Update and add Texinfo macros in translations

- update macros.itexi in all languages,

- add and use new macro @untranslated to mark untranslated nodes,

- update TRANSLATION and buildscripts accordingly,

- update TRANSLATION instructions during GDP.

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 dba72b917c7a1cf89fdbe91ddb99406122345534..9672e1723e041970360fb5f3e0f397ac681a18be 100644 (file)
--- a/Documentation/de/user/changing-defaults.itely
+++ b/Documentation/de/user/changing-defaults.itely
@@ -11,9 +11,7 @@
 @node Changing defaults
 @chapter Changing defaults
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -29,9 +27,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Interpretation contexts
 @section Interpretation contexts
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -46,9 +42,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Contexts explained
 @subsection Contexts explained
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -61,81 +55,61 @@ UNTRANSLATED NODE: IGNORE ME
 @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
@@ -148,41 +122,31 @@ UNTRANSLATED NODE: IGNORE ME
 @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
@@ -196,49 +160,37 @@ UNTRANSLATED NODE: IGNORE ME
 @node Overview of modifying properties
 @subsection Overview of modifying properties
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node The set command
 @subsection The @code{\set} command
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node The override command
 @subsection The @code{\override} command
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @node set versus override
 @subsection @code{\set} vs. @code{\override}
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @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
@@ -251,41 +203,31 @@ UNTRANSLATED NODE: IGNORE ME
 @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
@@ -298,9 +240,7 @@ UNTRANSLATED NODE: IGNORE ME
 @node Controlling visibility of objects
 @subsection Controlling visibility of objects
 
-@ifhtml
-UNTRANSLATED NODE: IGNORE ME
-@end ifhtml
+@untranslated
 
 
 @menu
@@ -314,73 +254,55 @@ UNTRANSLATED NODE: IGNORE ME
 @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
@@ -393,41 +315,31 @@ UNTRANSLATED NODE: IGNORE ME
 @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
@@ -437,9 +349,7 @@ UNTRANSLATED NODE: IGNORE ME
 @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 0e59a7021c63ee206643a3b38eb6068724e543db..933c73f00e25cb3c67c8536510d24987304a8d25 100644 (file)
--- a/Documentation/es/user/changing-defaults.itely
+++ b/Documentation/es/user/changing-defaults.itely
@@ -960,7 +960,7 @@ 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
@@ -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/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 cd85c3465b40e62e0e795163000d768a596df166..f56c28309d89c501389e7318adc8adf16c433536 100644 (file)
--- a/Documentation/es/user/rhythms.itely
+++ b/Documentation/es/user/rhythms.itely
@@ -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/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 ad0cf4ef0b185bca8b618345bf5cdf8afa8e0b48..34a76058bd1b1a16480186c218c2c4a960fbb01a 100644 (file)
--- a/Documentation/fr/user/changing-defaults.itely
+++ b/Documentation/fr/user/changing-defaults.itely
@@ -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,7 +917,7 @@ 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}.
 
 
@@ -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 :
 

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/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/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')