From 8b7758314c06098bdf78be42b7ed8987b621467b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Feb 2016 23:01:38 +0000 Subject: leadsheets (3feb16) git-svn-id: svn://tug.org/texlive/trunk@39564 c570f23f-e606-0410-a88d-b1316a301751 --- .../leadsheets.library.chordnames.code.tex | 24 ++++++++++++ .../leadsheets/leadsheets.library.chords.code.tex | 28 +++++++++++++- .../leadsheets.library.musejazz.code.tex | 24 ++++++++++++ .../leadsheets.library.musicsymbols.code.tex | 26 ++++++++++++- .../leadsheets.library.properties.code.tex | 31 +++++++++++---- .../leadsheets.library.shorthands.code.tex | 29 +++++++++++++- .../leadsheets/leadsheets.library.songs.code.tex | 44 +++++++++++++++++++++- .../leadsheets.library.templates.code.tex | 24 ++++++++++++ .../leadsheets.library.translations.code.tex | 24 ++++++++++++ .../leadsheets.library.transposing.code.tex | 24 ++++++++++++ .../texmf-dist/tex/latex/leadsheets/leadsheets.sty | 27 ++++++++++++- 11 files changed, 290 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/leadsheets') 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 8c875b60906..4342d33d69b 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{chordnames}{2015/07/02 typesetting chord names with easy syntax} \leadsheets_load_library:n {musicsymbols} 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 3dd24ce0dd4..96be6e7c483 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{chords}{2015/07/02 printing chords} \msg_new:nnn {leadsheets} {no-chords} @@ -214,7 +238,7 @@ \cs_new:Npn \leadsheets_remember_or_recall_chords:w { \leadsheets_if_recall_chords:TF - { \__leadsheets_recall_chord:w } + { \recallchord } { \chord } } @@ -229,7 +253,7 @@ { \leadsheets_chord_write:V \l__leadsheets_tmpa_tl } } -\NewDocumentCommand \__leadsheets_recall_chord:w {st-} +\NewDocumentCommand \recallchord {st-} { \leadsheets_recall_chord:nn {#1} {#2} } \endinput 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 f329453c8d6..6e13b570c12 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{musejazz} {2014/08/10 using MuseScore's MuseJazz font for chordnames} 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 93b55d64168..02cf93aa5a8 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsLibrary{musicsymbols}{2015/07/13 musical symbols} \RequirePackage{etoolbox} @@ -111,4 +135,4 @@ \endinput 2014/08/10 - initial release -2015/07/13 - scale musix font by 1.9 => else the symbols are rather small! +2015/07/13 - scale musix font by 1.5 => else the symbols are rather small! 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 2455228fad1..f434525a50d 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{properties}{2014/08/10 song properties} \cs_generate_variant:Nn \tl_if_eq:nnTF {x} @@ -36,13 +60,6 @@ \cs_generate_variant:Nn \leadsheets_if_property:nnT { V } \cs_generate_variant:Nn \leadsheets_if_property_p:nn { V } -\prg_new_conditional:Npnn \leadsheets_if_measuring: {T,F,TF} - { - \bool_if:NTF \l__leadsheets_measuring_bool - { \prg_return_true: } - { \prg_return_false: } - } - \prg_new_protected_conditional:Npnn \leadsheets_if_properties_eq:nnn #1#2#3 {T,F,TF} { \tl_if_eq:xxTF 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 3766ddcc0b3..184db99e233 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{shorthands} {2014/08/10 definition and activation of shorthands} @@ -14,13 +38,15 @@ \__leadsheets_define_shorthand_aux_i:np {#1} } -\cs_new_protected:Npn \__leadsheets_define_shorthand_aux_i:np #1#2#{ +\cs_new_protected:Npn \__leadsheets_define_shorthand_aux_i:np #1#2# + { \char_set_lccode:nn {`~} {`#1} \__leadsheets_define_shorthand_aux_ii:nn {#2} } \cs_new_protected:Npn \__leadsheets_define_shorthand_aux_ii:nn #1#2 { \tl_to_lowercase:n { \group_end: \cs_set:Npn ~ } #1 {#2} } + \group_end: \cs_new_protected:Npn \leadsheets_activate_shorthands:n #1 @@ -31,6 +57,7 @@ { \char_set_catcode_active:N ##1 } } } + \cs_new_protected:Npn \leadsheets_activate_all_shorthands: { \seq_map_inline:Nn \l__leadsheets_shorthands_seq 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 79d235f66aa..63e3fc12832 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 @@ -1,4 +1,28 @@ -\LeadsheetsExplLibrary{songs}{2015/07/27 typesetting songs} +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- +\LeadsheetsExplLibrary{songs}{2016/02/02 typesetting songs} % -------------------------------------------------------------------------- % messages: @@ -331,6 +355,13 @@ { \prg_return_false: } } +\prg_new_conditional:Npnn \leadsheets_if_measuring: {T,F,TF} + { + \bool_if:NTF \l__leadsheets_measuring_bool + { \prg_return_true: } + { \prg_return_false: } + } + \cs_new_protected:Npn \leadsheets_check_print:n #1 { \leadsheets_if_print_tags:nT {#1} @@ -557,7 +588,12 @@ \keys_set:nn {leadsheets/#2} {##1} \tl_set:Nx \l_leadsheets_verse_type_tl { #2-\tl_use:c {l__leadsheets_#2_class_tl} } - \bool_if:NF \l__leadsheets_recall_verse_type_bool + \bool_if:NTF \l__leadsheets_recall_verse_type_bool + { + \tl_set_eq:NN + \l_leadsheets_verse_type_tl + \l__leadsheets_recall_verse_type_tl + } { \tl_set_eq:NN \l__leadsheets_recall_verse_type_tl @@ -567,6 +603,9 @@ { \seq_gclear:N \g__leadsheets_chords_sequences_seq } \leadsheets_if_recall_chords:T { + % \prop_show:N \g__leadsheets_chords_sequences_prop + % \tl_show:N \l__leadsheets_recall_verse_type_tl + % \seq_show:N \g__leadsheets_chords_sequences_seq \prop_get:NVN \g__leadsheets_chords_sequences_prop \l__leadsheets_recall_verse_type_tl @@ -673,3 +712,4 @@ 2015/07/05: enable usage of # in the key property 2015/07/27: new options `before-song', `after-song', `after-title' and `add-to-reset' +2015/02/02: enable to recall chords even if verse is used the first time 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 618350e1deb..bb6e2b98639 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{templates} {2014/08/10 template mechanism for song titles and verses} 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 afbb8d0a1ec..83726462dfe 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{translations}{2014/08/10 dictionary for leadsheets} \cs_new:Npn \leadsheets_translation:n #1 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 f70cec60748..eaacc95f3f9 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 @@ -1,3 +1,27 @@ +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \LeadsheetsExplLibrary{transposing}{2014/08/10 transposing of chord symbols} \prop_new:N \l__leadsheets_pitches_prop diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty index d8ff399ae96..21dcd6f1078 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty @@ -1,12 +1,35 @@ % -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ +% E-Mail: contact@mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2016 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- % required packages: \RequirePackage{expl3,l3keys2e,xparse,translations} % -------------------------------------------------------------------------- % package information: \ExplSyntaxOn -\tl_const:Nn \c_leadsheets_date_tl {2015/07/28} -\tl_const:Nn \c_leadsheets_version_tl {0.3} +\tl_const:Nn \c_leadsheets_date_tl {2016/02/02} +\tl_const:Nn \c_leadsheets_version_tl {0.3a} \tl_const:Nn \c_leadsheets_info_tl {Typesetting leadsheets and songbooks} \ProvidesExplPackage -- cgit v1.2.3