From 2a296c8262f9c790904ca068ddff5c505707fa0a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Oct 2019 21:10:20 +0000 Subject: leadsheets (3oct19) git-svn-id: svn://tug.org/texlive/trunk@52275 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/leadsheets/leadsheet.cls | 2 +- .../leadsheets.library.chordnames.code.tex | 3 ++- .../leadsheets/leadsheets.library.chords.code.tex | 2 +- .../leadsheets.library.external.code.tex | 2 +- .../leadsheets.library.musejazz.code.tex | 2 +- .../leadsheets.library.musicsymbols.code.tex | 2 +- .../leadsheets.library.properties.code.tex | 3 +-- .../leadsheets.library.shorthands.code.tex | 2 +- .../leadsheets/leadsheets.library.songs.code.tex | 23 ++++++++++++---------- .../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 | 9 +++++---- 13 files changed, 30 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls b/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls index 7ea96cb2b50..2c5dadf4af0 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 d43c840c60a..113b9788a34 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -53,6 +53,7 @@ \tl_new:N \l__leadsheets_dim_tl \tl_new:N \l__leadsheets_add_tl \tl_new:N \l__leadsheets_major_seven_tl +\tl_new:N \l__leadsheets_major_nine_tl \tl_new:N \l__leadsheets_german_B_tl \tl_new:N \l__leadsheets_german_H_tl 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 bda16e3ff25..11e8539cec5 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 f7d8f11ea4a..77d414b4104 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 6256c426f6c..6f6ffb90520 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex index f94701cdf6f..cce3dfbf76e 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 44a69aaa25f..ee01fbf3e9a 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -42,7 +42,6 @@ \prop_gput:cnV {l__leadsheets_songs_#2_prop} {#1} \l__leadsheets_tmpa_tl } -\cs_generate_variant:Nn \prop_gput:cnn {cnV} \cs_generate_variant:Nn \leadsheets_set_property:nnn { nnx } \cs_new:Npn \leadsheets_get_property:nn #1#2 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 0f5a339e558..c3a2aac953d 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2016 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 8a377a04ca0..ca2c8cac7a6 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\LeadsheetsExplLibrary{songs}{2016/07/02 typesetting songs} +\LeadsheetsExplLibrary{songs}{2019/10/02 typesetting songs} % -------------------------------------------------------------------------- % messages: @@ -533,14 +533,16 @@ \bool_if:cF {l__leadsheets_#1_empty_bool} { \tl_use:c {l__leadsheets_#1_label_format_tl} - \bool_if:cT {l__leadsheets_#1_named_bool} - { - \leadsheets_translation:n {#1} - \bool_if:cT {l__leadsheets_#1_numbered_bool} { ~ } - } - \bool_if:cT {l__leadsheets_#1_numbered_bool} - { \use:c {the#1} } - \tl_use:c {l__leadsheets_#1_after_label_tl} + { + \bool_if:cT {l__leadsheets_#1_named_bool} + { + \leadsheets_translation:n {#1} + \bool_if:cT {l__leadsheets_#1_numbered_bool} {~} + } + \bool_if:cT {l__leadsheets_#1_numbered_bool} + { \use:c {the#1} } + \tl_use:c {l__leadsheets_#1_after_label_tl} + } } } @@ -790,3 +792,4 @@ 2016/06/29: - adapt to changed shorthand library - activate bar-shortcuts per default 2016/07/02: fix issue when \capo is used in a title template +2019/10/02: enable https://tex.stackexchange.com/q/442222/ 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 c09744aa3e7..9514a03f1e5 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 c3ecd3e1519..d5992adcdbf 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 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 2f0e428d94d..91e21f00196 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 @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty index 5e6464dfcca..382c436b7a8 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty @@ -7,7 +7,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014-2017 Clemens Niederberger +% Copyright 2014--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -27,8 +27,8 @@ % -------------------------------------------------------------------------- % package information: \ExplSyntaxOn -\tl_const:Nn \leadsheetsdate {2017/09/26} -\tl_const:Nn \leadsheetsversion {0.5b} +\tl_const:Nn \leadsheetsdate {2019/10/02} +\tl_const:Nn \leadsheetsversion {0.6} \tl_const:Nn \leadsheetsinfo {Typesetting leadsheets and songbooks} \ProvidesExplPackage @@ -60,10 +60,11 @@ \cs_generate_variant:Nn \seq_item:Nn { cV } \cs_generate_variant:Nn \int_to_arabic:n { V } \cs_generate_variant:Nn \tl_replace_once:Nnn { NnV } -\cs_generate_variant:Nn \prop_gput:Nnn { cxx , NVf } +\cs_generate_variant:Nn \prop_gput:Nnn { cnV , cxx , NVf } \cs_generate_variant:Nn \msg_error:nnn { nnV } \cs_generate_variant:Nn \msg_warning:nnn { nnV } \cs_generate_variant:Nn \vbox_set:Nn { NV } +\cs_generate_variant:Nn \prop_gput:Nnn { cnV } % -------------------------------------------------------------------------- % temporary variables: -- cgit v1.2.3