Remove copy of DejaVu font and prioritize helvetica

Dynamically adding and removing directories to/from the font-path
is a bad idea, so remove our own copy of the DejaVu font and use
Helvetica if it is available. This makes rendered fonts a bit
more bearable.

diff --git a/Makefile b/Makefile
index dc804a4c9923af3533ba3bbcb8610dbccddfd535..d502fdd766e156e71cfca3a4a911bd24e65e5945 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ APPLICATIONSDIR=$(PREFIX)/share/applications
 
 INSTALL=install
 
 
 INSTALL=install
 

-DIRS=  $(DESTDIR)/$(DATADIR)/res/sounds $(DESTDIR)/$(DATADIR)/res/dejavu-lgc \
+DIRS=  $(DESTDIR)/$(DATADIR)/res/sounds \

        $(DESTDIR)/$(DATADIR)/images $(DESTDIR)/$(DATADIR)/cities \
        $(DESTDIR)/$(LIBEXECDIR) $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(DOCDIR) \
        $(DESTDIR)/$(PIXMAPDIR) $(DESTDIR)/$(APPLICATIONSDIR)
        $(DESTDIR)/$(DATADIR)/images $(DESTDIR)/$(DATADIR)/cities \
        $(DESTDIR)/$(LIBEXECDIR) $(DESTDIR)/$(BINDIR) $(DESTDIR)/$(DOCDIR) \
        $(DESTDIR)/$(PIXMAPDIR) $(DESTDIR)/$(APPLICATIONSDIR)


@@ -70,7 +70,7 @@ install-bin:
        echo "cd $(DATADIR) && exec $(LIBEXECDIR)/sim \"\$$@\"" >>$(DESTDIR)/$(BINDIR)/micropolis
        chmod 755 $(DESTDIR)/$(BINDIR)/micropolis
 
        echo "cd $(DATADIR) && exec $(LIBEXECDIR)/sim \"\$$@\"" >>$(DESTDIR)/$(BINDIR)/micropolis
        chmod 755 $(DESTDIR)/$(BINDIR)/micropolis
 

-install-res: install-res-sounds install-res-dejavu-lgc
+install-res: install-res-sounds

        for file in $(RES); do \
                install -m 0644 $$file $(DESTDIR)/$(DATADIR)/$$file; \
        done
        for file in $(RES); do \
                install -m 0644 $$file $(DESTDIR)/$(DATADIR)/$$file; \
        done


@@ -78,9 +78,6 @@ install-res: install-res-sounds install-res-dejavu-lgc
 install-res-sounds:
        find res/sounds -type f -name \*.wav -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/res/sounds/ \;
 
 install-res-sounds:
        find res/sounds -type f -name \*.wav -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/res/sounds/ \;
 

-install-res-dejavu-lgc:
-       find res/dejavu-lgc -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/ \;
-

 install-images:
        find images -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/images/ \;
 
 install-images:
        find images -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(DATADIR)/images/ \;
 


