From 377b86b900ae223ac33a7dd118289210354967e9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 10 Oct 2005 22:38:11 +0000 Subject: [PATCH] (wordwrap-string): remove \r characters from string before splitting. --- ChangeLog | 5 +++++ THANKS | 1 + scm/define-markup-commands.scm | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c748f6794..b710c225d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-11 Han-Wen Nienhuys + + * scm/define-markup-commands.scm (wordwrap-string): remove \r + characters from string before splitting. + 2005-10-10 Han-Wen Nienhuys * 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) -- 2.39.2