lilypond-1.3.0

diff --git a/ly/accordion-defs.ly b/ly/accordion-defs.ly
index b4051d111a8e5059271082d6437b6980424e052f..c8caeabfd459a5cd7b28a2693715a100523f1a0b 100644 (file)
--- a/ly/accordion-defs.ly
+++ b/ly/accordion-defs.ly
@@ -6,7 +6,7 @@
 % 16' = S
 %
 
-\scmfile "accordion-script.scm";
+#(eval-string (ly-gulp-file "accordion-script.scm"))
 
 accDiscant = \script "accDiscant"
 accDiscantF = \script "accDiscantF"

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 876dff52139b82896293b82a6144872a22e83d7c..5b02ba912f9ce46da21a2b5c0c74d9fc0c8b6eaa 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -14,7 +14,7 @@
 \def\theinstrument{}
 \def\theopus{}
 \def\thepiece{}
-\def\themetre{}
+\def\themeter{}
 \def\thepoet{}
 %
 % duh.  LaTeX has a \title too.
@@ -25,7 +25,7 @@
 \newcommand*{\instrument}[1]{\def\theinstrument{#1}}
 \newcommand*{\opus}[1]{\def\theopus{#1}}
 \newcommand*{\piece}[1]{\def\thepiece{#1}}
-\newcommand*{\metre}[1]{\def\themetre{#1}}
+\newcommand*{\meter}[1]{\def\themeter{#1}}
 \newcommand*{\poet}[1]{\def\thepoet{#1}}
 %
 \newcommand*{\mudelatitle}[1]{\def\thetitle{#1}}
@@ -35,8 +35,8 @@
 \newcommand*{\mudelainstrument}[1]{\def\theinstrument{#1}}
 \newcommand*{\mudelaopus}[1]{\def\theopus{#1}}
 \newcommand*{\mudelapiece}[1]{\def\thepiece{#1}}
-\newcommand*{\mudelametre}[1]{\def\themetre{#1}}
-\newcommand*{\mudelameter}[1]{\def\themetre{#1}}
+\newcommand*{\mudelametre}[1]{\def\themeter{#1}}
+\newcommand*{\mudelameter}[1]{\def\themeter{#1}}
 \newcommand*{\mudelapoet}[1]{\def\thepoet{#1}}
 %
 %
@@ -53,7 +53,7 @@
   \edef\saveparskip{\parskip}\parskip-5mm
   \begin{minipage}[t]{0.45\textwidth}
         \ifx\mudelanull\thepoet\else{\thepoet}\\ \fi
-        \ifx\mudelanull\themetre\else{\themetre}\\ \fi
+        \ifx\mudelanull\themeter\else{\themeter}\\ \fi
   \end{minipage}\hspace*{\fill}
   \begin{minipage}[t]{0.45\textwidth}
       \begin{flushright}