Auto*ify dvi and dvi/dvilib

Tue Dec 21 21:45:43 2004  Soeren Sandmann  <sandmann@redhat.com>

	* Makefile.am:
	* dvi/dvilib/Makefile.am:
	* dvi/Makefile.am:
	* configure.ac: Auto*ify dvi and dvi/dvilib

	* dvi/Makefile: Remove from CVS

	* dvi/dvilib/dl-pkfont.cc (unpack_bitmap): Fix uchar/uint
	confusion.

	* dvi/dvilib/dl-fontdefinition.{cc,hh}: New DviFontMap class

	* dvi/dvilib/dl-vffont.{cc,hh}: Many bugfixes to VF code.

1 files changed, 37 insertions, 0 deletions

diff --git a/dvi/dvilib/dl-dvi-fontdefinition.cc b/dvi/dvilib/dl-dvi-fontdefinition.cc
index 553ea28..6a4979b 100755
--- a/dvi/dvilib/dl-dvi-fontdefinition.cc
+++ b/dvi/dvilib/dl-dvi-fontdefinition.cc
@@ -1,3 +1,40 @@
 #include "dl-dvi-fontdefinition.hh"
 
+#include <iostream>
+
 using namespace DviLib;
+
+DviFontdefinition *
+DviFontMap::get_fontdefinition (int fontnum)
+{
+    cout << "getting fontnum " << fontnum << endl;
+    return fontmap[fontnum];
+}
+
+void
+DviFontMap::set_fontdefinition (int fontnum,
+				DviFontdefinition *fd)
+{
+    fd->ref();
+
+    
+    cout << "froot " << fontnum << (int)this << endl;
+    
+    if (fontmap[fontnum])
+    {
+	cout << "blah" << endl;
+	fontmap[fontnum]->unref();
+    }
+    
+    fontmap[fontnum] = fd;
+}
+
+DviFontMap::~DviFontMap ()
+{
+    typedef map <int, DviFontdefinition *>::iterator It;
+
+    for (It i = fontmap.begin(); i != fontmap.end(); ++i)
+    {
+	(*i).second->unref();
+    }
+}