From d56713cfccb89e55881d60bce5c3bc8962de4e2a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Mon, 3 Jun 2002 12:11:40 +0000
Subject: [PATCH] imeks

---
 config.hh.in             |  3 ---
 lily/lily-guile.cc       |  5 ++++-
 lilypond-font-lock.el    | 18 +++++++++---------
 scm/grob-description.scm |  1 +
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config.hh.in b/config.hh.in
index 98dbd72ffb..b5e4575dc4 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -3,9 +3,6 @@
 /* Hmm */
 #define PACKAGE "@package@"
 
-/* we don't set DIR_SHAREDSTATEDIR anymore */
-#define DIR_SHAREDSTATEDIR "@DIR_SHAREDSTATEDIR@"
-
 /* default lilypond init and input dir */
 #define  DIR_DATADIR "@DIR_DATADIR@"
 
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index ac8bc5fd3b..d490e50f60 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -162,7 +162,10 @@ file is looked up using the lilypond search path.
 /**
    Read a file, and shove it down GUILE.  GUILE also has file read
    functions, but you can't fiddle with the path of those.
- */
+
+
+   TODO: JUNKME.
+*/
 void
 read_lily_scm_file (String fn)
 {
diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index aa3e21c794..044f821b04 100644
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -195,19 +195,19 @@
 			(car x) (cdr x) LilyPond-mode-syntax-table)))
 	  '(( ?\( . "." ) ( ?\) . "." ) 
 	    ( ?\[ . "(]" ) ( ?\] . ")[" ) ;; all the other paren characters are now handled by          
-	    ( ?\{  .  ".2b" )             ;; lily-specific indenting/matching code in lilypond-indent.el 
-	    ( ?\}  .  ".4b" )              
+	    ( ?\{  .  ". 2b" )             ;; lily-specific indenting/matching code in lilypond-indent.el 
+	    ( ?\}  .  ". 4b" )              
 	    ( ?\< . "." )( ?\> . ".") 
-	    ( ?\$ . "." ) ( ?\% . "." ) ( ?\& . "." )
+	    ( ?\$ . "." ) ( ?\& . "." )
 	    ( ?\* . "." ) ( ?\+ . "." )
 	    ( ?\/ . "." )  ( ?\= . "." )
 	    ( ?\| . "." ) (?\\ . "\\" )
-	    ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." )
-	    ( ?\' . "w")	
-	    ( ?\" . "\"" )
-	    ( ?\%  .  ". 1b3b" )
-	    ( ?\n . ">")
-	    ( ?\r . ">")
+	    ( ?\- . "." ) ( ?\_ . "." ) ( ?\^ . "." ) ; accent positioners: puctuation characters
+	    ( ?\' . "w") ( ?\, . "w") ; transposing octaves, parts of words (notes)
+	    ( ?\" . "\"" ) ; string quote characters 
+	    ( ?\%  .  "< 1b3b" ) ; (block-)comment starter (or ender)
+	    ( ?\n . ">") ; newline: comment ender
+	    ( ?\r . ">") ; formfeed: comment ender
 	    ))
   )
 
diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 0b64c026c3..dae0d5d8a2 100644
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -112,6 +112,7 @@
 	(position-callbacks . (,Beam::least_squares
 			       ,Beam::check_concave
 			       ,Beam::slope_damping
+			       ,Beam::shift_region_to_valid
 			       ,Beam::quanting
 			      ))
 
-- 
2.39.5