@@ -101,11 +98,6 @@ uninstall:
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/player
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/*.wav
        -rmdir $(DESTDIR)/$(DATADIR)/res/sounds
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/player
        rm -f $(DESTDIR)/$(DATADIR)/res/sounds/*.wav
        -rmdir $(DESTDIR)/$(DATADIR)/res/sounds

-       rm -f $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/*ttf \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.alias \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.dir \
-               $(DESTDIR)/$(DATADIR)/res/dejavu-lgc/fonts.scale
-       -rmdir $(DESTDIR)/$(DATADIR)/res/dejavu-lgc

        for file in $(RES); do \
                rm $(DESTDIR)/$(DATADIR)/$$file; \
        done
        for file in $(RES); do \
                rm $(DESTDIR)/$(DATADIR)/$$file; \
        done


@@ -121,5 +113,5 @@ uninstall:
        rm -f $(DESTDIR)/$(PIXMAPDIR)/micropolis.png
 
 .PHONY: all clean install install-dirs install-bin install-res \
        rm -f $(DESTDIR)/$(PIXMAPDIR)/micropolis.png
 
 .PHONY: all clean install install-dirs install-bin install-res \

-       install-res-sounds install-res-dejavu-lgc install-images \
+       install-res-sounds install-images \

        install-cities install-doc install-desktop uninstall tcl tk tclx sim
        install-cities install-doc install-desktop uninstall tcl tk tclx sim

diff --git a/README b/README
index 2a4a8558d232de2b84e045bd32293ef21acd66cf..5b42e41f9323bbef1482df54000640eda6b318fb 100644 (file)
--- a/README
+++ b/README
@@ -101,12 +101,6 @@ by other people.  We gratefully acknowledge the authors and thank them
 for their generosity in sharing their software with us and the world.
 Such software includes:
 
 for their generosity in sharing their software with us and the world.
 Such software includes:
 

-       res/dejavu-lgc/         Font for use in Sugar Micropolis
-               
-http://dejavu.sourceforge.net
-Fonts are (c) Bitstream (see below). DejaVu changes are in public
-domain. Glyphs imported from Arev fonts are (c) Tavmjung Bah.
-

        src/sim/rand.c          Random Number Generator
        src/sim/random.c        Random Number Generator
 
        src/sim/rand.c          Random Number Generator
        src/sim/random.c        Random Number Generator
 

diff --git a/res/dejavu-lgc/DejaVuLGCSans-Bold.ttf b/res/dejavu-lgc/DejaVuLGCSans-Bold.ttf
deleted file mode 100644 (file)
index 2fb94ed..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSans-Bold.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf b/res/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf
deleted file mode 100644 (file)
index 4204838..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSans-ExtraLight.ttf b/res/dejavu-lgc/DejaVuLGCSans-ExtraLight.ttf
deleted file mode 100644 (file)
index bf6fe1c..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSans-ExtraLight.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSans-Oblique.ttf b/res/dejavu-lgc/DejaVuLGCSans-Oblique.ttf
deleted file mode 100644 (file)
index e260494..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSans-Oblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSans.ttf b/res/dejavu-lgc/DejaVuLGCSans.ttf
deleted file mode 100644 (file)
index fc21908..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSans.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansCondensed-Bold.ttf b/res/dejavu-lgc/DejaVuLGCSansCondensed-Bold.ttf
deleted file mode 100644 (file)
index 806e797..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansCondensed-Bold.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansCondensed-BoldOblique.ttf b/res/dejavu-lgc/DejaVuLGCSansCondensed-BoldOblique.ttf
deleted file mode 100644 (file)
index 45c02ce..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansCondensed-BoldOblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansCondensed-Oblique.ttf b/res/dejavu-lgc/DejaVuLGCSansCondensed-Oblique.ttf
deleted file mode 100644 (file)
index 0e3626c..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansCondensed-Oblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansCondensed.ttf b/res/dejavu-lgc/DejaVuLGCSansCondensed.ttf
deleted file mode 100644 (file)
index 8b1081a..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansCondensed.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf b/res/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
deleted file mode 100644 (file)
index b55beca..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf b/res/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf
deleted file mode 100644 (file)
index b17ef8b..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf b/res/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf
deleted file mode 100644 (file)
index 368ed67..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSansMono.ttf b/res/dejavu-lgc/DejaVuLGCSansMono.ttf
deleted file mode 100644 (file)
index c2de2e3..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSansMono.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerif-Bold.ttf b/res/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
deleted file mode 100644 (file)
index 6dc8ce4..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerif-Bold.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf b/res/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf
deleted file mode 100644 (file)
index a6998d0..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf b/res/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf
deleted file mode 100644 (file)
index 6f8864a..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerif.ttf b/res/dejavu-lgc/DejaVuLGCSerif.ttf
deleted file mode 100644 (file)
index 987c870..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerif.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerifCondensed-Bold.ttf b/res/dejavu-lgc/DejaVuLGCSerifCondensed-Bold.ttf
deleted file mode 100644 (file)
index e2fb188..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerifCondensed-Bold.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerifCondensed-BoldOblique.ttf b/res/dejavu-lgc/DejaVuLGCSerifCondensed-BoldOblique.ttf
deleted file mode 100644 (file)
index 3be9bcf..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerifCondensed-BoldOblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerifCondensed-Oblique.ttf b/res/dejavu-lgc/DejaVuLGCSerifCondensed-Oblique.ttf
deleted file mode 100644 (file)
index 24e3e89..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerifCondensed-Oblique.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/DejaVuLGCSerifCondensed.ttf b/res/dejavu-lgc/DejaVuLGCSerifCondensed.ttf
deleted file mode 100644 (file)
index 320e744..0000000
Binary files a/res/dejavu-lgc/DejaVuLGCSerifCondensed.ttf and /dev/null differ

diff --git a/res/dejavu-lgc/fonts.alias b/res/dejavu-lgc/fonts.alias
deleted file mode 100644 (file)
index a0d2a90..0000000
--- a/res/dejavu-lgc/fonts.alias
+++ /dev/null
@@ -1,144 +0,0 @@
-"-misc-dejavu lgc sans-bold-r-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-r-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-r-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-bold-o-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-bold-o-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-o-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-o-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans-medium-r-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans-medium-r-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-r-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-r-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-bold-o-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-bold-o-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-o-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-o-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--6-60-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--12-120-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--7-70-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--14-140-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--8-80-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--16-160-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--9-90-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--18-180-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--10-100-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--20-200-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--11-110-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--22-220-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--12-120-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--24-240-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--13-130-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--26-260-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--14-140-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--28-280-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--15-150-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--30-300-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--18-180-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--36-360-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans condensed-medium-r-normal--24-240-75-75-p-0-iso8859-1" "-misc-dejavu lgc sans condensed-medium-r-normal--48-480-0-0-p-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--6-60-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--12-120-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--7-70-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--14-140-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--8-80-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--16-160-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--9-90-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--18-180-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--10-100-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--20-200-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--11-110-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--22-220-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--12-120-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--24-240-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--13-130-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--26-260-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--14-140-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--28-280-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--15-150-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--30-300-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--18-180-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--36-360-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-r-normal--24-240-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-r-normal--48-480-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--6-60-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--12-120-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--7-70-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--14-140-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--8-80-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--16-160-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--9-90-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--18-180-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--10-100-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--20-200-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--11-110-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--22-220-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--12-120-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--24-240-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--13-130-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--26-260-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--14-140-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--28-280-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--15-150-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--30-300-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--18-180-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--36-360-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-bold-o-normal--24-240-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-bold-o-normal--48-480-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--6-60-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--12-120-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--7-70-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--14-140-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--8-80-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--16-160-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--9-90-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--18-180-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--10-100-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--20-200-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--11-110-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--22-220-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--12-120-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--24-240-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--13-130-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--26-260-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--14-140-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--28-280-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--15-150-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--30-300-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--18-180-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--36-360-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-o-normal--24-240-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-o-normal--48-480-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--6-60-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--12-120-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--7-70-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--14-140-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--8-80-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--16-160-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--9-90-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--18-180-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--10-100-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--20-200-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--11-110-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--22-220-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--12-120-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--24-240-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--13-130-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--26-260-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--14-140-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--28-280-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--15-150-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--30-300-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--18-180-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--36-360-0-0-m-0-iso8859-1"
-"-misc-dejavu lgc sans mono-medium-r-normal--24-240-75-75-m-0-iso8859-1" "-misc-dejavu lgc sans mono-medium-r-normal--48-480-0-0-m-0-iso8859-1"

diff --git a/res/dejavu-lgc/fonts.dir b/res/dejavu-lgc/fonts.dir
deleted file mode 100644 (file)
index 062a587..0000000
--- a/res/dejavu-lgc/fonts.dir
+++ /dev/null
@@ -1,22 +0,0 @@
-21
-DejaVuLGCSans-Bold.ttf -misc-dejavu lgc sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-BoldOblique.ttf -misc-dejavu lgc sans-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-ExtraLight.ttf -misc-dejavu lgc sans light-extralight-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-Oblique.ttf -misc-dejavu lgc sans-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans.ttf -misc-dejavu lgc sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-Bold.ttf -misc-dejavu lgc sans condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-BoldOblique.ttf -misc-dejavu lgc sans condensed-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-Oblique.ttf -misc-dejavu lgc sans condensed-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed.ttf -misc-dejavu lgc sans condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansMono-Bold.ttf -misc-dejavu lgc sans mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono-BoldOblique.ttf -misc-dejavu lgc sans mono-bold-o-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono-Oblique.ttf -misc-dejavu lgc sans mono-medium-o-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono.ttf -misc-dejavu lgc sans mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSerif-Bold.ttf -misc-dejavu lgc serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif-BoldOblique.ttf -misc-dejavu lgc serif-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif-Oblique.ttf -misc-dejavu lgc serif-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif.ttf -misc-dejavu lgc serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-Bold.ttf -misc-dejavu lgc serif condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-BoldOblique.ttf -misc-dejavu lgc serif condensed-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-Oblique.ttf -misc-dejavu lgc serif condensed-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed.ttf -misc-dejavu lgc serif condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1

diff --git a/res/dejavu-lgc/fonts.scale b/res/dejavu-lgc/fonts.scale
deleted file mode 100644 (file)
index 062a587..0000000
--- a/res/dejavu-lgc/fonts.scale
+++ /dev/null
@@ -1,22 +0,0 @@
-21
-DejaVuLGCSans-Bold.ttf -misc-dejavu lgc sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-BoldOblique.ttf -misc-dejavu lgc sans-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-ExtraLight.ttf -misc-dejavu lgc sans light-extralight-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans-Oblique.ttf -misc-dejavu lgc sans-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSans.ttf -misc-dejavu lgc sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-Bold.ttf -misc-dejavu lgc sans condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-BoldOblique.ttf -misc-dejavu lgc sans condensed-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed-Oblique.ttf -misc-dejavu lgc sans condensed-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansCondensed.ttf -misc-dejavu lgc sans condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSansMono-Bold.ttf -misc-dejavu lgc sans mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono-BoldOblique.ttf -misc-dejavu lgc sans mono-bold-o-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono-Oblique.ttf -misc-dejavu lgc sans mono-medium-o-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSansMono.ttf -misc-dejavu lgc sans mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuLGCSerif-Bold.ttf -misc-dejavu lgc serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif-BoldOblique.ttf -misc-dejavu lgc serif-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif-Oblique.ttf -misc-dejavu lgc serif-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerif.ttf -misc-dejavu lgc serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-Bold.ttf -misc-dejavu lgc serif condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-BoldOblique.ttf -misc-dejavu lgc serif condensed-bold-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed-Oblique.ttf -misc-dejavu lgc serif condensed-medium-o-normal--0-0-0-0-p-0-iso8859-1
-DejaVuLGCSerifCondensed.ttf -misc-dejavu lgc serif condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1

diff --git a/res/micropolis.tcl b/res/micropolis.tcl
index 8c4c36a8420b021a6bf45746432eddcbb0b3794f..1f24900af13ff06b42b76f2c9bd7a5cd24f85b8a 100644 (file)
--- a/res/micropolis.tcl
+++ b/res/micropolis.tcl
@@ -261,7 +261,7 @@ set ScenarioDescX 232
 set ScenarioDescY 170
 set ScenarioDescWidth 280
 set ScenarioDescHeight 285
 set ScenarioDescY 170
 set ScenarioDescWidth 280
 set ScenarioDescHeight 285

-set ScenarioDescFont Large
+set ScenarioDescFont Medium

 set EventLines 5
 
 set screenwidth [winfo screenwidth .]
 set EventLines 5
 
 set screenwidth [winfo screenwidth .]


@@ -298,30 +298,39 @@ if {($screenwidth < $ScenarioPanelWidth) ||
 
 set FontInfo {
   {Big {
 
 set FontInfo {
   {Big {

+       {-*-helvetica-medium-r-normal-*-20-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-90-*}
   }}
   {Large {
        {-*-dejavu lgc sans-medium-r-normal-*-90-*}
   }}
   {Large {

+       {-*-helvetica-medium-r-normal-*-18-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-80-*}
   }}
   {Medium {
        {-*-dejavu lgc sans-medium-r-normal-*-80-*}
   }}
   {Medium {

+       {-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Small {
        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Small {

+       {-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Narrow {
        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Narrow {

+       {-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Tiny {
        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Tiny {

+       {-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Text {
        {-*-dejavu lgc sans-medium-r-normal-*-60-*}
   }}
   {Text {

+       {-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Message {
        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Message {

+       {-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Alert {
        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
   {Alert {

+       {-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*}

        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
 }
        {-*-dejavu lgc sans-medium-r-normal-*-70-*}
   }}
 }


@@ -472,13 +481,6 @@ sprite train 1
 
 sim ResetDynamic
 
 
 sim ResetDynamic
 

-# The next three lines have no effect on the OLPC, where we don't provide
-# the font in res (because it's already in the system fonts).  These lines
-# are for other systems that lack the font.
-set FontPath "[pwd]/res/dejavu-lgc"
-system "xset -fp \"$FontPath\" >/dev/null 2>&1"
-system "xset +fp \"$FontPath\" >/dev/null 2>&1"
-

 # Ignore SIGCHLD for spawned sound-player childs, this should lead to them
 # being reaped by init
 signal ignore SIGCHLD
 # Ignore SIGCHLD for spawned sound-player childs, this should lead to them
 # being reaped by init
 signal ignore SIGCHLD

diff --git a/src/makefile b/src/makefile
index bed6c5a2eb9804f7be19cea3119824b61264e48e..b42cf24774e0a3fb792f091bf900d0a7894893cc 100644 (file)
--- a/src/makefile
+++ b/src/makefile
@@ -106,8 +106,6 @@ xo:  install
        rm -rf BUILDIT
        mkdir BUILDIT
        tar cf - -C ../.. $(TARFILES) | (cd BUILDIT; tar xf -)
        rm -rf BUILDIT
        mkdir BUILDIT
        tar cf - -C ../.. $(TARFILES) | (cd BUILDIT; tar xf -)

-       # The DejaVu fonts are not needed on the XO, only other platforms.
-       rm -rf BUILDIT/micropolis-activity/res/dejavu-lgc

        mv BUILDIT/micropolis-activity BUILDIT/micropolis.activity
        (cd BUILDIT; zip -r ../../../micropolis.xo micropolis.activity)
        rm -rf BUILDIT
        mv BUILDIT/micropolis-activity BUILDIT/micropolis.activity
        (cd BUILDIT; zip -r ../../../micropolis.xo micropolis.activity)
        rm -rf BUILDIT