From a1bce83e51d1b4a040359562b271dfbcd52702cc Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:04:45 +0000
Subject: [PATCH] lilypond-0.1.41

---
 init/paper16.ly   |  4 ++--
 init/paper20.ly   |  4 ++--
 lily/bar.cc       |  2 +-
 lily/paper-def.cc |  4 ++--
 lily/tex-slur.cc  | 27 +++++++++++++++++++++------
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/init/paper16.ly b/init/paper16.ly
index 98ee62688d..06aa523fa2 100644
--- a/init/paper16.ly
+++ b/init/paper16.ly
@@ -13,8 +13,8 @@ paper sizes.
 %}
 paper_sixteen = \paper {
 	linewidth = 15.5 \cm;
-	rule_thickness = 0.4\pt;
-	bar_size = 16.0 \pt;
+	rulethickness = 0.4\pt;
+	barsize = 16.0 \pt;
 	interline = 4.\pt;
 	notewidth = 5.93\pt; % ugh, see table16 for sizes
 	wholewidth = 8.64\pt;
diff --git a/init/paper20.ly b/init/paper20.ly
index e4bd6bfb00..8e30c48c1a 100644
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -4,8 +4,8 @@
 
 paper_twenty = \paper {
 	linewidth = 15.0 \cm;
-	rule_thickness = 0.4\pt;
-	bar_size = 20.0 \pt;
+	rulethickness = 0.4\pt;
+	barsize = 20.0 \pt;
 	interline = 5.\pt;
 	notewidth = 7.15\pt; % ugh see table20 for sizes
 	wholewidth = 10.44\pt;
diff --git a/lily/bar.cc b/lily/bar.cc
index 14b5310099..87a654100e 100644
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -36,7 +36,7 @@ Bar::brew_molecule_p() const
 {    
   Paper_def *p = paper();
   Atom s = p->lookup_l()->bar (type_str_, 
-			       p->get_var ("bar_size"));
+			       p->get_var ("barsize"));
   
   Molecule*output = new Molecule (Atom (s));
   return output;
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 052f0c48d9..c3568f1b4d 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -116,7 +116,7 @@ Paper_def::interline_f() const
 Real
 Paper_def::rule_thickness() const
 {
-  return get_var ("rule_thickness");
+  return get_var ("rulethickness");
 }
 
 Real
@@ -164,9 +164,9 @@ String
 Paper_def::TeX_output_settings_str () const
 {
   String s("\n ");
-  s +=  lookup_p_->texsetting + "%(Tex id)\n";
   for (Assoc_iter<String,Real> i (*real_vars_p_); i.ok(); i++)
     s += String ("\\def\\mudelapaper") + i.key () + "{" + i.val () + "}\n";
+  s +=  lookup_p_->texsetting + "%(Tex id)\n";
   return s;
 }
 
diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index eb140c4768..b0c67cf95b 100644
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -127,7 +127,6 @@ Lookup::half_slur (int dy, Real &dx, Direction dir, int xpart) const
   assert (idx < 256);
   f+=String ("{") + String (idx) + "}";
 
-
   s.tex_ = f;
 
   return s;
@@ -143,12 +142,28 @@ Lookup::ps_slur (Real dy , Real dx, Real dir) const
     + String_convert::double_str (dir) +
     " draw_slur}";
 
-  String mf = "\\embeddedmf{\n";
+  /*
+   slurs are rarely wider than 100pt: 
+   precision of 3 yields maximum (slur spanning page)
+   error of: 1%% * 6*72pt === 0.4pt = 0.14 mm
+   */
+  String dx_str = String_convert::precision_str (dx, 4);
+  String dy_str = String_convert::precision_str (dy, 3);
+  String dir_str = String_convert::int_str ((int)dir);
+  String name = "feta-sleur-" + dx_str + "-" + dy_str + "-" + dir_str;
+  int i = name.index_i ('.');
+  while (i != -1)
+    {
+      *(name.ch_l () + i) = 'x';
+      i = name.index_i ('.');
+    }
+
+  String mf = "\\embeddedmf{" + name + "}{\n";
+  mf += "staffsize\\#:=" 
+    + String_convert::int_str ((int)paper_l_->get_var ("barsize"), "%d")
+    + "pt\\#;\n";
   mf += "input feta-sleur;\n";
-  mf += "draw_slur((0,0),";
-  mf += "(" + String_convert::double_str (dx) + "," 
-    + String_convert::double_str (dy) + "),";
-  mf += String_convert::double_str (dir) + ");\n";
+  mf += "drawslur(" + dx_str + "," + dy_str + "," + dir_str + ");\n";
   mf += "end.\n";
   mf += "}\n";
 
-- 
2.39.5