Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/es/user/converters.itely b/Documentation/es/user/converters.itely
index d73da3a203a20a5437d06bd1e1e44b1462ca51fb..9370723c56c2bfbf1046d14fc97975e6aedfe8e1 100644 (file)
--- a/Documentation/es/user/converters.itely
+++ b/Documentation/es/user/converters.itely
@@ -137,7 +137,7 @@ pedal.
 @node Invoking musicxml2ly
 @section Invoking @code{musicxml2ly}
 
-@uref{http://@/www.@/recordarde@/.com/xml@/.html,MusicXML} es un
+@uref{http://@/www.@/recordare@/.com/xml@/.html,MusicXML} es un
 dialecto del XML para representar notación musical.
 
 @command{musicxml2ly} extrae las notas de archivos de MusicXML parte a

diff --git a/Documentation/fr/user/converters.itely b/Documentation/fr/user/converters.itely
index 890f3343543c673c0a6bc6feb46117555b3b29c3..3ba2eb22d066f5b30b08ee190d1aa94d9b1a2169 100644 (file)
--- a/Documentation/fr/user/converters.itely
+++ b/Documentation/fr/user/converters.itely
@@ -137,7 +137,7 @@ ajoutez une indication de phrasé ou de pédale.
 @node Invoking musicxml2ly
 @section Invoking @code{musicxml2ly}
 
-@uref{http://@/www.@/recordarde@/.com/xml@/.html,MusicXML} est un
+@uref{http://@/www.@/recordare@/.com/xml@/.html,MusicXML} est un
 dialecte XML pour représenter la notation musicale.
 
 @command{musicxml2ly} extrait des notes à partir de fichiers MusicXML,

diff --git a/Documentation/fr/user/templates.itely b/Documentation/fr/user/templates.itely
index 9a8184245c294010d0ddc1788d4d5f9d0f23ef29..5a5fae013ab99fafa8a889616cb3958f6026ff48 100644 (file)
--- a/Documentation/fr/user/templates.itely
+++ b/Documentation/fr/user/templates.itely
@@ -22,7 +22,7 @@ UNTRANSLATED NODE: IGNORE ME
 * Vocal ensembles::
 * Ancient notation templates::
 * Jazz combo::
-* Lilypond-book templates::
+* lilypond-book templates::
 @end menu 
 @node Single staff
 @appendixsec Single staff
@@ -69,8 +69,8 @@ UNTRANSLATED NODE: IGNORE ME
 
 UNTRANSLATED NODE: IGNORE ME
 
-@node Lilypond-book templates
-@appendixsec Lilypond-book templates
+@node lilypond-book templates
+@appendixsec lilypond-book templates
 
 UNTRANSLATED NODE: IGNORE ME
 

diff --git a/Documentation/user/converters.itely b/Documentation/user/converters.itely
index 1419d606bd9046b3c645e8bd68999a543d3131c8..17bc45a9a7876f28be3ba2b62caebca4d5ba04a4 100644 (file)
--- a/Documentation/user/converters.itely
+++ b/Documentation/user/converters.itely
@@ -127,7 +127,7 @@ to a single duration and add phrase markings or pedal indicators.
 @node Invoking musicxml2ly
 @section Invoking @code{musicxml2ly}
 
-@uref{http://@/www.@/recordarde@/.com/xml@/.html,MusicXML} is an XML dialect
+@uref{http://@/www.@/recordare@/.com/xml@/.html,MusicXML} is an XML dialect
 for representing music notation.
 
 @command{musicxml2ly} extracts the notes from part-wise MusicXML

diff --git a/Documentation/user/pitches.itely b/Documentation/user/pitches.itely
index 3e4e69e30a10f28f14b9768476bb6a56573a8142..78ca74506284b746f9883834ee77c806d0d10259 100644 (file)
--- a/Documentation/user/pitches.itely
+++ b/Documentation/user/pitches.itely
@@ -334,7 +334,7 @@ Music Glossary:
 @rglos{double sharp},
 @rglos{double flat},
 @rglos{Pitch names},
-@rglos{quarter-tone}.
+@rglos{quarter tone}.
 
 Learning Manual:
 @rlearning{Accidentals and key signatures}.

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4c74880ed3b506c6e2a0f6efa94124fbace0a65e..6d01a52da9cb3e1af9f7e59b25b4f119d845ed76 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -713,7 +713,7 @@ d4( c16) cis( d e c cis d) e( d4)
 @cindex phrasing slurs
 @subheading Phrasing slurs
 
-Music Glossary: @rglos{slurs}, @rglos{phrasing}.
+Music Glossary: @rglos{slur}, @rglos{phrasing}.
 
 Slurs to indicate longer @notation{phrasing} can be entered with
 @code{\(} and @code{\)}.  You can have both @notation{slurs}

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 6219ce53c3f3a0de56b2ad3f8ff3d26a4f190f7b..d137ae1b1d27456d167725fff8e3c4ec6967415b 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -72,6 +72,22 @@
 @ifhtml
 @c ***** HTML *****
 
+@ifset bigpage
+
+@macro ruser{TEXT}
+@ref{\\TEXT\\,,,lilypond-big-page,Notation Reference}
+@cindex \\TEXT\\
+@end macro
+
+@macro glossaryref{TEXT}
+@vindex \\TEXT\\
+@ref{\\TEXT\\,,,music-glossary-big-page,Music Glossary}
+@end macro
+
+@end ifset
+
+@ifclear bigpage
+
 @macro ruser{NAME}
 @ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
@@ -82,6 +98,8 @@
 @cindex \\NAME\\
 @end macro
 
+@end ifclear
+
 @macro inputfileref{DIR,NAME}
 @uref{source/\\DIR\\/out-www/collated-files.html#\\NAME\\,@file{\\DIR\\/\\NAME\\}}@c
 @end macro