rpms/fontconfig/devel fontconfig-2.3.93-defaultconfig.patch, NONE, 1.1 50-no-hint-fonts.conf, 1.2, 1.3 fontconfig.spec, 1.58, 1.59 fontconfig-2.3.91-defaultconfig.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 17 23:16:54 UTC 2006


Author: rstrode

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11526

Modified Files:
	50-no-hint-fonts.conf fontconfig.spec 
Added Files:
	fontconfig-2.3.93-defaultconfig.patch 
Removed Files:
	fontconfig-2.3.91-defaultconfig.patch 
Log Message:
- apply patch from Tim Mayberry to correct aliasing and disable
  hinting for the two Chinese font names AR PL ShanHeiSun Uni 
  and AR PL Zenkai Uni


fontconfig-2.3.93-defaultconfig.patch:
 fonts.conf.in |  103 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 82 insertions(+), 21 deletions(-)

--- NEW FILE fontconfig-2.3.93-defaultconfig.patch ---
--- fontconfig-2.3.93/fonts.conf.in.defaultconfig	2005-11-03 14:48:59.000000000 +1000
+++ fontconfig-2.3.93/fonts.conf.in	2006-01-17 12:27:51.000000000 +1000
@@ -78,7 +78,9 @@
 		<family>Times</family>
 		<family>Nimbus Roman No9 L</family>
 		<family>Luxi Serif</family>
+		<family>Sazanami Mincho</family>
 		<family>Kochi Mincho</family>
+		<family>AR PL ZenKai Uni</family>
 		<family>AR PL SungtiL GB</family>
 		<family>AR PL Mingti2L Big5</family>
 		<family>MS 明朝</family>
@@ -98,7 +100,9 @@
 		<family>Albany AMT</family>
 		<family>Nimbus Sans L</family>
 		<family>Luxi Sans</family>
+		<family>Sazanami Gothic</family>
 		<family>Kochi Gothic</family>
+		<family>AR PL ShanHeiSun Uni</family>
 		<family>AR PL KaitiM GB</family>
 		<family>AR PL KaitiM Big5</family>
 		<family>MS ゴシック</family>
@@ -146,15 +150,37 @@
   -->
         <alias>
 	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
+	  <accept>
+	    <family>Nimbus Roman No9 L</family>
+	    <family>Thorndale AMT</family>
+	    <family>Times New Roman</family>
+	  </accept>
 	</alias>
         <alias>
 	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
+	  <accept>
+	    <family>Nimbus Sans L</family>
+	    <family>Albany AMT</family>
+	    <family>Arial</family>
+	  </accept>
 	</alias>
         <alias>
 	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
+	  <accept>
+	    <family>Cumberland AMT</family>
+	    <family>Courier New</family>
+	    <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+	<alias>
+	  <family>ZapfDingbats</family>
+	  <accept><family>Dingbats</family></accept>
+	</alias>
+
+	<alias>
+	  <family>Symbol</family>
+	  <accept><family>Open Symbols L</family></accept>
 	</alias>
 
 <!--
@@ -163,11 +189,18 @@
  -->
  	<alias>
 		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
+		<accept>
+			<family>Thorndale AMT</family>
+			<family>Nimbus Roman No9 L</family>
+		</accept>
 	</alias>
  	<alias>
 		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
+		<accept>
+			<family>Albany AMT</family>
+			<family>Nimbus Sans L</family>
+			<family>Arial</family>
+		</accept>
 	</alias>
  	<alias>
 		<family>Courier New</family>
@@ -260,16 +293,25 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
+			<family>Nimbus Roman No9 L</family>
+			<family>Thorndale AMT</family>
 			<family>Bitstream Vera Serif</family>
 			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
 			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
 			<family>Times</family>
-			<family>Frank Ruehl</family>
+			<family>KacstQura</family>
+			<family>Frank Ruehl CLM</family>
+                        <family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Sazanami Mincho</family>
+			<family>Kochi Mincho</family>
+			<family>ZYSong18030</family>
 			<family>MgOpen Canonica</family>
 			<family>FreeSerif</family>
-			<family>Kochi Mincho</family>
+			<family>AR PL Zenkai Uni</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
 			<family>MS 明朝</family>
@@ -279,39 +321,58 @@
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
+			<family>Luxi Sans</family>
+			<family>Albany AMT</family>
 			<family>Bitstream Vera Sans</family>
 			<family>Verdana</family>
 			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
+			<family>KacstQura</family>
 			<family>Nachlieli</family>
-			<family>MgOpen Modata</family>
-			<family>FreeSans</family>
+                        <family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
 			<family>MS ゴシック</family>
