imeks

diff --git a/config.hh.in b/config.hh.in
index 98dbd72ffb288977ff5389c02a84c1a57ba1a6a4..b5e4575dc4d4a0cfc7c54c95e3b41894fd7c3148 100644 (file)
--- 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 ac8bc5fd3bdc5121fd639ecfdae60c7fc14f292c..d490e50f60c7347f51aec5e74ba7811f243e9eee 100644 (file)
--- 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 aa3e21c7945be39e368d7618db6e354bacc2f42d..044f821b0494d87523bdb74749eefa14d7de4622 100644 (file)
--- 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 0b64c026c3466e5dbc7c44210a072d6edac920bb..dae0d5d8a207d8d6b3c4efaf9c9e574fee800e8a 100644 (file)
--- 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
                              ))