From ddbb47b55229a220d99b4e5e630bab06c543149e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 26 Sep 2017 23:19:58 +0000 Subject: leadsheets (26sep17) git-svn-id: svn://tug.org/texlive/trunk@45405 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/leadsheets/README | 6 ++--- .../doc/latex/leadsheets/leadsheets_en.pdf | Bin 913061 -> 948160 bytes .../doc/latex/leadsheets/leadsheets_en.tex | 12 ++++++---- .../leadsheets.library.chordnames.code.tex | 2 +- .../leadsheets/leadsheets.library.chords.code.tex | 2 +- .../leadsheets.library.external.code.tex | 2 +- .../leadsheets.library.musejazz.code.tex | 25 +++++---------------- .../leadsheets.library.properties.code.tex | 3 ++- .../leadsheets.library.shorthands.code.tex | 3 ++- .../leadsheets/leadsheets.library.songs.code.tex | 3 ++- .../leadsheets.library.templates.code.tex | 2 +- .../leadsheets.library.translations.code.tex | 2 +- .../leadsheets.library.transposing.code.tex | 2 +- .../texmf-dist/tex/latex/leadsheets/leadsheets.sty | 6 ++--- 14 files changed, 32 insertions(+), 38 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/leadsheets/README b/Master/texmf-dist/doc/latex/leadsheets/README index 2ac3bf8f2f1..831b2a33b71 100644 --- a/Master/texmf-dist/doc/latex/leadsheets/README +++ b/Master/texmf-dist/doc/latex/leadsheets/README @@ -1,11 +1,11 @@ -------------------------------------------------------------------------- -the LEADSHEETS package v0.5a 2017/01/23 - +the LEADSHEETS package v0.5b 2017/09/26 + typesetting leadsheets and songbooks -------------------------------------------------------------------------- Clemens Niederberger -Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +Web: https://github.com/cgnieder/leadsheets E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- Copyright 2014-2017 Clemens Niederberger diff --git a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf index 8295080b5d5..1c881907fab 100644 Binary files a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf and b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex index 9cadbe8e39d..c11f660e5c1 100644 --- a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex +++ b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex @@ -1,7 +1,7 @@ -% arara: pdflatex: { shell: on , action: nonstopmode } -% !arara: biber -% !arara: pdflatex -% !arara: pdflatex +% !arara: pdflatex: { shell: on , action: nonstopmode } +% arara: biber +% arara: pdflatex +% arara: pdflatex % -------------------------------------------------------------------------- % the LEADSHEETS package % @@ -1164,6 +1164,10 @@ as \cs{chord} with one exception: it lacks the mandatory argument \meta{chord} (since it's obviously not needed). It has the optional \sarg{} and \code{-}, though, as well as the mandatory space (\visiblespace)! +\emph{Please note that \shortcut{\textasciicircum} \emph{can't} be the last + token in a line! It then should be followed by a space an an empty group -- + similar to the caveat in section~\ref{sec:placing-chords:caveat}.} + Each \env{verse} like environment (see section~\ref{sec:other-envverse-like} for more information) is treated uniquely by this mechanism: diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex index d3f68898443..d43c840c60a 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex @@ -206,7 +206,7 @@ \NewDocumentCommand \chordname {} { \leadsheets_chord: } -\endinput +\file_input_stop: HISTORY: diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex index d627de9bf00..bda16e3ff25 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex @@ -260,7 +260,7 @@ { \chord } } -\endinput +\file_input_stop: HISTORY: diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.external.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.external.code.tex index 95fc2b70a39..f7d8f11ea4a 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.external.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.external.code.tex @@ -176,6 +176,6 @@ \leadsheets_include_leadsheet:nn {#2} {#3} } -\endinput +\file_input_stop: 2016/08/18 - first version diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex index 4807d4039d0..6256c426f6c 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex @@ -173,24 +173,6 @@ \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {sus} {\l__leadsheets_sus_tl} \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {^} {\textsuperscript} - \bool_if:NF \l__leadsheets_notation_literal_bool - { - % convert to English to German input: - \bool_if:NT \l__leadsheets_input_notation_german_bool - { - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {B} {@@@} - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {H} {B} - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {@@@} {Bb} - } - % convert to English to German output: - \bool_if:NT \l__leadsheets_output_notation_german_bool - { - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {Bb} {@@@} - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {B} {H} - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {@@@} {B} - \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {B#} {H} - } - } \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {#b} {} \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {b#} {} \leadsheets_chord_sym:Nnn \l__leadsheets_chord_tl {##} @@ -279,4 +261,9 @@ \group_end: } -\tex_endinput:D +\file_input_stop: + +HISTORY: + +2017/09/25 - the `literal' option has been dropped 2015/05/08 already - adopt + file accordingly diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.properties.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.properties.code.tex index 30972adbd22..44a69aaa25f 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.properties.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.properties.code.tex @@ -226,6 +226,7 @@ { \leadsheets_duplicate_property:nn {#1} {#2} } \@onlypreamble\copysongproperty -\endinput +\file_input_stop: + 2015/07/05: enable usage of # in the key property 2016/05/18: new commands \ifanysongproperty and \ifallsongproperties diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex index eeaa4934b76..0f5a339e558 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex @@ -62,6 +62,7 @@ { \leadsheets_activate_shorthand:N ##1 } } -\endinput +\file_input_stop: + 2016/06/29 - breaking change: \leadsheets_define_shorthand:Npn is now \leadsheets_define_shorthand:NN diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex index 71942935235..8a377a04ca0 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex @@ -776,7 +776,8 @@ disable-measuring .initial:n = false } -\endinput +\file_input_stop: + 2015/05/22: \l__leadsheets_chords_sequences_prop changed into global 2015/07/02: added `class' option to verses 2015/07/05: enable usage of # in the key property diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.templates.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.templates.code.tex index c1b20852a3a..c09744aa3e7 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.templates.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.templates.code.tex @@ -107,4 +107,4 @@ \NewDocumentCommand \defineversetypetemplate {m+m+m} { \leadsheets_define_verse_template:nnn {#1} {#2} {#3} } -\endinput +\file_input_stop: diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.translations.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.translations.code.tex index e00cb8d759e..c3ecd3e1519 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.translations.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.translations.code.tex @@ -75,7 +75,7 @@ \leadsheets_declare_translation:nnn {English} {fret} {fret} \leadsheets_declare_translation:nnn {German} {fret} {Bund} -\tex_endinput:D +\file_input_stop: 2014/08/10: first version 2016/05/18: new command: \leadsheets_declare_translation:nnn diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.transposing.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.transposing.code.tex index d2b9c9dac56..2f0e428d94d 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.transposing.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.transposing.code.tex @@ -231,4 +231,4 @@ } } -\endinput +\file_input_stop: diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty index e9da8f85979..5e6464dfcca 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty @@ -27,8 +27,8 @@ % -------------------------------------------------------------------------- % package information: \ExplSyntaxOn -\tl_const:Nn \leadsheetsdate {2017/01/23} -\tl_const:Nn \leadsheetsversion {0.5a} +\tl_const:Nn \leadsheetsdate {2017/09/26} +\tl_const:Nn \leadsheetsversion {0.5b} \tl_const:Nn \leadsheetsinfo {Typesetting leadsheets and songbooks} \ProvidesExplPackage @@ -244,7 +244,7 @@ { \leadsheets_load_library:n {songs} } % -------------------------------------------------------------------------- -\tex_endinput:D +\file_input_stop: 2016/08/18 - new commands: \leadsheetsifpackageloaded, \leadsheetsiflibrary - new class `leadsheet' -- cgit v1.2.3