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

diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely
index be65ef5ffc3b087d7e7f0539400bfd9a327c6d32..5645ab640723d2529e48f10604c3f203d70f0752 100644 (file)
--- a/Documentation/de/user/introduction.itely
+++ b/Documentation/de/user/introduction.itely
@@ -777,18 +777,18 @@ demonstriert die Erstellung von musikalischen Funktionen.
 
 
 @item
-@emph{@ref{Running LilyPond}}
+@emph{@rprogram{Running LilyPond}}
 zeigt, wie LilyPond und die Hilfsprogramme gestartet werden. Zusätzlich 
 wird hier gezeigt, wie Quelldateien von älteren LilyPond-Versionen 
 aktualisiert werden können.
 
 @item
-@emph{@ref{LilyPond-book}} 
+@emph{@rprogram{LilyPond-book}}
 zeigt die Details der Integration von Noten in Texte wie etwa dieses 
 Handbuch.
 
 @item
-@emph{@ref{Converting from other formats}}
+@emph{@rprogram{Converting from other formats}}
 erklärt die Funktionsweise der Konvertierungsprogramme. Diese Programme 
 sind im LilyPond-Paket enthalten und können ein ganze Anzahl von Formaten 
 in das @code{.ly}-Format umwandeln.

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index fb8e8360a3f45435c2cff09ee40ecad199884363..fd08e3afcd0040483ef39ea7ef82a37e2b07032b 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -121,6 +121,16 @@
 @ref{\NAME\,,,music-glossary-big-page}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program-big-page}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-big-page}
+@end macro
+
 @end ifset
 
 
@@ -138,6 +148,16 @@
 @ref{\NAME\,,,music-glossary}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
+@end macro
+
 @end ifclear
 
 
@@ -180,6 +200,16 @@
 @ref{\NAME\,,,music-glossary}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
