Accepting request 129078 from M17N

- added configuration for croscorefonts

- hintnone for IPA fonts [bnc#766319]

OBS-URL: https://build.opensuse.org/request/show/129078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=58
This commit is contained in:
Stephan Kulow 2012-07-30 18:26:19 +00:00 committed by Git OBS Bridge
commit 955e97d568
7 changed files with 129 additions and 8 deletions

View File

@ -149,13 +149,6 @@
<string>HGPKyokashotai</string>
<string>HGSSoeiKakupoptai</string>
<string>HGSeikaishotaiPRO</string>
<string>IPAexMincho</string>
<string>IPAexGothic</string>
<string>IPAMincho</string>
<string>IPAGothic</string>
<string>IPAPMincho</string>
<string>IPAPGothic</string>
<string>IPAUIGothic</string>
<string>TLKyokashotai</string>
<string>TLMincho</string>
<string>TLPMincho</string>

View File

@ -119,4 +119,32 @@ exceptions:
</edit>
</match>
<!-- IPA* fonts: setting hintstyle=hintnone for now, IPA font
setting should be improved in the future [bnc#766319]
We are using fullname element instead of family, because
some programs may use Japanese name instead, which would
double this list, when using family element. See comment
47 and 48 of referred bug. -->
<match target="font">
<test name="fullname">
<string>IPAexGothic</string>
<string>IPAexMincho</string>
<string>IPAGothic BoldItalic</string>
<string>IPAGothic Bold</string>
<string>IPAGothic Italic</string>
<string>IPAGothic</string>
<string>IPAMincho</string>
<string>IPAPGothic BoldItalic</string>
<string>IPAPGothic Bold</string>
<string>IPAPGothic Italic</string>
<string>IPAPGothic</string>
<string>IPAPMincho</string>
<string>IPAUIGothic</string>
</test>
<edit name="hintstyle">
<const>hintnone</const>
</edit>
</match>
</fontconfig>

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jul 27 09:52:20 UTC 2012 - pgajdos@suse.com
- added configuration for croscorefonts
-------------------------------------------------------------------
Thu Jul 26 12:15:37 UTC 2012 - pgajdos@suse.com
- hintnone for IPA fonts [bnc#766319]
-------------------------------------------------------------------
Tue Jul 3 11:37:52 UTC 2012 - pgajdos@suse.com

View File

@ -75,6 +75,8 @@ Patch1: make-check.patch
Patch2: usr-share-doc-packages.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705
Patch3: cloexec.patch
# to be upstreamed
Patch4: metric-croscore.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
@ -121,6 +123,7 @@ accepts font patterns and returns the nearest matching font.
%patch1 -p1
%patch2 -p1
%patch3
%patch4
%build
autoreconf -fiv

81
metric-croscore.patch Normal file
View File

@ -0,0 +1,81 @@
Index: conf.d/30-metric-aliases.conf
===================================================================
--- conf.d/30-metric-aliases.conf
+++ conf.d/30-metric-aliases.conf
@@ -21,6 +21,10 @@
Liberation Sans
Liberation Serif
Liberation Mono
+ Croscore fonts;
+ Tinos
+ Arimo
+ Cousine
StarOffice fonts:
Albany
Thorndale
@@ -82,6 +86,13 @@
</alias>
<alias binding="same">
+ <family>Tinos</family>
+ <default>
+ <family>Arial</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Albany</family>
<default>
<family>Arial</family>
@@ -103,6 +114,13 @@
</alias>
<alias binding="same">
+ <family>Arimo</family>
+ <default>
+ <family>Times New Roman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Thorndale</family>
<default>
<family>Times New Roman</family>
@@ -124,6 +142,13 @@
</alias>
<alias binding="same">
+ <family>Cousine</family>
+ <default>
+ <family>Courier New</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Cumberland</family>
<default>
<family>Courier New</family>
@@ -219,6 +244,7 @@
<alias binding="same">
<family>Arial</family>
<accept>
+ <family>Tinos</family>
<family>Liberation Sans</family>
<family>Albany</family>
<family>Albany AMT</family>
@@ -228,6 +254,7 @@
<alias binding="same">
<family>Times New Roman</family>
<accept>
+ <family>Arimo</family>
<family>Liberation Serif</family>
<family>Thorndale</family>
<family>Thorndale AMT</family>
@@ -237,6 +264,7 @@
<alias binding="same">
<family>Courier New</family>
<accept>
+ <family>Cousine</family>
<family>Liberation Mono</family>
<family>Cumberland</family>
<family>Cumberland AMT</family>

View File

@ -31,6 +31,7 @@
<family>IPAexMincho</family>
<family>Sazanami Mincho</family>
<family>STIXGeneral</family>
<family>Arimo</family>
<default><family>serif</family></default>
</alias>
<!--
@ -60,6 +61,7 @@
<family>IPAexGothic</family>
<family>Sazanami Gothic</family>
<family>Baekmuk Gulim</family>
<family>Tinos</family>
<default><family>sans-serif</family></default>
</alias>
<!--
@ -73,6 +75,7 @@
<family>DejaVu Sans Mono</family>
<family>Droid Sans Mono</family>
<family>Liberation Mono</family>
<family>Cousine</family>
<default><family>monospace</family></default>
</alias>

View File

@ -14,6 +14,7 @@
<family>Thorndale AMT</family>
<family>DejaVu Serif</family>
<family>Droid Serif</family>
<family>Arimo</family>
<family>Liberation Serif</family>
<family>SUSE Serif</family>
<family>Bitstream Vera Serif</family>
@ -64,8 +65,9 @@
<family>Arial</family>
<family>Albany AMT</family>
<family>Verdana</family>
<family>DejaVu Sans</family>a
<family>DejaVu Sans</family>
<family>Droid Sans</family>
<family>Tinos</family>
<family>Liberation Sans</family>
<family>Cantarell</family>
<family>SUSE Sans</family>
@ -118,6 +120,7 @@
<family>DejaVu Sans Mono</family>
<family>Droid Sans Mono</family>
<family>Andale Mono</family>
<family>Cousine</family>
<family>Liberation Mono</family>
<family>SUSE Sans Mono</family>
<family>Bitstream Vera Sans Mono</family>