Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:
	input/regression/musicxml/GNUmakefile

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 17bc053ee089f7f54c45d0f4c0cda36fdd402f51..7f1fd966e0c163736b16bac53287715546d6fcb6 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -119,6 +119,8 @@ may be manually placed above or below the staff, see
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {controlling-the-vertical-ordering-of-scripts.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{creating-a-delayed-turn.ly}
 
 @seealso
 Music Glossary:
@@ -583,6 +585,11 @@ g4( e c2)
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {using-double-slurs-for-legato-chords.ly}
 
+@c TODO remove ignores after LSR update
+@ignore
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{positioning-text-markups-inside-slurs}
+@end ignore
 
 @seealso
 Music Glossary:

diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
index b06235254407bbe509b1d5be2f6553f716f62282..c4c313a526c7fbffe8d3ab329a0c90e6f1916386 100644 (file)
--- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
+++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
@@ -6,14 +6,14 @@
   lsrtags = "ancient-notation, template"
 
   texidoces = "
-Este ejemplo muestra cómo hacer una transcripción moderna de Canto
-Gregoriano. El Canto Gregoriano no tiene compás ni plicas; utiliza
+Este ejemplo muestra cómo hacer una transcripción moderna de canto
+gregoriano. El canto gregoriano no tiene compás ni plicas; utiliza
 solamente cabezas de nota de blanca y de negra, y unas marcas
 especiales que indican silencios de distintas longitudes.
 
 "
 
-  doctitlees = "Plantilla para notación de música antigua (transcripción moderna de Canto Gregoriano)"
+  doctitlees = "Plantilla para notación de música antigua (transcripción moderna de canto gregoriano)"
   
   texidocde = "
 Dieses Beispiel zeigt eine moderne Transkription des Gregorianischen 

diff --git a/input/lsr/changing-the-breath-mark-symbol.ly b/input/lsr/changing-the-breath-mark-symbol.ly
index ed6d49f12deff719649d1e40e8118adb9408a4ae..c9db86ef07c266b77732590b4bb8f56960b09c66 100644 (file)
--- a/input/lsr/changing-the-breath-mark-symbol.ly
+++ b/input/lsr/changing-the-breath-mark-symbol.ly
@@ -7,7 +7,7 @@
 
   texidoces = "
 El glifo de la marca de respiración se puede ajustar
-sobreescribiendo la proopiedad de texto del objeto de presentación
+sobreescribiendo la propiedad de texto del objeto de presentación
 @code{BreathingSign}, con cualquier otro texto de marcado.
 
 "

diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly
index 750d4cb9c46f141d6e5cb2b676bd892df8c2fbab..e51eb43132d20dab8778858e8929422171f3c549 100644 (file)
--- a/input/lsr/combining-two-parts-on-the-same-staff.ly
+++ b/input/lsr/combining-two-parts-on-the-same-staff.ly
@@ -10,7 +10,7 @@ La herramienta de combinación de partes ( instrucción
 @code{\\partcombine}) permite la combinación de varias partes
 diferentes sobre el mismo pentagrama.  Las indicaciones textuales
 tales como \"solo\" o \"a2\" se añaden de forma predeterminada;
-para quitarlas, sencillamente establezca la proopiedad
+para quitarlas, sencillamente establezca la propiedad
 @code{printPartCombineTexts} al valor \"falso\".  Para partituras
 vocales (como himnos), no hay necesidad de añadir los textos
 \"solo\" o \"a2\", por lo que se deben desactivar.  Sin embargo,

diff --git a/input/lsr/creating-a-delayed-turn.ly b/input/lsr/creating-a-delayed-turn.ly
new file mode 100644 (file)
index 0000000..b1a6a07
--- /dev/null
+++ b/input/lsr/creating-a-delayed-turn.ly
@@ -0,0 +1,28 @@
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.12.0"
+
+\header {
+  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
+  texidoc = "Creating a delayed turn, where the lower note of the
+  turn uses the accidental, requires several overrides.  The
+  @code{outside-staff-priority} property must be set to #f, as otherwise
+  this would take precedence over the @code{avoid-slur property}.  The
+  value of @code{halign} is used to position the turn horizontally."
+
+  doctitle = "Creating a delayed turn"
+} % begin verbatim
+
+
+\relative c'' {
+  \once \override TextScript #'avoid-slur = #'inside
+  \once \override TextScript #'outside-staff-priority = ##f
+  c2(^\markup \tiny \override #'(baseline-skip . 1) {
+    \halign #-4
+    \center-column {
+      \sharp
+      \musicglyph #"scripts.turn"
+    }
+  }
+  d4.) c8
+}

diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list
index c3d82864aa73dee937adbabf4f0aa4527e6c426e..652c2b3f99b107363b4aaf36267532aa84f0f6a1 100644 (file)
--- a/input/lsr/editorial-annotations.snippet-list
+++ b/input/lsr/editorial-annotations.snippet-list
@@ -8,6 +8,7 @@ changing-a-single-notes-size-in-a-chord.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 coloring-notes-depending-on-their-pitch.ly
 controlling-the-placement-of-chord-fingerings.ly
+creating-a-delayed-turn.ly
 creating-blank-staves.ly
 default-direction-of-stems-on-the-center-line-of-the-staff.ly
 embedding-native-postscript-in-a--markup-block.ly

diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index 7d9e09b2461973ca9eca974f2dd19bd66a87f3a2..e95535469b5e39d5ca13d094a7fdd82603958ae1 100644 (file)
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -12,6 +12,7 @@ changing-the-breath-mark-symbol.ly
 combining-dynamics-with-markup-texts.ly
 contemporary-glissando.ly
 controlling-the-vertical-ordering-of-scripts.ly