+@end macro
+
 @c to get decent German quotes in `foo'
 @macro q{TEXT}
 @html
@@ -214,6 +244,16 @@
 @inforef{\NAME\,,,music-glossary}
 @end macro
 
+@macro rprogram{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-program}
+@end macro
+
+@macro ruser{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond}
+@end macro
+
 @macro usermanref{NAME}
 @inforef{\NAME\}
 @end macro
@@ -256,6 +296,12 @@ internals document, @internalsref{\NAME\}
 user manual, @internalsref{\NAME\}
 @end macro
 
+@macro rprogram{NAME}
+program usage manual, @internalsref{\NAME\}
+@end macro
+
+@alias ruser=usermanref
+
 @c to get decent German quotes in `foo'
 @macro q{TEXT}
 @quotesinglbase{}\TEXT\`

diff --git a/Documentation/de/user/tutorial.itely b/Documentation/de/user/tutorial.itely
index 46c3828ec57c543ccacdb7f47bcaa5c5c7c5116c..4580edc6987211e755f1d55474f0af3ecb193f4d 100644 (file)
--- a/Documentation/de/user/tutorial.itely
+++ b/Documentation/de/user/tutorial.itely
@@ -180,7 +180,7 @@ der Quelldatei gelesen hat. Sollten Fehler auftreten, hilft oft ein Blick in
 diese Datei.
 
 Es gibt einige andere Editoren mit besserer Unterstützung für LilyPond; Einzelheiten 
-dazu können Sie im Kapitel @ref{Editor support} nachlesen.
+dazu können Sie im Kapitel @rprogram{Editor support} nachlesen.
 
 @subsubheading Unix
 
@@ -190,7 +190,7 @@ Beispiel können Sie xterm öffnen und
 und es gibt einen @code{LilyPond-Modus} für Emacs.  Wenn diese noch
 nicht installiert sind, lesen Sie die Datei @file{INSTALL.txt}.}
 Die einfachste Bearbeitunsumgebung ist das  @file{LilyPondTool}.
-Siehe auch @ref{Editor support} für mehr Information. Geben Sie
+Siehe auch @rprogram{Editor support} für mehr Information. Geben Sie
 folgendes in Ihrem Editor ein und speichern Sie die Datei als @file{test.ly}:
 
 @verbatim
@@ -1436,7 +1436,7 @@ am Anfang der Textdatei eingefügt.
 Durch diese Versionsmarkierung werden zukünftige Aktualisierungen
 des LilyPond-Programmes einfacher gemacht. Syntax-Änderungen
 zwischen den Programmversionen werden von einem speziellen
-Programm, @file{convert-ly}, vorgenommen (siehe @ref{Updating
+Programm, @file{convert-ly}, vorgenommen (siehe @rprogram{Updating
 files with convert-ly}). Dieses Programm braucht @code{\version},
  um zu entscheiden, welche Regeln angewandt werden müssen.
 

diff --git a/Documentation/de/user/working.itely b/Documentation/de/user/working.itely
index 9f09c1d3ac3dff1404d5b1a8003a6cc446006b1b..1a6762843d656ef3c3ab5cfb33219be147bf75b6 100644 (file)
--- a/Documentation/de/user/working.itely
+++ b/Documentation/de/user/working.itely
@@ -576,16 +576,15 @@ Eigenschaften des Programmes benutzbar zu machen.
 
 LilyPond stellt ein Programm bereit, das Aktualisierungen 
 vereinfacht: @code{convert-ly}. Einzelheiten zur Programmbenutzung 
-finden sich in @ref{Updating files with convert-ly}.
-
-Leider kann @code{convert-ly} nicht alle Veränderungen der Syntax 
-berücksichtigen. Hier werden einfache @qq{Suchen und 
-Ersetzen}-Veränderungen
-vorgenommen (wie etwa  @code{raggedright} zu becoming @code{ragged-right}),
-aber einige Veränderungen sind zu kompliziert. Die 
-Syntax-Veränderungen, 
-die das Programm nicht berücksichtigt, sind im Kapitel  @ref{Updating 
-files with convert-ly} aufgelistet.
+finden sich in @rprogram{Updating files with convert-ly}.
+
+Leider kann @code{convert-ly} nicht alle Veränderungen der Syntax
+berücksichtigen. Hier werden einfache @qq{Suchen und
+Ersetzen}-Veränderungen vorgenommen (wie etwa @code{raggedright} zu
+becoming @code{ragged-right}), aber einige Veränderungen sind zu
+kompliziert. Die Syntax-Veränderungen, die das Programm nicht
+berücksichtigt, sind im Kapitel @rprogram{Updating files with
+convert-ly} aufgelistet.
 
 Zum Beispiel wurden in LilyPond 2.4 und früheren Versionen 
 Akzente und Umlaute mit LaTeX-Befehlen eingegeben, ein 

diff --git a/Documentation/es/user/lilypond.tely b/Documentation/es/user/lilypond.tely
index fbdf7589cb4225368522b0b4a683fa72b126701c..e479d4704bf9a8b353dd6ab559abcb29e41ab5e7 100644 (file)
--- a/Documentation/es/user/lilypond.tely
+++ b/Documentation/es/user/lilypond.tely
@@ -7,7 +7,7 @@
 @end ignore
 @setfilename lilypond.info
 @settitle Manual del usuario de GNU LilyPond
-@documentencoding utf-8
+@documentencoding UTF-8
 @documentlanguage es
 
 @iftex

diff --git a/Documentation/es/user/tutorial.itely b/Documentation/es/user/tutorial.itely
index 6c277080c8691fd7637e074b80d8729964ced311..70f0c2280a20e7b0d525a2e2b42300243369231f 100644 (file)
--- a/Documentation/es/user/tutorial.itely
+++ b/Documentation/es/user/tutorial.itely
@@ -157,8 +157,9 @@ Al hacer doble click sobre el archivo no sólo se obtiene como resultado un arch
 sino también un archivo @file{.log} que contiene cierta información acerca de lo que
 LilyPond ha hecho con el archivo. Si se produce algún error, examine este archivo de registro.
 
-Tenga en cuenta que hay disponibles varios editores de texto alternativos con un mejor
-apoyo para la realización de documentos de LilyPond, consulte @ref{Editor support} para ver más información.
+Tenga en cuenta que hay disponibles varios editores de texto
+alternativos con un mejor apoyo para la realización de documentos de
+LilyPond, consulte @rprogram{Editor support} para ver más información.
 
 @subsubheading Unix
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 278061df3958f124cececaac1dd5893ff64d11c3..5de72002c744677ef9bad2a68a8fcfe80e50b937 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -108,6 +108,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 else
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
        -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
+       -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info
        install-info --info-dir=$(infodir) $(outdir)/lilypond.info
        @echo
        @echo "***************************************************************"

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index c03e8901239ec3f41453b8b32ab533df936e0cd4..412e0c81101baf69c54a0ab21907e0389f59833c 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2562,9 +2562,10 @@ care when you mix staves with grace notes and staves without, for example,
 This can be remedied by inserting grace skips of the corresponding
 durations in the other staves. For the above example
 
-@example
-\new Staff @{ c4 \bar "|:" \grace s16 d4 @}
-@end example
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
+<< \new Staff { e4 \bar "|:" \grace c16 d4 }
+   \new Staff { c4 \bar "|:" \grace s16 d4 } >>
+@end lilypond
 
 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not supported,

diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index 88359fefd43e4ad67f33d8399c297f158a72ff10..6fa9f3900be20626275a638c169fc08baee68217 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -7,7 +7,7 @@
 @end ignore
 @setfilename lilypond-program.info
 @settitle GNU LilyPond program usage
-@documentencoding utf-8
+@documentencoding UTF-8
 @documentlanguage en
 
 @iftex

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index ae4c536387055ac5ed36cbbec19138542f27302f..c5a85cdcfc8e79916e963655bf07d19e3d1dcd54 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -7,7 +7,7 @@
 @end ignore
 @setfilename lilypond.info
 @settitle GNU LilyPond user manual
-@documentencoding utf-8
+@documentencoding UTF-8
 @documentlanguage en
 
 @iftex
@@ -46,7 +46,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 * abc2ly: (lilypond/lilypond-program)Invoking abc2ly.          Importing ABC.      
 * convert-ly: (lilypond/lilypond-program)Invoking convert-ly.  Older LilyPond versions.
 * etf2ly: (lilypond/lilypond-program)Invoking etf2ly.          Importing Finale.
-* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Itegrating text and music.
+* lilypond-book: (lilypond/lilypond-program)LilyPond-book.     Integrating text and music.
 * midi2ly: (lilypond/lilypond-program)Invoking midi2ly.        Importing MIDI.
 @end direntry
 

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index d5aaca3ec4a397b4929d1f243c823ae7e1ed4b94..f7382e571ab8fa95df9db1558384c009636f0e69 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -639,6 +639,10 @@ with the music.
 }
 @end lilypond
 
+Similarly, line breaks are normally forbidden when beams cross bar
+lines.  This behavior can be changed by setting 
+@code{\override Beam #'breakable = ##t}.
+
 
 @node Page breaking
 @subsection Page breaking

diff --git a/input/bach-schenker.ly b/input/bach-schenker.ly
index 1b731e7715c7b1796cd9aa1125349b51a3b8518d..ef282fb67efe3244293ace4a25376d7721492d29 100644 (file)
--- a/input/bach-schenker.ly
+++ b/input/bach-schenker.ly
@@ -1,27 +1,26 @@
 % -*-coding: utf-8 -*-
 
 \header{
-
- composer ="J.S. Bach"
- title = "Wenn wir in hoechsten Noten sein"
- subtitle = "Analysis from Gene Biringer's Schenker Text, Ex. 5-27"
-%% "BWV641"
- enteredby = "Kris Shaffer"
- 
+  composer = "J.S. Bach"
+  title = "Wenn wir in höchsten Nöten sein"
+  subtitle = "Analysis from Gene Biringer's Schenker Text, Ex. 5-27"
+% "BWV641"
+  enteredby = "Kris Shaffer"
 }
 
+%%
 %% See http://www.shaffermusic.com/doc/schenker/index.html for more information
-%% 
+%%
 
 
-\version "2.10.0"
+\version "2.11.30"
 
 staffPiano = \new PianoStaff {
   \set Score.timing = ##f
   \set PianoStaff.followVoice = ##t
 
   <<
-    \new Staff {  % Right hand 
+    \new Staff = "RH" {  % Right hand
       \clef treble
       \key g \major
       \relative c'' {
@@ -29,46 +28,42 @@ staffPiano = \new PianoStaff {
        #'merge-differently-headed = ##t
        <<
          {
-           \override Beam  #'positions = #'(8 . 8)
+           \override Beam #'positions = #'(8 . 8)
            \override NoteHead #'transparent = ##t
+           \override NoteHead #'duration-log = #1
            s1 b8[^\markup {
              \override #'(baseline-skip . 0.5)
              \column { \small {^ 3} }
            }
-                 s4. s1 a8^\markup {
-                   \override #'(baseline-skip . 0.5)
-                   \column { \small {^ 2} }
-                 } s4. s2 g8]^\markup {
-                   \override #'(baseline-skip . 0.5)
-                   \column {
-                     \small {^ 1}
-                   }
-                 }
+           s4. s1 a8^\markup {
+             \override #'(baseline-skip . 0.5)
+             \column { \small {^ 2} }
+           }
+           s4. s2 g8]^\markup {
+             \override #'(baseline-skip . 0.5)
+             \column { \small {^ 1} }
+           }
            s4.
            \revert Beam #'positions
            \revert NoteHead #'transparent
-         } 
+           \revert NoteHead #'duration-log
+         }
          \\
          {
            \override Stem #'transparent = ##t
-           \slurDown
-           \override Staff.Slur #'height-limit = #6
-           \slurDashed
-           s1 
+           s1
+           \once \override Slur #'height-limit = #6
            \once \override Slur #'extra-offset = #'(1.25 . 0)
-           b2( s2
-           \revert Staff.Slur #'height-limit
-           \override NoteHead #'transparent = ##t
-           b4) s 
-           \revert NoteHead #'transparent
-           \override Staff.Slur #'height-limit = #3.25
-           \once \override Slur #'extra-offset = #'(.75 . 0)
            \slurDashed
-           a2( s4
-           \override NoteHead #'transparent = ##t
-           a) 
-           \revert NoteHead #'transparent
-           g2 
+           b2_( s2
+           \once \override NoteHead #'transparent = ##t
+           b4) s
+           \once \override Slur #'height-limit = #3.25
+           \once \override Slur #'extra-offset = #'(.75 . 0)
+           a2_( s4
+           \once \override NoteHead #'transparent = ##t
+           a)
+           g2
            \revert Stem #'transparent
          }
          \\
@@ -76,17 +71,34 @@ staffPiano = \new PianoStaff {
          #'merge-differently-headed = ##t
          {
            \override Beam #'positions = #'(4 . -3.25)
-           \stemUp 
-           g8[ s s4 s2 
-               \stemDown 
-               \override NoteHead #'transparent = ##t
-               b8] s8
-           \revert NoteHead #'transparent
-           \override Beam #'positions = #'(3 . -2.75)
+           \stemUp
+           g8[ s s4 s2
+             \stemDown
+             \once \override NoteHead #'transparent = ##t
+             b8] s8
+           \override Beam #'positions = #'(3 . -2.25)
            \stemUp
            a8[ s s4
-               \stemDown
-               c8] s s2 s s
+             \stemDown
+             c8] s s2 s s
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override Stem #'length = #0
+           g4_\( fis^(_\markup { \tiny N } g)\)
+           a^(^\markup { \tiny P } b2)
+           b4^(^\markup { \tiny P }
+           \stemUp
+           \revert Stem #'transparent
+           \override Stem #'length = #10
+           c8)^( s
+           \override Stem #'length = #14
+           b4) s s
+           \override Stem #'length = #0
+           \override Stem #'transparent = ##t
+           \once \override Slur #'extra-offset = #'(0 . 0.35)
+           c4^\( b_(_\markup { \tiny P } a)\) s2
            \revert Stem #'length
          }
          \\
@@ -94,197 +106,152 @@ staffPiano = \new PianoStaff {
            \override Stem #'transparent = ##t
            \override NoteHead #'transparent = ##t
            \override Stem #'length = #0
-           \phrasingSlurDown
-           \slurUp            
-           g4\( 
-             \revert NoteHead #'transparent
-             \once \override TextScript #'padding = #1.5
-             \once\override Slur #'extra-offset = #'(0 . -0.35)
-             fis(_\markup { \tiny N } g)\) \slurUp a(^\markup { \tiny P } b2)
-           b4(^\markup { \tiny P }
-           \stemUp 
+           s1 s4 e4 s
+           \change Staff = "LH"
+           fis,4 s2
            \revert Stem #'transparent
-           \override Stem #'length = #10
-           c8[])( s 
-         \override Stem #'length = #14
-         b4) s s
-         \override Stem #'length = #0
-         \override Stem #'transparent = ##t
-         \phrasingSlurUp \slurDown 
-         \override Slur #'extra-offset = #'(0 . 0.35)
-         c4\(
-           \once \override TextScript #'padding = #1.25
-           b(_\markup { \tiny P } a)\) s2
-         \revert Stem #'length
-         \revert Slur #'extra-offset
-       }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \override Stem #'length = #0
-          s1 s4 e4 s 
-          \change Staff=LH
-          fis,4 s2     
-          \revert Stem #'transparent
-          \revert NoteHead #'transparent
-          \revert Stem #'length
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \override Stem #'length = #0
-          s1 s s2
-          fis'4 s
-          \change Staff=LH
-          g,4 s s2
-          \revert Stem #'transparent
-          \revert NoteHead #'transparent
-          \revert Stem #'length
-        }
-       >>
-      \bar "|."
+           \revert NoteHead #'transparent
+           \revert Stem #'length
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           \override Stem #'length = #0
+           s1 s s2
+           fis'4 s
+           \change Staff = "LH"
+           g,4 s s2
+           \revert Stem #'transparent
+           \revert NoteHead #'transparent
+           \revert Stem #'length
+         }
+       >>
+       \bar "|."
+      }
     }
-  }
-   \new Staff {  % Left hand                   
-     \clef bass
-     \key g \major
-     \relative c' {
-       \override Staff.NoteCollision
-       #'merge-differently-headed = ##t
-       <<
-        {
-          \override Beam  #'positions = #'(-8 . -8)
-          \override NoteHead #'transparent = ##t
-          \stemDown
-          g8[_\markup { \bold I } s4. s1 s s2
+
+    \new Staff = "LH" {  % Left hand
+      \clef bass
+      \key g \major
+      \relative c' {
+       \override Staff.NoteCollision
+       #'merge-differently-headed = ##t
+       <<
+         {
+           \override Beam #'positions = #'(-8 . -8)
+           \override NoteHead #'transparent = ##t
+           \stemDown
+           g8[_\markup { \bold I } s4. s1 s s2
              d8_\markup { \bold V } s4.
              g,8]_\markup { \bold I } s4.
-          \revert Beam #'positions
-          \revert NoteHead #'transparent
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \stemDown
-          \override TextScript #'extra-offset = #'(-11.75 . -12.25)
-          g'2 s1 s s2 d2 g,2
-          \revert Stem #'transparent
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \override Stem #'length = #0
-          g'4
-          \revert NoteHead #'transparent
-          \slurDown
-          \once \override TextScript #'padding = #0.25
-          a4(^\markup { \tiny P } b)
-          \slurUp
-          fis4(^\markup { \tiny P } e)
-          \override NoteHead #'transparent = ##t
-          c4( 
-          \revert NoteHead #'transparent
-          d)^\markup { \tiny N }
-          \slurDown
-          \override NoteHead #'transparent = ##t
-          \once \override Slur #'extra-offset = #'(0 . 0.5)
-          fis,4(
-          \revert NoteHead #'transparent
-          \revert Stem #'transparent
-          \override Stem #'length = #12
-          \stemDown
-          g4) s
-          \override Stem #'length = #10
-          \once \override Slur #'extra-offset = #'(0 . 0.25)
-          c8( s
-          \override Stem #'transparent = ##t
-          \revert Stem #'length
-          a4)
-          \override NoteHead #'transparent = ##t
-          \slurUp
-          d4(
-          \revert NoteHead #'transparent
-          d,4) s2
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \slurUp
-          \override Staff.Slur #'height-limit = #3.5
-          g'4( s b) s2
-          \revert Staff.Slur #'height-limit
-          \revert Stem #'transparent
-          \revert NoteHead #'transparent
-          \override Beam #'positions = #'(-4 . 1)
-          \stemDown
-          c,8[ s s4
-               \stemUp
-               fis,8] s
-          \override Beam #'positions = #'(1 . -4)
-          g8[ s
-              \stemDown
-              b8] s
-          \revert Beam #'positions
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \slurUp
-          c4( s d4) s s2
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \slurDown
-          \override Stem #'length = #0
-          \stemDown
-          \override Slur #'height-limit = #3
-          \once \override Slur #'extra-offset = #'(0 . 0.25)
-          g4( s2. e4) s2. s2 s1 s2
-          \revert Stem #'transparent
-          \revert NoteHead #'transparent
-          \revert Staff.Slur #'height-limit
-        }
-        \\
-        {
-          \override Stem #'transparent = ##t
-          \override NoteHead #'transparent = ##t
-          \slurDown \slurDashed        
-          \override Staff.Slur #'height-limit = #6.0
-          \override Slur #'extra-offset = #'(0.5 . -0.25)
-          \override Stem #'length = #0
-          g4( s2. s1 g,4) s s1 s2
-          \revert Stem #'transparent
-          \revert NoteHead #'transparent
-          \revert Staff.Slur #'height-limit
-        }
-       >>
-       \bar "|."
-     }
-   }
- >>
+           \revert Beam #'positions
+           \revert NoteHead #'transparent
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \stemDown
+           \override TextScript #'extra-offset = #'(-11.75 . -12.25)
+           g'2 s1 s s2 d2 g,2
+           \revert Stem #'transparent
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \once \override NoteHead #'transparent = ##t
+           \override Stem #'length = #0
+           g'4
+           \once \override TextScript #'padding = #0.25
+           a4_(^\markup { \tiny P } b)
+           fis4^(^\markup { \tiny P } e)
+           \once \override NoteHead #'transparent = ##t
+           \once \override Slur #'height-limit = #1.5
+           c4^(
+           d)^\markup { \tiny N }
+           \once \override NoteHead #'transparent = ##t
+           \once \override Slur #'extra-offset = #'(0 . 0.5)
+           fis,4_(
+           \revert Stem #'transparent
+           \override Stem #'length = #10
+           \stemDown
+           g4) s
+           \once \override Slur #'extra-offset = #'(0 . 0.25)
+           c8_( s
+           \override Stem #'transparent = ##t
+           \revert Stem #'length
+           a4)
+           \once \override NoteHead #'transparent = ##t
+           d4^( d,4) s2
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           g'4^( s b) s2
+           \revert Stem #'transparent
+           \revert NoteHead #'transparent
+           \override Beam #'positions = #'(-4 . 1)
+           \stemDown
+           c,8[ s s4
+             \stemUp
+             fis,8] s
+           \override Beam #'positions = #'(1 . -4)
+           g8[ s
+             \stemDown
+             b8] s
+           \revert Beam #'positions
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           c4^( s d4) s s2
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           \override Stem #'length = #0
+           \stemDown
+           \once \override Slur #'height-limit = #3
+           \once \override Slur #'extra-offset = #'(0 . 0.25)
+           g4_( s2. e4) s2. s2 s1 s2
+           \revert Stem #'transparent
+           \revert NoteHead #'transparent
+         }
+         \\
+         {
+           \override Stem #'transparent = ##t
+           \override NoteHead #'transparent = ##t
+           \slurDashed
+           \once \override Slur #'height-limit = #6.0
+           \once \override Slur #'extra-offset = #'(0.5 . -0.25)
+           \override Stem #'length = #0
+           g4_( s2. s1 g,4) s s1 s2
+           \revert Stem #'transparent
+           \revert NoteHead #'transparent
+         }
+       >>
+       \bar "|."
+      }
+    }
+  >>
 }
 
 
-
 \score {
   <<
     \staffPiano
   >>
-  
+
   \midi {
   }
 
-  \layout  {
+  \layout {
     indent = 0.0
     ragged-right = ##t
     \context { \Staff \remove "Time_signature_engraver" }
   }
 }
 
+
 \paper {
 }
-

diff --git a/input/regression/spacing-accidental-tie.ly b/input/regression/spacing-accidental-tie.ly
new file mode 100644 (file)
index 0000000..35c25b9
--- /dev/null
+++ b/input/regression/spacing-accidental-tie.ly
@@ -0,0 +1,23 @@
+\version "2.11.30"
+
+\header {
+  texidoc = "Horizontal spacing works as expected on tied notes with
+accidentals. No space is reserved for accidentals that end up not being printed,
+but accindentals that are printed don't collide with anything."
+}
+
+\paper { ragged-right = ##t }
+
+\relative c'
+{ \time 1/4
+  cis16 cis cis cis~
+  cis cis cis cis
+  c c c c \break
+
+  cis16 cis cis cis~
+  cis! cis cis cis
+  c c c c \break
+
+  cis cis cis cis~ \break
+  cis
+}
\ No newline at end of file

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index bb1419977ef262fb9ef7a4fada49be8362c15e87..2c76062d6742a19151d1aaac5104c482d6e5f154 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -68,7 +68,7 @@ Accidental_placement::split_accidentals (Grob *accs,
       {
        Grob *a = unsmob_grob (scm_car (s));
 
-       if (unsmob_grob (a->get_object ("tie")))
+       if (unsmob_grob (a->get_object ("tie")) && !to_boolean (a->get_property ("forced")))
          break_reminder->push_back (a);
        else
          real_acc->push_back (a);

diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index 7e9b7ed74089328eeb1f5c6b79ed45071321497a..a04b0c67cc95456f4284b8df39e6d632a43964df 100644 (file)
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -16,12 +16,12 @@ MAKEINFO_FLAGS += --force
 
 $(outdir)/%/index.html: $(outdir)/%.nexi $(outdir)/user-ln doc-po
        mkdir -p $(dir $@)
-       -$(MAKEINFO) -I$(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+       -$(MAKEINFO) $(MAKEINFO_FLAGS) -I$(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
 # we don't make the big page until the whole manual is translated
 # if this happens, we'll have to define local-WWW differently for this language
 #$(outdir)/lilypond.html: $(outdir)/lilypond.nexi
-#      -$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
+#      -$(MAKEINFO) $(MAKEINFO_FLAGS) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
 
 $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/user-ln doc-po
        $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<