(wordwrap-string): remove \r

characters from string before splitting.

diff --git a/ChangeLog b/ChangeLog
index 2c748f67949cc735e269fa2aebe3715898aff7ff..b710c225d58b5a6da9297e0fd29442c6c41770d7 100644 (file)
--- 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 9485bf54a53743e4de7eb8667db9143ba0361238..a0b8a290a08a46d1cdf58219d0ae540113ba48e2 100644 (file)
--- 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 ccb03a499a5955de8908832471bb271adf09cc21..c7e3a45c5c5e0c2b987748800b8863ffcbe197c0 100644 (file)
--- 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)