1. Update tex-live.sty to reflect 2008 changes from english version.

2. Use xeCJK instead of xcp.py to process Chinese in XeTeX 0.997+.
3. Rename live.tex to texlive-zh-cn.tex to match other translations.



git-svn-id: svn://tug.org/texlive/trunk@9925 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 110 insertions, 62 deletions

diff --git a/Master/texmf-doc/source/texlive/texlive-zh-cn/Makefile b/Master/texmf-doc/source/texlive/texlive-zh-cn/Makefile
index fd4ca4ee60f..6541a022547 100644
--- a/Master/texmf-doc/source/texlive/texlive-zh-cn/Makefile
+++ b/Master/texmf-doc/source/texlive/texlive-zh-cn/Makefile
@@ -1,8 +1,47 @@
-live.pdf: live.true.pdf
-	mv live.true.pdf live.pdf
+# $Id:$
+# Makefile for TeX Live documentation.  Public domain.
+TEX = xelatex
+doc = texlive-zh-cn
+source = $(doc).tex
+pdf = $(doc).pdf
+lang = chinese
 
-live.true.pdf: live.true.tex
-	xelatex -output-driver="xdvipdfmx -q -E" live.true.tex
+all: $(pdf)
+
+env = TEXINPUTS=../texlive-common:../texlive-zh-cn:; export TEXINPUTS;
+
+$(pdf): $(source)
+	$(env) $(TEX) $<
+	$(env) $(TEX) $<
+
+clean:
+	rm -f *.aux *.log *.blg *.toc *.out *.lot tex4ht.ps *.4*
+	rm -f *.xref* *.lg *.idv *.out *.otc *.tmp tmp.*
+	rm -f $(doc).dvi $(doc).ps
+
+realclean: clean
+	rm -f $(doc).pdf
+	rm -f *.html *.htm $(doc).css *.gif *.jpg
+
+
+insttop = ../../../doc
+instfiles = $(doc)*html $(doc).css $(doc).pdf
+copyfiles = *.png
+install:
+#	lang=`dirname \`pwd\` | sed 's,.*/,,'`;
+	lang=$(lang); \
+	tldir=`pwd | sed 's,.*/,,'`; \
+	instdir=$(insttop)/$$lang/$$tldir; \
+	echo tldoc install to $$instdir; \
+	for f in $(instfiles); do \
+	  cmp -s $$f $$instdir/$$f && rm -v $$f && continue; \
+	  mv -v $$f $$instdir/$$f; \
+	done; \
+	lang=$(lang); \
+	tldir=`pwd | sed 's,.*/,,'`; \
+	instdir=$(insttop)/$$lang/$$tldir; \
+	for f in $(copyfiles); do \
+	  cmp -s $$f $$instdir/$$f && continue; \
+	  cp -v $$f $$instdir/$$f; \
+	done; echo "$$instdir"
 
-live.true.tex: live.tex
-	python xcp.py live.tex > live.true.tex
diff --git a/Master/texmf-doc/source/texlive/texlive-zh-cn/tex-live.sty b/Master/texmf-doc/source/texlive/texlive-zh-cn/tex-live.sty
index 5cb816d0d5e..b3c9ee3d096 100644
--- a/Master/texmf-doc/source/texlive/texlive-zh-cn/tex-live.sty
+++ b/Master/texmf-doc/source/texlive/texlive-zh-cn/tex-live.sty
@@ -1,7 +1,7 @@
-% $Id$
+% $Id: tex-live.sty 9758 2008-07-25 00:47:03Z karl $
 % TeX Live documentation style.  Written by many people over many years.
 % Public domain.
-% 
+%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{tex-live}[2005/09/24 v1.5 TeX Live documentation style]
 %
@@ -16,25 +16,34 @@
 \RequirePackage[normalem]{ulem}
 \RequirePackage[obeyspaces]{url}
 \RequirePackage{xspace}
-\RequirePackage{fontspec}
 
