* Documentation/user/internals.itely:

* Documentation/user/refman.itely: Run texinfo-all-menus-update.

* lily/parser.yy: Identify shift/reduce problems.

* input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly: Rename
make-style-sheet.  Too specific for convert-ly?

diff --git a/ChangeLog b/ChangeLog
index 11da6c4e3fc483b52f2f57848b6dff4be5530136..cdadb992422e72b8930c0d04f9ac16453a0af102 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/user/internals.itely:
+       * Documentation/user/refman.itely: Run texinfo-all-menus-update.
+
+       * lily/parser.yy: Identify shift/reduce problems.
+
+       * input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly: Rename
+       make-style-sheet.  Too specific for convert-ly?
+
 2002-10-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * po/cs.po: added czech translation, courtesy Tomas Kopecek.

diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely
index d34093f5691abc2bdc240d606998c668bd5b9d01..997e63105edb2b48026c4fe83abf1b0d6c7b9261 100644 (file)
--- a/Documentation/user/internals.itely
+++ b/Documentation/user/internals.itely
@@ -123,7 +123,7 @@ section.
 * Interpretation context::      
 * Syntactic details::           
 * Lexical details::             
-* Output details::               
+* Output details::              
 @end menu
 
 
@@ -514,7 +514,6 @@ This section describes details that were too boring to be put elsewhere.
 * Identifiers::                 
 * Music expressions::           
 * Manipulating music expressions::  
-* Span requests::               
 * Assignments::                 
 * Lexical modes::               
 * Ambiguities::                 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index d75db2313bfb68b8863eb0742fb11f8d48afcc38..19b8c228e2e309723757a06d7f1e7fc5c7a9cc81 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -805,7 +805,7 @@ such as keys, clefs and time signatures.
 @cindex Staff notation
 
 @menu
-* Staff symbol::
+* Staff symbol::                
 * Key signature::               
 * Clef::                        
 * Time signature::              
@@ -3754,7 +3754,7 @@ output.
 
 @menu
 * Ancient note heads::          
-* Ancient clefs::               
+* Ancient clefs ::              
 * Custodes::                    
 * Ligatures::                   
 * Figured bass::                
@@ -4240,8 +4240,8 @@ affecting a whole set of objects.  Second, you can select one specific
 object, and set a object property in that object.
 
 @menu
-* Tuning groups of objects ::     
-* Tuning per object ::            
+* Tuning groups of objects ::   
+* Tuning per object ::          
 * Font selection::              
 * Text markup::                 
 @end menu

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index c04fed8085678f9713fd81fda5924a9c3eb2f721..bd09d8331c58c38a86334e1bbd9fdd238db66d05 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -12,14 +12,24 @@ ritenuto = \textscript #'(italic  "rit.")
 
 %% burp
 %% the very idea of a style sheet, is that it's easy to override
-#(define (set-style! sheet name style)
-  (set-cdr! (assoc 'mark-letter (cdr (assoc 'style-alist sheet))) style))
+%#(define (set-style! sheet name style)
+%  (set-cdr! (assoc 'mark-letter (cdr (assoc 'style-alist sheet))) style))
+%
+%#(define my-sheet (make-font-list 'paper20))
+%#(set-style! my-sheet 'mark-letter '((font-family . roman)
+%                                     (font-series . bold)
+%                                     (font-shape . upright)
+%                                     (font-relative-size . 3)))
 
-#(define my-sheet (make-style-sheet 'paper20))
-#(set-style! my-sheet 'mark-letter '((font-family . roman)
-                                     (font-series . bold)
-                                     (font-shape . upright)
-                                     (font-relative-size . 3)))
+#(define (set-style! xstyle-alist name style)
+  (set-cdr! (assoc name xstyle-alist)) style)
+
+#(set-style! style-alist 'mark-letter '((font-family . roman)
+                                        (font-series . bold)
+                                        (font-shape . upright)
+                                        (font-relative-size . 3)))
+  
+  
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
@@ -45,7 +55,7 @@ stopGraceMusic= \sequential {
 }
 
 \paper{
-    \stylesheet #my-sheet
+    #(define fonts my-sheet)
     \translator {
         \ScoreContext
         skipBars = ##t

diff --git a/lily/parser.yy b/lily/parser.yy
index 8d9fed63e3b885820df4d77633ed19cc110240c1..eb1e28bbfe5f496650ff380fee34d8d36f9f675e 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -5,14 +5,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 /*
   Two shift/reduce problems:
-    -
-    -
+    - empty music-list
+    - empty pre-events
  */
 
 /*
@@ -650,7 +650,7 @@ The representation of a  list is the
 
  to have  efficient append.
 */
-Music_list: /* empty */ {
+Music_list: /* empty */ { /* SR conflict */
                $$ = scm_cons (SCM_EOL, SCM_EOL);
        }
        | Music_list Music {
@@ -1309,7 +1309,7 @@ verbose_command_req:
        ;
 
 post_events:
-       {
+       /* empty */ {
                $$ = new Link_array<Music>;
        }
        | post_events post_event {
@@ -1589,7 +1589,7 @@ script_dir:
        ;
 
 pre_events:
-       {
+       /* empty */ { /* SR conflict */
                $$ = new Link_array<Music>;
        }
        | pre_events open_event {

diff --git a/ly/params-init.ly b/ly/params-init.ly
index 8e144cc9a762f6ca62ebb3a95511c9ae7efd061b..6dd444fdcfb9e7bdbcfdec67e7f5171ca96ad446 100644 (file)
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -61,7 +61,8 @@ interscoreline = 4. \mm
        (font-series . medium)
        ))
 
-#(define style-alist
+%% How to override this?
+#(define-public style-alist
       '((finger . ((font-family . number) (font-relative-size . -3)))
        (volta . ((font-family . number) (font-relative-size . -2)))
        (tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))