*** empty log message ***

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index c88a8ab4625642d7505ddec59db821ee799e965c..bf0bb0f49fdee21e26e371e868a321cbcd1ce4e9 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -31,6 +31,8 @@ nicely looking output.
 In this chapter, we will explain the reasoning behind this unusual
 design, and how this approach affects you as a user.
 
+
+
 @menu
 * Batch processing::            
 * Music engraving::             
@@ -459,6 +461,7 @@ browser.
 @cindex search in manual
 @cindex using the manual
 
+@c  TODO: advise to buy a book on notation? 
 
 If you are not familiar with music notation, or music terminology
 (especially if you are a foreigner), then it is advisable to consult

diff --git a/VERSION b/VERSION
index 40d1c8c5598de20aeac76007790c41f93978194e..0297c4fab0ef36546b3abb614260ae6be1d514af 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=7
 PATCH_LEVEL=23
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/molecule.scm b/scm/molecule.scm
index cc199b4192e1e64c9cdec15af245a182eeb9f032..0c5510179b4255b700756658461f4419e34a991b 100644 (file)
--- a/scm/molecule.scm
+++ b/scm/molecule.scm
@@ -45,7 +45,7 @@
     mol
   ))
 
-(define-public (box-molecule xext yext)
+(define-public (make-filled-box-molecule xext yext)
   "Make a filled box."
   
   (ly:make-molecule
@@ -63,10 +63,10 @@ encloses the contents.
         (yext (ly:get-extent grob grob 1))
         (thick 0.1))
 
-    (ly:molecule-add (box-molecule xext (cons (- (car yext) thick) (car yext) ))
-                    (box-molecule xext (cons  (cdr yext) (+ (cdr yext) thick) ))
-                    (box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext)
-                    (box-molecule (cons (- (car xext) thick) (car xext)) yext))))
+    (ly:molecule-add (make-filled-box-molecule xext (cons (- (car yext) thick) (car yext) ))
+                    (make-filled-box-molecule xext (cons  (cdr yext) (+ (cdr yext) thick) ))
+                    (make-filled-box-molecule (cons (cdr xext) (+ (cdr xext) thick)) yext)
+                    (make-filled-box-molecule (cons (- (car xext) thick) (car xext)) yext))))
 
 
 ;; TODO merge this and prev function. 
@@ -75,9 +75,9 @@ encloses the contents.
   (let* (
         (x-ext (widen-interval (ly:molecule-get-extent mol 0) padding))
         (y-ext (widen-interval (ly:molecule-get-extent mol 1) padding))
-        (x-rule (box-molecule (widen-interval x-ext thick)
+        (x-rule (make-filled-box-molecule (widen-interval x-ext thick)
                               (cons 0 thick)))
-        (y-rule (box-molecule (cons 0 thick) y-ext)))
+        (y-rule (make-filled-box-molecule (cons 0 thick) y-ext)))
     
     (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule (* 0.5 padding)))
     (set! mol (ly:molecule-combine-at-edge mol 0 -1  y-rule (* 0.5 padding)))

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index fbc4cfd8ad86945e55e1e322385be7c624ff5395..d03fb732adadfe0a3b64c20794f156a3e1bb6aef 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -79,9 +79,9 @@
     (mol    (callback grob))
     (x-ext (widen-interval (ly:molecule-get-extent mol 0) x-padding))
     (y-ext (widen-interval (ly:molecule-get-extent mol 1) y-padding))
-    (x-rule (box-molecule (widen-interval x-ext line-thick)
+    (x-rule (make-filled-box-molecule (widen-interval x-ext line-thick)
                               (cons 0 line-thick)))
-    (y-rule (box-molecule (cons 0 line-thick) y-ext))
+    (y-rule (make-filled-box-molecule (cons 0 line-thick) y-ext))
     )
     
     (set! mol (ly:molecule-combine-at-edge mol 0 1 y-rule x-padding))