texlive[73160] Master/texmf-dist/doc/latex/lshort-chinese:
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 18 22:12:32 CET 2024
Revision: 73160
https://tug.org/svn/texlive?view=revision&revision=73160
Author: karl
Date: 2024-12-18 22:12:32 +0100 (Wed, 18 Dec 2024)
Log Message:
-----------
lshort-chinese (18dec24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/lshort-chinese/lshort-zh-cn.pdf
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/app.B.error.help.tex
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.contrib.tex
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty
trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/lshort-zh-cn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/app.B.error.help.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/app.B.error.help.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/app.B.error.help.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -133,7 +133,7 @@
\section{查找帮助文档}\label{sec:texdoc}
\index{texdoc@\texttt{texdoc} 工具}
-无论是 \hologo{TeXLive} 还是 \hologo{MiKTeX}，提供了一个命令行模式的程序 \texttt{texdoc}。
+无论是 \hologo{TeXLive} 还是 \hologo{MiKTeX}，都提供了一个命令行模式的程序 \texttt{texdoc}。
比如对 \ref{subsec:fancyhdr} 小节的 \pkg{fancyhdr} 宏包感兴趣，这时在 Windows 命令提示符或者 Linux 终端输入以下命令，
则会弹出宏包的帮助文档 \texttt{fancyhdr.pdf}：
\begin{verbatim}
@@ -142,8 +142,8 @@
除了宏包的帮助文档外，\TeX{} 发行版还包括了各类有用的文档，有一部分在参考文献中给出。
-如果不熟悉命令行工具的话，\hologo{TeXLive} 提供了一个图形界面的程序 TeXdoc GUI。打开后，可以看到程序里的许多按钮，分别代表某一类的帮助文档。
-除此之外，点击 File Search 弹出搜索框，输入想要搜索的宏包和文件并按回车键，TeXdoc GUI 会弹出它搜索到的所有结果，可点击任意一项来打开文档。
+%如果不熟悉命令行工具的话，\hologo{TeXLive} 提供了一个图形界面的程序 TeXdoc GUI。打开后，可以看到程序里的许多按钮，分别代表某一类的帮助文档。
+%除此之外，点击 File Search 弹出搜索框，输入想要搜索的宏包和文件并按回车键，TeXdoc GUI 会弹出它搜索到的所有结果，可点击任意一项来打开文档。
当然对于初学者，有一个现实而棘手的问题：\textbf{某个命令到底是 \LaTeX{} 自有的，还是哪个宏包提供的？}
很遗憾地说，除了通过慢慢积累、熟悉较多宏包之外，没有很方便的办法解决这个问题，因为 \LaTeX{} 的宏包实在太丰富了。
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -276,6 +276,7 @@
\hline
\end{tabular}
\end{center}
+更多的 \LaTeX{} 标志可以使用 \pkg{hologo} 宏包提供的 \cmd{hologo} 命令输入。
\section{断行和断页}\label{sec:break}
@@ -295,7 +296,7 @@
通常用在英文人名、图表名称等上下文环境：
\begin{example}
Fig.~2a \\
-Donald~E. Knuth
+Donald~E.~Knuth
\end{example}
\subsection{手动断行和断页}\label{subsec:manual-break}
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -176,7 +176,7 @@
Louis
\end{tabular}\par}%
\vskip 1em%
- {\large \csname CTEX at todayold\endcsname}%
+ {\large \CTEX at todayold}%
\end{minipage}
\makeatother
\caption{\LaTeX{} 默认的标题页示例和效果。}\label{code:titlepage}
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -167,7 +167,7 @@
\end{example}
\pinyinindex{daoshu}{导数符号\texttt' ($a'$)}
-导数符号\texttt'(${}'$)是一类特殊的上标，可以适当连用表示多阶导数，也可以在其后连用上标：
+导数符号\texttt'(${}'$)是一类特殊的上标，可连续使用，但只能在\textbf{其后}添加其他上标：
\begin{example}
$f(x) = x^2 \quad f'(x)
= 2x \quad f''^{2}(x) = 4$
@@ -191,7 +191,7 @@
\end{example}
\mathindex{sqrt}
-一般的根式使用 \cmd{sqrt}\marg*{...}；表示 $n$ 次方根时写成 \cmd{sqrt}\oarg*{\textit{n}}\marg*{...}。
+一般的根式使用 \cmd{sqrt}\marg*{…}；表示 $n$ 次方根时写成 \cmd{sqrt}\oarg*{\textit{n}}\marg*{…}。
\begin{example}
$\sqrt{x} \Leftrightarrow x^{1/2}
\quad \sqrt[3]{2}
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.contrib.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.contrib.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.contrib.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -5,7 +5,7 @@
参与此次修订的朋友包括：
\begin{center}
-\begin{tabular}{cccc}
+\begin{tabular}{llll}
atxy-blip & SainoNamkho & OsbertWang & syvshc \\
chenxijun & yunhao94 & hushidong
\end{tabular}
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty 2024-12-18 21:12:32 UTC (rev 73160)
@@ -1,12 +1,11 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{lshort-zh-cn-style}
-
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% lshort 调用的宏包
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% 基本工具宏包
-%
\RequirePackage{amsmath,amsthm,bm}
\RequirePackage{hologo,verbatim,fancyvrb,layout,multicol}
\RequirePackage[normalem]{ulem}
@@ -15,18 +14,14 @@
\RequirePackage{makeidx}
\RequirePackage[inner=1in,outer=1.5in,vmargin=1in,marginparwidth=1in]{geometry}
\RequirePackage{tikz}
-
%
% ctex 宏包 2.2(2015/06/24) 或以上版本
% ctex 宏包的字号设定会让许多固定字号的字体宏包报太多 warning，应当抑制
% 中文正文字体使用 Fandol
-%
\PassOptionsToPackage{no-math}{fontspec}
\RequirePackage[zihao=false,scheme=chinese,heading=true,fontset=fandol]{ctex}[2015/06/24]
-
%
% 字体和符号宏包
-%
\setmainfont{cmun}[
Extension = .otf,
UprightFont = *rm,
@@ -50,12 +45,11 @@
BoldFont = *tb,
BoldItalicFont = *tx,
]
-\RequirePackage{amssymb,latexsym,textcomp,mathrsfs,euscript,yhmath} % 与默认字体不冲突的一些符号包
+\RequirePackage{amssymb,latexsym,textcomp,mathrsfs,euscript,yhmath}% 与默认字体不冲突的一些符号包
% 消除 \t 命令的字体 warning
-\AtBeginDocument{%}
- \renewcommand*\t[1]{{\edef\restore at font{\the\font}\usefont{OML}{cmm}{m}{it}\accent"7F\restore at font#1}}
+\AtBeginDocument{%
+ \DeclareRobustCommand*\t[1]{{\edef\restore at font{\the\font}\usefont{OML}{cmm}{m}{it}\accent"7F\restore at font#1}}%
}
-
% 调整 layout 宏包的命令使之能够放入浮动体，手动指定奇偶页的 layout
\input lshort-zh-cn-layout
\oddsidelayouttrue
@@ -66,22 +60,18 @@
\def\MarginNotestext{边注}
\def\oneinchtext{1in}
\def\notshown{未显示}
-
% hyperref 基本设定
\RequirePackage{hyperref}
\hypersetup{colorlinks,%
bookmarksnumbered=true,%
pdfstartview=FitH}
-
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% lshort 的版式设置
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\raggedbottom
-
%
% 不依赖 fancyhdr 的页眉页脚设定
-%
\addtolength{\headheight}{1.6pt}
\newdimen\headwidth \headwidth\textwidth
\newdimen\headrulewidth \headrulewidth=0.4pt
@@ -94,48 +84,44 @@
\hb at xt@\headwidth{\bfseries\rightmark\hfil\thepage}%
\vss\hrule\@height\headrulewidth}}%
\let\@mkboth\markboth
- \def\chaptermark##1{\markboth{\if at mainmatter\CTEXthechapter\fi\quad ##1}{}}
- \def\sectionmark##1{\markright{\S\thesection\quad ##1}}
+ \def\chaptermark##1{\markboth{\if at mainmatter\CTEXthechapter\fi\quad ##1}{}}%
+ \def\sectionmark##1{\markright{\S\thesection\quad ##1}}%
}
%\let\ps at plain\ps at fancyplain
\pagestyle{fancy}
-
%
% 不依赖 tocbibind 的参考文献/索引修改
% 索引依赖 multicols 环境排版
-%
\renewenvironment{thebibliography}[1]
{\chapter{\bibname}%
- \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
- \list{\@biblabel{\@arabic\c at enumiv}}%
- {\settowidth\labelwidth{\@biblabel{#1}}%
- \leftmargin\labelwidth
- \advance\leftmargin\labelsep
- \@openbib at code
- \usecounter{enumiv}%
- \let\p at enumiv\@empty
- \renewcommand\theenumiv{\@arabic\c at enumiv}}%
- \sloppy
- \clubpenalty4000
- \@clubpenalty \clubpenalty
- \widowpenalty4000%
- \sfcode`\.\@m}
- {\def\@noitemerr
- {\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
+ \list{\@biblabel{\@arabic\c at enumiv}}%
+ {\settowidth\labelwidth{\@biblabel{#1}}%
+ \leftmargin\labelwidth
+ \advance\leftmargin\labelsep
+ \@openbib at code
+ \usecounter{enumiv}%
+ \let\p at enumiv\@empty
+ \renewcommand\theenumiv{\@arabic\c at enumiv}}%
+ \sloppy
+ \clubpenalty4000
+ \@clubpenalty \clubpenalty
+ \widowpenalty4000%
+ \sfcode`\.\@m}
+ {\def\@noitemerr
+ {\@latex at warning{Empty `thebibliography' environment}}%
+ \endlist}
\renewenvironment{theindex}%
{\chapter{\indexname}%
- \@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}%
- \parskip\z@ \@plus .3\p@\relax
- \let\item\@idxitem
- \small
- \begin{multicols}{2}}
- {\end{multicols}}
-
+ \@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}%
+ \parskip\z@ \@plus .3\p@\relax
+ \let\item\@idxitem
+ \small
+ \begin{multicols}{2}}
+ {\end{multicols}}
%
% 将主目录和源代码目录合并排版
% 不依赖 float 宏包的 \listof，因此要补充定义 \l at sourcecode
-%
\renewcommand\tableofcontents%
{\chapter{\contentsname}%
\@mkboth{\MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
@@ -145,41 +131,28 @@
\@makeschapterhead{\sourcecodename}%
\@starttoc{los}%
}
-
%
% 令 \cleardoublepage 的偶数页页眉页脚为空
-%
\renewcommand{\cleardoublepage}
{\clearpage\if at twoside \ifodd\c at page\else
\hbox{}\thispagestyle{empty}\newpage\if at twocolumn\hbox{}\newpage\fi\fi\fi}
-
% 允许 hologo 断词
\hologoSetup{discretionarybreak=true}
% 不在 METAFONT 和 METAPOST 中断行，避免出现字体缺失警告（该字体不包含连字符）
\def\HoLogo at METAFONT#1{%
- \HoLogoFont at font{METAFONT}{logo}{%
- \HOLOGO at mbox{METAFONT}%
- }%
-}
+ \HoLogoFont at font{METAFONT}{logo}{\HOLOGO at mbox{METAFONT}}}
\def\HoLogo at METAPOST#1{%
- \HoLogoFont at font{METAPOST}{logo}{%
- \HOLOGO at mbox{METAPOST}%
- }%
-}
+ \HoLogoFont at font{METAPOST}{logo}{\HOLOGO at mbox{METAPOST}}}
% 新定义 hologo
\def\HoLogo at TeXLive#1{%
- \hologo{TeX}\HOLOGO at space\HOLOGO at mbox{Live}%
-}
+ \hologo{TeX}\HOLOGO at space\HOLOGO at mbox{Live}}
\def\HoLogo at MacTeX#1{%
- \HOLOGO at mbox{Mac}\hologo{TeX}%
-}
+ \HOLOGO at mbox{Mac}\hologo{TeX}}
\def\HoLogo at CTeX#1{%
- \HOLOGO at mbox{C}\hologo{TeX}%
-}
+ \HOLOGO at mbox{C}\hologo{TeX}}
\def\HoLogo at TikZ#1{%
- \HOLOGO at mbox{Ti\textit{k\/}Z}%
-}
-
+ \HOLOGO at mbox{Ti\textit{k\/}Z}}
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% lshort 用到的自定义命令
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -186,21 +159,16 @@
%
% 源自 TeX FAQ 的超链接命令
% CTAN 镜像暂用清华源
-%
\newcommand{\Email}{\begingroup \def\UrlLeft{<}\def\UrlRight{>} \urlstyle{tt}\Url} % email address
\def\mailto|#1|{\href{mailto:#1}{\Email|#1|}} % url to mail somewhere
\def\CTANref{\begingroup \urlstyle{tt}\Url}
\def\CTAN|#1|{\href{https://mirrors.tuna.tsinghua.edu.cn/CTAN/#1}{\CTANref|CTAN://#1|}}
\newcommand{\contrib}[3]{#1\quad\mailto|#2|{\small\\\quad\textit{#3}}\\[1ex]}
-
%
% 示意长度
-%
\def\demowidth#1{\rule{.6pt}{1ex}\rule{#1}{.6pt}\rule{.6pt}{1ex}}
-
%
% 命令和环境的写法
-%
\DeclareRobustCommand*\cmd[1]{\texttt{\char`\\#1}}
\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
\def\crcmd{\cmd{\char`\\}}
@@ -215,10 +183,8 @@
\def\@marg#1{\texttt{\{#1\}}}
\def\@margmeta#1{\@marg{\@meta{#1}}}
\def\@meta#1{$\m at th\langle$\textnormal{\textit{#1}}$\m at th\rangle$}
-
%
% 命令和环境的索引
-%
\def\pkgindex#1{\@for\pkgname:=#1\do{\index{\pkgname @\pkg{\pkgname} 宏包}}}
\def\clsindex#1{\@for\clsname:=#1\do{\index{\clsname @\cls{\clsname} 文档类}}}
\def\cmdindex{\@ifnextchar[{\pkgcmdindex}{\ltxcmdindex}}
@@ -227,34 +193,27 @@
\def\ltxenvindex#1{\@for\@ltxenv:=#1\do{\index{\@ltxenv @\env{\@ltxenv} 环境}}}
\def\pkgcmdindex[#1]#2{\@for\@pkgcmd:=#2\do{\index{\@pkgcmd @\cmd{\@pkgcmd} (\pkg{#1})}}}
\def\pkgenvindex[#1]#2{\@for\@pkgenv:=#2\do{\index{\@pkgenv @\env{\@pkgenv} 环境 (\pkg{#1})}}}
-
%
% 文本和数学符号索引
-%
\def\symindex#1{\@for\t at xtsym:=#1\do{\index{\t at xtsym @\cmd{\t at xtsym} (\textit{符号} \expandafter\protect\csname \t at xtsym\endcsname)}}}
\def\mathindex#1{\@for\m at thcmd:=#1\do{\index{\m at thcmd @\cmd{\m at thcmd} (\textit{数学命令})}}}
\def\msymindex#1{\@for\m at thsym:=#1\do{\index{\m at thsym @\cmd{\m at thsym} (\textit{数学符号}$\expandafter\protect\csname \m at thsym\endcsname$)}}}
\def\maccindex#1{\@for\m at thacc:=#1\do{\index{\m at thacc @\cmd{\m at thacc} (\textit{数学重音}$\expandafter\protect\csname \m at thacc\endcsname{a}$)}}}
\def\waccindex#1{\@for\wideacc:=#1\do{\index{\wideacc @\cmd{\wideacc} (\textit{数学重音}$\expandafter\protect\csname \wideacc\endcsname{AB}$)}}}
-
%
% 拼音索引
+\def\pinyinindex#1#2{\index{#1@#2}}
%
-\def\pinyinindex#1#2{\index{#1@#2}}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% lshort 用到的自定义环境
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% 每章最前的介绍内容环境 intro
-%
\newenvironment{intro}
{\advance\leftskip\parindent\advance\rightskip\parindent\sffamily}%
{\par\vspace*{2ex minus 1.5ex}}
-
%
% 展示命令
-%
\newenvironment{command}%
{\trivlist\item\relax%
\def\arraystretch{1.2}%
@@ -261,12 +220,10 @@
\hskip\parindent%
\begin{tabular}{>{\columncolor{blue!5}}l}
}{\end{tabular}\endtrivlist}
-
%
% 示例环境 example
% 环境中的代码写入临时文件 lshort-zh-cn-example.aux
% 再从临时文件中读取，分别生成代码盒子和示例盒子
-%
\newwrite\example at out
\newlength\savefboxrule
\newlength\savefboxsep
@@ -301,10 +258,8 @@
}%
\endtrivlist
}
-
%
% sourcecode 浮动体
-%
\belowcaptionskip\abovecaptionskip
\fvset{fontsize=\small,frame=lines}
\newfloat{sourcecode}{tbp}{los}[chapter]
@@ -311,5 +266,5 @@
\floatname{sourcecode}{源代码}
\def\sourcecodename{源代码示例列表}
\def\l at sourcecode{\@dottedtocline{1}{1.5em}{2.3em}}
-
+%
\endinput
Modified: trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex 2024-12-18 21:12:14 UTC (rev 73159)
+++ trunk/Master/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex 2024-12-18 21:12:32 UTC (rev 73160)
@@ -2,8 +2,8 @@
\usepackage{lshort-zh-cn-style}
\def\lshortversionoriginal{6.4}
-\def\lshortdateoriginal{May 5, 2023}
-\def\lshortversioncn{6.04}
+\def\lshortdateoriginal{March 9, 2021}
+\def\lshortversioncn{6.05}
\hypersetup{
pdftitle={The Short Introduction to LaTeX2e (Chinese Simplified)},
More information about the tex-live-commits
mailing list.