summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-12-29 09:57:49 +0000
committerKeith Packard <keithp@keithp.com>2004-12-29 09:57:49 +0000
commit2ba729ed3bde6512aaab00b50442b86cb013f94e (patch)
treef9934692dc71bc2c634fcec177008ad1fcefde08
parent192296d852011f4a2abb6e9fd1ee741fa7f81673 (diff)
Reorder utility programs to make sure fc-case is run before fc-lang as
fc-lang uses fcstr.c which uses fccase.h Fix broken XML
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am2
-rw-r--r--fonts.conf.in10
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e0d8b7..e0c8867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2004-12-29 Keith Packard <keithp@keithp.com>
+ * Makefile.am:
+ Reorder utility programs to make sure fc-case is run before fc-lang
+ as fc-lang uses fcstr.c which uses fccase.h
+ * fonts.conf.in:
+ Fix broken XML
+
+2004-12-29 Keith Packard <keithp@keithp.com>
+
* fonts.conf.in:
Adopt some RedHat suggestions for standard font configuration.
diff --git a/Makefile.am b/Makefile.am
index 53c1920..79908fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
# PERFORMANCE OF THIS SOFTWARE.
DOCSRC=@DOCSRC@
-SUBDIRS=fontconfig fc-lang fc-glyphname fc-case src fc-cache fc-list fc-match $(DOCSRC) test
+SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src fc-cache fc-list fc-match $(DOCSRC) test
EXTRA_DIST = \
fontconfig.pc.in \
diff --git a/fonts.conf.in b/fonts.conf.in
index 712cdda..95b5555 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -81,6 +81,7 @@
<family>Kochi Mincho</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
+ <family>MS 明朝</family>
<family>Baekmuk Batang</family>
<family>FreeSerif</family>
<default><family>serif</family></default>
@@ -99,6 +100,7 @@
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
<family>Baekmuk Dotum</family>
<family>SimSun</family>
<family>FreeSans</family>
@@ -169,15 +171,15 @@
<alias>
<family>Times New Roman</family>
<accept><family>Thorndale AMT</family></accept>
- </alias
+ </alias>
<alias>
<family>Arial</family>
<accept><family>Albany AMT</family></accept>
- </alias
+ </alias>
<alias>
<family>Courier New</family>
<accept><family>Cumberland AMT</family></accept>
- </alias
+ </alias>
<!--
Some Asian fonts misadvertise themselves as monospaced when
@@ -275,6 +277,7 @@
<family>Kochi Mincho</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
+ <family>MS 明朝</family>
<family>Baekmuk Batang</family>
<family>FreeSerif</family>
</prefer>
@@ -293,6 +296,7 @@
<family>Kochi Gothic</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
+ <family>MS ゴシック</family>
<family>Baekmuk Dotum</family>
<family>SimSun</family>
<family>FreeSans</family>