release: 0.1.41

[lilypond.git] / flower / string-convert.cc

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index ab7c6ab3e666bcdfb3ef2e95dbf244689e392e5e..23ab488cf3d776e80496dbf9351abd1e61dd5850 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -31,8 +31,8 @@ String_convert::bin2hex_str (String bin_str)
   Byte const* byte_C = bin_str.byte_C();
   for (int i = 0; i < bin_str.length_i(); i++) 
     {
-       str += (char)nibble2hex_byte (*byte_C >> 4);
-       str += (char)nibble2hex_byte (*byte_C++);
+      str += (char)nibble2hex_byte (*byte_C >> 4);
+      str += (char)nibble2hex_byte (*byte_C++);
     }
   return str;
 }
@@ -51,8 +51,8 @@ String_convert::bin2_u (String bin_str)
   unsigned result_u = 0;
   for (int i = 0; i < bin_str.length_i(); i++) 
     {
-       result_u <<= 8;
-       result_u += (Byte)bin_str[ i ];
+      result_u <<= 8;
+      result_u += (Byte)bin_str[ i ];
     }
   return result_u;
 }
@@ -62,7 +62,7 @@ int
 String_convert::dec2_i (String dec_str)
 {
   if (!dec_str.length_i())
-       return 0;
+    return 0;
 
   long l = 0;
   int conv = sscanf (dec_str.ch_C(), "%ld", &l);
@@ -76,7 +76,7 @@ String_convert::i64_str (I64 i64, char const* fmt)
 {
   char buffer[STRING_BUFFER_LEN];
   snprintf (buffer, STRING_BUFFER_LEN,
-            (fmt ? fmt : "%Ld"), i64);     // assume radix 10
+           (fmt ? fmt : "%Ld"), i64);     // assume radix 10
   return String (buffer);
 
 }
