Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Reordering of single-staff polyphony.
  Tiny updates
  Mark reorder plan for Simultaneous
  Typo
  Fix octave in example
  Better explaination of implicit and explicit voices.
  Reword and added example from Carl.

diff --git a/Documentation/TRANSLATION b/Documentation/TRANSLATION
index 5ffe6f1b905cf8ac36b33a0112cc7586bd3a45bf..455653cdeae0b841a27749ed08d57c84604ab65b 100644 (file)
--- a/Documentation/TRANSLATION
+++ b/Documentation/TRANSLATION
@@ -397,13 +397,17 @@ between files, without updating contents itself.  In other words, the
 game is catching where has gone each section.  In Learning manual, and
 in Notation Reference sections which have been revised in GDP, there
 may be completely new sections: in this case, copy @node and
-@section-command from English docs, and put the usual tricky line
-'UNTRANSLATED NODE: IGNORE ME'.  Note that it is not possible to
-exactly match subsections or subsubsections of documentation in
-English, when contents has been deeply revised; in this case, kee
-obsolete (sub)subsections in the translation.
+@section-command from English docs, and add the marker for
+untranslated status '@untranslated' on a single line.  Note that it is
+not possible to exactly match subsections or subsubsections of
+documentation in English, when contents has been deeply revised; in
+this case, keep obsolete (sub)subsections in the translation, marking
+them with a line '@c obsolete' just before the node.
 
-* Hints for Emacs users (without Emacs AucTeX installed)
+4) update sections finished in GDP; check sections status at GDP website.
+
+
+* Hints for Emacs users
 
 Emacs with Texinfo mode makes this step easier:
 

diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely
index 77cfa539570e6d3d0b0d7ce35d41dd96619b2a7d..5c549d300a8160d0c3d0e06a9862e13906422091 100644 (file)
--- a/Documentation/de/user/ancient.itely
+++ b/Documentation/de/user/ancient.itely
@@ -13,7 +13,7 @@
 @node Ancient notation
 @section Ancient notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Introduction to ancient notation::
@@ -28,7 +28,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Introduction to ancient notation
 @subsection Introduction to ancient notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Ancient notation supported::
@@ -38,13 +38,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Ancient notation supported
 @subsubsection Ancient notation supported
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Alternative note signs
 @subsection Alternative note signs
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Ancient note heads::
@@ -610,7 +610,7 @@ eine Textbeschriftung (@code{\markup}).
 @node Additional note signs
 @subsection Additional note signs
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Ancient articulations::
@@ -1894,7 +1894,7 @@ Präfixen in arbiträrer Reihenfolge notiert werden kann.
 @node Pre-defined contexts
 @subsection Pre-defined contexts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Gregorian chant contexts::
@@ -1974,7 +1974,7 @@ werden kann. Siehe das folgende Beispiel:
 @node Transcribing ancient music
 @subsection Transcribing ancient music
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Ancient and modern from one source::
@@ -1987,31 +1987,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Ancient and modern from one source
 @subsubsection Ancient and modern from one source
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Incipits
 @subsubsection Incipits
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Mensurstriche layout
 @subsubsection Mensurstriche layout
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Transcribing Gregorian chant
 @subsubsection Transcribing Gregorian chant
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Editorial markings
 @subsection Editorial markings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Annotational accidentals::
@@ -2053,5 +2053,5 @@ Programmreferenz: @rinternals{Accidental_engraver}-Setzer und das
 @node Baroque rhythmic notation
 @subsubsection Baroque rhythmic notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/de/user/changing-defaults.itely b/Documentation/de/user/changing-defaults.itely
index 9a4b13c96bc5cb0fba8c0a20552987a71256c658..9672e1723e041970360fb5f3e0f397ac681a18be 100644 (file)
--- a/Documentation/de/user/changing-defaults.itely
+++ b/Documentation/de/user/changing-defaults.itely
@@ -11,435 +11,345 @@
 @node Changing defaults
 @chapter Changing defaults
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Interpretation contexts::
-* Explaining the Internals Reference::
-* Modifying properties::
-* Useful concepts and properties::
-* Common properties::
-* Advanced tweaks::
-* Discussion of specific tweaks::
+* Interpretation contexts::     
+* Explaining the Internals Reference::  
+* Modifying properties::        
+* Useful concepts and properties::  
+* Common properties::           
+* Advanced tweaks::             
+* Discussion of specific tweaks::  
 @end menu
 
 @node Interpretation contexts
 @section Interpretation contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Contexts explained::
-* Creating contexts::
-* Modifying context plug-ins::
-* Changing context default settings::
-* Defining new contexts::
-* Aligning contexts::
+* Contexts explained::          
+* Creating contexts::           
+* Modifying context plug-ins::  
+* Changing context default settings::  
+* Defining new contexts::       
+* Aligning contexts::           
 @end menu
 
 @node Contexts explained
 @subsection Contexts explained
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Score - the master of all contexts::
-* Top-level contexts - staff containers::
-* Intermediate-level contexts - staves::
-* Bottom-level contexts - voices::
+* Score - the master of all contexts::  
+* Top-level contexts - staff containers::  
+* Intermediate-level contexts - staves::  
+* Bottom-level contexts - voices::  
 @end menu
 
 @node Score - the master of all contexts
 @unnumberedsubsubsec Score - the master of all contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Top-level contexts - staff containers
 @unnumberedsubsubsec Top-level contexts - staff containers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Intermediate-level contexts - staves
 @unnumberedsubsubsec Intermediate-level contexts - staves
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Bottom-level contexts - voices
 @unnumberedsubsubsec Bottom-level contexts - voices
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Creating contexts
 @subsection Creating contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Modifying context plug-ins
 @subsection Modifying context plug-ins
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing context default settings
 @subsection Changing context default settings
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Defining new contexts
 @subsection Defining new contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Aligning contexts
 @subsection Aligning contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explaining the Internals Reference
 @section Explaining the Internals Reference
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Navigating the program reference::
-* Layout interfaces::
-* Determining the grob property::
-* Naming conventions::
+* Navigating the program reference::  
+* Layout interfaces::           
+* Determining the grob property::  
+* Naming conventions::          
 @end menu
 
 @node Navigating the program reference
 @subsection Navigating the program reference
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Layout interfaces
 @subsection Layout interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Determining the grob property
 @subsection Determining the grob property
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Naming conventions
 @subsection Naming conventions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Modifying properties
 @section Modifying properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Overview of modifying properties::
-* The \set command::
-* The \override command::
-* \set versus \override::
-* Objects connected to the input::
+* Overview of modifying properties::  
+* The set command::             
+* The override command::        
+* set versus override::         
+* The tweak command::           
 @end menu
 
 @node Overview of modifying properties
 @subsection Overview of modifying properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
-@node The \set command
+@node The set command
 @subsection The @code{\set} command
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
-@node The \override command
+@node The override command
 @subsection The @code{\override} command
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
-@node \set versus \override
+@node set versus override
 @subsection @code{\set} vs. @code{\override}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
-@node Objects connected to the input
-@subsection Objects connected to the input
+@node The tweak command
+@subsection The @code{\tweak} command
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Useful concepts and properties
 @section Useful concepts and properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Input modes::
-* Direction and placement::
-* Distances and measurements::
-* Spanners::
+* Input modes::                 
+* Direction and placement::     
+* Distances and measurements::  
+* Spanners::                    
 @end menu
 
 @node Input modes
 @subsection Input modes
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Direction and placement
 @subsection Direction and placement
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Distances and measurements
 @subsection Distances and measurements
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Spanners
 @subsection Spanners
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Common properties
 @section Common properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Controlling visibility of objects::
-* Line styles::
-* Rotating objects::
-* Aligning objects::
+* Controlling visibility of objects::  
+* Line styles::                 
+* Rotating objects::            
+* Aligning objects::            
 @end menu
 
 @node Controlling visibility of objects
 @subsection Controlling visibility of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Removing the stencil::
-* Making objects transparent::
-* Painting objects white::
-* Using break-visibility::
-* Special considerations::
+* Removing the stencil::        
+* Making objects transparent::  
+* Painting objects white::      
+* Using break-visibility::      
+* Special considerations::      
 @end menu
 
 @node Removing the stencil
 @unnumberedsubsubsec Removing the stencil
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Making objects transparent
 @unnumberedsubsubsec Making objects transparent
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Painting objects white
 @unnumberedsubsubsec Painting objects white
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using break-visibility
 @unnumberedsubsubsec Using break-visibility
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Special considerations
 @unnumberedsubsubsec Special considerations
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Line styles
 @subsection Line styles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Rotating objects
 @subsection Rotating objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Aligning objects
 @subsection Aligning objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Advanced tweaks
 @section Advanced tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* Vertical grouping of grobs::
-* Modifying ends of spanners::
-* Modifying stencils::
-* Modifying shapes::
+* Vertical grouping of grobs::  
+* Modifying ends of spanners::  
+* Modifying stencils::          
+* Modifying shapes::            
 @end menu
 
 @node Vertical grouping of grobs
 @subsection Vertical grouping of grobs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Modifying ends of spanners
 @subsection Modifying ends of spanners
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Modifying stencils
 @subsection Modifying stencils
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Modifying shapes
 @subsection Modifying shapes
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Discussion of specific tweaks
 @section Discussion of specific tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
-* old Contexts explained::
+* old Contexts explained::      
 @end menu
 
 @node old Contexts explained
 @subsection old Contexts explained
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/chords.itely b/Documentation/de/user/chords.itely
index 9fd209e208f205b15946a67c5d8c013a86c338b6..fd7fb6d8da25aca6747a38d971945eed1f6e7bfa 100644 (file)
--- a/Documentation/de/user/chords.itely
+++ b/Documentation/de/user/chords.itely
@@ -12,7 +12,7 @@
 @node Chord notation
 @section Chord notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Chord mode::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Chord mode
 @subsection Chord mode
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Chord mode overview::
@@ -228,12 +228,12 @@ weil @code{5+} als letztes kommt.
 @node Extended and altered chords
 @unnumberedsubsubsec Extended and altered chords
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Displaying chords
 @subsection Displaying chords
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Printing chord names::
@@ -445,12 +445,12 @@ wenn die Akkorde mit der @code{< ... >} Syntax notiert werden.
 @node Customizing chord names
 @unnumberedsubsubsec Customizing chord names
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Figured bass
 @subsection Figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Introduction to figured bass::
@@ -659,9 +659,9 @@ Programmreferenz: @rinternals{NewBassFigure}-,
 @node Entering figured bass
 @unnumberedsubsubsec Entering figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Displaying figured bass
 @unnumberedsubsubsec Displaying figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated

