Doc: NR Moved Appendix C to CG

Issue 3015

diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index 74d03bd1b7e8fb9a05ba3fbaeee96dcfa49733cd..9541883b74a8cec3fd307c3d70ba3cc59ee6ebc2 100644 (file)
--- a/Documentation/contributor.texi
+++ b/Documentation/contributor.texi
@@ -66,6 +66,7 @@ Copyright @copyright{} 2007--2012 by the authors.
 
 Appendices
 
+* LilyPond grammar::
 * GNU Free Documentation License:: License of this document.
 @end menu
 
@@ -91,7 +92,14 @@ Appendices
 @include contributor/feta-font.itexi
 @include contributor/administration.itexi
 
+@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
 
 @bye
-

diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely
index 65a28c62d272c0cff1d7312901d085e3ec2419d8..a87c6f91f0d3ebe73a65b1b0fc9a85b1b0c62226 100644 (file)
--- a/Documentation/extending/scheme-tutorial.itely
+++ b/Documentation/extending/scheme-tutorial.itely
@@ -660,7 +660,7 @@ Now LilyPond's input is structured into tokens and expressions, much
 like human language is structured into words and sentences.  LilyPond
 has a lexer that recognizes tokens (literal numbers, strings, Scheme
 elements, pitches and so on), and a parser that understands the syntax,
-@ruser{LilyPond grammar}.  Once it knows that a particular syntax rule
+@rcontrib{LilyPond grammar}.  Once it knows that a particular syntax rule
 applies, it executes actions associated with it.
 
 The hash mark@tie{}@code{#} method of embedding Scheme is a natural fit

diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index 098d4f3593a3cb1aea7d783e310761a788987fc8..517c4dc0463a1dcb6185c2b5332fcc78b0fd9be1 100644 (file)
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -58,7 +58,6 @@ Appendices
 
 * 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::
@@ -84,16 +83,6 @@ Appendices
 @include notation/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
 
 

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index e74dae6184639caa4a96455ece846bfe9dca6557..75c12d4e4d28f3ac06784ea8e5287b7322a8cea7 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1530,6 +1530,7 @@ created for midi, layout and paper blocks.
 
 @cindex parser
 @cindex Bison
+@cindex LilyPond grammar
 @cindex grammar for LilyPond
 @cindex BNF
 
@@ -1542,10 +1543,10 @@ cannot be achieved the file is invalid and an appropriate error
 message is produced.  The syntactic groupings and the rules for
 constructing the groupings from their parts for the LilyPond syntax
 are defined in @file{lily/parser.yy} and shown in Backus Normal Form
-(BNF) in @ref{LilyPond grammar}.  This file is used to build the
-parser during the program build by the parser generator, Bison.  It
-is part of the source code and is not included in the LilyPond
-binary installation.
+(BNF) in @rcontrib{LilyPond grammar}.  This file is used to build the
+parser during the program build by the parser generator, Bison.  It is
+part of the source code and is not included in the LilyPond binary
+installation.
 
 
 @node parser variable