patch::: 1.1.3.jcn5: jcn5

pl 3.jcn5
	- bf: dashed-slur
	- bf: LilyIdString
	- more star fixes
	- repeatbar fixes

---
Generated by janneke@gnu.org using package-diff 0.62,
>From = lilypond-1.1.3.jcn4, To = lilypond-1.1.3.jcn5

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.3.jcn5.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.3.jcn4
1.1.3.jcn5
++state

diff --git a/NEWS b/NEWS
index 83cb1ed69779828fa71010e503984a234ceaa38c..6c803b3fac71cd71b0e226a80ffacf863a0b6e68 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,15 @@
---- ../lilypond-1.1.3.jcn3/NEWS        Mon Nov  9 18:07:04 1998
+--- ../lilypond-1.1.3.jcn4/NEWS        Mon Nov  9 21:14:59 1998
+++ b/NEWS      Mon Nov  9 22:53:55 1998
+@@ -1,3 +1,9 @@
+pl 3.jcn5
+       - bf: dashed-slur
+       - bf: LilyIdString
+       - more star fixes
+       - repeatbar fixes
+
+ pl 3.jcn3
+       - GrandStaffContext
+       - mup-to-ly.py: version 0.0--- ../lilypond-1.1.3.jcn3/NEWS      Mon Nov  9 18:07:04 1998
 ++ b/NEWS      Mon Nov  9 21:14:59 1998
 @@ -1,4 +1,5 @@
  pl 3.jcn3

diff --git a/TODO b/TODO
index fdc4b6febd73d9439d6ad1ac94dea36070bd4ae6..a94bbad6d9627b739d057d79052bd782fd11f250 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,8 +8,6 @@ grep for TODO and ugh/ugr/urg
 
 
 BUGS:
-       * repeat bars: strange chars after |: and :|
-
        * latex bla.tex broken (titles / \lilyfooter stuff?)
 
        * --safe:  disallow backslashes, disallow \include.

diff --git a/VERSION b/VERSION
index e2ab1a809ba85d46f1167c069efadbfd7d43a142..e49fb461420f3cc7a1ae90375d5e18b26d7d32ae 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=jcn5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/stars-and-stripes.ly b/input/test/stars-and-stripes.ly
index b9e03b5b5acbd01a9f5c8c5bf7dfa86361f34db6..289fc5acddd6ec133ee3cecd349613fec5587980 100644 (file)
--- a/input/test/stars-and-stripes.ly
+++ b/input/test/stars-and-stripes.ly
@@ -71,6 +71,8 @@ global = \notes {
        \bar "|.";
        }
 
+\include "paper16.ly";
+
 \score{ 
        \type GrandStaff < 
                \type Staff=staffA < 
@@ -92,6 +94,9 @@ global = \notes {
                >
        >
        \paper{
+               \paper_sixteen;
+               textheight = 230.\mm;
+               linewidth= 180.\mm;
                \translator {
                                \GrandStaffContext
                                \accepts "Lyrics";

diff --git a/lily/lookup.cc b/lily/lookup.cc
index acb4a7e84b2fd1fcd995c4c8f93515fa311403fe..300439b3dd0bec0cd7e4cc13e351ba51ad9c61ac 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -178,13 +178,12 @@ Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
     }
 
   // (lambda (o) (dashed-slur o thick dash '(stuff))
-  a.lambda_ = gh_list (gh_append3 (ly_lambda_o (),
-                                 ly_func_o ("dashed-slur"),
-                                 gh_list (gh_double2scm (thick),
-                                          gh_double2scm (dash),
-                                          ly_quote_scm (gh_list (sc[0], sc[1], sc[2], sc[3], SCM_UNDEFINED)),
-                                          SCM_UNDEFINED)
-                                 ), SCM_UNDEFINED);
+  a.lambda_ = 
+    ly_append (ly_lambda_o (),
+    ly_list1 (ly_append (ly_func_o ("dashed-slur"),
+    gh_cons (gh_double2scm (thick), 
+    gh_cons (gh_double2scm (dash),
+    ly_list1 (ly_quote_scm (gh_list (sc[0], sc[1], sc[2], sc[3], SCM_UNDEFINED))))))));
 
   a.str_ = "dashed_slur";
   return a;

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index d071415e7481abd69410b6937a6035e2958b5908..e597ce1f3cec6c2489f744536f45c4a5868f8689 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -243,7 +243,7 @@ output_header (Paper_outputter* p, Scope *head)
     id_str += ".";
   else
     id_str += String (", ") + lily_version_number_sz ();
-  output_def (p, "lily_id_string", id_str);
+  output_def (p, "LilyIdString", id_str);
   
   for (Dictionary_iter<Identifier*> i (*head); i.ok (); i++)
     {

diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make
index 01a06871f449851c95210f460bc32f647bc177f2..4fac9bc0a0a6f5047a6b90b3a8940d3838389a7b 100644 (file)
--- a/stepmake/stepmake/package.make
+++ b/stepmake/stepmake/package.make
@@ -17,8 +17,8 @@ deb:
          dpkg-buildpackage -b; \
        )'
 
-# makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
-makeflags=$(patsubst %==, %, $(patsubst ----%,%,$($(MAKEFLAGS:%=--%):--unix=)))
+makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%)))
+# makeflags=$(patsubst %==, %, $(patsubst ----%,%,$($(MAKEFLAGS:%=--%):--unix=)))
 
 diff:
        $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags)

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 4312a117a8fb2beda1d4d27d5e21c52a579faefb..7b5fbabcc88d48208f1cbfcbfdebe017bc971572 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -166,9 +166,9 @@
 %compatibility
 %urg
 \fetdef\repeatcolon{20}
-\def\repeatbar{\repeatstopbar}
-\def\startrepeat{\repeatstartbar}
-\def\repeatbarstartrepeat{\repeatstopstart}
+\def\repeatbar#1{\repeatstopbar}
+\def\startrepeat#1{\repeatstartbar}
+\def\repeatbarstartrepeat#1{\repeatstopstart}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % parametric symbols