*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ccda9872b6053273e324c0c58bb9a74f94c5f9e5..123b9031973d43a4e3eb9229ed2c49198b1ac03d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+n2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/ChangeLog-1.5: add back old log.
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 65e62ded582d4160f432677772df5f4d88eb114a..913644d1f813be0801903beb31594994e1c267c2 100644 (file)
--- 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 (file)
index f4e8730..0000000
--- 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 <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef DICTIONARY_HH
-#define DICTIONARY_HH
-
-#include <map>
-
-#include "string.hh"
-
-template <class V>
-struct Dict_initialiser
-{
-  char *key_;
-  V value_;
-};
-
-
-/*
-  interface to STL function.
- */
-
-template <class V>
-class Dictionary : public std::map<String, V> //map<String, V>
-{
-public:
-  Dictionary ()
-    {
-    }
-  Dictionary (Dict_initialiser<V> *p)
-    {
-      for (Dict_initialiser<V> *q = p; q->key_; q++)
-       (*this) [q->key_] = q->value_;
-    }
-  bool elem_b (String s)
-  {
-    typename std::map<String,V>::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 2f1e01e88e5795b313589fb75e3f28d9686cb0b9..c654c96dc75ceb989b906aa47251cb5850ac8aa0 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -16,9 +16,6 @@ template<class T> struct Array;
 template<class T,class K> struct Assoc;
 template<class K, class V> struct Hash_table;
 template<class K, class V> struct Hash_table_iter;
-template<class T> struct Dictionary_iter;
-template<class T> struct Dictionary;
-template<class T> struct Dictionary_iter;
 template<class T> struct Link_list;
 template<class T> struct Interval_t;
 template<class T> struct PQueue;

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index 01982d5c9904dd6dbb02c07da75ea2eb7ca66bb8..c3bb9a8cec6bf19b2727603df929f714cb579af8 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -11,10 +11,11 @@
 #ifndef AFM_HH
 #define AFM_HH
 
+#include <map>
+
 #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<int> ascii_to_metric_idx_;
-  Dictionary<int> name_to_metric_dict_;
+  std::map<String,int> 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 f4eae8ca4a7b9ee5b7fad171f92094401cdbfc44..b548b4a23b88c0d275ce2aa613e7ff69384688a6 100644 (file)
--- 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 64a7aba4ecf4e144a806a7f701a21275885e01dd..eaafa53145a53a04159f04fc05cff7bc80a37968 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -131,7 +131,6 @@ classname::static_translator_description () const \
 
 
 
-extern Dictionary<Translator*> *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 082270c0b66a2ee8df732b65dda1e6b7d69a6ca7..e8ae40ccfd1919e95d36ec65d382d978784e03c1 100644 (file)
--- 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 3c3a1d7552cdc597ff84a342338e1ff0fad36e47..9eb51e7c6813613a84402ead260cc99b249a96aa 100644 (file)
--- a/lily/translator-ctors.cc
+++ b/lily/translator-ctors.cc
@@ -7,21 +7,18 @@
 */
 
 #include "translator.hh"
-#include "dictionary.hh"
+#include <map>
 #include "warn.hh"
 
 /*
   should delete these after exit.
- */
+*/
 
-/*
-  UGH. Dictionary is deprecated
- */
-Dictionary<Translator*> *global_translator_dict=0;
+std::map<String,Translator*> *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<String,Translator*>::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<Translator*>;
+    global_translator_dict = new std::map<String,Translator*>;
 
- (*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));