Merge commit 'origin'

[lilypond.git] / Documentation / user / lilypond.tely

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 850e2a815259c5197864d1a6075b4f24684d37f9..e4c9c6243dc3ff60224aee75e66014dd257d721a 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -68,9 +68,16 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @ifhtml
+@ifclear bigpage
 This document is also available as a
 @uref{source/Documentation/user/lilypond.pdf,PDF} and as
 @uref{source/Documentation/user/lilypond-big-page.html,one big page}.
+@end ifclear
+@ifset bigpage
+This document is also available as a
+@uref{source/Documentation/user/lilypond.pdf,PDF} and as a
+@uref{source/Documentation/user/lilypond/index.html,HTML indexed multiple pages}.
+@end ifset
 @end ifhtml
 
 
@@ -87,7 +94,7 @@ This document is also available as a
 @titlefont{Notation Reference}
 @author The LilyPond development team
 
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -104,7 +111,7 @@ For LilyPond version @version{}
 @end titlepage
 
 @copying
-Copyright @copyright{} 1999--2008 by the authors
+Copyright @copyright{} 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -119,7 +126,7 @@ Free Documentation License''.
 @ifnottex
 This file documents GNU LilyPond.
 
-Copyright 1999--2008 by the authors
+Copyright 1999--2009 by the authors
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -160,6 +167,7 @@ Appendices
 * Literature list::                Reference works about music notation.
 * Notation manual tables::         Tables and charts.
 * Cheat sheet::                    Summary of LilyPond syntax.
+* LilyPond grammar::               Syntax diagram for LilyPond parser.
 * GNU Free Documentation License:: License of this document.
 * LilyPond command index::
 * LilyPond index::
@@ -182,6 +190,14 @@ Appendices
 @include literature.itely
 @include notation-appendices.itely
 @include cheatsheet.itely
+
+@node LilyPond grammar
+@appendix LilyPond grammar
+
+This appendix contains a description of the LilyPond grammar, as
+output from the parser.
+@verbatiminclude ly-grammar.txt
+
 @include fdl.itexi
 
 @node LilyPond command index