lilypond-1.3.104

diff --git a/input/bugs/hinterfleisch-gone.ly b/input/bugs/hinterfleisch-gone.ly
index 59fd4de8d15e13f7f288baa68ec935629ccb2bb2..bb838c8cdd055862c1a3ba53aa6af1d2229f4ed1 100644 (file)
--- a/input/bugs/hinterfleisch-gone.ly
+++ b/input/bugs/hinterfleisch-gone.ly
@@ -3,7 +3,7 @@
 \score {
        \notes \relative c'' {
        \time 2/4;
-       \property Voice.noAutoBeaming=1
+       \property Voice.noAutoBeaming=##t
        a4 a8
        a32 a a a
 }

diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly
index 3638bc3da16dfb4b17b989ee4d756d86259a3e98..6c3f1b5ec0b16bfbd522d130f562b9a58ceb3745 100644 (file)
--- a/input/scarlatti-test.ly
+++ b/input/scarlatti-test.ly
@@ -4,11 +4,12 @@
 %sonata-specific settings
 \paper {
 \translator{\VoiceContext
-  beamAutoBegin=0;
-  beamAutoEnd_8=#(make-moment 3  8)
-  beamAutoEnd_16=#(make-moment 3 8)
-  beamAutoEnd_24=#(make-moment 1 8)
-  beamAutoEnd_32=#(make-moment 1 8)
+  %% huh?
+  %%beamAutoBegin=0;
+  autoBeamSettings \push #'(end 1 8 * *) = #(make-moment 3 8)
+  autoBeamSettings \push #'(end 1 16 * *) = #(make-moment 3 8)
+  autoBeamSettings \push #'(end 1 24 * *) = #(make-moment 1 8)
+  autoBeamSettings \push #'(end 1 32 * *) = #(make-moment 1 8)
 }
 }
 
@@ -25,8 +26,8 @@ ls={\property Voice.forceHorizontalShift="-0.6"}
 sls={\property Voice.forceHorizontalShift="-0.22"}
 rs={\property Voice.forceHorizontalShift="0.6"}
 srs={\property Voice.forceHorizontalShift="0.22"}
-ab={\property Voice.noAutoBeaming="0"}
-xb={\property Voice.noAutoBeaming="1"}
+ab={\property Voice.noAutoBeaming=##f}
+xb={\property Voice.noAutoBeaming=##t}
 %}
 
 

diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly
index bf3467bcafdd998865880193fb1d322f95ec793b..3f0c131b11bc0d2f38fdbcf95833164d087bcb23 100644 (file)
--- a/input/test/ac-extra-voice.ly
+++ b/input/test/ac-extra-voice.ly
@@ -62,7 +62,7 @@ accompany = \notes \relative c{
 
                        slurVerticalDirection = #1
                        verticalDirection = -1
-                       beamAutoEnd = #(make-moment 1 2)
+                       autoBeamSettings \push (end * * * *)  = #(make-moment 1 2)
                }
        }
        \midi {

diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly
index 5292a25354839edfbc87910c63ec591085c225a6..24a32da104f65ca1859436e2e88635b114f1998b 100644 (file)
--- a/input/test/auto-beam-4-8.ly
+++ b/input/test/auto-beam-4-8.ly
@@ -3,7 +3,7 @@
      \time 4/8;
 
 %{
-    the default for 4/8 (see ly/auto-beam-settings.ly)
+    the default for 4/8 (see scm/auto-beam.scm)
      ----  --------
      |  |  |   |--|
     x| x| x|  x| x|
@@ -17,7 +17,8 @@
      |  |  |   |--|
     x| x| x|  x| x|
 %}
-     \property Voice.beamAutoEnd = #(make-moment 2 4)
+     %\property Voice.beamAutoEnd = #(make-moment 2 4)
+     \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 2 4)
      c8 c c c16 c
 
   }

diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly
index ba6d5dcc4d6429d6f019eab8cd7cbcbc28c4e90a..42da5010cf87d585174cdfd8c8a4101c82ae9111 100644 (file)
--- a/input/test/auto-beam-override.ly
+++ b/input/test/auto-beam-override.ly
@@ -17,7 +17,7 @@
        c8 c c c
        c16 c c c c c c c
        % from here on consider ending beam every 1/4 note
-       \property Voice.beamAutoEnd = #(make-moment 1 4)
+       \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4)
        c8 c c c
        % manually override autobeam with weird beaming
        c8 [c c] c
@@ -25,14 +25,14 @@
        c8 c c4
        r8 c c c
        % no autobeaming
-       \property Voice.beamAuto = #f
+       \property Voice.beamAuto = ##f
        c8 c c c
     }
     \paper{
        \translator{
            \VoiceContext
            % consider ending beam at every 1/2 note
-           beamAutoEnd = "1/2";
+           autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2)
        }
     }
 }

diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly
index c36178ee77dabc1fc65759f7c1da9828988acb68..2abe8a395b7f4d4aba4b1ce16d35e977b5464bd2 100644 (file)
--- a/input/test/standchen-as5.ly
+++ b/input/test/standchen-as5.ly
@@ -27,7 +27,7 @@
                \translator { 
                        \VoiceContext 
                        beamHeight = ##f 
-                       beamAutoBegin= #(make-moment 0 1)
+                       autoBeamSettings \push (begin * * * *) = #(make-moment 0 1)
                        textEmptyDimension = ##t
                }
        }

diff --git a/input/test/standchen-as9.ly b/input/test/standchen-as9.ly
index 9ac7aaacc5247fef10aa82e0ee2dbefb3e6027d3..84c3c7394b51245cca137f5fc83269a6e8911988 100644 (file)
--- a/input/test/standchen-as9.ly
+++ b/input/test/standchen-as9.ly
@@ -27,7 +27,7 @@
                \translator { 
                        \VoiceContext 
                        beamHeight = ##f 
-                       beamAutoBegin= #(make-moment 0 1)
+                       autoBeamSettings \push (begin * * * *) = #(make-moment 0 1)
                        textEmptyDimension = ##t
                }
        }

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index bdf6aefe107ca6c8d959e2dc75aab430d19b5800..d703831ed3bd4ed5c9b805ca038621c68c330edd 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -97,8 +97,7 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
   SCM type = gh_list (gh_int2scm (test_mom.num_i ()),
                      gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED);
 
-  // fixme
-  SCM settings = scm_eval2 (ly_symbol2scm ("auto-beam-settings"), SCM_EOL);
+  SCM settings = get_property ("autoBeamSettings");
   
   /*
     Determine end moment for auto beaming (and begin, mostly 0==anywhere) 
@@ -126,14 +125,6 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom)
   */
   
 
-
-  //
-  //
-  // FIXME: arg: why all these guesses in reverse order?
-  // 
-  // 
-
-  
   /*
     first guess: begin beam at any position
   */

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 3cec390b494a312b3c83b2d4294063d00cdc83a8..b7cabd16a911797bc02e9b53532513c1019162df 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -199,9 +199,7 @@ Text_item::brew_molecule (SCM smob)
   
   SCM text = me->get_elt_property ("text");
 
-  SCM properties = gh_list (me->immutable_property_alist_,
-                           me->mutable_property_alist_, SCM_UNDEFINED);
-
+  SCM properties = Font_interface::font_alist_chain (me);
   Molecule mol = Text_item::text2molecule (me, text, properties);
 
   SCM space = me->get_elt_property ("word-space");

diff --git a/scm/GNUmakefile b/scm/GNUmakefile
index 419ac4c97f5545651d8a2bd290f8dc400e9c352c..c10270ce5764e5dce93d760bca7900bd49a66dda 100644 (file)
--- a/scm/GNUmakefile
+++ b/scm/GNUmakefile
@@ -2,13 +2,10 @@
 
 depth = ..
 
-SCM_FILES = $(wildcard *.scm)
-EXTRA_DIST_FILES = $(SCM_FILES)
-
 INSTALLATION_DIR=$(datadir)/scm/
 INSTALLATION_FILES=$(SCM_FILES)
 
-STEPMAKE_TEMPLATES=install
+STEPMAKE_TEMPLATES=install scm
 
 include $(depth)/make/stepmake.make 
 

diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index 280974bc8fc3fd6c8f1ae6833a75a45c0f29c0ae..ec78e2b2f6238942693cab3b9e2f321bae351f3d 100644 (file)
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -1,46 +1,34 @@
 ;;;
-;;; auto-beam.scm -- Auto-beam settings
+;;; auto-beam.scm -- Auto-beam-engraver settings
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
 ;;; 
 ;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 
-;;; setup for auto-beam engraver
-;;;
-;;; specify generic beam end times
+;;; specify generic beam begin and end times
 
 ;;; format:
 ;;;
-;;;     [time-signature]'beamAutoEnd'[duration]
+;;;   function shortest-duration-in-beam time-signature
 ;;;
 ;;; where
 ;;;
-;;;     time-signature = 'time'[numerator]'_'denominator; eg: 3_4
-;;;     duration = [numerator]'_'denominator; eg: 3_8, _16
+;;;     function = begin or end
+;;;     shortest-duration-in-beam = numerator denominator; eg: 1 16
+;;;     time-signature = numerator denominator, eg: 4 4
 ;;;
+;;; unspecified or wildcard entries for duration or time-signature
+;;; are given by * *
 
-;;; in 3/2 time:
-;;;   end beams each 1/2 note
-;;;   end beams with 16th notes each 1/4 note
-;;;   end beams with 32th notes each 1/8 note
-
+;;; maybe do:  '(end shortest-1 16 time-3 4) ?
 
