From b11e28c777fdee74bbe9fce9349ea37a029a06e3 Mon Sep 17 00:00:00 2001 From: Heikki Junes Date: Tue, 29 Jul 2003 12:45:11 +0000 Subject: [PATCH] Use two uppercase letters in LilyPond. --- ChangeLog | 8 ++++++-- Documentation/topdocs/INSTALL.texi | 4 ++-- Documentation/user/latex-example.latex | 6 +++--- .../user/latex-lilypond-example.latex | 10 +++++----- Documentation/user/lilypond-book.itely | 8 ++++---- buildscripts/mf-to-table.py | 2 +- debian/changelog | 4 ++-- input/template/jazz-combo.ly | 2 +- lily/include/lilypond-input-version.hh | 10 +++++----- lily/include/my-lily-lexer.hh | 2 +- lily/lexer.ll | 6 +++--- lily/lilypond-version.cc | 10 +++++----- lilypond-mode.el | 6 +++--- make/lilypond.mandrake.spec.in | 2 +- po/da.po | 2 +- po/es.po | 2 +- po/fr.po | 4 ++-- po/ru.po | 2 +- po/sv.po | 2 +- scm/define-music-types.scm | 2 +- scripts/lilypond-book.py | 20 +++++++++---------- 21 files changed, 59 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ca87e63d..70ad1057f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-07-29 Heikki Junes + + * { many }: Use two uppercase letters in LilyPond. + 2003-07-29 Han-Wen Nienhuys * input/regression/font-name.ly: don't use PS fonts for @@ -702,7 +706,7 @@ m2003-07-15 Han-Wen Nienhuys * lilypond-mode.el, lilypond-indent.el: restrusture and comment paren highlight function definitions. add todo for - Lilypond-show-paren-mode. + LilyPond-show-paren-mode. 2003-07-07 Han-Wen Nienhuys @@ -3079,7 +3083,7 @@ m2003-07-15 Han-Wen Nienhuys 2002-12-09 Heikki Junes - * lilypond-mode.el (LilyPond-kill-job): Kill all Lilypond compiling + * lilypond-mode.el (LilyPond-kill-job): Kill all LilyPond compiling jobs at the same time. Add horizontal lines to Command menu. Allow one compiling job -- propose killing others before a new one. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index b011a475eb..abb37e1de6 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -134,7 +134,7 @@ script automating this has been included, see @subsection Compilation -You need the following packages to compile Lilypond: +You need the following packages to compile LilyPond: @itemize @item The GNU c++ compiler (version 2.95.2 or newer). @@ -551,7 +551,7 @@ LilyPond is available through fink, in the unstable cvs distribution. You need to: @itemize @bullet @item Get the Fink package manager from @uref{http://fink.sourceforge.net}. -@item Get the Lilypond package description by enabling the "unstable" tree +@item Get the LilyPond package description by enabling the "unstable" tree in fink and executing @command{fink selfupdate-cvs}. @end itemize diff --git a/Documentation/user/latex-example.latex b/Documentation/user/latex-example.latex index 68a861072a..d69d815ddf 100644 --- a/Documentation/user/latex-example.latex +++ b/Documentation/user/latex-example.latex @@ -2,8 +2,8 @@ -%\def\preLilypondExample{}} -%\def\postLilypondExample{} +%\def\preLilyPondExample{}} +%\def\postLilyPondExample{} \begin{document} @@ -22,7 +22,7 @@ c d e % generate standard lilypond titles \input titledefs.tex -\def\preLilypondExample{\def\mustmakelilypondtitle{}} +\def\preLilyPondExample{\def\mustmakelilypondtitle{}} \begin{lilypond} \header { diff --git a/Documentation/user/latex-lilypond-example.latex b/Documentation/user/latex-lilypond-example.latex index 72e7e2fd9c..8e29ef42c4 100644 --- a/Documentation/user/latex-lilypond-example.latex +++ b/Documentation/user/latex-lilypond-example.latex @@ -7,8 +7,8 @@ \documentclass[a4paper, 12pt]{article} -%\def\preLilypondExample{} -%\def\postLilypondExample{} +%\def\preLilyPondExample{} +%\def\postLilyPondExample{} %\usepackage{graphics} %\usepackage{landscape} @@ -17,9 +17,9 @@ %\twocolumn -\section{Lilypond-book + LaTeX} +\section{LilyPond-book + LaTeX} -This is an examplefile for mixing Lilypond and Latex. It is also +This is an examplefile for mixing LilyPond and Latex. It is also used to test lilypond-book. View the source to see how it is done. A simple scale: @@ -30,7 +30,7 @@ A simple scale: } \end{lilypond} -Lilypond-book search for the \verb|\score| command when it decides +LilyPond-book search for the \verb|\score| command when it decides if the code is only a fragment. Thus, in the following code, you have to use \verb|fragment| option, because the comment confuses lilypond-book. diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index dcf9d68f2a..5e03f8744c 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -175,11 +175,11 @@ imported by adding the following to the top of the La@TeX{} file: @example \input titledefs.tex -\def\preLilypondExample@{\def\mustmakelilypondtitle@{@}@} +\def\preLilyPondExample@{\def\mustmakelilypondtitle@{@}@} @end example -The music will be surrounded by @code{\preLilypondExample} and -@code{\postLilypondExample}, which are defined to be empty by default. +The music will be surrounded by @code{\preLilyPondExample} and +@code{\postLilyPondExample}, which are defined to be empty by default. @node Integrating HTML and music @section Integrating HTML and music @@ -377,7 +377,7 @@ To add titling from the @code{\header} section of the files, add the following to the top of the La@TeX{} file: @example \input titledefs.tex -\def\preLilypondExample@{\def\mustmakelilypondtitle@{@}@} +\def\preLilyPondExample@{\def\mustmakelilypondtitle@{@}@} @end example @command{lilypond-book} accepts the following command line options: diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index a63cdc0c17..188a0d3dfb 100644 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -156,7 +156,7 @@ def write_fontlist (file, global_info, charmetrics): nm = font_family per_line = 3 file.write (r""" -%% Lilypond file to list all font symbols and the corresponding names +%% LilyPond file to list all font symbols and the corresponding names %% Automatically generated by mf-to-table.py \score{\notes{\fatText\time %d/4 """ % per_line) diff --git a/debian/changelog b/debian/changelog index 093332501f..04c0135542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -168,8 +168,8 @@ lilypond (1.4.5-1) unstable; urgency=low lilypond (1.4.3-1) unstable; urgency=high * New upstream release. - * Urgency high because Lilypond-1.2.17 is too buggy and yet it has - been stuck in testing forever. Lilypond-1.4.x fixes multiple + * Urgency high because LilyPond-1.2.17 is too buggy and yet it has + been stuck in testing forever. LilyPond-1.4.x fixes multiple serious bugs. :-) * Ah, silly me, lilypond was conflicting against itself! I forgot to remove this relics during the switch from lilypond1.3 to lilypond. diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 358350755a..cfbab5b317 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -5,7 +5,7 @@ composer = "Me" meter = "moderato" piece = "Swing" - tagline = "Lilypond example file by Amelie Zapf, Berlin 07/07/2003" + tagline = "LilyPond example file by Amelie Zapf, Berlin 07/07/2003" texidoc = "Jazz tune for combo (horns, piano, drums, bass, guitar)." } diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh index 0aef344dac..1333a556ad 100644 --- a/lily/include/lilypond-input-version.hh +++ b/lily/include/lilypond-input-version.hh @@ -1,5 +1,5 @@ /* - lilypond-version.hh -- declare Lilypond_version + lilypond-version.hh -- declare LilyPond_version source file of the GNU LilyPond music typesetter @@ -12,10 +12,10 @@ #include "string.hh" -struct Lilypond_version +struct LilyPond_version { - Lilypond_version (int major, int minor, int patch); - Lilypond_version (String str); + LilyPond_version (int major, int minor, int patch); + LilyPond_version (String str); String to_string () const; operator int () const; @@ -26,6 +26,6 @@ struct Lilypond_version String extra_patch_string_; }; -extern Lilypond_version oldest_version; +extern LilyPond_version oldest_version; #endif // LILYPOND_VERSION_HH diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index f416eecfa9..f4eae8ca4a 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -25,7 +25,7 @@ bool busy_parsing (); void kill_lexer (); void set_lexer (); -/// lexer for Lilypond +/// lexer for LilyPond class My_lily_lexer : public Includable_lexer { Protected_scm scopes_; diff --git a/lily/lexer.ll b/lily/lexer.ll index 7fc5828206..11dc326517 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -729,14 +729,14 @@ strip_trailing_white (String&s) /* 1.3.146 == removal of ; */ -Lilypond_version oldest_version ("1.3.146"); +LilyPond_version oldest_version ("1.3.146"); bool valid_version_b (String s) { - Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); - Lilypond_version ver (s); + LilyPond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); + LilyPond_version ver (s); if (! ((ver >= oldest_version) && (ver <= current))) { non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ())); diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc index ca293c9a78..3854972714 100644 --- a/lily/lilypond-version.cc +++ b/lily/lilypond-version.cc @@ -1,5 +1,5 @@ /* - lilypond-version.cc -- implement Lilypond_version + lilypond-version.cc -- implement LilyPond_version source file of the GNU LilyPond music typesetter @@ -11,14 +11,14 @@ #include "string-convert.hh" #include "array.hh" -Lilypond_version::Lilypond_version (int major, int minor, int patch) +LilyPond_version::LilyPond_version (int major, int minor, int patch) { major_ = major; minor_ = minor; patch_ = patch; } -Lilypond_version::Lilypond_version (String str) +LilyPond_version::LilyPond_version (String str) { Array version; version = String_convert::split (str, '.'); @@ -34,12 +34,12 @@ Lilypond_version::Lilypond_version (String str) } String -Lilypond_version::to_string () const +LilyPond_version::to_string () const { return ::to_string (major_) + "." + ::to_string (minor_) + "." + ::to_string (patch_); } -Lilypond_version::operator int () const +LilyPond_version::operator int () const { // ugh return 100000 * major_ + 1000 * minor_ + patch_; diff --git a/lilypond-mode.el b/lilypond-mode.el index ca5b3beed6..4d8c228a5e 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -665,7 +665,7 @@ command." (if LilyPond-mode-map () (setq LilyPond-mode-map (make-sparse-keymap)) - ;; Put keys to Lilypond-command-alist and fetch them from there somehow. + ;; Put keys to LilyPond-command-alist and fetch them from there somehow. (define-key LilyPond-mode-map "\C-c\C-l" 'LilyPond-command-lilypond) (define-key LilyPond-mode-map "\C-c\C-r" 'LilyPond-command-region) (define-key LilyPond-mode-map "\C-c\C-b" 'LilyPond-command-buffer) @@ -966,7 +966,7 @@ command." ;;; (let ((file 'LilyPond-command-on-current)) ;;; (mapcar 'LilyPond-command-menu-entry LilyPond-command-alist)) ;;; Some kind of mapping which includes :keys might be more elegant -;;; Put keys to Lilypond-command-alist and fetch them from there somehow. +;;; Put keys to LilyPond-command-alist and fetch them from there somehow. '([ "LilyPond" LilyPond-command-lilypond t]) '([ "TeX" (LilyPond-command (LilyPond-command-menu "TeX") 'LilyPond-master-file) ]) '([ "2Dvi" LilyPond-command-formatdvi t]) @@ -1127,7 +1127,7 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous" (setq zmacs-regions nil) (setq mark-even-if-inactive t)) - ;; Context dependent syntax tables in Lilypond-mode + ;; Context dependent syntax tables in LilyPond-mode (make-local-hook 'post-command-hook) ; XEmacs requires (add-hook 'post-command-hook 'LilyPond-mode-context-set-syntax-table nil t) diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index fff822a448..a37eb2e17d 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -18,7 +18,7 @@ Requires: tetex tetex-latex python chkfontpath info-install XFree86 %description LilyPond is a music typesetter. It produces beautiful sheet music using a -high level description file as input. Lilypond is part of the GNU project. +high level description file as input. LilyPond is part of the GNU project. LilyPond is split into two packages. The package "lilypond" provides the core package, containing the utilities for converting the music source diff --git a/po/da.po b/po/da.po index e97f0d6b36..cbf0f0a0e2 100644 --- a/po/da.po +++ b/po/da.po @@ -1722,7 +1722,7 @@ msgstr "" #: main.cc:198 msgid "GNU LilyPond -- The music typesetter" -msgstr "GNU Lilypond -- Musiktypesætteren" +msgstr "GNU LilyPond -- Musiktypesætteren" #: main.cc:206 #, fuzzy diff --git a/po/es.po b/po/es.po index 58e72aad3e..c0b83b9d36 100644 --- a/po/es.po +++ b/po/es.po @@ -1,4 +1,4 @@ -# Spanish translation of GNU Lilypond - http://lilypond.org +# Spanish translation of GNU LilyPond - http://lilypond.org # Copyright (C) 2002 Free Software Foundation, Inc. # Quique , 2002. # diff --git a/po/fr.po b/po/fr.po index 93956a55c0..da46f865c8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -770,7 +770,7 @@ msgstr "pas de telle configuration: #: ly2dvi.py:274 #, python-format msgid "LilyPond crashed (signal %d)." -msgstr "Lilypond a planté (signal %d)." +msgstr "LilyPond a planté (signal %d)." #: ly2dvi.py:275 msgid "Please submit a bug report to bug-lilypond@gnu.org" @@ -800,7 +800,7 @@ msgstr "Analyse de %s..." #: ly2dvi.py:354 #, python-format msgid "no LilyPond output found for `%s'" -msgstr "aucune sortie de Lilypond n'a été trouvée pour « %s »" +msgstr "aucune sortie de LilyPond n'a été trouvée pour « %s »" #. The final \n seems important here. It ensures that the footers and taglines end up on the right page. #. TODO: should set textheight (enlarge) depending on papersize. diff --git a/po/ru.po b/po/ru.po index 016e188992..d7e17e6421 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1690,7 +1690,7 @@ msgid "" "the GNU Project.\n" msgstr "" "LilyPond - ÐÒÏÇÒÁÍÍÁ ÎÁÂÏÒÁ ÍÕÚÙËÉ. ïÎÁ ÐÒÏÉÚ×ÏÄÉÔ ÐÒÅËÒÁÓÎÕÀ ÍÕÚÙËÕ\n" -"ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. Lilypond\n" +"ÎÁ ÂÕÍÁÇÅ, ÉÓÐÏÌØÚÕÑ ×ÙÓÏËÏÕÒÏ×ÎÅ×ÙÊ ÆÁÊÌ ÏÐÉÓÁÎÉÑ ÎÁ ××ÏÄÅ. LilyPond\n" "Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ðÒÏÅËÔÁ GNU.\n" #: main.cc:182 diff --git a/po/sv.po b/po/sv.po index 186d02ed6a..f07398f0eb 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1728,7 +1728,7 @@ msgstr "" #: main.cc:198 msgid "GNU LilyPond -- The music typesetter" -msgstr "GNU Lilypond -- Musiktypsättaren" +msgstr "GNU LilyPond -- Musiktypsättaren" #: main.cc:206 #, fuzzy diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 546dcca283..0b758bc901 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -53,7 +53,7 @@ arguments to func are 1. the grob, 2. the originating context, . ( (description . "Adds an articulation marking to a note. Syntax: @var{note}@code{X}@code{Y}, where X is a direction (up @code{^}, down -@code{_}, or Lilypond's choice (no direction specified)), and where Y +@code{_}, or LilyPond's choice (no direction specified)), and where Y is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}). See the user manual for details.") diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 43f7b7901c..0ad7860812 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -402,20 +402,20 @@ output_dict= { 'output-small-verbatim': r'''{\small\begin{verbatim} %s\end{verbatim}} ''', - 'output-default-post': "\\def\postLilypondExample{}\n", - 'output-default-pre': "\\def\preLilypondExample{}\n", + 'output-default-post': "\\def\postLilyPondExample{}\n", + 'output-default-pre': "\\def\preLilyPondExample{}\n", 'usepackage-graphics': '\\usepackage{graphics}\n', 'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics{%(fn)s}}', 'output-noinline': r''' %% generated: %(fn)s.eps ''', - 'output-latex-quoted': r'''{\preLilypondExample + 'output-latex-quoted': r'''{\preLilyPondExample \input %(fn)s.tex -\postLilypondExample}''', +\postLilyPondExample}''', 'output-latex-noquote': r'''{\parindent 0pt -\preLilypondExample +\preLilyPondExample \input %(fn)s.tex -\postLilypondExample}''', +\postLilyPondExample}''', 'pagebreak': r'\pagebreak', }, @@ -541,8 +541,8 @@ re_dict = { 'lilypond-file': r'(?m)^[^%\n]*?(?P\\lilypondfile\s*(\[(?P.*?)\])?\s*\{(?P.+)})', 'lilypond' : r'(?m)^[^%\n]*?(?P\\lilypond\s*(\[(?P.*?)\])?\s*{(?P.*?)})', 'lilypond-block': r"(?sm)^[^%\n]*?(?P\\begin\s*(\[(?P.*?)\])?\s*{lilypond}(?P.*?)\\end{lilypond})", - 'def-post-re': r"\\def\\postLilypondExample", - 'def-pre-re': r"\\def\\preLilypondExample", + 'def-post-re': r"\\def\\postLilyPondExample", + 'def-pre-re': r"\\def\\preLilyPondExample", 'usepackage-graphics': r"\usepackage\s*{graphics}", 'intertext': r',?\s*intertext=\".*?\"', 'multiline-comment': no_match, @@ -633,7 +633,7 @@ def error (str): def compose_full_body (body, opts): - '''Construct the lilypond code to send to Lilypond. + '''Construct the lilypond code to send to LilyPond. Add stuff to BODY using OPTS as options.''' music_size = default_music_fontsize if g_force_music_fontsize: @@ -1580,7 +1580,7 @@ for opt in options: elif o == '--outname' or o == '-o': if len (files) > 1: #HACK - sys.stderr.write ("Lilypond-book is confused by --outname on multiple files") + sys.stderr.write ("lilypond-book is confused by --outname on multiple files") sys.exit (1) outname = a elif o == '--help' or o == '-h': -- 2.39.5