Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

diff --cc scm/documentation-generate.scm
index 5a7939da01fd1fb4db1bb6fd5194b6a3f6160c99,d137ae1b1d27456d167725fff8e3c4ec6967415b..526e9a209364e9eb8cbe87a9cbbeef9cdca45e0f
--- 1/scm/documentation-generate.scm
--- 2/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@@ -72,8 -72,24 +72,24 @@@
  @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}
 +@ref{\\NAME\\,,,lilypond,Notation Reference}
  @cindex \\NAME\\
  @end macro