From 4ef4476a60ebdb17cd963ed95ee2460f5278e85f Mon Sep 17 00:00:00 2001 From: Heikki Junes Date: Wed, 29 Oct 2003 23:32:59 +0000 Subject: [PATCH] * Documentation/user/lilypond-book.itely * buildscripts/lilypond-login.sh elisp/lilypond-mode.el * input/example-1.ly input/example-2.ly input/example-3.ly * input/les-nereides.ly input/test/fill-a4.ly input/test/spacing-2.ly * input/test/title.ly po/cs.po po/da.po po/de.po po/es.po po/fi.po * po/fr.po po/it.po po/ja.po po/lilypond.pot po/nl.po po/ru.po * po/sv.po scm/output-pdftex.scm scm/output-tex.scm * scripts/lilypond-book.py scripts/lilypond.py * stepmake/bin/package-zip32.sh tex/lilyponddefs.tex tex/titledefs.tex * vimrc: replace ly2dvi with lilypond and remove silly comments. --- ChangeLog | 11 +++++++++++ Documentation/user/lilypond-book.itely | 4 ++-- buildscripts/lilypond-login.sh | 2 +- elisp/lilypond-mode.el | 4 ++-- input/example-1.ly | 2 +- input/example-2.ly | 2 +- input/example-3.ly | 2 +- input/les-nereides.ly | 2 +- input/test/fill-a4.ly | 2 +- input/test/spacing-2.ly | 2 +- input/test/title.ly | 4 ++-- po/cs.po | 14 ++++++-------- po/da.po | 14 ++++++-------- po/de.po | 14 ++++++-------- po/es.po | 14 ++++++-------- po/fi.po | 14 ++++++-------- po/fr.po | 14 ++++++-------- po/it.po | 16 +++++++--------- po/ja.po | 16 +++++++--------- po/lilypond.pot | 14 ++++++-------- po/nl.po | 14 ++++++-------- po/ru.po | 16 +++++++--------- po/sv.po | 14 ++++++-------- scm/output-pdftex.scm | 2 +- scm/output-tex.scm | 2 +- scripts/lilypond-book.py | 3 +-- scripts/lilypond.py | 19 +++++++++---------- stepmake/bin/package-zip32.sh | 2 +- tex/lilyponddefs.tex | 2 +- tex/titledefs.tex | 2 +- vimrc | 4 ++-- 31 files changed, 116 insertions(+), 131 deletions(-) diff --git a/ChangeLog b/ChangeLog index 793f48373c..a75b37fb76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,17 @@ * input/test/lilypond-testpage.ly, Documentation/user/invoking.itexi: new file (renamed, see above). + * Documentation/user/lilypond-book.itely + * buildscripts/lilypond-login.sh elisp/lilypond-mode.el + * input/example-1.ly input/example-2.ly input/example-3.ly + * input/les-nereides.ly input/test/fill-a4.ly input/test/spacing-2.ly + * input/test/title.ly po/cs.po po/da.po po/de.po po/es.po po/fi.po + * po/fr.po po/it.po po/ja.po po/lilypond.pot po/nl.po po/ru.po + * po/sv.po scm/output-pdftex.scm scm/output-tex.scm + * scripts/lilypond-book.py scripts/lilypond.py + * stepmake/bin/package-zip32.sh tex/lilyponddefs.tex tex/titledefs.tex + * vimrc: replace ly2dvi with lilypond and remove silly comments. + 2003-10-29 Mats Bengtsson * scripts/lilypond-book.py (output_dict): Add definition of diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 44e902ac30..3508f9cacf 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -214,9 +214,9 @@ Some music in a line of text. @end example A special feature not (yet) available in other output formats, is the -@code{} tag, for example, +@code{} tag, for example, @example - trip.ly + trip.ly @end example This runs @file{trip.ly} through @code{lilypond} (see also @ref{Invoking lilypond}), and substitutes a preview image in the diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index 8279c4778d..f272e67619 100644 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -13,7 +13,7 @@ set datadir="@local_lilypond_datadir@" # setenv LILYPONDPREFIX "$datadir" -# bit silly. for ly2dvi, overrules compiled-in datadir... +# bit silly. for lilypond, overrules compiled-in datadir... # setenv LILYPONDPREFIX "@local_lilypond_datadir@" # Add the installation directory to the teTeX system tree, diff --git a/elisp/lilypond-mode.el b/elisp/lilypond-mode.el index 51052b9cee..a9c134a4e9 100644 --- a/elisp/lilypond-mode.el +++ b/elisp/lilypond-mode.el @@ -258,9 +258,9 @@ in LilyPond-include-path." killed)) ; return the killed jobs ;; URG, should only run LilyPond-compile for LilyPond -;; not for tex,xdvi (ly2dvi?) +;; not for tex,xdvi (lilypond?) (defun LilyPond-compile-file (command name) - ;; We maybe should know what we run here (Lily, ly2dvi, tex) + ;; We maybe should know what we run here (Lily, lilypond, tex) ;; and adjust our error-matching regex ? (compile-internal (if (eq LilyPond-command-current 'LilyPond-command-master) diff --git a/input/example-1.ly b/input/example-1.ly index 9a4eb65351..d081d44fd4 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -3,7 +3,7 @@ % % Type: % -% ly2dvi example-1 +% lilypond example-1 % xdvi example-1 # or your dvi viewer here % diff --git a/input/example-2.ly b/input/example-2.ly index f4d8e07849..1fc85134f5 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -3,7 +3,7 @@ % % Type: % -% ly2dvi example-2 +% lilypond example-2 % xdvi example-2 # or your dvi viewer here % diff --git a/input/example-3.ly b/input/example-3.ly index 73fa8071c1..f653ae059b 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -23,7 +23,7 @@ two = \notes\relative c{ % % Type: % -% ly2dvi example-3 +% lilypond example-3 % xdvi example-3 # or your dvi viewer here %% diff --git a/input/les-nereides.ly b/input/les-nereides.ly index c3a83f88e5..60d4053119 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -23,7 +23,7 @@ marked with %tweak possibly more impressive to render without tweaks? grep -v tweak input/les-nereides.ly >> lnnt.ly - ly2dvi lnnt.ly + lilypond lnnt.ly %} diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 3cb9bad413..0e81466d5b 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -10,7 +10,7 @@ % % `textheight = 310.0\mm' % -% process this file with ly2dvi, and make sure footskip/headsep are set +% process this file with lilypond, and make sure footskip/headsep are set % at a reasonably (small) value. -- jcn % \header{ texidoc="@cindex Paper a4 Fill diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 97830deb51..2aec4f5fc1 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -26,7 +26,7 @@ texidoc = " \paper { -% linewidth = 5.0 \cm % ly2dvi barfs on -1 +% linewidth = 5.0 \cm % lilypond barfs on -1 linewidth = 8.0 \cm % linewidth = 12.0 \cm } diff --git a/input/test/title.ly b/input/test/title.ly index 3685a4c03d..0701660eb1 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) \version "1.9.8" -% MERGE with ly2dvi- +% MERGE with lilypond- \header { filename = "title.ly" dedication = "dedication" @@ -18,7 +18,7 @@ enteredby = "jcn" source = "urtext" - texidoc ="This test ly2dvi titling. process with ly2dvi, not lilypond-book." + texidoc ="This test lilypond titling. process with lilypond, not lilypond-book." } \score { diff --git a/po/cs.po b/po/cs.po index e688f9e4a0..c2ed7e4eb1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -423,7 +423,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -555,7 +554,7 @@ msgstr "vypisuje z msgid "LaTeX failed." msgstr "Spu¹tìní LaTeXu selhalo" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -659,9 +658,9 @@ msgstr "na p #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -681,7 +680,6 @@ msgstr "na p #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -772,7 +770,7 @@ msgstr "vypisuje #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -842,7 +840,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -861,7 +859,7 @@ msgstr "Zapisuji `%s'..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "pseudofiltr" diff --git a/po/da.po b/po/da.po index ed33e4e40e..0d4b1791f2 100644 --- a/po/da.po +++ b/po/da.po @@ -423,7 +423,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -554,7 +553,7 @@ msgstr "vis garanti og copyright" msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -657,9 +656,9 @@ msgstr "ingen filer angivne p #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -679,7 +678,6 @@ msgstr "ingen filer angivne p #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -770,7 +768,7 @@ msgstr "vis versionsnummer" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -840,7 +838,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -859,7 +857,7 @@ msgstr "Skriver \"%s\"..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" diff --git a/po/de.po b/po/de.po index 162c2cc900..45e68d4f5c 100644 --- a/po/de.po +++ b/po/de.po @@ -420,7 +420,6 @@ msgstr "L #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -545,7 +544,7 @@ msgstr "Gew msgid "LaTeX failed." msgstr "LaTeX scheiterte." -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -648,9 +647,9 @@ msgstr "Keine Dateien auf der Kommandozeile angegeben" #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -670,7 +669,6 @@ msgstr "Keine Dateien auf der Kommandozeile angegeben" #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -755,7 +753,7 @@ msgstr "Versionsnummer ausgeben" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -826,7 +824,7 @@ msgstr "" "Verwende stattdessen Bitmap-Schriftarten. Das wird übel aussehen." #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -845,7 +843,7 @@ msgstr "Schreibe HTML-Men #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "Pseudo-Filter" diff --git a/po/es.po b/po/es.po index 71275fd21d..2fa9efd8c0 100644 --- a/po/es.po +++ b/po/es.po @@ -418,7 +418,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -550,7 +549,7 @@ msgstr "mostrar los avisos de garant msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -654,9 +653,9 @@ msgstr "no se ha especificado ning #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -676,7 +675,6 @@ msgstr "no se ha especificado ning #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -767,7 +765,7 @@ msgstr "mostrar n #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -837,7 +835,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -856,7 +854,7 @@ msgstr "Escribiendo `%s'..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" diff --git a/po/fi.po b/po/fi.po index 5d92d5cacd..db9804d767 100644 --- a/po/fi.po +++ b/po/fi.po @@ -420,7 +420,6 @@ msgstr "Poistetaan tulostustiedosto" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -545,7 +544,7 @@ msgstr "n msgid "LaTeX failed." msgstr "LaTeX epäonnistui." -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -648,9 +647,9 @@ msgstr "tiedostoja ei m #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -670,7 +669,6 @@ msgstr "tiedostoja ei m #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -760,7 +758,7 @@ msgstr "tulosta versionumero" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -831,7 +829,7 @@ msgstr "" "Käytetään bittikarttafonttejan niiden sijasta. Tulos ei näytä hyvältä." #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -850,7 +848,7 @@ msgstr "Kirjoitetan HTML-valikko `%s'..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "valefiltteri" diff --git a/po/fr.po b/po/fr.po index 64fac81503..6d311a0e81 100644 --- a/po/fr.po +++ b/po/fr.po @@ -418,7 +418,6 @@ msgstr "Destruction du fichier de sortie" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -543,7 +542,7 @@ msgstr "afficher la notice de garantie et du droit d'auteur" msgid "LaTeX failed." msgstr "Échec de LaTeX" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -646,9 +645,9 @@ msgstr "aucun fichier sp #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -668,7 +667,6 @@ msgstr "aucun fichier sp #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -757,7 +755,7 @@ msgstr "afficher le num #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -828,7 +826,7 @@ msgstr "" "Utilisation des fontes bitmap à la place. L'apparence sera moins bonne." #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -847,7 +845,7 @@ msgstr " #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "pseudo filtre" diff --git a/po/it.po b/po/it.po index ca1118057d..9f95fab2b1 100644 --- a/po/it.po +++ b/po/it.po @@ -418,7 +418,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -546,7 +545,7 @@ msgstr " -w, --warranty mostra la garanzia e il copyright\n" msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -649,9 +648,9 @@ msgstr "" #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -671,7 +670,6 @@ msgstr "" #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -768,7 +766,7 @@ msgstr "" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -838,7 +836,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -857,7 +855,7 @@ msgstr "Genero le voci..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" @@ -2578,7 +2576,7 @@ msgstr "" #~ msgstr "scrivo il file delle dipendenze: `%s'..." #, fuzzy -#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n" +#~ msgid "Usage: lilypond [OPTIONS]... FILE\n" #~ msgstr "Uso: %s [OPZIONE]... [FILE]" #~ msgid "unconventional key: flats: %d, sharps: %d" diff --git a/po/ja.po b/po/ja.po index 2aecfca7fa..6f1ea52446 100644 --- a/po/ja.po +++ b/po/ja.po @@ -418,7 +418,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -548,7 +547,7 @@ msgstr " msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -651,9 +650,9 @@ msgstr "" #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -673,7 +672,6 @@ msgstr "" #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -767,7 +765,7 @@ msgstr " #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -837,7 +835,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -856,7 +854,7 @@ msgstr " #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" @@ -2615,7 +2613,7 @@ msgstr "" #~ msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø" #, fuzzy -#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n" +#~ msgid "Usage: lilypond [OPTIONS]... FILE\n" #~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]" #~ msgid "unconventional key: flats: %d, sharps: %d" diff --git a/po/lilypond.pot b/po/lilypond.pot index 5f6eb35350..f72effa0a7 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -420,7 +420,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -545,7 +544,7 @@ msgstr "" msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -648,9 +647,9 @@ msgstr "" #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -670,7 +669,6 @@ msgstr "" #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -759,7 +757,7 @@ msgstr "" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -828,7 +826,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -847,7 +845,7 @@ msgstr "" #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" diff --git a/po/nl.po b/po/nl.po index 22e4b33af3..065d8a9300 100644 --- a/po/nl.po +++ b/po/nl.po @@ -430,7 +430,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -561,7 +560,7 @@ msgstr "toon garantie en auteursrechten" msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -665,9 +664,9 @@ msgstr "geen bestanden gespecificeerd op de commandoregel." #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -687,7 +686,6 @@ msgstr "geen bestanden gespecificeerd op de commandoregel." #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -778,7 +776,7 @@ msgstr "druk versienummer af" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -848,7 +846,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -867,7 +865,7 @@ msgstr "Schrijven van `%s'..." #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" diff --git a/po/ru.po b/po/ru.po index a4dc3fdcc1..1535541f50 100644 --- a/po/ru.po +++ b/po/ru.po @@ -419,7 +419,6 @@ msgstr "" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -549,7 +548,7 @@ msgstr " msgid "LaTeX failed." msgstr "" -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -652,9 +651,9 @@ msgstr "" #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -674,7 +673,6 @@ msgstr "" #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -765,7 +763,7 @@ msgstr " #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -835,7 +833,7 @@ msgid "" msgstr "" #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -854,7 +852,7 @@ msgstr " #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "" @@ -2530,7 +2528,7 @@ msgstr "" #~ msgstr "óÏÏÂÝÁÊÔÅ Ï ÏÛÉÂËÁÈ ÐÏ %s." #, fuzzy -#~ msgid "Usage: ly2dvi [OPTIONS]... FILE\n" +#~ msgid "Usage: lilypond [OPTIONS]... FILE\n" #~ msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]" #~ msgid "unconventional key: flats: %d, sharps: %d" diff --git a/po/sv.po b/po/sv.po index 7cca357ff4..ddfb4ea873 100644 --- a/po/sv.po +++ b/po/sv.po @@ -422,7 +422,6 @@ msgstr "Tar bort utdatafilen" #. temp_dir = os.path.join (original_dir, '%s.dir' % program_name) #. urg #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond-book.py:120 @@ -548,7 +547,7 @@ msgstr "visa garanti och copyright" msgid "LaTeX failed." msgstr "LaTeX misslyckades." -#. URG see ly2dvi +#. URG see lilypond #. Convert numeric values, with or without specific dimension, to floats. #. Keep other strings #. ############################################################### @@ -651,9 +650,9 @@ msgstr "inga filer angivna p #. #. (c) 1998--2003 Han-Wen Nienhuys #. Jan Nieuwenhuizen -#. This is the third incarnation of ly2dvi. +#. This is the third incarnation of lilypond. #. -#. Earlier incarnations of ly2dvi were written by +#. Earlier incarnations of lilypond were written by #. Jeffrey B. Reed (Python version) #. Jan Arne Fagertun (Bourne shell script) #. @@ -673,7 +672,6 @@ msgstr "inga filer angivna p #. if __name__ == '__main__': #. lilylib globals #. # FIXME -#. # ly2dvi: silly name? #. # do -P or -p by default? #. #help_summary = _ ("Run LilyPond using LaTeX for titling") #: lilypond.py:121 @@ -763,7 +761,7 @@ msgstr "visa versionsnummer" #. init to empty; values here take precedence over values in the file #. # TODO: change name. #. for geometry v3 -#. Output formats that ly2dvi should create +#. Output formats that lilypond should create #. what a name. #. ly.warning (_ ("invalid value: %s") % `val`) #. ly.warning (_ ("invalid value: %s") % `val`) @@ -834,7 +832,7 @@ msgstr "" "Använder punkttypsnitt istället. Det kommer att se dåligt ut." #. ugh. Different targets? -#. Added as functionality to ly2dvi, because ly2dvi may well need to do this +#. Added as functionality to lilypond, because lilypond may well need to do this #. in future too. #. no ps header? #: lilypond.py:615 @@ -853,7 +851,7 @@ msgstr "Skriver HTML-meny \"%s\"" #. path. #. As a neat trick, add directory part of first input file #. to include path. That way you can do without the clumsy -I in: -#. ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +#. lilypond -I foe/bar/baz foo/bar/baz/baz.ly #: lilypond.py:769 msgid "pseudo filter" msgstr "pseudofilter" diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm index 1a325fc2c4..3ecd63b726 100644 --- a/scm/output-pdftex.scm +++ b/scm/output-pdftex.scm @@ -165,7 +165,7 @@ "\\lilypondpostscript\n" "\\pdfcompresslevel=0")) -;; Note: this string must match the string in ly2dvi.py!!! +;; Note: this string must match the string in lilypond.py!!! (define (header creator generate) (string-append "% Generated automatically by: " creator generate "\n")) diff --git a/scm/output-tex.scm b/scm/output-tex.scm index 54ea6318e8..c4395f1923 100644 --- a/scm/output-tex.scm +++ b/scm/output-tex.scm @@ -179,7 +179,7 @@ "\\lilypondspecial\n" "\\lilypondpostscript\n")) -;; Note: this string must match the string in ly2dvi.py!!! +;; Note: this string must match the string in lilypond.py!!! (define (header creator generate) (string-append "% Generated automatically by: " creator generate "\n")) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 0b289eae4f..f6358cc133 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -113,7 +113,6 @@ original_dir = os.getcwd () preview_resolution = 90 ## FIXME -## ly2dvi: silly name? ## do -P or -p by default? ##help_summary = _ ("Run LilyPond using LaTeX for titling") help_summary = _ ("Process LilyPond snippets in hybrid html, LaTeX or texinfo document") @@ -228,7 +227,7 @@ class LatexPaper: ly.error (_ ("LaTeX failed.")) ly.error (_ ("The error log is as follows:")) - #URG see ly2dvi + #URG see lilypond try: lns = open ('lily-tmp.log').readlines () except: diff --git a/scripts/lilypond.py b/scripts/lilypond.py index 20270944b1..74e33482a9 100644 --- a/scripts/lilypond.py +++ b/scripts/lilypond.py @@ -9,9 +9,9 @@ # (c) 1998--2003 Han-Wen Nienhuys # Jan Nieuwenhuizen -# This is the third incarnation of ly2dvi, now renamed lilypond. +# This is the third incarnation of lilypond, now renamed lilypond. # -# Earlier incarnations of ly2dvi were written by +# Earlier incarnations of lilypond were written by # Jeffrey B. Reed (Python version) # Jan Arne Fagertun (Bourne shell script) # @@ -56,10 +56,10 @@ TODO: * Introduce verbosity levels - 0 = QUIET: mute all command output, no ly2dvi progress - 1 = BRIEF: mute all command output, only ly2dvi progress - 2a = NORMAL: show only LilyPond command output, show ly2dvi progress - 2b = NORMAL: show command output, show ly2dvi progress + 0 = QUIET: mute all command output, no lilypond progress + 1 = BRIEF: mute all command output, only lilypond progress + 2a = NORMAL: show only LilyPond command output, show lilypond progress + 2b = NORMAL: show command output, show lilypond progress 3 = VERBOSE: show command output, run lilypond --verbose 4 = DEBUGGING: show all command output, run lilypond --verbose, print environment and all kinds of client side debugging stuff @@ -115,7 +115,6 @@ preview_resolution = 90 debug_p = 0 ## FIXME -## ly2dvi: silly name? ## do -P or -p by default? ##help_summary = _ ("Run LilyPond using LaTeX for titling") help_summary = _ ("Run LilyPond, add titles, generate printable document.") @@ -205,7 +204,7 @@ paper_p = 1 output_name = '' -# Output formats that ly2dvi should create +# Output formats that lilypond should create targets = ['DVI', 'LATEX', 'MIDI', 'TEX', 'PDF', 'PS'] track_dependencies_p = 0 @@ -616,7 +615,7 @@ def find_file_in_path (path, name): if name in os.listdir (d): return os.path.join (d, name) -# Added as functionality to ly2dvi, because ly2dvi may well need to do this +# Added as functionality to lilypond, because lilypond may well need to do this # in future too. PS = '%!PS-Adobe' def find_pfa_fonts (name): @@ -766,7 +765,7 @@ include_path.insert (0, '.') # As a neat trick, add directory part of first input file # to include path. That way you can do without the clumsy -I in: -# ly2dvi -I foe/bar/baz foo/bar/baz/baz.ly +# lilypond -I foe/bar/baz foo/bar/baz/baz.ly if files and files[0] != '-' and os.path.dirname (files[0]) != '.': include_path.append (os.path.dirname (files[0])) diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh index 788763e3a6..75039f9504 100644 --- a/stepmake/bin/package-zip32.sh +++ b/stepmake/bin/package-zip32.sh @@ -108,7 +108,7 @@ cp -r $GUILE_SCM $distdir/share/lilypond # # Rename python files to .py # -mv $distdir/bin/ly2dvi $distdir/bin/ly2dvi.py +mv $distdir/bin/lilypond $distdir/bin/lilypond.py mv $distdir/bin/convert-mudela $distdir/bin/convert-mudela.py mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 879dacc9a9..515e8811ec 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -174,7 +174,7 @@ {\gdef\lilypondpaperinterscorelinefill{0}} {\gdef\lilypondpaperinterscorelinefill{1}} -%% Allow overriding of interscoreline, eg for ly2dvi --preview +%% Allow overriding of interscoreline, eg for lilypond --preview \lilypondifundefined{interscoreline} {\gdef\interscoreline{ \vskip \lilypondpaperinterscoreline \lilypondpaperunit diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 9894742ba4..73e4628d5b 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -159,7 +159,7 @@ \fi } -% Moved header and footer definitions here from the ly2dvi script. +% Moved header and footer definitions here from the lilypond script. % Separate page styles for first, last and ordinary (plain) pages. \makeatletter diff --git a/vimrc b/vimrc index c37ee866e4..7cfa170a40 100644 --- a/vimrc +++ b/vimrc @@ -5,10 +5,10 @@ set shiftwidth=2 " some handy key mappings " " save & make and play midi -map :w:se makeprg=ly2dvi\ -m\ %<:make:!timidity %<.midi +map :w:se makeprg=lilypond\ -m\ %<:make:!timidity %<.midi " " save & make dvi, midi, ps -map :w:se makeprg=ly2dvi\ -P\ %<:make +map :w:se makeprg=lilypond\ -P\ %<:make " " view ps map :!gv -watch %<.ps & -- 2.39.2