* scm/define-markup-commands.scm (wordwrap-string): bugfix for

MacOS 9 users.

* scm/define-markup-commands.scm (wordwrap-string): remove \r
characters from string before splitting.

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index b0723688749177383351798cfcb90aad7f164008..97cedfa03f4a20fb5454094011d7b15cac41465b 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -4049,6 +4049,25 @@ It is also possible to use continuation lines for repeated figures,
 >>
 @end lilypond
 
+The @code{FiguredBass} context doesn't pay attention to the actual
+bass line. As a consequence, you may have to insert extra figures to
+get extender lines below all notes, eg.
+
+
+@lilypond[verbatim, relative=1]
+<<
+  \new Voice 
+  {
+    \clef bass
+    f16. g32 f16. g32 f16. g32 f16. g32
+  }
+  \figures {
+    \set useBassFigureExtenders = ##t 
+    <6 4>4. <6 4>16. <6 4>32 <5 3>8 r
+  }
+>>
+@end lilypond
+
 When using continuation lines, common figures are always put in the
 same vertical position. When this is unwanted, you can insert a rest
 with @code{r}. The rest will clear any previous alignment.  For

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index c7e3a45c5c5e0c2b987748800b8863ffcbe197c0..8d5e057a51567d3ac58ccb29fcf6a81390b32866 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -514,7 +514,8 @@ linewidth, where X is the number of staff spaces."
        (word-space (chain-assoc-get 'word-space props))
        
        (para-strings (regexp-split
-                     (string-regexp-substitute "\r" "" arg)
+                     (string-regexp-substitute "\r" "\n"
+                                               (string-regexp-substitute "\r\n" "\n" arg))
                      "\n[ \t\n]*\n[ \t\n]*"))
        
        (text-dir (chain-assoc-get 'text-direction props RIGHT))