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

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index 34dbffc849565a5f05a6f4591798756517256607..cc8de79d4b9cd495a819a1fad46eba5d6b71936c 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -17,6 +17,25 @@
 @cindex Petrucci
 @cindex mensural
 
+@menu
+* Introduction to ancient notation::
+* Alternative note signs::
+* Additional note signs::
+* Pre-defined contexts::
+* Transcribing ancient music::
+* Editorial markings::
+@end menu
+
+@node Introduction to ancient notation
+@subsection Introduction to ancient notation
+
+@menu
+* Ancient notation supported::
+@end menu
+
+@node Ancient notation supported
+@subsubsection Ancient notation supported
+
 Support for ancient notation includes features for mensural notation
 and Gregorian Chant notation.  There is also limited support for
 figured bass notation, see @ref{Figured bass}.
@@ -88,23 +107,16 @@ up during the baroque period.
 
 @c Here are all subtopics at a glance:
 
-@menu
-* Alternative note signs for ancient music::
-* Additional note signs for ancient music::
-* Pre-defined contexts::
-* Musica ficta accidentals::
-@end menu
-
-@node Alternative note signs for ancient music
-@subsection Alternative note signs for ancient music
+@node Alternative note signs
+@subsection Alternative note signs
 
 @menu
-* Ancient note heads::          
-* Ancient accidentals::         
-* Ancient rests::               
-* Ancient clefs::               
-* Ancient flags::               
-* Ancient time signatures::     
+* Ancient note heads::
+* Ancient accidentals::
+* Ancient rests::
+* Ancient clefs::
+* Ancient flags::
+* Ancient time signatures::
 @end menu
 
 @node Ancient note heads
@@ -157,7 +169,7 @@ engravers work.
 
 Use the @code{glyph-name-alist} property of grob
 @internalsref{Accidental} and @internalsref{KeySignature} to select
-ancient accidentals. 
+ancient accidentals.
 
 @lilypond[quote,ragged-right,staffsize=26]
 \score {
@@ -645,16 +657,16 @@ The @code{old6/8alt} symbol (an alternate symbol for 6/8) is not
 addressable with @code{\time}.  Use a @code{\markup} instead
 
 
-@node Additional note signs for ancient music
-@subsection Additional note signs for ancient music
+@node Additional note signs
+@subsection Additional note signs
 
 @menu
-* Ancient articulations::       
-* Custodes::                    
-* Divisiones::                  
-* Ligatures::                   
-* White mensural ligatures::    
-* Gregorian square neumes ligatures::  
+* Ancient articulations::
+* Custodes::
+* Divisiones::
+* Ligatures::
+* White mensural ligatures::
+* Gregorian square neumes ligatures::
 @end menu
 
 
@@ -877,8 +889,8 @@ function
 with the same effect and is believed to be stable.
 
 @menu
-* White mensural ligatures::    
-* Gregorian square neumes ligatures::  
+* White mensural ligatures::
+* Gregorian square neumes ligatures::
 @end menu
 
 @node White mensural ligatures
@@ -1927,8 +1939,8 @@ with head prefixes in arbitrary order.
 @subsection Pre-defined contexts
 
 @menu
-* Gregorian Chant contexts::    
-* Mensural contexts::           
+* Gregorian Chant contexts::
+* Mensural contexts::
 @end menu
 
 
@@ -1999,8 +2011,60 @@ demonstrates
 }
 @end lilypond
 
-@node Musica ficta accidentals
-@subsection Musica ficta accidentals
+@node Transcribing ancient music
+@subsection Transcribing ancient music
+
+@menu
+* Ancient and modern from one source::
+* Incipits::
+* Mensurstriche layout::
+* Transcribing Gregorian chant::
+@end menu
+
+
+@node Ancient and modern from one source
+@subsubsection Ancient and modern from one source
+
+@c TODO Add text
+@c Here among others the snippets about reducing note length
+TBC
+
+
+@node Incipits
+@subsubsection Incipits
+
+@c TODO Add text
+@c clefs, mensuration signs etc from lsr and -user
+TBC
+
+
+@node Mensurstriche layout
+@subsubsection Mensurstriche layout
+
+@c TODO Add text
+@c from lsr and -user
+TBC
+
+
+@node Transcribing Gregorian chant
+@subsubsection Transcribing Gregorian chant
+
+@c TODO Add text
+@c extract from 1.6.1.1
+TBC
+
+
+@node Editorial markings
+@subsection Editorial markings
+
+@menu
+* Annotational accidentals::
+* Baroque rhythmic notation::
+@end menu
+
+
+@node Annotational accidentals
+@subsubsection Annotational accidentals
 
 In European music from before about 1600, singers were often
 expected to chromatically alter notes at their own initiative.
@@ -2038,3 +2102,9 @@ Internals Reference: @internalsref{Accidental_engraver} engraver and
 the @internalsref{AccidentalSuggestion} object.
 
 
+@node Baroque rhythmic notation
+@subsubsection Baroque rhythmic notation
+
+@c TODO Add text
+@c try Till Rettig
+TBC
\ No newline at end of file

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 897cd9aa54c3d505456bb2562e913bac0650a81b..39793910eca612236604f52a3607a36224d88b64 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -44,14 +44,13 @@ articulations, just like simple notes:
 <c e g>4 <c>8
 @end lilypond
 
-For more information about chords, see @ref{Introducing chord
-names}.
+For more information about chords, see @ref{Modern chords}.
 
 @seealso
 
 Music Glossary: @rglos{chord}.
 
-Notation Reference: @ref{Introducing chord names}.
+Notation Reference: @ref{Modern chords}.
 
 Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
 

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index 16946ea380e995a088f23360793a473d12894e03..f79adc52914c73282b477dcb18129f6640fab7ab 100644 (file)
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -24,7 +24,7 @@ GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
 $(outdir)/%.itely: %-intro.itely %.snippet-list
        xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
 
-$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES)
+$(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES) $(LY_FILES)
 
 info: $(INFO_FILES)
 

diff --git a/input/lsr/creating-real-parenthesized-dynamics.ly b/input/lsr/creating-real-parenthesized-dynamics.ly
index 53e5dd0642d931625df8fe057b4d76cccfaf06db..cf8867b266ce6fc7c87a313f533ff8a8c069241c 100644 (file)
--- a/input/lsr/creating-real-parenthesized-dynamics.ly
+++ b/input/lsr/creating-real-parenthesized-dynamics.ly
@@ -19,7 +19,7 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}.
 
 
 "
-  doctitle = "Creating "real" parenthesized dynamics"
+  doctitle = "Creating \"real\" parenthesized dynamics"
 } % begin verbatim
 \paper { ragged-right = ##t }