diff --git a/Documentation/de/user/converters.itely b/Documentation/de/user/converters.itely
index 846ceff6d02f0e72190584fd4a66289da9d44c90..0ade506a79208ed399ac53116d87cfe047376731 100644 (file)
--- a/Documentation/de/user/converters.itely
+++ b/Documentation/de/user/converters.itely
@@ -11,9 +11,7 @@
 @node Converting from other formats
 @chapter Converting from other formats
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -27,41 +25,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Invoking midi2ly
 @section Invoking @command{midi2ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Invoking musicxml2ly
 @section Invoking @code{musicxml2ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Invoking abc2ly
 @section Invoking @code{abc2ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Invoking etf2ly
 @section Invoking @command{etf2ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Generating LilyPond files
 @section Generating LilyPond files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/editorial.itely b/Documentation/de/user/editorial.itely
index 9c90b530e6ab04f96468a0f92aba981a506431a8..2550e858e0f75f348a45376a505bfe8ed69450b2 100644 (file)
--- a/Documentation/de/user/editorial.itely
+++ b/Documentation/de/user/editorial.itely
@@ -35,7 +35,7 @@
 @node Selecting notation font size
 @unnumberedsubsubsec Selecting notation font size
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Fingering instructions
@@ -103,19 +103,19 @@ Beispiele:
 @node Hidden notes
 @unnumberedsubsubsec Hidden notes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Coloring objects
 @unnumberedsubsubsec Coloring objects
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Parentheses
 @unnumberedsubsubsec Parentheses
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Stems
@@ -164,16 +164,16 @@ a4 b c b
 @node Balloon help
 @unnumberedsubsubsec Balloon help
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Grid lines
 @unnumberedsubsubsec Grid lines
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Analysis brackets
 @unnumberedsubsubsec Analysis brackets
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated

diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely
index 15bfb280618fd7dfba403db968aa1b29a940ff3c..7a8f4b1f14e811cc98e521b0af0f8f0a36113a73 100644 (file)
--- a/Documentation/de/user/expressive.itely
+++ b/Documentation/de/user/expressive.itely
@@ -305,7 +305,7 @@ Vertikale Positionierung der Symbole wird von der Eigenschaft
 @node New dynamic marks
 @subsubsection New dynamic marks
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Curves

diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely
index c6ec8b9a1f3f4e1fcec68b8fbae418967a889143..a32c4b4a308a53d9a00bcf8aca0f67fbdcbc8df4 100644 (file)
--- a/Documentation/de/user/fretted-strings.itely
+++ b/Documentation/de/user/fretted-strings.itely
@@ -12,7 +12,7 @@
 @node Fretted string instruments
 @section Fretted string instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for fretted strings::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for fretted strings
 @subsection Common notation for fretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for fretted strings::
@@ -37,7 +37,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for fretted strings
 @subsubsection References for fretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node String number indications
 @subsubsection String number indications
@@ -311,7 +311,7 @@ Program reference: @rinternals{StrokeFinger}
 @node Guitar
 @subsection Guitar
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Guitar tablatures::
@@ -321,7 +321,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Guitar tablatures
 @subsubsection Guitar tablatures
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Indicating position and barring
 @subsubsection Indicating position and barring
@@ -350,7 +350,7 @@ gezeigt.
 @node Banjo
 @subsection Banjo
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Banjo tablatures::

diff --git a/Documentation/de/user/fundamental.itely b/Documentation/de/user/fundamental.itely
index 0f5c3101f79c947fa02ab562f67a5c62559bc8ec..ff65642a03467e7c6474cedbb74bfc767826c2b1 100644 (file)
--- a/Documentation/de/user/fundamental.itely
+++ b/Documentation/de/user/fundamental.itely
@@ -150,7 +150,7 @@ im Kapitel @ruser{File structure}.
 @node Introduction to the LilyPond file structure
 @subsection Introduction to the LilyPond file structure
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Score is a (single) compound musical expression
 @subsection Score is a (single) compound musical expression
@@ -298,18 +298,18 @@ gleichen Stelle beginnt.
 @node Nesting music expressions
 @subsection Nesting music expressions
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @ 
 @node On the un-nestedness of brackets and ties
 @subsection On the un-nestedness of brackets and ties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Voices contain music
 @section Voices contain music
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu 
 * I'm hearing Voices::
@@ -319,22 +319,22 @@ UNTRANSLATED NODE: IGNORE ME
 @node I'm hearing Voices
 @subsection I'm hearing Voices
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Explicitly instantiating voices
 @subsection Explicitly instantiating voices
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Voices and vocals
 @subsection Voices and vocals
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Contexts and engravers
 @section Contexts and engravers
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu 
 * Contexts explained::
@@ -347,32 +347,32 @@ UNTRANSLATED NODE: IGNORE ME
 @node Contexts explained
 @subsection Contexts explained
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Creating contexts
 @subsection Creating contexts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Engravers explained
 @subsection Engravers explained
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Modifying context properties
 @subsection Modifying context properties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Adding and removing engravers
 @subsection Adding and removing engravers
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Extending the templates
 @section Extending the templates
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu 
 * Soprano and cello::
@@ -383,15 +383,15 @@ UNTRANSLATED NODE: IGNORE ME
 @node Soprano and cello
 @subsection Soprano and cello
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Four-part SATB vocal score
 @subsection Four-part SATB vocal score
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Building a score from scratch
 @subsection Building a score from scratch
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/de/user/input.itely b/Documentation/de/user/input.itely
index ef6ad14aeb59273232f3f85516704be703619751..84523f9077c200a7b2be3c1fdad534c8e9823ef3 100644 (file)
--- a/Documentation/de/user/input.itely
+++ b/Documentation/de/user/input.itely
@@ -12,9 +12,7 @@
 @node General input and output
 @chapter General input and output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input structure
 @section Input structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -42,33 +38,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Structure of a score
 @subsection Structure of a score
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multiple scores in a book
 @subsection Multiple scores in a book
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node File structure
 @subsection File structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Titles and headers
 @section Titles and headers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -81,41 +69,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Creating titles
 @subsection Creating titles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Custom titles
 @subsection Custom titles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Reference to page numbers
 @subsection Reference to page numbers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Table of contents
 @subsection Table of contents
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Working with input files
 @section Working with input files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -128,17 +106,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Including LilyPond files
 @subsection Including LilyPond files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Different editions from one source
 @subsection Different editions from one source
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -149,9 +123,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Using variables
 @unnumberedsubsubsec Using variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using tags
@@ -200,25 +172,19 @@ Prozent-Wiederholungen benutzt werden. Zum Beispiel:
 @node Text encoding
 @subsection Text encoding
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Displaying LilyPond notation
 @subsection Displaying LilyPond notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Controlling output
 @section Controlling output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -229,25 +195,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Extracting fragments of music
 @subsection Extracting fragments of music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Skipping corrected music
 @subsection Skipping corrected music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node MIDI output
 @section MIDI output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -261,26 +221,20 @@ UNTRANSLATED NODE: IGNORE ME
 @node Creating MIDI files
 @subsection Creating MIDI files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Instrument names
 @node MIDI block
 @subsection MIDI block
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node What goes into the MIDI output?
 @subsection What goes into the MIDI output?
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Supported in MIDI
@@ -288,17 +242,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Repeats in MIDI
 @subsection Repeats in MIDI
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Controlling MIDI dynamics
 @subsection Controlling MIDI dynamics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Dynamic marks

diff --git a/Documentation/de/user/install.itely b/Documentation/de/user/install.itely
index 05980d756143b4bb6253087c21e14290efb4b4f4..c5f0fed16a0135b077ce94ad01e8268811c88219 100644 (file)
--- a/Documentation/de/user/install.itely
+++ b/Documentation/de/user/install.itely
@@ -11,9 +11,7 @@
 @node Install
 @chapter Install
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -24,18 +22,14 @@ UNTRANSLATED NODE: IGNORE ME
 @node Precompiled binaries
 @section Precompiled binaries
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subsection Downloading
 @node Compiling from source
 @section Compiling from source
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -50,17 +44,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Downloading source code
 @subsection Downloading source code
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Requirements
 @subsection Requirements
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Compilation
@@ -69,9 +59,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Building LilyPond
 @subsection Building LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Compiling
@@ -80,9 +68,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Building documentation
 @subsection Building documentation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -93,33 +79,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Commands for building documentation
 @unnumberedsubsubsec Commands for building documentation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Building documentation without compiling LilyPond
 @unnumberedsubsubsec Building documentation without compiling LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Testing LilyPond
 @subsection Testing LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Problems
 @subsection Problems
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Bison 1.875

diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely
index 10e862dfb1e380ab8c5d49f4a2f3e627c0b4d19a..906823783932fd3bc31c9587d3734c0d6f26e9ad 100644 (file)
--- a/Documentation/de/user/keyboards.itely
+++ b/Documentation/de/user/keyboards.itely
@@ -34,9 +34,7 @@
 @node References for keyboards
 @subsubsection References for keyboards
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -77,7 +75,7 @@ manuell erzielt werden. Die Zeichenkette @var{Systembezeichnung} ist die
 Bezeichnung des Systems. Damit wird die aktuelle Stimme vom aktuellen 
 System zu dem System mit der @var{Systembezeichnung} gewechselt. 
 Üblicherweise ist die Systembezeichnung @code{"up"} oder
-@code{"down"}.  Dieses System (@context{Staff}), auf das verweisen wird, 
+@code{"down"}.  Dieses System (@code{Staff}), auf das verweisen wird, 
 muss auch wirklich existieren, weshalb die Aufstellung eines Klaviersystems 
 dann üblicherweise damit beginnt, die Systeme zu benennen. Hierbei können 
 natürlich beliebige Namen vergeben werden.
@@ -323,9 +321,7 @@ Im Handbuch: @ref{Laissez vibrer ties}
 @node Discant symbols
 @subsubsection Discant symbols
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml

diff --git a/Documentation/de/user/lilypond-book.itely b/Documentation/de/user/lilypond-book.itely
index 55fa935096e4f7ea1cc4b77ad93a1d8a58956e32..627b95f04111eaff6ee51cc173034e78918d2725 100644 (file)
--- a/Documentation/de/user/lilypond-book.itely
+++ b/Documentation/de/user/lilypond-book.itely
@@ -11,9 +11,7 @@
 @node LilyPond-book
 @chapter @command{lilypond-book}: Integrating text and music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node An example of a musicological document
 @section An example of a musicological document
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Input
@@ -39,9 +35,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Integrating music and text
 @section Integrating music and text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -54,33 +48,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node LaTeX
 @subsection @LaTeX{}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Texinfo
 @subsection Texinfo
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node HTML
 @subsection HTML
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node DocBook
 @subsection DocBook
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Common conventions
@@ -90,17 +76,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Music fragment options
 @section Music fragment options
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Invoking lilypond-book
 @section Invoking @command{lilypond-book}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Format-specific instructions
@@ -110,17 +92,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Filename extensions
 @section Filename extensions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Alternate methods of mixing text and music
 @section Alternative methods of mixing text and music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -132,25 +110,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Many quotes from a large score
 @subsection Many quotes from a large score
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Inserting LilyPond output into OpenOffice.org
 @subsection Inserting LilyPond output into OpenOffice.org
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Inserting LilyPond output into other programs
 @subsection Inserting LilyPond output into other programs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index 03751cdace0ec46da6aef6d9a2a21b0b28264e57..9114eea63908a4028c31e1d82b2c02850e091fac 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5
+    Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -12,9 +12,11 @@
 
 @c   ***** Displaying text *****
 
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs{}} instead
+@macro bs
+\\
+@end macro
 
 @c to get decent quotes in `foo' and ``foo''
 @c  these need to be split up so that "@qq{foo}." looks nice.  :(
@@ -26,6 +28,15 @@
 @quotedblbase{}\TEXT\@quotedblleft{}
 @end macro
 
+@ifhtml
+@macro warning{TEXT}
+@cartouche
+@b{Achtung:} \TEXT\
+@end cartouche
+@end macro
+@end ifhtml
+
+@ifnothtml
 @macro warning{TEXT}
 @quotation
 @quotation
@@ -35,6 +46,7 @@
 @end quotation
 @end quotation
 @end macro
+@end ifnothtml
 
 @ifnotinfo
 @macro notation{TEXT}
@@ -107,12 +119,6 @@
 
 @end macro
 
-@c obsolete, remove when translation is fully updated
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use rinternals
-@end macro
-
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
 
@@ -151,31 +157,43 @@
 
 
 
+@c   **** Links and references ****
+
 @c  Definitions for references:
-@c     @rinternals
 @c     @rglos
-@c     @rprogram
-@c     @ruser
 @c     @rlearning
+@c     @ruser
+@c     @rprogram
+@c     @rlsr
+@c     @rinternals
+@c  all these also have a @...named version, which allows to specify the
+@c  displayed text for the reference as second argument
 
-@ifhtml
-@c ***** HTML *****
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
 
 @ifset bigpage
 
-@macro rinternals{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
+@ref{\TEXT\,,,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page,Glossar}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossar}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
+@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Handbuch zum Lernen}
 @end macro
 
 @macro ruser{TEXT}
@@ -183,39 +201,52 @@
 @ref{\TEXT\,,,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Benutzerhandbuch}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page,Programmbenutzung}
 @end macro
 
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Programmbenutzung}
+@end macro
 
-@end ifset
-
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Beispiele}
+@end macro
 
-@ifclear bigpage
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Beispiele}
+@end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Programmreferenz}
 @end macro
 
-@macro rprogram{TEXT}
+@end ifset
+
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
@@ -223,27 +254,19 @@
 @ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Handbuch zum Lernen}
 @end macro
 
-
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
 @end macro
 
-@macro rglos{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Benutzerhandbuch}
 @end macro
 
 @macro rprogram{TEXT}
@@ -251,93 +274,98 @@
 @ref{\TEXT\,,,lilypond-program,Programmbenutzung}
 @end macro
 
-@macro ruser{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
-@end macro
-
-@macro rlearning{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Programmbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Programmreferenz}
+@end macro
 
-@end ifdocbook
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Programmreferenz}
+@end macro
 
+@end ifclear
 
-@ifinfo
-@c **** INFO ****
+@end ifnottex
 
-@macro rinternals{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals,Programmreferenz}
-@end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary,Glossar}
-@end macro
+@c **** TEX ****
+@iftex
 
-@macro rprogram{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Programmbenutzung}
+@ref{\TEXT\,,,music-glossary,Glossar}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Benutzerhandbuch}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossar}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Handbuch zum Lernen}
+@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Beispiele}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.de,Handbuch zum Lernen}
 @end macro
 
-
-@end ifinfo
-
-
-@c **** TEX ****
-@iftex
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
 @end macro
 
-@macro rglos {TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossar}
+@ref{\TEXT\,,\DISPLAY\,lilypond.de,Benutzerhandbuch}
 @end macro
 
 @macro rprogram{TEXT}
+@vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program.de,Programmbenutzung}
 @end macro
 
-@macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond.de,Benutzerhandbuch}
-@end macro
-
-@macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning.de,Handbuch zum Lernen}
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.de,Programmbenutzung}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Beispiele}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Beispiele}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@code{\DISPLAY\}
+@end macro
 
 @end iftex
 
-@c Commands specific to translated docs
+@c **** Macros specific to translated docs ****
 
 @c ugh, cannot set/define global variable 'translationof' in some way?
 @iftex
@@ -359,3 +387,13 @@ Dieser Abschnitt wurde noch nicht übersetzt, bitte lesen Sie den
 Abschnitt im englischen Benutzerhandbuch.
 @end macro
 
+@ifhtml
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro untranslated
+@end macro
+@end ifnothtml

diff --git a/Documentation/de/user/percussion.itely b/Documentation/de/user/percussion.itely
index d75b32a6a394ceb24d7d5205c292446a203e19c7..48b469731c615dd4ccabeeac3a473ad674dd5a5e 100644 (file)
--- a/Documentation/de/user/percussion.itely
+++ b/Documentation/de/user/percussion.itely
@@ -11,7 +11,7 @@
 @node Percussion
 @section Percussion
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @menu
@@ -35,7 +35,7 @@ aber hiermit kann auch der Rhythmus einer Melodie dargestellt werden.
 @node References for percussion
 @subsubsection References for percussion
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Basic percussion notation
 @subsubsection Basic percussion notation

diff --git a/Documentation/de/user/pitches.itely b/Documentation/de/user/pitches.itely
index f7404f332e7b0d1b801c71de886b4a27e47f3d51..8e24e29529ab4ce1bb49ca2aab77c7eb0f4e6163 100644 (file)
--- a/Documentation/de/user/pitches.itely
+++ b/Documentation/de/user/pitches.itely
@@ -736,39 +736,29 @@ Programmreferenz: @rinternals{KeyCancellation},
 @node Ottava brackets
 @unnumberedsubsubsec Ottava brackets
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Instrument transpositions
 @unnumberedsubsubsec Instrument transpositions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Automatic accidentals
 @unnumberedsubsubsec Automatic accidentals
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Ambitus
 @unnumberedsubsubsec Ambitus
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Note heads
 @subsection Note heads
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Special note heads::          
@@ -780,27 +770,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Special note heads
 @unnumberedsubsubsec Special note heads
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Easy notation note heads
 @unnumberedsubsubsec Easy notation note heads
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Shape note heads
 @unnumberedsubsubsec Shape note heads
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Improvisation
 @unnumberedsubsubsec Improvisation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated

diff --git a/Documentation/de/user/programming-interface.itely b/Documentation/de/user/programming-interface.itely
index fe45e8a87d6acb0ae6fada55bd507d07b77f0e39..eed3a8c6cd054b1345a0af013c2fdd54351927fd 100644 (file)
--- a/Documentation/de/user/programming-interface.itely
+++ b/Documentation/de/user/programming-interface.itely
@@ -11,9 +11,7 @@
 @node Interfaces for programmers
 @chapter Interfaces for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -29,9 +27,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Music functions
 @section Music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -47,66 +43,50 @@ UNTRANSLATED NODE: IGNORE ME
 @node Overview of music functions
 @subsection Overview of music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Simple substitution functions
 @subsection Simple substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Paired substitution functions
 @subsection Paired substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Mathematics in functions
 @subsection Mathematics in functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Void functions
 @subsection Void functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Functions without arguments
 @subsection Functions without arguments
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Overview of available music functions
 @subsection Overview of available music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @include identifiers.tely
 @node Programmer interfaces
 @section Programmer interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -117,25 +97,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input variables and Scheme
 @subsection Input variables and Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Internal music representation
 @subsection Internal music representation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Building complicated functions
 @section Building complicated functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -148,41 +122,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying music expressions
 @subsection Displaying music expressions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music properties
 @subsection Music properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Doubling a note with slurs (example)
 @subsection Doubling a note with slurs (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Adding articulation to notes (example)
 @subsection Adding articulation to notes (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Markup programmer interface
 @section Markup programmer interface
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -195,41 +159,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Markup construction in Scheme
 @subsection Markup construction in Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node How markups work internally
 @subsection How markups work internally
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup command definition
 @subsection New markup command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup list command definition
 @subsection New markup list command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Contexts for programmers
 @section Contexts for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -240,33 +194,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Context evaluation
 @subsection Context evaluation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Running a function on all layout objects
 @subsection Running a function on all layout objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Scheme procedures as properties
 @section Scheme procedures as properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node TODO moved into scheme
 @section TODO moved into scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -277,17 +223,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Using Scheme code instead of \tweak
 @subsection Using Scheme code instead of @code{\tweak}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Difficult tweaks
 @subsection Difficult tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/rhythms.itely b/Documentation/de/user/rhythms.itely
index 6ffd7bb3139aa8eac4d862b74aaf84bf2469c3fd..58eb42769f8d53b0c751996280c3c93578e786d7 100644 (file)
--- a/Documentation/de/user/rhythms.itely
+++ b/Documentation/de/user/rhythms.itely
@@ -409,7 +409,7 @@ Programmreferenz: @rinternals{SkipMusic}.
 @node Multi measure rests
 @subsubsection Multi measure rests
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Displaying rhythms
@@ -604,7 +604,7 @@ einfügen, um anzuzeigen, wo umgebrochen werden darf.
 @node Polymetric notation
 @subsubsection Polymetric notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Automatic note splitting
@@ -803,12 +803,12 @@ Balken vermeiden nicht andere Objekte, wie etwa Text und Versetzungszeichen.
 @node Feathered beams
 @subsubsection Feathered beams
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Setting automatic beam behavior
 @subsubsection Setting automatic beam behavior
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Bars
@@ -965,7 +965,7 @@ Programmreferenz: @rinternals{BarLine} (auf Partitur
 @node Bar numbers
 @subsubsection Bar numbers
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Barnumber check
@@ -989,7 +989,7 @@ nicht mit dem Wert 123 übereinstimmt.
 @node Rehearsal marks
 @subsubsection Rehearsal marks
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Special rhythmic concerns
@@ -1221,17 +1221,17 @@ zu Fehlermeldungen oder Abstürzen kommen.
 @node Aligning to cadenzas
 @subsubsection Aligning to cadenzas
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Time administration
 @subsubsection Time administration
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Proportional notation (introduction)
 @subsubsection Proportional notation (introduction)
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/de/user/running.itely b/Documentation/de/user/running.itely
index 1abcaf9fb13322cc2eea1110aa5953031e843377..b35fb13a11a2bc84fbea52094b68cd73ebd7fe2a 100644 (file)
--- a/Documentation/de/user/running.itely
+++ b/Documentation/de/user/running.itely
@@ -11,9 +11,7 @@
 @node Running LilyPond
 @chapter Running LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -27,17 +25,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Normal usage
 @section Normal usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command-line usage
 @section Command-line usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -49,41 +43,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Invoking lilypond
 @subsection Invoking lilypond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command line options
 @subsection Command line options
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Environment variables
 @subsection Environment variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Error messages
 @section Error messages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Updating files with convert-ly
 @section Updating with @command{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subsection Command line options
@@ -94,17 +78,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Problems with convert-ly
 @subsection Problems with @code{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Reporting bugs
 @section Reporting bugs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely
index 06b1ca74383d0e0a3df58c829d88063d1b351798..c933655e3aa357b7e7a46a07a1d22a0505569567 100644 (file)
--- a/Documentation/de/user/simultaneous.itely
+++ b/Documentation/de/user/simultaneous.itely
@@ -53,7 +53,7 @@ Siehe @ref{Chord notation} für mehr Information.
 @node Clusters
 @unnumberedsubsubsec Clusters
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Multiple voices
@@ -412,7 +412,7 @@ die spezielle Cluster-Notationsweise, siehe @ref{Clusters}.
 @node Automatic part combining
 @unnumberedsubsubsec Automatic part combining
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Writing music in parallel

diff --git a/Documentation/de/user/spacing.itely b/Documentation/de/user/spacing.itely
index 80d801229490cf3635ebb084d65aa461528e5776..4411022f0fa27a0f260793a1639d96ffccc10758 100644 (file)
--- a/Documentation/de/user/spacing.itely
+++ b/Documentation/de/user/spacing.itely
@@ -11,9 +11,7 @@
 @node Spacing issues
 @chapter Spacing issues
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Paper and pages
 @section Paper and pages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -41,25 +37,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Paper size
 @subsection Paper size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page formatting
 @subsection Page formatting
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music layout
 @section Music layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -70,25 +60,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Setting the staff size
 @subsection Setting the staff size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Score layout
 @subsection Score layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Breaks
 @section Breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -104,65 +88,49 @@ UNTRANSLATED NODE: IGNORE ME
 @node Line breaking
 @subsection Line breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page breaking
 @subsection Page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page breaking
 @subsection Optimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page turning
 @subsection Optimal page turning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Minimal page breaking
 @subsection Minimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit breaks
 @subsection Explicit breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using an extra voice for breaks
 @subsection Using an extra voice for breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing
 @section Vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -176,49 +144,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Vertical spacing inside a system
 @subsection Vertical spacing inside a system
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing between systems
 @subsection Vertical spacing between systems
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit staff and system positioning
 @subsection Explicit staff and system positioning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Two-pass vertical spacing
 @subsection Two-pass vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical collision avoidance
 @subsection Vertical collision avoidance
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Horizontal spacing
 @section Horizontal Spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -232,49 +188,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Horizontal spacing overview
 @subsection Horizontal spacing overview
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New spacing area
 @subsection New spacing area
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing horizontal spacing
 @subsection Changing horizontal spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Line length
 @subsection Line length
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Proportional notation
 @subsection Proportional notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Fitting music onto fewer pages
 @section Fitting music onto fewer pages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -285,9 +229,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying spacing
 @subsection Displaying spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing spacing

diff --git a/Documentation/de/user/staff.itely b/Documentation/de/user/staff.itely
index 2dd58970903af8206ccd02a69b908762a4ea22e3..0992571cc5c717f6fbce16c75bee6e7e9a826c3b 100644 (file)
--- a/Documentation/de/user/staff.itely
+++ b/Documentation/de/user/staff.itely
@@ -177,7 +177,7 @@ Beispiele:
 @node Hiding staves
 @unnumberedsubsubsec Hiding staves
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Writing parts
@@ -193,23 +193,23 @@ UNTRANSLATED NODE: IGNORE ME
 @node Metronome marks
 @unnumberedsubsubsec Metronome marks
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Instrument names
 @unnumberedsubsubsec Instrument names
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Quoting other voices
 @unnumberedsubsubsec Quoting other voices
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Formatting cue notes
 @unnumberedsubsubsec Formatting cue notes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/de/user/text.itely b/Documentation/de/user/text.itely
index 68e39f72196a7c752e85b3162f0870d0e8282437..4a1d30ed96d955186f08265c1ffab84304210e87 100644 (file)
--- a/Documentation/de/user/text.itely
+++ b/Documentation/de/user/text.itely
@@ -11,9 +11,7 @@
 @node Text
 @section Text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -25,9 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Writing text
 @subsection Writing text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -40,41 +36,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Text scripts
 @subsubsection Text scripts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Text spanners
 @subsubsection Text spanners
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Text marks
 @subsubsection Text marks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Separate text
 @subsubsection Separate text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Formatting text
 @subsection Formatting text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -89,57 +75,43 @@ UNTRANSLATED NODE: IGNORE ME
 @node Text markup introduction
 @subsubsection Text markup introduction
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Selecting font and font size
 @subsubsection Selecting font and font size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Text alignment
 @subsubsection Text alignment
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Graphic notation inside markup
 @subsubsection Graphic notation inside markup
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music notation inside markup
 @subsubsection Music notation inside markup
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multi-page markup
 @subsubsection Multi-page markup
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Fonts
 @subsection Fonts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -150,17 +122,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Entire document fonts
 @subsubsection Entire document fonts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Single entry fonts
 @subsubsection Single entry fonts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/tweaks.itely b/Documentation/de/user/tweaks.itely
index 01604d3c583f1f17cae3c337df5cd7d0aa2b675e..b9df747938fef50d7fe2febda80f9bcb9dc893c8 100644 (file)
--- a/Documentation/de/user/tweaks.itely
+++ b/Documentation/de/user/tweaks.itely
@@ -31,9 +31,7 @@ Notenfragment kann geändert werden.
 @node Tweaking basics
 @section Tweaking basics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Introduction to tweaks::      
@@ -45,37 +43,27 @@ UNTRANSLATED NODE: IGNORE ME
 @node Introduction to tweaks
 @subsection Introduction to tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Objects and interfaces
 @subsection Objects and interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Naming conventions of objects and properties
 @subsection Naming conventions of objects and properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Tweaking methods
 @subsection Tweaking methods
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node The Internals Reference manual
 @section The Internals Reference manual
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Properties of layout objects::  
@@ -86,30 +74,22 @@ UNTRANSLATED NODE: IGNORE ME
 @node Properties of layout objects
 @subsection Properties of layout objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Properties found in interfaces
 @subsection Properties found in interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Types of properties
 @subsection Types of properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Appearance of objects
 @section Appearance of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Visibility and color of objects::  
@@ -120,30 +100,22 @@ UNTRANSLATED NODE: IGNORE ME
 @node Visibility and color of objects
 @subsection Visibility and color of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Size of objects
 @subsection Size of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Length and thickness of objects
 @subsection Length and thickness of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Placement of objects
 @section Placement of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Automatic behavior::          
@@ -154,23 +126,17 @@ UNTRANSLATED NODE: IGNORE ME
 @node Automatic behavior
 @subsection Automatic behavior
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Within-staff objects
 @subsection Within-staff objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Outside staff objects
 @subsection Outside staff objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Collisions of objects
@@ -371,9 +337,7 @@ aber die gebräuchlichsten finden sich hier:
 @node Real music example
 @subsection Real music example
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @c DEPRECATED SECTION
@@ -530,16 +494,12 @@ im relevanten Teil der Programmreferenz.
 @node Other uses for tweaks
 @subsection Other uses for tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Using variables for tweaks
 @subsection Using variables for tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Other sources of information
 @subsection Other sources of information

diff --git a/Documentation/de/user/unfretted-strings.itely b/Documentation/de/user/unfretted-strings.itely
index 4a5f7aa995a4619c3c8d281bc0336c34484d79aa..032966b59b496ef6b19e0ef8b5ed1e70f2902ef0 100644 (file)
--- a/Documentation/de/user/unfretted-strings.itely
+++ b/Documentation/de/user/unfretted-strings.itely
@@ -12,7 +12,7 @@
 @node Unfretted string instruments
 @section Unfretted string instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for unfretted strings::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for unfretted strings
 @subsection Common notation for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for unfretted strings::
@@ -32,12 +32,12 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for unfretted strings
 @subsubsection References for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bowed instruments
 @subsection Bowed instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for bowed strings::
@@ -59,7 +59,7 @@ Befehl @code{\harmonic} markiert wird.
 @node Plucked instruments
 @subsection Plucked instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Harp::
@@ -68,5 +68,5 @@ UNTRANSLATED NODE: IGNORE ME
 @node Harp
 @subsubsection Harp
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/de/user/vocal.itely b/Documentation/de/user/vocal.itely
index 308d097e70e8bab61a3cba193e9e0d4980707cd7..66744882a6c67c847ad0cd32a7e3a83ea0a22ec7 100644 (file)
--- a/Documentation/de/user/vocal.itely
+++ b/Documentation/de/user/vocal.itely
@@ -11,9 +11,7 @@
 @node Vocal music
 @section Vocal music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -26,9 +24,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for vocals
 @subsection Common notation for vocals
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -41,41 +37,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for vocal music
 @subsubsection References for vocal music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Setting simple songs
 @subsubsection Setting simple songs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Entering lyrics
 @subsubsection Entering lyrics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Working with lyrics and variables
 @subsubsection Working with lyrics and variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Aligning lyrics to a melody
 @subsection Aligning lyrics to a melody
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -91,65 +77,49 @@ UNTRANSLATED NODE: IGNORE ME
 @node Automatic syllable durations
 @subsubsection Automatic syllable durations
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Manual syllable durations
 @subsubsection Manual syllable durations
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multiple syllables to one note
 @subsubsection Multiple syllables to one note
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multiple notes to one syllable
 @subsubsection Multiple notes to one syllable
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Skipping notes
 @subsubsection Skipping notes
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Extenders and hyphens
 @subsubsection Extenders and hyphens
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Lyrics and repeats
 @subsubsection Lyrics and repeats
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Placement of lyrics
 @subsection Placement of lyrics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -163,49 +133,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Divisi lyrics
 @subsubsection Divisi lyrics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Lyrics independent of notes
 @subsubsection Lyrics independent of notes
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Chants
 @subsubsection Chants
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Spacing out syllables
 @subsubsection Spacing out syllables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Centering lyrics between staves
 @subsubsection Centering lyrics between staves
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Stanzas
 @subsection Stanzas
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -220,33 +178,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Adding stanza numbers
 @subsubsection Adding stanza numbers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Adding dynamics marks to stanzas
 @subsubsection Adding dynamics marks to stanzas
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Adding singers' names to stanzas
 @subsubsection Adding singers' names to stanzas
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Stanzas with different rhythms
 @subsubsection Stanzas with different rhythms
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subsubheading Ignoring melismata
@@ -254,17 +204,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Printing stanzas at the end
 @subsubsection Printing stanzas at the end
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Printing stanzas at the end in multiple columns
 @subsubsection Printing stanzas at the end in multiple columns
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/de/user/wind.itely b/Documentation/de/user/wind.itely
index 40b1f872a358397e4eaebf40d2ac538e1df9aa06..7f63dbbdf9e9678bcf67340b149aa46f164f5dd9 100644 (file)
--- a/Documentation/de/user/wind.itely
+++ b/Documentation/de/user/wind.itely
@@ -13,7 +13,7 @@
 @node Wind instruments
 @section Wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for wind instruments::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for wind instruments::
@@ -33,17 +33,17 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for wind instruments
 @subsubsection References for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Half-holes
 @subsubsection Half-holes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bagpipes
 @subsection Bagpipes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Bagpipe definitions::

diff --git a/Documentation/de/user/world.itely b/Documentation/de/user/world.itely
index 13e3b36779aca1ad9032562716ac2681490798e4..a11f1fff9b9f3284028081eadcad74532e83c5d9 100644 (file)
--- a/Documentation/de/user/world.itely
+++ b/Documentation/de/user/world.itely
@@ -11,9 +11,7 @@
 @node World music
 @section World music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -23,9 +21,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Arabic music
 @subsection Arabic music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -40,49 +36,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for Arabic music
 @unnumberedsubsubsec References for Arabic music 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic note names 
 @unnumberedsubsubsec Arabic note names 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic key signatures
 @unnumberedsubsubsec Arabic key signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic time signatures
 @unnumberedsubsubsec Arabic time signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic music example
 @unnumberedsubsubsec Arabic music example 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Further reading
 @unnumberedsubsubsec Further reading
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/es/user/changing-defaults.itely b/Documentation/es/user/changing-defaults.itely
index dbc9397137dad0461009f1d835be5e06dd4b92f9..933c73f00e25cb3c67c8536510d24987304a8d25 100644 (file)
--- a/Documentation/es/user/changing-defaults.itely
+++ b/Documentation/es/user/changing-defaults.itely
@@ -423,7 +423,7 @@ compás independiente.
 @node Changing context default settings
 @subsection Changing context default settings
 
-Los ajustes de las secciones previas ( @ref{The \set command},
+Los ajustes de las secciones previas ( @ref{The set command},
 @ref{Modifying context plug-ins} y @ref{Overview of modifying
 properties}) también se pueden escribir separados de la música dentro
 del bloque @code{\layout}:
@@ -960,17 +960,17 @@ El grabador Fingering_engraver es parte de los contextos: @dots{}
 @node Naming conventions
 @subsection Naming conventions
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Modifying properties
 @section Modifying properties
 
 @menu
 * Overview of modifying properties::  
-* The \set command::            
-* The \override command::       
-* \set versus \override::       
-* Objects connected to the input::  
+* The set command::             
+* The override command::        
+* set versus override::         
+* The tweak command::           
 @end menu
 
 
@@ -1097,7 +1097,7 @@ valores Scheme de propiedades pueden producir cuelgues o salidas
 abruptas, o las dos cosas.
 
 
-@node The \set command
+@node The set command
 @subsection The @code{\set} command
 
 @cindex propiedades
@@ -1228,7 +1228,7 @@ usuario.
 
 
 
-@node The \override command
+@node The override command
 @subsection The @code{\override} command
 
 Las instrucciones que modifican la salida tienen por lo general un
@@ -1273,7 +1273,7 @@ causarína problemas.
 Mostraremos a continuación cómo localizar esta información en el
 manual de notación y en la referencia de funcionamiento interno.
 
-@node \set versus \override
+@node set versus override
 @subsection @code{\set} vs. @code{\override}
 
 Hemos visto dos formas de cambiar las propiedades: @code{\set} y
@@ -1326,8 +1326,8 @@ Al ser éste un cambio muy común, se creó la propiedad especial
 (modificada con @code{\set}).
 
 
-@node Objects connected to the input
-@subsection Objects connected to the input
+@node The tweak command
+@subsection The @code{\tweak} command
 
 @funindex \tweak
 
@@ -1578,7 +1578,7 @@ significan @qq{utilizar la dirección predeterminada}, como antes.
 @node Distances and measurements
 @subsection Distances and measurements
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Spanners
 @subsection Spanners
@@ -1783,10 +1783,10 @@ partitura, pero cada @code{Staff}, @code{Lyrics}, etc. tiene su propio
 @node Modifying ends of spanners
 @subsection Modifying ends of spanners
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Modifying stencils
 @subsection Modifying stencils
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated

diff --git a/Documentation/es/user/editorial.itely b/Documentation/es/user/editorial.itely
index ccc485a6c2dd6d2cb4713ccd8314891aa6c1faf2..4a6a5681555c1268a66568a4a2dec7827d6fea3a 100644 (file)
--- a/Documentation/es/user/editorial.itely
+++ b/Documentation/es/user/editorial.itely
@@ -305,8 +305,8 @@ gis4 a
 @seealso
 
 Referencia de la notación:
-@ref{List of colors}, @ref{Objects connected to
-the input}.
+@ref{List of colors}, @ref{The
+tweak command}.
 
 Fragmentos de código:
 @rlsr{Editorial annotations}.
@@ -324,8 +324,8 @@ sea: @code{#blue}, azul, @code{#green}, verde, @code{#red}, rojo).
 
 
 Las notas de un acorde no se pueden colorear con @code{\override}; en
-su lugar utilice @code{\tweak}.  Consulte @ref{Objects connected to
-the input} para ver más detalles.
+su lugar utilice @code{\tweak}.  Consulte @ref{The
+tweak command} para ver más detalles.
 
 
 @node Parentheses

diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely
index 058d033718cdf409a68e883321601a1eddae0cbe..2d58f01488d309f03590222d18a5c3962e5fb4e6 100644 (file)
--- a/Documentation/es/user/fretted-strings.itely
+++ b/Documentation/es/user/fretted-strings.itely
@@ -36,7 +36,7 @@
 @node References for fretted strings
 @subsubsection References for fretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node String number indications
 @subsubsection String number indications
@@ -362,7 +362,7 @@ Referencia de funcionamiento interno:
 @node Guitar tablatures
 @subsubsection Guitar tablatures
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Indicating position and barring
 @subsubsection Indicating position and barring

diff --git a/Documentation/es/user/input.itely b/Documentation/es/user/input.itely
index 42dffe4a89cf1fc008af0491b27fbb6d6ef7897e..a48f8d948f35941183125e1f8366d989c44a8381 100644 (file)
--- a/Documentation/es/user/input.itely
+++ b/Documentation/es/user/input.itely
@@ -11,9 +11,7 @@
 @node General input and output
 @chapter General input and output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -27,9 +25,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input structure
 @section Input structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -41,25 +37,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Structure of a score
 @subsection Structure of a score
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multiple scores in a book
 @subsection Multiple scores in a book
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node File structure
 @subsection File structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Titles and headers
@@ -509,9 +499,7 @@ Archivos de inicio: @file{ly/@/toc@/-init@/.ly}.
 @node Working with input files
 @section Working with input files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -524,17 +512,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Including LilyPond files
 @subsection Including LilyPond files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Different editions from one source
 @subsection Different editions from one source
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -545,41 +529,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Using variables
 @unnumberedsubsubsec Using variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using tags
 @unnumberedsubsubsec Using tags
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Text encoding
 @subsection Text encoding
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Displaying LilyPond notation
 @subsection Displaying LilyPond notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Controlling output
 @section Controlling output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -590,17 +564,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Extracting fragments of music
 @subsection Extracting fragments of music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Skipping corrected music
 @subsection Skipping corrected music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node MIDI output
@@ -802,9 +772,7 @@ para la salida MIDI se encuentran definidos dentro de
 @node What goes into the MIDI output?
 @subsection What goes into the MIDI output?
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @unnumberedsubsubsec Supported in MIDI
 @unnumberedsubsubsec Unsupported in MIDI
@@ -854,9 +822,7 @@ y percent --repetición de compases--).  Por ejemplo,
 @node Controlling MIDI dynamics
 @subsection Controlling MIDI dynamics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Dynamic marks

diff --git a/Documentation/es/user/install.itely b/Documentation/es/user/install.itely
index 16fc086c97d372df6da285daaa08fbace6e8abef..384fecd6d4ef897d59183ca80f1eb273179e1897 100644 (file)
--- a/Documentation/es/user/install.itely
+++ b/Documentation/es/user/install.itely
@@ -74,7 +74,7 @@ win32-x86
 @node Compiling from source
 @section Compiling from source
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu 
 * Downloading source code::
@@ -87,12 +87,12 @@ UNTRANSLATED NODE: IGNORE ME
 @node Downloading source code
 @subsection Downloading source code
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Requirements
 @subsection Requirements
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @unnumberedsubsubsec Compilation
 @unnumberedsubsubsec Running requirements
@@ -100,24 +100,24 @@ UNTRANSLATED NODE: IGNORE ME
 @node Building LilyPond
 @subsection Building LilyPond
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @unnumberedsubsubsec Compiling
 @unnumberedsubsubsec Compiling for multiple platforms
 @node Building documentation without compiling LilyPond
 @subsection Building documentation without compiling LilyPond
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Testing LilyPond
 @subsection Testing LilyPond
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Problems
 @subsection Problems
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @unnumberedsubsubsec Bison 1.875
 @unnumberedsubsubsec Solaris

diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely
index fc740dedba3e27331687178866c9459c10771790..eb068bec6470be3b18130f453d9dbca2b552bd4f 100644 (file)
--- a/Documentation/es/user/keyboards.itely
+++ b/Documentation/es/user/keyboards.itely
@@ -33,9 +33,7 @@
 @node References for keyboards
 @subsubsection References for keyboards
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -74,7 +72,7 @@ Las voces se pueden cambiar de pentagrama manualmente usando la instrucción
 La cadena @var{nombre_del_pentagrama} es el nombre del pentagrama.
 Cambia la voz actual de su pentagrama en curso al pentagrama de nombre
 @var{nombre_del_pentagrama}.  Por lo común @var{nombre_del_pentagrama}
-es @code{"up"} o @code{"down"}.  El @context{Staff} referido debe
+es @code{"up"} o @code{"down"}.  El @code{Staff} referido debe
 existir previamente, por ello normalmente la preparación de una
 partitura empezará por la preparación de los pentagramas,
 
@@ -90,7 +88,7 @@ partitura empezará por la preparación de los pentagramas,
 @end example
 
 
-y la @context{Voice} se inserta con posterioridad
+y la @code{Voice} se inserta con posterioridad
 
 @example
 \context Staff = down
@@ -316,9 +314,7 @@ Referencia de la notación: @ref{Ties} (laissez vibrer).
 @node Discant symbols
 @subsubsection Discant symbols
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml

diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi
index 33859d863bbfd6ad13bae8ebdf1cf40a548527fa..a4d2e178909d9cb943cb6db481c5b7a8f82dddbf 100644 (file)
--- a/Documentation/es/user/macros.itexi
+++ b/Documentation/es/user/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: d0333749421c9695907a4da61a6e1cd7eafcb726
+    Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -25,6 +25,15 @@
 @quotedblleft{}\TEXT\@quotedblright{}
 @end macro
 
+@ifhtml
+@macro warning{TEXT}
+@cartouche
+@b{Nota:} \TEXT\
+@end cartouche
+@end macro
+@end ifhtml
+
+@ifnothtml
 @macro warning{TEXT}
 @quotation
 @quotation
@@ -34,6 +43,7 @@
 @end quotation
 @end quotation
 @end macro
+@end ifnothtml
 
 @ifnotinfo
 @macro notation{TEXT}
@@ -106,18 +116,6 @@
 
 @end macro
 
-@c * Deprecated: not in English macros.itexi *
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use rinternals
-@end macro
-
-@c * Deprecated: not in English macros.itexi *
-@macro refcommand{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}
-@end macro
-
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
 
@@ -132,52 +130,41 @@
 
 @c   **** Links and references ****
 
-@c  Possibly deprecated; under discussion.
-@c usage: @lsr{ancient,custodes.ly}
-@macro lsr{DIR,TEXT}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html#\TEXT\,@file{\DIR\/\TEXT\}}
-@end ifhtml
-@ifnothtml
-@file{\DIR\/\TEXT\}
-@end ifnothtml
-@end macro
-
-@macro lsrdir{DIR}
-@ifhtml
-@uref{source/input/lsr/\DIR\/collated-files.html,@file{\DIR\}/}
-@end ifhtml
-@ifnothtml
-\DIR\
-@end ifnothtml
-@end macro
-
-
 @c  Definitions for references:
-@c     @rinternals
 @c     @rglos
-@c     @rprogram
-@c     @ruser
 @c     @rlearning
+@c     @ruser
+@c     @rprogram
+@c     @rlsr
+@c     @rinternals
+@c  all these also have a @...named version, which allows to specify the
+@c  displayed text for the reference as second argument
 
-@ifhtml
-@c ***** HTML *****
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
 
 @ifset bigpage
 
-@macro rinternals{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,music-glossary-big-page,Glosario Musical}
 @end macro
 
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page,Glosario Musical}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glosario Musical}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Utilización del Programa}
+@ref{\TEXT\,,,lilypond-learning-big-page,Manual de Aprendizaje}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manual de Aprendizaje}
 @end macro
 
 @macro ruser{TEXT}
@@ -185,38 +172,52 @@
 @ref{\TEXT\,,,lilypond-big-page,Referencia de la Notación}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Manual de Aprendizaje}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Referencia de la Notación}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets-big-page,Fragmentos de código}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program-big-page,Utilización del Programa}
 @end macro
 
-@end ifset
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Utilización del Programa}
+@end macro
 
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets-big-page,Fragmentos de código}
+@end macro
 
-@ifclear bigpage
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Fragmentos de código}
+@end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,lilypond-internals-big-page,Referencia de Funcionamiento Interno}
 @end macro
 
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glosario Musical}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Referencia de Funcionamiento Interno}
 @end macro
 
-@macro rprogram{TEXT}
+@end ifset
+
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Utilización del Programa}
+@ref{\TEXT\,,,music-glossary,Glosario Musical}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Referencia de la Notación}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glosario Musical}
 @end macro
 
 @macro rlearning{TEXT}
@@ -224,26 +225,19 @@
 @ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manual de Aprendizaje}
 @end macro
 
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,lilypond,Referencia de la Notación}
 @end macro
 
-@macro rglos{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glosario Musical}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Referencia de la Notación}
 @end macro
 
 @macro rprogram{TEXT}
@@ -251,95 +245,99 @@
 @ref{\TEXT\,,,lilypond-program,Utilización del Programa}
 @end macro
 
-@macro ruser{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Referencia de la Notación}
-@end macro
-
-@macro rlearning{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Utilización del Programa}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
 @end macro
 
-
-
-@end ifdocbook
-
-
-@ifinfo
-@c **** INFO ****
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código}
+@end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@inforef{\TEXT\,,lilypond-internals,Referencia de Funcionamiento Interno}
+@ref{\TEXT\,,,lilypond-internals,Referencia de Funcionamiento Interno}
 @end macro
 
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@inforef{\TEXT\,,music-glossary,Glosario Musical}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Referencia de Funcionamiento Interno}
 @end macro
 
-@macro rprogram{TEXT}
+@end ifclear
+
+@end ifnottex
+
+
+@c **** TEX ****
+@iftex
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Utilización del Programa}
+@ref{\TEXT\,,,music-glossary,Glosario Musical}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Referencia de la Notación}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glosario Musical}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manual de Aprendizaje}
+@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.es,Manual de Aprendizaje}
 @end macro
 
-
-
-@end ifinfo
-
-
-@c **** TEX ****
-@iftex
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond.es,Referencia de la Notación}
 @end macro
 
-@macro rglos {TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glosario Musical}
+@ref{\TEXT\,,\DISPLAY\,lilypond.es,Referencia de la Notación}
 @end macro
 
 @macro rprogram{TEXT}
+@vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program.es,Utilización del Programa}
 @end macro
 
-@macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond.es,Referencia de la Notación}
-@end macro
-
-@macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning.es,Manual de Aprendizaje}
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.es,Utilización del Programa}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Fragmentos de código}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Fragmentos de código}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@code{\DISPLAY\}
+@end macro
+
 @end iftex
 
 
-@c Commands specific to translated docs
+@c **** Macros specific to translated docs ****
 
 @c ugh, cannot set/define global variable 'translationof' in some way?
 @iftex
@@ -360,3 +358,13 @@
 Esta sección aún no está traducida; consulte el manual en inglés.
 @end macro
 
+@ifhtml
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro untranslated
+@end macro
+@end ifnothtml

diff --git a/Documentation/es/user/percussion.itely b/Documentation/es/user/percussion.itely
index c61451583201d51c9d0f8836fdbe83f546924c09..7f96f6070c58d0e878396790531bfec41067889e 100644 (file)
--- a/Documentation/es/user/percussion.itely
+++ b/Documentation/es/user/percussion.itely
@@ -32,7 +32,7 @@ se puede utilizar para mostrar los valores rítmicos una melodía.
 @node References for percussion
 @subsubsection References for percussion
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Basic percussion notation

diff --git a/Documentation/es/user/pitches.itely b/Documentation/es/user/pitches.itely
index 3ae57fcf3743f871140982737829ae5acd93e94f..0144186977ddf4b46fcd205aa9cba1f22449570b 100644 (file)
--- a/Documentation/es/user/pitches.itely
+++ b/Documentation/es/user/pitches.itely
@@ -84,7 +84,7 @@ Glosario musical:
 @rglos{Pitch names}.
 
 Fragmentos de código:
-@lsrdir{Pitches,Pitches}.
+@rlsr{Pitches}.
 
 
 @node Relative octave entry

diff --git a/Documentation/es/user/programming-interface.itely b/Documentation/es/user/programming-interface.itely
index 1e79c98ba75f29c5dc2c805ddac90b0f7e12b7e2..20f33c492f34d832c6b1528f7a89de69624831c9 100644 (file)
--- a/Documentation/es/user/programming-interface.itely
+++ b/Documentation/es/user/programming-interface.itely
@@ -11,9 +11,7 @@
 @node Interfaces for programmers
 @chapter Interfaces for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -29,9 +27,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Music functions
 @section Music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -47,66 +43,50 @@ UNTRANSLATED NODE: IGNORE ME
 @node Overview of music functions
 @subsection Overview of music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Simple substitution functions
 @subsection Simple substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Paired substitution functions
 @subsection Paired substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Mathematics in functions
 @subsection Mathematics in functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Void functions
 @subsection Void functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Functions without arguments
 @subsection Functions without arguments
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Overview of available music functions
 @subsection Overview of available music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @include identifiers.tely
 @node Programmer interfaces
 @section Programmer interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -117,25 +97,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input variables and Scheme
 @subsection Input variables and Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Internal music representation
 @subsection Internal music representation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Building complicated functions
 @section Building complicated functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -148,41 +122,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying music expressions
 @subsection Displaying music expressions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music properties
 @subsection Music properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Doubling a note with slurs (example)
 @subsection Doubling a note with slurs (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Adding articulation to notes (example)
 @subsection Adding articulation to notes (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Markup programmer interface
 @section Markup programmer interface
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -195,41 +159,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Markup construction in Scheme
 @subsection Markup construction in Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node How markups work internally
 @subsection How markups work internally
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup command definition
 @subsection New markup command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup list command definition
 @subsection New markup list command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Contexts for programmers
 @section Contexts for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -240,33 +194,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Context evaluation
 @subsection Context evaluation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Running a function on all layout objects
 @subsection Running a function on all layout objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Scheme procedures as properties
 @section Scheme procedures as properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node TODO moved into scheme
 @section TODO moved into scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -277,17 +223,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Using Scheme code instead of \tweak
 @subsection Using Scheme code instead of @code{\tweak}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Difficult tweaks
 @subsection Difficult tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/es/user/rhythms.itely b/Documentation/es/user/rhythms.itely
index fce14fa01c676e4441496cedcab8bc76c6e1b743..f56c28309d89c501389e7318adc8adf16c433536 100644 (file)
--- a/Documentation/es/user/rhythms.itely
+++ b/Documentation/es/user/rhythms.itely
@@ -255,7 +255,7 @@ Manual de aprendizaje:
 Referencia de la notación:
 @ref{Time administration},
 @ref{Scaling durations},
-@ref{Objects connected to the input},
+@ref{The tweak command},
 @ref{Polymetric notation}.
 
 Fragmentos de código:
@@ -963,7 +963,7 @@ para indicar dónde se pueden producir los saltos.
 @node Polymetric notation
 @subsubsection Polymetric notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Automatic note splitting

diff --git a/Documentation/es/user/running.itely b/Documentation/es/user/running.itely
index 54ebe08b82dc47c8fccf44addccaeed50edb152d..519eefbc45ba26054394837f7ba2294ac9415207 100644 (file)
--- a/Documentation/es/user/running.itely
+++ b/Documentation/es/user/running.itely
@@ -11,9 +11,7 @@
 @node Running LilyPond
 @chapter Running LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -27,17 +25,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Normal usage
 @section Normal usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command-line usage
 @section Command-line usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -49,41 +43,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Invoking lilypond
 @subsection Invoking lilypond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command line options
 @subsection Command line options
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Environment variables
 @subsection Environment variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Error messages
 @section Error messages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Updating files with convert-ly
 @section Updating with @command{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subsection Command line options
@@ -94,17 +78,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Problems with convert-ly
 @subsection Problems with @code{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Reporting bugs
 @section Reporting bugs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/es/user/spacing.itely b/Documentation/es/user/spacing.itely
index 56b0811e7dd9a17a01a3b23d76f0e69a9fbc6da1..29e3cf33be95ef89cfcc59a02700318f0b63e80f 100644 (file)
--- a/Documentation/es/user/spacing.itely
+++ b/Documentation/es/user/spacing.itely
@@ -11,9 +11,7 @@
 @node Spacing issues
 @chapter Spacing issues
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Paper and pages
 @section Paper and pages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -41,25 +37,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Paper size
 @subsection Paper size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page formatting
 @subsection Page formatting
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music layout
 @section Music layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -70,25 +60,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Setting the staff size
 @subsection Setting the staff size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Score layout
 @subsection Score layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Breaks
 @section Breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -104,65 +88,49 @@ UNTRANSLATED NODE: IGNORE ME
 @node Line breaking
 @subsection Line breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page breaking
 @subsection Page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page breaking
 @subsection Optimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page turning
 @subsection Optimal page turning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Minimal page breaking
 @subsection Minimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit breaks
 @subsection Explicit breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using an extra voice for breaks
 @subsection Using an extra voice for breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing
 @section Vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -176,49 +144,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Vertical spacing inside a system
 @subsection Vertical spacing inside a system
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing between systems
 @subsection Vertical spacing between systems
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit staff and system positioning
 @subsection Explicit staff and system positioning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Two-pass vertical spacing
 @subsection Two-pass vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical collision avoidance
 @subsection Vertical collision avoidance
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Horizontal spacing
 @section Horizontal Spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -232,49 +188,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Horizontal spacing overview
 @subsection Horizontal spacing overview
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New spacing area
 @subsection New spacing area
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing horizontal spacing
 @subsection Changing horizontal spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Line length
 @subsection Line length
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Proportional notation
 @subsection Proportional notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Fitting music onto fewer pages
 @section Fitting music onto fewer pages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -285,17 +229,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying spacing
 @subsection Displaying spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing spacing
 @subsection Changing spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/es/user/text.itely b/Documentation/es/user/text.itely
index 6d6ed3dacce85e426e2236b975b8e27f726b3ecd..3b0475cf5bfefa056f296e3a97d4057f1386bffd 100644 (file)
--- a/Documentation/es/user/text.itely
+++ b/Documentation/es/user/text.itely
@@ -457,22 +457,22 @@ confusión.
 @node Selecting font and font size
 @subsubsection Selecting font and font size
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Text alignment
 @subsubsection Text alignment
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Graphic notation inside markup
 @subsubsection Graphic notation inside markup
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Music notation inside markup
 @subsubsection Music notation inside markup
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Multi-page markup
 @subsubsection Multi-page markup

diff --git a/Documentation/es/user/tweaks.itely b/Documentation/es/user/tweaks.itely
index 93a873162313af25bec1a52e2faf86fa742f8c8d..8db1ef5cf7585c3c6ad23bb84e8ce70e33a72e64 100644 (file)
--- a/Documentation/es/user/tweaks.itely
+++ b/Documentation/es/user/tweaks.itely
@@ -384,7 +384,7 @@ tresillo corto.
 @end lilypond
 
 Encontrará más detalles de la instrucción @code{\tweak} en
-@ruser{Objects connected to the input}.
+@ruser{The tweak command}.
 
 Si los grupos anidados no comienzan en el mismo momento, su apariencia
 se puede modificar de la forma usual mediante instrucciones

diff --git a/Documentation/es/user/unfretted-strings.itely b/Documentation/es/user/unfretted-strings.itely
index f4f3d08e7bc694c4a9c5e285e9ea64e5798cb181..07df592439e288ef2e7ff73ce386c13fe4f97824 100644 (file)
--- a/Documentation/es/user/unfretted-strings.itely
+++ b/Documentation/es/user/unfretted-strings.itely
@@ -12,7 +12,7 @@
 @node Unfretted string instruments
 @section Unfretted string instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for unfretted strings::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for unfretted strings
 @subsection Common notation for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for unfretted strings::
@@ -32,12 +32,12 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for unfretted strings
 @subsubsection References for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bowed instruments
 @subsection Bowed instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for bowed strings::
@@ -58,7 +58,7 @@ introducen marcando la nota que es un armónico mediante @code{\harmonic}.
 @node Plucked instruments
 @subsection Plucked instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Harp::
@@ -67,5 +67,5 @@ UNTRANSLATED NODE: IGNORE ME
 @node Harp
 @subsubsection Harp
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/es/user/vocal.itely b/Documentation/es/user/vocal.itely
index ecac4f8e53dc3cea5ccf5f931187d16ae4819202..1b26f31db0e296d99b481e98895d4990dce12bab 100644 (file)
--- a/Documentation/es/user/vocal.itely
+++ b/Documentation/es/user/vocal.itely
@@ -583,7 +583,7 @@ se deben insertar a mano.
 @node Skipping notes
 @subsubsection Skipping notes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Extenders and hyphens
 @subsubsection Extenders and hyphens
@@ -620,7 +620,7 @@ Referencia de funcionamiento interno: @rinternals{LyricExtender},
 @node Lyrics and repeats
 @subsubsection Lyrics and repeats
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Placement of lyrics
 @subsection Placement of lyrics
@@ -714,7 +714,7 @@ lyr = \lyricmode { I like my cat! }
 @node Chants
 @subsubsection Chants
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Spacing out syllables
@@ -763,7 +763,7 @@ completa, establezca la propiedad dentro del @q{layout} o disposición.
 @node Centering lyrics between staves
 @subsubsection Centering lyrics between staves
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Stanzas
 @subsection Stanzas

diff --git a/Documentation/es/user/wind.itely b/Documentation/es/user/wind.itely
index 66af9fb7e0503d01f5f1719bb41cc347b20a9983..887830e62616767fa093e4b62b48c3b9724efc57 100644 (file)
--- a/Documentation/es/user/wind.itely
+++ b/Documentation/es/user/wind.itely
@@ -13,7 +13,7 @@
 @node Wind instruments
 @section Wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for wind instruments::
@@ -23,7 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for wind instruments::
@@ -33,17 +33,17 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for wind instruments
 @subsubsection References for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Half-holes
 @subsubsection Half-holes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bagpipes
 @subsection Bagpipes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Bagpipe definitions::

diff --git a/Documentation/es/user/world.itely b/Documentation/es/user/world.itely
index e70032cb5783e3563463fd11b7716f83500e49fb..52a903908d28226c720207330f87e8a135360641 100644 (file)
--- a/Documentation/es/user/world.itely
+++ b/Documentation/es/user/world.itely
@@ -11,9 +11,7 @@
 @node World music
 @section World music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -23,9 +21,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Arabic music
 @subsection Arabic music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -40,49 +36,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for Arabic music
 @unnumberedsubsubsec References for Arabic music 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic note names 
 @unnumberedsubsubsec Arabic note names 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic key signatures
 @unnumberedsubsubsec Arabic key signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic time signatures
 @unnumberedsubsubsec Arabic time signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic music example
 @unnumberedsubsubsec Arabic music example 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Further reading
 @unnumberedsubsubsec Further reading
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/ancient.itely b/Documentation/fr/user/ancient.itely
index 6a1c73f25575097a2bbcf810cde38ce12b9a4338..79f6ff8e52fa89191aa83f3d3ad0a0df25cb7044 100644 (file)
--- a/Documentation/fr/user/ancient.itely
+++ b/Documentation/fr/user/ancient.itely
@@ -11,7 +11,7 @@
 @node Ancient notation
 @section Ancient notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @menu
@@ -113,14 +113,14 @@ Voici les points que nous allons aborder :
 @node Ancient notation supported
 @subsubsection Ancient notation supported
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 
 @node Alternative note signs
 @subsection Alternative note signs
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @menu
@@ -681,7 +681,7 @@ plutôt un @code{\markup}.
 @node Additional note signs
 @subsection Additional note signs
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @menu
@@ -1967,7 +1967,7 @@ s'intégrer avec d'autres préfixes dans n'importe quel ordre.
 @node Pre-defined contexts
 @subsection Pre-defined contexts
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @menu
@@ -2050,7 +2050,7 @@ lancer dans la saisie de votre chant comme ci-après :
 @node Transcribing ancient music
 @subsection Transcribing ancient music
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Ancient and modern from one source::  
@@ -2062,30 +2062,30 @@ UNTRANSLATED NODE: IGNORE ME
 @node Ancient and modern from one source
 @subsubsection Ancient and modern from one source
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Incipits
 @subsubsection Incipits
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Mensurstriche layout
 @subsubsection Mensurstriche layout
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Transcribing Gregorian chant
 @subsubsection Transcribing Gregorian chant
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Editorial markings
 @subsection Editorial markings
 
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Annotational accidentals::    
@@ -2131,5 +2131,5 @@ lancer dans la saisie de votre chant comme ci-après :
 @node Baroque rhythmic notation
 @subsubsection Baroque rhythmic notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/fr/user/changing-defaults.itely b/Documentation/fr/user/changing-defaults.itely
index 5606cb51d4d2b9d4a84b17b177b8f848f1caf5ea..34a76058bd1b1a16480186c218c2c4a960fbb01a 100644 (file)
--- a/Documentation/fr/user/changing-defaults.itely
+++ b/Documentation/fr/user/changing-defaults.itely
@@ -72,7 +72,7 @@ des listes, des chaînes de caractères ou des symboles, en Scheme.}
 @menu
 * Automatic notation::          
 * Interpretation contexts::     
-* The \override command::       
+* The override command::        
 @end menu
 
 
@@ -329,7 +329,7 @@ Ce changement étant appliqué @q{à la volée}, il n'affecte que le second grou
 
 Si l'argument @var{contexte} n'est pas spécifié, alors la propriété cherchera à s'appliquer
 dans le contexte le plus restreint où elle est employée : le plus souvent
- @context{ChordNames}, @context{Voice}, ou @context{Lyrics}.  Dans l'exemple suivant,
+ @code{ChordNames}, @code{Voice}, ou @code{Lyrics}.  Dans l'exemple suivant,
 
 @lilypond[quote,verbatim,relative=2,fragment]
 c8 c c c
@@ -353,8 +353,8 @@ R1*2
 @end lilypond
 
 Les contextes s'organisent de façon hiérarchique : aussi, lorsqu'un contexte de niveau
-supérieur est spécifié (par exemple @context{Staff}), la propriété sera modifée dans
-tous les contextes inférieurs (tous les contextes @context{Voice}, par exemple)
+supérieur est spécifié (par exemple @code{Staff}), la propriété sera modifée dans
+tous les contextes inférieurs (tous les contextes @code{Voice}, par exemple)
 qu'il contient.
 
 @funindex \unset
@@ -565,7 +565,7 @@ La commande suivante :
 @noindent
 rend les hampes plus épaisses (la valeur par défaut est 1.3, ce qui signifie qu'elles 
 sont 1,3 fois plus épaisses que les lignes de la portée).  Dans la mesure où nous avons
-indiqué @context{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ;
+indiqué @code{Staff} comme contexte, ce réglage ne s'appliquera qu'à la portée courante ;
 les autres portées demeureront intactes.
 
 
@@ -578,10 +578,10 @@ c4
 @end lilypond
 
 La commande @code{\override} modifie donc la définition de l'objet @code{Stem}
-dans le contexte @context{Staff} ; toutes les hampes qui suivent seront affectées.
+dans le contexte @code{Staff} ; toutes les hampes qui suivent seront affectées.
 
 Tout comme avec la commande @code{\set}, l'argument @var{contexte} peut être omis, auquel
-cas le contexte par défaut (ici, @context{Voice}) sera employé.  La commande @code{\once}
+cas le contexte par défaut (ici, @code{Voice}) sera employé.  La commande @code{\once}
 permet de n'appliquer la modification qu'une seule fois.
 
 @lilypond[quote,fragment,verbatim,relative=2]
@@ -670,9 +670,9 @@ de la musique dans le bloc @code{\layout}, au moyen de la commande @code{\contex
 @end example
 
 Le raccourci @code{\Staff} invoque les définitions inhérentes au contexte
-@context{Staff}, de façon à ce qu'elles puissent être modifiées.
+@code{Staff}, de façon à ce qu'elles puissent être modifiées.
 
-Les lignes suivantes affecteront toutes les portées (tous les contextes @context{Staff})
+Les lignes suivantes affecteront toutes les portées (tous les contextes @code{Staff})
 dans la partition.
 @example
 \set fontSize = #-2
@@ -717,12 +717,12 @@ avoir invoqué @code{\RemoveEmptyStaffContext} :
 @node Defining new contexts
 @subsection Defining new contexts
 
-Les contextes tels que @context{Staff} ou @code{Voice} sont faits
+Les contextes tels que @code{Staff} ou @code{Voice} sont faits
 de briques de constructions empilées.  En combinant divers graveurs,
 il est possible de créer de nouveaux types de contextes.
 
 Dans l'exemple suivant, on construit, de zéro, un nouveau contexte très
-semblable à @context{Voice}, mais qui n'imprime que des têtes de notes en forme
+semblable à @code{Voice}, mais qui n'imprime que des têtes de notes en forme
 de barres obliques au centre de la portée.  Un tel contexte, par exemple, peut
 servir à indiquer un passage improvisé dans un morceau de jazz.
 
@@ -771,9 +771,9 @@ En lieu et place des points (@dots{}), voici les éléments à saisir :
 \name ImproVoice
 @end example
 
-@item Comme il est très semblable à @context{Voice}, nous souhaitons que toutes les
-commandes associées au @context{Voice} déjà existant, restent valables.  D'où nécessité
-de la commande @code{\alias}, qui va l'associer au contexte @context{Voice} :
+@item Comme il est très semblable à @code{Voice}, nous souhaitons que toutes les
+commandes associées au @code{Voice} déjà existant, restent valables.  D'où nécessité
+de la commande @code{\alias}, qui va l'associer au contexte @code{Voice} :
 
 @example
 \alias Voice
@@ -835,9 +835,9 @@ Récapitulons -- on se retrouve avec le bloc suivant :
 
 @funindex \accepts
 Ce n'est pas tout.  En effet, on veut intégrer le nouveau contexte
-@context{ImproVoice} dans la hiérarchie des contextes.  Tout comme le
+@code{ImproVoice} dans la hiérarchie des contextes.  Tout comme le
 contexte @code{Voice}, sa place est au sein du contexte @code{Staff}.
-Nous allons donc modifier le contexte @context{Staff},
+Nous allons donc modifier le contexte @code{Staff},
 au moyen de la commande @code{\accepts} :
 
 @example
@@ -917,11 +917,11 @@ travaillent de concert.  Comme leurs noms anglais l'indiquent,
 (@code{Staff}), les paroles (@code{Lyrics}) et ainsi de suite ; puis
 @code{VerticalAlignment} synchronise verticalement ces différents groupes.
 En général, il n'y a qu'un seul @code{VerticalAlignment} pour l'ensemble
-de la partition, mais chaque contexte @context{Staff}, @context{Lyrics}, etc.
+de la partition, mais chaque contexte @code{Staff}, @code{Lyrics}, etc.
 possède son propre @code{VerticalAxisGroup}.
 
 
-@node The \override command
+@node The override command
 @section The @code{\override} command
 
 La commande @code{\override} permet de modifier la mise en page
@@ -940,9 +940,9 @@ La propriété @var{propriété} de l'objet @var{objet}, appartenant au contexte
 * Navigating the program reference::  
 * Layout interfaces::           
 * Determining the grob property::  
-* Objects connected to the input::  
-* Using Scheme code instead of \tweak::  
-* \set versus \override::       
+* The tweak command::           
+* Using Scheme code instead of tweak::  
+* set versus override::         
 * Difficult tweaks::            
 @end menu
 
@@ -962,7 +962,7 @@ ressemblent en général à
 Pour élaborer un réglage de ce type, on a besoin de connaître précisément :
 
 @itemize
-@item le contexte : ici @context{Voice} (la voix).
+@item le contexte : ici @code{Voice} (la voix).
 @item l'objet à affecter : ici @code{Stem} (les hampes).
 @item la propriété à modifier : ici @code{thickness} (l'épaisseur du trait).
 @item la valeur désirée : ici @code{3.0} (par défaut, elle est de 1.3).
@@ -1302,7 +1302,7 @@ f
 @end lilypond
 
 
-Dans le cas présent, le réglage intervient dans le contexte @context{Voice},
+Dans le cas présent, le réglage intervient dans le contexte @code{Voice},
 ce qui pouvait également se déduire de la Référence du programme, où la page
 du graveur @rinternals{Fingering_engraver} indique :
 
@@ -1317,8 +1317,8 @@ Le graveur Fingering_engraver fait partie des contextes : @dots{} @rinternals{Vo
 @end quotation
 
 
-@node Objects connected to the input
-@subsection Objects connected to the input
+@node The tweak command
+@subsection The @code{\tweak} command
 
 @funindex \tweak
 
@@ -1367,7 +1367,7 @@ pas directement rendue ; c'est pourquoi le code suivant ne sera d'aucun effet :
 Voir pour plus de détails @ref{Displaying music expressions}.
 
 
-@node Using Scheme code instead of \tweak
+@node Using Scheme code instead of tweak
 @subsection Using Scheme code instead of @code{\tweak}
 
 L'inconvénient principal de la commande @code{\tweak} est la rigidité de sa
@@ -1413,7 +1413,7 @@ Le dernier élément, dans ce bloc @code{let}, est la valeur finale de
 @samp{m} lui-même.
 
 
-@node \set versus \override
+@node set versus override
 @subsection @code{\set} vs. @code{\override}
 
 Si les propriétés peuvent être modifiées de deux façons, par les commandes

diff --git a/Documentation/fr/user/chords.itely b/Documentation/fr/user/chords.itely
index 78a252c38b09e2db47ca2d308cdb0a12fd8852ba..128504ff424a32955d27ed077bf9c4bd79fe059d 100644 (file)
--- a/Documentation/fr/user/chords.itely
+++ b/Documentation/fr/user/chords.itely
@@ -15,7 +15,7 @@
 @node Chord notation
 @section Chord notation
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Chord mode::
@@ -26,7 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Chord mode
 @subsection Chord mode
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Chord mode overview::
@@ -212,12 +212,12 @@ car elle est indiquée en dernier :
 @node Extended and altered chords
 @unnumberedsubsubsec Extended and altered chords
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Displaying chords
 @subsection Displaying chords
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Printing chord names::
@@ -413,12 +413,12 @@ chiffrages étranges.
 @node Customizing chord names
 @unnumberedsubsubsec Customizing chord names
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Figured bass
 @subsection Figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Introduction to figured bass::
@@ -635,9 +635,9 @@ Référence du programme : les objets @rinternals{NewBassFigure},
 @node Entering figured bass
 @unnumberedsubsubsec Entering figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Displaying figured bass
 @unnumberedsubsubsec Displaying figured bass
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated

diff --git a/Documentation/fr/user/editorial.itely b/Documentation/fr/user/editorial.itely
index 4236c4547d7dbc271422ff04d0c0ec757cbc9743..60f4e85fd758308fb8ecf75576adfcc6bdf18d9b 100644 (file)
--- a/Documentation/fr/user/editorial.itely
+++ b/Documentation/fr/user/editorial.itely
@@ -261,7 +261,7 @@ normale ayant un nom similaire.
 
 Vous ne pouvez pas coloriser des notes à l'intérieur d'un accord avec
 @code{\override}. si besoin est, utilisez @code{\tweak}.  
-Pour plus de détails, consultez @ref{Objects connected to the input}.
+Pour plus de détails, consultez @ref{The tweak command}.
 
 
 @node Parentheses

diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely
index 6b3678f063707d6db13c95883ae5e2c4cb5b1907..ec1247bcb28dcee293d26ceb9cf667e27b86e2f5 100644 (file)
--- a/Documentation/fr/user/fretted-strings.itely
+++ b/Documentation/fr/user/fretted-strings.itely
@@ -15,7 +15,7 @@
 @node Fretted string instruments
 @section Fretted string instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for fretted strings::
@@ -26,7 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for fretted strings
 @subsection Common notation for fretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for fretted strings::
@@ -40,7 +40,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for fretted strings
 @subsubsection References for fretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node String number indications
 @subsubsection String number indications
@@ -304,7 +304,7 @@ Référence du programme : @rinternals{StrokeFinger}
 @node Guitar
 @subsection Guitar
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Guitar tablatures::
@@ -314,7 +314,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Guitar tablatures
 @subsubsection Guitar tablatures
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Indicating position and barring
 @subsubsection Indicating position and barring
@@ -373,7 +373,7 @@ Référence du programme : @rinternals{StrokeFinger}
 @node Banjo
 @subsection Banjo
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Banjo tablatures::

diff --git a/Documentation/fr/user/fundamental.itely b/Documentation/fr/user/fundamental.itely
index 9398a9b2c1ea4b9d7a6e21f454d336ffe31d256b..834bbd64250117e17c4ff9c3c440ace85dd71f1a 100644 (file)
--- a/Documentation/fr/user/fundamental.itely
+++ b/Documentation/fr/user/fundamental.itely
@@ -296,17 +296,17 @@ horizontal dans votre éditeur de texte !
 @node Nesting music expressions
 @subsection Nesting music expressions
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node On the un-nestedness of brackets and ties
 @subsection On the un-nestedness of brackets and ties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Voices contain music
 @section Voices contain music
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * I'm hearing Voices::
@@ -317,7 +317,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node I'm hearing Voices
 @subsection I'm hearing Voices
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Explicitly instantiating voices
 @subsection Explicitly instantiating voices
@@ -445,7 +445,7 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 @node Voices and vocals
 @subsection Voices and vocals
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Contexts and engravers
 @section Contexts and engravers
@@ -482,11 +482,11 @@ une altération n'a d'effet que sur une seule portée, tandis qu'une barre de me
 être synchronisée sur toute l'étendue verticale de la partition.
 
 LilyPond regroupe ces règles et ces fragments d'information dans des
-@emph{Contextes}.  Certains contextes sont les voix (contexte @context{Voice}),
-les portées (contexte @context{Staff}), ou la partition dans son ensemble
-(contexte @context{Score}).  Ils sont ordonnés hiérarchiquement : ainsi un
-contexte @context{Staff} peut contenir plusieurs contextes @context{Voice}, et un
-contexte @context{Score} peut contenir plusieurs contextes @context{Staff}.
+@emph{Contextes}.  Certains contextes sont les voix (contexte @code{Voice}),
+les portées (contexte @code{Staff}), ou la partition dans son ensemble
+(contexte @code{Score}).  Ils sont ordonnés hiérarchiquement : ainsi un
+contexte @code{Staff} peut contenir plusieurs contextes @code{Voice}, et un
+contexte @code{Score} peut contenir plusieurs contextes @code{Staff}.
 
 @quotation
 @image{context-example,5cm,,}
@@ -494,14 +494,14 @@ contexte @context{Score} peut contenir plusieurs contextes @context{Staff}.
 
 Chaque contexte est chargé de faire appliquer certaines règles de gravure,
 de créer certains objets, et de prendre en compte les propriétés qui leur
-sont associées.  Ainsi, le contexte @context{Voice} peut faire intervenir une
-altération accidentelle, puis le contexte @context{Staff} devra déterminer si
+sont associées.  Ainsi, le contexte @code{Voice} peut faire intervenir une
+altération accidentelle, puis le contexte @code{Staff} devra déterminer si
 cette dernière devra être imprimée ou non dans la suite de la mesure.  Les barres
-de mesure, enfin, sont alignées verticalement grâce au contexte @context{Score}.
+de mesure, enfin, sont alignées verticalement grâce au contexte @code{Score}.
 
 En revanche, dans une musique polymétrique, par exemple mélant une portée à 3/4
 et une autre à 4/4, les barres de mesures n'ont plus à être alignées : il faut alors 
-modifier les comportement par défaut des contextes @context{Score} et @context{Staff}.
+modifier les comportement par défaut des contextes @code{Score} et @code{Staff}.
 
 Dans une partition très simple, les contextes sont créés implicitement, et peuvent
 être ignorés.  Mais lorsqu'il s'agit de morceaux plus amples -- entendons par là tout
@@ -607,7 +607,7 @@ musique = @{ c4 c4 @}
 ponctuation = @{ s4-. s4-> @}
 @end example
 
-En les envoyant toutes deux dans le même contexte @context{Voice}, on les combine :
+En les envoyant toutes deux dans le même contexte @code{Voice}, on les combine :
 
 @example
 <<
@@ -648,13 +648,13 @@ Cette variante sert à des expressions musicales qui peuvent être interprétée
 plusieurs niveaux.  Par exemple, une commande telle que @code{\applyOutput} (voir
 @c FIXME: broken link
 @c @ruser{Running a function on all layout objects}) : si elle n'est pas associée avec
-@code{\context}, elle s'applique par défaut dans le contexte @context{Voice}.
+@code{\context}, elle s'applique par défaut dans le contexte @code{Voice}.
 
 @example
 \applyOutput #'@var{Contexte} #@var{fonction}   % s'applique dans le contexte Voice
 @end example
 
-Pour l'appliquer au contexte @context{Score} ou @context{Staff}, il faut utiliser :
+Pour l'appliquer au contexte @code{Score} ou @code{Staff}, il faut utiliser :
 
 @example
 \applyOutput #'Score #@var{fonction}
@@ -667,17 +667,17 @@ Pour l'appliquer au contexte @context{Score} ou @context{Staff}, il faut utilise
 @node Engravers explained
 @subsection Engravers explained
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Modifying context properties
 @subsection Modifying context properties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Adding and removing engravers
 @subsection Adding and removing engravers
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Extending the templates
@@ -886,10 +886,10 @@ celloMusic = \relative c {
 @node Four-part SATB vocal score
 @subsection Four-part SATB vocal score
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Building a score from scratch
 @subsection Building a score from scratch
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/fr/user/input.itely b/Documentation/fr/user/input.itely
index 212c32878b418e5578f31f6b77d0bbeace8f79df..32c0fc7765507122d2a02b7b3bf57b2f0c7fd0aa 100644 (file)
--- a/Documentation/fr/user/input.itely
+++ b/Documentation/fr/user/input.itely
@@ -14,9 +14,7 @@
 @node General input and output
 @chapter General input and output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -30,9 +28,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input structure
 @section Input structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -44,33 +40,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node Structure of a score
 @subsection Structure of a score
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Multiple scores in a book
 @subsection Multiple scores in a book
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node File structure
 @subsection File structure
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Titles and headers
 @section Titles and headers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -83,41 +71,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Creating titles
 @subsection Creating titles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Custom titles
 @subsection Custom titles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Reference to page numbers
 @subsection Reference to page numbers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Table of contents
 @subsection Table of contents
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Working with input files
 @section Working with input files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -130,17 +108,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Including LilyPond files
 @subsection Including LilyPond files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Different editions from one source
 @subsection Different editions from one source
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -151,9 +125,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Using variables
 @unnumberedsubsubsec Using variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using tags
@@ -245,25 +217,19 @@ si vous imprimez une partition avec les deux sections balisées.
 @node Text encoding
 @subsection Text encoding
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Displaying LilyPond notation
 @subsection Displaying LilyPond notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Controlling output
 @section Controlling output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -274,25 +240,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Extracting fragments of music
 @subsection Extracting fragments of music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Skipping corrected music
 @subsection Skipping corrected music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node MIDI output
 @section MIDI output
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -306,26 +266,20 @@ UNTRANSLATED NODE: IGNORE ME
 @node Creating MIDI files
 @subsection Creating MIDI files
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Instrument names
 @node MIDI block
 @subsection MIDI block
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node What goes into the MIDI output?
 @subsection What goes into the MIDI output?
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Supported in MIDI
@@ -379,9 +333,7 @@ pourcentage.  Par exemple
 @node Controlling MIDI dynamics
 @subsection Controlling MIDI dynamics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @unnumberedsubsubsec Dynamic marks

diff --git a/Documentation/fr/user/install.itely b/Documentation/fr/user/install.itely
index 7c7de7d1d8df79e6b1e202df165601c1c92384a4..a180700bd1d9b051ee35a1643cb6c8928260f3a2 100644 (file)
--- a/Documentation/fr/user/install.itely
+++ b/Documentation/fr/user/install.itely
@@ -55,9 +55,7 @@ mingw       - Windows x86
 @node Compiling from source
 @section Compiling from source
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @iftex
 Toute cette section ne sera pas traduite, car la compilation de LilyPond
 demande de maîtriser un minimum l'anglais ; reportez-vous donc à

diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely
index 827d26eeeb945161f7fc245beb3445cc1d690b37..7ddfc90c05d6edbc46940bc79e81192c2a10922c 100644 (file)
--- a/Documentation/fr/user/keyboards.itely
+++ b/Documentation/fr/user/keyboards.itely
@@ -36,9 +36,7 @@
 @node References for keyboards
 @subsubsection References for keyboards
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -93,7 +91,7 @@ par définir les portées
 @end example
 
 
-avant d'insérer une mélodie au moyen d'un contexte @context{Voice} :
+avant d'insérer une mélodie au moyen d'un contexte @code{Voice} :
 
 @example
 \context Staff = bas
@@ -316,9 +314,7 @@ Dans ce manuel : @ref{Ties} @qq{laissez vibrer}.
 @node Discant symbols
 @subsubsection Discant symbols
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml

diff --git a/Documentation/fr/user/lilypond-book.itely b/Documentation/fr/user/lilypond-book.itely
index b91a3def3cd6859893c1f72469b934f6b217df26..b55983b47a4cef0d6db39951efa1c5405c1db8ac 100644 (file)
--- a/Documentation/fr/user/lilypond-book.itely
+++ b/Documentation/fr/user/lilypond-book.itely
@@ -11,9 +11,7 @@
 @node LilyPond-book
 @chapter @command{lilypond-book}: Integrating text and music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node An example of a musicological document
 @section An example of a musicological document
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Input
@@ -39,9 +35,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Integrating music and text
 @section Integrating music and text
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -54,33 +48,25 @@ UNTRANSLATED NODE: IGNORE ME
 @node LaTeX
 @subsection @LaTeX{}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Texinfo
 @subsection Texinfo
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node HTML
 @subsection HTML
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node DocBook
 @subsection DocBook
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Common conventions
@@ -90,17 +76,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Music fragment options
 @section Music fragment options
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Invoking lilypond-book
 @section Invoking @command{lilypond-book}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subheading Format-specific instructions
@@ -110,17 +92,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Filename extensions
 @section Filename extensions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Alternate methods of mixing text and music
 @section Alternative methods of mixing text and music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -132,25 +110,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Many quotes from a large score
 @subsection Many quotes from a large score
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Inserting LilyPond output into OpenOffice.org
 @subsection Inserting LilyPond output into OpenOffice.org
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Inserting LilyPond output into other programs
 @subsection Inserting LilyPond output into other programs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/literature.itely b/Documentation/fr/user/literature.itely
index 7fd85faf49344d6b572fa81e86d431720d25db93..36c1d35780d18493523a35848ad68d25307cf174 100644 (file)
--- a/Documentation/fr/user/literature.itely
+++ b/Documentation/fr/user/literature.itely
@@ -11,9 +11,7 @@
 @node Literature list
 @appendix Literature list
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 8c60d92155d9e8a43184304e31341fbfbcc33c0e..78c4e03c1dd1141fb1e49cea1dc2e69f2a802f36 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @ignore
-    Translation of GIT committish: 1440fffdf8579046cc2033b9c697a190b34b91e5
+    Translation of GIT committish: a88c1b861df238ad1c000e6a86926e6f19f2fedd
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  See TRANSLATION for details.
@@ -10,9 +10,11 @@
 
 @c   ***** Displaying text *****
 
-@c we need this since @q{\} doesn't work with makeinfo 4.8 --
-@c say @q{@value{backslash}} instead
-@set backslash \
+@c we need this since @q{\} doesn't work with makeinfo 4.11 --
+@c say @q{@bs} instead
+@macro bs
+\\
+@end macro
 
 @c to get decent quotes in `foo' and ``foo''
 @c  these need to be split up so that "@qq{foo}." looks nice.  :(
@@ -67,6 +69,15 @@
 @end macro
 @end ifdocbook
 
+@ifhtml
+@macro warning{TEXT}
+@cartouche
+@b{Note :} \TEXT\
+@end cartouche
+@end macro
+@end ifhtml
+
+@ifnothtml
 @macro warning{TEXT}
 @quotation
 @quotation
@@ -76,6 +87,7 @@
 @end quotation
 @end quotation
 @end macro
+@end ifnothtml
 
 @ifnotinfo
 @macro notation{TEXT}
@@ -148,18 +160,6 @@
 
 @end macro
 
-@c obsolete, remove when translation is fully updated
-@macro context{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}@c should use rinternals
-@end macro
-
-@c obsolete, remove when translation is fully updated
-@macro refcommand{TEXT}
-@vindex \TEXT\
-@code{\TEXT\}
-@end macro
-
 @macro lydoctitle {TEXT}
 @emph{\TEXT\}
 
@@ -175,31 +175,41 @@
 @c   **** Links and references ****
 
 @c  Definitions for references:
-@c     @rinternals
 @c     @rglos
-@c     @rprogram
-@c     @ruser
 @c     @rlearning
+@c     @ruser
+@c     @rprogram
 @c     @rlsr
+@c     @rinternals
+@c  all these also have a @...named version, which allows to specify the
+@c  displayed text for the reference as second argument
 
-@ifhtml
-@c ***** HTML *****
+
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
 
 @ifset bigpage
 
-@macro rinternals{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
+@ref{\TEXT\,,,music-glossary-big-page,Glossaire}
 @end macro
 
-@macro rglos{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary-big-page,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Glossaire}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Manuel d'initiation}
 @end macro
 
 @macro ruser{TEXT}
@@ -207,39 +217,53 @@
 @ref{\TEXT\,,,lilypond-big-page,Manuel de notation}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning-big-page,Manuel d'initiation}
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Manuel de notation}
 @end macro
 
-@macro rlsr{TEXT}
+@macro rprogram{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@ref{\TEXT\,,,lilypond-program-big-page,Manuel d'utilisation du programme}
 @end macro
 
-@end ifset
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Manuel d'utilisation du programme}
+@end macro
 
+@macro rlsr{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-snippets-big-page,Exemples de code}
+@end macro
 
-@ifclear bigpage
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Exemples de code}
+@end macro
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
 @end macro
 
-@macro rglos{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,,lilypond-internals-big-page,Référence des propriétés internes}
 @end macro
 
-@macro rprogram{TEXT}
+@end ifset
+
+
+@ifclear bigpage
+
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,music-glossary,Glossaire}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
 @end macro
 
 @macro rlearning{TEXT}
@@ -247,27 +271,19 @@
 @ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
 @end macro
 
-@macro rlsr{TEXT}
+@macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Manuel d'initiation}
 @end macro
 
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@ref{\TEXT\,,,lilypond,Manuel de notation}
 @end macro
 
-@macro rglos{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
@@ -275,92 +291,100 @@
 @ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
 @end macro
 
-@macro ruser{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Manuel d'utilisation du programme}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rlsr{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
 @end macro
 
-@macro rlsr{TEXT}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@end macro
+
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
 @end macro
 
-@end ifdocbook
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-internals,Référence des propriétés internes}
+@end macro
 
+@end ifclear
 
-@ifinfo
-@c **** INFO ****
+@end ifnottex
 
-@macro rinternals{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,lilypond-internals,Référence des propriétés internes}
-@end macro
 
-@macro rglos{NAME}
-@vindex \NAME\
-@inforef{\NAME\,,music-glossary,Glossaire}
-@end macro
+@c **** TEX ****
+@iftex
 
-@macro rprogram{TEXT}
+@macro rglos{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Manuel d'utilisation du programme}
+@ref{\TEXT\,,,music-glossary,Glossaire}
 @end macro
 
-@macro ruser{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Manuel de notation}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Glossaire}
 @end macro
 
 @macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Manuel d'initiation}
+@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Exemples de code}
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning.fr,Manuel d'initiation}
 @end macro
 
-@end ifinfo
-
-
-@c **** TEX ****
-@iftex
-
-@macro rinternals{TEXT}
+@macro ruser{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
 @end macro
 
-@macro rglos {TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Glossaire}
+@ref{\TEXT\,,\DISPLAY\,lilypond.fr,Manuel de notation}
 @end macro
 
 @macro rprogram{TEXT}
+@vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program.fr,Manuel d'utilisation du programme}
 @end macro
 
-@macro ruser{TEXT}
-@ref{\TEXT\,,,lilypond.fr,Manuel de notation}
-@end macro
-
-@macro rlearning{TEXT}
-@ref{\TEXT\,,,lilypond-learning.fr,Manuel d'initiation}
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program.fr,Manuel d'utilisation du programme}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Exemples de code}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Exemples de code}
+@end macro
+
+@macro rinternals{TEXT}
+@vindex \TEXT\
+@code{\TEXT\}
+@end macro
+
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@code{\DISPLAY\}
+@end macro
+
 @end iftex
 
 
-@c Commands specific to translated docs
+@c **** Macros specific to translated docs ****
 
 @c ugh, cannot set/define global variable 'translationof' in some way?
 @iftex
@@ -381,3 +405,14 @@
 Cette section n'est pas encore encore traduite, veuillez
 vous reporter à la documentation correspondante en anglais.
 @end macro
+
+@ifhtml
+@macro untranslated
+UNTRANSLATED NODE: IGNORE ME
+@end macro
+@end ifhtml
+
+@ifnothtml
+@macro untranslated
+@end macro
+@end ifnothtml

diff --git a/Documentation/fr/user/notation-appendices.itely b/Documentation/fr/user/notation-appendices.itely
index 7a42e9b9c08554d5f67cafa1cdfcd2d9527b19af..fee2c8fae12235850e7642160deb72addcad0f85 100644 (file)
--- a/Documentation/fr/user/notation-appendices.itely
+++ b/Documentation/fr/user/notation-appendices.itely
@@ -32,17 +32,17 @@
 @node Chord name chart
 @appendixsec Chord name chart
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node MIDI instruments
 @appendixsec MIDI instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node List of colors
 @appendixsec List of colors
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @subsubheading Normal colors
 @subsubheading X color names
@@ -53,12 +53,12 @@ UNTRANSLATED NODE: IGNORE ME
 @node The Feta font
 @appendixsec The Feta font
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Note head styles
 @appendixsec Note head styles
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @ignore
 Vous pouvez utiliser les commandes suivantes au sein d'un bloc
@@ -113,22 +113,22 @@ Voici la liste exhaustive des symboles :
 @node All context properties
 @appendixsec All context properties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Layout properties
 @appendixsec Layout properties
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Identifiers
 @appendixsec Identifiers
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Scheme functions
 @appendixsec Scheme functions
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated

diff --git a/Documentation/fr/user/percussion.itely b/Documentation/fr/user/percussion.itely
index b5b1a751034f7647c1f7bacff110bec42d0a214a..5ce10829ae3acda653179c1ae23290c23f970e3a 100644 (file)
--- a/Documentation/fr/user/percussion.itely
+++ b/Documentation/fr/user/percussion.itely
@@ -38,7 +38,7 @@ montrer le rythme d'une mélodie.
 @subsubsection References for percussion
 
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 
 @node Basic percussion notation

diff --git a/Documentation/fr/user/programming-interface.itely b/Documentation/fr/user/programming-interface.itely
index fd103677f5c7dfcc5210b59d0e1ee2c1cd22386a..dcea5e4f37b741c924e895e27be2733f71ad2e94 100644 (file)
--- a/Documentation/fr/user/programming-interface.itely
+++ b/Documentation/fr/user/programming-interface.itely
@@ -11,9 +11,7 @@
 @node Interfaces for programmers
 @chapter Interfaces for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -28,9 +26,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Music functions
 @section Music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -46,66 +42,50 @@ UNTRANSLATED NODE: IGNORE ME
 @node Overview of music functions
 @subsection Overview of music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Simple substitution functions
 @subsection Simple substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Paired substitution functions
 @subsection Paired substitution functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Mathematics in functions
 @subsection Mathematics in functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Void functions
 @subsection Void functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Functions without arguments
 @subsection Functions without arguments
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Overview of available music functions
 @subsection Overview of available music functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @include identifiers.tely
 @node Programmer interfaces
 @section Programmer interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -116,25 +96,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Input variables and Scheme
 @subsection Input variables and Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Internal music representation
 @subsection Internal music representation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Building complicated functions
 @section Building complicated functions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -147,41 +121,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying music expressions
 @subsection Displaying music expressions
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music properties
 @subsection Music properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Doubling a note with slurs (example)
 @subsection Doubling a note with slurs (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Adding articulation to notes (example)
 @subsection Adding articulation to notes (example)
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Markup programmer interface
 @section Markup programmer interface
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -194,41 +158,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Markup construction in Scheme
 @subsection Markup construction in Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node How markups work internally
 @subsection How markups work internally
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup command definition
 @subsection New markup command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New markup list command definition
 @subsection New markup list command definition
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Contexts for programmers
 @section Contexts for programmers
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -239,24 +193,18 @@ UNTRANSLATED NODE: IGNORE ME
 @node Context evaluation
 @subsection Context evaluation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Running a function on all layout objects
 @subsection Running a function on all layout objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Scheme procedures as properties
 @section Scheme procedures as properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @c -- SKELETON FILE --

diff --git a/Documentation/fr/user/running.itely b/Documentation/fr/user/running.itely
index 9137288bc36c31673b8a3550c545938de2db9306..208ec73016dff05f8f6070203ce3764286c284e0 100644 (file)
--- a/Documentation/fr/user/running.itely
+++ b/Documentation/fr/user/running.itely
@@ -11,9 +11,7 @@
 @node Running LilyPond
 @chapter Running LilyPond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -27,17 +25,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Normal usage
 @section Normal usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command-line usage
 @section Command-line usage
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -49,41 +43,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Invoking lilypond
 @subsection Invoking lilypond
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Command line options
 @subsection Command line options
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Environment variables
 @subsection Environment variables
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Error messages
 @section Error messages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Updating files with convert-ly
 @section Updating with @command{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @subsection Command line options
@@ -94,17 +78,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Problems with convert-ly
 @subsection Problems with @code{convert-ly}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Reporting bugs
 @section Reporting bugs
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/scheme-tutorial.itely b/Documentation/fr/user/scheme-tutorial.itely
index 8e84141b5010924b047bd9c0760b1fced038a9bd..43d89abc7851193a84ab9b7bd9f9fc3c1f1a01fd 100644 (file)
--- a/Documentation/fr/user/scheme-tutorial.itely
+++ b/Documentation/fr/user/scheme-tutorial.itely
@@ -11,9 +11,7 @@
 @node Scheme tutorial
 @appendix Scheme tutorial
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -23,9 +21,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Tweaking with Scheme
 @appendixsec Tweaking with Scheme
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/setup.itely b/Documentation/fr/user/setup.itely
index 0c9541c8d5c2662d6f14437d9f754ae60282d665..44f4ca245ca44be633da7ba07e0e98861bce01df 100644 (file)
--- a/Documentation/fr/user/setup.itely
+++ b/Documentation/fr/user/setup.itely
@@ -11,9 +11,7 @@
 @node Setup
 @chapter Setup
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -25,9 +23,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Setup for specific Operating Systems
 @section Setup for specific Operating Systems
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -37,17 +33,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node MacOS X on the command-line
 @subsection MacOS X on the command-line
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Text editor support
 @section Text editor support
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -62,57 +54,43 @@ UNTRANSLATED NODE: IGNORE ME
 @node Emacs mode
 @subsection Emacs mode
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vim mode
 @subsection Vim mode
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node jEdit
 @subsection jEdit
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node TexShop
 @subsection TexShop
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node TextMate
 @subsection TextMate
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node LilyKDE
 @subsection LilyKDE
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Point and click
 @section Point and click
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/fr/user/spacing.itely b/Documentation/fr/user/spacing.itely
index ef876267474a19122bbe3f502fee68cb2e7b76ce..29e0b8ba31626c3871925c0c2c0a5f30bf5ee3ed 100644 (file)
--- a/Documentation/fr/user/spacing.itely
+++ b/Documentation/fr/user/spacing.itely
@@ -25,9 +25,7 @@
 @node Paper and pages
 @section Paper and pages
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -38,25 +36,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Paper size
 @subsection Paper size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page formatting
 @subsection Page formatting
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Music layout
 @section Music layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -67,25 +59,19 @@ UNTRANSLATED NODE: IGNORE ME
 @node Setting the staff size
 @subsection Setting the staff size
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Score layout
 @subsection Score layout
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Breaks
 @section Breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -101,65 +87,49 @@ UNTRANSLATED NODE: IGNORE ME
 @node Line breaking
 @subsection Line breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Page breaking
 @subsection Page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page breaking
 @subsection Optimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Optimal page turning
 @subsection Optimal page turning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Minimal page breaking
 @subsection Minimal page breaking
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit breaks
 @subsection Explicit breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Using an extra voice for breaks
 @subsection Using an extra voice for breaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing
 @section Vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -173,49 +143,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Vertical spacing inside a system
 @subsection Vertical spacing inside a system
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical spacing between systems
 @subsection Vertical spacing between systems
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Explicit staff and system positioning
 @subsection Explicit staff and system positioning
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Two-pass vertical spacing
 @subsection Two-pass vertical spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Vertical collision avoidance
 @subsection Vertical collision avoidance
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Horizontal spacing
 @section Horizontal Spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -229,41 +187,31 @@ UNTRANSLATED NODE: IGNORE ME
 @node Horizontal spacing overview
 @subsection Horizontal spacing overview
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node New spacing area
 @subsection New spacing area
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing horizontal spacing
 @subsection Changing horizontal spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Line length
 @subsection Line length
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Proportional notation
 @subsection Proportional notation
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Fitting music onto fewer pages
@@ -277,9 +225,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Displaying spacing
 @subsection Displaying spacing
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Changing spacing

diff --git a/Documentation/fr/user/templates.itely b/Documentation/fr/user/templates.itely
index c6cd0e1c337b8d6cb4d0ae8ffb15d0bd53b235d8..86418b2a12398def7838908611cff5ec3ed9a472 100644 (file)
--- a/Documentation/fr/user/templates.itely
+++ b/Documentation/fr/user/templates.itely
@@ -11,9 +11,7 @@
 @node Templates
 @appendix Templates
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -29,9 +27,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Single staff
 @appendixsec Single staff
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec Notes only
@@ -41,9 +37,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Piano templates
 @appendixsec Piano templates
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec Solo piano
@@ -53,9 +47,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node String quartet
 @appendixsec String quartet
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec String quartet
@@ -63,9 +55,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Vocal ensembles
 @appendixsec Vocal ensembles
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec SATB vocal score
@@ -74,9 +64,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Ancient notation templates
 @appendixsec Ancient notation templates
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec Transcription of mensural music
@@ -84,17 +72,13 @@ UNTRANSLATED NODE: IGNORE ME
 @node Jazz combo
 @appendixsec Jazz combo
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node lilypond-book templates
 @appendixsec lilypond-book templates
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @appendixsubsec LaTeX

diff --git a/Documentation/fr/user/tweaks.itely b/Documentation/fr/user/tweaks.itely
index 8cae3c4720556cf09358d0cb08cb1fc328127897..e8bf011654cd58ee70c6000a86c7c13caca84cd1 100644 (file)
--- a/Documentation/fr/user/tweaks.itely
+++ b/Documentation/fr/user/tweaks.itely
@@ -32,9 +32,7 @@ quasiment chaque élément de votre partition.
 @node Tweaking basics
 @section Tweaking basics
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Introduction to tweaks::      
@@ -46,37 +44,27 @@ UNTRANSLATED NODE: IGNORE ME
 @node Introduction to tweaks
 @subsection Introduction to tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Objects and interfaces
 @subsection Objects and interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Naming conventions of objects and properties
 @subsection Naming conventions of objects and properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Tweaking methods
 @subsection Tweaking methods
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node The Internals Reference manual
 @section The Internals Reference manual
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Properties of layout objects::  
@@ -87,30 +75,22 @@ UNTRANSLATED NODE: IGNORE ME
 @node Properties of layout objects
 @subsection Properties of layout objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Properties found in interfaces
 @subsection Properties found in interfaces
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Types of properties
 @subsection Types of properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Appearance of objects
 @section Appearance of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Visibility and color of objects::  
@@ -121,30 +101,22 @@ UNTRANSLATED NODE: IGNORE ME
 @node Visibility and color of objects
 @subsection Visibility and color of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Size of objects
 @subsection Size of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Length and thickness of objects
 @subsection Length and thickness of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Placement of objects
 @section Placement of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @menu
 * Automatic behavior::          
@@ -155,23 +127,17 @@ UNTRANSLATED NODE: IGNORE ME
 @node Automatic behavior
 @subsection Automatic behavior
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Within-staff objects
 @subsection Within-staff objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Outside staff objects
 @subsection Outside staff objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Collisions of objects
@@ -377,9 +343,7 @@ les plus communs :
 @node Real music example
 @subsection Real music example
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @c DEPRECATED SECTION
@@ -532,16 +496,12 @@ consultez les sections correspondantes de la Référence du programme.
 @node Other uses for tweaks
 @subsection Other uses for tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Using variables for tweaks
 @subsection Using variables for tweaks
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 @node Other sources of information
 @subsection Other sources of information

diff --git a/Documentation/fr/user/unfretted-strings.itely b/Documentation/fr/user/unfretted-strings.itely
index 6f92d1380d0f5b31459323149ae2086120af7c55..75c145c51390778ae2521440ed5edfc39dfd1e6a 100644 (file)
--- a/Documentation/fr/user/unfretted-strings.itely
+++ b/Documentation/fr/user/unfretted-strings.itely
@@ -27,7 +27,7 @@ l'écriture pour les cordes frottées.
 @node Common notation for unfretted strings
 @subsection Common notation for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for unfretted strings::
@@ -36,12 +36,12 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for unfretted strings
 @subsubsection References for unfretted strings
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bowed instruments
 @subsection Bowed instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for bowed strings::
@@ -64,7 +64,7 @@ par @code{\harmonic}.
 @node Plucked instruments
 @subsection Plucked instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Harp::
@@ -73,5 +73,5 @@ UNTRANSLATED NODE: IGNORE ME
 @node Harp
 @subsubsection Harp
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 

diff --git a/Documentation/fr/user/vocal.itely b/Documentation/fr/user/vocal.itely
index 588874f8185b7d32e0c561ef5c3e07a805b5ca72..2d14d152f064f60cb0be636e415a24b6c45e8568 100644 (file)
--- a/Documentation/fr/user/vocal.itely
+++ b/Documentation/fr/user/vocal.itely
@@ -572,9 +572,7 @@ alors prolonger vous-même les syllabes concernées.
 @node Skipping notes
 @subsubsection Skipping notes
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -613,9 +611,7 @@ Référence du programme : @rinternals{LyricExtender},
 @node Lyrics and repeats
 @subsubsection Lyrics and repeats
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -711,9 +707,7 @@ lyr = \lyricmode { I like my cat! }
 @node Chants
 @subsubsection Chants
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml
@@ -764,9 +758,7 @@ dans le bloc @code{\layout}.
 @node Centering lyrics between staves
 @subsubsection Centering lyrics between staves
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 @ifnothtml
 @englishref
 @end ifnothtml

diff --git a/Documentation/fr/user/wind.itely b/Documentation/fr/user/wind.itely
index 31a39de7fffd863560c455778a8c0576fdb666b3..4b0b5c89ad5526c4502499c4713a71ce5e676682 100644 (file)
--- a/Documentation/fr/user/wind.itely
+++ b/Documentation/fr/user/wind.itely
@@ -15,7 +15,7 @@
 @node Wind instruments
 @section Wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Common notation for wind instruments::
@@ -25,7 +25,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * References for wind instruments::
@@ -35,17 +35,17 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for wind instruments
 @subsubsection References for wind instruments
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Half-holes
 @subsubsection Half-holes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @node Bagpipes
 @subsection Bagpipes
 
-UNTRANSLATED NODE: IGNORE ME
+@untranslated
 
 @menu
 * Bagpipe definitions::

diff --git a/Documentation/fr/user/world.itely b/Documentation/fr/user/world.itely
index e7f3ddb4c046d9a7c3404b96e49026fedb130830..ba94ae24438d71a0801e7fbbc6a2b3c072b0b63a 100644 (file)
--- a/Documentation/fr/user/world.itely
+++ b/Documentation/fr/user/world.itely
@@ -11,9 +11,7 @@
 @node World music
 @section World music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -23,9 +21,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Arabic music
 @subsection Arabic music
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -40,49 +36,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node References for Arabic music
 @unnumberedsubsubsec References for Arabic music 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic note names 
 @unnumberedsubsubsec Arabic note names 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic key signatures
 @unnumberedsubsubsec Arabic key signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic time signatures
 @unnumberedsubsubsec Arabic time signatures 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Arabic music example
 @unnumberedsubsubsec Arabic music example 
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node Further reading
 @unnumberedsubsubsec Further reading
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 05de5724b0a30cd39c311a3602615f00f8d4bd0c..3822b3a2bfa9721a2020e2658c3666fb304413b8 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -49,13 +49,13 @@
          <ul>
            <li>
            <a class="title"
-href="user/lilypond-learning/index.html">Learning Manual (LM)</a>
+href="user/lilypond-learning/index.html">Learning Manual</a>
 (in <a class="title" href="user/lilypond-learning-big-page.html">one big page</a> ~ 1.5 MB,
 in <a class="title" href="user/lilypond-learning.pdf">PDF</a>)
              <br>(start here)
 
           <li><a class="title"
-href="user/music-glossary/index.html">Music Glossary (MG)</a>
+href="user/music-glossary/index.html">Music Glossary</a>
 (in <a class="title" href="user/music-glossary-big-page.html">one big page</a> ~ 500 kB,
 in <a class="title" href="user/music-glossary.pdf">PDF</a>)
 
@@ -80,14 +80,14 @@ in <a class="title" href="user/music-glossary.pdf">PDF</a>)
          <ul>
            <li>
 <a class="title" href="user/lilypond/index.html">Notation
-Reference (NR)</a>
+Reference</a>
 (in <a class="title" href="user/lilypond-big-page.html">one big page</a> ~ 4 MB,
 in <a class="title" href="user/lilypond.pdf">PDF</a>)
      <br>(writing music in LilyPond)
 
        <li>
  <a  class="title"
-href="user/lilypond-internals/index.html">Internals Reference (IR)</a>
+href="user/lilypond-internals/index.html">Internals Reference</a>
  (in <a class="title" href="user/lilypond-internals-big-page.html">one big page</a> ~ 1 MB)
      <br>(definitions for tweaking)
         
@@ -98,12 +98,12 @@ href="user/lilypond-internals/index.html">Internals Reference (IR)</a>
          <ul>
               <li>
            <a class="title"
-href="user/lilypond-program/index.html">Application Usage (AU)</a>
+href="user/lilypond-program/index.html">Application Usage</a>
 (in <a class="title" href="user/lilypond-program-big-page.html">one big page</a>,
 in <a class="title" href="user/lilypond-program.pdf">PDF</a>)
            <br>(how to install and run the program)
 
-<li><a class="title"href="../input/lsr/lilypond-snippets/index.html">Snippets List (SL)</a>
+<li><a class="title"href="../input/lsr/lilypond-snippets/index.html">Snippets List</a>
 (in <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">one big page</a> ~ 2MB,
 in <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
      <br>(Short tricks, tips, and examples)

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 5e6ff487e26c9ea98047657607924cab7fd06e67..cafa877cf104867ced2ad2109b5bf5a053bb2605 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -66,29 +66,56 @@ which scares away people.
 @end ignore
 
 @item
-A few syntax changes were made:
+Predefined, user-configurable, transposable fret diagrams
+are now available in the FretBoards context:
+@lilypond[]
+\include "predefined-guitar-fretboards.ly"
+<<
+  \new ChordNames {
+   \chordmode {
+      c1 \transpose c e { c }
+    }
+  }
+  \new FretBoards {
+    \chordmode {
+      c1 \transpose c e { c }
+    }
+  }
+>>
+@end lilypond
+
+@item
+The following syntax changes were made, in chronological order. In
+addition, fret diagram properties have been moved to
+@code{fret-diagram-details}, and @code{#'style} property is used to
+select solid/dashed lines instead of @code{#'dash-fraction}.
+
 @example
-2.11.23: #'break-align-symbol -> #'break-align-symbols
-2.11.35: scripts.caesura -> scripts.caesura.curved.
-Use #'style not #'dash-fraction to select solid/dashed lines.
-2.11.38: \setEasyHeads -> \easyHeadsOn, \fatText -> \textLengthOn,
+#'break-align-symbol -> #'break-align-symbols
+scripts.caesura -> scripts.caesura.curved
+\setEasyHeads -> \easyHeadsOn
+\easyHeadsOff (new command)
+\fatText -> \textLengthOn
 \emptyText -> \textLengthOff
-2.11.46: \set hairpinToBarline -> \override Hairpin #'to-barline
-2.11.48: \compressMusic -> \scaleDurations
-2.11.50: metronomeMarkFormatter uses text markup as second
-argument,
-fret diagram properties moved to fret-diagram-details.
-2.11.51: \octave -> \octaveCheck, \arpeggioUp -> \arpeggioArrowUp,
-\arpeggioDown -> \arpeggioArrowDown, \arpeggioNeutral ->
-\arpeggioNormal,
-\setTextCresc -> \crescTextCresc, \setTextDecresc ->
-\dimTextDecresc,
-\setTextDecr -> \dimTextDecr, \setTextDim -> \dimTextDim,
-\setHairpinCresc -> \crescHairpin, \setHairpinDecresc ->
-\dimHairpin,
-\sustainUp -> \sustainOff, \sustainDown -> \sustainOn
-\sostenutoDown -> \sostenutoOn, \sostenutoUp -> \sostenutoOff
-2.11.53: infinite-spacing-height -> extra-spacing-height
+\set hairpinToBarline -> \override Hairpin #'to-barline
+\compressMusic -> \scaleDurations
+\octave -> \octaveCheck
+\arpeggioUp -> \arpeggioArrowUp
+\arpeggioDown -> \arpeggioArrowDown
+\arpeggioNeutral -> \arpeggioNormal
+\setTextCresc -> \crescTextCresc
+\setTextDecresc -> \dimTextDecresc
+\setTextDecr -> \dimTextDecr
+\setTextDim -> \dimTextDim
+\setHairpinCresc -> \crescHairpin
+\setHairpinDecresc -> \dimHairpin
+\sustainUp -> \sustainOff
+\sustainDown -> \sustainOn
+\sostenutoDown -> \sostenutoOn
+\sostenutoUp -> \sostenutoOff
+infinite-spacing-height -> extra-spacing-height
+#(set-octavation oct) -> \ottava #oct
+\put-adjacent markup axis dir markup -> \put-adjacent axis dir markup markup
 @end example
 
 @item
@@ -111,15 +138,6 @@ using the @code{rounded-box} command.
 to guess the line width, thanks to @code{--latex-program} command line
 option.
 
-@item
-@code{\setEasyHeads} has been renamed to @code{\easyHeadsOn}, and a new
-command @code{\easyHeadsOff} reverts note heads to normal heads.
-
-@item
-@code{\fatText}, @code{\emptyText} and @code{\compressMusic} have been
-renamed to @code{\textLengthOn}, @code{\textLengthOff} and
-@code{\scaleDurations}, respectively.
-
 @item
 Underlining is now possible with the @code{\underline} markup command.
 
@@ -178,7 +196,6 @@ their end points.  This includes glissando, voice followers, text
 crescendos and other text spanners.  The old syntax for setting
 text on line spanners is no longer valid.
 
-@c  with ragged-right we can't see the gliss.
 @lilypond[]
 \relative c'' {
   \override Glissando #'bound-details #'right #'text = \markup { \hcenter \bold down }
@@ -187,6 +204,8 @@ text on line spanners is no longer valid.
   \override Glissando #'bound-details #'left #'arrow = ##t
   \override Glissando #'bound-details #'left #'padding = #3.0
   \override Glissando #'style = #'trill
+  \override Glissando #'springs-and-rods = #ly:spanner::set-spacing-rods
+  \override Glissando #'minimum-length = #12
   
   c1 \glissando c'
 }
@@ -290,13 +309,13 @@ duration and count (if given) are shown in parentheses after the text.
   \tempo "Fast"
   c'4 c' c' c'
   c'4 c' c' c'
-  \tempo "Andante" 4=120
+  \tempo "Andante" 4 = 120
   c'4 c' c' c'
   c'4 c' c' c'
-  \tempo 4=100
+  \tempo 4 = 100
   c'4 c' c' c'
   c'4 c' c' c'
-  \tempo "" 4=30
+  \tempo "" 4 = 30
   c'4 c' c' c'
   c'4 c' c' c'
 }

diff --git a/Documentation/user/ancient.itely b/Documentation/user/ancient.itely
index c6b489a8275dd31ed661210df0e0f2ea7536f09f..f641269f2b3fea9dc061243c6eecd563585ecdce 100644 (file)
--- a/Documentation/user/ancient.itely
+++ b/Documentation/user/ancient.itely
@@ -150,7 +150,7 @@ a'\maxima a'\longa a'\breve a'1 a'2 a'4 a'8 a'16 a'
 @end lilypond
 
 When typesetting a piece in Gregorian chant notation, the
-@rinternals{Gregorian_ligature_engraver} automatically selects the proper
+@rinternals{Vaticana_ligature_engraver} automatically selects the proper
 note heads, so there is no need to explicitly set the note head style. 
 Still, the note head style can be set, e.g., to @code{vaticana_punctum} to
 produce punctum neumes.  Similarly, the

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 719e0fb89858001f83577a77649676040c8846f2..a6a4087d975a20106ffadd037f2611c69e42678e 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -26,14 +26,7 @@ particular effect.
 @cindex Internals Reference
 
 The controls available for tuning are described in a separate
-document, the
-@iftex
-Internals Reference manual.
-@end iftex
-@ifnottex
-@ref{Top,Internals Reference,,lilypond-internals}.
-@end ifnottex
-That manual
+document: @rinternalsnamed{Top,the Internals Reference}.  That manual
 lists all different variables, functions and options available in
 LilyPond.  It is written as a HTML document, which is available
 @c leave the @uref as one long line.
@@ -73,13 +66,13 @@ on entering numbers, lists, strings, and symbols in Scheme.}
 
 
 @menu
-* Interpretation contexts::
-* Explaining the Internals Reference::
-* Modifying properties::
-* Useful concepts and properties::
-* Common properties::
-* Advanced tweaks::
-* Discussion of specific tweaks::
+* Interpretation contexts::     
+* Explaining the Internals Reference::  
+* Modifying properties::        
+* Useful concepts and properties::  
+* Common properties::           
+* Advanced tweaks::             
+* Discussion of specific tweaks::  
 @end menu
 
 
@@ -89,12 +82,12 @@ on entering numbers, lists, strings, and symbols in Scheme.}
 This section describes what contexts are, and how to modify them.
 
 @menu
-* Contexts explained::
-* Creating contexts::
-* Modifying context plug-ins::
-* Changing context default settings::
-* Defining new contexts::
-* Aligning contexts::
+* Contexts explained::          
+* Creating contexts::           
+* Modifying context plug-ins::  
+* Changing context default settings::  
+* Defining new contexts::       
+* Aligning contexts::           
 @end menu
 
 
@@ -127,10 +120,10 @@ further explanation and with links to the IR.
 Contexts are arranged heirarchically:
 
 @menu
-* Score - the master of all contexts::
-* Top-level contexts - staff containers::
-* Intermediate-level contexts - staves::
-* Bottom-level contexts - voices::
+* Score - the master of all contexts::  
+* Top-level contexts - staff containers::  
+* Intermediate-level contexts - staves::  
+* Bottom-level contexts - voices::  
 @end menu
 
 @node Score - the master of all contexts
@@ -540,7 +533,7 @@ time signature.
 @subsection Changing context default settings
 
 The adjustments of the previous subsections (
-@ref{The \set command}, @ref{Modifying context plug-ins}, and
+@ref{The set command}, @ref{Modifying context plug-ins}, and
 @ref{Overview of modifying properties}) can also be entered
 separately from the music in the @code{\layout} block,
 
@@ -702,7 +695,7 @@ The notes look like a slash, and have no stem,
 
 All these plug-ins have to cooperate, and this is achieved with a
 special plug-in, which must be marked with the keyword @code{\type}.
-This should always be @rinternals{Engraver_group},
+This should always be @code{Engraver_group}.
 
 @example
 \type "Engraver_group"
@@ -803,10 +796,10 @@ ossia = { f4 f f f }
 
 
 @menu
-* Navigating the program reference::
-* Layout interfaces::
-* Determining the grob property::
-* Naming conventions::
+* Navigating the program reference::  
+* Layout interfaces::           
+* Determining the grob property::  
+* Naming conventions::          
 @end menu
 
 @node Navigating the program reference
@@ -838,9 +831,9 @@ Internals Reference: @rinternals{Fingering}.
 @c  outdated info; probably will delete.
 @ignore
 This fragment points to two parts of the program reference: a page
-on @code{FingerEvent} and one on @code{Fingering}.
+on @code{FingeringEvent} and one on @code{Fingering}.
 
-The page on @code{FingerEvent} describes the properties of the music
+The page on @code{FingeringEvent} describes the properties of the music
 expression for the input @code{-2}.  The page contains many links
 forward.  For example, it says
 
@@ -856,7 +849,7 @@ plug-in, which says
 This engraver creates the following layout objects: @rinternals{Fingering}.
 @end quotation
 
-In other words, once the @code{FingerEvent}s are interpreted, the
+In other words, once the @code{FingeringEvent}s are interpreted, the
 @code{Fingering_engraver} plug-in will process them.
 @end ignore
 
@@ -902,7 +895,7 @@ Music types accepted: @rinternals{fingering-event}
 
 @item @rinternals{fingering-event}:
 Music event type @code{fingering-event} is in Music expressions named
-@rinternals{FingerEvent}
+@rinternals{FingeringEvent}
 @end itemize
 
 This path goes against the flow of information in the program: it
@@ -1124,11 +1117,11 @@ LP-specific?
 @section Modifying properties
 
 @menu
-* Overview of modifying properties::
-* The \set command::
-* The \override command::
-* \set versus \override::
-* Objects connected to the input::
+* Overview of modifying properties::  
+* The set command::             
+* The override command::        
+* set versus override::         
+* The tweak command::           
 @end menu
 
 
@@ -1246,7 +1239,7 @@ or crashes, or both.
 
 
 
-@node The \set command
+@node The set command
 @subsection The @code{\set} command
 
 @cindex properties
@@ -1371,7 +1364,7 @@ Translation @expansion{} Tunable context properties.
 
 
 
-@node The \override command
+@node The override command
 @subsection The @code{\override} command
 
 Commands which change output generally look like
@@ -1413,7 +1406,7 @@ We demonstrate how to glean this information from the notation manual
 and the program reference.
 
 
-@node \set versus \override
+@node set versus override
 @subsection @code{\set} vs. @code{\override}
 
 We have seen two methods of changing properties: @code{\set} and
@@ -1464,8 +1457,8 @@ objects.  Since this is a common change, the special
 property (modified with @code{\set}) was created.
 
 
-@node Objects connected to the input
-@subsection Objects connected to the input
+@node The tweak command
+@subsection The @code{\tweak} command
 
 TODO: can't use \tweak in a variable
 
@@ -1518,10 +1511,10 @@ details.
 
 
 @menu
-* Input modes::
-* Direction and placement::
-* Distances and measurements::
-* Spanners::
+* Input modes::                 
+* Direction and placement::     
+* Distances and measurements::  
+* Spanners::                    
 @end menu
 
 @node Input modes
@@ -1737,17 +1730,12 @@ restricted to a sub-set of the spanners.
 @section Common properties
 
 @menu
-* Controlling visibility of objects::
-* Line styles::
-* Rotating objects::
-* Aligning objects::
+* Controlling visibility of objects::  
+* Line styles::                 
+* Rotating objects::            
+* Aligning objects::            
 @end menu
 
-@c TODO Add new subsection Shapes of objects
-@c which would include Slur shapes
-@c with a Known issue: can't modify shapes with 'control-points if there are
-@c more than one at the same musical moment
-
 @node Controlling visibility of objects
 @subsection Controlling visibility of objects
 
@@ -1768,11 +1756,11 @@ certain layout objects.  These are covered under Special
 considerations.
 
 @menu
-* Removing the stencil::
-* Making objects transparent::
-* Painting objects white::
-* Using break-visibility::
-* Special considerations::
+* Removing the stencil::        
+* Making objects transparent::  
+* Painting objects white::      
+* Using break-visibility::      
+* Special considerations::      
 @end menu
 
 
@@ -2256,8 +2244,8 @@ Both layout objects and elements of markup text can be rotated by
 any angle about any point, but the method of doing so differs.
 
 @menu
-* Rotating layout objects::
-* Rotating markup::
+* Rotating layout objects::     
+* Rotating markup::             
 @end menu
 
 @node Rotating layout objects
@@ -2322,10 +2310,10 @@ fis^\markup { \rotate #30 "an F-Sharp" }
 @section Advanced tweaks
 
 @menu
-* Vertical grouping of grobs::
-* Modifying ends of spanners::
-* Modifying stencils::
-* Modifying shapes::
+* Vertical grouping of grobs::  
+* Modifying ends of spanners::  
+* Modifying stencils::          
+* Modifying shapes::            
 @end menu
 
 
@@ -2348,23 +2336,148 @@ VerticalAxisGroup.
 @subsection Modifying ends of spanners
 
 @c FIXME Write this section
+@c See earlier material in Line styles
 
 @node Modifying stencils
 @subsection Modifying stencils
 
-@c FIXME Write this section
+All layout objects have a @code{stencil} property which is part of
+the @code{grob-interface}.  By default, this property is usually
+set to a function specific to the object that is tailor-made to
+render the symbol which represents it in the output.  For example,
+the standard setting for the @code{stencil} property of the
+@code{MultiMeasureRest} object is @code{ly:multi-measure-rest::print}.
+
+The standard symbol for any object can be replaced by modifying the
+@code{stencil} property to reference a different, specially-written,
+procedure.  This requires a high level of knowledge of the internal
+workings of LilyPond, but there is an easier way which can often
+produce adequate results.
+
+This is to set the @code{stencil} property to the procedure which
+prints text -- @code{ly:text-interface::print} -- and to add a
+@code{text} property to the object which is set to contain the
+markup text which produces the required symbol.  Due to the
+flexibility of markup, much can be achieved -- see in particular
+@ref{Graphic notation inside markup}.
+
+The following example demonstrates this by changing the note head
+symbol to a cross within a circle.
+
+@lilypond[verbatim,quote]
+XinO = {
+  \once \override NoteHead  #'stencil = #ly:text-interface::print
+  \once \override NoteHead #'text = \markup {
+    \combine
+      \halign #-0.7 \draw-circle #0.85 #0.2 ##f
+      \musicglyph #"noteheads.s2cross"
+  }
+}
+\relative c'' {
+  a a \XinO a a
+}
+@end lilypond
+
+Any of the glyphs in the feta Font can be supplied to the
+@code{\musicglyph} markup command -- see @ref{The Feta font}.
+
+@c TODO Add inserting eps files or ref to later
+
+@c TODO Add inserting Postscript or ref to later
+
+@seealso
+
+Notation Reference:
+@ref{Graphic notation inside markup},
+@ref{Formatting text},
+@ref{Text markup commands},
+@ref{The Feta font}.
+
 
 @node Modifying shapes
 @subsection Modifying shapes
 
-@c FIXME Write this section
-@c Discussion of Bezier curves and the control-points property
+@menu
+* Modifying ties and slurs::
+@end menu
+
+@node Modifying ties and slurs
+@unnumberedsubsubsec Modifying ties and slurs
+
+Ties, slurs and phrasing slurs are drawn as third-order Bézier
+curves.  If the shape of the tie or slur which is calculated
+automatically is not optimum, the shape may be modified manually by
+explicitly specifying the four control points required to define
+a third-order Bézier curve.
+
+Third-order or cubic Bézier curves are defined by four control
+points.  The first and fourth control points are precisely the
+starting and ending points of the curve.  The intermediate two
+control points define the shape.  Animations showing how the curve
+is drawn can be found on the web, but the following description
+may be helpful.  The curve starts from the first control point
+heading directly towards the second, gradually bending over to
+head towards the third and continuing to bend over to head towards
+the fourth, arriving there travelling directly from the third
+control point.  The curve is entirely contained in the
+quadrilateral defined by the four control points.
+
+Here is an example of a case where the tie is not optimum, and
+where @code{\tieDown} would not help.
+
+@lilypond[verbatim,quote,relative=1]
+<<
+  { e1 ~ e }
+\\
+  { r4 <g c,> <g c,> <g c,> }
+>>
+@end lilypond
+
+One way of improving this tie is to manually modify its control
+points, as follows.
+
+The coordinates of the Bézier control points are specified in units
+of staff-spaces.  The X@tie{}coordinate is relative to the reference
+point of the note to which the tie or slur is attached, and the
+Y@tie{}coordinate is relative to the staff center line.  The
+coordinates are entered as a list of four pairs of decimal numbers
+(reals).  One approach is to estimate the coordinates of the two
+end points, and then guess the two intermediate points.  The optimum
+values are then found by trial and error.
+
+It is useful to remember that a symmetric curve requires symmetric
+control points, and that Bézier curves have the useful property that
+transformations of the curve such as translation, rotation and
+scaling can be achieved by applying the same transformation to the
+curve's control points.
+
+For the example above the following override gives a satisfactory
+tie:
+
+@lilypond[verbatim,quote,relative=1]
+<<
+  \once \override Tie
+    #'control-points = #'((1 . -1) (3 . 0.6) (12.5 . 0.6) (14.5 . -1))
+  { e1 ~ e1 }
+\\
+  { r4 <g c,> <g c,> <g c,>4  }
+>>
+@end lilypond
+
+@knownissues
+
+It is not possible to modify shapes of ties or slurs by changing
+the @code{control-points} property if there are more than one at
+the same musical moment, not even by using the @code{\tweak}
+command.
+
+
 
 @node Discussion of specific tweaks
 @section Discussion of specific tweaks
 
 @menu
-* old Contexts explained::
+* old Contexts explained::      
 @end menu
 
 

diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index df34a18956cf45d6ebfe7f9385e4f0ba31d4e17d..363b06198492f679b5dfe40b0e84c17299f25303 100644 (file)
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -65,10 +65,10 @@ transposed just like chords entered using simultaneous music.
 Chord mode and note mode can be mixed in sequential music:
 
 @lilypond[verbatim,quote,ragged-right,relative=1]
-<c e g>2 < g b d >
-\chordmode { c2 f}
-< c e g > < g' b d >
-\chordmode { f g}
+<c e g>2 <g b d>
+\chordmode { c2 f }
+<c e g>2 <g' b d>
+\chordmode { f2 g }
 @end lilypond
 
 
@@ -91,16 +91,16 @@ chord mode comes first, the note mode will create a new @code{Staff}
 context.
 
 @lilypond[verbatim,quote,ragged-right,relative=1]
-\chordmode { c2 f}
-< c e g > < g' b d >
+\chordmode { c2 f }
+<c e g>2 <g' b d>
 @end lilypond
 
 To avoid this behavior, explicitly create the @code{Staff} context:
 
 @lilypond[verbatim,quote,ragged-right,relative=1]
 \new Staff {
-  \chordmode { c2 f}
-  < c e g > < g' b d >
+  \chordmode { c2 f }
+  <c e g>2  <g' b d>
 }
 @end lilypond
 
@@ -250,9 +250,9 @@ larger value is interpreted as 13.
 @lilypond[quote,ragged-right,fragment,verbatim,relative=1]
 \chordmode {
   c1:2 c:3 c:4 c:5
-  c:6 c:7 c:8 c:9
-  c:10 c:11 c:12 c:13
-  c:14
+  c1:6 c:7 c:8 c:9
+  c1:10 c:11 c:12 c:13
+  c1:14
 }
 @end lilypond
 
@@ -292,7 +292,7 @@ Added steps can be as high as desired.
 
 Added chord steps can be altered by suffixing a @code{-} or @code{+}
 sign to the number.  To alter a step that is automatically included
-as part of the basic chode structure, add it as an altered step.
+as part of the basic chord structure, add it as an altered step.
 
 @lilypond[quote,verbatim,fragment,relative=1]
 \chordmode {
@@ -441,7 +441,7 @@ of the mode of entry, unless there are inversions or added bass notes:
 @funindex{\chords}
 
 @code{\chords @{ ... @}} is a shortcut notation for
-@code{\new ChordNames @{\chordmode @{ ... @}@}}.
+@code{\new ChordNames @{ \chordmode @{ ... @} @}}.
 
 @lilypond[verbatim,quote,ragged-right, relative=1]
 \chords {
@@ -484,6 +484,8 @@ Snippets:
 
 Internals Reference:
 @rinternals{ChordNames},
+@rinternals{ChordName},
+@rinternals{Chord_name_engraver},
 @rinternals{Volta_engraver},
 @rinternals{Bar_engraver}.
 
@@ -546,7 +548,7 @@ this property.
 @item majorSevenSymbol
 
 This property contains the markup object used to follow the output
-of @code{chordRootNamer} to dentify a major 7 chord. Predefined
+of @code{chordRootNamer} to identify a major 7 chord. Predefined
 options are @code{whiteTriangleMarkup} and
 @code{blackTriangleMarkup}.
 
@@ -575,16 +577,16 @@ for a separator.
 
 This property is a list of pairs.  The first item in each pair
 is a set of pitches used to identify the steps present in the chord.
-The second item is a markups that will follow the @code{chordRootNamer}
+The second item is a markup that will follow the @code{chordRootNamer}
 output to create the chord name.
 
 @funindex chordPrefixSpacer
 @item chordPrefixSpacer
 
 The @q{m} for minor chords is usually printed immediately to the
-right of the root of the chord.  By setting
-@code{chordPrefixSpacer}, you can fix a spacer between the root
-and @q{m}.  The spacer is not used when the root is altered.
+right of the root of the chord.  A spacer can be placed between
+the root and @q{m} by setting @code{chordPrefixSpacer}.
+The spacer is not used when the root is altered.
 
 @end table
 
@@ -650,8 +652,8 @@ inversions or bass notes.
 
 @lilypond[quote,ragged-right,verbatim]
 myChords = \relative c' {
-  \chordmode{ c1 c/g c/f }
-  <c e g> <g c e> <f c' e g>
+  \chordmode { c1 c/g c/f }
+  <c e g>1 <g c e> <f c' e g>
 }
 <<
   \new ChordNames { \myChords }
@@ -709,7 +711,7 @@ entry of bass figures, and there is a context named
 in @code{Staff} contexts.
 
 @code{\figures@{ ... @}} is a shortcut notation for
-@code{\new FiguredBass @{\figuremode @{ ... @}@}}.
+@code{\new FiguredBass @{ \figuremode @{ ... @} @}}.
 
 
 Although the support for figured bass may superficially resemble chord
@@ -717,15 +719,17 @@ support, it is much simpler.  @code{\figuremode} mode simply
 stores the figures and the @code{FiguredBass} context prints them
 as entered.  There is no conversion to pitches.
 
+@ignore
 Figures are created as markup texts.  Any of the standard markup
 properties can be used to modify the display of figures.  For
 example, the vertical spacing of the figures may be set with
 @code{baseline-skip}.
+@end ignore
 
 @seealso
 
 Music Glossary:
-@rglos{Figured Bass}.
+@rglos{figured bass}.
 
 Snippets:
 @rlsr{Chords}
@@ -758,7 +762,7 @@ Accidentals (including naturals) can be added to figures:
 }
 @end lilypond
 
-Augmented and diminished steps can be indicated.
+Augmented and diminished steps can be indicated:
 
 @lilypond[verbatim,quote,ragged-right,fragment]
 \figures {
@@ -767,12 +771,11 @@ Augmented and diminished steps can be indicated.
 @end lilypond
 
 A backward slash through a figure (typically used for raised
-sixth steps) can be created.
+sixth steps) can be created:
 
 @lilypond[verbatim,quote,ragged-right,fragment]
 \figures {
-  <6>
-  <6\\>
+  <6> <6\\>
 }
 @end lilypond
 
@@ -788,7 +791,7 @@ Any text markup can be inserted as a figure:
 
 @lilypond[verbatim,quote,ragged-right,fragment]
 \figures {
-  <  \markup{ \tiny \number 6 \super (1)} 5 >
+  <\markup { \tiny \number 6 \super (1) } 5>
 }
 @end lilypond
 
@@ -802,14 +805,14 @@ Continuation lines can be used to indicate repeated figures:
 <<
   {
     \clef bass
-    e d c b,
-    e d c b,
+    e4 d c b,
+    e4 d c b,
   }
   \figures {
     \bassFigureExtendersOn
-    <6 4> <6 3> <7 3> <7 3>
+    <6 4>4 <6 3> <7 3> <7 3>
     \bassFigureExtendersOff
-    <6 4> <6 3> <7 3> <7 3>
+    <6 4>4 <6 3> <7 3> <7 3>
   }
 >>
 @end lilypond
@@ -822,11 +825,11 @@ unless the continuation lines have been explicitly terminated.
 <<
   \figures {
     \bassFigureExtendersOn
-    <6 4> <6 4> <6\! 4\!> <6 4>
+    <6 4>4 <6 4> <6\! 4\!> <6 4>
   }
   {
     \clef bass
-    d d c c
+    d4 d c c
   }
 >>
 @end lilypond
@@ -880,7 +883,7 @@ Raised sixth step
 @tab
 End of continuation line
 @tab
-@lilypond[line-width=1.5\cm]
+@lilypond[line-width=4\cm]
 <<
   \figures {
     \bassFigureExtendersOn
@@ -915,7 +918,7 @@ End of continuation line
 @c @rlearning{}.
 
 @c Notation Reference:
-@c @ruser{}.
+@c @ref{}.
 
 @c Application Usage:
 @c @rprogram{}.
@@ -927,7 +930,7 @@ Snippets:
 @rlsr{Chords}.
 
 Internals Reference:
-@rinternals{NewBassFigure},
+@rinternals{BassFigure},
 @rinternals{BassFigureAlignment},
 @rinternals{BassFigureLine},
 @rinternals{BassFigureBracket},
@@ -985,7 +988,7 @@ figures is adjusted automatically.
 @end lilypond
 
 
-When added in a Staff context, figured bass can be displayed above
+When added in a @code{Staff} context, figured bass can be displayed above
 or below the staff.
 
 @lilypond[verbatim,ragged-right,fragment,quote]
@@ -1022,7 +1025,7 @@ or below the staff.
 @c @rlearning{}.
 
 @c Notation Reference:
-@c @ruser{}.
+@c @ref{}.
 
 @c Application Usage:
 @c @rprogram{}.
@@ -1034,7 +1037,7 @@ Snippets:
 @rlsr{Chords}.
 
 Internals Reference:
-@rinternals{NewBassFigure},
+@rinternals{BassFigure},
 @rinternals{BassFigureAlignment},
 @rinternals{BassFigureLine},
 @rinternals{BassFigureBracket},
@@ -1051,19 +1054,19 @@ the bass line.
 <<
   {
     \clef bass
-    \repeat unfold 4 {f16. g32} f8. es16 d8 es
+    \repeat unfold 4 { f16. g32 } f8. es16 d8 es
   }
   \figures {
     \bassFigureExtendersOn
     % The extenders are correct here, with the same rhythm as the bass
-    \repeat unfold 4 {<6 4->16. <6 4->32}
+    \repeat unfold 4 { <6 4->16. <6 4->32 }
     <5>8. r16 <6>8 <6\! 5->
   }
 >>
 <<
   {
     \clef bass
-    \repeat unfold 4 {f16. g32} f8. es16 d8 es
+    \repeat unfold 4 { f16. g32 } f8. es16 d8 es
   }
   \figures {
     \bassFigureExtendersOn
@@ -1079,10 +1082,10 @@ a different figure location can cause the figure positions to invert.
 
 @lilypond[verbatim,ragged-right,fragment,quote,relative=1]
 <<
- { fis g g, e' }
+ { fis4 g g, e' }
   \figures {
     \bassFigureExtendersOn
-    <6 5> <5\! 4> < 5 _!> <6>
+    <6 5>4 <5\! 4> < 5 _!> <6>
   }
 >>
 @end lilypond
@@ -1092,11 +1095,11 @@ begins the extender line and turn them off at the end of the extender line.
 
 @lilypond[verbatim,ragged-right,fragment,quote,relative=1]
 <<
- { fis g g, e' }
+ { fis4 g g, e' }
   \figures {
-    <6 5> <5 4>
+    <6 5>4 <5 4>
     \bassFigureExtendersOn
-    < 5 _!> <6>
+    < 5 _!>4 <6>
     \bassFigureExtendersOff
   }
 >>

diff --git a/Documentation/user/editorial.itely b/Documentation/user/editorial.itely
index 7bdca44e346334f8deb201a0d70574af57dc0282..c93a2c4045da171fb10b8bd086c9ad09d896d571 100644 (file)
--- a/Documentation/user/editorial.itely
+++ b/Documentation/user/editorial.itely
@@ -138,8 +138,6 @@ Snippets:
 @rlsr{Editorial annotations}.
 
 Internals Reference:
-@rinternals{fontSize},
-@rinternals{font-size},
 @rinternals{font-interface}.
 
 
@@ -350,8 +348,8 @@ gis4 a
 @seealso
 
 Notation Reference:
-@ref{List of colors}, @ref{Objects connected to
-the input}.
+@ref{List of colors}, @ref{The
+tweak command}.
 
 Snippets:
 @rlsr{Editorial annotations}.
@@ -373,7 +371,7 @@ and @code{'ForestGreen}.  For web use normal colors are recommended
 
 
 Notes in a chord cannot be colored with @code{\override}; use
-@code{\tweak} instead, see @ref{Objects connected to the input}.
+@code{\tweak} instead, see @ref{The tweak command}.
 
 
 @node Parentheses

diff --git a/Documentation/user/fretted-strings.itely b/Documentation/user/fretted-strings.itely
index 83db0efed37a2699bcbf66d17eda68939245b8a7..a13e61a53f869580c9f0c101f42b8ecf1ee25e2b 100644 (file)
--- a/Documentation/user/fretted-strings.itely
+++ b/Documentation/user/fretted-strings.itely
@@ -176,6 +176,18 @@ The default value for @code{minimumFret} is 0.
 >>
 @end lilypond
 
+Harmonic indications and slides can be added to tablature
+notation.
+
+@lilypond[fragment, verbatim, quote, relative=1]
+\new TabStaff {
+  \new TabVoice {
+    <c g'\harmonic> d\2\glissando e\2
+  }
+}
+@end lilypond
+
+
 @snippets
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
@@ -220,6 +232,7 @@ melodia = \partcombine { e4 g g g }{ e4 e e e }
 >>
 @end lilypond
 
+Guitar special effects are limited to harmonics and slides.
 
 @node Custom tablatures
 @unnumberedsubsubsec Custom tablatures
@@ -309,10 +322,6 @@ Snippets:
 Internals Reference: 
 @rinternals{Tab_note_heads_engraver}.
 
-@knownissues
-
-No guitar special effects have been implemented.
-
 
 @node Fret diagram markups
 @unnumberedsubsubsec Fret diagram markups

diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index 7c57879ede912840a0e14004258e90a20772f983..543f6f95b6920e663f4f54a980d79fd6996d76bc 100644 (file)
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -1235,7 +1235,7 @@ in separate files should they become too long.
 
 @cindex hymn structure
 
-Here is a example of the first line of a hymn with four
+Here is an example of the first line of a hymn with four
 verses, set for SATB.  In this case the words for all four
 parts are the same.  Note how we use variables to separate the
 music notation and words from the staff structure.  See too
@@ -1690,11 +1690,11 @@ about any.
 
 Engravers live and operate in Contexts.
 Engravers such as the @code{Metronome_mark_engraver}, whose
-action and output applies to the score as a whole, operate in
+action and output apply to the score as a whole, operate in
 the highest level context -- the @code{Score} context.
 
 The @code{Clef_engraver} and @code{Key_engraver} are to be
-found in every Staff Context, as different staves may require
+found in every @code{Staff} Context, as different staves may require
 different clefs and keys.
 
 The @code{Note_heads_engraver} and @code{Stem_engraver} live
@@ -1836,7 +1836,7 @@ in which context they operate.  Sometimes this is obvious,
 but occasionally it can be tricky.  If the wrong context
 is specified, no error message is produced, but the expected
 action will not take place.  For example, the
-@code{instrumentName} clearly lives in the Staff context, since
+@code{instrumentName} clearly lives in the @code{Staff} context, since
 it is the staff that is to be named.
 In this example the first staff is labelled, but not the second,
 because we omitted the context name.
@@ -1854,9 +1854,9 @@ because we omitted the context name.
 >>
 @end lilypond
 
-Remember the default context name is Voice, so the second
+Remember the default context name is @code{Voice}, so the second
 @code{\set} command set the property @code{instrumentName} in the
-Voice context to @qq{Alto}, but as LilyPond does not look
+@code{Voice} context to @qq{Alto}, but as LilyPond does not look
 for any such property in the @code{Voice} context, no
 further action took place.  This is not an error, and no error
 message is logged in the log file.
@@ -2032,10 +2032,14 @@ instances of contexts by statements in a @code{\with} block, and by
 
 @seealso
 
-Notation Reference: @ruser{Changing context default settings},
-@ruser{The set command}.
+Notation Reference:
+@ruser{Changing context default settings}.
+@c FIXME
+@c uncomment when backslash-node-name issue is resolved -pm
+@c @ruser{The set command}.
 
-Internals Reference: @rinternals{Contexts},
+Internals Reference:
+@rinternals{Contexts},
 @rinternals{Tunable context properties}.
 
 

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index a88a14212bf7fbb8208b4450beb50c26bac15764..e63cd63c224f894f66208df11bd8588ed78cd726 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -325,6 +325,17 @@ for more information, see @file{Documentation/user/README.txt} and
 
 @knownissues
 
+@code{-j} command-line option of @command{make} is unsupported for
+building the documentation.  As the most time consuming task is
+running LilyPond to build images of music, the makefile variable
+@code{CPU_COUNT} may be set in @file{local.make} or on the command line
+to the number of @code{.ly} files that LilyPond should process
+simultaneously, e.g. on a bi-processor or Dual core machine
+
+@example
+make CPU_COUNT=2 web
+@end example
+
 If source files have changed since last documentation build, output
 files that need to be rebuilt are normally rebuilt, even if you do not
 run @code{make web-clean} first.  However, building dependencies in the

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 32e425a216fdae1bf573bfd9e761156dacb230a2..4f576c458f0fc2525c5c476f47a27dbdfec07b66 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -791,30 +791,29 @@ This section explains the different portions of the documentation.
 @c leave these lines wrapping around.  It's some texinfo 4.12 thing. -gp
 @c This is actually a limitation of texi2html. -jm
 @menu
-* About the Learning Manual (LM)::  this manual introduces LilyPond, giving in-depth explanations of how to create notation.
-
-* About the Music Glossary (MG)::  this manual explains musical terms and gives translations of terms in other languages.
-
-* About the Notation Reference (NR)::  this manual is the main portion of the documentation.  It provides detailed information about creating notation.  This book assumes that the reader knows basic material covered in the LM and is familiar with the English musical terms presented in the MG.
-
-* About the Application Usage (AU)::  this discusses the actual programs and operating system-specific issues.
-
-* About the Snippet List (SL)::  this is a collection of short LilyPond examples.
-
-* About the Internals Reference (IR)::  this document gives reference information about LilyPond's internal structures, which is required for constructing tweaks.
-
+* About the Learning Manual::  this manual introduces LilyPond, giving in-depth explanations of how to create notation.
+* About the Music Glossary::  this manual explains musical terms and gives translations of terms in other languages.
+* About the Notation Reference::  this manual is the main portion of the documentation.  It provides detailed information about creating notation.  This book assumes that the reader knows basic material covered in the LM and is familiar with the English musical terms presented in the MG.
+* About the Application Usage::  this discusses the actual programs and operating system-specific issues.
+* About the Snippet List::  this is a collection of short LilyPond examples.
+* About the Internals Reference::  this document gives reference information about LilyPond's internal structures, which is required for constructing tweaks.
 * Other documentation::         there are a few other portions of the documentation, such as News items and the mailist archives.
-
 @end menu
 
 
-@node About the Learning Manual (LM)
-@unnumberedsubsec About the Learning Manual (LM)
+@node About the Learning Manual
+@unnumberedsubsec About the Learning Manual
 
 This book explains how to begin learning LilyPond, as well as
 explaining some key concepts in easy terms.  You should read these
 chapters in a linear fashion.
 
+There is a paragraph @strong{See also} at the end of each section,
+which contains cross-references to other sections: you should not
+follow these cross-references at first reading; when you have read all
+of the Learning Manual, you may want to read some sections again and
+follow cross-references for further reading.
+
 @itemize
 
 @item
@@ -841,7 +840,7 @@ undertaking large projects!
 
 @end itemize
 
-The LM also contains appendices which are not part of the
+The Learning Manual also contains appendices which are not part of the
 recommended linear reading.  They may be useful for later
 viewing:
 
@@ -861,8 +860,8 @@ all.
 @end itemize
 
 
-@node About the Music Glossary (MG)
-@unnumberedsubsec About the Music Glossary (MG)
+@node About the Music Glossary
+@unnumberedsubsec About the Music Glossary
 
 @cindex idiom
 @cindex jargon
@@ -870,19 +869,19 @@ all.
 @cindex foreign languages
 @cindex language
 
-@ref{Top,Music glossary,,music-glossary}:
+@rglosnamed{Top,Music glossary}
 this explains musical terms, and includes translations to various
 languages.  If you are not familiar with music notation or music
 terminology (especially if you are a non-native English speaker),
 it is highly advisable to consult the glossary.
 
 
-@node About the Notation Reference (NR)
-@unnumberedsubsec About the Notation Reference (NR)
+@node About the Notation Reference
+@unnumberedsubsec About the Notation Reference
 
 This book explains all the LilyPond commands which produce
 notation.  It assumes that readers are familiar with the concepts
-in the Learning manual.
+in the Learning Manual.
 
 @itemize
 
@@ -919,7 +918,8 @@ explains how to create music functions with scheme.
 
 @end itemize
 
-The NR also contains appendices with useful reference charts.
+The Notation Reference also contains appendices with useful
+reference charts.
 
 @itemize
 
@@ -948,8 +948,8 @@ a complete index.
 @end itemize
 
 
-@node About the Application Usage (AU)
-@unnumberedsubsec About the Application Usage (AU)
+@node About the Application Usage
+@unnumberedsubsec About the Application Usage
 
 This book explains how to execute the programs and how to integrate
 LilyPond notation with other programs.
@@ -958,8 +958,8 @@ LilyPond notation with other programs.
 
 @item
 @rprogram{Install}:
-explains how to install LilyPond (including compilation if
-desired).
+explains how to install LilyPond, including compilation if
+desired.
 
 @item
 @rprogram{Setup}:
@@ -987,13 +987,13 @@ formats to the @code{.ly} format.
 @end itemize
 
 
-@node About the Snippet List (SL)
-@unnumberedsubsec About the Snippet List (SL)
+@node About the Snippet List
+@unnumberedsubsec About the Snippet List
 
 @cindex snippets
 @cindex LSR
 
-@ref{Top,LilyPond Snippet List,,lilypond-snippets}: this shows a
+@rlsrnamed{Top,LilyPond Snippet List}: this shows a
 selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
 (LSR).  All the snippets are in the public domain.
@@ -1008,10 +1008,10 @@ The list of snippets for each subsection of the Notation Reference
 (NR) are also linked from the @strong{See also} portion.
 
 
-@node About the Internals Reference (IR)
-@unnumberedsubsec About the Internals Reference (IR)
+@node About the Internals Reference
+@unnumberedsubsec About the Internals Reference
 
-@ref{Top,Internals Reference,,lilypond-internals}: this is a set
+@rinternalsnamed{Top,Internals Reference}: this is a set
 of heavily cross linked HTML pages which document the nitty-gritty
 details of each and every LilyPond class, object, and function.
 It is produced directly from the formatting definitions in the
@@ -1035,7 +1035,19 @@ very valuable.
 
 @itemize
 
-@item News: This is a summary of important changes
+@item
+@ifhtml
+@ifset bigpage
+@uref{../topdocs/NEWS.html,News}:
+@end ifset
+@ifclear bigpage
+@uref{../../topdocs/NEWS.html,News}:
+@end ifclear
+@end ifhtml
+@ifnothtml
+News:
+@end ifnothtml
+this is a summary of important changes
 and new features in LilyPond since the previous version.
 
 @item @uref{http://lists.gnu.org/archive/html/lilypond-user/, The
@@ -1054,20 +1066,19 @@ internals, the answer might be in these archives.
 music fragments embedded, the exact LilyPond input that was used
 to produce that image can be viewed by clicking the image.
 
-@item Init files: The location of the documentation files that are
+@item Init files: the location of the documentation files that are
 mentioned here can vary from system to system.  On occasion, this
-manual refers to initialization and example files.  Throughout
-this manual, we refer to input files relative to the top-directory
-of the source archive.  For example,
-@file{input/@/lsr/@/dirname/@/bla@/.ly} may refer to the file
-@file{lilypond@/2.x.y/@/input/@/lsr/@/dirname/@/bla@/.ly}.  On
-binary packages for the UNIX platform, the documentation and
-examples can typically be found somewhere below
+manual refers to initialization and example files.  Throughout this
+manual, we refer to input files relative to the top-directory of the
+source archive.  For example, @file{input/@/lsr/@/dirname/@/bla@/.ly}
+may refer to the file
+@file{lilypond@/2.x.y/@/input/@/lsr/@/dirname/@/bla@/.ly}.  On binary
+packages for the UNIX platform, the documentation and examples can
+typically be found somewhere below
 @file{/usr/@/share/@/doc/@/lilypond/}.  Initialization files, for
-example @file{scm/@/lily@/.scm}, or
-@file{ly/@/engraver@/-init@/.ly}, are usually found in the
-directory @file{/usr/@/share/@/lilypond/}.
+example @file{scm/@/lily@/.scm}, or @file{ly/@/engraver@/-init@/.ly},
+are usually found in the directory @file{/usr/@/share/@/lilypond/}.
+For more details, see @ref{Other sources of information}.
 
 @end itemize
 
-

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index fb4e0e779adf1c184103bc0ce9c3fa3c9e418bbb..07cf74a547fc187bf6d24aac8b3cdbcfee89369b 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -25,13 +25,16 @@
 @quotedblleft{}\TEXT\@quotedblright{}
 @end macro
 
-@macro warning{TEXT}
 @ifhtml
+@macro warning{TEXT}
 @cartouche
 @b{Note:} \TEXT\
 @end cartouche
+@end macro
 @end ifhtml
+
 @ifnothtml
+@macro warning{TEXT}
 @quotation
 @quotation
 @cartouche
@@ -39,8 +42,8 @@
 @end cartouche
 @end quotation
 @end quotation
-@end ifnothtml
 @end macro
+@end ifnothtml
 
 @ifnotinfo
 @macro notation{TEXT}
@@ -125,11 +128,15 @@
 @c     @rlearning
 @c     @ruser
 @c     @rprogram
-@c     @rsnippets
+@c     @rlsr
 @c     @rinternals
+@c  all these also have a @...named version, which allows to specify the
+@c  displayed text for the reference as second argument
 
-@ifhtml
-@c ***** HTML *****
+@c ***** HTML + bigpage is a special case (other manual names), all other
+@c formats are treated similarly
+
+@ifnottex
 
 @ifset bigpage
 
@@ -138,30 +145,59 @@
 @ref{\TEXT\,,,music-glossary-big-page,Music Glossary}
 @end macro
 
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary-big-page,Music Glossary}
+@end macro
+
 @macro rlearning{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-learning-big-page,Learning Manual}
 @end macro
 
+@macro rlearningnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning-big-page,Learning Manual}
+@end macro
+
 @macro ruser{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-big-page,Notation Reference}
 @end macro
 
+@macro rusernamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-big-page,Notation Reference}
+@end macro
+
 @macro rprogram{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program-big-page,Application Usage}
 @end macro
 
+@macro rprogramnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-program-big-page,Application Usage}
+@end macro
+
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets-big-page,Snippets}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets-big-page,Snippets}
+@end macro
+
 @macro rinternals{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-internals-big-page,Internals Reference}
 @end macro
 
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals-big-page,Internals Reference}
+@end macro
+
 @end ifset
 
 
@@ -172,44 +208,17 @@
 @ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
-@macro rlearning{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
-@end macro
-
-@macro ruser{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notation Reference}
-@end macro
-
-@macro rprogram{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
-@end macro
-
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
-@end macro
-
-@macro rinternals{TEXT}
+@macro rglosnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
 @end macro
 
-@end ifclear
-
-@end ifhtml
-
-
-@ifdocbook
-@c ***** DOCBOOK-XML *****
-
-@macro rglos{TEXT}
+@macro rlearning{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Music Glossary}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
 
-@macro rlearning{TEXT}
+@macro rlearningnamed{TEXT,DISPLAY}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-learning,Learning Manual}
 @end macro
@@ -219,56 +228,43 @@
 @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rusernamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
+@macro rprogram{TEXT}
+@vindex \TEXT\
+@ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
 
-@macro rinternals{TEXT}
+@macro rprogramnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
 @end macro
 
-@end ifdocbook
-
-
-@ifinfo
-@c **** INFO ****
-
-@macro rglos{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,music-glossary,Music Glossary}
+@macro rlsr{TEXT}
+@ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
-@macro rlearning{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
 @end macro
 
-@macro ruser{TEXT}
+@macro rinternals{TEXT}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
 @end macro
 
-@macro rprogram{TEXT}
+@macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
 @end macro
 
-@macro rlsr{TEXT}
-@ref{\TEXT\,,,lilypond-snippets,Snippets}
-@end macro
+@end ifclear
 
-@macro rinternals{TEXT}
-@vindex \TEXT\
-@ref{\TEXT\,,,lilypond-internals,Internals Reference}
-@end macro
+@end ifnottex
 
-@end ifinfo
 
 
 @c **** TEX ****
@@ -279,26 +275,51 @@
 @ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
+@macro rglosnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@ref{\TEXT\,,\DISPLAY\,music-glossary,Music Glossary}
+@end macro
+
 @macro rlearning{TEXT}
-learning manual, @ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@ref{\TEXT\,,,lilypond-learning,Learning Manual}
+@end macro
+
+@macro rlearningnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
 @end macro
 
 @macro ruser{TEXT}
-notation reference, @ref{\TEXT\,,,lilypond,Notation Reference}
+@ref{\TEXT\,,,lilypond,Notation Reference}
+@end macro
+
+@macro rusernamed{TEXT,DISPLAY,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
 @end macro
 
 @macro rprogram{TEXT}
-program usage manual, @ref{\TEXT\,,,lilypond-program,Application Usage}
+@ref{\TEXT\,,,lilypond-program,Application Usage}
+@end macro
+
+@macro rprogramnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
 @end macro
 
 @macro rlsr{TEXT}
 @ref{\TEXT\,,,lilypond-snippets,Snippets}
 @end macro
 
+@macro rlsrnamed{TEXT,DISPLAY}
+@ref{\TEXT\,,\DISPLAY\,lilypond-snippets,Snippets}
+@end macro
+
 @macro rinternals{TEXT}
 @vindex \TEXT\
 @code{\TEXT\}
 @end macro
 
-@end iftex
+@macro rinternalsnamed{TEXT,DISPLAY}
+@vindex \TEXT\
+@code{\DISPLAY\}
+@end macro
 
+@end iftex

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index 9263b951dcee9368c5f13ece3a1e72f102ce37f8..1ed786a61f3e4e6d90d09677840ebeaa9d651fc9 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -453,10 +453,10 @@ This section explains how to gather the information necessary
 to create complicated music functions.
 
 @menu
-* Displaying music expressions::  
-* Music properties::            
-* Doubling a note with slurs (example)::  
-* Adding articulation to notes (example)::  
+* Displaying music expressions::
+* Music properties::
+* Doubling a note with slurs (example)::
+* Adding articulation to notes (example)::
 @end menu
 
 
@@ -465,7 +465,6 @@ to create complicated music functions.
 
 @cindex internal storage
 @funindex \displayMusic
-@funindex \displayLilyMusic
 
 When writing a music function it is often instructive to inspect how
 a music expression is stored internally.  This can be done with the
@@ -578,6 +577,8 @@ of the @code{NoteEvent} object,
 
 The note pitch can be changed by setting this 'pitch property,
 
+@funindex \displayLilyMusic
+
 @example
 #(set! (ly:music-property (first (ly:music-property someNote 'elements))
                           'pitch)

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index e251cb98f464dbed6134198e91a2f410f972a920..1b0d580bf5ef24b4d22bf6da5e3ac5ee63aa73a2 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -267,7 +267,7 @@ Learning Manual: @rlearning{Tweaking methods}.
 Notation Reference:
 @ref{Time administration},
 @ref{Scaling durations},
-@ref{Objects connected to the input},
+@ref{The tweak command},
 @ref{Polymetric notation}.
 
 Snippets:
@@ -799,15 +799,12 @@ setting, resulting bar-check warnings may not be displayed.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {positioning-multi--measure-rests.ly}
 
-@c TODO -- convert to snippet
+@c TODO -- convert to snippet -- submitted to Neil
 Markups attached to a multi-measure rest will be centered above or
 below it.  Long markups attached to multi-measure rests do not cause
 the measure to expand. To expand a multi-measure rest to fit the markup,
 use a spacer rest with an attached markup before the multi-measure rest:
 
-@c -- music is somewhat compressed vertically.  I thought it
-@c    was good because the emphasis is not on the content
-@c    of the markup, but on the place the markup was attached -cs
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
 \compressFullBarRests
 \textLengthOn
@@ -1082,17 +1079,6 @@ Internal Reference:
 
 @cindex grace notes, in anacruses
 
-This command does not take into account grace notes at the start
-of the music.  If the pick-up starts with one or more grace
-notes, then the @code{\partial} should follow the grace note(s):
-
-@lilypond[verbatim,quote,ragged-right,relative,fragment]
-\grace f16
-\partial 4
-g4
-a2 g2
-@end lilypond
-
 The @code{\partial} command is intended to be used only at the
 beginning of a piece.  If you use it after the beginning, some
 odd warnings may occur.
@@ -1177,38 +1163,6 @@ to indicate where breaks can occur.
 Polymetric notation is supported, either explicitly or through
 clever use of markup features.
 
-@c Each of these examples uses \set or \override, and therefore
-@c by policy should be converted to a snippet.
-@c Do we want to have a section with a very brief (two-line 
-@c introduction, and have most of the content be in snippets?
-
-@strong{Alternating time signatures}
-
-Regularly alternating double time signatures are not supported
-explicitly, but they can be faked.  In the next example, the
-double time signature is created with markup text, while the
-real time signature is set in the usual way with @code{\time}.
-
-@lilypond[verbatim,ragged-right]
-% Create 9/8 split into 2/4 + 5/8
-tsMarkup = \markup {
-  \override #'(baseline-skip . 2) \number {
-    \column { "2" "4" }
-    \vcenter "+"
-    \bracket \column { "5" "8" }
-  }
-}
-
-{
-  \override Staff.TimeSignature #'stencil =
-    #ly:text-interface::print
-  \override Staff.TimeSignature #'text = #tsMarkup
-  \time 9/8
-  c'2 \bar ":" c'4 c'4.
-  c'2 \bar ":" c'4 c'4.
-}
-@end lilypond
-
 @strong{Staves with different time signatures, equal measure lengths}
 
 This notation can be created by setting a common time signature
@@ -1249,9 +1203,6 @@ staff, shown durations are multiplied by 3/5, as 3/5 * 10/8 = 3/4.
 >> }
 @end lilypond
 
-@c I guess this example doesn't use \set or \override, and so
-@c could stay in the manual.
-
 @strong{Staves with different time signatures, unequal bar lengths}
 
 Each staff can be given its own independent time signature by
@@ -1295,6 +1246,37 @@ moving the @code{Timing_translator} to the @code{Staff} context.
 >>
 @end lilypond
 
+@snippets
+
+@c TODO -- Convert to snippet. -- Sent to Neil 8/14/08
+
+@strong{Alternating time signatures}
+
+Regularly alternating double time signatures are not supported
+explicitly, but they can be faked.  In the next example, the
+double time signature is created with markup text, while the
+real time signature is set in the usual way with @code{\time}.
+
+@lilypond[verbatim,ragged-right]
+% Create 9/8 split into 2/4 + 5/8
+tsMarkup = \markup {
+  \override #'(baseline-skip . 2) \number {
+    \column { "2" "4" }
+    \vcenter "+"
+    \bracket \column { "5" "8" }
+  }
+}
+
+{
+  \override Staff.TimeSignature #'stencil =
+    #ly:text-interface::print
+  \override Staff.TimeSignature #'text = #tsMarkup
+  \time 9/8
+  c'2 \bar ":" c'4 c'4.
+  c'2 \bar ":" c'4 c'4.
+}
+@end lilypond
+
 
 @seealso
 
@@ -1312,7 +1294,7 @@ Snippets:
 
 Internals Reference:
 @rinternals{TimeSignature},
-@rinternals{Timing-translator},
+@rinternals{Timing_translator},
 @rinternals{Staff}.
 
 @knownissues
@@ -1350,13 +1332,6 @@ inserts ties.  One of its uses is to debug complex scores: if the
 measures are not entirely filled, then the ties show exactly how
 much each measure is off.
 
-To allow line breaking on the bar lines where the
-@code{Completion_heads_engraver} has inserted a split note, remove
-the @code{Forbid_line_break_engraver} too.
-
-TODO -- find example that shows the above paragraph.  I can't make
-the Forbid_line_break_engraver have any effect in my examples (cs).
-Does the Forbid_line_break_engraver still have the claimed effect?
 @seealso
 
 Music Glossary: @rglos{tie}
@@ -1391,16 +1366,116 @@ Sometimes you might want to show only the rhythm of a melody.  This
 can be done with the rhythmic staff.  All pitches of notes on such a
 staff are squashed, and the staff itself has a single line
 
-@c TODO Devise a more realistic example, perhaps with lyrics -td
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-\new RhythmicStaff {
-  \time 4/4
-  c4 e8 f g2 | r4 g r2 | g1 | r1 |
-}
+<<
+  \new RhythmicStaff {
+    \new Voice = "myRhythm" {
+      \time 4/4
+      c4 e8 f g2
+      r4 g g f
+      g1
+    }
+  }
+  \new Lyrics {
+    \lyricsto "myRhythm" {
+      This is my song
+      I like to sing
+    }
+  }
+>>
+@end lilypond
+
+Guitar chord charts often show the strumming rhythms.  This can
+be done with the @code{Pitch_squash_engraver} and
+@code{\improvisationOn}.
+
+ 
+@lilypond[quote,verbatim]
+<<
+  \new ChordNames {
+    \chordmode {
+      c1 f g c
+    }
+  }
+
+  \new Voice \with {
+    \consists Pitch_squash_engraver
+  } \relative c'' {
+    \improvisationOn
+    c4 c8 c c4 c8 c
+    f4 f8 f f4 f8 f
+    g4 g8 g g4 g8 g
+    c4 c8 c c4 c8 c
+  }
+>>
+@end lilypond
+
+@predefined
+@code{\improvisationOn},
+@code{\improvisationOff}.
+
+@snippets
+@c TODO -- Convert to snippet;
+@c     tag for both Rhythms and Guitar? Move to @seealso?
+
+For guitar music, it is possible to show strum rhythms, along
+with melody notes, chord names, and fret diagrams.
+
+
+@lilypond[quote,verbatim]
+\include "predefined-guitar-fretboards.ly"
+<<
+  \new ChordNames {
+    \chordmode {
+      c1 f g c
+    }
+  }
+
+  \new FretBoards {
+    \chordmode {
+      c1 f g c
+    }
+  }
+
+  
+  \new Voice \with {
+    \consists Pitch_squash_engraver
+  } \relative c'' {
+    \improvisationOn
+    c4 c8 c c4 c8 c
+    f4 f8 f f4 f8 f
+    g4 g8 g g4 g8 g
+    c4 c8 c c4 c8 c
+  }
+
+
+  \new Voice = "melody" {
+    \relative c'' {
+      \improvisationOff
+      c2 e4 e4 
+      f2. r4
+      g2. a4
+      e4 c2.
+    }
+  }
+ 
+  \new Lyrics {
+    \lyricsto "melody" {
+      This is my song.
+      I like to sing.
+    }
+  }
+>>
 @end lilypond
 
-TODO -- put example in with multiple lines as well (used for strumming
-rhythms in guitar)
+@seealso
+
+Snippets:
+@rlsr{Rhythms}.
+
+Internals Reference:
+@rinternals{RhythmicStaff},
+@rinternals{Pitch_squash_engraver}.
 
 @node Beams
 @subsection Beams
@@ -1446,6 +1521,9 @@ c4 c8 c8. c16 c8.
 c16 c8
 @end lilypond
 
+@predefined
+@code{\autoBeamOff},
+@code{\autoBeamOn}.
 
 @snippets
 
@@ -1527,7 +1605,12 @@ f8 f''8 f8 f''8
 
 @seealso
 
-Notation Reference: @ref{Manual beams}, @ref{Setting automatic beam behavior}.
+Notation Reference: 
+@ref{Manual beams}, 
+@ref{Setting automatic beam behavior}.
+
+Installed Files:
+@file{scm/auto-beam.scm}.
 
 Snippets:
 @rlsr{Rhythms}.
@@ -2383,20 +2466,22 @@ For common tweaks to the positioning of rehearsal marks, see
 
 @seealso
 
-Snippets:
-@rlsr{Rhythms}.
-
-This manual: @ref{The Feta font}, @ref{Formatting text}.
-
-Internals Reference: @rinternals{RehearsalMark}.
+This manual: 
+@ref{The Feta font}, 
+@ref{Formatting text}.
 
-Init files: @file{scm/@/translation@/-functions@/.scm} contains
+Installed Files: 
+@file{scm/@/translation@/-functions@/.scm} contains
 the definition of @code{format-mark-numbers} and
 @code{format-mark-letters}.  They can be used as inspiration for
 other formatting functions.
 
-Examples: @c @lsr{parts,rehearsal-mark-numbers.ly}
+Snippets:
+@rlsr{Rhythms}.
+
+Internals Reference: @rinternals{RehearsalMark}.
 
+Examples: @c @lsr{parts,rehearsal-mark-numbers.ly}
 
 @node Special rhythmic concerns
 @subsection Special rhythmic concerns
@@ -2417,42 +2502,35 @@ Examples: @c @lsr{parts,rehearsal-mark-numbers.ly}
 @cindex appoggiatura
 @cindex acciaccatura
 
-Grace notes are ornaments that are written out. They are made with
-the @code{\grace} command.  By prefixing this keyword to a music
-expression, a new one is formed, which will be printed in a
-smaller font and takes up no logical time in a measure.
+Grace notes are ornaments that are written out. Grace notes
+are printed in a smaller font and take up no logical time 
+in a measure.
 
 @lilypond[quote,ragged-right,relative=2,verbatim,fragment]
 c4 \grace c16 c4
-\grace { c16[ d16] } c2 c4
+\grace { c16[ d16] } c2
 @end lilypond
 
-Two special forms of the @code{\grace} command exist.
-An @emph{acciaccatura}, which should be played as very short,
-is denoted by a slurred small note with a slashed stem.  The
-@emph{appoggiatura}, a grace note that takes a fixed fraction of the
-main note, is denoted as a slurred note in small print without
-a slash.  They are entered with the commands @code{\acciaccatura}
-and @code{\appoggiatura}, as demonstrated in the following
-example:
+Lilypond also supports two special types of grace notes, the 
+@emph{acciaccatura}--an unmeasured grace note indicated by a slurred 
+small note with a slashed stem--and the @emph{appoggiatura}, which 
+takes a fixed fraction of the main note and appears in small print 
+without a slash. 
 
 @lilypond[quote,ragged-right,relative=2,verbatim,fragment]
-b4 \acciaccatura d8 c4
+\grace c8 b4 
+\acciaccatura d8 c4
 \appoggiatura e8 d4
 \acciaccatura { g16[ f] } e4
 @end lilypond
 
-@noindent
-@code{\acciaccatura} and @code{\appoggiatura} start a slur,
-@code{\grace} does not.
-
 The placement of grace notes is synchronized between different
 staves.  In the following example, there are two sixteenth grace
 notes for every eighth grace note
 
 @lilypond[quote,ragged-right,relative=2,verbatim,fragment]
-<< \new Staff { e4 \grace { c16[ d e f] } e4 }
-   \new Staff { c4 \grace { g8[ b] } c4 } >>
+<< \new Staff { e2 \grace { c16[ d e f] } e2 }
+   \new Staff { c2 \grace { g8[ b] } c2 } >>
 @end lilypond
 
 @funindex \afterGrace
@@ -2464,39 +2542,50 @@ command.  It takes two arguments: the main note, and the grace
 notes following the main note.
 
 @lilypond[quote,ragged-right,verbatim,relative=2,fragment]
-c1 \afterGrace d1 { c16[ d] } c4
+c1 \afterGrace d1 { c16[ d] } c1
 @end lilypond
 
-This will put the grace notes after a @q{space} lasting 3/4 of the
-length of the main note.  The fraction 3/4 can be changed by
-setting @code{afterGraceFraction}, i.e.,
-
-@example
-#(define afterGraceFraction (cons 7 8))
-@end example
+This will put the grace notes after a space lasting 3/4 of the
+length of the main note.  The default fraction 3/4 can be changed by
+setting @code{afterGraceFraction}.  The following example shows
+the results from setting the space at the default,  at 15/16, and 
+finally at 1/2 of the main note.
 
-@noindent
-will put the grace note at 7/8 of the main note.
+@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+<<
+  \new Staff {
+    c1 \afterGrace d1 { c16[ d] } c1
+  }
+  \new Staff {
+    #(define afterGraceFraction (cons 15 16))
+    c1 \afterGrace d1 { c16[ d] } c1
+  }
+  \new Staff {
+    #(define afterGraceFraction (cons 1 2))
+    c1 \afterGrace d1 { c16[ d] } c1
+  }
+>>
+@end lilypond
 
-The same effect can be achieved manually by doing
+The space between the main note and the grace note may also be
+specified using spacers. The following example places the grace
+note after a space lasting 7/8 of the main note.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Voice {
   << { d1^\trill_( }
-     { s2 \grace { c16[ d] } } >>
-  c4)
+     { s2 s4. \grace { c16[ d] } } >>
+  c1)
 }
 @end lilypond
 
-@noindent
-By adjusting the duration of the skip note (here it is a
-half-note), the space between the main note and the grace
-may be adjusted.
-
 A @code{\grace} music expression will introduce special
 typesetting settings, for example, to produce smaller type, and
-set directions.  Hence, when introducing layout tweaks, they
-should be inside the grace expression, for example,
+set directions.  Hence, when introducing layout tweaks to
+override the special settings, they should be placed inside
+the grace expression. The overrides should also be reverted
+inside the grace expression. Here, the grace note's default stem
+direction is overriden and then reverted.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Voice {
@@ -2505,59 +2594,69 @@ should be inside the grace expression, for example,
     f16->
     \stemNeutral
   }
-  g4
+  g4 e c2
 }
 @end lilypond
 
-@noindent
-The overrides should also be reverted inside the grace expression.
+
+@cindex stem, with slash
+
+
+@snippets
+
+The slash through the stem found in @emph{acciaccatura}s can be applied 
+in other situations:
+
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
+\relative c'' {
+  \override Stem #'stroke-style = #"grace"
+  c8( d2) e8( f4)
+}
+@end lilypond
 
 The layout of grace expressions can be changed throughout the
 music using the function @code{add-grace-property}.  The following
 example undefines the @code{Stem} direction for this grace, so
 that stems do not always point up.
 
-@example
-\new Staff @{
-  #(add-grace-property 'Voice 'Stem 'direction '())
-  @dots{}
-@}
-@end example
+@lilypond[quote,ragged-right,fragment,verbatim,relative=2]
+\relative c'' {
+  \new Staff {
+    #(add-grace-property 'Voice 'Stem 'direction ly:stem::calc-direction)
+    #(remove-grace-property 'Voice 'Stem 'direction)
+    \new Voice {
+       \acciaccatura { f16 } g4 
+       \grace { d16[ e] } f4
+       \appoggiatura { a,32[ b c d] } e2
+    }
+  }
+}
+@end lilypond
 
-@noindent
 Another option is to change the variables @code{startGraceMusic},
 @code{stopGraceMusic}, @code{startAcciaccaturaMusic},
 @code{stopAcciaccaturaMusic}, @code{startAppoggiaturaMusic},
 @code{stopAppoggiaturaMusic}.  The default values of these can be
-seen in the file @file{ly/@/grace@/-init@/.ly}.  By redefining
+seen in the file @code{ly/@/grace@/-init@/.ly}.  By redefining
 them other effects may be obtained.
 
-@cindex stem, with slash
+Grace notes may be forced to align with regular notes
+in other staves:
 
-@noindent
-The slash through the stem in @emph{acciaccatura}s can be obtained in
-other situations by @code{\override Stem  #'stroke-style =
-#"grace"}.
-
-
-@snippets
-
-Grace notes may be forced to use align with regular notes
-in other staves by setting @code{strict-grace-spacing} to
-##t:
-
-@lilypond[verbatim,quote,relative=2]
-<<
-  \override Score.SpacingSpanner #'strict-grace-spacing = ##t
-  \new Staff {
-    c4
-    \afterGrace c4 { c16[ c8 c16] }
-    c4 r
-  }
-  \new Staff {
-    c16 c c c c c c c c4 r
-  }
->>
+@lilypond[verbatim,quote,ragged-right]
+\relative c'' {
+  <<
+    \override Score.SpacingSpanner #'strict-grace-spacing = ##t
+    \new Staff {
+      c4
+      \afterGrace c4 { c16[ c8 c16] }
+      c4 r
+    }
+    \new Staff {
+      c16 c c c c c c c c4 r
+    }
+  >>
+}
 @end lilypond
 
 
@@ -2566,10 +2665,11 @@ in other staves by setting @code{strict-grace-spacing} to
 Music Glossary:
 @rglos{grace notes},
 @rglos{acciaccatura},
-@rglos{appoggiatura}
+@rglos{appoggiatura}.
 
-Snippets:
-@rlsr{Rhythms}.
+Installed Files: @file{ly/@/grace@/-init@/.ly}.
+
+Snippets: @rlsr{Rhythms}.
 
 Internals Reference: @rinternals{GraceMusic}.
 
@@ -2587,8 +2687,8 @@ synchronized.  Take care when you mix staves with grace notes and
 staves without, for example,
 
 @lilypond[quote,ragged-right,relative=2,verbatim,fragment]
-<< \new Staff { e4 \bar "|:" \grace c16 d4 }
-   \new Staff { c4 \bar "|:" d4 } >>
+<< \new Staff { e4 \bar "|:" \grace c16 d2. }
+   \new Staff { c4 \bar "|:" d2. } >>
 @end lilypond
 
 @noindent
@@ -2596,8 +2696,8 @@ This can be remedied by inserting grace skips of the corresponding
 durations in the other staves.  For the above example
 
 @lilypond[quote,ragged-right,relative=2,verbatim,fragment]
-<< \new Staff { e4 \bar "|:" \grace c16 d4 }
-   \new Staff { c4 \bar "|:" \grace s16 d4 } >>
+<< \new Staff { e4 \bar "|:" \grace c16 d2. }
+   \new Staff { c4 \bar "|:" \grace s16 d2. } >>
 @end lilypond
 
 Grace sections should only be used within sequential music
@@ -2619,20 +2719,19 @@ cadenza, otherwise they will start too soon or too late.
 A solution to this problem is to use the functions
 @code{mmrest-of-length} and @code{skip-of-length}.  These Scheme
 functions take a piece of music as argument, and generate a multi-measure
-rest or @code{\skip}, exactly as long as the piece.  The use of
-@code{mmrest-of-length} is demonstrated in the following example.
+rest or @code{\skip}, exactly as long as the piece.  
 
 @lilypond[verbatim,ragged-right,quote]
 cadenza = \relative c' {
-  c4 d8 << { e f g } \\ { d4. } >>
-  g4 f2 g4 g
+  c4 d8 e f g g4 
+  f2 g4 g
 }
 
 \new GrandStaff <<
-  \new Staff { \cadenza c'4 }
+  \new Staff { \cadenza c'1 }
   \new Staff {
     #(ly:export (mmrest-of-length cadenza))
-    c'4
+    c'1
   }
 >>
 @end lilypond
@@ -2724,3 +2823,4 @@ Snippets:
 
 Internals Reference: @rinternals{Timing_translator},
 @rinternals{Score}
+

diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index 1daccd6b6d0c8a54f52a735ed626b9c0a28756fc..daf89d72c6276bb9cf8aceecfc8f0c75a95837f6 100644 (file)
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -282,14 +282,23 @@ reducing the size of PDF and PS files, point and click may be switched
 off by issuing
 
 @example
-#(ly:set-option 'point-and-click #f)
+\pointAndClickOff
 @end example
 
 @noindent
-in a @file{.ly} file.  Alternately, you may pass this as an command-line
-option
+in a @file{.ly} file.  Point and click may be explicitly enabled with
+
+@example
+\pointAndClickOn
+@end example
+
+Alternately, you may disable point and click with a command-line
+option:
 
 @example
 lilypond -dno-point-and-click file.ly
 @end example
 
+@warning{You should always turn off point and click in any LilyPond
+files to be distributed to avoid including path information about
+your computer in the .pdf file, which can pose a security risk.}

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index f31c98af414ddc2545741b4e740a4807cddfaa9f..0ad6e8f90323d9e10a52b58d680e33bc38b49ae8 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1749,6 +1749,13 @@ Manual assumes that you are familiar with LilyPond input.  You may
 wish to skim these chapters right now, and come back to them after
 you have more experience.
 
+In this tutorial and in the rest of the Learning Manual, there is a
+paragraph @strong{See also} at the end of each section, which contains
+cross-references to other sections: you should not follow these
+cross-references at first reading; when you have read all of the
+Learning Manual, you may want to read some sections again and follow
+cross-references for further reading.
+
 If you have not done so already, @emph{please} read @ref{About the
 documentation}.  There is a lot of information about LilyPond, so
 newcomers often do not know where they should look for help.  If

diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index e59614f71ac63a607987a914673620edb7393370..8094700d479adda04146896bbad6d574f85a9d7f 100644 (file)
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -124,15 +124,15 @@ We met some object naming conventions previously, in
 @ref{Contexts and engravers}.  Here for reference is a list
 of the most common object and property types together with 
 the conventions for naming them and a couple of examples of 
-some real names.  We have used A to stand for any capitalized
-alphabetic character and aaa to stand for any number of
+some real names.  We have used @q{A} to stand for any capitalized
+alphabetic character and @q{aaa} to stand for any number of
 lower-case alphabetic characters.  Other characters are used
 verbatim. 
 
 @multitable @columnfractions .33 .33 .33
 @headitem Object/property type           
   @tab Naming convention
-  @tab Example
+  @tab Examples
 @item Contexts
   @tab Aaaa or AaaaAaaaAaaa
   @tab Staff, GrandStaff
@@ -170,7 +170,7 @@ properties.
 We have already met the commands @code{\set} and @code{\with},
 used to change the properties of @strong{contexts} and to remove
 and add @strong{engravers}, in
-@ref{Modifying context properties} and @ref{Adding
+@ref{Modifying context properties}, and @ref{Adding
 and removing engravers}.  We now must meet some more important
 commands.
 
@@ -185,17 +185,16 @@ how this is done.
 The general syntax of this command is:
 
 @example
-\override @emph{context}.@emph{layout_object} 
-  #'@emph{layout_property} = #@emph{value}
+\override @var{Context}.@var{LayoutObject} #'@var{layout-property} = #@var{value}
 @end example
 
 @noindent
-This will set the property with the name @emph{layout_property}
+This will set the property with the name @var{layout-property}
 of the layout object with the name
-@emph{layout_object}, which is a member of the @emph{context}
-context, to the value @emph{value}.
+@var{LayoutObject}, which is a member of the @var{Context}
+context, to the value @var{value}.
 
-The @emph{context} can be omitted (and usually is) when the
+The @var{Context} can be omitted (and usually is) when the
 required context is unambiguously implied and is one of lowest
 level contexts, i.e., @code{Voice}, @code{ChordNames} or
 @code{Lyrics}, and we shall omit it in many of the following
@@ -235,11 +234,11 @@ value; note, not its previous value if several @code{\override}
 commands have been issued.
 
 @example
-\revert @emph{context}.@emph{layout_object} #'@emph{layout_property}
+\revert @var{Context}.@var{LayoutObject} #'@var{layout-property}
 @end example
 
-Again, just like @emph{context} in the @code{\override} command,
-@emph{context} is often not needed.  It will be omitted
+Again, just like @var{Context} in the @code{\override} command,
+@var{Context} is often not needed.  It will be omitted
 in many of the following examples.  Here we revert the color
 of the note head to the default value for the final two notes:
 
@@ -294,7 +293,7 @@ within a chord, whereas @code{\tweak} affects just the following
 item in the input stream.
 
 Here's an example.  Suppose we wish to change the size of the
-middle note (the E) in a C major chord.  Let's first see what
+middle note head (the E) in a C major chord.  Let's first see what
 @code{\once \override} would do:
 
 @lilypond[quote,fragment,ragged-right,verbatim,relative=1]
@@ -304,7 +303,7 @@ middle note (the E) in a C major chord.  Let's first see what
   <c e g>
 @end lilypond
 
-We see the override affects @emph{all} the notes in the chord.
+We see the override affects @emph{all} the note heads in the chord.
 This is because all the notes of a chord occur at the same
 @emph{musical moment}, and the action of @code{\once} is to
 apply the override to all layout objects of the type specified
@@ -314,9 +313,9 @@ command itself.
 The @code{\tweak} command operates in a different way.  It acts
 on the immediately following item in the input stream.  However,
 it is effective only on objects which are created directly from
-the input stream, essentially note heads and articulations.
-(Objects such as stems and accidentals are created later and
-cannot be tweaked in this way).  Furthermore, when it is applied
+the input stream, essentially note heads and articulations;
+objects such as stems and accidentals are created later and
+cannot be tweaked in this way.  Furthermore, when it is applied
 to note heads these @emph{must} be within a chord, i.e., within
 single angle brackets, so to tweak a single note the @code{\tweak}
 command must be placed inside single angle brackets with the
@@ -335,10 +334,10 @@ of the @code{\override} command.  Neither the context nor the
 layout object should be specified; in fact, it would generate
 an error to do so.  These are both implied by the following
 item in the input stream.  So the general syntax of the
-@code{\tweak} command is simply:
+@code{\tweak} command is simply
 
 @example
-\tweak #'@emph{layout_property} = #@emph{value}
+\tweak #'@var{layout-property} = #@var{value}
 @end example
 
 A @code{\tweak} command can also be used to modify just one in
@@ -350,6 +349,7 @@ a ^Black
   -\tweak #'color #green _Green
 @end lilypond
 
+@noindent
 Note that the @code{\tweak} command must be preceded by an
 articulation mark as if it were an articulation itself.
 
@@ -381,10 +381,7 @@ printed in red on the first short tuplet bracket.
 }
 @end lilypond
 
-You can find more details of the @code{\tweak} command in
-@ruser{Objects connected to the input}.
-
-If nested tuplets do not begin at the same moment their
+If nested tuplets do not begin at the same moment, their
 appearance may be modified in the usual way with
 @code{\override} commands:
 
@@ -403,6 +400,11 @@ appearance may be modified in the usual way with
 }
 @end lilypond
 
+@seealso
+
+Notation Reference:
+@ruser{The tweak command}.
+
 
 @node The Internals Reference manual
 @section The Internals Reference manual
@@ -449,7 +451,7 @@ yourself with just a little practice.
 Let's use a concrete example with a simple fragment of real
 music:
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2]
 {
   \time 6/8
   {
@@ -472,7 +474,7 @@ this we must look in the Internals Reference, or IR for short.
 The IR for the version of LilyPond you are using may be found
 on the LilyPond website at @uref{http://lilypond.org}.  Go to the
 documentation page and click on the Internals Reference link.
-For learning purposes you should use the standard html version,
+For learning purposes you should use the standard HTML version,
 not the @q{one big page} or the PDF.  For the next few
 paragraphs to make sense you will need to actually do this
 as you read.
@@ -485,18 +487,17 @@ The page that appears lists all the layout objects used in your
 version of LilyPond, in alphabetic order.  Select the link to
 Slur, and the properties of Slurs are listed.
 
-(An alternative way of finding this page is from the Notation
-Reference.  On one of the pages that deals with slurs you may
-find a link to the Internals Reference.  This link will
-take you directly to this page, but often it is easier to go
-straight to the IR and search there.)
+An alternative way of finding this page is from the Notation
+Reference.  On one of the pages that deals with slurs you may find a
+link to the Internals Reference.  This link will take you directly to
+this page, but if you have an idea about the name of the layout object
+to be tweaked, it is easier to go straight to the IR and search there.
 
-This Slur page in the IR tells us first that Slur objects are 
-created by the 
-Slur_engraver.  Then it lists the standard settings.  Note
-these are @strong{not} in alphabetic order.  Browse down
-them looking for a property that might control the heaviness
-of slurs, and you should find
+This Slur page in the IR tells us first that Slur objects are created
+by the Slur_engraver.  Then it lists the standard settings.  Note
+these are @strong{not} in alphabetic order.  Browse down them looking
+for a property that might control the heaviness of slurs, and you
+should find
 
 @example
 @code{thickness} (number)
@@ -533,7 +534,7 @@ placed?}  While you are unsure and learning, the best
 answer is, @q{Within the music, before the first slur and
 close to it.}  Let's do that:
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2]
 {
   \time 6/8
   {
@@ -597,7 +598,7 @@ is encountered, it is simply discarded.  So the command with
 @code{\once} must be
 repositioned as follows:
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2]
 {
   \time 6/8
   {
@@ -631,7 +632,7 @@ heavier?  Well, we could use two commands, each preceded by
 @code{\once} placed immediately before each of the notes where
 the slurs begin:
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2]
 {
   \time 6/8
   {
@@ -656,7 +657,7 @@ or we could omit the @code{\once} command and use the
 to return the @code{thickness} property to its default value
 after the second slur:
 
-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2]
 {
   \time 6/8
   {
@@ -688,6 +689,7 @@ additional features of the IR, and partly to give you more
 practice in extracting information from it.  These examples will
 contain progressively fewer words of guidance and explanation. 
 
+
 @node Properties found in interfaces
 @subsection Properties found in interfaces
 

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 5384baf12586ee11b9f2591f260e465b456727bc..dfc2352241b9d1441c2e13de77117ef6a4c12051 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -635,9 +635,6 @@ A complete example of a SATB score setup is in section
 
 @seealso
 
-Internals Reference:
-@rinternals{Melisma_translator}.
-
 @c @lsr{vocal,lyric@/-combine.ly}.
 
 @knownissues
@@ -1268,8 +1265,7 @@ text = \lyricmode {
 
 Internals Reference:
 @rinternals{LyricText},
-@rinternals{StanzaNumber},
-@rinternals{VocalName}.
+@rinternals{StanzaNumber}.
 
 
 

diff --git a/Documentation/user/wind.itely b/Documentation/user/wind.itely
index a754aaca31e7089f183e4f9159fb5d2903cd030f..9c9e483d0bb3be8a0cf2696f832101f146e0e885 100644 (file)
--- a/Documentation/user/wind.itely
+++ b/Documentation/user/wind.itely
@@ -11,7 +11,10 @@
 @node Wind instruments
 @section Wind instruments
 
-This section includes extra information for writing for bagpipes.
+@lilypondfile[quote]{wind-headword.ly}
+
+This section includes some elements of music notation that arise when
+writing for winds.
 
 @menu
 * Common notation for wind instruments::
@@ -21,32 +24,111 @@ This section includes extra information for writing for bagpipes.
 @node Common notation for wind instruments
 @subsection Common notation for wind instruments
 
+This section discusses some issues common to most wind instruments.
+
 @menu
 * References for wind instruments::
-* Half-holes::
+* Fingerings::
 @end menu
 
 @node References for wind instruments
-@subsubsection References for wind instruments
+@unnumberedsubsubsec References for wind instruments
+
+@cindex wind instruments
+
+Many notation issues for wind instruments pertain to breathing and
+tonguing:
+
+@itemize
+@item Breathing can be specified by rests or @ref{Breath marks}.
+@item Legato playing is indicated by @ref{Slurs}.
+@item Different types of tonguings, ranging from legato to non-legato to
+stacatto are usually shown by articulation marks, sometimes combined
+with slurs, see @ref{Articulations and ornamentations} and @ref{List of
+articulations}.
+@item Flutter tonguing is usually indicated by placing a tremolo mark
+and a text markup on the note. See @ref{Tremolo repeats}.
+@end itemize
+
+There are also other aspects of musical notation that can apply to wind
+instruments:
+
+@itemize
+@item Many wind instruments are transposing intruments, see
+@ref{Instrument transpositions}.
+@item The slide glissando are characteristic of the trombone, but other
+winds may perform keyed or valved glissandi. See @ref{Glissando}.
+@item Harmonic series glissandi, which are possible on all brass
+instruments but common for French Horns, are usually written out as
+@ref{Grace notes}.
+@item Pitch inflections at the end of a note are discussed in @ref{Falls
+and doits}.
+@item Key slaps or valve slaps are often shown by the @code{cross} style
+of @ref{Special note heads}.
+@item Woodwinds can overblow low notes to sound harmonics. These are
+shown by the @code{flageolet} articulation. See @ref{List of articulations}.
+@item The use of brass mutes is usually indicated by a text markup, but
+where there are many rapid changes it is better to use the
+@code{stopped} and @code{open} articulations. See @ref{Articulations and
+ornamentations} and @ref{List of articulations}.
+@item Stopped horns are indicated by the @code{stopped} articulation.
+See @ref{Articulations and ornamentations}.
+@end itemize
+
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{changing--flageolet-mark-size.ly}
+
+@seealso
+
+Notation Reference:
+@ref{Breath marks},
+@ref{Slurs},
+@ref{Articulations and ornamentations},
+@ref{List of articulations},
+@ref{Tremolo repeats},
+@ref{Instrument transpositions},
+@ref{Glissando},
+@ref{Grace notes},
+@ref{Falls and doits},
+@ref{Special note heads},
+
+Snippets:
+@rlsr{Winds}
+
+
+@node Fingerings
+@unnumberedsubsubsec Fingerings
+@c TODO add link to LSR snippet by Libero Mureddo once he has added
+@c it (after August 15th).
+All wind instruments other than the trombone require the use of several
+fingers to produce each pitch.
 
-@c TODO Add refs
-TBC
-
-@node Half-holes
-@subsubsection Half-holes
-@c TODO Add text; search -user
 TBC
 
 @node Bagpipes
 @subsection Bagpipes
 
+This section includes extra information for writing for bagpipes.
+
 @menu
 * Bagpipe definitions::
 * Bagpipe example::
 @end menu
 
 @node Bagpipe definitions
-@subsubsection Bagpipe definitions
+@unnumberedsubsubsec Bagpipe definitions
+
+@cindex bagpipe
+@cindex Scottish highland bagpipe
+@cindex grace notes
+@funindex \taor
+@funindex taor
+@funindex \hideKeySignature
+@funindex hideKeySignature
+@funindex \showKeySignature
+@funindex showKeySignature
 
 LilyPond contains special definitions for music for the Scottish
 highland bagpipe; to use them, add
@@ -85,9 +167,14 @@ This can be indicated by @code{cflat} or @code{fflat}.  Similarly, the
 piobaireachd high g can be written @code{gflat} when it occurs in light
 music.
 
+@seealso
+@rlsr{Winds}
 
 @node Bagpipe example
-@subsubsection Bagpipe example
+@unnumberedsubsubsec Bagpipe example
+
+@cindex bagpipe example
+@cindex Amazing Grace bagpipe example
 
 This is what the well known tune Amazing Grace looks like in bagpipe
 notation.
@@ -129,7 +216,5 @@ notation.
 }
 @end lilypond
 
-
-
-
-
+@seealso
+@rlsr{Winds}

diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py
index 34ada97aac97d2cb7a5cfc8af0c0c481aab23aec..f0631321328beee93514e1bc65fa24ed931f8737 100644 (file)
--- a/buildscripts/add_html_footer.py
+++ b/buildscripts/add_html_footer.py
@@ -13,12 +13,15 @@ import langdefs
 # see process_links()
 non_copied_pages = ['Documentation/user/out-www/lilypond-big-page',
                     'Documentation/user/out-www/lilypond-internals-big-page',
+                    'Documentation/user/out-www/lilypond-learning-big-page',
+                    'Documentation/user/out-www/lilypond-program-big-page',
                     'Documentation/user/out-www/music-glossary-big-page',
                     'out-www/examples',
                     'Documentation/topdocs',
                     'Documentation/bibliography',
                     'Documentation/out-www/THANKS',
                     'Documentation/out-www/DEDICATION',
+                    'Documentation/out-www/devel',
                     'input/']
 
 def _doc (s):
@@ -253,7 +256,7 @@ def add_html_footer (package_name = '',
     translation = langdefs.translation
     localtime = time.strftime ('%c %Z', time.localtime (time.time ()))
 
-    if re.search ("http://", mail_address):
+    if "http://" in mail_address:
         mail_address_url = mail_address
     else:
         mail_address_url= 'mailto:' + mail_address
@@ -263,6 +266,23 @@ def add_html_footer (package_name = '',
     if int (versiontup[1]) %  2:
         branch_str = _doc ('development-branch')
 
+    # Initialize dictionaries for string formatting
+    subst = {}
+    subst[''] = dict ([i for i in globals ().items() if type (i[1]) is str])
+    subst[''].update (dict ([i for i in locals ().items() if type (i[1]) is str]))
+    for l in translation:
+        e = langdefs.LANGDICT[l].webext
+        if e:
+            subst[e] = {}
+            for name in subst['']:
+                subst[e][name] = translation[l] (subst[''][name])
+    # Do deeper string formatting as early as possible,
+    # so only one '%' formatting pass is needed later
+    for e in subst:
+        subst[e]['footer_name_version'] = subst[e]['footer_name_version'] % subst[e]
+        subst[e]['footer_report_errors'] = subst[e]['footer_report_errors'] % subst[e]
+        subst[e]['footer_suggest_docs'] = subst[e]['footer_suggest_docs'] % subst[e]
+
     for prefix, ext_list in pages_dict.items ():
         for lang_ext in ext_list:
             file_name = langdefs.lang_file_name (prefix, lang_ext, '.html')
@@ -282,16 +302,8 @@ def add_html_footer (package_name = '',
                 page_flavors = process_links (s, prefix, lang_ext, file_name, missing, target)
                 # Add menu after stripping: must not have autoselection for language menu.
                 page_flavors = add_menu (page_flavors, prefix, available, target, translation)
-            subst = dict ([i for i in globals().items() if type (i[1]) is str])
-            subst.update (dict ([i for i in locals().items() if type (i[1]) is str]))
             for k in page_flavors:
-                if page_flavors[k][0] in translation:
-                    for name in subst:
-                        subst[name] = translation[page_flavors[k][0]] (subst[name])
-                subst['footer_name_version'] = subst['footer_name_version'] % subst
-                subst['footer_report_errors'] = subst['footer_report_errors'] % subst
-                subst['footer_suggest_docs'] = subst['footer_suggest_docs'] % subst
-                page_flavors[k][1] = page_flavors[k][1] % subst
+                page_flavors[k][1] = page_flavors[k][1] % subst[page_flavors[k][0]]
                 out_f = open (name_filter (k), 'w')
                 out_f.write (page_flavors[k][1])
                 out_f.close()

diff --git a/buildscripts/check_texi_refs.py b/buildscripts/check_texi_refs.py
index 94bd6ecb642476c58ed188cbbd26e624f3a88977..4df33e68e7f8dfc21586d398c839aaa6ea067051 100755 (executable)
--- a/buildscripts/check_texi_refs.py
+++ b/buildscripts/check_texi_refs.py
@@ -143,8 +143,10 @@ else:
         return None
 
 
-ref_re = re.compile (r'@(ref|ruser|rlearning|rprogram|rglos)\{([^,\\]*?)\}(.)',
-                     re.DOTALL)
+ref_re = re.compile \
+    ('@(ref|ruser|rlearning|rprogram|rglos)(?:\\{(?P<ref>[^,\\\\\\}]+?)|\
+named\\{(?P<refname>[^,\\\\]+?),(?P<display>[^,\\\\\\}]+?))\\}(?P<last>.)',
+     re.DOTALL)
 node_include_re = re.compile (r'(?m)^@(node|include)\s+(.+?)$')
 
 whitespace_re = re.compile (r'\s+')
@@ -327,18 +329,24 @@ in the list)\n")
         t -= 1
     raise InteractionError ("%d retries limit exceeded" % retries)
 
+refs_count = 0
 
 def check_ref (manual, file, m):
-    global fixes_count, bad_refs_count
+    global fixes_count, bad_refs_count, refs_count
+    refs_count += 1
     bad_ref = False
     fixed = True
     type = m.group (1)
-    original_name = m.group (2)
+    original_name = m.group ('ref') or m.group ('refname')
     name = whitespace_re.sub (' ', original_name). strip ()
     newline_indices = manuals[manual]['newline_indices'][file]
     line = which_line (m.start (), newline_indices)
-    linebroken = '\n' in m.group (2)
-    next_char = m.group (3)
+    linebroken = '\n' in original_name
+    original_display_name = m.group ('display')
+    next_char = m.group ('last')
+    if original_display_name: # the xref has an explicit display name
+        display_linebroken = '\n' in original_display_name
+        display_name = whitespace_re.sub (' ', original_display_name). strip ()
     commented_out = is_commented_out \
         (m.start (), m.end (), manuals[manual]['comments_boundaries'][file])
     useful_fix = not outdir in file
@@ -433,7 +441,7 @@ and x-ref by index number or beginning of name:\n", [''.join ([i[0], ' ', i[1]])
                         fixed = True
 
         if not fixed:
-            # all previous automatic fixes attempts failed,
+            # all previous automatic fixing attempts failed,
             # ask user for substring to look in node names
             while True:
                 node_list = search_prompt ()
@@ -466,11 +474,29 @@ please fix the code source instead of generated documentation.\n")
 
     # compute returned string
     if new_name == name:
-        return ('@%s{%s}' % (type, original_name)) + next_char
+        if bad_ref and (options.interactive or options.auto_fix):
+            # only the type of the ref was fixed
+            fixes_count += 1
+        if original_display_name:
+            return ('@%snamed{%s,%s}' % (type, original_name, original_display_name)) + next_char
+        else:
+            return ('@%s{%s}' % (type, original_name)) + next_char
     else:
         fixes_count += 1
         (ref, n) = preserve_linebreak (new_name, linebroken)
-        return ('@%s{%s}' % (type, ref)) + next_char + n
+        if original_display_name:
+            if bad_ref:
+                stdout.write ("Current display name is `%s'\n")
+                display_name = raw_input \
+                    ("Enter a new display name or press enter to keep the existing name:\n") \
+                    or display_name
+                (display_name, n) = preserve_linebreak (display_name, display_linebroken)
+            else:
+                display_name = original_display_name
+            return ('@%snamed{%s,%s}' % (type, ref, display_name)) + \
+                next_char + n
+        else:
+            return ('@%s{%s}' % (type, ref)) + next_char + n
 
 
 log.write ("Checking cross-references...\n")
@@ -489,5 +515,5 @@ except InteractionError, instance:
     log.write ("Operation refused by user: %s\nExiting.\n" % instance)
     sys.exit (3)
 
-log.write ("Done: %d bad x-refs found, fixed %d.\n" %
-           (bad_refs_count, fixes_count))
+log.write ("Done: %d x-refs found, %d bad x-refs found, fixed %d.\n" %
+           (refs_count, bad_refs_count, fixes_count))

diff --git a/buildscripts/texi-langutils.py b/buildscripts/texi-langutils.py
index d949662206dc1a888674572edf70c8f5e177392c..844e2ef86817637c8c00461838884b2b731bbbce 100644 (file)
--- a/buildscripts/texi-langutils.py
+++ b/buildscripts/texi-langutils.py
@@ -26,9 +26,9 @@ make_gettext = ('--gettext', '') in optlist   # --gettext    generate a node lis
 make_skeleton = ('--skeleton', '') in optlist # --skeleton   extract the node tree from a Texinfo source
 
 output_file = 'doc.pot'
-node_blurb = '''@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+
+# @untranslated should be defined as a macro in Texinfo source
+node_blurb = '''@untranslated
 '''
 doclang = ''
 head_committish = read_pipe ('git-rev-parse HEAD')

diff --git a/buildscripts/translations-status.py b/buildscripts/translations-status.py
index a3b6799f21f8b43777ed3e69229610395114062f..1c62ee56d200b9a94e987a710ef5552a0c68ccb4 100755 (executable)
--- a/buildscripts/translations-status.py
+++ b/buildscripts/translations-status.py
@@ -50,7 +50,7 @@ checkers_re = re.compile (r'^@c\s+Translation\s*checkers\s*:\s*(.*?)$',
                           re.M | re.I)
 status_re = re.compile (r'^@c\s+Translation\s*status\s*:\s*(.*?)$', re.M | re.I)
 post_gdp_re = re.compile ('post.GDP', re.I)
-untranslated_node_str = 'UNTRANSLATED NODE: IGNORE ME'
+untranslated_node_str = '@untranslated'
 skeleton_str = '-- SKELETON FILE --'
 
 section_titles_string = _doc ('Section titles')

diff --git a/input/manual/chords-headword.ly b/input/manual/chords-headword.ly
index 149e5a76866a4088dd39f18273e8ee42adc54853..8f40a58f2bfbe7077381466a7dae2321a12a67a0 100644 (file)
--- a/input/manual/chords-headword.ly
+++ b/input/manual/chords-headword.ly
@@ -43,7 +43,7 @@ c''2 f''4 d'' |  c''2  bes'4  a' | bes'2 a' | g'1 |
 
 Alto = { 
   \key f \major 
-  c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 ges' | g'4 e' f'2 |
+  c'2 c'4 c' | d'4 c' c'2 | f'4. f'8 f'4 fis' | g'4 e' f'2 |
   f'2 f'4 f' |  f'2  g'4  f' | e'2 f' | e'1 | 
 }
 

diff --git a/input/manual/wind-headword.ly b/input/manual/wind-headword.ly
new file mode 100644 (file)
index 0000000..139b853
--- /dev/null
+++ b/input/manual/wind-headword.ly
@@ -0,0 +1,46 @@
+\version "2.11.55"
+#(set-global-staff-size 15)
+\paper {
+  line-width = 16\cm
+  indent = 0\cm
+}
+
+% NR 2.whatever  Wind 
+
+% Tchaikovsky
+% Nutcracker Suite, VII Dance of the Merlitons
+\score {
+  \new StaffGroup <<
+    \new Staff \relative c'' {
+      \set Staff.instrumentName = "Flauto I,II"
+      \once \override Score.RehearsalMark #'self-alignment-X = #-1
+      \once \override Score.RehearsalMark #'break-align-symbols =
+#'(time-signature)
+      \once \override Score.TimeSignature
+#'break-align-anchor-alignment = #LEFT
+      \once \override Score.RehearsalMark #'padding = #4
+      \mark \markup \large \bold {Moderato assai}
+      \key d \major
+      \time 2/4
+      \compressFullBarRests
+      R2*2
+      <d a>16-.\p <cis g>-. <d a>-. <cis g>-. <d a>8-. <cis g>-.
+      <e a,>-.\< <d a>32( <fis d> <a fis> <d a> <fis d>4--)\mf
+      <g d>16-. <fis cis>-. <g d>-. <fis cis>-.
+        <e b>(\> <d a>) <a fis>-. <fis d>-.\!
+      <d bes>4--\sf \acciaccatura {<d' bes>8} <cis a>4--\mf
+    }
+    \new Staff \relative c' {
+      \set Staff.instrumentName = "Flauto III"
+      \key d \major
+      \time 2/4
+      \compressFullBarRests
+      R2*2_\markup{Gr.Fl.}
+      fis16-.\p e-. fis-. e-. fis8-. e-.
+      g8-.\< fis32( a d fis a4--)\mf
+      b16-. a-. b-. a-. g(\> fis) d-. a-.\!
+      g4--\sf \acciaccatura fis'8 g4--\mf
+    }
+  >>
+}
+

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index b07acd6ef0b4f6477ed646da3d49a7e20c5299c0..509dece604d31f96cef2345cd141615e0c836461 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -17,7 +17,6 @@ struct Lookup
 {
   static Stencil dot (Offset p, Real radius);
   static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
-  static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm);
   static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
   static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
   static Stencil frame (Box b, Real thick, Real blot);

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 62e0d9731786d78c03da4f7bcefe0cc3ae8cf4e7..d2099d7c4886f58802ee2db82dc85ebc54369b3d 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -18,11 +18,9 @@ using namespace std;
 #include "warn.hh"
 #include "dimensions.hh"
 #include "bezier.hh"
-#include "string-convert.hh"
 #include "file-path.hh"
 #include "main.hh"
 #include "lily-guile.hh"
-#include "font-metric.hh"
 
 Stencil
 Lookup::dot (Offset p, Real radius)
@@ -461,207 +459,6 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
   return Stencil (b, horizontal_bend);
 }
 
-/*
-  TODO: junk me.
-*/
-Stencil
-Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
-{
-  Stencil m;
-  string sym = ly_scm2string (scm_car (s));
-  string reg = ly_scm2string (scm_car (scm_cdr (s)));
-
-  if (sym == "Discant")
-    {
-      Stencil r = fm->find_by_name ("accordion.accDiscant");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      int eflag = 0x00;
-      if (reg.substr (0, 3) == "EEE")
-       {
-         eflag = 0x07;
-         reg = reg.substr (3);
-       }
-      else if (reg.substr (0, 2) == "EE")
-       {
-         eflag = 0x05;
-         reg = reg.substr (2);
-       }
-      else if (reg.substr (0, 2) == "Eh")
-       {
-         eflag = 0x04;
-         reg = reg.substr (2);
-       }
-      else if (reg.substr (0, 1) == "E")
-       {
-         eflag = 0x02;
-         reg = reg.substr (1);
-       }
-      if (eflag & 0x02)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-       }
-      if (eflag & 0x04)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         d.translate_axis (0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-       }
-      if (eflag & 0x01)
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-       }
-      if (reg.substr (0, 2) == "SS")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (0.5 * staff_space PT, Y_AXIS);
-         d.translate_axis (0.4 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (2);
-       }
-      if (reg.substr (0, 1) == "S")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (0.5 * staff_space PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  else if (sym == "Freebase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accFreebase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-       }
-    }
-  else if (sym == "Bayanbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBayanbase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "T")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      /* include 4' reed just for completeness. You don't want to use this. */
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 2) == "EE")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         d.translate_axis (0.4 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         d.translate_axis (-0.8 * staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (2);
-       }
-      if (reg.substr (0, 1) == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  else if (sym == "Stdbase")
-    {
-      Stencil r = fm->find_by_name ("accordion.accStdbase");
-      m.add_stencil (r);
-      if (reg.substr (0, 1) == "T")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "F")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "M")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 2 PT, Y_AXIS);
-         d.translate_axis (staff_space PT, X_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "E")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-      if (reg.substr (0, 1) == "S")
-       {
-         Stencil d = fm->find_by_name ("accordion.accDot");
-         d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
-         m.add_stencil (d);
-         reg = reg.substr (1);
-       }
-    }
-  /* ugh maybe try to use regular font for S.B. and B.B and only use one font
-     for the rectangle */
-  else if (sym == "SB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accSB");
-      m.add_stencil (r);
-    }
-  else if (sym == "BB")
-    {
-      Stencil r = fm->find_by_name ("accordion.accBB");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEE")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEE");
-      m.add_stencil (r);
-    }
-  else if (sym == "OldEES")
-    {
-      Stencil r = fm->find_by_name ("accordion.accOldEES");
-      m.add_stencil (r);
-    }
-  return m;
-}
-
 Stencil
 Lookup::repeat_slash (Real w, Real s, Real t)
 {

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index f6957f9eea8bcf87f4dca26482dcfb18d410433f..a8fbc49fcdb51d3b446e12eca0848b1541ea9f19 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -33,9 +33,6 @@ Script_interface::get_stencil (Grob *me, Direction d)
       return Font_interface::get_default_font (me)
        ->find_by_name ("scripts." + ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
-    return Lookup::accordion (scm_cdr (s), 1.0,
-                             Font_interface::get_default_font (me));
   else
     assert (false);
 

diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly
deleted file mode 100644 (file)
index bb69331..0000000
--- a/ly/accordion-defs-init.ly
+++ /dev/null
@@ -1,56 +0,0 @@
-\version "2.10.0"
-% Symbols needed to print accordion music
-% 
-%  2' = T
-%  4' = F
-%  8' = E
-% 16' = S
-%
-
-accDiscant = #(make-articulation "accDiscant")
-accDiscantF = #(make-articulation "accDiscantF")
-accDiscantE = #(make-articulation "accDiscantE")
-accDiscantEh = #(make-articulation "accDiscantEh")
-accDiscantFE = #(make-articulation "accDiscantFE")
-accDiscantFEh = #(make-articulation "accDiscantFEh")
-accDiscantEE = #(make-articulation "accDiscantEE")
-accDiscantFEE = #(make-articulation "accDiscantFEE")
-accDiscantEEE = #(make-articulation "accDiscantEEE")
-accDiscantFEEE = #(make-articulation "accDiscantFEEE")
-accDiscantS = #(make-articulation "accDiscantS")
-accDiscantFS = #(make-articulation "accDiscantFS")
-accDiscantES = #(make-articulation "accDiscantES")
-accDiscantEhS = #(make-articulation "accDiscantEhS")
-accDiscantFES = #(make-articulation "accDiscantFES")
-accDiscantFEhS = #(make-articulation "accDiscantFEhS")
-accDiscantEES = #(make-articulation "accDiscantEES")
-accDiscantFEES = #(make-articulation "accDiscantFEES")
-accDiscantEEES = #(make-articulation "accDiscantEEES")
-accDiscantFEEES = #(make-articulation "accDiscantFEEES")
-accDiscantSS = #(make-articulation "accDiscantSS")
-accDiscantESS = #(make-articulation "accDiscantESS")
-accDiscantEESS = #(make-articulation "accDiscantEESS")
-accDiscantEEESS = #(make-articulation "accDiscantEEESS")
-
-accFreebase = #(make-articulation "accFreebase")
-accFreebaseF = #(make-articulation "accFreebaseF")
-accFreebaseE = #(make-articulation "accFreebaseE")
-accFreebaseFE = #(make-articulation "accFreebaseFE")
-
-accBayanbase = #(make-articulation "accBayanbase")
-accBayanbaseT = #(make-articulation "accBayanbaseT")
-accBayanbaseE = #(make-articulation "accBayanbaseE")
-accBayanbaseTE = #(make-articulation "accBayanbaseTE")
-accBayanbaseEE = #(make-articulation "accBayanbaseEE")
-accBayanbaseTEE = #(make-articulation "accBayanbaseTEE")
-
-accStdbase = #(make-articulation "accStdbase")
-accStdbaseFE = #(make-articulation "accStdbaseFE")
-accStdbaseTFE = #(make-articulation "accStdbaseTFE")
-accStdbaseMES = #(make-articulation "accStdbaseMES")
-accStdbaseTFMES = #(make-articulation "accStdbaseTFMES")
-
-accSB = #(make-articulation "accSB")
-accBB = #(make-articulation "accBB")
-accOldEE = #(make-articulation "accOldEE")
-accOldEES = #(make-articulation "accOldEES")

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 0ed5d49f5bec759b635a68aa95be9e53a2d7b243..c0d43eb980f74b66856e5a2fa8c559320b89e8a4 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -349,3 +349,10 @@ predefinedFretboardsOn = {
   \set FretBoards.predefinedDiagramTable = #fretboard-table
 }
 
+pointAndClickOff = #(define-music-function (parser location) ()
+                      (ly:set-option 'point-and-click #f)
+                      (make-music 'SequentialMusic 'void #t))
+
+pointAndClickOn = #(define-music-function (parser location) ()
+                      (ly:set-option 'point-and-click #t)
+                      (make-music 'SequentialMusic 'void #t))

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index f655cf6177ee9a43833ca485fa87220de8cd4ffb..2736eb5069cb65c2441bd5775af114c162984d5c 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -27,10 +27,9 @@ CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 
 LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir)   \
- -I $(input-dir)/regression/ -I $(input-dir)/manual/ -I                        \
- $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/ -I      \
- $(top-build-dir)/mf/out/ -I $(input-dir)/lsr/ -I                      \
- $(top-src-dir)/input/manual 
+ -I $(input-dir)/lsr/ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \
+ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/      \
+ -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 85b41ceb59e5c05f7d99bd37b9dac9b41ed25f1e..ee7942b1a534e9867ab370ad8b08f233934a59a7 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.11.39\n"
+"Project-Id-Version: lilypond 2.11.56\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs\n"
-"POT-Creation-Date: 2008-02-14 15:55+0100\n"
+"POT-Creation-Date: 2008-08-17 15:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,138 +28,144 @@ msgstr ""
 msgid "%s has been replaced by %s"
 msgstr ""
 
-#: convertrules.py:24 musicexp.py:16 convert-ly.py:47 lilypond-book.py:82
+#: convertrules.py:24 musicexp.py:16 convert-ly.py:48 lilypond-book.py:82
 #: warn.cc:48 input.cc:90
 #, c-format, python-format
 msgid "warning: %s"
 msgstr ""
 
-#: convertrules.py:33 convertrules.py:103
+#: convertrules.py:49 convertrules.py:99
 msgid "\\header { key = concat + with + operator }"
 msgstr ""
 
-#: convertrules.py:48
+#: convertrules.py:58
 #, python-format
 msgid "deprecated %s"
 msgstr ""
 
-#: convertrules.py:61
+#: convertrules.py:70
 msgid "deprecated \\textstyle, new \\key syntax"
 msgstr ""
 
-#: convertrules.py:80 convertrules.py:2124 convertrules.py:2337
-#: convertrules.py:2512 convertrules.py:2889
+#: convertrules.py:86 convertrules.py:1906 convertrules.py:2085
+#: convertrules.py:2237 convertrules.py:2567
 msgid "bump version for release"
 msgstr ""
 
-#: convertrules.py:99
+#: convertrules.py:103
 msgid "new \\header format"
 msgstr ""
 
-#: convertrules.py:133
+#: convertrules.py:132
 msgid "\\translator syntax"
 msgstr ""
 
-#: convertrules.py:211
+#: convertrules.py:184
 msgid "\\repeat NUM Music Alternative -> \\repeat FOLDSTR Music Alternative"
 msgstr ""
 
-#: convertrules.py:254 convertrules.py:828 convertrules.py:1584
-#: convertrules.py:2685
+#: convertrules.py:216 convertrules.py:699 convertrules.py:1383
+#: convertrules.py:2379
 #, python-format
 msgid "deprecate %s"
 msgstr ""
 
-#: convertrules.py:361
+#: convertrules.py:290
 #, python-format
 msgid "deprecate %s "
 msgstr ""
 
-#: convertrules.py:384
+#: convertrules.py:319
 msgid "new \\notenames format"
 msgstr ""
 
-#: convertrules.py:404
+#: convertrules.py:337
 msgid "new tremolo format"
 msgstr ""
 
-#: convertrules.py:417
+#: convertrules.py:342
 msgid "Staff_margin_engraver deprecated, use Instrument_name_engraver"
 msgstr ""
 
-#: convertrules.py:536
+#: convertrules.py:395
 msgid "change property definiton case (eg. onevoice -> oneVoice)"
 msgstr ""
 
-#: convertrules.py:544
+#: convertrules.py:457
 msgid "new \\textscript markup text"
 msgstr ""
 
-#: convertrules.py:638
+#: convertrules.py:530
 #, python-format
 msgid "identifier names: %s"
 msgstr ""
 
-#: convertrules.py:679
+#: convertrules.py:569
 msgid "point-and-click argument changed to procedure."
 msgstr ""
 
-#: convertrules.py:739
+#: convertrules.py:611
 msgid "semicolons removed"
 msgstr ""
 
 #. 40 ?
-#: convertrules.py:795
+#: convertrules.py:654
 #, python-format
 msgid "%s property names"
 msgstr ""
 
-#: convertrules.py:865
+#: convertrules.py:724
 msgid "automaticMelismata turned on by default"
 msgstr ""
 
-#: convertrules.py:1131 convertrules.py:1893 convertrules.py:2166
-#: convertrules.py:2472
+#: convertrules.py:963 convertrules.py:1682 convertrules.py:1943
+#: convertrules.py:2190
 #, python-format
 msgid "remove %s"
 msgstr ""
 
-#: convertrules.py:1164 convertrules.py:1173
+#: convertrules.py:1001 convertrules.py:1005
 msgid "cluster syntax"
 msgstr ""
 
-#: convertrules.py:1182
+#: convertrules.py:1014
 msgid "new Pedal style syntax"
 msgstr ""
 
-#: convertrules.py:1451
+#: convertrules.py:1273
 msgid ""
 "New relative mode,\n"
 "Postfix articulations, new text markup syntax, new chord syntax."
 msgstr ""
 
-#: convertrules.py:1475
+#: convertrules.py:1286
 msgid "Remove - before articulation"
 msgstr ""
 
-#: convertrules.py:1515
+#: convertrules.py:1324
 #, python-format
 msgid "%s misspelling"
 msgstr ""
 
-#: convertrules.py:1521
-msgid "attempting automatic \\figures conversion.  Check results!"
+#: convertrules.py:1346
+msgid "Swap < > and << >>"
 msgstr ""
 
-#: convertrules.py:1550
-msgid "Swap < > and << >>"
+#: convertrules.py:1349
+msgid "attempting automatic \\figures conversion.  Check results!"
 msgstr ""
 
-#: convertrules.py:1576
+#: convertrules.py:1400
 msgid "Use Scheme code to construct arbitrary note events."
 msgstr ""
 
-#: convertrules.py:1609
+#: convertrules.py:1407
+msgid ""
+"use symbolic constants for alterations,\n"
+"remove \\outputproperty, move ly:verbose into ly:get-option"
+msgstr ""
+
+#: convertrules.py:1432
 #, python-format
 msgid ""
 "\\outputproperty found,\n"
@@ -171,7 +177,7 @@ msgid ""
 "as a substitution text."
 msgstr ""
 
-#: convertrules.py:1623
+#: convertrules.py:1446
 msgid ""
 "The alteration field of Scheme pitches was multiplied by 2\n"
 "to support quarter tone accidentals.  You must update the following "
@@ -181,75 +187,69 @@ msgid ""
 "* keySignature settings made with \\property\n"
 msgstr ""
 
-#: convertrules.py:1633
-msgid ""
-"use symbolic constants for alterations,\n"
-"remove \\outputproperty, move ly:verbose into ly:get-option"
-msgstr ""
-
-#: convertrules.py:1692
+#: convertrules.py:1493
 msgid "removal of automaticMelismata; use melismaBusyProperties instead."
 msgstr ""
 
-#: convertrules.py:1807
+#: convertrules.py:1600
 msgid "\\partcombine syntax change to \\newpartcombine"
 msgstr ""
 
-#: convertrules.py:1824
+#: convertrules.py:1628
+msgid ""
+"Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
+"Harmonic notes. Thread context removed. Lyrics context removed."
+msgstr ""
+
+#: convertrules.py:1632
 msgid "Drums found. Enclose drum notes in \\drummode"
 msgstr ""
 
-#: convertrules.py:1835 convertrules.py:1842 convertrules.py:1853
+#: convertrules.py:1643 convertrules.py:1650 convertrules.py:1661
 #, python-format
 msgid ""
 "\n"
 "%s found. Check file manually!\n"
 msgstr ""
 
-#: convertrules.py:1835
+#: convertrules.py:1643
 msgid "Drum notation"
 msgstr ""
 
-#: convertrules.py:1863
-msgid ""
-"Drum notation changes, Removing \\chordmodifiers, \\notenames.\n"
-"Harmonic notes. Thread context removed. Lyrics context removed."
-msgstr ""
-
-#: convertrules.py:1924
+#: convertrules.py:1702
 msgid "new syntax for property settings:"
 msgstr ""
 
-#: convertrules.py:1957
+#: convertrules.py:1728
 msgid "Property setting syntax in \\translator{ }"
 msgstr ""
 
-#: convertrules.py:1978
-#, python-format
-msgid "use %s"
+#: convertrules.py:1767
+msgid "Scheme grob function renaming"
 msgstr ""
 
-#: convertrules.py:1995
-msgid "Scheme grob function renaming"
+#: convertrules.py:1780
+#, python-format
+msgid "use %s"
 msgstr ""
 
-#: convertrules.py:2008
+#: convertrules.py:1797
 msgid "More Scheme function renaming"
 msgstr ""
 
-#: convertrules.py:2140
+#: convertrules.py:1925
 msgid ""
 "Page layout has been changed, using paper size and margins.\n"
 "textheight is no longer used.\n"
 msgstr ""
 
-#: convertrules.py:2259
+#: convertrules.py:2011
 msgid ""
 "\\foo -> \\foomode (for chords, notes, etc.)\n"
 "fold \\new FooContext \\foomode into \\foo."
 msgstr ""
 
-#: convertrules.py:2285
+#: convertrules.py:2049
 msgid ""
 "staff size should be changed at top-level\n"
 "with\n"
@@ -258,79 +258,79 @@ msgid ""
 "\n"
 msgstr ""
 
-#: convertrules.py:2320
+#: convertrules.py:2069
 msgid "regularize other identifiers"
 msgstr ""
 
-#: convertrules.py:2411
+#: convertrules.py:2137
+msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
+msgstr ""
+
+#: convertrules.py:2150
 msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: convertrules.py:2414
+#: convertrules.py:2153
 msgid "Try the texstrings backend"
 msgstr ""
 
-#: convertrules.py:2417
+#: convertrules.py:2156
 #, python-format
 msgid "Do something like: %s"
 msgstr ""
 
-#: convertrules.py:2420
+#: convertrules.py:2159
 msgid "Or save as UTF-8 in your editor"
 msgstr ""
 
-#: convertrules.py:2452
-msgid "\\encoding: smart recode latin1..utf-8. Remove ly:point-and-click"
+#: convertrules.py:2213
+msgid "warn about auto beam settings"
 msgstr ""
 
-#: convertrules.py:2485
+#: convertrules.py:2218
 msgid "auto beam settings"
 msgstr ""
 
-#: convertrules.py:2487
+#: convertrules.py:2220
 msgid ""
 "\n"
 "Auto beam settings must now specify each interesting moment in a measure\n"
 "explicitely; 1/4 is no longer multiplied to cover moments 1/2 and 3/4 too.\n"
 msgstr ""
 
-#: convertrules.py:2498
-msgid "warn about auto beam settings"
-msgstr ""
-
-#: convertrules.py:2624
+#: convertrules.py:2334
 msgid "verticalAlignmentChildCallback has been deprecated"
 msgstr ""
 
-#: convertrules.py:2652
+#: convertrules.py:2338
 msgid "Remove callbacks property, deprecate XY-extent-callback."
 msgstr ""
 
-#: convertrules.py:2663
+#: convertrules.py:2359
 msgid "Use grob closures iso. XY-offset-callbacks."
 msgstr ""
 
-#: convertrules.py:2770
+#: convertrules.py:2421
 msgid "foobar -> foo-bar for \\paper, \\layout"
 msgstr ""
 
-#: convertrules.py:2877
+#: convertrules.py:2531
 msgid "deprecate \\tempo in \\midi"
 msgstr ""
 
-#: convertrules.py:2912
+#: convertrules.py:2578
 msgid "deprecate cautionary-style. Use AccidentalCautionary properties"
 msgstr ""
 
-#: convertrules.py:2941
+#: convertrules.py:2591
 msgid "Rename accidental glyphs, use glyph-name-alist."
 msgstr ""
 
-#: convertrules.py:2973
+#: convertrules.py:2646
 msgid "edge-text settings for TextSpanner."
 msgstr ""
 
-#: convertrules.py:2974
+#: convertrules.py:2647
 #, python-format
 msgid ""
 "Use\n"
@@ -338,82 +338,111 @@ msgid ""
 "%s"
 msgstr ""
 
-#: convertrules.py:3020
+#: convertrules.py:2686
+msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
+msgstr ""
+
+#: convertrules.py:2692
 msgid "all settings related to dashed lines.\n"
 msgstr ""
 
-#: convertrules.py:3021
+#: convertrules.py:2693
 msgid "Use \\override ... #'style = #'line for solid lines and\n"
 msgstr ""
 
-#: convertrules.py:3022
+#: convertrules.py:2694
 msgid "\t\\override ... #'style = #'dashed-line for dashed lines."
 msgstr ""
 
-#: convertrules.py:3027
-msgid "Use #'style not #'dash-fraction to select solid/dashed lines."
+#: convertrules.py:2730
+msgid ""
+"metronomeMarkFormatter uses text markup as second argument,\n"
+"fret diagram properties moved to fret-diagram-details."
+msgstr ""
+
+#: convertrules.py:2735
+msgid "metronomeMarkFormatter got an additional text argument.\n"
+msgstr ""
+
+#: convertrules.py:2736
+#, python-format
+msgid ""
+"The function assigned to Score.metronomeMarkFunction now uses the signature\n"
+"%s"
+msgstr ""
+
+#: convertrules.py:2799
+msgid "\\put-adjacent argument order.\n"
+msgstr ""
+
+#: convertrules.py:2800
+msgid "Axis and direction now come before markups:\n"
+msgstr ""
+
+#: convertrules.py:2801
+msgid "\\put-adjacent axis dir markup markup."
 msgstr ""
 
-#: fontextract.py:26
+#: fontextract.py:25
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: fontextract.py:71
+#: fontextract.py:70
 #, python-format
 msgid "Extracted %s"
 msgstr ""
 
-#: fontextract.py:86
+#: fontextract.py:85
 #, python-format
 msgid "Writing fonts to %s"
 msgstr ""
 
-#: lilylib.py:102 lilylib.py:153
+#: lilylib.py:101 lilylib.py:152
 #, python-format
 msgid "Invoking `%s'"
 msgstr ""
 
-#: lilylib.py:104 lilylib.py:155
+#: lilylib.py:103 lilylib.py:154
 #, python-format
 msgid "Running %s..."
 msgstr ""
 
-#: lilylib.py:220
+#: lilylib.py:219
 #, python-format
 msgid "Usage: %s"
 msgstr ""
 
-#: musicexp.py:577
+#: musicexp.py:585
 #, python-format
 msgid "unable to set the music %(music)s for the repeat %(repeat)s"
 msgstr ""
 
-#: musicexp.py:586
+#: musicexp.py:594
 msgid "encountered repeat without body"
 msgstr ""
 
-#: musicxml.py:13 convert-ly.py:50 lilypond-book.py:85 warn.cc:54 input.cc:96
+#: musicxml.py:13 convert-ly.py:51 lilypond-book.py:85 warn.cc:54 input.cc:96
 #: input.cc:104
 #, c-format, python-format
 msgid "error: %s"
 msgstr ""
 
-#: musicxml.py:272
+#: musicxml.py:298
 msgid "requested time signature, but time sig is unknown"
 msgstr ""
 
-#: musicxml.py:338
+#: musicxml.py:354
 #, python-format
 msgid "Encountered note at %s with %s duration (no <type> element):"
 msgstr ""
 
-#: musicxml.py:372
+#: musicxml.py:388
 #, python-format
-msgid "Unable to find find instrument for ID=%s\n"
+msgid "Unable to find instrument for ID=%s\n"
 msgstr ""
 
-#: abc2ly.py:1342 convert-ly.py:71 lilypond-book.py:109 midi2ly.py:849
+#: abc2ly.py:1342 convert-ly.py:72 lilypond-book.py:109 midi2ly.py:846
 #, python-format
 msgid "%s [OPTION]... FILE"
 msgstr ""
@@ -422,127 +451,129 @@ msgstr ""
 #, python-format
 msgid ""
 "abc2ly converts ABC music files (see\n"
-"%s) to LilyPond input."
+"%s) to LilyPond input.\n"
 msgstr ""
 
-#: abc2ly.py:1350 convert-ly.py:78 etf2ly.py:1190 lilypond-book.py:175
-#: midi2ly.py:885 musicxml2ly.py:1824 main.cc:161
+#: abc2ly.py:1351 convert-ly.py:79 etf2ly.py:1190 lilypond-book.py:195
+#: midi2ly.py:882 musicxml2ly.py:2170 main.cc:161
 msgid "show version number and exit"
 msgstr ""
 
-#: abc2ly.py:1354 convert-ly.py:82 etf2ly.py:1186 lilypond-book.py:125
-#: midi2ly.py:864 musicxml2ly.py:1808 main.cc:150
+#: abc2ly.py:1355 convert-ly.py:83 etf2ly.py:1186 lilypond-book.py:126
+#: midi2ly.py:861 musicxml2ly.py:2152 main.cc:150
 msgid "show this help and exit"
 msgstr ""
 
-#: abc2ly.py:1356 etf2ly.py:1191 midi2ly.py:868
+#: abc2ly.py:1357 etf2ly.py:1191 midi2ly.py:865
 msgid "write output to FILE"
 msgstr ""
 
-#: abc2ly.py:1358
-msgid "be strict about succes"
+#: abc2ly.py:1359
+msgid "be strict about success"
 msgstr ""
 
-#: abc2ly.py:1360
+#: abc2ly.py:1361
 msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: abc2ly.py:1361 convert-ly.py:111 etf2ly.py:1198 lilypond-book.py:180
-#: midi2ly.py:897 musicxml2ly.py:1872
-msgid "Bugs"
-msgstr ""
-
-#: abc2ly.py:1362 convert-ly.py:112 etf2ly.py:1199 lilypond-book.py:181
-#: midi2ly.py:898 musicxml2ly.py:1873
+#: abc2ly.py:1363 convert-ly.py:120 etf2ly.py:1199 lilypond-book.py:202
+#: midi2ly.py:894 musicxml2ly.py:2225
 msgid "Report bugs via"
 msgstr ""
 
-#: convert-ly.py:32
+#: convert-ly.py:31
 msgid ""
 "Update LilyPond input to newer version.  By default, update from the\n"
 "version taken from the \\version command, to the current LilyPond version."
 msgstr ""
 
-#: convert-ly.py:34 lilypond-book.py:59
+#: convert-ly.py:33 lilypond-book.py:59
 msgid "Examples:"
 msgstr ""
 
-#: convert-ly.py:66 etf2ly.py:1174 lilypond-book.py:105 midi2ly.py:79
+#: convert-ly.py:67 etf2ly.py:1173 lilypond-book.py:105 midi2ly.py:77
 msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:67 etf2ly.py:1175 lilypond-book.py:106 midi2ly.py:80
+#: convert-ly.py:68 etf2ly.py:1174 lilypond-book.py:106 midi2ly.py:78
 msgid "It comes with NO WARRANTY."
 msgstr ""
 
-#: convert-ly.py:86 convert-ly.py:106
+#: convert-ly.py:87 convert-ly.py:114
 msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:88
+#: convert-ly.py:89
 msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
 
-#: convert-ly.py:91
+#: convert-ly.py:92
 msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:94
+#: convert-ly.py:96
 msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:100
-msgid "show rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
+#: convert-ly.py:102
+#, python-format
+msgid "force updating \\version number to %s"
 msgstr ""
 
-#: convert-ly.py:105
-msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
+#: convert-ly.py:108
+#, python-format
+msgid "show rules [default: -f 0, -t %s]"
 msgstr ""
 
-#: convert-ly.py:153
+#: convert-ly.py:113
+#, python-format
+msgid "convert to VERSION [default: %s]"
+msgstr ""
+
+#: convert-ly.py:160
 msgid "Applying conversion: "
 msgstr ""
 
-#: convert-ly.py:166
+#: convert-ly.py:173
 msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:168
+#: convert-ly.py:175
 msgid "Stopping at last succesful rule"
 msgstr ""
 
-#: convert-ly.py:190
+#: convert-ly.py:196
 #, python-format
 msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:277 relocate.cc:362 source-file.cc:54
+#: convert-ly.py:286 relocate.cc:362 source-file.cc:59
 #, c-format, python-format
 msgid "cannot open file: `%s'"
 msgstr ""
 
-#: convert-ly.py:284
+#: convert-ly.py:293
 #, python-format
 msgid "cannot determine version for `%s'.  Skipping"
 msgstr ""
 
-#: etf2ly.py:1180
+#: etf2ly.py:1179
 #, python-format
 msgid "%s [OPTION]... ETF-FILE"
 msgstr ""
 
-#: etf2ly.py:1181
+#: etf2ly.py:1180
 msgid ""
 "Enigma Transport Format is a format used by Coda Music Technology's\n"
 "Finale product.  etf2ly converts a subset of ETF to a ready-to-use LilyPond "
-"file."
+"file.\n"
 msgstr ""
 
-#: etf2ly.py:1192 midi2ly.py:869 musicxml2ly.py:1866 main.cc:154 main.cc:159
+#: etf2ly.py:1192 midi2ly.py:866 musicxml2ly.py:2218 main.cc:154 main.cc:159
 msgid "FILE"
 msgstr ""
 
-#: etf2ly.py:1194 lilypond-book.py:178 midi2ly.py:886 main.cc:163
+#: etf2ly.py:1194 lilypond-book.py:198 midi2ly.py:883 main.cc:163
 msgid "show warranty and copyright"
 msgstr ""
 
@@ -570,7 +601,7 @@ msgid "FILTER"
 msgstr ""
 
 #: lilypond-book.py:116
-msgid "pipe snippets through FILTER [convert-ly -n -]"
+msgid "pipe snippets through FILTER [default: `convert-ly -n -']"
 msgstr ""
 
 #: lilypond-book.py:120
@@ -578,380 +609,422 @@ msgid ""
 "use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
 msgstr ""
 
-#: lilypond-book.py:127
+#: lilypond-book.py:121
+msgid "FORMAT"
+msgstr ""
+
+#: lilypond-book.py:128
 msgid "add DIR to include path"
 msgstr ""
 
-#: lilypond-book.py:128 lilypond-book.py:135 lilypond-book.py:147 main.cc:153
+#: lilypond-book.py:129 lilypond-book.py:136 lilypond-book.py:154
+#: lilypond-book.py:160 lilypond-book.py:166 lilypond-book.py:172 main.cc:153
 msgid "DIR"
 msgstr ""
 
-#: lilypond-book.py:133
+#: lilypond-book.py:134
 msgid "format Texinfo output so that Info will look for images of music in DIR"
 msgstr ""
 
-#: lilypond-book.py:140
-msgid "PAD"
+#: lilypond-book.py:141
+msgid "run executable PROG instead of latex"
 msgstr ""
 
 #: lilypond-book.py:142
+msgid "PROG"
+msgstr ""
+
+#: lilypond-book.py:147
+msgid "PAD"
+msgstr ""
+
+#: lilypond-book.py:149
 msgid ""
 "pad left side of music to align music inspite of uneven bar numbers (in mm)"
 msgstr ""
 
-#: lilypond-book.py:146
+#: lilypond-book.py:153
 msgid "write output to DIR"
 msgstr ""
 
-#: lilypond-book.py:151
+#: lilypond-book.py:159
+msgid "do not fail if no lilypond output is found"
+msgstr ""
+
+#: lilypond-book.py:165
+msgid "do not fail if no PNG images are found for EPS files"
+msgstr ""
+
+#: lilypond-book.py:171
+msgid "write lily-XXX files to DIR, link into --output dir"
+msgstr ""
+
+#: lilypond-book.py:176
 msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:152
+#: lilypond-book.py:177
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:159
+#: lilypond-book.py:184
 msgid "create PDF files for use with PDFTeX"
 msgstr ""
 
-#: lilypond-book.py:163
-msgid ""
-"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
-"must use this with dvips -h INPUT.psfonts"
-msgstr ""
-
-#: lilypond-book.py:167 midi2ly.py:879 musicxml2ly.py:1829 main.cc:162
+#: lilypond-book.py:187 midi2ly.py:876 musicxml2ly.py:2175 main.cc:162
 msgid "be verbose"
 msgstr ""
 
-#: lilypond-book.py:788
+#: lilypond-book.py:825
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:1022
+#: lilypond-book.py:1087
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1025
+#: lilypond-book.py:1089
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:1029
+#: lilypond-book.py:1092
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:1032
+#: lilypond-book.py:1094
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:1051
+#: lilypond-book.py:1112
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1422
+#: lilypond-book.py:1538
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:1439
+#: lilypond-book.py:1555
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilypond-book.py:1440
+#: lilypond-book.py:1556
 msgid "The error log is as follows:"
 msgstr ""
 
-#: lilypond-book.py:1512
+#: lilypond-book.py:1618
 msgid "cannot find \\begin{document} in LaTeX document"
 msgstr ""
 
-#: lilypond-book.py:1623
+#: lilypond-book.py:1718
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:1628
+#: lilypond-book.py:1724
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1632
+#: lilypond-book.py:1730
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1642
+#: lilypond-book.py:1764
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:1653
+#: lilypond-book.py:1775
 #, python-format
 msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1659
+#: lilypond-book.py:1789
 #, python-format
 msgid "Writing `%s'..."
 msgstr ""
 
-#: lilypond-book.py:1714
+#: lilypond-book.py:1847
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1718
+#: lilypond-book.py:1851
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:1737
+#: lilypond-book.py:1870
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:1753
+#: lilypond-book.py:1886
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1762
+#: lilypond-book.py:1895
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1776
+#: lilypond-book.py:1907
 #, python-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: lilypond-book.py:1809
-msgid "option --psfonts not used"
-msgstr ""
-
-#: lilypond-book.py:1810
-msgid "processing with dvips will have no fonts"
-msgstr ""
-
-#: lilypond-book.py:1813
-msgid "DVIPS usage:"
-msgstr ""
-
-#: lilypond-book.py:1869
-#, python-format
-msgid "Writing fonts to %s..."
-msgstr ""
-
-#: midi2ly.py:87 lily-library.scm:615 lily-library.scm:624
+#: midi2ly.py:85 lily-library.scm:620 lily-library.scm:629
 msgid "warning: "
 msgstr ""
 
-#: midi2ly.py:90 midi2ly.py:911
+#: midi2ly.py:88 midi2ly.py:907
 msgid "error: "
 msgstr ""
 
-#: midi2ly.py:91
+#: midi2ly.py:89
 msgid "Exiting... "
 msgstr ""
 
-#: midi2ly.py:837
+#: midi2ly.py:834
 #, python-format
 msgid "%s output to `%s'..."
 msgstr ""
 
-#: midi2ly.py:850 musicxml2ly.py:1803
+#: midi2ly.py:847
 #, python-format
-msgid "Convert %s to LilyPond input."
+msgid "Convert %s to LilyPond input.\n"
 msgstr ""
 
-#: midi2ly.py:855
+#: midi2ly.py:852
 msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:857 midi2ly.py:872
+#: midi2ly.py:854 midi2ly.py:869
 msgid "DUR"
 msgstr ""
 
-#: midi2ly.py:858
+#: midi2ly.py:855
 msgid "quantise note durations on DUR"
 msgstr ""
 
-#: midi2ly.py:861
+#: midi2ly.py:858
 msgid "print explicit durations"
 msgstr ""
 
-#: midi2ly.py:865
+#: midi2ly.py:862
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr ""
 
-#: midi2ly.py:866
+#: midi2ly.py:863
 msgid "ALT[:MINOR]"
 msgstr ""
 
-#: midi2ly.py:871
+#: midi2ly.py:868
 msgid "quantise note starts on DUR"
 msgstr ""
 
-#: midi2ly.py:874
+#: midi2ly.py:871
 msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:877
+#: midi2ly.py:874
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:889
+#: midi2ly.py:886
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:892
+#: midi2ly.py:889
 msgid "Examples"
 msgstr ""
 
-#: midi2ly.py:912
+#: midi2ly.py:908
 msgid "no files specified on command line."
 msgstr ""
 
-#: musicxml2ly.py:193 musicxml2ly.py:195
+#: musicxml2ly.py:213
+msgid ""
+"Encountered file created by Dolet 3.4 for Sibelius, containing wrong beaming "
+"information. All beaming information in the MusicXML file will be ignored"
+msgstr ""
+
+#: musicxml2ly.py:229 musicxml2ly.py:231
 #, python-format
 msgid "Unprocessed PartGroupInfo %s encountered"
 msgstr ""
 
-#: musicxml2ly.py:426
+#: musicxml2ly.py:471
 #, python-format
 msgid ""
 "Encountered rational duration with denominator %s, unable to convert to "
 "lilypond duration"
 msgstr ""
 
-#: musicxml2ly.py:609
+#: musicxml2ly.py:654
 #, python-format
 msgid "unknown mode %s, expecting 'major' or 'minor'"
 msgstr ""
 
-#: musicxml2ly.py:647
+#: musicxml2ly.py:692
 #, python-format
 msgid "Encountered unprocessed marker %s\n"
 msgstr ""
 
-#: musicxml2ly.py:741
+#: musicxml2ly.py:786
 #, python-format
 msgid "unknown span event %s"
 msgstr ""
 
-#: musicxml2ly.py:751
+#: musicxml2ly.py:796
 #, python-format
 msgid "unknown span type %s for %s"
 msgstr ""
 
-#: musicxml2ly.py:1259
+#: musicxml2ly.py:1207
+msgid "Unknown metronome mark, ignoring"
+msgstr ""
+
+#. TODO: Implement the other (more complex) way for tempo marks!
+#: musicxml2ly.py:1212
+msgid ""
+"Metronome marks with complex relations (<metronome-note> in MusicXML) are "
+"not yet implemented."
+msgstr ""
+
+#: musicxml2ly.py:1368
+#, python-format
+msgid "Unable to convert chord type %s to lilypond."
+msgstr ""
+
+#: musicxml2ly.py:1514
 #, python-format
 msgid "drum %s type unknown, please add to instrument_drumtype_dict"
 msgstr ""
 
-#: musicxml2ly.py:1263
+#: musicxml2ly.py:1518
 msgid "cannot find suitable event"
 msgstr ""
 
-#: musicxml2ly.py:1346
+#: musicxml2ly.py:1608
 #, python-format
 msgid "Negative skip %s"
 msgstr ""
 
-#: musicxml2ly.py:1480
+#: musicxml2ly.py:1760
 #, python-format
 msgid "Negative skip found: from %s to %s, difference is %s"
 msgstr ""
 
-#: musicxml2ly.py:1505
+#: musicxml2ly.py:1787
 #, python-format
 msgid "unexpected %s; expected %s or %s or %s"
 msgstr ""
 
-#: musicxml2ly.py:1583
+#: musicxml2ly.py:1897
 msgid "cannot have two simultaneous slurs"
 msgstr ""
 
-#: musicxml2ly.py:1711
+#: musicxml2ly.py:2035
 #, python-format
 msgid "cannot simultaneously have more than one mode: %s"
 msgstr ""
 
-#: musicxml2ly.py:1791
+#: musicxml2ly.py:2133
 msgid "Converting to LilyPond expressions..."
 msgstr ""
 
-#: musicxml2ly.py:1802
-msgid "musicxml2ly [options] FILE.xml"
+#: musicxml2ly.py:2144
+msgid "musicxml2ly [OPTION]... FILE.xml"
 msgstr ""
 
-#: musicxml2ly.py:1812
-#, python-format
+#: musicxml2ly.py:2146
 msgid ""
-"This program is free software.  It is covered by the GNU General Public\n"
-"License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `%s --warranty' for more\n"
-"information."
+"Convert MusicXML from FILE.xml to LilyPond input.\n"
+"If the given filename is -, musicxml2ly reads from the command line.\n"
 msgstr ""
 
-#: musicxml2ly.py:1835
+#: musicxml2ly.py:2156
+msgid ""
+"Copyright (c) 2005--2008 by\n"
+"    Han-Wen Nienhuys <hanwen@xs4all.nl>,\n"
+"    Jan Nieuwenhuizen <janneke@gnu.org> and\n"
+"    Reinhold Kainhofer <reinhold@kainhofer.com>\n"
+msgstr ""
+
+#: musicxml2ly.py:2181
 msgid "use lxml.etree; uses less memory and cpu time"
 msgstr ""
 
-#: musicxml2ly.py:1841
+#: musicxml2ly.py:2187
 msgid "input file is a zip-compressed MusicXML file"
 msgstr ""
 
-#: musicxml2ly.py:1847
+#: musicxml2ly.py:2193
 msgid "convert pitches in relative mode (default)"
 msgstr ""
 
-#: musicxml2ly.py:1852
+#: musicxml2ly.py:2198
 msgid "convert pitches in absolute mode"
 msgstr ""
 
-#: musicxml2ly.py:1855
+#: musicxml2ly.py:2201
 msgid "LANG"
 msgstr ""
 
-#: musicxml2ly.py:1857
+#: musicxml2ly.py:2203
 msgid ""
 "use a different language file 'LANG.ly' and corresponding pitch names, e.g. "
 "'deutsch' for deutsch.ly"
 msgstr ""
 
-#: musicxml2ly.py:1863
+#: musicxml2ly.py:2209
 msgid "do not convert directions (^, _ or -) for articulations, dynamics, etc."
 msgstr ""
 
-#: musicxml2ly.py:1871
-msgid "set output filename to FILE"
+#: musicxml2ly.py:2215
+msgid ""
+"do not convert beaming information, use lilypond's automatic beaming instead"
 msgstr ""
 
-#: musicxml2ly.py:1929
+#: musicxml2ly.py:2223
+msgid "set output filename to FILE, stdout if -"
+msgstr ""
+
+#: musicxml2ly.py:2305
 #, python-format
 msgid "unknown part in part-list: %s"
 msgstr ""
 
-#: musicxml2ly.py:1985
+#: musicxml2ly.py:2367
+msgid "Input is compressed, extracting raw MusicXML data from stdin"
+msgstr ""
+
+#: musicxml2ly.py:2370
 #, python-format
 msgid "Input file %s is compressed, extracting raw MusicXML data"
 msgstr ""
 
-#: musicxml2ly.py:2011
+#: musicxml2ly.py:2400
+msgid "Reading MusicXML from Standard input ..."
+msgstr ""
+
+#: musicxml2ly.py:2402
 #, python-format
 msgid "Reading MusicXML from %s ..."
 msgstr ""
 
-#: musicxml2ly.py:2039 musicxml2ly.py:2053
+#: musicxml2ly.py:2435
 #, python-format
 msgid "Output to `%s'"
 msgstr ""
 
-#: musicxml2ly.py:2096
+#: musicxml2ly.py:2497
 #, python-format
 msgid "Unable to find input file %s"
 msgstr ""
@@ -985,17 +1058,17 @@ msgstr ""
 msgid "continuing, cross fingers"
 msgstr ""
 
-#: accidental-engraver.cc:250
+#: accidental-engraver.cc:249
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:277
+#: accidental-engraver.cc:276
 #, c-format
 msgid "ignoring unknown accidental rule: %s"
 msgstr ""
 
-#: accidental-engraver.cc:293
+#: accidental-engraver.cc:292
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
@@ -1009,7 +1082,7 @@ msgstr ""
 msgid "natural alteration glyph not found"
 msgstr ""
 
-#: align-interface.cc:325
+#: align-interface.cc:305
 msgid "tried to get a translation for something that is no child of mine"
 msgstr ""
 
@@ -1039,7 +1112,7 @@ msgstr ""
 msgid "removing this vertical group"
 msgstr ""
 
-#: axis-group-interface.cc:524
+#: axis-group-interface.cc:532
 msgid "an outside-staff object should have a direction, defaulting to up"
 msgstr ""
 
@@ -1076,7 +1149,7 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:1069
+#: beam.cc:1078
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
@@ -1143,7 +1216,7 @@ msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
 #. if we get to here, just put everything on one line
-#: constrained-breaking.cc:167 constrained-breaking.cc:184
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
 msgid "cannot find line breaking that satisfies constraints"
 msgstr ""
 
@@ -1152,26 +1225,26 @@ msgstr ""
 msgid "program has no such type: `%s'"
 msgstr ""
 
-#: context-property.cc:30
+#: context-property.cc:32
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: context.cc:144
+#: context.cc:139
 #, c-format
 msgid "cannot find or create new `%s'"
 msgstr ""
 
-#: context.cc:206
+#: context.cc:197
 #, c-format
 msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context.cc:268
+#: context.cc:259
 #, c-format
 msgid "Invalid CreateContext event: Cannot create %s context"
 msgstr ""
 
-#: context.cc:380
+#: context.cc:390
 #, c-format
 msgid "cannot find or create: `%s'"
 msgstr ""
@@ -1195,23 +1268,23 @@ msgstr ""
 msgid "dot `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:192
+#: dynamic-engraver.cc:186
 msgid "cannot find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:201
+#: dynamic-engraver.cc:195
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:203
+#: dynamic-engraver.cc:197
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:206
+#: dynamic-engraver.cc:200
 msgid "cresc starts here"
 msgstr ""
 
-#: dynamic-engraver.cc:335
+#: dynamic-engraver.cc:328
 msgid "unterminated (de)crescendo"
 msgstr ""
 
@@ -1238,15 +1311,15 @@ msgstr ""
 msgid "adding font directory: %s"
 msgstr ""
 
-#: general-scheme.cc:201
+#: general-scheme.cc:202
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:202
+#: general-scheme.cc:203
 msgid "setting to zero"
 msgstr ""
 
-#: general-scheme.cc:421 output-ps.scm:61
+#: general-scheme.cc:422 output-ps.scm:61
 msgid "Found infinity or nan in output. Substituting 0.0"
 msgstr ""
 
@@ -1278,12 +1351,12 @@ msgid "implied \\%s added"
 msgstr ""
 
 #. ligature may not start with 2nd head of pes or flexa
-#: gregorian-ligature-engraver.cc:212
+#: gregorian-ligature-engraver.cc:213
 msgid "cannot apply `\\~' on first head of ligature"
 msgstr ""
 
 #. (pitch == prev_pitch)
-#: gregorian-ligature-engraver.cc:224
+#: gregorian-ligature-engraver.cc:225
 msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
@@ -1311,15 +1384,15 @@ msgstr ""
 msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:187
+#: hairpin.cc:186
 msgid "decrescendo too small"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:59
+#: horizontal-bracket-engraver.cc:68
 msgid "do not have that many brackets"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:68
+#: horizontal-bracket-engraver.cc:77
 msgid "conflicting note group events"
 msgstr ""
 
@@ -1331,17 +1404,17 @@ msgstr ""
 msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:117
+#: includable-lexer.cc:53 lily-guile.cc:76 lily-parser-scheme.cc:110
 #, c-format
 msgid "cannot find file: `%s'"
 msgstr ""
 
-#: includable-lexer.cc:55 lily-parser-scheme.cc:108
+#: includable-lexer.cc:55 lily-parser-scheme.cc:101
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
 
-#: input.cc:112 source-file.cc:168 source-file.cc:183
+#: input.cc:112 source-file.cc:173 source-file.cc:188
 msgid "position unknown"
 msgstr ""
 
@@ -1387,20 +1460,20 @@ msgstr ""
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:438
+#: lily-guile.cc:428
 #, c-format
 msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:441
+#: lily-guile.cc:431
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:448
+#: lily-guile.cc:438
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:460
+#: lily-guile.cc:450
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
@@ -1424,17 +1497,17 @@ msgstr ""
 msgid "deprecated function called: %s"
 msgstr ""
 
-#: lily-parser-scheme.cc:89
+#: lily-parser-scheme.cc:83
 #, c-format
 msgid "Changing working directory to: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:107
+#: lily-parser-scheme.cc:100
 #, c-format
 msgid "cannot find init file: `%s'"
 msgstr ""
 
-#: lily-parser-scheme.cc:126
+#: lily-parser-scheme.cc:119
 #, c-format
 msgid "Processing `%s'"
 msgstr ""
@@ -1447,12 +1520,12 @@ msgstr ""
 msgid "braces do not match"
 msgstr ""
 
-#: lyric-combine-music-iterator.cc:327
+#: lyric-combine-music-iterator.cc:329
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr ""
 
-#: lyric-engraver.cc:158
+#: lyric-engraver.cc:162
 msgid "Lyric syllable does not have note. Use \\lyricsto or associatedVoice."
 msgstr ""
 
@@ -1566,7 +1639,7 @@ msgstr ""
 msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:203
+#: main.cc:226
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1574,82 +1647,82 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:230
+#: main.cc:254
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:232
+#: main.cc:256
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:234
+#: main.cc:258
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:236
+#: main.cc:260
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:238
+#: main.cc:262
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: main.cc:242
+#: main.cc:266
 #, c-format
 msgid "Report bugs via %s"
 msgstr ""
 
-#: main.cc:288
+#: main.cc:312
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:302
+#: main.cc:326
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
-#: main.cc:304
+#: main.cc:328
 #, c-format
 msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:319
+#: main.cc:343
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:321
+#: main.cc:345
 #, c-format
 msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:329
+#: main.cc:353
 #, c-format
 msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:336
+#: main.cc:360
 #, c-format
 msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:342
+#: main.cc:366
 #, c-format
 msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:348
+#: main.cc:372
 #, c-format
 msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
-#: main.cc:594
+#: main.cc:619
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -1746,6 +1819,13 @@ msgstr ""
 msgid "transposition by %s makes alteration larger than double"
 msgstr ""
 
+#: new-dynamic-engraver.cc:128
+#, c-format
+msgid ""
+"unknown crescendo style: %s\n"
+"defaulting to hairpin."
+msgstr ""
+
 #: new-fingering-engraver.cc:96
 msgid "cannot add text scripts to individual note heads"
 msgstr ""
@@ -1758,7 +1838,7 @@ msgstr ""
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:463
+#: note-collision.cc:484
 msgid "ignoring too many clashing note columns"
 msgstr ""
 
@@ -1815,21 +1895,21 @@ msgstr ""
 msgid "Finding the ideal number of pages..."
 msgstr ""
 
-#: optimal-page-breaking.cc:71
+#: optimal-page-breaking.cc:76
 msgid "Fitting music on 1 page..."
 msgstr ""
 
-#: optimal-page-breaking.cc:73
+#: optimal-page-breaking.cc:78
 #, c-format
 msgid "Fitting music on %d pages..."
 msgstr ""
 
-#: optimal-page-breaking.cc:75
+#: optimal-page-breaking.cc:80
 #, c-format
 msgid "Fitting music on %d or %d pages..."
 msgstr ""
 
-#: optimal-page-breaking.cc:152 page-turn-page-breaking.cc:226
+#: optimal-page-breaking.cc:157 page-turn-page-breaking.cc:226
 #: paper-score.cc:146
 msgid "Drawing systems..."
 msgstr ""
@@ -1915,7 +1995,7 @@ msgstr ""
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: parse-scm.cc:87
+#: parse-scm.cc:93
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
@@ -1944,18 +2024,18 @@ msgstr ""
 msgid "unterminated phrasing slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:286
+#: piano-pedal-engraver.cc:287
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
+#: piano-pedal-engraver.cc:302 piano-pedal-engraver.cc:313
 #: piano-pedal-performer.cc:93
 #, c-format
 msgid "cannot find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:347
+#: piano-pedal-engraver.cc:348
 #, c-format
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
@@ -2048,7 +2128,7 @@ msgstr ""
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:132
+#: rest.cc:148
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
@@ -2105,12 +2185,12 @@ msgstr ""
 msgid "cannot end slur"
 msgstr ""
 
-#: slur.cc:353
+#: slur.cc:357
 #, c-format
 msgid "Ignoring grob for slur: %s. avoid-slur not set?"
 msgstr ""
 
-#: source-file.cc:74
+#: source-file.cc:79
 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
@@ -2152,25 +2232,25 @@ msgstr ""
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:179
+#: system.cc:178
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:271
+#: system.cc:270
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: text-spanner-engraver.cc:60
+#: text-spanner-engraver.cc:62
 msgid "cannot find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:72
+#: text-spanner-engraver.cc:75
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:118
+#: text-spanner-engraver.cc:121
 msgid "unterminated text spanner"
 msgstr ""
 
@@ -2220,11 +2300,11 @@ msgstr ""
 msgid "Previous %s event here"
 msgstr ""
 
-#: trill-spanner-engraver.cc:84
+#: trill-spanner-engraver.cc:85
 msgid "cannot find start of trill spanner"
 msgstr ""
 
-#: trill-spanner-engraver.cc:96
+#: trill-spanner-engraver.cc:98
 msgid "already have a trill spanner"
 msgstr ""
 
@@ -2273,40 +2353,40 @@ msgstr ""
 msgid "giving up"
 msgstr ""
 
-#: parser.yy:728
+#: parser.yy:729
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:752
+#: parser.yy:753
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1211
+#: parser.yy:1224
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1509
+#: parser.yy:1522
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1536 parser.yy:1541 parser.yy:2006
+#: parser.yy:1549 parser.yy:1554 parser.yy:2026
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1638
+#: parser.yy:1651
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1793 parser.yy:1843
+#: parser.yy:1806 parser.yy:1856
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1960
+#: parser.yy:1980
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2021
+#: parser.yy:2041
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
@@ -2357,35 +2437,35 @@ msgstr ""
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:582
+#: lexer.ll:584
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:686
+#: lexer.ll:688
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:801 lexer.ll:802
+#: lexer.ll:803 lexer.ll:804
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:907 lexer.ll:908
+#: lexer.ll:910 lexer.ll:911
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:908 lexer.ll:909
+#: lexer.ll:911 lexer.ll:912
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lexer.ll:914 lexer.ll:915
+#: lexer.ll:917 lexer.ll:918
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:767 ps-to-png.scm:58
+#: backend-library.scm:19 lily.scm:776 ps-to-png.scm:58
 #, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
@@ -2395,17 +2475,19 @@ msgstr ""
 msgid "`~a' failed (~a)"
 msgstr ""
 
-#: backend-library.scm:117 framework-tex.scm:344 framework-tex.scm:369
+#: backend-library.scm:116 framework-tex.scm:344 framework-tex.scm:369
 #, scheme-format
 msgid "Converting to `~a'..."
 msgstr ""
 
-#: backend-library.scm:130
+#. Do not try to guess the name of the png file,
+#. GS produces PNG files like BASE-page%d.png.
+#: backend-library.scm:128
 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
-#: backend-library.scm:168
+#: backend-library.scm:166
 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
@@ -2427,11 +2509,16 @@ msgstr ""
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:296
+#: define-markup-commands.scm:608
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1310
+#: define-markup-commands.scm:2386
+#, scheme-format
+msgid "Cannot find glyph ~a"
+msgstr ""
+
+#: define-markup-commands.scm:2697
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
@@ -2455,32 +2542,32 @@ msgstr ""
 msgid "See music-types.scm for supported repeats"
 msgstr ""
 
-#: document-backend.scm:91
+#: document-backend.scm:99
 #, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
-#: document-backend.scm:135
+#: document-backend.scm:154
 #, scheme-format
 msgid "cannot find interface for property: ~S"
 msgstr ""
 
-#: document-backend.scm:145
+#: document-backend.scm:164
 #, scheme-format
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
-#: documentation-lib.scm:45
+#: documentation-lib.scm:48
 #, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:154
+#: documentation-lib.scm:164
 #, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:176
+#: documentation-lib.scm:186
 #, scheme-format
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
@@ -2510,17 +2597,17 @@ msgstr ""
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:750
+#: framework-ps.scm:753
 #, scheme-format
 msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:769 framework-ps.scm:772
+#: framework-ps.scm:772 framework-ps.scm:775
 #, scheme-format
 msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:779
+#: framework-ps.scm:782
 msgid ""
 "\n"
 "The PostScript backend does not support the system-by-system \n"
@@ -2551,7 +2638,7 @@ msgstr ""
 msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
 msgstr ""
 
-#: layout-beam.scm:46
+#: layout-beam.scm:43
 #, scheme-format
 msgid "Error in beam quanting.  Expected ~S 0, found ~S."
 msgstr ""
@@ -2564,48 +2651,48 @@ msgstr ""
 msgid "Calculating page breaks..."
 msgstr ""
 
-#: lily-library.scm:583
+#: lily-library.scm:588
 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:617
+#: lily-library.scm:622
 #, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:625
+#: lily-library.scm:630
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:177
+#: lily.scm:178
 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:242
+#: lily.scm:243
 #, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:634
+#: lily.scm:640
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:637
+#: lily.scm:643
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:664 lily.scm:757
+#: lily.scm:668 lily.scm:766
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:747
+#: lily.scm:756
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
@@ -2614,21 +2701,26 @@ msgstr ""
 msgid "Music head function must return Music object"
 msgstr ""
 
-#: ly-syntax-constructors.scm:139
+#: ly-syntax-constructors.scm:150
 #, scheme-format
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:124
+#: markup.scm:204
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:130
+#: markup.scm:210
 #, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
+#: markup.scm:274
+#, scheme-format
+msgid "Not a markup command: ~A"
+msgstr ""
+
 #: music-functions.scm:228
 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
@@ -2643,23 +2735,23 @@ msgstr ""
 msgid "expecting 2 elements for chord tremolo, found ~a"
 msgstr ""
 
-#: music-functions.scm:564
+#: music-functions.scm:575
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:614
+#: music-functions.scm:625
 #, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:764
+#: music-functions.scm:793
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:961
+#: music-functions.scm:990
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
@@ -2683,23 +2775,23 @@ msgstr ""
 msgid "cannot find ~a in ~a"
 msgstr ""
 
-#: paper.scm:85
+#: paper.scm:86
 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 
-#: paper.scm:133
+#: paper.scm:226
 #, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:145
+#: paper.scm:238
 #, scheme-format
 msgid "Unknown papersize: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:160
+#: paper.scm:253
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 250eace2f865cdb7deae0513fcde2ecf1f42db86..03074040805a8427b0abb87470e9708c37bb80ce 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,5 +1,5 @@
-.PHONY : all clean config default dist doc exe help html lib TAGS\
-        po
+.PHONY : all clean bin-clean config default dist doc exe help\
+         html lib TAGS po
 
 all:    default
        $(LOOP)
@@ -11,6 +11,16 @@ clean: local-clean
        -rm -rf "./$(outdir)"
        $(LOOP)
 
+ifeq (,$(findstring metafont,$(STEPMAKE_TEMPLATES)))
+bin-clean: local-bin-clean
+       -rm -rf "./$(outdir)"
+       $(LOOP)
+else
+bin-clean:
+endif
+
+local-bin-clean: local-clean
+
 ifneq ($(strip $(depth)),.)
 dist:
        $(MAKE) -C $(depth) dist
@@ -48,6 +58,7 @@ help: generic-help local-help
        @echo -e "Generic targets:\n\
   all *       update everything except website documentation\n\
   clean *     remove all generated stuff in $(outdir)\n\
+  bin-clean * same as clean, except that mf/out is preserved\n\
   default     same as the empty target\n\
   exe         update all executables\n\
   help        this help\n\