-;;;
-;;;UGH UGH. 
-;;;
-;;;Fixme: should use an alist
-;;;
-;;;autoBeamSettings = (list
-;;;  (cons (list (make-moment MEASURE) TIME-SIGNATURE) (make-moment INTERVAL)
-;;;  ..
-;;;
-;;;  )
-;;;
-;;;
+;;; in 3 2 time:
+;;;   end beams each 1 2 note
+;;;   end beams with 16th notes each 1 4 note
+;;;   end beams with 32th notes each 1 8 note
 
 (define auto-beam-settings
-  (list
    `(
      ((end * * 3 2) . ,(make-moment 1 2))
      ((end 1 16 3 2) . ,(make-moment 1 4))
@@ -58,9 +46,9 @@
      ((end * * 3 8) . ,(make-moment 3 8))
 
      ;; in common time:
-     ;;   end beams each 1/2 note
-     ;;   end beams with 32th notes each 1/8 note
-     ;;   end beams with 1/8 triplets each 1/4 note
+     ;;   end beams each 1 2 note
+     ;;   end beams with 32th notes each 1 8 note
+     ;;   end beams with 1 8 triplets each 1 4 note
 
      ((end * * 4 4) . ,(make-moment 1 2))
      ((end 1 12 4 4) . ,(make-moment 1 4))
@@ -90,25 +78,26 @@
      ((end * * 12 8) . ,(make-moment 3 8))
      ((end 1 16 12 8) . ,(make-moment 3 8))
      ((end 1 32 12 8) . ,(make-moment 1 8))
-     )))
+     (meta . ,(element-description  "autoBeamSettings"))
+     ))
 
 ;;; Users may override in most cases, simply by issuing
 ;;;
-;;;    ;;; from here on consider ending beam every 1/4 note
-;;;    \property Voice.beamAutoend1_1 = (make-moment 1 4)
+;;;    % from here on consider ending beam every 1 4 note
+;;;    \property Voice.autoBeamSettings \push #'(end * * * *) = #(make-moment 1 4)
 ;;;
-;;;    ;;; no autobeaming
-;;;    \property Voice.beamAuto = f  
+;;;    % no autobeaming
+;;;    \property Voice.beamAuto = ##f  
 ;;;
-;;;or, more globally, by doing:
+;;; or, more globally, by doing:
 ;;;
 ;;; \paper{
 ;;;        \translator{
 ;;;            \VoiceContext
-;;;            ;;; consider ending beam at every 1/2 note
-;;;            beamAutoend1_1 = (make-moment 1 2)
+;;;            % consider ending beam at every 1 2 note
+;;;            autoBeamSettings \push #'(end * * * *) = #(make-moment 1 2)
 ;;;        }
 ;;;    }
 ;;;
-;;; see also input/test/auto-beam-override.ly
+;;; see also input test auto-beam-override.ly
 

diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py
index c6d70e2e4c6a68c63a3a0fd7eb92773586e880fc..8d86614ddb38feee70561aba8a4847fff83c23f7 100644 (file)
--- a/scripts/convert-mudela.py
+++ b/scripts/convert-mudela.py
@@ -544,12 +544,24 @@ if 1:
                if re.search ('\\\\textscript "[^"]* *"[^"]*"', str):
                        sys.stderr.write ('\nNot smart enough to convert to new \\textscript markup text')
 
-               str = re.sub ('\\textscript +\("[^"]*"\)', '\\textscript #\1', str)
+               str = re.sub ('\\textscript +("[^"]*")', '\\textscript #\\1', str)
 
                return str
        
        conversions.append ((1,3,97), conv, 'ChordName -> ChordNames')
 
+if 1:
+       def conv (str):
+               str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str)
+               str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str)
+               str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str)
+               str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str)
+
+
+               return str
+       
+       conversions.append ((1,3,102), conv, 'beamAutoEnd -> autoBeamSettings \\push (end * * * *)')
+
 ############################
        
 

diff --git a/stepmake/stepmake/scm-rules.make b/stepmake/stepmake/scm-rules.make
new file mode 100644 (file)
index 0000000..841db19
--- /dev/null
+++ b/stepmake/stepmake/scm-rules.make
@@ -0,0 +1,2 @@
+
+#empty

diff --git a/stepmake/stepmake/scm-targets.make b/stepmake/stepmake/scm-targets.make
new file mode 100644 (file)
index 0000000..841db19
--- /dev/null
+++ b/stepmake/stepmake/scm-targets.make
@@ -0,0 +1,2 @@
+
+#empty

diff --git a/stepmake/stepmake/scm-vars.make b/stepmake/stepmake/scm-vars.make
new file mode 100644 (file)
index 0000000..115a05f
--- /dev/null
+++ b/stepmake/stepmake/scm-vars.make
@@ -0,0 +1,7 @@
+
+SCM_FILES := $(wildcard *.scm)
+
+SOURCE_FILES += $(SCM_FILES)
+
+TAGS_FILES += $(SCM_FILES)
+