From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 10 Oct 2005 22:38:11 +0000 (+0000)
Subject: (wordwrap-string): remove \r
X-Git-Tag: release/2.7.13~29
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=377b86b900ae223ac33a7dd118289210354967e9;p=lilypond.git

(wordwrap-string): remove \r
characters from string before splitting.
---

diff --git a/ChangeLog b/ChangeLog
index 2c748f6794..b710c225d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scm/define-markup-commands.scm (wordwrap-string): remove \r
+	characters from string before splitting.
+
 2005-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scm/framework-ps.scm (output-preview-framework): use
diff --git a/THANKS b/THANKS
index 9485bf54a5..a0b8a290a0 100644
--- a/THANKS
+++ b/THANKS
@@ -41,6 +41,7 @@ Vicente Solsona Dellá
 BUG HUNTERS/SUGGESTIONS
 
 Bob Broadus
+Chris Sawer
 Darius Blasband
 Donald Axel
 Erlend Aasland
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index ccb03a499a..c7e3a45c5c 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -512,7 +512,10 @@ linewidth, where X is the number of staff spaces."
       ((baseline-skip (chain-assoc-get 'baseline-skip props))
        (line-width (chain-assoc-get 'linewidth props))
        (word-space (chain-assoc-get 'word-space props))
-       (para-strings (regexp-split arg "\n[ \t\n]*\n[ \t\n]*"))
+       
+       (para-strings (regexp-split
+		      (string-regexp-substitute "\r" "" arg)
+		      "\n[ \t\n]*\n[ \t\n]*"))
        
        (text-dir (chain-assoc-get 'text-direction props RIGHT)) 
        (list-para-words (map (lambda (str)