patch::: 1.4.4.jcn3

1.4.4.jcn3

diff --git a/CHANGES b/CHANGES
index ed0d05237876f4b5c567c60e524008904f2178a3..a24a79ed303adb99b9447a1def3b32c6298707c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
-1.4.4.jcn2
+1.4.4.jcn3
 ==========
 
+TODO: look at other filledbox'es (stafflines and barlines don't match up).
+
+* Testing code off by default.  On: -e "(define ps-testing 1)" -fps
+
+* Output via TeX/dvips still gives problems.  Use direct postscript
+output for real testing.
+
 * Beam and stem fixes:
  - Stems drawn in PostScript (should do all filledbox'es in PS?).
  - Fixes for draw_box and draw_beam PostScript routines.

diff --git a/Documentation/misc/CHANGES-1.3 b/Documentation/misc/CHANGES-1.3
index 864e359b6db1b37f11c221231e9efeeba20a3633..476a69dc152670ca6a6f55b4c9a17cb15f85a1d9 100644 (file)
--- a/Documentation/misc/CHANGES-1.3
+++ b/Documentation/misc/CHANGES-1.3
@@ -41,7 +41,7 @@ dvips are stored in outdir.
 * PO updates.
 
 * petite-ouverture-a-danser.ly bugfix, twinkle.ly bugfix
-V
+
 1.3.153
 =======
 
@@ -363,7 +363,7 @@ staff.
 
 * Add a check for regular identifiers to parser.
 
-1.3.145
+1.3.146
 =======
 
 * Make and ly2dvi fixes.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 8a0b07f13c55d0ebe03ec82cb27f0f52bbee7869..6bdfb552b685e66052d496d0d84b29d6d7fc7745 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -500,8 +500,9 @@ Bugs that are not fault of LilyPond are documented here.
 
 Flex (2.5.4a-11) in unstable does not produce g++-3.0 compliant C++
 code.  To compile LilyPond with gcc-3.0 you may do:
+
 @example
-        CC=gcc-3.0 CXX=g++-3.0 ./configure
+        CC=gcc-3.0 CXX=g++-3.0 ./configure --enable-config=gcc-3.0
         make conf=gcc-3.0 -C lily out-gcc-3.0/lexer.cc
         patch -p1 < lexer-gcc-3.0.patch
         make conf=gcc-3.0 -C lily

diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi
index 5110fb12e229cd228513892300343e1f305fab82..dc2b06439d9ff8913eefe56b5e0cf41acab13caa 100644 (file)
--- a/Documentation/windows/compiling.texi
+++ b/Documentation/windows/compiling.texi
@@ -19,11 +19,19 @@ webpage}.  You may need the patch @file{guile-1.4-gnu-windows.patch}
 included in LilyPond's source distribution.
 @end table
 
+@subsection Cross compiling
+
 These binaries are cross compiled for Windows on a GNU/Linux box.  You
 may want to check out the
 @uref{http://www.lilypond.org/gnu-windows/cross.tar.gz,cross compilation
 scripts}.
 
