release: 0.1.39

[lilypond.git] / lily / tex-beam.cc

diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc
index 193e6d4e6f42f8089053191ecc4110e109139abf..d756461a6ff784f8e979605f3fd3de83fe9d4316 100644 (file)
--- a/lily/tex-beam.cc
+++ b/lily/tex-beam.cc
@@ -19,14 +19,14 @@
 #include "debug.hh"
 #include "lookup.hh"
 #include "misc.hh"
+#include "main.hh"
 
 Atom
 Lookup::beam_element (int sidx, int widx, Real slope) const
 {
-  char dir_char = slope >0 ? 'u' : 'd';
-  String name = dir_char + String("slope");
-  Atom bs=(*symtables_)("beamslopes")->lookup (name);
-  
+  String name = String("slope");
+  Atom bs=(*symtables_p_)("beamslopes")->lookup (name);
+
   Array<String> args;
   args.push (sidx);
   args.push (widx);
@@ -38,29 +38,11 @@ Lookup::beam_element (int sidx, int widx, Real slope) const
   return bs;
 }
 
-// ugh.. hard wired tex-code.
-static int
-slope_index (Real &s)
-{
-  if (abs (s) > 0.5)
-    {
-      WARN << "beam steeper than 0.5 (" << s << ")\n";
-      s = sign (s) * 0.5;
-    }
-
-  int i = int (rint (s *  20.0));
-
-  s = i/20.0;
-  if (s>0)
-    return 6*i;
-  else
-    return -6 * i;
-}
 
 Atom
 Lookup::rule_symbol (Real height, Real width) const
 {
-  Atom bs=(*symtables_)("beamslopes")->lookup ("horizontal");    
+  Atom bs=(*symtables_p_)("beamslopes")->lookup ("horizontal");
   Array<String> args;
   args.push (print_dimen (height));
   args.push (print_dimen (width));
@@ -70,28 +52,61 @@ Lookup::rule_symbol (Real height, Real width) const
   return bs;
 }
 
+Atom 
+Lookup::beam(Real &slope, Real width, Real y_thick) const
+{
+  if (postscript_global_b)
+    {
+      return ps_beam (slope, width, y_thick);
+    }
+  else
+    return tex_beam(slope, width);
+}
+
 Atom
-Lookup::beam (Real &slope, Real width) const
-{        
-  int sidx = slope_index (slope);
-  if (!slope)
-    return rule_symbol (2 PT, width);
+Lookup::ps_beam (Real  slope, Real width, Real y_thickness)const
+{
+  Atom ret;
+  String ps(String (width) + " "+ String(slope) 
+           + " " + String(y_thickness) + " draw_beam");
+  ret.tex_ = String("\\embeddedps{" + ps + "}");
+  ret.dim_[X_AXIS] = Interval(0, width);
+  ret.dim_[Y_AXIS] = Interval(0, slope * width + y_thickness);
+  return ret;
+}
+
+Atom
+Lookup::tex_beam (Real &slope, Real width) const
+{
+  const Real MAX_SLOPE = 0.6;
+  const Real SLOPES = 20.0;
+  int sidx = 0;
+  if (abs (slope) > MAX_SLOPE)
+    {
+      WARN << _("beam too steep (") << slope << ")\n";
+      slope = sign (slope) * MAX_SLOPE;
+    }
+
+  sidx = int (rint (slope / MAX_SLOPE *  SLOPES));
+  slope = MAX_SLOPE * sidx / SLOPES;
 
-  Interval xdims = (*symtables_)("beamslopes")->lookup ("uslope").dim_[X_AXIS];
+  Interval xdims = (*symtables_p_)("beamslopes")->lookup ("slope").dim_[X_AXIS];
   Real min_wid = xdims[LEFT];
   Real max_wid = xdims[RIGHT];
+  assert(max_wid > 0);
+  int widths = intlog2 (int (max_wid/min_wid)) + 1;
 
-  if (width < min_wid) 
+  if (width < min_wid)
     {
-      WARN<<"Beam too narrow. (" << print_dimen (width) <<")\n";
+      WARN<<_("Beam too narrow. (") << print_dimen (width) <<")\n";
       width = min_wid;
     }
+
   Real elemwidth = max_wid;
-  int widx = intlog2 (int (max_wid/min_wid));
 
+  int widx  =widths - 1;
   Molecule m;
-  
-  while (elemwidth > width) 
+  while (elemwidth > width)
     {
       widx --;
       elemwidth /= 2.0;
@@ -99,9 +114,9 @@ Lookup::beam (Real &slope, Real width) const
   Real overlap = elemwidth/4;
   Real last_x = width - elemwidth;
   Real x = overlap;
-  Atom elem (beam_element (sidx, widx, slope));
+  Atom elem (beam_element (sidx * widths, widx, slope));
   m.add (elem);
-  while (x < last_x) 
+  while (x < last_x)
     {
       Atom a(elem);
       a.translate (Offset (x-overlap, (x-overlap)*slope));
@@ -111,13 +126,11 @@ Lookup::beam (Real &slope, Real width) const
   Atom a(elem);
   a.translate (Offset (last_x, (last_x) * slope));
   m.add (a);
-  
+
   Atom ret;
   ret.tex_ = m.TeX_string();
   ret.dim_.y() = Interval (0,width*slope);
   ret.dim_.x() = Interval (0,width);
-  
+
   return ret;
 }
-
-