diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-07 22:15:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-07 22:15:48 +0000 |
commit | fbed7778f5ea584cbd6c36f4497d9a4c63878d46 (patch) | |
tree | 0b1ee0ae2890eba1b76bf5bab7101fa6e8087fb4 /Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex | |
parent | 1a2539bd1fc02074e7949e5e3055cca5084696cd (diff) |
leadsheets (7jul15)
git-svn-id: svn://tug.org/texlive/trunk@37793 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.songs.code.tex | 22 |
1 files changed, 18 insertions, 4 deletions
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 |