CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/10 22:38:12
Modified files:
. : ChangeLog THANKS
scm : define-markup-commands.scm
Log message:
(wordwrap-string): remove \r
characters from string before splitting.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4170&tr2=1.4171&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.118&tr2=1.119&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4170 lilypond/ChangeLog:1.4171
--- lilypond/ChangeLog:1.4170 Mon Oct 10 21:29:47 2005
+++ lilypond/ChangeLog Mon Oct 10 22:38:11 2005
@@ -1,3 +1,8 @@
+2005-10-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/define-markup-commands.scm (wordwrap-string): remove \r
+ characters from string before splitting.
+
2005-10-10 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/framework-ps.scm (output-preview-framework): use
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.154 lilypond/THANKS:1.155
--- lilypond/THANKS:1.154 Fri Oct 7 09:12:02 2005
+++ lilypond/THANKS Mon Oct 10 22:38:11 2005
@@ -41,6 +41,7 @@
BUG HUNTERS/SUGGESTIONS
Bob Broadus
+Chris Sawer
Darius Blasband
Donald Axel
Erlend Aasland
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.118
lilypond/scm/define-markup-commands.scm:1.119
--- lilypond/scm/define-markup-commands.scm:1.118 Sun Oct 9 15:28:35 2005
+++ lilypond/scm/define-markup-commands.scm Mon Oct 10 22:38:11 2005
@@ -512,7 +512,10 @@
((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)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
