(Module):

new file.

diff --git a/ChangeLog b/ChangeLog
index 3c4f9c46c03d795ddefec971fd4f91135bc6cb22..33acfab1416f8b65143cf0b07ab067643e943921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/*.cc: various fixes for substr(ARG).
+
+       * lily/sustain-pedal.cc (print): 
+
        * flower/file-name.cc (slashify): use std strings.
 
        * flower/string-convert.cc: remove publib.h

diff --git a/flower/file-path.cc b/flower/file-path.cc
index bf3f921aacc9a6d6352af23db176a2a4f67c82c3..ff35abfaec25c0a7fb0334ada336ff69e6954fc0 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -37,6 +37,11 @@ File_path::directories () const
   return dirs_;
 }
 
+/*
+  TODO: use split_string.
+  
+ */
+
 #include <algorithm>
 void
 File_path::parse_path (std::string p)

diff --git a/flower/string.cc b/flower/string.cc
index 47cf6f11f21bbeaa932fc37315efd7c3b438bb87..e210ea21730cfe42e814b2b167fd0eac97b0448a 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -420,3 +420,4 @@ String::substitute (char find, char replace)
 }
 
 #endif /* !STD_STRING */
+

diff --git a/input/regression/alignment-vertical-manual-setting.ly b/input/regression/alignment-vertical-manual-setting.ly
index 17c332a18e01c865a6c8cd81ef58cc3a1e709b44..dc51ba16cf31d28951d07b60c300200a001c30af 100644 (file)
--- a/input/regression/alignment-vertical-manual-setting.ly
+++ b/input/regression/alignment-vertical-manual-setting.ly
@@ -6,6 +6,8 @@
 
 }
 
+\version "2.7.29"
+
 \book {
   \score {
     \relative c'' \new StaffGroup <<

diff --git a/input/test/font-table.ly b/input/test/font-table.ly
index 6bb5ef83a235d660dbb5bd1526a5ae51e7a6a7ad..7c1be04a016d2d0f12978bdc6cf1a4b9b3538821 100644 (file)
--- a/input/test/font-table.ly
+++ b/input/test/font-table.ly
@@ -9,6 +9,8 @@
   evenFooterMarkup = \markup {}
   }
 
+\version "2.7.29"
+
 #(define (doc-char name)
   (make-line-markup
    (list

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 0a4db9346160b2648accf5d6f10b1026b9c304c3..11ed6df0c6aaa94f1d3bd2b6aaca3c5d0eee60b9 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -855,7 +855,7 @@ scan_fraction (std::string frac)
 {
        ssize i = frac.find ('/');
        std::string left = frac.substr (0, i);
-       std::string right = frac.substr (i - 1);
+       std::string right = frac.substr (i + 1, (frac.length () - i + 1));
 
        int n = String_convert::dec2int (left);
        int d = String_convert::dec2int (right);

diff --git a/lily/main.cc b/lily/main.cc
index 15a7d6f74249fdb76fed733245ecb8665a17cf59..3ea52240a6413be49418359bb6c7c6f7fb9cb5d3 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -503,7 +503,7 @@ parse_argv (int argc, char **argv)
            if (eq != NPOS)
              {
                key = arg.substr (0, eq);
-               val = arg.substr (eq + 1);
+               val = arg.substr (eq + 1, key.length () - 1);
              }
 
            init_scheme_variables

diff --git a/lily/misc.cc b/lily/misc.cc
index 607cbe99534ccc246d421cf725bec332144b643a..ee5dd51fda048d1b96167d4a4167d7035b506a27 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -45,7 +45,7 @@ split_string (std::string s, char c)
 
       if (i == 0)
        {
-         s = s.substr (1);
+         s = s.substr (1, s.length () -1);
          continue;
        }
 
@@ -53,7 +53,7 @@ split_string (std::string s, char c)
        i = s.length ();
 
       rv.push (s.substr (0, i));
-      s = s.substr (i);
+      s = s.substr (i, s.length () - i);
     }
 
   return rv;

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index da0f1022d2a744a52f37d20221add4cfbe96bbf4..674ed68724555ff4acebeee9d5cf07ede5239231 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -173,11 +173,15 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, std::string str) c
 
       ssize slash_idx = name.rfind ('/');
       if (slash_idx != NPOS)
-       name = name.substr (slash_idx - 1);
-
+       {
+         slash_idx ++; 
+         name = name.substr (slash_idx,
+                             name.length () - slash_idx);
+       }
+      
       std::string initial = name.substr (0, 1);
       initial = String_convert::to_upper (initial);
-      name = name.substr (1);
+      name = name.substr (1, name.length () - 1);
       name = String_convert::to_lower (name);
       ps_name = initial + name;
     }

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 894f9d0db9dc0260bdf16670660ac5325869885a..dc53b307adb84b864ed229f854563f426cc40d71 100644 (file)
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -179,7 +179,7 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   std::string varstr = ly_scm2string (scm_symbol_to_string (var));
   if (varstr.substr (0, 3) == std::string ("no-"))
     {
-      var = ly_symbol2scm (varstr.substr (3).c_str ());
+      var = ly_symbol2scm (varstr.substr (3, varstr.length () -3).c_str ());
       val = scm_from_bool (!to_boolean (val));
     }
 

diff --git a/lily/source-file.cc b/lily/source-file.cc
index c350248065cea64211dfe5f73c5a29cd51950f0f..9d4a3db37a10ca98c34d39273a9f49fdb1ac1e64 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -174,7 +174,7 @@ Source_file::quote_input (char const *pos_str0) const
   std::string context = line.substr (0, ch)
     + to_string ('\n')
     + to_string (' ', col)
-    + line.substr (ch);
+    + line.substr (ch, line.length()-ch);
   return context;
 }