Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package maint-guide
(explain the reason for the unblock here)
* Fix dquilt bash completion. Closes: #861084
* Fix VCS-Browser. Closes: #861144
* Drop menu section. Closes: #861146
* Update translation: de
* Update translation: zh_CN. Closes: #645969
* Trivial update translation: all
* Use opencc as the backup PO string generator for Chinese
translation.
* Add PDF for zh-cn, zh-tw, and jp. Closes: #850523
(include/attach the debdiff against the package in testing)
Attached after removing diff in PO directory
Please note some of the unused codes have been removed and opencc based
Chinese auto-translation functionality added by moving working code from
debian-reference.
unblock maint-guide/1.2.39
-- System Information:
Debian Release: 9.0
APT prefers testing-proposed-updates
APT policy: (500, 'testing-proposed-updates'), (500, 'testing'), (98,
'experimental'), (98, 'unstable')
Architecture: amd64
(x86_64)
Foreign Architectures: i386
Kernel: Linux 4.10.0-rc6-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru maint-guide-1.2.38/bin/fuzzypo maint-guide-1.2.39/bin/fuzzypo
--- maint-guide-1.2.38/bin/fuzzypo 1970-01-01 09:00:00.000000000 +0900
+++ maint-guide-1.2.39/bin/fuzzypo 2017-05-25 23:17:12.000000000 +0900
@@ -0,0 +1,11 @@
+#! /bin/sh -e
+# vim: set sts=4 expandtab:
+# $1: es.po fr.po pt.po zh-cn.po zh-cn.po-best ...
+#
+DPO="po"
+MSGATTR="msgattrib"
+#
+echo "no-obsolete $1 `${MSGATTR} --no-obsolete $1 |grep ^msgid |sed 1d|wc -l`"
+echo "untranslated $1 `${MSGATTR} --untranslated $1 |grep ^msgid |sed 1d|wc -l`"
+echo "fuzzy $1 `${MSGATTR} --fuzzy $1 |grep ^msgid |sed 1d|wc -l`"
+echo
diff -Nru maint-guide-1.2.38/bin/genxml maint-guide-1.2.39/bin/genxml
--- maint-guide-1.2.38/bin/genxml 1970-01-01 09:00:00.000000000 +0900
+++ maint-guide-1.2.39/bin/genxml 2017-05-25 23:17:12.000000000 +0900
@@ -0,0 +1,73 @@
+#! /bin/sh -e
+# vim: set sts=4 expandtab:
+# $1: en fr pt zh-cn ...
+#
+DPO="po"
+DBIN="bin"
+DCC="/usr/share/opencc"
+MANUAL="maint-guide"
+# The threshold should be 80 if translation is completed.
+THRESHOLD="0"
+TRANSLATE="po4a-translate -M utf-8 --format docbook --keep ${THRESHOLD} -v"
+MSGCAT="msgcat"
+OPENCC="opencc"
+
+# Generate XML (en)
+gen_xml_en () {
+ echo "!!! Should not be here !!!" >&2
+ false
+}
+
+# Generate XML (other)
+gen_xml_other () {
+ if [ -f ${DPO}/${1}.add ]; then
+ ${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/${1}.add -p ${DPO}/${1}.po -l ${MANUAL}.${1}.xml
+ else
+ ${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/${1}.po -l ${MANUAL}.${1}.xml
+ fi
+}
+
+# Generate XML (zh-cn)
+gen_xml_zh_CN () {
+ if which opencc >/dev/null ; then
+ ${MSGCAT} --no-wrap ${DPO}/zh-cn.po |\
+ ${OPENCC} -c ${DCC}/tw2sp.json -o ${DPO}/zh-cn.po-opencc
+ ${MSGCAT} -o ${DPO}/zh-cn.po-best --use-first ${DPO}/zh-cn.po ${DPO}/zh-cn.po-opencc
+ ${DBIN}/fuzzypo ${DPO}/zh-cn.po-best >>fuzzy.log
+ else
+ ln -f ${DPO}/zh-cn.po ${DPO}/zh-cn.po-best
+ fi
+ if [ -f ${DPO}/zh-cn.add ]; then
+ ${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/zh-cn.add -p ${DPO}/zh-cn.po-best -l ${MANUAL}.zh-cn.xml
+ else
+ ${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/zh-cn.po-best -l ${MANUAL}.zh-cn.xml
+ fi
+ #rm -f ${DPO}/zh-cn.po-best
+}
+
+# Generate XML (zh-tw)
+gen_xml_zh_TW () {
+ if which opencc >/dev/null ; then
+ ${MSGCAT} --no-wrap ${DPO}/zh-cn.po |\
+ ${OPENCC} -c ${DCC}/s2twp.json -o ${DPO}/zh-tw.po-opencc
+ ${MSGCAT} -o ${DPO}/zh-tw.po-best --use-first ${DPO}/zh-tw.po ${DPO}/zh-tw.po-opencc
+ ${DBIN}/fuzzypo ${DPO}/zh-tw.po-best >>fuzzy.log
+ else
+ ln -f ${DPO}/zh-tw.po ${DPO}/zh-tw.po-best
+ fi
+ if [ -f ${DPO}/zh-tw.add ]; then
+ ${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/zh-tw.add -p ${DPO}/zh-tw.po-best -l ${MANUAL}.zh-tw.xml
+ else
+ ${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/zh-tw.po-best -l ${MANUAL}.zh-tw.xml
+ fi
+ #rm -f ${DPO}/zh-tw.po-best
+}
+
+# Main routine
+case "$1" in
+ "zh-tw") gen_xml_zh_TW;;
+ "zh-cn") gen_xml_zh_CN;;
+ "en") gen_xml_en;;
+ *) gen_xml_other "$1";;
+esac
+
diff -Nru maint-guide-1.2.38/Credits maint-guide-1.2.39/Credits
--- maint-guide-1.2.38/Credits 2014-06-28 15:36:00.000000000 +0900
+++ maint-guide-1.2.39/Credits 2017-05-25 22:58:43.000000000 +0900
@@ -96,6 +96,7 @@
* Chinese (zh_CN):
@ Aron Xu <happyaron...@gmail.com>
+- Boyuan Yang <073p...@gmail.com>
- 李凌, Ling Li <lili...@yahoo.com.cn>
* 郑原真, <ych...@slat.org>
@ Chinese (simplified) <i18n...@googlegroups.com>
diff -Nru maint-guide-1.2.38/debian/changelog maint-guide-1.2.39/debian/changelog
--- maint-guide-1.2.38/debian/changelog 2017-02-26 13:03:57.000000000 +0900
+++ maint-guide-1.2.39/debian/changelog 2017-05-25 23:17:12.000000000 +0900
@@ -1,3 +1,17 @@
+maint-guide (1.2.39) unstable; urgency=medium
+
+ * Fix dquilt bash completion. Closes: #861084
+ * Fix VCS-Browser. Closes: #861144
+ * Drop menu section. Closes: #861146
+ * Update translation: de
+ * Update translation: zh_CN. Closes: #645969
+ * Trivial update translation: all
+ * Use opencc as the backup PO string generator for Chinese
+ translation.
+ * Add PDF for zh-cn, zh-tw, and jp. Closes: #850523
+
+ -- Osamu Aoki <os...@debian.org> Thu, 25 May 2017 23:17:12 +0900
+
maint-guide (1.2.38) unstable; urgency=medium
* Fix "Link to Lintian User's Manual". Closes: #819346, #821117
diff -Nru maint-guide-1.2.38/debian/control maint-guide-1.2.39/debian/control
--- maint-guide-1.2.38/debian/control 2016-12-08 00:19:13.000000000 +0900
+++ maint-guide-1.2.39/debian/control 2017-05-25 23:17:12.000000000 +0900
@@ -7,11 +7,12 @@
Build-Depends-Indep: dblatex,
docbook-xml,
docbook-xsl,
- fonts-ipafont,
- fonts-liberation,
- ghostscript,
- gsfonts,
- lmodern,
+ libopencc2-data,
+ fonts-liberation2,
+ fonts-vlgothic,
+ fonts-wqy-microhei,
+ locales-all | locales,
+ opencc,
po4a,
texlive-lang-chinese,
texlive-lang-cyrillic,
@@ -21,13 +22,12 @@
texlive-lang-japanese,
texlive-lang-spanish,
texlive-xetex,
- tipa,
w3m,
xsltproc,
zip
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/ddp/maint-guide.git
-Vcs-Browser: https://anonscm.debian.org/cgit/dp/maint-guide.git
+Vcs-Browser: https://anonscm.debian.org/cgit/ddp/maint-guide.git
Homepage: http://www.debian.org/doc/devel-manuals#maint-guide
Package: maint-guide
diff -Nru maint-guide-1.2.38/doc/03_modify.xml maint-guide-1.2.39/doc/03_modify.xml
--- maint-guide-1.2.38/doc/03_modify.xml 2014-07-23 22:44:14.000000000 +0900
+++ maint-guide-1.2.39/doc/03_modify.xml 2017-04-26 07:56:37.000000000 +0900
@@ -16,7 +16,7 @@
</para>
<screen>
alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
-complete -F _quilt_completion $_quilt_complete_opt dquilt
+complete -F _quilt_completion -o filenames dquilt
</screen>
<para>
Then let's create <filename>~/.quiltrc-dpkg</filename> as follows:
diff -Nru maint-guide-1.2.38/doc/05_dother.xml maint-guide-1.2.39/doc/05_dother.xml
--- maint-guide-1.2.38/doc/05_dother.xml 2014-07-23 22:44:14.000000000 +0900
+++ maint-guide-1.2.39/doc/05_dother.xml 2017-04-26 08:42:07.000000000 +0900
@@ -593,63 +593,6 @@
docs/gentoo.1
</screen>
</section>
-<section id="menu"><title><filename>menu</filename></title>
-<para>
-X Window System users usually have a window manager with a menu that can be
-customized to launch programs. If they have installed the Debian <systemitem role="package">menu</systemitem> package, a set of menus for every program on
-the system will be created for them.
-</para>
-<para>
-Here's the default <filename>menu.ex</filename> file that
-<command>dh_make</command> created:
-</para>
-<screen>
-?package(gentoo):needs=X11|text|vc|wm \
- section=Applications/see-menu-manual\
- title=gentoo command=/usr/bin/gentoo
-</screen>
-<para>
-The first field after the colon character is <literal>needs</literal>, and it
-specifies what kind of interface the program needs. Change this to one of the
-listed alternatives, e.g. <literal>text</literal> or <literal>X11</literal>.
-</para>
-<para>
-The next is the <literal>section</literal> that the menu and submenu entry
-should appear in.
-<footnote><para> The current list of sections is in
-<ulink url="&menu-structure;">The Debian Menu sub-policy, 2.1 "Preferred menu structure"</ulink>.
-There was a major reorganization of menu structure for <literal>squeeze</literal>.
-</para> </footnote>
-</para>
-<para>
-The <literal>title</literal> field is the name of the program. You can start
-this one in uppercase if you like. Just keep it short.
-</para>
-<para>
-Finally, the <literal>command</literal> field is the command that runs the
-program.
-</para>
-<para>
-Let's change the file name to <filename>menu</filename> and change the menu
-entry to this:
-</para>
-<screen>
-?package(gentoo): needs=X11 \
- section=Applications/Tools \
- title=Gentoo command=gentoo
-</screen>
-<para>
-You can also add other fields like <literal>longtitle</literal>,
-<literal>icon</literal>, <literal>hints</literal> etc. See <citerefentry>
-<refentrytitle>dh_installmenu</refentrytitle> <manvolnum>1</manvolnum>
-</citerefentry>, <citerefentry> <refentrytitle>menufile</refentrytitle>
-<manvolnum>5</manvolnum> </citerefentry>, <citerefentry>
-<refentrytitle>update-menus</refentrytitle> <manvolnum>1</manvolnum>
-</citerefentry>, and
-<ulink url="&policy-menu;">The Debian Menu sub-policy</ulink> for more
-information.
-</para>
-</section>
<section id="news"><title><filename>NEWS</filename></title>
<para>
The <citerefentry> <refentrytitle>dh_installchangelogs</refentrytitle>
diff -Nru maint-guide-1.2.38/Makefile maint-guide-1.2.39/Makefile
--- maint-guide-1.2.38/Makefile 2015-06-09 21:30:08.000000000 +0900
+++ maint-guide-1.2.39/Makefile 2017-05-25 23:17:12.000000000 +0900
@@ -9,7 +9,7 @@
# languages translated with PO files
LANGPO := ca de es fr it ja ru zh-cn zh-tw
# languages to skip generation of PDF files
-NOPDF := ja zh-cn zh-tw
+NOPDF :=
# languages to build document
LANGALL = en $(LANGPO)
@@ -190,11 +190,7 @@
$(MANUAL).%.xml: $(DPO)/%.po $(MANUAL).en.xml
@$(call check-command, po4a-translate, po4a)
@$(call check-command, msgcat, gettext)
- if [ -f $(DPO)/$*.add ]; then \
- $(TRANSLATE) -m $(MANUAL).en.xml -a $(DPO)/$*.add -p $(DPO)/$*.po -l $(MANUAL).$*.xml ;\
- else \
- $(TRANSLATE) -m $(MANUAL).en.xml -p $(DPO)/$*.po -l $(MANUAL).$*.xml ;\
- fi
+ $(DBIN)/genxml $*
sed -i -e 's/$(DPO)\/en\.ent/$(DPO)\/$*.ent/' $@
#######################################################################
diff -Nru maint-guide-1.2.38/Makefile.po maint-guide-1.2.39/Makefile.po
--- maint-guide-1.2.38/Makefile.po 2014-07-24 21:12:07.000000000 +0900
+++ maint-guide-1.2.39/Makefile.po 1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
-#######################################################################
-# Build maint-guide
-# vim: set ts=8:
-#######################################################################
-### key adjustable parameters
-#######################################################################
-# languages translated with PO files
-LANGPO := ca de es fr it ja ru zh-cn zh-tw
-
-#######################################################################
-# $ make merge # merge po1 and po2 data into po
-#######################################################################
-merge: $(addprefix po/, $(addsuffix .po, $(LANGPO)))
-
-# po1 has priority over po2
-po/%.po: po1/%.po po2/%.po
- msgcat po1/$*.po po2/$*.po |\
- msguniq --use-first >po/$*.po
-
diff -Nru maint-guide-1.2.38/po/ca.po maint-guide-1.2.39/po/ca.po
diff -Nru maint-guide-1.2.38/po/de.po maint-guide-1.2.39/po/de.po
diff -Nru maint-guide-1.2.38/po/es.po maint-guide-1.2.39/po/es.po
diff -Nru maint-guide-1.2.38/po/fr.po maint-guide-1.2.39/po/fr.po
diff -Nru maint-guide-1.2.38/po/it.po maint-guide-1.2.39/po/it.po
diff -Nru maint-guide-1.2.38/po/ja.po maint-guide-1.2.39/po/ja.po
diff -Nru maint-guide-1.2.38/po/ru.po maint-guide-1.2.39/po/ru.po
diff -Nru maint-guide-1.2.38/po/templates.pot maint-guide-1.2.39/po/templates.pot
diff -Nru maint-guide-1.2.38/po/zh-cn.ent maint-guide-1.2.39/po/zh-cn.ent
diff -Nru maint-guide-1.2.38/po/zh-cn.po maint-guide-1.2.39/po/zh-cn.po
diff -Nru maint-guide-1.2.38/po/zh-tw.po maint-guide-1.2.39/po/zh-tw.po
diff -Nru maint-guide-1.2.38/script/cn2tw.sed maint-guide-1.2.39/script/cn2tw.sed
--- maint-guide-1.2.38/script/cn2tw.sed 2014-06-28 15:36:00.000000000 +0900
+++ maint-guide-1.2.39/script/cn2tw.sed 1970-01-01 09:00:00.000000000 +0900
@@ -1,58 +0,0 @@
-# Run this after opencc autoconversion, sed script shoule be run in this order:
-# doc content substitution
-s/簡體/繁體/g
-s/maint-guide-zh-cn/maint-guide-zh-tw/g
-# opencc bug work around
-s/在綫/在線/g
-s/發布里/發佈裏/g
-s/綫索/線索/g
-s/裏麵/裡面/g
-# idiom conversion
-# Left: string auto-converted from zh_CN to zh_TW with opencc
-# Right: better string to use under zh_TW
-# manually sorted list with longer one first etc.
-s/軟件包/套件/g
-s/軟件/軟體/g
-s/二進制包/二進位套件/g
-s/二進制/二進位/g
-s/源代碼包/原始碼套件/g
-s/源代碼/原始碼/g
-s/歸檔文件/壓縮檔/g
-s/文件/檔案/g
-s/文檔/文件/g
-s/內核模塊/核心模組/g
-s/內核補丁/核心補丁/g
-s/內核/核心/g
-# auto sorted list "sort"
-s/下劃綫/底線/g
-s/主頁/首頁/g
-s/代碼/程式碼/g
-s/信息/訊息/g
-s/分發/散佈/g
-s/刷新/更新/g
-s/半角/半形/g
-s/卸載/反安裝/g
-s/參看/參考/g
-s/圖標/圖示/g
-s/屏幕/螢幕/g
-s/操作系統/作業系統/g
-s/擴展名/副檔名/g
-s/數字簽名/數位簽章/g
-s/示例/範例/g
-s/社區/社群/g
-s/程序/程式/g
-s/老板本/舊版本/g
-s/自檢/自身測試/g
-s/解包/解壓縮/g
-s/解釋型/解譯型/g
-s/配置/設定/g
-# One character ones which needs to be careful
-s/棧/堆疊/g
-s/宏/巨集/g
-# Special exclusion rules
-s/\([^區]\)域/\1欄位/g
-s/\([^倉]\)庫/\1函式庫/g
-# formatting fix only for maint-guide table
-s/3 函數函式庫調用 系統函式庫提供的函數/3 函數函式庫調用 系統函式庫提供的函數/
-s/7 巨集包 例如 man 巨集/7 巨集包 例如 man 巨集/
-
diff -Nru maint-guide-1.2.38/script/cnpo2twpo.sh maint-guide-1.2.39/script/cnpo2twpo.sh
--- maint-guide-1.2.38/script/cnpo2twpo.sh 2015-05-24 00:37:22.000000000 +0900
+++ maint-guide-1.2.39/script/cnpo2twpo.sh 1970-01-01 09:00:00.000000000 +0900
@@ -1,34 +0,0 @@
-#!/bin/bash
-# cdlumin...@gmail.com
-
-#set -e
-
-# check arg
-if [ -z $1 ]||[ -z $2 ]; then
- echo "Usage: $0 <zh-cn.po> <zh-tw.po>"
- false
-fi
-
-# check pwd
-if [ ! -e ./Makefile ]; then
- echo "Please cd into source root dir"
- false
-fi
-
-# reformat and do zh_cn -> zh_tw transform via opencc
-printf "reformat... "
-msgcat --no-wrap $1 | opencc -o zhcnx.po
-msgcat --no-wrap $2 | opencc -o zhtwx.po
-
-# manipulate zhcnx.po with sed script
-printf "sed... "
-sed -i -f script/cn2tw.sed zhcnx.po
-
-# merge them together, and set the available translation in original
-# zh_tw.po as prior.
-printf "merge... "
-msgcat --use-first zhtwx.po zhcnx.po -o zh_tw.new.po
-
-# clean
-rm zhcnx.po zhtwx.po
-printf "done.\n"
diff -Nru maint-guide-1.2.38/xslt/xetex_param.xsl maint-guide-1.2.39/xslt/xetex_param.xsl
--- maint-guide-1.2.38/xslt/xetex_param.xsl 2015-05-24 11:33:59.000000000 +0900
+++ maint-guide-1.2.39/xslt/xetex_param.xsl 2017-05-15 00:35:39.000000000 +0900
@@ -3,58 +3,114 @@
<!-- vim: set sts=2 ai expandtab: -->
<!--############################################################################
- XSLT Stylesheet DocBook -> LaTeX
+ XSLT Stylesheet DocBook -> LaTeX (XeTeX focused)
############################################################################ -->
<xsl:param name="xetex.font">
- <!-- Western centric Adobe PostScript looks-alike: gsfonts: missing some odd codes, mono is thin
+ <!-- Set Western font: XeTeX default seems Latin Modern (LM) Family of Fonts -->
+ <!-- Depends: lmodern, tipa -->
+
+ <!-- Nimbus: Original Adobe PostScript looks-alike -->
+ <!-- Origin: URW++ -->
+ <!-- Depends: gsfonts -->
+ <!-- Note: missing some odd codes, mono is thin -->
+ <!--
<xsl:text>\setmainfont{Nimbus Roman No9 L} </xsl:text>
<xsl:text>\setsansfont{Nimbus Sans L} </xsl:text>
<xsl:text>\setmonofont{Nimbus Mono L} </xsl:text>
-->
- <!-- Western centric Bitstream Vera Fonts extended: DejaVu: too big and spaced
+ <!-- DejaVu: Extended coverage Bitstream Vera Fonts -->
+ <!-- Origin: GNOME, https://dejavu-fonts.github.io/ -->
+ <!-- Depends: fonts-dejavu -->
+ <!-- Note: mainly for computer screens, too big and spaced -->
+ <!--
<xsl:text>\setmainfont{DejaVu Serif} </xsl:text>
<xsl:text>\setsansfont{DejaVu Sans} </xsl:text>
<xsl:text>\setmonofont{DejaVu Sans Mono} </xsl:text>
-->
- <!-- Western centric MS (monotype) fonts looks-alike: Liberation : Best looking -->
+ <!-- Liberation: Extended coverage MS (monotype) fonts looks-alike -->
+ <!-- Origin: Red Hat, https://pagure.io/liberation-fonts -->
+ <!-- Depends: fonts-liberation2 -->
+ <!-- License: SIL -->
+ <!-- Note: Best looking -->
<xsl:text>\setmainfont{Liberation Serif} </xsl:text>
<xsl:text>\setsansfont{Liberation Sans} </xsl:text>
<xsl:text>\setmonofont{Liberation Mono} </xsl:text>
+ <!-- GNU FreeFont: Extended coverage Adobe PostScript looks-alike -->
+ <!-- Origin: GNU, https://www.gnu.org/software/freefont -->
+ <!-- Depends: fonts-freefont-otf -->
+ <!-- License: GPL3+ font_exception -->
+ <!-- Note: Best looking -->
+ <!--
+ <xsl:text>\setmainfont{FreeSerif} </xsl:text>
+ <xsl:text>\setsansfont{FreeSans} </xsl:text>
+ <xsl:text>\setmonofont{FreeMono} </xsl:text>
+ -->
+
+ <!-- Only non-latin chars seem to use \setCJK*font settings -->
+ <xsl:text>\usepackage{xeCJK} </xsl:text>
<xsl:choose>
<xsl:when test="$lingua = 'zh-cn'">
- <!-- zh_CN centric: ttf-arphic-gbsn00lp, ttf-wqy-zenhei -->
- <xsl:text>\usepackage{xeCJK} </xsl:text>
+ <!-- zh_CN centric: main=Serif CJK Arphic+文泉-->
+ <!-- Depends: fonts-arphic-gbsn00lp -->
+ <!-- Depends: fonts-wqy-zenhei -->
+ <!--
<xsl:text>\setCJKmainfont{AR PL SungtiL GB} </xsl:text>
<xsl:text>\setCJKsansfont{WenQuanYi Zen Hei} </xsl:text>
<xsl:text>\setCJKmonofont{WenQuanYi Zen Hei Mono} </xsl:text>
+ -->
+ <!-- zh_CN centric: main=Sans CJK, Google Droid derivative-->
+ <!-- Depends: fonts-wqy-microhei -->
+ <xsl:text>\setCJKmainfont{WenQuanYi Micro Hei} </xsl:text>
+ <xsl:text>\setCJKsansfont{WenQuanYi Micro Hei} </xsl:text>
+ <xsl:text>\setCJKmonofont{WenQuanYi Micro Hei Mono} </xsl:text>
</xsl:when>
<xsl:when test="$lingua = 'zh-tw'">
- <!-- zh_TW centric: ttf-arphic-bsmi00lp, ttf-wqy-zenhei -->
- <xsl:text>\usepackage{xeCJK} </xsl:text>
+ <!-- zh_TW centric: main=Serif CJK Arphic+文泉 -->
+ <!-- Depends: fonts-arphic-bsmi00lp -->
+ <!-- Depends: fonts-wqy-zenhei -->
+ <!--
<xsl:text>\setCJKmainfont{AR PL Mingti2L Big5} </xsl:text>
<xsl:text>\setCJKsansfont{WenQuanYi Zen Hei} </xsl:text>
<xsl:text>\setCJKmonofont{WenQuanYi Zen Hei Mono} </xsl:text>
- </xsl:when>
- <xsl:when test="$lingua = 'ja'">
- <!-- ja centric: otf-ipafont-mincho otf-ipafont-gothic -->
- <xsl:text>\usepackage{xeCJK} </xsl:text>
- <xsl:text>\setCJKmainfont{IPAMincho} </xsl:text>
- <xsl:text>\setCJKsansfont{IPAPGothic} </xsl:text>
- <xsl:text>\setCJKmonofont{IPAGothic} </xsl:text>
+ -->
+ <!-- zh_TW centric: main=Sans CJK, Google Droid derivative-->
+ <!-- Depends: fonts-wqy-microhei -->
+ <xsl:text>\setCJKmainfont{WenQuanYi Micro Hei} </xsl:text>
+ <xsl:text>\setCJKsansfont{WenQuanYi Micro Hei} </xsl:text>
+ <xsl:text>\setCJKmonofont{WenQuanYi Micro Hei Mono} </xsl:text>
</xsl:when>
<xsl:when test="$lingua = 'ko'">
- <!-- ko centric: ttf-unfonts-core -->
- <xsl:text>\usepackage{xeCJK} </xsl:text>
+ <!-- ko centric: -->
+ <!-- Depends: fonts-unfonts-core -->
<xsl:text>\setCJKmainfont{UnBatang} </xsl:text>
<xsl:text>\setCJKsansfont{UnDotum} </xsl:text>
<xsl:text>\setCJKmonofont{UnDotum} </xsl:text>
</xsl:when>
<xsl:otherwise>
- <!-- set none -->
+ <!-- This includes English etc. (English original text has my name in Japanese -->
+ <!-- ja centric: Older IPA, main=serif -->
+ <!-- Depends: fonts-ipafont -->
+ <!--
+ <xsl:text>\setCJKmainfont{IPAPMincho} </xsl:text>
+ <xsl:text>\setCJKsansfont{IPAPGothic} </xsl:text>
+ <xsl:text>\setCJKmonofont{IPAGothic} </xsl:text>
+ -->
+ <!-- ja centric: Newer IPA, main=serif -->
+ <!-- Depends: fonts-ipaexfont -->
+ <!--
+ <xsl:text>\setCJKmainfont{IPAexMincho} </xsl:text>
+ <xsl:text>\setCJKsansfont{IPAexGothic} </xsl:text>
+ <xsl:text>\setCJKmonofont{IPAexGothic} </xsl:text>
+ -->
+ <!-- ja centric: main=sans -->
+ <!-- Depends: fonts-vlgothic -->
+ <xsl:text>\setCJKmainfont{VL PGothic} </xsl:text>
+ <xsl:text>\setCJKsansfont{VL PGothic} </xsl:text>
+ <xsl:text>\setCJKmonofont{VL Gothic} </xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:param>
@@ -64,7 +120,7 @@
<!--
= Asian font basics =
-Use xCJK only for CJK http://bugs.debian.org/666569
+NOTE: This is slightly outdated
== Sanserif ==
simplified Chinese: 黑体 hēi tǐ
signature.asc
Description: PGP signature
