diff options
author | Karl Berry <karl@freefriends.org> | 2016-08-19 21:44:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-08-19 21:44:56 +0000 |
commit | 2639cda39baf8b76bc02b0e2cd4e426570ee46d5 (patch) | |
tree | 27df9611cca8433df0fd634c9486d55e0a6f17da /Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex | |
parent | 3a531292de6d64a874319788cdf2f324bc8aa2eb (diff) |
leadsheets (19aug16)
git-svn-id: svn://tug.org/texlive/trunk@41890 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.chords.code.tex | 68 |
1 files changed, 36 insertions, 32 deletions
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 96be6e7c483..0cea01229a3 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 @@ -5,7 +5,6 @@ % % -------------------------------------------------------------------------- % Clemens Niederberger -% Web: http://www.mychemistry.eu/forums/forum/leadsheets/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- % Copyright 2014-2016 Clemens Niederberger @@ -22,12 +21,13 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -\LeadsheetsExplLibrary{chords}{2015/07/02 printing chords} +\LeadsheetsExplLibrary{chords}{2016/07/02 printing chords} \msg_new:nnn {leadsheets} {no-chords} { No~ more~ chords~ left~ for~ verse~ type~ `#1'~ \msg_line_context: } \leadsheets_load_library:n {chordnames} + \bool_new:N \l__leadsheets_output_notation_german_bool \bool_new:N \l__leadsheets_input_notation_german_bool @@ -114,28 +114,31 @@ \tl_replace_all:Nnn \l__leadsheets_current_chord_tl {H} {B} } { \tl_replace_all:Nnn \l__leadsheets_current_chord_tl {H} {B} } - \bool_if:nT - { - \leadsheets_if_property_p:Vn \l_leadsheets_current_song_id_tl {key} - && - ( \l__leadsheets_transpose_bool || \l__leadsheets_transpose_capo_bool ) - } - { - \leadsheets_transpose:xVN - { \leadsheets_get_property:Vn \l_leadsheets_current_song_id_tl {key} } - \l__leadsheets_transpose_steps_int - \l__leadsheets_current_chord_tl - } - \bool_if:nTF - { - ! \leadsheets_if_property_p:Vn \l_leadsheets_current_song_id_tl {key} - && - ( \l__leadsheets_transpose_bool || \l__leadsheets_transpose_capo_bool ) - } + \leadsheets_if_library:nT {songs} { - \msg_warning:nnV {leadsheets} - {transpose-key} - \l_leadsheets_current_song_id_tl + \bool_if:nT + { + \leadsheets_if_property_p:Vn \l_leadsheets_current_song_id_tl {key} + && + ( \l__leadsheets_transpose_bool || \l__leadsheets_transpose_capo_bool ) + } + { + \leadsheets_transpose:xVN + { \leadsheets_get_property:Vn \l_leadsheets_current_song_id_tl {key} } + \l__leadsheets_transpose_steps_int + \l__leadsheets_current_chord_tl + } + \bool_if:nTF + { + ! \leadsheets_if_property_p:Vn \l_leadsheets_current_song_id_tl {key} + && + ( \l__leadsheets_transpose_bool || \l__leadsheets_transpose_capo_bool ) + } + { + \msg_warning:nnV {leadsheets} + {transpose-key} + \l_leadsheets_current_song_id_tl + } } % => convert to specified output \bool_if:NT \l__leadsheets_output_notation_german_bool @@ -158,7 +161,8 @@ \bool_if:NTF \l__leadsheets_chord_print_bool { \group_begin: - \leadsheets_ignore_lines: + \leadsheets_if_library:nT {songs} + { \leadsheets_ignore_lines: } \bool_if:NT \g__leadsheets_smash_next_chord_bool { \bool_set_true:N \l__leadsheets_smash_chords_bool @@ -235,13 +239,6 @@ { \prg_return_false: } } -\cs_new:Npn \leadsheets_remember_or_recall_chords:w - { - \leadsheets_if_recall_chords:TF - { \recallchord } - { \chord } - } - \cs_new_protected:Npn \leadsheets_recall_chord:nn #1#2 { \seq_pop_left:NNF \g__leadsheets_chords_sequences_seq @@ -256,6 +253,13 @@ \NewDocumentCommand \recallchord {st-} { \leadsheets_recall_chord:nn {#1} {#2} } +\NewDocumentCommand \getorprintchord {} + { + \leadsheets_if_recall_chords:TF + { \recallchord } + { \chord } + } + \endinput HISTORY: @@ -267,4 +271,4 @@ HISTORY: - options `input-notation' and `output-notation' now directly belong to the `chords' library. - this is now a user library - +2016/07/02 - \getorprintchord |