diff options
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 29 insertions, 7 deletions
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 b904d2320ba..2455228fad1 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 @@ -12,7 +12,14 @@ } \cs_new_protected:Npn \leadsheets_set_property:nnn #1#2#3 - { \prop_gput:cnn {l__leadsheets_songs_#2_prop} {#1} {#3} } + { + \tl_set_rescan:Nnn \l__leadsheets_tmpa_tl + { \char_set_catcode_other:N \# } + {#3} + \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 @@ -165,3 +172,4 @@ \@onlypreamble\copysongproperty \endinput +2015/07/05: enable usage of # in the key property 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 3344cdd758b..a495369a56e 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 @@ -60,6 +60,7 @@ \int_new:N \g__leadsheets_song_id_int \skip_new:N \l__leadsheets_obey_parskip_skip +\skip_new:N \l__leadsheets_obey_parindent_skip % -------------------------------------------------------------------------- % load necessary libraries: @@ -110,12 +111,14 @@ % -------------------------------------------------------------------------- % the `song' environment: -\NewDocumentEnvironment {song} { O{}m } +\NewDocumentEnvironment {song} { O{} } { \int_gincr:N \g__leadsheets_song_id_int \tl_set:Nx \l__leadsheets_tmpa_tl { song-\int_to_arabic:n { \g__leadsheets_song_id_int } } - \leadsheets_startsong:nVn {#1} \l__leadsheets_tmpa_tl {#2} + \char_set_catcode_other:N \# + \skip_set_eq:NN \l__leadsheets_obey_parskip_skip \parskip + \leadsheets_startsong:nVn {#1} \l__leadsheets_tmpa_tl } {} @@ -129,7 +132,10 @@ \__leadsheets_active_eol: % \tl_const:Nn \c__leadsheets_eol_tl {^^M}% \cs_new_protected:Npn \leadsheets_obey_lines: {% - \skip_set_eq:NN \l__leadsheets_obey_parskip_skip \parskip + \bool_if:NT \l__leadsheets_obey_lines_bool {% + \skip_set_eq:NN \l__leadsheets_obey_parindent_skip \parindent% + \skip_zero:N \parindent% + }% \cs_set:Npn ^^M{% \peek_meaning:NTF ^^M% {\par \skip_vertical:N \l__leadsheets_obey_parskip_skip}% @@ -142,6 +148,10 @@ {\par}% {\c_space_tl}% }% + \bool_if:NT \l__leadsheets_obey_lines_bool {% + \skip_set_eq:NN \parindent \l__leadsheets_obey_parindent_skip% + \skip_zero:N \l__leadsheets_obey_parindent_skip% + }% }% \group_end: @@ -163,6 +173,7 @@ } \cs_generate_variant:Nn \leadsheets_startsong:nnn { nV } + \cs_new_protected:Npn \leadsheets_specials: { \leadsheets_activate_shorthands:n {^_} @@ -223,6 +234,8 @@ \leadsheets_set_property:nnx {#1} {counter} { \int_to_arabic:n {\g__leadsheets_song_id_int} } } +\cs_generate_variant:Nn \keys_set:nn {nV} +\cs_generate_variant:Nn \leadsheets_song_define:nn {nV} \cs_new_protected:Npn \leadsheets_define_song_properties:n #1 { @@ -396,7 +409,7 @@ \ifsongproperty{key} { & - \setchordnames{ + \setchords{ major = -\GetTranslation{leadsheets/major} , minor = -\GetTranslation{leadsheets/minor} } @@ -648,3 +661,4 @@ \endinput 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.sty b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty index 430bde992de..6ba57e9be26 100644 --- a/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty +++ b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.sty @@ -5,8 +5,8 @@ % -------------------------------------------------------------------------- % package information: \ExplSyntaxOn -\tl_const:Nn \c_leadsheets_date_tl {2015/07/02} -\tl_const:Nn \c_leadsheets_version_tl {0.2} +\tl_const:Nn \c_leadsheets_date_tl {2015/07/07} +\tl_const:Nn \c_leadsheets_version_tl {0.2a} \tl_const:Nn \c_leadsheets_info_tl {Typesetting leadsheets and songbooks} \ProvidesExplPackage |