* Documentation/topdocs/NEWS.tely (Top): refresh.

* scm/define-markup-commands.scm (wordwrap-string): new function:
split string in paras and words.
(wordwrap-markups): new function.
(wordwrap-stencils): new function.
(justify): use it.
(wordwrap): use it.
(wordwrap-string): use it
(justify-string): use it.

* scm/lily-library.scm (regexp-split): new function.

* scm/define-markup-commands.scm: remove encoded-simple.
remove font-markup.
(fontsize): remove old version  of fontsize.
(wordwrap): new markup function. Wrap into paragraphs.

2 files changed, 91 insertions, 27 deletions

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 66286ca643..ab0ca1eaf1 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -371,9 +371,17 @@ determines the space between each markup in @var{args}."
    (remove ly:stencil-empty? stencils))))
 
 
-(def-markup-command (wordwrap layout props args) (markup-list?)
-  "Perform simple wordwrap on @var{args}"
-
+(define (wordwrap-stencils stencils
+			   justify base-space line-width 
+			   )
+  
+  "Perform simple wordwrap, return stencil of each line."
+  (define space (if justify
+		    
+		    ;; justify only stretches lines.
+		    (* 0.7 base-space)
+		    base-space))
+       
   (define (take-list width space stencils
 		     accumulator accumulated-width)
     "Return (head-list . tail) pair, with head-list fitting into width"
@@ -383,7 +391,6 @@ determines the space between each markup in @var{args}."
 	    ((first (car stencils))
 	     (first-wid (cdr (ly:stencil-extent (car stencils) X)))
 	     (newwid (+ space first-wid accumulated-width))
-	     (word-space (chain-assoc-get 'word-space props))
 	     )
 
 	  (if
@@ -396,24 +403,10 @@ determines the space between each markup in @var{args}."
 		      newwid)
 	     (cons accumulator stencils))
 	   )))
-  
-  (let*
-      ((line-width (chain-assoc-get 'linewidth props))
-       (justify (chain-assoc-get 'word-wrap-justify props #f))
-       (base-space (chain-assoc-get 'word-space props))
-       (space (if justify
-		  
-		  ;; justify only stretches lines.
-		  (* 0.7 base-space)
-		  base-space))
-       
-       (baseline-skip (chain-assoc-get 'baseline-skip props)))
 
     (let loop
 	((lines '())
-	 (todo
-	  (remove ly:stencil-empty?
-		  (map (lambda (m) (interpret-markup layout props m)) args))))
+	 (todo stencils))
 
       (let*
 	  ((line-break (take-list line-width space todo
@@ -426,6 +419,7 @@ determines the space between each markup in @var{args}."
 			     ((not justify) space)
 
 			     ;; don't stretch last line of paragraph.
+			     ;; hmmm . bug - will overstretch the last line in some case. 
 			     ((null? (cdr line-break))
 			      base-space)
 			     ((null? line-stencils) 0.0)
@@ -440,21 +434,71 @@ determines the space between each markup in @var{args}."
 	    (loop (cons line lines)
 		  (cdr line-break))
 
-	    (stack-lines DOWN 0.0 baseline-skip (reverse (cons line lines)))
+	    (reverse (cons line lines))
 	    ))
 
-      )))
-    
+      ))
+
+
+(define (wordwrap-markups layout props args justify)
+  (let*
+      ((baseline-skip (chain-assoc-get 'baseline-skip props))
+       (line-width (chain-assoc-get 'linewidth props))
+       (word-space (chain-assoc-get 'word-space props))
+       (lines (wordwrap-stencils
+	       (remove ly:stencil-empty?
+		       (map (lambda (m) (interpret-markup layout props m)) args))
+	       justify word-space  line-width)
+	       ))
 
+    (stack-lines DOWN 0.0 baseline-skip lines)))
 
 (def-markup-command (justify layout props args) (markup-list?)
+  "Simple wordwrap"
+
+  (wordwrap-markups layout props args #t))
+
+(def-markup-command (wordwrap layout props args) (markup-list?)
   "Like wordwrap, but with lines stretched to justify the margins."
-  
-  (interpret-markup layout
-		    (prepend-alist-chain 'word-wrap-justify #t props)
-		    (list wordwrap-markup args)
-  ))
 
+  (wordwrap-markups layout props args #f))
+
+(define (wordwrap-string  layout props justify arg) 
+  (let*
+      ((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]*"))
+       
+       (list-para-words (map (lambda (str)
+			       (regexp-split str "[ \t\n]+"))
+			     para-strings))
+       (para-lines (map (lambda (words)
+			  (let*
+			      ((stencils
+				(remove
+				 ly:stencil-empty? (map 
+				      (lambda (x)
+					(interpret-markup layout props x))
+				      words)))
+			       (lines (wordwrap-stencils stencils
+							 justify word-space line-width)))
+
+			    lines))
+			
+			list-para-words)))
+
+    (stack-lines DOWN 0.0 baseline-skip (apply append para-lines))))
+
+
+(def-markup-command (wordwrap-string layout props arg) (string?)
+  "Wordwrap a string. Paragraphs may be separated with double newlines"
+  (wordwrap-string layout props  #f arg))
+  
+(def-markup-command (justify-string layout props arg) (string?)
+  "Justify a string. Paragraphs may be separated with double newlines"
+  (wordwrap-string layout props #t arg))
+  
 (def-markup-command (combine layout props m1 m2) (markup? markup?)
   "Print two markups on top of each other."
   (let* ((s1 (interpret-markup layout props m1))
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 937564844a..5b08393b80 100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -314,6 +314,26 @@ possibly turned off."
 (define-public (string-regexp-substitute a b str)
   (regexp-substitute/global #f a str 'pre b 'post)) 
 
+
+(define (regexp-split str regex)
+  (define matches '())
+  (define end-of-prev-match 0)
+  (define (notice match)
+    (set! matches (cons (substring (match:string match)
+				   end-of-prev-match
+				   (match:start match))
+			matches))
+    (set! end-of-prev-match (match:end match)))
+
+  (regexp-substitute/global #f regex str notice 'post)
+
+  (if (< end-of-prev-match (string-length str))
+      (set!
+       matches
+       (cons (substring str end-of-prev-match (string-length str)) matches)))
+
+   (reverse matches))
+
 ;;;;;;;;;;;;;;;;
 ; other
 (define (sign x)