Dev-ref: Fix FTBFS #666578

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@9193 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/debian/changelog b/debian/changelog
index 1ead246e787e44a6d0d6881e74aea4d330a7f3ae..f53545ae458e74ad2e4f9918b64ad699f7b78dcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 developers-reference (3.4.8) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ David Prévot ]
   * Move away po4a handling in its own directory with a single config file.
   * Adapt Makefile and README-contrib to the current po4a tree.
 
- -- David Prévot <taffit@debian.org>  Mon, 27 Feb 2012 01:08:49 -0400
+  [ Osamu Aoki ]
+  * Make XeTeX backend to use xCJK package only for CJK and add tipa for
+    build dependency. (See #666569). Closes: #666578
+
+ -- Osamu Aoki <osamu@debian.org>  Sun, 15 Apr 2012 20:54:05 +0900
 
 developers-reference (3.4.7) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 35e3f9d473573de9b568965c67686575cd7b405c..bbc29077485f617db9e3c02aa621589f79d03a0a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Developers Reference Maintainers <debian-policy@lists.debian.org>
 Uploaders: Lucas Nussbaum <lucas@debian.org>, Marc 'HE' Brockschmidt <he@debian.org>, Raphaël Hertzog <hertzog@debian.org>
 Standards-Version: 3.9.2
 Build-Depends-Indep: docbook-xsl (>= 1.71.0), dblatex (>= 0.2), xsltproc, libxml2-utils, po4a, w3m,
- fonts-ipafont-gothic, fonts-ipafont-mincho, gsfonts, latex-cjk-xcjk, lmodern,
+ fonts-ipafont-gothic, fonts-ipafont-mincho, gsfonts, latex-cjk-xcjk, lmodern, tipa,
  texlive-lang-cyrillic, texlive-lang-french, texlive-lang-german, texlive-xetex
 Build-Depends: debhelper (>= 5)
 Vcs-Svn: svn://svn.debian.org/ddp/manuals/trunk/developers-reference

diff --git a/xslt/xetex_param.xsl b/xslt/xetex_param.xsl
index 04ea199ebe1370d892d2151318919151322a03ad..bc36408f4135d6b63cf7d9fae51d355507245af2 100644 (file)
--- a/xslt/xetex_param.xsl
+++ b/xslt/xetex_param.xsl
@@ -11,28 +11,31 @@
     <xsl:text>\setmainfont{Nimbus Roman No9 L}&#10;</xsl:text>
     <xsl:text>\setsansfont{Nimbus Sans L}&#10;</xsl:text>
     <xsl:text>\setmonofont{Nimbus Mono L}&#10;</xsl:text>
-    <xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
     <xsl:choose>
       <xsl:when test="$lingua = 'zh-cn'">
        <!-- zh_CN centric: ttf-arphic-gbsn00lp, ttf-wqy-zenhei -->
+        <xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
         <xsl:text>\setCJKmainfont{AR PL SungtiL GB}&#10;</xsl:text>
         <xsl:text>\setCJKsansfont{WenQuanYi Zen Hei}&#10;</xsl:text>
         <xsl:text>\setCJKmonofont{WenQuanYi Zen Hei Mono}&#10;</xsl:text>
       </xsl:when>
       <xsl:when test="$lingua = 'zh-tw'">
         <!-- zh_TW centric: ttf-arphic-bsmi00lp, ttf-wqy-zenhei -->
+        <xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
         <xsl:text>\setCJKmainfont{AR PL Mingti2L Big5}&#10;</xsl:text>
         <xsl:text>\setCJKsansfont{WenQuanYi Zen Hei}&#10;</xsl:text>
         <xsl:text>\setCJKmonofont{WenQuanYi Zen Hei Mono}&#10;</xsl:text>
       </xsl:when>
       <xsl:when test="$lingua = 'ja'">
         <!-- ja centric: otf-ipafont-mincho otf-ipafont-gothic -->
+        <xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
         <xsl:text>\setCJKmainfont{IPAMincho}&#10;</xsl:text>
         <xsl:text>\setCJKsansfont{IPAPGothic}&#10;</xsl:text>
         <xsl:text>\setCJKmonofont{IPAGothic}&#10;</xsl:text>
       </xsl:when>
       <xsl:when test="$lingua = 'ko'">
         <!-- ko centric: ttf-unfonts-core -->
+        <xsl:text>\usepackage{xeCJK}&#10;</xsl:text>
         <xsl:text>\setCJKmainfont{UnBatang}&#10;</xsl:text>
         <xsl:text>\setCJKsansfont{UnDotum}&#10;</xsl:text>
         <xsl:text>\setCJKmonofont{UnDotum}&#10;</xsl:text>