From 33dc014ec7a5445fd4e70aeefc8e36421acf435c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 20 Aug 2003 15:30:38 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 2 +- Documentation/topdocs/INSTALL.texi | 6 ++-- flower/include/dictionary.hh | 50 ------------------------------ flower/include/flower-proto.hh | 3 -- lily/include/afm.hh | 5 +-- lily/include/my-lily-lexer.hh | 1 - lily/include/translator.hh | 1 - lily/music-output-def.cc | 1 - lily/translator-ctors.cc | 22 ++++++------- 9 files changed, 18 insertions(+), 73 deletions(-) delete mode 100644 flower/include/dictionary.hh diff --git a/ChangeLog b/ChangeLog index ccda9872b6..123b903197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2003-08-20 Han-Wen Nienhuys +n2003-08-20 Han-Wen Nienhuys * Documentation/ChangeLog-1.5: add back old log. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 65e62ded58..913644d1f8 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -209,9 +209,11 @@ tar -C / -zxf data.tar.gz /usr/share/lilypond/1.8.0/fonts/type1/ tar -C / -zxf data.tar.gz /usr/share/lilypond/1.8.0/dvips/ texhash @end example - If you are installing LilyPond somewhere else, unpack the appropriate -files as shown, and move them to the appropriate paths. +files as shown, and move them to the appropriate paths. Of course, the +.deb version number should correspond to what you are installing. + + If you are doing an upgrade, you should remove all @file{feta} @code{.pk} and @code{.tfm} files. A script has been provided to do the diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh deleted file mode 100644 index f4e8730040..0000000000 --- a/flower/include/dictionary.hh +++ /dev/null @@ -1,50 +0,0 @@ -/* - dictionary.hh -- declare Dictionary - - source file of the Flower Library - - (c) 1997--2003 Han-Wen Nienhuys -*/ - - -#ifndef DICTIONARY_HH -#define DICTIONARY_HH - -#include - -#include "string.hh" - -template -struct Dict_initialiser -{ - char *key_; - V value_; -}; - - -/* - interface to STL function. - */ - -template -class Dictionary : public std::map //map -{ -public: - Dictionary () - { - } - Dictionary (Dict_initialiser *p) - { - for (Dict_initialiser *q = p; q->key_; q++) - (*this) [q->key_] = q->value_; - } - bool elem_b (String s) - { - typename std::map::const_iterator ki (find (s)); - return ki != end (); - } - -}; - - -#endif // DICTIONARY_HH diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh index 2f1e01e88e..c654c96dc7 100644 --- a/flower/include/flower-proto.hh +++ b/flower/include/flower-proto.hh @@ -16,9 +16,6 @@ template struct Array; template struct Assoc; template struct Hash_table; template struct Hash_table_iter; -template struct Dictionary_iter; -template struct Dictionary; -template struct Dictionary_iter; template struct Link_list; template struct Interval_t; template struct PQueue; diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 01982d5c99..c3bb9a8cec 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -11,10 +11,11 @@ #ifndef AFM_HH #define AFM_HH +#include + #include "string.hh" #include "box.hh" #include "array.hh" -#include "dictionary.hh" #include "font-metric.hh" #include "parse-afm.hh" @@ -34,7 +35,7 @@ struct Adobe_font_metric : Font_metric unsigned int checksum_; protected: Array ascii_to_metric_idx_; - Dictionary name_to_metric_dict_; + std::map name_to_metric_dict_; virtual Molecule find_by_name (String) const; diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index f4eae8ca4a..b548b4a23b 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -12,7 +12,6 @@ #include "includable-lexer.hh" #include "input.hh" -#include "dictionary.hh" #include "lily-proto.hh" #include "flower-proto.hh" #include "array.hh" diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 64a7aba4ec..eaafa53145 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -131,7 +131,6 @@ classname::static_translator_description () const \ -extern Dictionary *global_translator_dict; void add_translator (Translator*trans); Translator*get_translator (String s); diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index 082270c0b6..e8ae40ccfd 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -8,7 +8,6 @@ #include "scm-hash.hh" -#include "dictionary.hh" #include "warn.hh" #include "music-output-def.hh" #include "global-translator.hh" diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 3c3a1d7552..9eb51e7c68 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -7,21 +7,18 @@ */ #include "translator.hh" -#include "dictionary.hh" +#include #include "warn.hh" /* should delete these after exit. - */ +*/ -/* - UGH. Dictionary is deprecated - */ -Dictionary *global_translator_dict=0; +std::map *global_translator_dict=0; LY_DEFINE(get_all_translators,"ly:get-all-translators", 0, 0, 0, (), "Return an list of a all translator objects that may be instantiated " -" during a lilypond run.") + " during a lilypond run.") { SCM l = SCM_EOL; for (std::map::const_iterator (ci (global_translator_dict->begin())); @@ -36,18 +33,19 @@ void add_translator (Translator *t) { if (!global_translator_dict) - global_translator_dict = new Dictionary; + global_translator_dict = new std::map; - (*global_translator_dict)[classname (t)] = t; + (*global_translator_dict)[classname (t)] = t; } Translator* get_translator (String s) { - if (global_translator_dict->elem_b (s)) + if (global_translator_dict->find (s) != + global_translator_dict->end ()) { - Translator* t = (*global_translator_dict)[s]; - return t; + Translator* t = (*global_translator_dict)[s]; + return t; } error (_f ("unknown translator: `%s'", s)); -- 2.39.5