+creating-a-delayed-turn.ly
 creating-arpeggios-across-notes-in-different-voices.ly
 creating-cross-staff-arpeggios-in-a-piano-staff.ly
 creating-cross-staff-arpeggios-in-other-contexts.ly

diff --git a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
index e3046d11c12019dc39e116d137e84bbe404ed109..a2e9dd9cf33a3659719f754d85292f796963b4e6 100644 (file)
--- a/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
+++ b/input/lsr/modifying-default-values-for-articulation-shorthand-notation.ly
@@ -13,7 +13,7 @@ Las abreviaturas se encuentran definidas dentro del archivo
 valores predeterminados.  Se pueden modificar estos valores
 predeterminados para las abreviaturas. Por ejemplo, para asociar
 la abreviatura @code{-+} (@code{dashPlus}) con el símbolo del
-semitrino en lugar del símboloo predeterminado +, asigne el valor
+semitrino en lugar del símbolo predeterminado +, asigne el valor
 @code{trill} a la variable @code{dashPlus}:
 
 "

diff --git a/input/lsr/specifying-context-with-beatgrouping.ly b/input/lsr/specifying-context-with-beatgrouping.ly
index 884f0824b200f4622453ff75809b0279c8e35c20..621f2195ca627cb89693d35385e4a92df4582a16 100644 (file)
--- a/input/lsr/specifying-context-with-beatgrouping.ly
+++ b/input/lsr/specifying-context-with-beatgrouping.ly
@@ -16,7 +16,9 @@ altos:
   texidoc = "
 By specifying the context, the effect of @code{beatGrouping} can be
 limited to the context specified, and the values which may have
-been set in higher-level contexts can be overridden:
+been set in higher-level contexts can be overridden.  The
+@code{\set} commands must be placed @emph{after} all @code{\time}
+commands:
 "
   doctitle = "Specifying context with beatGrouping"
 } % begin verbatim

diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index a40f0534ac283187b6b603608994d37a22b86e63..e4264b29c7d6c68410704d5492199dd2013ac0be 100644 (file)
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -9,6 +9,7 @@ changing-the-default-text-font-family.ly
 changing-the-staff-size.ly
 controlling-the-vertical-ordering-of-scripts.ly
 controlling-tuplet-bracket-visibility.ly
+creating-a-delayed-turn.ly
 creating-simultaneous-rehearsal-marks.ly
 creating-text-spanners.ly
 custodes.ly

diff --git a/input/new/creating-a-delayed-turn.ly b/input/new/creating-a-delayed-turn.ly
new file mode 100644 (file)
index 0000000..38fec61
--- /dev/null
+++ b/input/new/creating-a-delayed-turn.ly
@@ -0,0 +1,25 @@
+\version "2.12.0"
+
+\header {
+  lsrtags = "expressive-marks, editorial-annotations, tweaks-and-overrides"
+  texidoc = "Creating a delayed turn, where the lower note of the
+  turn uses the accidental, requires several overrides.  The
+  @code{outside-staff-priority} property must be set to #f, as otherwise
+  this would take precedence over the @code{avoid-slur property}.  The
+  value of @code{halign} is used to position the turn horizontally."
+
+  doctitle = "Creating a delayed turn"
+}
+
+\relative c'' {
+  \once \override TextScript #'avoid-slur = #'inside
+  \once \override TextScript #'outside-staff-priority = ##f
+  c2(^\markup \tiny \override #'(baseline-skip . 1) {
+    \halign #-4
+    \center-column {
+      \sharp
+      \musicglyph #"scripts.turn"
+    }
+  }
+  d4.) c8
+}

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 8c85ea5efcb0c2996bb55111dc92484f42520bf0..315113a27f1a66478a7ef8c8a31e1564ede0f71f 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -52,7 +52,7 @@ public:
 };
 
 string get_otf_table (FT_Face face, string tag);
-FT_Face open_ft_face (string str, FT_Long idx = 0);
+FT_Face open_ft_face (string str, FT_Long idx);
 
 
 #endif /* OPEN_TYPE_FONT_HH */

diff --git a/lily/include/scale.hh b/lily/include/scale.hh
index f853636b8caccfddbceb0c47df943d7a12b158b9..7984a2d2333c224124f62ca1cd74c3b0211a0a11 100644 (file)
--- a/lily/include/scale.hh
+++ b/lily/include/scale.hh
@@ -20,7 +20,7 @@ public:
   Scale (vector<Rational> const&);
   Scale (Scale const&);
 
-  Rational tones_at_step (int step, int octave = 0) const;
+  Rational tones_at_step (int step, int octave) const;
   Rational step_size (int step) const;
   int step_count () const;
   int normalize_step (int step) const;

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 3bd52480a1e684f52215f337a9e3e04e3af4d50d..771a87561092afc643014baa78a0391d462752a3 100644 (file)
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -108,7 +108,7 @@ open_ft_face (string str, FT_Long idx)
 SCM
 Open_type_font::make_otf (string str)
 {
-  FT_Face face = open_ft_face (str);
+  FT_Face face = open_ft_face (str, 0 /* index */);
   Open_type_font *otf = new Open_type_font (face);
 
   return otf->self_scm ();

diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc
index 7fcdc73de5b5ac701eff4f8702fb31e8b1092227..6713c1b08f70bd235022e1114e46350c8a3d8004 100644 (file)
--- a/lily/pfb-scheme.cc
+++ b/lily/pfb-scheme.cc
@@ -40,7 +40,7 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff",
   if (be_verbose_global)
     progress_indication ("[" + file_name);
 
-  FT_Face face = open_ft_face (file_name);
+  FT_Face face = open_ft_face (file_name, 0 /* index */);
   string table = get_otf_table (face, "CFF ");
 
   SCM asscm = scm_from_locale_stringn ((char *) table.data (),