-\newfontinstance\zhfont[BoldFont=Adobe Heiti Std, ItalicFont=Adobe Heiti Std]{Adobe Song Std}
-\newcommand{\zh}[1]{{\zhfont #1}}
+% Chinese support (with XeTeX 0.997+)
+\RequirePackage{xeCJK} 
+\setCJKmainfont[BoldFont=Adobe Heiti Std]{Adobe Song Std}
+\setCJKmonofont[Scale=0.9]{Adobe Kaiti Std}
+\setCJKfamilyfont{song}[BoldFont=Adobe Heiti Std]{Adobe Song Std}
 
-\XeTeXlinebreaklocale "zh" 
-\XeTeXlinebreakskip = 0pt plus 1pt
+\renewcommand\contentsname{目录}
+\renewcommand\listfigurename{插图列表}
+\renewcommand\listtablename{表格列表}
+\renewcommand\refname{参考文献}
+\renewcommand\indexname{索引}
+\renewcommand\figurename{图}
+\renewcommand\tablename{表}
+\renewcommand\partname{部分}
+\renewcommand\appendixname{附录}
+\renewcommand\abstractname{摘要}
+\setlength{\parskip}{5pt}
 
-\parindent=20pt 
 %
 %\RequirePackage{lmodern}
 %\usepackage{textcomp}% including \textbullet
-%\usepackage[T1]{fontenc}
-%\usepackage[latin1]{inputenc}
-%
-% for a proper \acro command (even in the context of the definition in
-% ltugboat -- \DRC overrides without checking)
+\def\p.{p.\,}
+
+% for a proper \acro command.
 \RequirePackage{relsize}
-\DeclareRobustCommand{\acro}[1]{#1\@}
+%\DeclareRobustCommand{\acro}[1]{\textscale{.9}{#1}\@}
+\def\acro#1{\textscale{.9}{#1}\@}
 %
 \RequirePackage{fancyvrb}
 \DefineVerbatimEnvironment{verbatim}{Verbatim}{fontsize=\normalsize}
@@ -50,7 +59,7 @@
 %
 %
 % Done with packages.
-% 
+%
 % Page layout.
 \advance\textwidth by 1.1in
 \advance\oddsidemargin by -.55in
@@ -65,17 +74,19 @@
 \renewcommand{\topfraction}{0.85}
 \renewcommand{\floatpagefraction}{0.86}
 \renewcommand{\textfraction}{0.1}
+\renewcommand{\abovecaptionskip}{4pt}
 \renewcommand{\belowcaptionskip}{4pt}
-\setcounter{tocdepth}{2}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
 \setcounter{topnumber}{5}
 \setcounter{totalnumber}{5}
-% 
+%
 % linebreaking, etc.
 \hbadness=4000
 \vbadness=4000
 \emergencystretch=.1\hsize
 \relpenalty=500
-% 
+%
 \def\slash{/\penalty\z@\hskip\z@skip }
 %
 % various sorts of names
@@ -88,24 +99,26 @@
 \newcommand*{\envname}[1]{\texttt{#1}}% environment variable name
 \newcommand{\code}[1]{\texttt{#1}}
 \newcommand{\file}[1]{\texttt{#1}}
-\newcommand{\prog}[1]{\texttt{#1}}
+\newcommand{\prog}[1]{\textsf{#1}}% same as \cmdname
 \newcommand{\samp}[1]{`\texttt{#1}'}
 \newcommand{\var}[1]{{\sl #1}}% not \textsl, for roman not typewriter slanted.
 \newcommand{\ttvar}[1]{\texttt{\var{#1}}}
 %
 % underlined command input.
-\def\Ucom#1{%
-   \uline{\rule[-.2\baselineskip]{0pt}{.9\baselineskip}\ttfamily #1}}
+%\def\Ucom#1{%
+%   \uline{\rule[-.2\baselineskip]{0pt}{.9\baselineskip}\ttfamily #1}}
+% bold command input
+\def\Ucom#1{{\bfseries\ttfamily #1}}
 %
 % \CDref is for url's with a #, where we need to write the target url and
-% displayed url separately in the input, due to catcode madness.  
+% displayed url separately in the input, due to catcode madness.
 % (We could simplify/remove this next time, I think.)
 \def\CDref#1#2{\texttt{#1}}
 %
 % \OnCD is currently for any other reference to a file or directory in
 % the distribution.  PDF readers only open .pdf files, though, so we
 % should change this to only use \href for those.  Or more likely use
-% different macros in the source. 
+% different macros in the source.
 \def\OnCD#1{\href{../../../../#1}{\path{#1}}}
 %
 % \href incorrectly appends .pdf to anything without an extension; these
@@ -141,20 +154,20 @@
 \def\GFtoDVI{\cmdname{GFtoDVI}\null}
 \def\GFtoPK{\cmdname{GFtoPK}\null}
 \def\GFtype{\cmdname{GFtype}}
+\def\GUI{\acro{GUI}\xspace}
 \def\KPS{Kpathsea}
 \def\La{La}
 \def\OMEGA{$\Omega$}
 \def\OzMF{OzMF}
 \def\OzMP{OzMP}
 \def\OzTeX{O\kern-.03em z\kern-.15em\TeX}
-\def\p.{p.\,}
 \def\PKtype{\cmdname{PKtype}}
 \def\PLtoTF{\cmdname{PLtoTF}\null}
 \def\ProTeXt{Pro\TeX t}
 \def\teTeX{\textrm{te}\TeX\xspace}
 \def\TeXLive{\TeX{} Live\xspace}
 \def\TFtoPL{\cmdname{TFtoPL}\null}
-\def\TK{\textsf{\TeX\ Collection}}
+\def\TK{\TeX\ Collection}
 \let\TL=\TeXLive
 \def\TypeI{Type~1}
 \def\VFtoVP{\cmdname{VFtoVP}\null}
@@ -162,22 +175,25 @@
 \def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}
 \def\XEmTeX{\textrm{XEm}\TeX\xspace}
 \def\XEmacs{\textrm{XEmacs}\xspace}
+\def\XeTeX{Xe\TeX\xspace}
 \def\Webc{Web2C}
 \providecommand*{\CD}{\acro{CD}\xspace}
 \providecommand*{\CTAN}{\acro{CTAN}\xspace}
 \providecommand*{\DVD}{\acro{DVD}\xspace}
+\providecommand*{\GNU}{\acro{GNU}\xspace}
+\providecommand*{\ISO}{\acro{ISO}\xspace}
 \providecommand*{\HTML}{\acro{HTML}\xspace}
-\providecommand*{\MacOSX}{Mac\,OS\,X\xspace}
+\providecommand*{\MacOSX}{Mac\,\acro{OS\,X}\xspace}
 \providecommand*{\PS}{Post\-Script\xspace}
 \providecommand*{\TDS}{\acro{TDS}\xspace}
 \providecommand*{\dvi}{\acro{DVI}\xspace}
-\providecommand*{\web}{\texttt{web}\xspace}
+\providecommand*{\web}{\texttt{WEB}\xspace}
 
 % Include an image.
 % #1 - name of image (pictures/#1.jpg, always .jpg please)
 % #2 - bb for html
 % #3 - width for TeX
-% 
+%
 \def\tlimage#1#2#3{%
   \ifnum \Status=2 % html, want relative path in output
     \includegraphics[#2]{../../general/texlive-common/pictures/#1.jpg}
@@ -186,11 +202,19 @@
   \fi
   \\[5mm]
 }
+
+\def\tlpng#1#2{%
+  \ifnum \Status=2 % html, want relative path in output
+    \includegraphics[bb=0 0 1 1]{#1.png}%
+  \else % not html, handled by TEXINPUTS in Makefile
+    \includegraphics[width=#2]{#1.png}%
+  \fi
+}
 %
 % description-like environment that uses tt instead of bf, and doesn't
 % go to the left margin.  Without the \hfil, get an underfull box.
 % Don't know why \descriptionlabel doesn't.
-% 
+%
 \newenvironment{ttdescription}
   {\begin{list}{label must be supplied}{%
      \itemsep=0pt  % these lists tend to have short descriptions
@@ -208,8 +232,6 @@
   {\end{list}}
 \newcommand*\cmddescriptionlabel[1]{\hspace\labelsep
                                     \normalfont\sffamily #1\hfil}
-                                    
-\setlength{\parskip}{5pt}
 
 % General squeezed itemize.
 \newenvironment{itemize*}%
@@ -233,7 +255,7 @@
 
 
 % emacs-page output setup
-% 
+%
 \ifx \HCode\UnDef
   \providecommand{\Status}{0}% running TeX
 \else
@@ -241,7 +263,7 @@
 \fi
 %\typeout{Status is \Status}
 %
-\newif\ifSingleColumn 
+\newif\ifSingleColumn
 %
 % By default, we won't be creating hyperlinks.
 \def\href#1#2{#2}
@@ -261,8 +283,7 @@
   \typeout{TeX Live documentation in PDF format}
   \RequirePackage[breaklinks,
                   colorlinks,linkcolor=hypercolor,citecolor=hypercolor,
-                    pagecolor=hypercolor,urlcolor=hypercolor,
-                    filecolor=hypercolor,
+                    urlcolor=hypercolor,filecolor=hypercolor,
                   bookmarksopen,
                   %pdfstartview={FitBH -320000}, % fails with acrobat7
                   hyperindex]
@@ -299,7 +320,7 @@
   \SingleColumnfalse
   \newenvironment{multicols}[1]{}{}
 \fi
-% 
+%
 \ifnum \Status=4
 \else
   \RequirePackage{texnames}
@@ -398,7 +419,7 @@
  \global\advance\colrow by1\relax
  \ifodd\colrow
    \gdef\RowColor{pale}%
- \else  
+ \else
    \gdef\RowColor{white}%
  \fi
 }
@@ -437,18 +458,4 @@
 % Silence hyperref warnings about \kern.
 \def\HyPsd@Warning#1{}%
 
-% Added by jjgod, for Chinese version
-\renewcommand\contentsname{\zh{目录}}
-\renewcommand\listfigurename{\zh{插图列表}}
-\renewcommand\listtablename{\zh{表格列表}}
-\renewcommand\refname{\zh{参考文献}}
-\renewcommand\indexname{\zh{索引}}
-\renewcommand\figurename{\zh{图}}
-\renewcommand\tablename{\zh{表}}
-\renewcommand\partname{\zh{部分}}
-\renewcommand\appendixname{\zh{附录}}
-\renewcommand\abstractname{\zh{摘要}}
-
-\def\MakeUppercase{}
-
 \endinput
diff --git a/Master/texmf-doc/source/texlive/texlive-zh-cn/live.tex b/Master/texmf-doc/source/texlive/texlive-zh-cn/texlive-zh-cn.tex
index 5d5f76703e5..b4e482b2b92 100644
--- a/Master/texmf-doc/source/texlive/texlive-zh-cn/live.tex
+++ b/Master/texmf-doc/source/texlive/texlive-zh-cn/texlive-zh-cn.tex
@@ -6,7 +6,7 @@
 %               Yule Wang    <yulewang@gmail.com>
 %               Helin Gai    <helin.gai@gmail.com>
 % Public domain.
-% 
+%
 \documentclass{article}
 \let\tldocenglish=1  % for live4ht.cfg
 
@@ -15,8 +15,8 @@
 \begin{document}
 
 \title{%
-  {\huge \textit{\protect\TL{} 指南}\\\strut}
-  {\LARGE \textsf{\TK{} 2008}}
+  {\huge \textit{\TeX\ Live 指南}\\\smallskip}%
+  {\LARGE \textsf{\TL{} 2008}}
 }
 
 \author{Karl Berry 编写 \\[3mm]
@@ -29,12 +29,14 @@
 
 \begin{multicols}{2}
 \tableofcontents
-\listoftables
+%\listoftables
 \end{multicols}
 
 \section{简介}
 \label{sec:intro}
 
+\subsection{\TeX\ Live 与 \TeX\ Collection}
+
 本文档描述 \TL{} 软件的主要功能和特性，\TL{} 是 \TeX{} 及其相关程序在 
 \acro{GNU}/Linux 及其他类 Unix 系统、\MacOSX\ 和 Windows 
 系统下的一套发行版。
@@ -158,7 +160,7 @@ Catalogue 就是你首先该找的地方。这里是所有 \TeX{} 相关内容�
 
 \item [\TL]  是一個完整的 \TeX{} 系統, 它可以直接在光盘上運行, 也可以安裝在本地的磁盘上.
 
-\item [Mac\TeX] 在 \TL{} 的基礎上, 又增加了一个 \MacOSX\ 的安装程序和其它的 Mac 应用. 它的官方主页在 \urs{http://www.tug.org/mactex/}
+\item [Mac\TeX] 在 \TL{} 的基礎上, 又增加了一个 \MacOSX\ 的安装程序和其它的 Mac 应用. 它的官方主页在 \url{http://www.tug.org/mactex/}
 \item [pro\TeX{}t] 是 Windows 下的 \MIKTEX\ 发行版的一个增强版本。\ProTeXt\ 在 
 \MIKTEX\ 基础上增加了一些额外的工具，简化了安装过程。它是完全独立于 \TL{} 的，有其
 自己的安装步骤。\ProTeXt\ 的主页在 \url{http://tug.org/protext}。