[PC-BSD Commits] r6019 - pcbsd/trunk/system-overlay/usr/local/etc/fonts

[svn at pcbsd.org]

Author: ayerenkow
Date: 2010-01-15 04:24:54 -0800 (Fri, 15 Jan 2010)
New Revision: 6019

Added:
   pcbsd/trunk/system-overlay/usr/local/etc/fonts/cyr-rules.conf
Modified:
   pcbsd/trunk/system-overlay/usr/local/etc/fonts/ja-rules.conf
   pcbsd/trunk/system-overlay/usr/local/etc/fonts/local.conf
Log:
Fix incorrect japanese font-conf and introduce PT Sans for 
ru, uk, by users.

Modified: pcbsd/trunk/system-overlay/usr/local/etc/fonts/ja-rules.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/fonts/ja-rules.conf	2010-01-15 01:02:53 UTC (rev 6018)
+++ pcbsd/trunk/system-overlay/usr/local/etc/fonts/ja-rules.conf	2010-01-15 12:24:54 UTC (rev 6019)
@@ -1,49 +1,49 @@
 <?xml version="1.0"?><!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
- <!-- start ja -->
- <match target="pattern">
-  <test name="lang" compare="contains">
-   <string>ja</string>
-  </test>
-  <test name="family" compare="eq">
-    <string>serif</string>
-  </test>
-  <edit name="family" mode="prepend">
-   <string>IPAMonaMincho</string>
-   <string>IPAMincho</string>
-   <string>Sazanami Mincho</string>
-  </edit>
- </match>
- <match target="pattern">
-  <test name="lang" compare="contains">
-   <string>ja</string>
-  </test>
-  <test name="family" compare="eq">
-   <string>sans-serif</string>
-  </test>
-  <edit name="family" mode="prepend">
-   <string>VL PGothic</string>
-   <string>IPAMonaGothic</string>
-   <string>IPAPGothic</string>
-   <string>Sazanami Gothic</string>
-  </edit>
- </match>
- <match target="pattern">
-  <test name="lang" compare="contains">
-   <string>ja</string>
-  </test>
-  <test name="family" compare="eq">
-   <string>monospace</string>
-  </test>
-  <edit name="family" mode="prepend">
-   <string>DejaVu Sans Mono</string> <!-- for Latin alphabet -->
-   <string>VL Gothic</string>
-   <string>IPAMonaGothic</string>
-   <string>IPAGothic</string>
-   <string>Sazanami Gothic</string>
-  </edit>
- </match>
- <!-- end ja -->
+	<!-- start ja -->
+	<match target="pattern">
+		<test qual="all" name="lang" compare="contains">
+			<string>ja</string>
+		</test>
+		<test qual="all" name="family" compare="eq">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>IPAMonaMincho</string>
+			<string>IPAMincho</string>
+			<string>Sazanami Mincho</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test qual="all" name="lang" compare="contains">
+			<string>ja</string>
+		</test>
+		<test qual="all" name="family" compare="eq">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>VL PGothic</string>
+			<string>IPAMonaGothic</string>
+			<string>IPAPGothic</string>
+			<string>Sazanami Gothic</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test qual="all" name="lang" compare="contains">
+			<string>ja</string>
+		</test>
+		<test qual="all" name="family" compare="eq">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>DejaVu Sans Mono</string> <!-- for Latin alphabet -->
+			<string>VL Gothic</string>
+			<string>IPAMonaGothic</string>
+			<string>IPAGothic</string>
+			<string>Sazanami Gothic</string>
+		</edit>
+	</match>
+	<!-- end ja -->
 
 </fontconfig>

Modified: pcbsd/trunk/system-overlay/usr/local/etc/fonts/local.conf
===================================================================
--- pcbsd/trunk/system-overlay/usr/local/etc/fonts/local.conf	2010-01-15 01:02:53 UTC (rev 6018)
+++ pcbsd/trunk/system-overlay/usr/local/etc/fonts/local.conf	2010-01-15 12:24:54 UTC (rev 6019)
@@ -20,4 +20,8 @@
 
 <include ignore_missing="yes">ja-rules.conf</include>
 
+<!-- Rules for Cyrillic fonts -->
+
+<include ignore_missing="yes">cyr-rules.conf</include>
+
 </fontconfig>