lilypond-1.2.4

diff --git a/lib/binary-source-file.cc b/lib/binary-source-file.cc
index fbece6c65e25db177393b9d04ad4d15658769809..c114b816484691368674d1b37bbfbb672aa39fd7 100644 (file)
--- a/lib/binary-source-file.cc
+++ b/lib/binary-source-file.cc
@@ -17,7 +17,7 @@
 #include "string-convert.hh"
 
 Binary_source_file::Binary_source_file (String& filename_str)
-       : Source_file (filename_str)
+  : Source_file (filename_str)
 {
 }
 
@@ -28,36 +28,36 @@ Binary_source_file::~Binary_source_file ()
 String
 Binary_source_file::error_str (char const* pos_ch_C) const
 {
-    assert (this);
-    if (!in_b (pos_ch_C))
-       return "";
-
-    char const* begin_ch_C = pos_ch_C - 8 >? ch_C ();
-    char const* end_ch_C = pos_ch_C + 7 <? ch_C () + length_i ();
-
-    String pre_str ((Byte const*)begin_ch_C, pos_ch_C - begin_ch_C);
-    pre_str = String_convert::bin2hex_str (pre_str);
-    for (int i = 2; i < pre_str.length_i (); i += 3)
-       pre_str = pre_str.left_str (i) + " " + pre_str.cut_str (i, INT_MAX);
-    String post_str ((Byte const*)pos_ch_C, end_ch_C - pos_ch_C);
-    post_str = String_convert::bin2hex_str (post_str);
-    for (int i = 2; i < post_str.length_i (); i += 3)
-       post_str = post_str.left_str (i) + " " + post_str.cut_str (i, INT_MAX);
-
-    String str = pre_str
-       + to_str ('\n')
-       + to_str (' ', pre_str.length_i () + 1) 
-       + post_str;
-    return str;
+  assert (this);
+  if (!in_b (pos_ch_C))
+    return "";
+
+  char const* begin_ch_C = pos_ch_C - 8 >? ch_C ();
+  char const* end_ch_C = pos_ch_C + 7 <? ch_C () + length_i ();
+
+  String pre_str ((Byte const*)begin_ch_C, pos_ch_C - begin_ch_C);
+  pre_str = String_convert::bin2hex_str (pre_str);
+  for (int i = 2; i < pre_str.length_i (); i += 3)
+    pre_str = pre_str.left_str (i) + " " + pre_str.cut_str (i, INT_MAX);
+  String post_str ((Byte const*)pos_ch_C, end_ch_C - pos_ch_C);
+  post_str = String_convert::bin2hex_str (post_str);
+  for (int i = 2; i < post_str.length_i (); i += 3)
+    post_str = post_str.left_str (i) + " " + post_str.cut_str (i, INT_MAX);
+
+  String str = pre_str
+    + to_str ('\n')
+    + to_str (' ', pre_str.length_i () + 1) 
+    + post_str;
+  return str;
 }
 
 int
 Binary_source_file::line_i (char const* pos_ch_C) const
 {
-    if (!in_b (pos_ch_C))
-       return 0;
+  if (!in_b (pos_ch_C))
+    return 0;
 
-    return pos_ch_C - ch_C ();
+  return pos_ch_C - ch_C ();
 }
 
 U8

diff --git a/stepmake/configure b/stepmake/configure
index efa10adb72d60efb63366650a9e0cdb2d501d829..c20bd4b8c62503712afe1a1bf4a4da9ffed89c94 100755 (executable)
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -53,10 +53,6 @@ fi
 # Derek Quinn Wyatt   98-08-21  (adapted from Jan Nieuwenhuizen's code)
 
 
-
-
-
-
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -609,7 +605,7 @@ fi
     stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
 
     echo $ac_n "checking Package""... $ac_c" 1>&6
-echo "configure:613: checking Package" >&5
+echo "configure:609: checking Package" >&5
     if test "x$PACKAGE" = "xSTEPMAKE"; then
        echo "$ac_t""Stepmake package!" 1>&6
        (cd stepmake; rm -f stepmake; ln -s ../stepmake .)
@@ -637,7 +633,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
     else
         echo "$ac_t""$PACKAGE" 1>&6
        echo $ac_n "checking for stepmake""... $ac_c" 1>&6
-echo "configure:641: checking for stepmake" >&5
+echo "configure:637: checking for stepmake" >&5
        # Check for installed stepmake
        if test -d $stepmake; then
            echo "$ac_t""$stepmake" 1>&6
@@ -760,7 +756,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:764: checking host system type" >&5
+echo "configure:760: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -785,7 +781,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:789: checking for $ac_word" >&5
+echo "configure:785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -820,7 +816,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:824: checking for $ac_word" >&5
+echo "configure:820: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -857,7 +853,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:861: checking for $ac_word" >&5
+echo "configure:857: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -892,7 +888,7 @@ test -n "$TAR" || TAR="error"
        # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:896: checking for $ac_word" >&5
+echo "configure:892: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -932,7 +928,7 @@ fi
        # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:936: checking for $ac_word" >&5
+echo "configure:932: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -969,7 +965,7 @@ fi
        # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:973: checking for $ac_word" >&5
+echo "configure:969: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1010,7 +1006,7 @@ fi
     # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
 set dummy ${PYTHON:-python}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1014: checking for $ac_word" >&5
+echo "configure:1010: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1177,7 +1173,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1181: checking language" >&5    
+echo "configure:1177: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;
@@ -1210,7 +1206,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1214: checking for $ac_word" >&5
+echo "configure:1210: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1245,7 +1241,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1249: checking for $ac_word" >&5
+echo "configure:1245: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1280,7 +1276,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1284: checking for $ac_word" >&5
+echo "configure:1280: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1315,7 +1311,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1319: checking for $ac_word" >&5
+echo "configure:1315: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1349,7 +1345,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1353: checking for $ac_word" >&5
+echo "configure:1349: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1384,7 +1380,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1388: checking for $ac_word" >&5
+echo "configure:1384: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1419,7 +1415,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1423: checking for $ac_word" >&5
+echo "configure:1419: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1454,7 +1450,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1458: checking for $ac_word" >&5
+echo "configure:1454: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1513,7 +1509,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1517: checking for $ac_word" >&5
+echo "configure:1513: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else