From: Keith Packard <keithp@keithp.com>
Date: Wed, 29 Dec 2004 09:57:49 +0000 (+0000)
Subject: Reorder utility programs to make sure fc-case is run before fc-lang as
X-Git-Tag: fc-2_2_98~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2ba729ed3bde6512aaab00b50442b86cb013f94e;p=fontconfig.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 8e0d8b7..e0c8867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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:
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>ＭＳ 明朝</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>ＭＳ ゴシック</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>ＭＳ 明朝</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>ＭＳ ゴシック</family>
 			<family>Baekmuk Dotum</family>
 			<family>SimSun</family>
 			<family>FreeSans</family>