diff options
16 files changed, 48 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/leadsheets/README b/Master/texmf-dist/doc/latex/leadsheets/README index c984872ee3c..22675c05622 100644 --- a/Master/texmf-dist/doc/latex/leadsheets/README +++ b/Master/texmf-dist/doc/latex/leadsheets/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the LEADSHEETS package v0.6 2019/10/02 +the LEADSHEETS package v0.7 2022/01/05 typesetting leadsheets and songbooks @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/leadsheets E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2014--2019 Clemens Niederberger +Copyright 2014--2022 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/doc/latex/leadsheets/leadsheets_en.pdf b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf Binary files differindex 264c7e5c75a..fc381678e35 100644 --- a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf +++ b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.pdf diff --git a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex index dbf744685c2..91a821c2ae2 100644 --- a/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex +++ b/Master/texmf-dist/doc/latex/leadsheets/leadsheets_en.tex @@ -1,7 +1,7 @@ -% arara: pdflatex: { shell: on , action: nonstopmode } +% arara: pdflatex: { shell: on , interaction: nonstopmode } % arara: biber -% arara: pdflatex: { action: nonstopmode } -% arara: pdflatex: { action: nonstopmode } +% arara: pdflatex: { interaction: nonstopmode } +% arara: pdflatex: { interaction: nonstopmode } % -------------------------------------------------------------------------- % the LEADSHEETS package % @@ -11,7 +11,7 @@ % Clemens Niederberger % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2014--2019 Clemens Niederberger +% Copyright 2014--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -26,7 +26,7 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} -\usepackage{leadsheets,bookmark} +\usepackage{leadsheets,bookmark,csquotes} \setcnltx{ package = leadsheets , info = Typesetting leadsheets and songbooks , @@ -99,8 +99,7 @@ \defbibheading{bibliography}{\section{References}} \addbibresource{\jobname.bib} -\usepackage{filecontents} -\begin{filecontents}{\jobname.bib} +\begin{filecontents}[overwrite]{\jobname.bib} @book{book:realbook, author = {Various} , title = {The Real Book} , @@ -212,7 +211,7 @@ promising packages: \pkg{songs}~\cite{pkg:songs} and I wanted. Just a bit too inflexible in the wrong places, needing tweaking here and there, and so on. On the other hand I had quite some code lying on my hard drive with various attempts of typesetting leadsheets. This package -is now the attempt to have a clean, documented and customisable version of my +is now the attempt to have a clean, documented and customizable version of my code\footnote{Plus new things!}. \section{The Structure of the Package} @@ -259,7 +258,7 @@ The user-libraries are the following ones: part~\ref{part:chords-library}. It also loads the \library{musicsymbols}library. \item[\library{musejazz}] \packageoption{musejazz}extends the \chords\ - library to use MuseScore's \enquote{MuseJazz} font, see + library to use MuseScore's \enquote{MuseJazz Text} font, see section~\ref{sec:musejazz-libr}. It loads the \library{chords} library. \item[\library{songs}] \packageoption{songs}This is the \emph{main @@ -395,7 +394,7 @@ bars: The distance between two bar rules as in \cs{doublebar} or \cs{stopbar}. \end{commands} -Finally \musicsymbols{} provides a macro for adding an abitrary meter: +Finally \musicsymbols{} provides a macro for adding an arbitrary meter: \begin{commands} \command{meter}[\marg{numerator}\marg{denominator}] \sinceversion{0.5}For example \verbcode+\meter{6}{8}+: \meter{6}{8} @@ -599,13 +598,13 @@ Let's see a few examples for the \option{input-notation} and \section{The \library*{musejazz} Library}\label{sec:musejazz-libr} The \musejazz\ library extends the \chords\ library to use -MuseScore's\footnote{\url{http://musescore.com/}} font \enquote{MuseJazz} for -the chord symbols. The library contains the two lines which explains why it -requires \LuaLaTeX\ or \XeLaTeX. Well, and the font, obviously. +MuseScore's\footnote{\url{http://musescore.com/}} font \enquote{MuseJazz Text} +for the chord symbols. The library contains the two lines which explains why +it requires \LuaLaTeX\ or \XeLaTeX. Well, and the font, obviously. \begin{sourcecode} \RequirePackage{fontspec} - \newfontfamily\musejazz{MuseJazz} + \newfontfamily\musejazz{MuseJazz Text} \end{sourcecode} Here is a small example of it's usage and the outcome: @@ -698,7 +697,7 @@ to specify the different parts of a song. They all are basically the same kind of environment, namely an \env*{itemize} environment internally where the only \cs*{item} has the name of the environment as option. The \env{verse} environment is a little bit different since verses can be numbered. If they -are then each usage of \env{verse} inside \env{song} will step a vers number +are then each usage of \env{verse} inside \env{song} will step a verse number and print it (as option to the internal \cs*{item}). \begin{environments} @@ -775,7 +774,7 @@ Although I used the word \enquote{global} above \emph{all options are local to the \env{song} environment. See sections~\ref{sec:special-characters} and~\ref{sec:typesetting-bars} for more details. \keybool{disable-measuring}\Default{false} - \sinceversion{0.4}This option turns of the song height measuring. This + \sinceversion{0.4}This option turns off the song height measuring. This makes song title template definitions easier (see section~\ref{sec:title-templates} for details). \emph{The song property \property{height} will be set to 0pt then!} \end{options} @@ -965,7 +964,8 @@ options: \meta{code} is inserted at the beginning of the environment and can thus be used to add formatting, \eg, \keyis{format}{\cs*{itshape}}. \keyval{label-format}{code}\Default - The same for the environment labels. + The same for the environment labels. The last command may take the label + as an argument so you can also use \cs*{textbf} for example. \keyval{class}{class-name}\Default{default} The\sinceversion{0.2} \env{verse} environment and all related environments all belong to a class, the default class is called \code{default}. This @@ -1395,7 +1395,7 @@ They have more options. Here's a complete list: different classes then \meta{class} needs to be \code{default}, see also page~\pageref{option:class}. The \option{class} to a \env{verse}-like environment allows for example to have verses with different chords which - are still counted reguarly together with the \option{remember-chords} + are still counted regularly together with the \option{remember-chords} option. \end{options} @@ -1407,7 +1407,7 @@ options for all environments: \keyval{verses-label-format}{code}\Default Sets the label format for all \env{verse} like environments. \keyval{verses-after-label}{code}\Default{:} - Defeault \meta{code} that is inserted in the label after the label text of + Default \meta{code} that is inserted in the label after the label text of \env{verse} like environments. \end{options} This options only determine the formatting of an environment if the @@ -1564,7 +1564,7 @@ contents or other auxiliary files. \leadsheets{} measures the height of a song body before it typesets it and it can often be necessary in a template to know if the measuring phase is active or not. For example the song property \property{height} should - only be used if \emph{not} in the measuring phase: it's value get's + only be used if \emph{not} in the measuring phase: its value gets determined there and is not yet available. \command{expandcode}[\marg{code}] Exhaustively expands \meta{code}. Experienced users won't need this. It diff --git a/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls b/Master/texmf-dist/tex/latex/leadsheets/leadsheet.cls index 2c5dadf4af0..2787610a2f7 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 113b9788a34..69763634851 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--2019 Clemens Niederberger +% Copyright 2014--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -156,7 +156,7 @@ } \cs_new_protected:Npn \__leadsheets_revert_minor:w #1 \l__leadsheets_minor_tl #2 \q_stop - { \tl_lower_case:n {#1} #2 } + { \text_lowercase:n {#1} #2 } \cs_new_protected:Npn \leadsheets_tension:w (#1) { @@ -221,3 +221,4 @@ HISTORY: lowercase letters; requires user input `Dmi' in order to get `d'; lowercase letters can of course be input directly but then are immune to transposing +2020/01/16 - adapt to renaming of case changing functions 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 11e8539cec5..4dee48d95d2 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 77d414b4104..ed62913b371 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--2019 Clemens Niederberger +% Copyright 2014--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -122,9 +122,9 @@ % and \LeadsheetEndSurvive \cs_new_protected:Npn \leadsheets_include_external_file:nn #1#2 { - \tl_set_from_file:Nnn \l__leadsheets_tmpa_tl + \file_get:nnN { #1 \tl_if_blank:nF {#2} {.} #2 } {} - { #1 \tl_if_blank:nF {#2} {.} #2 } + \l__leadsheets_tmpa_tl \cs_set:Npn \LeadsheetSurvive ##1 \LeadsheetEndSurvive ##2 \q_stop { ##1 \__leadsheets_extract_survival:ww ##2 \q_stop } \__leadsheets_include_external_file_aux:V \l__leadsheets_tmpa_tl 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 6f6ffb90520..9f55fbd1b23 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--2019 Clemens Niederberger +% Copyright 2014--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -22,11 +22,11 @@ % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- \LeadsheetsExplLibrary{musejazz} - {2014/08/10 using MuseScore's MuseJazz font for chordnames} + {2019/10/02 using MuseScore's MuseJazz font for chordnames} \leadsheets_load_library:n {chordnames} -\msg_new:nnnn { leadsheets } { wrong-engine } +\msg_new:nnnn {leadsheets} {wrong-engine} { the~ `musejazz'~ library~ needs~ either~ to~ be~ run~ with~ XeLaTeX~ or~ with~ LuaLaTeX. @@ -42,7 +42,7 @@ \RequirePackage {fontspec} -\newfontfamily \musejazz {MuseJazz} +\newfontfamily \musejazz {MuseJazz~ Text} \cs_new_protected:Npn \leadsheets_char:Nn #1#2 { \cs_set:Npx #1 { \tex_char:D "#2 \scan_stop: } } @@ -267,3 +267,4 @@ HISTORY: 2017/09/25 - the `literal' option has been dropped 2015/05/08 already - adopt file accordingly +2019/10/02 - MuseScore's font has been renamed into `MuseJazz Text' 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 cce3dfbf76e..3095250f48f 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 ee01fbf3e9a..0d7ce284cc9 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--2019 Clemens Niederberger +% Copyright 2014--2022 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.shorthands.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex index c3a2aac953d..ce4f48cf4e3 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 ca2c8cac7a6..6d0e4d901e8 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--2019 Clemens Niederberger +% Copyright 2014--2022 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.templates.code.tex b/Master/texmf-dist/tex/latex/leadsheets/leadsheets.library.templates.code.tex index 9514a03f1e5..c6180d9ca35 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 d5992adcdbf..02f8028fba8 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 91e21f00196..a23c5316c51 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 382c436b7a8..b360a6f8cbb 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--2019 Clemens Niederberger +% Copyright 2014--2022 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 {2019/10/02} -\tl_const:Nn \leadsheetsversion {0.6} +\tl_const:Nn \leadsheetsdate {2022/01/05} +\tl_const:Nn \leadsheetsversion {0.7} \tl_const:Nn \leadsheetsinfo {Typesetting leadsheets and songbooks} \ProvidesExplPackage @@ -252,4 +252,6 @@ - new library `external' - minor chords can now be typeset with lowercase letters (chordnames) - +2019/10/02 - adapt to name change of MuseJazz font + - allow commands which require an argument as formatting commands + for verse labels |