lilypond-0.1.37

diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod
index 0dc1ea97ca27b3ab111960d2174d2c4d305f2278..fdee2203875e88b8ad0c517a2227bad8418b73aa 100644 (file)
--- a/Documentation/lilypond.pod
+++ b/Documentation/lilypond.pod
@@ -61,6 +61,10 @@ Add F<DIRECTORY> to the search path for input files.
 
 Make incompatible mudela version non-fatal.
 
+=item B<--postscript, -p>,
+
+Try to use PostScript where possible.
+
 =back
 
 =head1 FEATURES

diff --git a/bin/make-website.pl b/bin/make-website.pl
index 2f177c29b2e97970acff8dd34b5ec9a53247de10..2159716e965e7f82c4de323c28ea02b98ed683dd 100644 (file)
--- a/bin/make-website.pl
+++ b/bin/make-website.pl
@@ -297,6 +297,7 @@ sub docxx_update
     print BANNER $ban;
     close BANNER;
     my_system("BANNEROPT=\"-B /tmp/lilybanner.html\" $depth/bin/out/make-docxx");
+    unlink "/tmp/lilybanner.html";
 }
 
 sub do_tar
@@ -313,6 +314,12 @@ sub identify
     print STDERR "This is " . $id_str . "\n";
     
 }
+sub clean_tmp
+{
+    @a = </tmp/gs*>;
+    unlink @a;
+}
+    
 sub main
 {
     identify;
@@ -352,6 +359,7 @@ sub main
     edit_index;
     docxx_update;
     do_tar;
+    clean_tmp;
 }
 
 main;

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 94ab8c55118e947336d5e3b9188b5d2e0587e0f8..13f3c8fb7baa3e7616c22d843fe51a502791c60b 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -22,6 +22,7 @@ extern Sources* source_l_g;
 extern bool only_midi;
 extern int exit_status_i_;
 extern bool experimental_features_global_b;
+extern bool postscript_global_b;
 
 extern String default_out_fn;
 

diff --git a/lily/lookup.cc b/lily/lookup.cc
index d2e4c12d9024a0a2ef0faaf411fe823ec9203dd2..8fa26797224dc7681ccbd027b072523c598f1a80 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -159,7 +159,7 @@ Lookup::streepje (int type) const
 Atom
 Lookup::hairpin (Real &wid, bool decresc) const
 {
-  bool embedded_b = experimental_features_global_b;
+  bool embedded_b = postscript_global_b;
   String embed;
   Atom ret;  
   if (embedded_b)
@@ -173,6 +173,12 @@ Lookup::hairpin (Real &wid, bool decresc) const
     }
   else
     {
+      if (wid > 32 * 6 PT)
+       {
+         warning (_("Crescendo too long (") + print_dimen (wid) 
+                  +_( ") shrinking (ugh)"));
+         wid = 32*6 PT;
+       }
       int idx = int (rint (wid / 6 PT));
       if (!idx) idx ++;
       wid = idx*6 PT;
@@ -182,7 +188,6 @@ Lookup::hairpin (Real &wid, bool decresc) const
       Array<String> a;
       a.push (idx);
       ret.tex_ = substitute_args (ret.tex_, a);
-      
     }
   
   ret.dim_.x() = Interval (0,wid);

diff --git a/lily/main.cc b/lily/main.cc
index f88d3a20af05dafef7970610e0b7d2d4097815dc..897c84daaa20dca1b4ebadfe3d720d996831b4e8 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -24,6 +24,7 @@ static bool version_ignore_b = false;
 Sources* source_l_g = 0;
 bool only_midi = false;
 bool experimental_features_global_b = false;
+bool postscript_global_b = false;
 int exit_status_i_;
 
 void destill_inname (String &name_str_r);
@@ -37,6 +38,7 @@ Long_option_init theopts[] = {
   {1, "init", 'i'},
   {1, "include", 'I'},
   {0, "midi", 'M'},
+  {0, "postscript", 'p'},
   {0, "ignore-version", 'V'},
   {0,0,0}
 };
@@ -58,6 +60,7 @@ usage()
     "  -t, --test             switch on experimental features\n"
     "  -M, --midi             produce midi output only\n"
     "  -V, --ignore-version   ignore mudela version\n"
+    "  -p, --postscript       try to use PostScript\n"
     "\n"
     "GNU LilyPond was compiled with the following settings:\n")
 #ifdef NDEBUG
@@ -187,6 +190,9 @@ main (int argc, char **argv)
        case 'V':
          version_ignore_b = true;
          break;
+       case 'p':
+         postscript_global_b = true;
+         break;
        case 'd':
          set_debug (true);
          break;

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 39ada58c3b21402c6ea95d8a30a9f00315aeb09b..4ca78c5993b9cba8cc81d9c278e4c5537dd9758e 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -211,6 +211,8 @@ Paper_score::tex_output ()
 
   if (experimental_features_global_b)
     tex_out << "\\turnOnExperimentalFeatures%\n";
+  if (postscript_global_b)
+    tex_out << "\\turnOnPostScript%\n";
   super_elem_l_->output_all ();
   tex_out << "\n\\EndLilyPondOutput";
   outputter_l_ = 0;

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 0301959589d47170a077ca4bb2680b6076be347a..85d4121aecfe9e2da87dbf4a9be0b5c7b7eb445b 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -66,7 +66,6 @@
 
 
 
-\def\turnOnExperimentalFeatures{
 
 %
 % WARNING: don't leave blank lines in the PS-code; they are
@@ -74,6 +73,13 @@
 %
 
 
+\def\turnOnPostScript{
+\def\embeddedps##1{
+        %
+        % This sets CTM so that you get to the currentpoint
+        % by executing a 0 0 moveto
+        \special{ps: @beginspecial @setspecial ##1 @endspecial}       
+}
 \special{ps:
 /draw_decresc
         {
@@ -99,8 +105,9 @@
         }
         def
 }
+}
 
-
+\def\turnOnExperimentalFeatures{
 % draw a slur in embedded postscript
 \special{ps:
 /xbow 1 3 div def
@@ -164,12 +171,7 @@
 }
 
 \def\embeddedtex#1{#1}
-\def\embeddedps#1{
-        %
-        % This sets CTM so that you get to the currentpoint
-        % by executing a 0 0 moveto
-        \special{ps: @beginspecial @setspecial #1 @endspecial}       
-}
+
 \def\embeddedmf#1{
         \edef\embedid{feta-sleur-\number\embedcount}
         \immediate\openout\embedfile=\embedid.mf