From 07ec1eb0e06207735ea966bd8c07aeccf57f45b6 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 4 Jul 2003 00:49:32 +0000
Subject: [PATCH] *** empty log message ***

---
 Documentation/user/introduction.itely |  3 +++
 VERSION                               |  2 +-
 scm/molecule.scm                      | 14 +++++++-------
 scm/output-lib.scm                    |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index c88a8ab462..bf0bb0f49f 100644
--- 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 40d1c8c559..0297c4fab0 100644
--- 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 cc199b4192..0c5510179b 100644
--- 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 fbc4cfd8ad..d03fb732ad 100644
--- 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))
-- 
2.39.5