Merge branch 'master' into lilypond/translation

* master:
  StringNumber: change 'avoid-slur setting to 'around.
  Docs: Some more link fixing
  Docs: Some more link-fixing
  Docs: More link fixing (unnumbered, renamed sections, etc.)

diff --git a/Documentation/bibliography/computer-notation.bib b/Documentation/bibliography/computer-notation.bib
index 2071e377ddcd7c546755c41db43775377d3bf273..b5887cbd2939a20103f582c9eae3d122e4ce33ca 100644 (file)
--- a/Documentation/bibliography/computer-notation.bib
+++ b/Documentation/bibliography/computer-notation.bib
@@ -677,7 +677,8 @@ users in mind) (sic) HWN},
 }
 
 @Article {smdl-web,
-  title = {SMDL, Standard Musical Description Language},
+  author = {International Organization for Standardization (ISO)},
+  title = {Information Technology - Document Description and Processing Languages - Standard Music Description Language (SMDL)},
   pdf= {ftp://ftp.ornl.gov/pub/sgml/wg8/smdl/10743.pdf},
   number={ISO/IEC DIS 10743},
   year = {1992},

diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index 7f15f4449430bd19051069ec84aaaf67ba56af3c..6d8e0e9e71e9edc6566ab6ba90be9a31cf7ebc92 100644 (file)
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -76,6 +76,7 @@ annote =       {This is about engraving, i.e.  professional typesetting.  It contain
   title = {Music Notation: a Manual of Modern Practice},
   author = {Gardner Read},
   totalentry = {(2nd edition)},
+  year = 1979,
   publisher ={Taplinger Publishing},
   address ={New York},
 }

diff --git a/Documentation/de/user/ancient.itely b/Documentation/de/user/ancient.itely
index 03eaa0e54c0f9de6aec6cd639f597d5e1954b688..35cb681928d9ddaba6d9117655868bd71538c0be 100644 (file)
--- a/Documentation/de/user/ancient.itely
+++ b/Documentation/de/user/ancient.itely
@@ -628,7 +628,7 @@ eine Textbeschriftung (@code{\markup}).
 @cindex articulations
 
 Zusätzlich zu den Standardartikulationszeichen, wie sie im Abschnitt
-@ref{Articulations} beschrieben werden, werden auch Artikulationszeichen
+@ref{Articulations and ornamentations} beschrieben werden, werden auch Artikulationszeichen
 für die Alte Musik zur Verfügung gestellt. Diese sind darauf hin geformt, dass
 sie mit der Notation des Editio Vaticana-Stils verwendet werden können.
 

diff --git a/Documentation/de/user/expressive.itely b/Documentation/de/user/expressive.itely
index bdf45a1e9bea266de680efa194ec9a6aa305443b..10029630adfe7702d7e2e48252bc3cd4ad1300f1 100644 (file)
--- a/Documentation/de/user/expressive.itely
+++ b/Documentation/de/user/expressive.itely
@@ -25,13 +25,13 @@
 
 
 @menu
-* Articulations::               
+* Articulations and ornamentations::               
 * Dynamics::                    
 * New dynamic marks::           
 @end menu
 
-@node Articulations
-@unnumberedsubsubsec Articulations
+@node Articulations and ornamentations
+@unnumberedsubsubsec Articulations and ornamentations
 
 @cindex Artikulationszeichen
 @cindex Beschriftung
@@ -629,7 +629,7 @@ Klaviersystem zu benutzen.
 @cindex Triller
 
 Kurze Triller können wie ein normales Artikulationszeichen eingegeben 
-werden, siehe @ref{Articulations}.
+werden, siehe @ref{Articulations and ornamentations}.
 
 Längere Triller werden mit den Befehlen @code{\startTrillSpan} zu 
 Beginn und @code{\stopTrillSpan} am Ende erstellt.

diff --git a/Documentation/de/user/fretted-strings.itely b/Documentation/de/user/fretted-strings.itely
index 584c1ff5f7935e97f3e08b7bbffe126907d21014..f2350e18c1c55ab314f3798a6e54336bc0f909d6 100644 (file)
--- a/Documentation/de/user/fretted-strings.itely
+++ b/Documentation/de/user/fretted-strings.itely
@@ -31,7 +31,7 @@
 * Default tablatures::
 * Custom tablatures::
 * Fret diagram markups::
-* Right hand fingerings::
+* Right-hand fingerings::
 @end menu
 
 @node References for fretted strings
@@ -252,8 +252,8 @@ Schnittstelle für die Griffsymboleigenschaften findet sich unter
 Beispiele:
 @rlsr{Fretted strings}.
 
-@node Right hand fingerings
-@unnumberedsubsubsec Right hand fingerings
+@node Right-hand fingerings
+@unnumberedsubsubsec Right-hand fingerings
 
 Fingersatz für die rechte Hand in Akkorden kann notiert werden, indem
 der Befehl @code{@var{note}-\rightHandFinger @var{finger}}

diff --git a/Documentation/de/user/keyboards.itely b/Documentation/de/user/keyboards.itely
index 40c43d6ad3de83d899714b9dc4592befa78be403..dde309f2edba8b5e33fa65e3fa8dd2a4f75c2b5d 100644 (file)
--- a/Documentation/de/user/keyboards.itely
+++ b/Documentation/de/user/keyboards.itely
@@ -23,7 +23,6 @@
 
 @menu
 * References for keyboards::    
-* The piano staff::             
 * Changing staff manually::     
 * Changing staff automatically::  
 * Staff-change lines::          
@@ -34,13 +33,6 @@
 @node References for keyboards
 @unnumberedsubsubsec References for keyboards
 
-@untranslated
-@ifnothtml
-@englishref
-@end ifnothtml
-
-@node The piano staff
-@unnumberedsubsubsec The piano staff
 
 Ein Pianosystem besteht aus zwei normalen Notensystemen, die durch 
 eine Klammer verbunden sind. Die Systeme sind verhältnismäßig 

diff --git a/Documentation/de/user/simultaneous.itely b/Documentation/de/user/simultaneous.itely
index c933655e3aa357b7e7a46a07a1d22a0505569567..63f485d1fdc6ec03f9f8cecdb7ea5cef11410820 100644 (file)
--- a/Documentation/de/user/simultaneous.itely
+++ b/Documentation/de/user/simultaneous.itely
@@ -28,12 +28,12 @@ von mehr als einer Stimme pro System.
 @subsection Single voice
 
 @menu
-* Chords::                      
+* Chorded notes::                      
 * Clusters::                    
 @end menu
 
-@node Chords
-@unnumberedsubsubsec Chords
+@node Chorded notes
+@unnumberedsubsubsec Chorded notes
 
 @cindex Akkorde
 
@@ -62,7 +62,7 @@ Siehe @ref{Chord notation} für mehr Information.
 @menu
 * Basic polyphony::             
 * Explicitly instantiating voices::  
-* Collision Resolution::        
+* Collision resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
@@ -279,8 +279,8 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 @end lilypond
 
 
-@node Collision Resolution
-@unnumberedsubsubsec Collision Resolution
+@node Collision resolution
+@unnumberedsubsubsec Collision resolution
 
 Normalerweise werden Notenköpfe mit einer unterschiedlichen Anzahl 
 von Punktierungen nicht verschmolzen, aber wenn die Objekt-Eigenschaft 

diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely
index 35828f502b5067a0234f872bf6c64cff599e4ff2..e8dfe0e97a965411ae43037419eb0ede630ba4e2 100644 (file)
--- a/Documentation/de/user/tutorial.itely
+++ b/Documentation/de/user/tutorial.itely
@@ -853,7 +853,7 @@ c2\< c2\ff\> c2 c2\!
 
 @seealso
 
-Benutzerhandbuch: @ruser{Articulations},
+Benutzerhandbuch: @ruser{Articulations and ornamentations},
 @ruser{Fingering instructions}, @ruser{Dynamics}.
 
 

diff --git a/Documentation/es/user/expressive.itely b/Documentation/es/user/expressive.itely
index cdb5336bdad2f3a8c089ba07fb16f1588e63d44b..a2b8d2f4a284a38e9e209fccdab46aa1ef2ac545 100644 (file)
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@ -30,7 +30,7 @@
 @end menu
 
 @node Articulations and ornamentations
-@subsubsection Articulations and ornamentations
+@unnumberedsubsubsec Articulations and ornamentations
 
 @cindex articulaciones
 @cindex guiones
@@ -144,7 +144,7 @@ representación de MIDI de la música.
 
 
 @node Dynamics
-@subsubsection Dynamics
+@unnumberedsubsubsec Dynamics
 
 @cindex dinámica
 @cindex matices absolutos
@@ -351,7 +351,7 @@ Referencia de funcionamiento interno:
 
 
 @node New dynamic marks
-@subsubsection New dynamic marks
+@unnumberedsubsubsec New dynamic marks
 
 @cindex indicaciones dinámicas nuevas
 @cindex dinámicas, indicaciones, nuevas
@@ -412,7 +412,7 @@ Fragmentos de código:
 @end menu
 
 @node Slurs
-@subsubsection Slurs
+@unnumberedsubsubsec Slurs
 
 @cindex ligaduras de expresión
 
@@ -477,7 +477,7 @@ Referencia de funcionamiento interno:
 
 
 @node Phrasing slurs
-@subsubsection Phrasing slurs
+@unnumberedsubsubsec Phrasing slurs
 
 @cindex ligaduras de fraseo
 @cindex marcas de fraseo
@@ -527,7 +527,7 @@ Referencia de funcionamiento interno:
 
 
 @node Breath marks
-@subsubsection Breath marks
+@unnumberedsubsubsec Breath marks
 
 @cindex respiraciones
 @funindex \breathe
@@ -555,7 +555,7 @@ Referencia de funcionamiento interno:
 
 
 @node Falls and doits
-@subsubsection Falls and doits
+@unnumberedsubsubsec Falls and doits
 
 Se pueden expresar @notation{caídas} y @notation{subidas} de tono
 (falls y doits) añadidas a las notas mediante la instrucción
@@ -600,7 +600,7 @@ Fragmentos de código:
 @end menu
 
 @node Glissando
-@subsubsection Glissando
+@unnumberedsubsubsec Glissando
 
 @cindex glissando
 @funindex \glissando
@@ -655,7 +655,7 @@ contemplada.
 
 
 @node Arpeggio
-@subsubsection Arpeggio
+@unnumberedsubsubsec Arpeggio
 
 @cindex arpeggio
 @cindex acorde quebrado
@@ -753,7 +753,7 @@ No es posible mezclar arpegios conectados y no conectados en un
 
 
 @node Trills
-@subsubsection Trills
+@unnumberedsubsubsec Trills
 
 @cindex trinos
 @funindex \trill

diff --git a/Documentation/es/user/fretted-strings.itely b/Documentation/es/user/fretted-strings.itely
index 55c7c8c4c2cd223d135652a5e2e43026b2b40c90..020f930174bf0ff3557842fb3b58c4eede41c003 100644 (file)
--- a/Documentation/es/user/fretted-strings.itely
+++ b/Documentation/es/user/fretted-strings.itely
@@ -30,7 +30,7 @@
 * Default tablatures::
 * Custom tablatures::
 * Fret diagram markups::
-* Right hand fingerings::
+* Right-hand fingerings::
 @end menu
 
 @node References for fretted strings
@@ -266,7 +266,7 @@ propiedades de los diagramas de trastes en
 
 @seealso
 
-@node Right hand fingerings
+@node Right-hand fingerings
 @unnumberedsubsubsec Right-hand fingerings
 
 Se pueden introducir las digitaciones de la mano derecha de los

diff --git a/Documentation/es/user/install.itely b/Documentation/es/user/install.itely
index 7d1a1ee1d35414f00822ec62e279f79b07f04dca..eee46cf8e7992ea8161f1e0a2d17b8a4c0327a92 100644 (file)
--- a/Documentation/es/user/install.itely
+++ b/Documentation/es/user/install.itely
@@ -99,7 +99,6 @@ mingw       - Windows x86
 
 @unnumberedsubsubsec Compilation
 @unnumberedsubsubsec Running requirements
-@unnumberedsubsubsec Building documentation
 @unnumberedsubsubsec Requirements for building documentation
 @node Building LilyPond
 @subsection Building LilyPond

diff --git a/Documentation/es/user/keyboards.itely b/Documentation/es/user/keyboards.itely
index af70a8f381f3af27450643b33fc0d470412b5951..3a4aee44451c16ead109172953a8fce3e200061e 100644 (file)
--- a/Documentation/es/user/keyboards.itely
+++ b/Documentation/es/user/keyboards.itely
@@ -23,7 +23,6 @@
 
 @menu
 * References for keyboards::    
-* The piano staff::             
 * Changing staff manually::     
 * Changing staff automatically::  
 * Staff-change lines::          
@@ -38,9 +37,6 @@
 @englishref
 @end ifnothtml
 
-@node The piano staff
-@unnumberedsubsubsec The piano staff
-
 Los sistemas de piano son dos pentagramas normales agrupados mediante
 una llave.  Los pentagramas son hasta cierto punto independientes,
 pero a veces las voces pueden cruzarse entre los dos pentagramas.
@@ -235,7 +231,7 @@ noFlag = \once \override Stem #'flag-style = #'no-flag
 @end menu
 
 @node Piano pedals
-@subsubsection Piano pedals
+@unnumberedsubsubsec Piano pedals
 @cindex Pedales
 
 El piano tiene pedales que alteran la forma en que se produce el

diff --git a/Documentation/es/user/repeats.itely b/Documentation/es/user/repeats.itely
index c86cdca0657ff88d06d272451f4b7a8240e0a972..9ce54da2de3643c2077a11cda711ce2dae7b549c 100644 (file)
--- a/Documentation/es/user/repeats.itely
+++ b/Documentation/es/user/repeats.itely
@@ -324,7 +324,7 @@ unfold
 @end menu
 
 @node Percent repeats
-@subsubsection Percent repeats
+@unnumberedsubsubsec Percent repeats
 
 @cindex porcentaje, repeticiones de
 @cindex compás, repeticiones de
@@ -379,7 +379,7 @@ Referencia del programa:
 @rinternals{PercentRepeatedMusic}.
 
 @node Tremolo repeats
-@subsubsection Tremolo repeats
+@unnumberedsubsubsec Tremolo repeats
 
 @cindex barras de trémolo
 

diff --git a/Documentation/es/user/staff.itely b/Documentation/es/user/staff.itely
index 40ee2ccbdfd0a0a72053e764c4ebb240d5471db6..abec276ed7d3cf0c58b891bc89895f356b747b50 100644 (file)
--- a/Documentation/es/user/staff.itely
+++ b/Documentation/es/user/staff.itely
@@ -224,7 +224,7 @@ francesa.
 @end menu
 
 @node Metronome marks
-@subsubsection Metronome marks
+@unnumberedsubsubsec Metronome marks
 
 @cindex Tempo
 @cindex pulsos por minuto
@@ -284,7 +284,7 @@ más lejos del pentagrama.
 
 
 @node Instrument names
-@subsubsection Instrument names
+@unnumberedsubsubsec Instrument names
 
 En una partitura orquestal, los nombres de los instrumentos se imprimen en el lado izquierdo
 de los pentagramas.
@@ -386,7 +386,7 @@ Referencia del programa: @rinternals{InstrumentName}.
 
 
 @node Quoting other voices
-@subsubsection Quoting other voices
+@unnumberedsubsubsec Quoting other voices
 
 @cindex guías
 
@@ -489,7 +489,7 @@ Referencia del programa:
 
 
 @node Formatting cue notes
-@subsubsection Formatting cue notes
+@unnumberedsubsubsec Formatting cue notes
 
 @cindex guía, formateo de las notas
 

diff --git a/Documentation/fr/user/fretted-strings.itely b/Documentation/fr/user/fretted-strings.itely
index ab6693a0141a9357ddf61fb30090fc036329f2e1..044421b9043283ed74eefb2f3dbb68417f21c395 100644 (file)
--- a/Documentation/fr/user/fretted-strings.itely
+++ b/Documentation/fr/user/fretted-strings.itely
@@ -34,7 +34,7 @@
 * Default tablatures::
 * Custom tablatures::
 * Fret diagram markups::
-* Right hand fingerings::
+* Right-hand fingerings::
 @end menu
 
 @node References for fretted strings
@@ -247,8 +247,8 @@ Par ailleurs, plusieurs propriétés permettent d'ajuster le graphisme
 
 Exemples : @rlsr{Fretted strings}.
 
-@node Right hand fingerings
-@unnumberedsubsubsec Right hand fingerings
+@node Right-hand fingerings
+@unnumberedsubsubsec Right-hand fingerings
 
 Les doigtés de la main droite, dans les accords, peuvent être ajoutés au moyen
 de @code{@var{note}-\rightHandFinger @var{doigté}}

diff --git a/Documentation/fr/user/keyboards.itely b/Documentation/fr/user/keyboards.itely
index 33d0452c1c91e2b2e44d1ebf5e690905ade3fe67..8ddfeac864497de05f7e274107eea60ae6976471 100644 (file)
--- a/Documentation/fr/user/keyboards.itely
+++ b/Documentation/fr/user/keyboards.itely
@@ -26,7 +26,6 @@
 
 @menu
 * References for keyboards::    
-* The piano staff::             
 * Changing staff manually::     
 * Changing staff automatically::  
 * Staff-change lines::          
@@ -41,9 +40,6 @@
 @englishref
 @end ifnothtml
 
-@node The piano staff
-@unnumberedsubsubsec The piano staff
-
 Les systèmes de piano comprennent deux portées réunies par une accolade.
 Les portées sont largement autonomes, mais il arrive que des voix passent
 de l'une à l'autre.  Cette notation sert également à la harpe ou à d'autres
@@ -236,7 +232,7 @@ noFlag = \once \override Stem #'flag-style = #'no-flag
 @end menu
 
 @node Piano pedals
-@subsubsection Piano pedals
+@unnumberedsubsubsec Piano pedals
 @cindex Pédales
 
 Le piano possède deux pédales, parfois trois, permettant de modifier

diff --git a/Documentation/fr/user/simultaneous.itely b/Documentation/fr/user/simultaneous.itely
index 2bc41e985ab77ae87a4998631a2efee3a0712a20..463c00031b9d542f073283f2d56c74c64a1a5098 100644 (file)
--- a/Documentation/fr/user/simultaneous.itely
+++ b/Documentation/fr/user/simultaneous.itely
@@ -88,7 +88,7 @@ seront pas imprimées de façon acceptable.  utilisez plutôt
 
 @menu
 * Basic polyphony::             
-* Collision Resolution::        
+* Collision resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
@@ -175,8 +175,8 @@ qui la précède immédiatement, sans tenir compte des différentes voix.
 pas à @code{noteB} ou @code{noteA}.
 
 
-@node Collision Resolution
-@unnumberedsubsubsec Collision Resolution
+@node Collision resolution
+@unnumberedsubsubsec Collision resolution
 
 D'ordinaire, les têtes de notes pointées et non-pointées ne sont pas
 fusionnées, mais lorsque la propriété @code{merge-differently-dotted} de

diff --git a/input/regression/string-number-around-slur.ly b/input/regression/string-number-around-slur.ly
new file mode 100644 (file)
index 0000000..42c8a39
--- /dev/null
+++ b/input/regression/string-number-around-slur.ly
@@ -0,0 +1,12 @@
+\version "2.11.57"
+
+\header {
+  texidoc = "String numbers should only be moved outside slurs when there
+is a collision."
+}
+
+\relative c'' {
+  \textLengthOn
+  <c\3>4-"inside"( d' <e,\2>-"inside" g
+  <c\1>1-"outside")
+}

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d43ce82efcd375617de9047cdba399b048df210d..f8a6526acf6659202a3845cc2e9a1454ed301da1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1683,7 +1683,7 @@
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (script-priority . 100)
-       (avoid-slur . outside)
+       (avoid-slur . around)
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
        (meta . ((class . Item)