Accepting request 176919 from home:MargueriteSu:branches:Documentation:Tools

fix wrong alias for fop Chinese/ChineseMono

OBS-URL: https://build.opensuse.org/request/show/176919
OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/suse-xsl-stylesheets?expand=0&rev=60
This commit is contained in:
Thomas Schraitle 2013-05-29 08:50:06 +00:00 committed by Git OBS Bridge
parent 567a45f3d7
commit 43c68ed3d4
3 changed files with 117 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 29 08:24:27 UTC 2013 - i@marguerite.su
- fix fop replaces Chinese as "#" because of missing fonts.
* new patch: susexsl-fop-chinese.patch (remove next release)
* upstream just copyed xep settings. fop can't use alias.
-------------------------------------------------------------------
Tue May 28 08:42:57 UTC 2013 - toms@opensuse.org

View File

@ -14,6 +14,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: suse-xsl-stylesheets
Version: 1.9.20
Release: 0
@ -45,6 +47,9 @@ Url: http://sourceforge.net/p/daps/suse-xslt
Source0: http://downloads.sourceforge.net/project/daps/suse-xsl-stylesheets/%{name}-%{version}.tar.bz2
Source1: susexsl-fetch-source
Source2: %{name}.rpmlintrc
# FIXME: remove next release, it'll be upstreamed.
# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fop use a wrong alias as Chinese fonts, so Chinese are now "#".
Patch: susexsl-fop-chinese.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -82,6 +87,7 @@ the DocBook 4 DTD.
#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
%patch -p2
#--------------------------------------------------------------------------
%build

104
susexsl-fop-chinese.patch Normal file
View File

@ -0,0 +1,104 @@
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_cn.xml
@@ -21,15 +21,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse_mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse_mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt/common/l10n/zh_tw.xml
@@ -26,15 +26,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse.mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_cn.xml
@@ -46,15 +46,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse_mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse_mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>
Index: suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
===================================================================
--- suse-xsl-stylesheets.orig/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
+++ suse-xsl-stylesheets/suse-xsl-stylesheets/xslt_suse2/common/l10n/zh_tw.xml
@@ -52,15 +52,15 @@
<!-- WARNING:
Change the following lines only, if you know what you are do!
-->
- <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,Chinese,serif"/>
- <l:gentext key="fop1.sans.font.family" text="suse.sans,Chinese,FreeSans,sansserif"/>
- <l:gentext key="fop1.monospace.font.family" text="suse.mono,ChineseMono"/>
+ <l:gentext key="fop1.body.font.family" text="suse.serif,FreeSerif,WenQuanYi Micro Hei,serif"/>
+ <l:gentext key="fop1.sans.font.family" text="suse.sans,WenQuanYi Micro Hei,FreeSans,sansserif"/>
+ <l:gentext key="fop1.monospace.font.family" text="suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.callout.unicode.font" text="Dingbats"/>
<!-- Pocket layout: -->
- <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,sansserif"/>
- <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono"/>
+ <l:gentext key="fop1.pocket.body.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.sans.font.family" text="LiberationSans,WenQuanYi Micro Hei,sansserif"/>
+ <l:gentext key="fop1.pocket.monospace.font.family" text="FreeMono,DejaVuSansMono,suse.mono,WenQuanYi Micro Hei Mono"/>
<l:gentext key="fop1.pocket.symbol.font.family" text="Symbol,ZapfDingbats"/>
<l:gentext key="fop1.pocket.callout.unicode.font" text="Dingbats"/>