+@subsection Compiling on Windows
+
+Compiling on Windows should be possible, but how should we now?  If you
+have any experiences you want to share, please do so at
+@uref{http://lilypond.org/wiki?CompilingOnWindows,Compiling on Windows}.
+Or write to one of the mailing lists.
 
 @section Windows installation specifics
 

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index 9f2fa8bf9b3759eae578a16ed0c01f18dada128e..a06bc0e4769286fd94339f9a1bfc3868eadc995c 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -90,7 +90,8 @@ and try again.
 @subsection Trouble
 
 For problems and solutions see
-@uref{Troubleshooting Windows,http://lilypond.org/TroubleshootingWindows}.
+@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
+Windows}
 
 
 @subsection Additional software

diff --git a/VERSION b/VERSION
index 31dbd0d4c761c85817723b3a4f8ebf307d240d4f..9da0ef98d4996036c98cdc932ea2c20d297e5af6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=4
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/trills.ly b/input/test/trills.ly
new file mode 100644 (file)
index 0000000..ab7cc17
--- /dev/null
+++ b/input/test/trills.ly
@@ -0,0 +1,42 @@
+\header {
+  texidoc="Document trills, pralls and turns"
+  title="Marques des agr\'ements et leur signification"
+  copyright="(1689)"
+}
+
+\score {
+  <
+    \property Score.TimeSignature = \turnOff
+    \context GrandStaff <
+      \context Staff=upper \notes\relative c'' {
+       \time 1/4
+       c4-\prallprall
+       \time 3/8
+       c4.^"TODO"
+       c4.-\downprall
+       c4.-\upprall
+       \time 5/8
+       c4-\turn c4.-\upprall
+      }
+      \context Lyrics=one \lyrics {
+       "Tremblement"4
+       "Tremblement"4.
+       "Cadence"
+       "autre"
+       "Double"4 "cadence"4.
+      }
+      \context Lyrics=two \lyrics {
+       "simple"4
+       "appuy\'e"4.
+      }
+      \context Staff=lower \notes\relative c'' {
+        % autobeamer has som problems here
+       [\repeat unfold 4 { d32 c }]
+       d8~[\repeat unfold 4 { d32 c }]
+       d32 c b c \repeat unfold 4 { d32 c }
+       b32 c d c \repeat unfold 4 { d32 c }
+       [c32( b a16 b )c] [b32 c d c \repeat unfold 4 { d32 c }]
+      }
+    >
+  >
+}
\ No newline at end of file

diff --git a/lily/beam.cc b/lily/beam.cc
index 57f5a508bf1224e017f7aad1e48a1ffe8604b796..2f314fa422b4e2bad640ae5ea1bae309ab7d7505 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -813,13 +813,19 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev,
        but let's make sure two half-beams never touch
        */
 
-      // FIXME: TODO stem width
-      Real w = here->relative_coordinate (0, X_AXIS) - prev->relative_coordinate (0, X_AXIS);
+      // FIXME: TODO (check) stem width / sloped beams
+      Real w = here->relative_coordinate (0, X_AXIS)
+       - prev->relative_coordinate (0, X_AXIS);
+      Real stem_w = gh_scm2double (prev->get_grob_property ("thickness"))
+       // URG
+       * me->paper_l ()->get_var ("stafflinethickness");
+
       w = w/2 <? nw_f;
       Molecule a;
       if (lhalfs)              // generates warnings if not
-       a =  Lookup::beam (dydx, w, thick);
+       a =  Lookup::beam (dydx, w + stem_w, thick);
       a.translate (Offset (-w, -w * dydx));
+      //a.translate_axis (stem_w/2, X_AXIS);
       for (int j = 0; j  < lhalfs; j++)
        {
          Molecule b (a);

diff --git a/lily/main.cc b/lily/main.cc
index b4c78117336d973c18b0d6e881a2a7730f9ff3d9..ccf5ab3923bf0c8f3699069a248bc490ba432b75 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -101,6 +101,7 @@ static Getopt_long *oparser_p_static = 0;
        follow regular localisation guidelines).
  */
 static Long_option_init options_static[] = {
+  /* print example usage:  lilypond -e "(set-lily-option 'help 0)" ? */
   {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
   /* another bug in option parser: --output=foe is taken as an abbreviation
      for --output-format */

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index 8b26f5ece06577277492eda00c38253de8e5fe49..b98327d1a37cc797a7c8f6176833b238cdc3c4ea 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -53,13 +53,20 @@ Switch on any experimental features.  Not for general public use.
 SCM
 set_lily_option (SCM var, SCM val)
 {
+  /*
+    Scheme option usage:
+    lilypond -e "(set-lily-option 'help 0)"
+   */
   if (var == ly_symbol2scm ("help"))
     {
       cout << '\n';
       cout << _ ("Scheme options:");
-      cout << "help"; 
-      cout << "midi-debug (boolean)"; 
-      cout << "testing-level (int)"; 
+      cout << '\n';
+      cout << "  help (any-symbol)"; 
+      cout << '\n';
+      cout << "  midi-debug (boolean)"; 
+      cout << '\n';
+      cout << "  testing-level (int)"; 
       cout << '\n';
       exit (0);
     }

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index aa3c2cc3824680b9a9f4841b99c6c74c8b148186..86b39dff6b754c49f764d3bfe3d2e3285fea34c0 100644 (file)
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -3,11 +3,6 @@
 % Functions for direct and embedded PostScript
 
 
-%%
-/testing true def
-
-
-
 % FIXME: set with individual symbols
 % round cappings 
 1 setlinecap

diff --git a/scm/ps.scm b/scm/ps.scm
index a288c77446442a499f6da8efddb9ed819b6fd519..8e4dc95ecf0c0ca408d9755387887914f23dc98d 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -126,6 +126,7 @@
      " {exch pop //systemdict /run get exec} "
      (ly-gulp-file "music-drawing-routines.ps")
      "{ exch pop //systemdict /run get exec } "
+     (if (defined? 'ps-testing) "\n /testing true def" "")
     ))
   
   (define (lily-def key val)

diff --git a/scm/tex.scm b/scm/tex.scm
index 3321bb9c95fe88fda58a0bf7c19544cbf2b0e701..c002a22b3f3dea5eb4445d47818e04e3a851167f 100644 (file)
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -97,13 +97,14 @@
   (define (header-end)
     (string-append
      "\\special{\\string! "
-
+     
      ;; URG: ly-gulp-file: now we can't use scm output without Lily
      (if use-regex
         ;; fixed in 1.3.4 for powerpc -- broken on Windows
         (regexp-substitute/global #f "\n"
                                   (ly-gulp-file "music-drawing-routines.ps") 'pre " %\n" 'post)
         (ly-gulp-file "music-drawing-routines.ps"))
+     (if (defined? 'ps-testing) "/testing true def%\n" "")
      "}"
      "\\input lilyponddefs\\newdimen\\outputscale \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript"))