* 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/define-markup-commands.scm: remove encoded-simple.
remove font-markup.
(fontsize): remove old version  of fontsize.
(wordwrap): new markup function. Wrap into paragraphs.

diff --git a/THANKS b/THANKS
index 0d007c6070379e29ae105df36c5eeaad37c0f6f4..504a23e01d8dba8f9bafbe93c603f2470aa6cb06 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,3 +1,21 @@
+Release 2.7
+***********
+
+DEVELOPMENT TEAM
+
+Han-Wen Nienhuys  - Core development
+Jan Nieuwenhuizen - Core development
+Erik Sandberg     - Bug Meister
+Pedro Kroger      - Build Meister
+Graham Percival   - Documentation Editor
+
+
+SPONSORS
+
+Sven Axelsson
+
+
+
 Release 2.6
 ***********
 

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index ab0ca1eaf1ad565a3fdfb586ddc3276cf0e7858f..bf2c40c869967db79a242e5996d2e82b3eb81d49 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1076,7 +1076,7 @@ the elements marked in @var{indices}, which is a list of numbers."
      ((null? stencils) '())
      ((not (ly:stencil? last-stencil))
       (cons (car stencils)
-           (stack-stencils (cdr stencils) bskip (car stencils))))
+           (stack-stencils-vertically (cdr stencils) bskip (car stencils))))
      (else
       (let* ((orig (car stencils))
             (dir (chain-assoc-get 'direction  props DOWN))