-			<family>Baekmuk Dotum</family>
+			<family>MgOpen Modata</family>
+			<family>FreeSans</family>
+                        <family>ZYSong18030</family>
+			<family>AR PL ShanHeiSun Uni</family>
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+			<family>Baekmuk Gulim</family>
 			<family>SimSun</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
+			<family>Luxi Mono</family>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
+                        <family>KacstQura</family>
+                        <family>Miriam Mono CLM</family>
+                        <family>Lohit Bengali</family>
+                        <family>Lohit Gujarati</family>
+                        <family>Lohit Hindi</family>
+                        <family>Lohit Punjabi</family>
+                        <family>Lohit Tamil</family>
 			<family>Nimbus Mono L</family>
 			<family>Courier</family>
-			<family>Miriam Mono</family>
+                        <family>Sazanami Gothic</family>
+                        <family>Kochi Gothic</family>
+                        <family>ZYSong18030</family>
+			<family>AR PL ShanHeiSun Uni</family>
+                        <family>AR PL SungtiL GB</family>
+                        <family>AR PL Mingti2L Big5</family>
+                        <family>Baekmuk Gulim</family>
 			<family>FreeMono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
 		</prefer>
 	</alias>
 



Index: 50-no-hint-fonts.conf
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/50-no-hint-fonts.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 50-no-hint-fonts.conf	13 Dec 2005 23:35:56 -0000	1.2
+++ 50-no-hint-fonts.conf	17 Jan 2006 23:16:50 -0000	1.3
@@ -12,12 +12,7 @@
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>
 		</edit>
-                <!-- the rh_prefer_bitmaps options (a nonstandard
-                     Red Hat extension), controls whether embedded 
-                     bitmaps, when available are preferred
-                     to antialiased rendering. For Japanese,
-                     we prefer antialiased rendering -->
-		<edit name="rh_prefer_bitmaps" mode="assign">
+		<edit name="embeddedbitmap" mode="assign">
 			<bool>false</bool>
 		</edit>
 	</match>
@@ -28,7 +23,7 @@
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>
 		</edit>
-		<edit name="rh_prefer_bitmaps" mode="assign">
+		<edit name="embeddedbitmap" mode="assign">
 			<bool>false</bool>
 		</edit>
 	</match>
@@ -39,7 +34,7 @@
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>
 		</edit>
-		<edit name="rh_prefer_bitmaps" mode="assign">
+		<edit name="embeddedbitmap" mode="assign">
 			<bool>false</bool>
 		</edit>
 	</match>
@@ -50,7 +45,7 @@
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>
 		</edit>
-		<edit name="rh_prefer_bitmaps" mode="assign">
+		<edit name="embeddedbitmap" mode="assign">
 			<bool>false</bool>
 		</edit>
 	</match>
@@ -94,9 +89,28 @@
 			<bool>false</bool>
 		</edit>
 	</match>
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>AR PL ShanHeiSun Uni</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+                <edit name="embeddedbitmap" mode="assign">
+                        <bool>true</bool>
+                </edit>
+        </match>
+        <match target="font">
+                <test name="family" compare="eq">
+                        <string>AR PL KaitiM Big5</string>
+                </test>
+                <edit name="hinting" mode="assign">
+                        <bool>false</bool>
+                </edit>
+        </match>
 	<match target="font">
 		<test name="family" compare="eq">
-			<string>AR PL KaitiM Big5</string>
+			<string>AR PL ZenKai Uni</string>
 		</test>
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- fontconfig.spec	10 Jan 2006 20:31:37 -0000	1.58
+++ fontconfig.spec	17 Jan 2006 23:16:50 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.93
-Release: 3
+Release: 4
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -12,7 +12,7 @@
 Source1: 40-blacklist-fonts.conf
 Source2: 50-no-hint-fonts.conf
 
-Patch1: fontconfig-2.3.91-defaultconfig.patch
+Patch1: fontconfig-2.3.93-defaultconfig.patch
 Patch2: fontconfig-2.3.91-crosscheck.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
@@ -134,6 +134,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 17 2006 Ray Strode <rstrode at redhat.com> - 2.3.93-4
+- apply patch from Tim Mayberry to correct aliasing and disable
+  hinting for the two Chinese font names AR PL ShanHeiSun Uni 
+  and AR PL Zenkai Uni
+
 * Tue Jan 10 2006 Bill Nottingham <notting at redhat.com> - 2.3.93-3
 - prereq coreutils for mkdir/touch in %%post
 


--- fontconfig-2.3.91-defaultconfig.patch DELETED ---




More information about the fedora-cvs-commits mailing list