From 92ad4fed0cb600ce55fffacc7e982fbaf955fc44 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Oct 2013 22:18:36 +0000 Subject: lilyglyphs (2oct13) git-svn-id: svn://tug.org/texlive/trunk@31814 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/lualatex/lilyglyphs/commands/accordion.inp | 116 ++++++++++++++++++ .../lualatex/lilyglyphs/commands/fancyexamples.inp | 2 +- .../tex/lualatex/lilyglyphs/commands/rests.inp | 4 +- .../lualatex/lilyglyphs/commands/singlenotes.inp | 130 ++++++++++++--------- .../tex/lualatex/lilyglyphs/lilyglyphs.sty | 2 + .../tex/lualatex/lilyglyphs/pdfs/.gitignore | 2 - 6 files changed, 195 insertions(+), 61 deletions(-) create mode 100644 Master/texmf-dist/tex/lualatex/lilyglyphs/commands/accordion.inp delete mode 100644 Master/texmf-dist/tex/lualatex/lilyglyphs/pdfs/.gitignore (limited to 'Master/texmf-dist/tex/lualatex/lilyglyphs') diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/accordion.inp b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/accordion.inp new file mode 100644 index 00000000000..b20f97203ed --- /dev/null +++ b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/accordion.inp @@ -0,0 +1,116 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% This file is part of the 'lilyglyphs' LaTeX package. % +% ========== % +% % +% https://github.com/openlilylib/lilyglyphs % +% http://www.openlilylib.org/lilyglyphs % +% % +% Copyright 2012-2013 Urs Liska and others, ul@openlilylib.org % +% % +% 'lilyglyphs' is free software: you can redistribute it and/or modify % +% it under the terms of the LaTeX Project Public License, either % +% version 1.3 of this license or (at your option) any later version. % +% You may find the latest version of this license at % +% http://www.latex-project.org/lppl.txt % +% more information on % +% http://latex-project.org/lppl/ % +% 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 Urs Liska (see above). % +% % +% This work consists of the files listed in the file 'manifest.txt' % +% which can be found in the 'license' directory. % +% % +% This program is distributed in the hope that it will be useful, % +% but WITHOUT ANY WARRANTY; without even the implied warranty of % +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This file is part of the lilyglyphs package % +% and defines one subset of glyphs % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%% +% Accordion registers % +%%%%%%%%%%%%%%%%%%%%%%% + +%------------------ +% Emmentaler glyphs + +% accordion bayan bass +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionBayanBass}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.5ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.bayanbass}% + \hspace*{-.3ex}}% +} + +% accordion discant +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionDiscant}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.6ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.discant}% + \hspace*{-.3ex}}% +} + +% accordion dot +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionDot}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.7ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.dot}}% +} + +% accordion free bass +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionFreeBass}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.5ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.freebass}}% +} + +% accordion old EE +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionOldEE}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.5ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.oldEE}}% +} + +% accordion pull +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionPull}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.2ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.pull}}% +} + +% accordion push +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionPush}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.5ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.push}}% +} + +% accordion standard bass +% created by lily-glyph-commands.py on 2013-09-23 +\newcommand*{\accordionStdBass}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=-.2}% + \hspace*{.9ex}% + \lilyPrint[#1]{\lilyGetGlyph{accordion.stdbass}% + \hspace*{-.4ex}}% +} + +%------------------------------ +% Combined glyphs, image based + +%TODO + diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/fancyexamples.inp b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/fancyexamples.inp index e59d1a65910..74c371cf31e 100644 --- a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/fancyexamples.inp +++ b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/fancyexamples.inp @@ -45,7 +45,7 @@ % example of a fancy notation % created by genImageCommands.py on 2013-09-07 -\newcommand*{\fancyExample}[1][]{% +\newcommand*{\lilyFancyExample}[1][]{% \setkeys{lilyDesignOptions}{scale=.7,raise=-.7}% \lilyPrintImage[#1]{lily-fancyExample}% } diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/rests.inp b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/rests.inp index 9a0b494fbad..48538af3f7a 100644 --- a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/rests.inp +++ b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/rests.inp @@ -42,13 +42,13 @@ %%%%%%%%%%%%%%%%%% % Whole note rests -% "rests.1o - half note rest upwards" +% "rests.1o - whole note rest upwards" \newcommand*{\wholeNoteRest}[1][]{% \setkeys{lilyDesignOptions}{scale=1.3,raise=0.4}% \lilyPrint[#1]{\hspace*{0.25ex}\lilyGetGlyph{rests.0o}}% } -% Dotted half note rest +% Dotted whole note rest \newcommand*{\wholeNoteRestDotted}[1][]{% % define the optional arguments for the dot \setkeys{lilyDesignOptions}{scale=0.8,raise=0.2}% diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/singlenotes.inp b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/singlenotes.inp index 99b576cc896..ba9a1a0cf9b 100644 --- a/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/singlenotes.inp +++ b/Master/texmf-dist/tex/lualatex/lilyglyphs/commands/singlenotes.inp @@ -39,52 +39,24 @@ % Single notes % %%%%%%%%%%%%%%%% -%%%%%%%%%%% -% crotchets - -% crotchet with upward stem -% created by buildglyphimages.py on 2012-11-06 -\newcommand*{\crotchet}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.2}% - \lilyPrintImage[#1]{lily-crotchet}% -} - -% crotchet with downward stem -% created by buildglyphimages.py on 2012-11-13 -\newcommand*{\crotchetDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% - \lilyPrintImage[#1]{lily-crotchetDown}% -} - -% dotted crotchet with upward stem -% created by buildglyphimages.py on 2012-11-07 -\newcommand*{\crotchetDotted}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.2}% - \lilyPrintImage[#1]{lily-crotchetDotted}% -} - -% dotted crotchet with downward stem -% created by buildglyphimages.py on 2012-11-13 -\newcommand*{\crotchetDottedDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% - \lilyPrintImage[#1]{lily-crotchetDottedDown}% -} +%%%%%%%%%%%%% +% whole notes -% doubledotted crotchet with upward stem -% created by buildglyphimages.py on 2012-11-08 -\newcommand*{\crotchetDottedDouble}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.2}% - \lilyPrintImage[#1]{lily-crotchetDottedDouble}% +% whole note +\newcommand*{\wholeNote}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=0.2}% + \lilyPrint[#1]{\lilyGetGlyph{noteheads.s0}}% } -% doubledotted crotchet with downward stem -% created by buildglyphimages.py on 2012-11-13 -\newcommand*{\crotchetDottedDoubleDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% - \lilyPrintImage[#1]{lily-crotchetDottedDoubleDown}% +% dotted whole note +\newcommand*{\wholeNoteDotted}[1][]{% + \setkeys{lilyDesignOptions}{scale=1,raise=0.2}% + % Calculate effective scale/raise and the hspace for the dot + \lilySetDotOptions[#1]{0}{0.5}{0.4}% + % Print the rest and then the dot + \wholeNote[#1]\lilyDotSpace\lilyPrintDot } - %%%%%%%%%%%% % half notes @@ -98,7 +70,7 @@ % half note with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\halfNoteDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.6}% \lilyPrintImage[#1]{lily-halfNoteDown}% } @@ -112,7 +84,7 @@ % dotted half note with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\halfNoteDottedDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.6}% \lilyPrintImage[#1]{lily-halfNoteDottedDown}% } @@ -126,18 +98,64 @@ % doubledotted half note with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\halfNoteDottedDoubleDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.6}% \lilyPrintImage[#1]{lily-halfNoteDottedDoubleDown}% } +%%%%%%%%%%% +% crotchets + +% crotchet with upward stem +% created by buildglyphimages.py on 2012-11-06 +\newcommand*{\crotchet}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.25}% + \lilyPrintImage[#1]{lily-crotchet}% +} + +% crotchet with downward stem +% created by buildglyphimages.py on 2012-11-13 +\newcommand*{\crotchetDown}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \lilyPrintImage[#1]{lily-crotchetDown}% +} + +% dotted crotchet with upward stem +% created by buildglyphimages.py on 2012-11-07 +\newcommand*{\crotchetDotted}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.25}% + \lilyPrintImage[#1]{lily-crotchetDotted}% +} + +% dotted crotchet with downward stem +% created by buildglyphimages.py on 2012-11-13 +\newcommand*{\crotchetDottedDown}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \lilyPrintImage[#1]{lily-crotchetDottedDown}% +} + +% doubledotted crotchet with upward stem +% created by buildglyphimages.py on 2012-11-08 +\newcommand*{\crotchetDottedDouble}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.25}% + \lilyPrintImage[#1]{lily-crotchetDottedDouble}% +} + +% doubledotted crotchet with downward stem +% created by buildglyphimages.py on 2012-11-13 +\newcommand*{\crotchetDottedDoubleDown}[1][]{% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \lilyPrintImage[#1]{lily-crotchetDottedDoubleDown}% +} + + %%%%%%%%% % quavers % quaver with upward stem % created by buildglyphimages.py on 2012-11-06 \newcommand*{\quaver}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.25}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.3}% \lilyPrintImage[#1]{lily-quaver}% \hspace*{-0.5ex}% } @@ -145,35 +163,35 @@ % quaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\quaverDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.7}% \lilyPrintImage[#1]{lily-quaverDown}% } % dotted quaver with upward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\quaverDotted}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.3}% \lilyPrintImage[#1]{lily-quaverDotted}% } % dotted quaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\quaverDottedDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.7}% \lilyPrintImage[#1]{lily-quaverDottedDown}% } % doubledotted quaver with upward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\quaverDottedDouble}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.3}% \lilyPrintImage[#1]{lily-quaverDottedDouble}% } % doubledotted quaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\quaverDottedDoubleDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.7}% \lilyPrintImage[#1]{lily-quaverDottedDoubleDown}% } @@ -184,7 +202,7 @@ % semiquaver with upward stem % created by buildglyphimages.py on 2012-11-06 \newcommand*{\semiquaver}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.1}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.15}% \lilyPrintImage[#1]{lily-semiquaver}% \hspace*{-0.4ex}% } @@ -192,34 +210,34 @@ % semiquaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\semiquaverDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.8}% \lilyPrintImage[#1]{lily-semiquaverDown}% } % dotted semiquaver with upward stem % created by buildglyphimages.py on 2012-11-07 \newcommand*{\semiquaverDotted}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.1}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.15}% \lilyPrintImage[#1]{lily-semiquaverDotted}% } % dotted semiquaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\semiquaverDottedDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.8}% \lilyPrintImage[#1]{lily-semiquaverDottedDown}% } % doubledotted semiquaver with upward stem % created by buildglyphimages.py on 2012-11-08 \newcommand*{\semiquaverDottedDouble}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.1}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.15}% \lilyPrintImage[#1]{lily-semiquaverDottedDouble}% } % doubledotted semiquaver with downward stem % created by buildglyphimages.py on 2012-11-13 \newcommand*{\semiquaverDottedDoubleDown}[1][]{% - \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.4}% + \setkeys{lilyDesignOptions}{scale=0.75,raise=-0.8}% \lilyPrintImage[#1]{lily-semiquaverDottedDoubleDown}% } diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/lilyglyphs.sty b/Master/texmf-dist/tex/lualatex/lilyglyphs/lilyglyphs.sty index dc27e2f41cf..7788f40755a 100644 --- a/Master/texmf-dist/tex/lualatex/lilyglyphs/lilyglyphs.sty +++ b/Master/texmf-dist/tex/lualatex/lilyglyphs/lilyglyphs.sty @@ -81,6 +81,8 @@ \input{commands/scripts.inp} +\input{commands/accordion.inp} + % Definitions of complex glyphs created with LilyPond % and included as image files diff --git a/Master/texmf-dist/tex/lualatex/lilyglyphs/pdfs/.gitignore b/Master/texmf-dist/tex/lualatex/lilyglyphs/pdfs/.gitignore deleted file mode 100644 index ef1bca48d65..00000000000 --- a/Master/texmf-dist/tex/lualatex/lilyglyphs/pdfs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# track pdf files in this directory and subdirectories -!*.pdf \ No newline at end of file -- cgit v1.2.3