@@ -85,7 +85,7 @@ double
 String_convert::dec2_f (String dec_str)
 {
   if (!dec_str.length_i())
-       return 0;
+    return 0;
   double d = 0;
   int conv = sscanf (dec_str.ch_C(), "%lf", &d);
   assert (conv);
@@ -96,7 +96,7 @@ int
 String_convert::hex2bin_i (String hex_str, String& bin_str_r)
 {
   if (hex_str.length_i() % 2)
-      hex_str = "0" + hex_str;
+    hex_str = "0" + hex_str;
 
   bin_str_r = "";
   Byte const* byte_C= hex_str.byte_C();
@@ -106,7 +106,7 @@ String_convert::hex2bin_i (String hex_str, String& bin_str_r)
       int high_i = hex2nibble_i (*byte_C++);
       int low_i = hex2nibble_i (*byte_C++);
       if (high_i < 0 || low_i < 0)
-          return 1; // illegal char
+       return 1; // illegal char
       bin_str_r += String ((char)(high_i << 4 | low_i), 1 );
       i += 2;
     }
@@ -117,8 +117,8 @@ String
 String_convert::hex2bin_str (String hex_str)
 {
   String str;
-//  silly, asserts should alway be "on"!
-//    assert (!hex2bin_i (hex_str, str) );
+  //  silly, asserts should alway be "on"!
+  //    assert (!hex2bin_i (hex_str, str) );
   int error_i = hex2bin_i (hex_str, str);
   assert (!error_i);
   return str;
@@ -128,11 +128,11 @@ int
 String_convert::hex2nibble_i (Byte byte)
 {
   if (byte >= '0' && byte <= '9')
-      return byte - '0';
+    return byte - '0';
   if (byte >= 'A' && byte <= 'F')
-      return byte - 'A' + 10;
+    return byte - 'A' + 10;
   if (byte >= 'a' && byte <= 'f')
-      return byte - 'a' + 10;
+    return byte - 'a' + 10;
   return -1;
 }
 
@@ -142,7 +142,7 @@ String_convert::i2dec_str (int i, int length_i, char ch)
 {
   char fill_ch = ch;
   if (fill_ch)
-      fill_ch = '0';
+    fill_ch = '0';
 
   // ugh
   String dec_str (i);
@@ -158,13 +158,13 @@ String_convert::u2hex_str (unsigned u, int length_i, char fill_ch)
 {
   String str;
   if (!u)
-       str = "0";
+    str = "0";
 
 #if 1 // both go...
   while (u) 
     {
-       str = String ((char)((u % 16)["0123456789abcdef"] ) ) + str;
-       u /= 16;
+      str = String ((char)((u % 16)["0123456789abcdef"] ) ) + str;
+      u /= 16;
     }
 #else
   str += int_str (u, "%x");    // hmm. %lx vs. %x -> portability?
@@ -172,7 +172,7 @@ String_convert::u2hex_str (unsigned u, int length_i, char fill_ch)
 
   str = String (fill_ch, length_i - str.length_i()) + str;
   while ((str.length_i() > length_i) &&  (str[ 0 ] == 'f' ) )
-       str = str.mid_str (2, INT_MAX);
+    str = str.cut (2, INT_MAX);
 
   return str;
 }
@@ -187,9 +187,9 @@ Byte
 String_convert::nibble2hex_byte (Byte byte)
 {
   if ((byte & 0x0f) <= 9 )
-       return (byte & 0x0f) + '0';
+    return (byte & 0x0f) + '0';
   else
-       return (byte & 0x0f) - 10 + 'a';
+    return (byte & 0x0f) - 10 + 'a';
 }
 /**
   Convert an integer to a string
@@ -202,7 +202,7 @@ String_convert::int_str (int i, char const* fmt)
 {
   char buffer[STRING_BUFFER_LEN];
   snprintf (buffer, STRING_BUFFER_LEN,
-            (fmt ? fmt : "%d"), i);     // assume radix 10
+           (fmt ? fmt : "%d"), i);     // assume radix 10
   return String (buffer);
 }
 
@@ -221,7 +221,7 @@ String_convert::double_str (double f, char const* fmt)
 }
 
 /**
-  Make a string from a single character.
+Make a string from a single character.
 
   @param
   #n# is a repetition count, default value is 1
@@ -245,12 +245,12 @@ String_convert::rational_str (Rational r)
   String s = n;
   if (r.denominator() != 1) 
     {
-       char * d = Itoa (r.denominator());
-       s +=  String ('/') + String (d);
-       //delete d;
+      char * d = Itoa (r.denominator());
+      s +=  String ('/') + String (d);
+      //delete d;
     }
-/*    delete n;
-  */
+  /*    delete n;
+   */
   return s;
 }
 
@@ -261,3 +261,41 @@ String_convert::pointer_str (void const *l)
   snprintf (buffer, STRING_BUFFER_LEN, "%p", l);     // assume radix 10
   return String (buffer);
 }
+
+/**
+  Convert a double to a string.
+
+  @param
+  #n# is the number of nonzero digits
+ */
+String
+String_convert::precision_str (double x, int n)
+{
+  String format = "%." + String (0 >? n - 1) + "e";
+  String str = double_str (abs (x), format.ch_C ());
+
+  int exp = str.right_str (3).value_i ();
+  str = str.left_str (str.len () - 4);
+
+  while (str[str.len () - 1] == '0')
+    str = str.left_str (str.len () - 1);
+  if (str[str.len () - 1] == '.')
+    str = str.left_str (str.len () - 1);
+
+  if (exp == 0)
+    return (sign (x) > 0 ? str : "-" + str);
+
+  str = str.left_str (1) + str.cut (2, INT_MAX);
+  int dot = 1 + exp;
+  if (dot <= 0)
+    str = "0." + String ('0', -dot) + str;
+  else if (dot >= str.len ())
+    str += String ('0', dot - str.len ());
+  else if (( dot > 0) && (dot < str.len ()))
+    str = str.left_str (dot) + '.' + str.cut (dot, INT_MAX);
+  else
+    assert (0);
+
+  return (sign (x) > 0 ? str : "-" + str);
+}
+