From 6ccdc6b9d82b8772dc0f457da3ec9df35a928282 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 11 Dec 2004 16:16:26 +0000 Subject: [PATCH] (substitute_char): Rename, rewrite, modify this. (upper_string, lower_string, reverse_string): Remove. --- ChangeLog | 3 ++ flower/include/string.hh | 13 +++------ flower/string.cc | 61 +++++++++------------------------------- lily/all-font-metrics.cc | 17 +++++------ lily/font-metric.cc | 4 +-- lily/open-type-font.cc | 2 ++ 6 files changed, 33 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2143e7cac..ef7e2641f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-12-11 Jan Nieuwenhuizen + * flower/string.cc (substitute_char): Rename, rewrite, modify this. + (upper_string, lower_string, reverse_string): Remove. + * configure.in (fontforge): Reinstate version check. * ly/engraver-init.ly: Fix clef glyph names. diff --git a/flower/include/string.hh b/flower/include/string.hh index 252fdb48f2..b3f08e6738 100644 --- a/flower/include/string.hh +++ b/flower/include/string.hh @@ -71,8 +71,8 @@ public: /// String s = "abc"; String (char const* source); - String (Byte const* byte, int length_i); - + String (Byte const* byte, int length_i); + /// return "new"-ed copy of contents Byte* get_copy_byte () const; char* get_copy_str0 () const; @@ -105,13 +105,8 @@ public: /// return n rightmost chars String right_string (int n) const; - /// return uppercase of *this - String upper_string () const; - /// return lowercase of *this - String lower_string () const; - /// return the "esrever" of *this - String reversed_string () const; + void reverse (); /// return a piece starting at index (first char = index_i 0), length n String cut_string (int index_i, int n) const; @@ -153,7 +148,7 @@ public: /// convert to a double double to_double () const; - String substituted (char text, String sub) const; + void substitute_char (char text, String sub); }; /* diff --git a/flower/string.cc b/flower/string.cc index beb445f255..2df83ba95b 100644 --- a/flower/string.cc +++ b/flower/string.cc @@ -234,7 +234,7 @@ String::index (char c) const find a substring. @return -1 index of leftmost occurrence of #searchfor# + index of leftmost occurrence of #searchfor# */ int String::index (String searchfor) const @@ -246,8 +246,8 @@ String::index (String searchfor) const if (p) return p - me; - else - return -1; + + return -1; } /** find chars of a set. @@ -317,9 +317,7 @@ String::nomid_string (int index_i, int n) const if (n <= 0) return *this; - return - left_string (index_i) + - right_string (length () - index_i - n) ; + return left_string (index_i) + right_string (length () - index_i - n); } String @@ -340,41 +338,23 @@ String::cut_string (int index_i, int n) const return String (to_bytes () + index_i, n); } -String -String::upper_string () const -{ - String str = *this; - str.to_upper (); - return str; -} + void String::to_upper () { - char *s = (char*)strh_.get_bytes (); - strnupr (s ,length ()); + strnupr (get_str0 (), length ()); } void String::to_lower () { - char* s = strh_.get_str0 (); - strnlwr (s,length ()); + strnlwr (get_str0 (), length ()); } - -String -String::lower_string () const +void +String::reverse () { - String str = *this; - str.to_lower (); - return str; -} -String -String::reversed_string () const -{ - String str = *this; - strrev (str.get_bytes (), str.length ()); - return str; + strrev (get_bytes (), length ()); } int @@ -397,7 +377,6 @@ operator << (ostream& os, String d) return os; } - void String::print_on (ostream& os) const { @@ -409,21 +388,9 @@ String::print_on (ostream& os) const } #endif - -String -String::substituted (char chr, String sub) const +void +String::substitute_char (char chr, String sub) { - Byte const* t = this->to_bytes (); - - String accumulator; - int n = length(); - for (int i = 0; i < n; i++) - { - if (t[i] == chr) - accumulator += sub; - else - accumulator += String_convert::char_string (t[i], 1); - } - - return accumulator; + for (int i = index (chr); i > -1; i = index (chr)) + *this = left_string (i) + sub + right_string (length () - i - 1); } diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 63658d6be3..a73e22a2fc 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -8,7 +8,7 @@ #include "all-font-metrics.hh" -#include "open-type-font.hh" +//#include "open-type-font.hh" #include "config.hh" #include "main.hh" #include "warn.hh" @@ -17,7 +17,7 @@ #include "scm-hash.hh" #include "kpath.hh" -static const char *default_font_str0_ = "cmr10"; +static char const *default_font_str0_ = "cmr10"; All_font_metrics::All_font_metrics (String path) { @@ -120,6 +120,7 @@ All_font_metrics::find_afm (String name) return dynamic_cast (unsmob_metrics (val)); } +#if 0 Open_type_font* All_font_metrics::find_otf (String name) @@ -153,7 +154,7 @@ All_font_metrics::find_otf (String name) return dynamic_cast (unsmob_metrics (val)); } - +#endif Tex_font_metric* All_font_metrics::find_tfm (String name) @@ -200,13 +201,13 @@ All_font_metrics::find_tfm (String name) Font_metric* All_font_metrics::find_font (String name) { - Font_metric *f = find_otf (name); - + //Font_metric *f = find_otf (name); + Font_metric *f = 0; if (!f && - (name.left_string (4) == "feta") - || (name.left_string (8) == "parmesan") - || (name.left_string (2) == "lm")) + (name.left_string (4) == "feta" + || (name.left_string (8) == "parmesan") + || (name.left_string (2) == "lm"))) { f = find_afm (name); if (!f) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index cbaa78603c..2e25dfac9c 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -35,9 +35,7 @@ Font_metric::coding_scheme () const Stencil Font_metric::find_by_name (String s) const { - // FIXME: past tense in func name? - // $23 = 0x865ba10 "clefsMG_change" - s = s.substituted ('-', "M"); + s.substitute_char ('-', "M"); int idx = name_to_index (s); Box b; diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index f053f441b4..ac30e89b70 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -7,6 +7,7 @@ */ +#if 0 #include "warn.hh" #include "open-type-font.hh" @@ -66,3 +67,4 @@ Open_type_font::get_design_size () const { return 20.0; } +#endif -- 2.39.5