release: 0.1.31

[lilypond.git] / lily / tex.cc

diff --git a/lily/tex.cc b/lily/tex.cc
index 470dd49ea69077a038e235d4777b7be758f1502f..19285561c1296280fa5923ae3c44d8e416e6a8a6 100644 (file)
--- a/lily/tex.cc
+++ b/lily/tex.cc
@@ -8,46 +8,42 @@
 
 #include "dimen.hh"
 #include "tex.hh"
-#include "symbol.hh"
+#include "atom.hh"
 #include "varray.hh"
 
 String
-vstrut(Real h)
+vstrut (Real h)
 {
-    return String("\\vrule height ") + print_dimen(h) + "depth 0pt width 0pt";
+  return String ("\\vrule height ") + print_dimen (h) + "depth 0pt width 0pt";
 }
 
 
 static void
-substitute_arg(String& r, String arg)
+substitute_arg (String& r, String arg)
 {
-    int p = r.index_i('%');
-    if (p < 0)
+  int p = r.index_i ('%');
+  if (p < 0)
        return ;
 
-    r = r.left_str(p) + arg + r.right_str(r.length_i() - p -1);
+  r = r.left_str (p) + arg + r.right_str (r.length_i() - p -1);
 }
 
 
 String
-substitute_args(String source, Array<String> args)    
+substitute_args (String source, Array<String> args)    
 {
-    String retval (source);
-    for (int i = 0 ; i < args.size(); i++)
-        substitute_arg(retval, args[i]);
-    /*
-    while (retval.index_i('%') >= 0)
-        substitute_arg(retval, "");
-       */
-    return retval;
+  String retval (source);
+  for (int i = 0 ; i < args.size(); i++)
+      substitute_arg (retval, args[i]);
+  return retval;
 }
 
 String
-substitute_args(String source, Array<Scalar> args)    
+substitute_args (String source, Array<Scalar> args)    
 {
-    Array<String> sv;
-    for (int i = 0 ; i < args.size(); i++)
-       sv.push(args[i]);
-    
-    return substitute_args(source, sv);
+  Array<String> sv;
+  for (int i = 0 ; i < args.size(); i++)
+       sv.push (args[i]);
+  
+  return substitute_args (source, sv);
 }