texlive[56224] Master/texmf-dist: nanicolle (31aug20)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 31 23:18:49 CEST 2020
Revision: 56224
http://tug.org/svn/texlive?view=revision&revision=56224
Author: karl
Date: 2020-08-31 23:18:48 +0200 (Mon, 31 Aug 2020)
Log Message:
-----------
nanicolle (31aug20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/nanicolle/README.md
trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.pdf
trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.tex
trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.pdf
trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.tex
trunk/Master/texmf-dist/tex/xelatex/nanicolle/nanicolle.cls
Modified: trunk/Master/texmf-dist/doc/xelatex/nanicolle/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/nanicolle/README.md 2020-08-31 21:18:29 UTC (rev 56223)
+++ trunk/Master/texmf-dist/doc/xelatex/nanicolle/README.md 2020-08-31 21:18:48 UTC (rev 56224)
@@ -33,9 +33,9 @@
The Current Maintainer of this work is Yuchang Yang.
This work consists of:
- - the class file: [nanicolle.cls];
- - the illustration files: [point.pdf, ChinaMainland.pdf, Dongguan.pdf];
- - the manual files: [nanicolle-doc-zh.tex, nanicolle-doc-zh.pdf,
- nanicolle-doc-en.tex, nanicolle-doc-en.pdf, README.md];
- - the example files: [nanicolle-ex-zh.tex, nanicolle-ex-zh.pdf,
- nanicolle-ex-en.tex, nanicolle-ex-en.pdf].
+ - the class file: [nanicolle.cls];
+ - the illustration files: [point.pdf, ChinaMainland.pdf, Dongguan.pdf];
+ - the manual files: [nanicolle-doc-zh.tex, nanicolle-doc-zh.pdf,
+ nanicolle-doc-en.tex, nanicolle-doc-en.pdf, README.md];
+ - the example files: [nanicolle-ex-zh.tex, nanicolle-ex-zh.pdf,
+ nanicolle-ex-en.tex, nanicolle-ex-en.pdf].
Modified: trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.tex 2020-08-31 21:18:29 UTC (rev 56223)
+++ trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-en.tex 2020-08-31 21:18:48 UTC (rev 56224)
@@ -29,6 +29,7 @@
\usepackage[top=32mm,bottom=32mm,textwidth=39em]{geometry}
\usepackage{marvosym}
+\usepackage{fontspec}
\usepackage{metalogo}
\usepackage{rulerbox}
\usepackage{array}
@@ -37,14 +38,14 @@
\newcommand{\rowstyle}[1]{\gdef\currentrowstyle{#1}#1\ignorespaces}
\usepackage{enumitem}
\setlist[description]{font=\color{mikudark}\bfseries,leftmargin=2em}
-\usepackage{multicol}
- \setlength\columnsep{3em}
- \setlength\columnseprule{0.4pt}
-\usepackage{adjustbox}
+% \usepackage{multicol}
+ % \setlength\columnsep{3em}
+ % \setlength\columnseprule{0.4pt}
+% \usepackage{adjustbox}
\usepackage{nth}
\usepackage{tikz}
\usepackage{color}
- \definecolor{mikudark}{RGB}{19, 149, 139}
+ \definecolor{mikudark}{RGB}{19,149,139}
\newbox\mynmy
\sbox\mynmy{%
\smash{\raisebox{-5mm}{\begin{tikzpicture}[x=7mm,y=7mm]
@@ -90,7 +91,7 @@
\author{\zh{杨宇昌} (Yuchang \textsc{Yang})%
\footnote{Email address: \url{yang.yc.allium at gmail.com}\stopurl.}%
\qquad \box\mynmy\kern-1cm}
-\date{July \nth{8}, 2020\qquad ver.~2.02}
+\date{August \nth{31}, 2020\qquad ver.~2.03y}
\frenchspacing
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -149,7 +150,7 @@
\tab\param{altitude}\tab\param{habitat}\tab\param{life form}%
\tab\param{height}\tab\param{diameter at breast height}\tab\param{note}%
\]
-where $\tab$ denotes a horizontal tab (U+0009, the character that the tab key inputs). Each $\string\collect$ macro followed by its parameters must exclusively occupy a single line without comment sign, and the line should begin immediately with the macro.
+where $\tab$ denotes a horizontal tab (U+0009, the character that the tab key inputs). Each $\string\collect$ macro followed by its parameters must exclusively occupy a single line.
Parameters can be left empty (some cannot), but even so the tabs seperating them should never be omitted.
The requirements of each parameter of $\string\collect$ are listed as follows.
@@ -263,7 +264,7 @@
\section{A full example using \pkgname{nanicolle}}
-The following is a full example file using document class \pkgname{nanicolle}. It can be found as \texttt{nanicolle-ex-en.tex} in the package. To display it more clearly, the $\uspace$ denotion for space is no longer used in this example. Actual lines correspond with line numbers in the left. An actual line may be so long that it is wrapped here, just as in text editors, but remember, these wrapped parts in fact belong to a single line, as there is no end-of-line character in between.
+The following is a full example file using document class \pkgname{nanicolle}. It can be found as \texttt{nanicolle-ex-en.tex} in the package. To display it more clearly, the $\uspace$ mark for space is no longer used in this example. Actual lines correspond with line numbers in the left. An actual line may be so long that it is wrapped here, just as in text editors, but remember, these wrapped parts in fact belong to a single line, as there is no end-of-line character in between.
\begingroup
\catcode`\^^I\active\let^^I\tab
Modified: trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.tex 2020-08-31 21:18:29 UTC (rev 56223)
+++ trunk/Master/texmf-dist/doc/xelatex/nanicolle/nanicolle-doc-zh.tex 2020-08-31 21:18:48 UTC (rev 56224)
@@ -97,12 +97,14 @@
\author{杨宇昌%
\footnote{电子邮箱为\url{yang.yc.allium at gmail.com}\stopurl 。}%
\qquad\box\mynmy\kern-1cm}
-\date{2020年7月8日\qquad ver.~2.02}
+\date{2020年8月31日\qquad ver.~2.03y}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
+\xeCJKsetup{CJKglue={\hskip0pt}}
+
\maketitle
\parskip=1ex\relax
@@ -158,7 +160,7 @@
\tab\param{海拔}\tab\param{生境}\tab\param{生活型}%
\tab\param{体高}\tab\param{胸径}\tab\param{附注}%
\]
-当中$\tab$表示水平制表符（U+0009，可按键盘Tab键输入）。每行最多能有一个$\string\Collect$命令；每个$\string\Collect$命令须出现在一行开始处，其所有参数必须出现在同一行中；$\string\Collect$所在的行不能有注释符号。
+当中$\tab$表示水平制表符（U+0009，可按键盘Tab键输入）。每行最多能有一个$\string\Collect$命令；每个$\string\Collect$命令及其所有参数必须出现在同一行中。
某些参数可以为空，但$\tab$都须保留。
以下分别说明诸参数。
@@ -298,6 +300,10 @@
\begin{description}[style=nextline]
\parskip=0pt
\obeylines
+ \item[ver. 2.03y (2020.8.31)]
+ 更精细地控制分类码，参数中允许不加转义地使用$\%$、$\$$、$\#$、$\string~$等字符，参数外允许$\tab$在行首缩进代码。
+ 修正中式采集标签中$\param{学名}$栏泄漏段落形状的漏洞。
+ 修正作者引证中$ex$排成$et$的错误。
\item[ver. 2.02 (2020.7.8)]
修正负经纬度值不能解析的错误。
中式采集标签的参数取消长度限制。
Modified: trunk/Master/texmf-dist/tex/xelatex/nanicolle/nanicolle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/nanicolle/nanicolle.cls 2020-08-31 21:18:29 UTC (rev 56223)
+++ trunk/Master/texmf-dist/tex/xelatex/nanicolle/nanicolle.cls 2020-08-31 21:18:48 UTC (rev 56224)
@@ -22,7 +22,7 @@
% nanicolle-ex-en.tex, nanicolle-ex-en.pdf].
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nanicolle}[2020/07/08 v2.02 class nanicolle]
+\ProvidesClass{nanicolle}[2020/08/31 v2.03y class nanicolle]
% CATCODE PART I
\makeatletter
% CLASS OPTIONS
@@ -51,11 +51,9 @@
\chardef\tw@=2
\chardef\thr@@=3
\chardef\f at ur=4
-\chardef\@other=12
\chardef\Identify at len=8
\chardef\Collect at len=19
% CONSTANT CHARACTER AND STRINGS
-\def\space{ }
\def\@unit{pt}
\def\vb at xt@{\vbox to}
% CATCODE PART II
@@ -87,8 +85,8 @@
% PAGE LAYOUT
\RequirePackage{graphicx}
\RequirePackage{geometry}
- \geometry{paperwidth=297mm, paperheight=210mm,
- left=\NC at margin, right=\NC at margin, top=\z@, bottom=\z@}
+ \geometry{paperwidth=297mm,paperheight=210mm,
+ left=\NC at margin,right=\NC at margin,top=\z@,bottom=\z@}
\RequirePackage{multicol}
\setlength\columnsep{2\NC at margin}
\setlength\columnseprule{\NC at seprule}
@@ -174,7 +172,7 @@
\strsubs{f.}{\handle at f}
\strsubs{sp.}{\upshape sp.\word at cnt\z@}
\strsubs{et}{\penalty-\@ne et\penalty-\@ne}
- \strsubs{ex}{\penalty-\tw@ et\penalty-\tw@}
+ \strsubs{ex}{\penalty-\tw@ ex\penalty-\tw@}
\strsubs{(}{\penalty-\thr@@(}\strsubs{)}{)\penalty-\thr@@}
\strsubs{×}{\ensuremath{\mathsf{\times}}\word at cnt\@ne\ignorespaces}
{\itshape\@tempstring}}
@@ -186,8 +184,9 @@
\latin at parse{#1}}
\RequirePackage{listofitems}
\reademptyitems
- \catcode`\^^I\@other
+ \@makeother\^^I
\setsepchar{^^I}
+ \catcode`\^^I=10\relax
\def\get at argin#1{%
\ifnum#1>\temp at arginlen\relax
\else\temp at argin[#1]\fi}
@@ -261,9 +260,13 @@
% \mapdef{Dongguan}{Dongguan.pdf}{113.5}{114.26667}{22.63333}{23.16667}
% FULL LINE COMMAND TRICK
\begingroup
- \catcode`\^^M\@other%
+ \@makeother\^^M%
\gdef\def at to@eol#1#2{%
- \gdef#1{\begingroup\catcode`\^^M\@other\csname\string#1\endcsname}%
+ \gdef#1{%
+ \begingroup%
+ \def\dospecials{\do\^^M\do\^^I\do\%\do\$\do\#\do\~}%
+ \def\do{\@makeother}\dospecials%
+ \csname\string#1\endcsname}%
\expandafter\gdef\csname\string#1\endcsname##1^^M{#2{##1}\endgroup}}%
\endgroup
% COMPONENTS IN COMMON
@@ -330,7 +333,7 @@
\form at cell{胸径}{\add at cm\DBH}\par
\form at cell{科名}{\Family}%
\form at cell{中文名}{\ChnName}\par
- \form at line{学名}{\col at latin{\LatName}}
+ {\form at line{学名}{\col at latin{\LatName}}\par}%
\form at line{附注}{\Descr}}
\nointerlineskip}
\if at col@barcode
@@ -400,7 +403,7 @@
\filbreak}
\fi}
\def at to@eol\Collect\@Collect
-% COLLECTING LABELS IN WESTERN LANGUAGES
+% COLLECTING LABELS IN WESTERN STYLE
\def\translation at asl{a.s.l.}
\def\translation at dbh{DBH}
\def\translation at tall{tall}
@@ -494,7 +497,7 @@
\fi
\@identifying at false}
\def at to@eol\Identify\@Identify
-% COLLECTING LABELS IN WESTERN LANGUAGES
+% COLLECTING LABELS IN WESTERN STYLE
\def\@Identify at en#1{{%
\let\detchinesestyle\detcommonnamestyle
\@Identify{#1}}}
More information about the tex-live-commits
mailing list.