From 8e3ad9ef158ebca8dbbfa112bb7779bee332ef8d2de494c490b9e5e513d057c6 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 3 Jul 2012 11:45:28 +0000
Subject: [PATCH] - add <prefer> and <default> aliases for Droid fonts into
 SUSE-specific   config; if they are not present and e. g. system with only
 droid font   installed, you get "Droid Sans" instead of "Droid Sans Mono"
 even if   "monospace" requested; that causes e. g. gvim displaying glyphs
 with   additional space - add also <default> aliases for DejaVu fonts into
 SUSE-specific config;   in case that someone has deinstalled them but gui or
 document explicitly   wants them

OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=84
---
 fontconfig.changes      | 12 ++++++++++++
 suse-generic-names.conf |  6 ++++++
 suse-post-user.conf     | 15 +++++++++------
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/fontconfig.changes b/fontconfig.changes
index 164a650..88780fc 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jul  3 11:37:52 UTC 2012 - pgajdos@suse.com
+
+- add <prefer> and <default> aliases for Droid fonts into SUSE-specific 
+  config; if they are not present and e. g. system with only droid font 
+  installed, you get "Droid Sans" instead of "Droid Sans Mono" even if
+  "monospace" requested; that causes e. g. gvim displaying glyphs with 
+  additional space
+- add also <default> aliases for DejaVu fonts into SUSE-specific config;
+  in case that someone has deinstalled them but gui or document explicitly 
+  wants them
+
 -------------------------------------------------------------------
 Tue Jun 12 10:41:54 CEST 2012 - tiwai@suse.de
 
diff --git a/suse-generic-names.conf b/suse-generic-names.conf
index 420be7c..a08f0e7 100644
--- a/suse-generic-names.conf
+++ b/suse-generic-names.conf
@@ -16,6 +16,8 @@
 		<family>Thorndale AMT</family>
 		<family>SUSE Serif</family>
 		<family>FreeSerif</family>
+		<family>DejaVu Serif</family>
+		<family>Droid Serif</family>
 		<family>Liberation Serif</family>
 		<family>HGMinchoL</family>
 		<family>HGPMinchoL</family>
@@ -41,6 +43,8 @@
 		<family>Albany AMT</family>
 		<family>SUSE Sans</family>
 		<family>FreeSans</family>
+		<family>DejaVu Sans</family>
+		<family>Droid Sans</family>
 		<family>Liberation Sans</family>
 		<family>Cantarell</family>
 		<family>HGGothicB</family>
@@ -66,6 +70,8 @@
 		<family>Cumberland AMT</family>
 		<family>SUSE Sans Mono</family>
 		<family>FreeMono</family>
+		<family>DejaVu Sans Mono</family>
+		<family>Droid Sans Mono</family>
 		<family>Liberation Mono</family>
 		<default><family>monospace</family></default>
 	</alias>
diff --git a/suse-post-user.conf b/suse-post-user.conf
index 4762b26..bad9263 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -13,6 +13,7 @@
 			<family>Times New Roman</family>
 			<family>Thorndale AMT</family>
 			<family>DejaVu Serif</family>
+			<family>Droid Serif</family>
 			<family>Liberation Serif</family>
 			<family>SUSE Serif</family>
 			<family>Bitstream Vera Serif</family>
@@ -48,7 +49,7 @@
 			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
-            <family>NanumMyeongjo</family>
+			<family>NanumMyeongjo</family>
 			<family>UnBatang</family>
 			<family>Baekmuk Batang</family>
 			<family>SimSun</family>
@@ -63,7 +64,8 @@
 			<family>Arial</family>
 			<family>Albany AMT</family>
 			<family>Verdana</family>
-			<family>DejaVu Sans</family>
+			<family>DejaVu Sans</family>a
+			<family>Droid Sans</family>
 			<family>Liberation Sans</family>
 			<family>Cantarell</family>
 			<family>SUSE Sans</family>
@@ -96,14 +98,14 @@
 			<family>Kochi Gothic</family>
 			<family>CMEXSong</family>
 			<family>FZSongTi</family>
-            <family>WenQuanYi Micro Hei</family>  
+			<family>WenQuanYi Micro Hei</family>  
 			<family>WenQuanYi WenQuanYi Bitmap Song</family>
 			<family>WenQuanYi Zen Hei</family>
 			<family>AR PL ShanHeiSun Uni</family>
 			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
-            <family>NanumGothic</family>
+			<family>NanumGothic</family>
 			<family>UnDotum</family>
 			<family>Baekmuk Gulim</family>
 			<family>Baekmuk Dotum</family>
@@ -114,6 +116,7 @@
 		<prefer>
 			<family>Consolas</family>
 			<family>DejaVu Sans Mono</family>
+			<family>Droid Sans Mono</family>
 			<family>Andale Mono</family>
 			<family>Liberation Mono</family>
 			<family>SUSE Sans Mono</family>
@@ -141,14 +144,14 @@
 			<family>Kochi Gothic</family>
 			<family>CMEXSong</family>
 			<family>FZSongTi</family>
-            <family>WenQuanYi Micro Hei Mono</family>  
+			<family>WenQuanYi Micro Hei Mono</family>  
 			<family>WenQuanYi WenQuanYi Bitmap Song</family>
 			<family>WenQuanYi Zen Hei Mono</family>
 			<family>AR PL ShanHeiSun Uni</family>
 			<family>FZMingTiB</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
-            <family>NanumGothicCoding</family>
+			<family>NanumGothicCoding</family>
 			<family>UnDotum</family>
 			<family>Baekmuk Gulim</family>
 			<family>Baekmuk Dotum</family>