lilypond-0.1.28

diff --git a/NEWS b/NEWS
index 45eba4d92bbd3f3c3b3197a31ce0b04c4f3dbf0e..94c3a8d3159d3f29a3c813a8e578f4ab31073380 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,22 @@
 
+
+pl 28
+       - revised Staff_symbol::brew_molecule_p ()
+       - naming: \makelilytitle
+       - fixes for TeX titledefs (thanks, (?))
+       - junked some obsolete pedal stuff.
+
+pl 27.om-je-te-helpen-met-je-ps-spul.jcn1
+       - embedded slurs:
+         * bf: placements
+         * added \embeddedtex
+         * postscript is default
+         * fixed \embeddedps
+         * fixed mf: draw_slur
+         * postscript macro: draw_slur
+
+********
+oct 28
 pl 27
        - -t/--test switch for experimental stuff.
        - bf: debian optimize is not with 'z'

diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index ea365069b2afa019f309b309c95c289d970de084..05ff03a0891e8d8ca5d7278bf2baf54259ec360f 100644 (file)
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -7,6 +7,7 @@
 */
 
 #include <math.h>
+#include "main.hh"
 #include "misc.hh"
 #include "lookup.hh"
 #include "molecule.hh"
@@ -15,7 +16,6 @@
 #include "paper-def.hh"
 #include "string-convert.hh"
 
-#include "main.hh"
 
 static char
 direction_char (Direction y_sign)
@@ -150,29 +150,28 @@ Lookup::slur (int dy , Real &dx, Direction dir) const
   // duh
   // let's try the embedded stuff
   bool embedded_b = experimental_features_global_b;
+  String embed;
   if (embedded_b)
     {
-      // huh, factor 8?
       Real fdy = dy*paper_l_->internote_f ();
       Real fdx = dx;
       String ps = "\\embeddedps{\n";
       // ugh, how bout " /draw_slur { ... } def "
-      ps += String_convert::int_str (fdx) + " " 
-       + String_convert::int_str (fdy) + " "
-       + String_convert::int_str (dir) +
-       " drawslur}";
+      ps += String_convert::double_str (fdx) + " " 
+       + String_convert::double_str (fdy) + " "
+       + String_convert::double_str (dir) +
+       " draw_slur}";
 
       String mf = "\\embeddedmf{\n";
       mf += "input feta-sleur;\n";
       mf += "draw_slur((0,0),";
-      mf += "(" + String_convert::int_str (fdx) + "," 
-       + String_convert::int_str (fdy) + "),";
-      mf += String_convert::int_str (dir) + ");\n";
+      mf += "(" + String_convert::double_str (fdx) + "," 
+       + String_convert::double_str (fdy) + "),";
+      mf += String_convert::double_str (dir) + ");\n";
       mf += "end.\n";
-      ps += "}\n";
+      mf += "}\n";
 
-      s.tex_ = ps + mf;
-      return s;
+      embed = ps + mf;
     }
 
   Direction y_sign = (Direction) sign (dy);
@@ -188,7 +187,13 @@ Lookup::slur (int dy , Real &dx, Direction dir) const
 
   if (large)
     {
-      return big_slur (dy, dx, dir);
+      s = big_slur (dy, dx, dir);
+      if (embedded_b)
+        {
+         s.tex_ = "\\embeddedtex{\n" + s.tex_ + "\n}\n";
+         s.tex_ += embed;
+        }
+      return s;
     }
   Real orig_dx = dx;
   int widx = int (floor (dx/4.0)); // slurs better too small..
@@ -234,6 +239,11 @@ Lookup::slur (int dy , Real &dx, Direction dir) const
   assert (idx < 256);
   f+=String ("{") + String (idx) + "}";
   s.tex_ = f;
+  if (embedded_b)
+    { 
+      s.tex_ = "\\embeddedtex{\n" + s.tex_ + "\n}\n";
+      s.tex_ += embed;
+    }
 
   s.translate_axis (dx/2, X_AXIS);
   return s;

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 4bd3ab3d5d666085b163c4f59547b99427f45aaa..71c7001f76d4d9a185b1f5df022360bb94952d2f 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -51,7 +51,6 @@
 \parindent=0pt
 \newdimen\smallspace
 \newdimen\interlinedist
-\newdimen\ledgerlinethickness
 \newdimen\stemthickness
 \newcount\n
 \newdimen\balkheight
@@ -106,7 +105,6 @@
         % We know better
         \staffrulethickness=0.1\interlinedist
         \stemthickness=\staffrulethickness
-        \ledgerlinethickness=2\staffrulethickness
 }
 
 % stacked numbers; may be overruled in fetdefs
@@ -121,29 +119,6 @@
 \input taupindefs
 %\input eglerdefs
 
-\musicmathdef\cup{91} % \cup
-\musicmathdef\wedge{94} % \wedge
-\musicmathdef\striepke{0} % heu?
-
-%% custom characters --- this should go: add to (meta!) font
-% \def\myheel{\kern-.5ex\vbox{\cup}\kern-.5ex}
-% \def\mytoe{\kern-.5ex\vbox{\wedge}\kern-.5ex}
-\def\myheel{\vbox{\cup}}
-\def\mytoe{\vbox{\wedge}}
-% \def\mystriepke{\kern-1.1ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.1ex}
-\def\mystriepke{\kern-1.8ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.8ex}
-
-\def\heel{\vbox{\myheel}}
-\def\toe{\vbox{\mytoe}}
-\def\backorfront{\mystriepke}
-
-\def\bheel{\vbox{\myheel\mystriepke}}
-\def\btoe{\vbox{\mytoe\mystriepke}}
-\def\fheel{\vbox{\mystriepke\myheel}}
-\def\ftoe{\vbox{\mystriepke\mytoe}}
-\def\heeltoe{\vbox{\myheel\mytoe}}
-\def\toeheel{\vbox{\mytoe\myheel}}
-%%
 
 \def\emptybar{}
 
@@ -202,31 +177,6 @@
 \def\hslurcharu#1{{\hslurufont\char#1}}
 \def\hslurchard#1{{\hslurdfont\char#1}}
 
-\def\lines#1#2#3{%
- \vbox{\kern-\interstaffrule
-        \n=0\nointerlineskip%
-        \loop\ifnum\n<#1\advance\n by1%
-                \kern\interstaffrule
-                \nointerlineskip
-                \vbox to 0pt{\hrule height .5#3 depth .5#3 width#2%
-                        \vss}\nointerlineskip
-                \repeat
-        }}
-
-%%
-% Ugh. Need to redo this. Wish we had PS.
-%
-\def\topledgerlines#1#2{\dist#1
-        \topalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}}
-
-\def\botledgerlines#1#2{\dist#1
-        \botalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}}
-
-%
-% a staffsymbol with #1 lines, width #2
-% bottom at baseline
-\def\linestafsym#1#2{\leftalign{\botalign{\lines{#1}{#2}{\staffrulethickness}}}}
-
 \def\stem#1#2{\hbox{\kern -.5\stemthickness
         \vrule width\stemthickness height#2 depth-#1}}