diff options
author | Norbert Preining <norbert@preining.info> | 2021-08-12 03:01:55 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-08-12 03:01:55 +0000 |
commit | a19bf62ec5fa04167fc9480e22cd235ec53b3e41 (patch) | |
tree | c485e2c2ed76a135e970688963b3b2d6cce51083 /macros/unicodetex/latex/beaulivre | |
parent | 78510518401cc9b3aced4cf291ecb7730591091d (diff) |
CTAN sync 202108120301
Diffstat (limited to 'macros/unicodetex/latex/beaulivre')
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf | bin | 330793 -> 331915 bytes | |||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex | 10 | ||||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf | bin | 215647 -> 215836 bytes | |||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex | 16 | ||||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf | bin | 219700 -> 219755 bytes | |||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex | 20 | ||||
-rw-r--r-- | macros/unicodetex/latex/beaulivre/beaulivre.cls | 9 |
7 files changed, 35 insertions, 20 deletions
diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf Binary files differindex 2406947a03..347daef679 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex index bcb60d0156..fb2ca4db0f 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex @@ -98,7 +98,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/08/09}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\hspace*{-.05em}以多彩的方式排版你的图书\\[10pt]\tiny 对应版本. \texttt{\beaulivre{} 2021/08/11}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{许锦文}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{2021年8月,北京}}; \end{tikzpicture}% @@ -297,9 +297,13 @@ Référence du théorème: \cref{thm:abc} \item 纯文本模式,不加载定理类环境。 \end{itemize} \clearpage + \item \texttt{delaythms} + \begin{itemize} + \item 将定理类环境设定推迟到导言结尾。如果你希望定理类环境跟随自定义计数器编号,则应考虑这一选项。 + \end{itemize} \item \texttt{nothmnum}、\texttt{thmnum} 或 \texttt{thmnum=}\meta{counter} \begin{itemize} - \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。 + \item 定理类环境均不编号 / 按照 1、2、3 顺序编号 / 在 \meta{counter} 内编号。其中 \meta{counter} 应该是自带的计数器 (如 \texttt{subsection}) 或在导言部分自定义的计数器 (在启用 \texttt{delaythms} 选项的情况下)。在没有使用任何选项的情况下将按照 \texttt{chapter} (书) 或 \texttt{section} (文章) 编号。 \end{itemize} \item \texttt{regionalref}、\texttt{originalref} \begin{itemize} @@ -503,7 +507,7 @@ Référence du théorème: \cref{thm:abc} \end{itemize} -\clearpage +\bigskip \LevelOneTitle{目前存在的问题} \begin{itemize}[itemsep=.6em] \item 对于字体的设置仍然不够完善。 diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf Binary files differindex 0002d7484e..a9a3f0c80c 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex index dd4f7268b1..286ccbcc04 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex @@ -99,7 +99,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/08/09}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Write your books in \\a colorful way}\\[10pt]\tiny Corresponding to: \texttt{\beaulivre{} 2021/08/11}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{August 2021, Beijing}}; \end{tikzpicture}% @@ -296,13 +296,16 @@ In addition, Source Code Pro is used as the English sans serif font, New Compute \end{itemize} \item \texttt{puretext} or \texttt{nothms} \begin{itemize} - \item Pure text mode. Does not load theorem-like environments. + \item Pure text mode. Do not load theorem-like environments. + \end{itemize} + \item \texttt{delaythms} + \begin{itemize} + \item Defer the definition of theorem-like environments to the end of the preamble. Use this option if you want the theorem-like environments to be numbered within a custom counter. \end{itemize} \item \texttt{nothmnum}, \texttt{thmnum} or \texttt{thmnum=}\meta{counter} \begin{itemize} - \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble. If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article). + \item Theorem-like environments will not be numbered / numbered in order 1, 2, 3... / numbered within \meta{counter}. Here, \meta{counter} should be a built-in counter (such as \texttt{subsection}) or a custom counter defined in the preamble (with the option \texttt{delaythms} enabled). If no option is used, they will be numbered within \texttt{chapter} (book) or \texttt{section} (article). \end{itemize} -\clearpage \item \texttt{regionalref}, \texttt{originalref} \begin{itemize} \item When referencing, whether the name of the theorem-like environment changes with the current language. The default is \texttt{regionalref}, \emph{i.e.}, the name corresponding to the current language is used; for example, when referencing a theorem-like environment in English context, the names "Theorem, Definition..." will be used no matter which language context the original environment is in. If \texttt{originalref} is enabled, then the name will always remain the same as the original place; for example, when referencing a theorem written in the French context, even if one is currently in the English context, it will still be displayed as ``Théorème''. @@ -501,11 +504,12 @@ You can use \lstinline|\dnf| to mark the unfinished part. For example: Similarly, there is \lstinline|\needgraph| : \begin{itemize} - \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...>The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph} + \item \lstinline|\needgraph| or \lstinline|\needgraph<...>|. The effect is: \needgraph or \needgraph<...> + The prompt text changes according to the current language. For example, in French mode, it will be displayed as \UseOtherLanguage{French}{\needgraph} \end{itemize} -\clearpage +\bigskip \LevelOneTitle{Known issues} \begin{itemize}[itemsep=.6em] diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf Binary files differindex 96a00f9bdc..a7d8dc2d7b 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf diff --git a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex index 67624156d3..425725f0cb 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex +++ b/macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex @@ -98,7 +98,7 @@ \fill [cyan!90!black] ($(current page.south west)+(0,7)$) rectangle ($(current page.north west)+(25,-7)$); \fill [yellow] (current page.south west) rectangle ($(current page.north west)+(3,0)$); \node[text width=10cm] at ($(current page.north west)+(8.5,-6)$) {\huge\ProjLib}; - \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière colorée}\\[10pt]\tiny Correspondant à : \texttt{\beaulivre{} 2021/08/09}}}; + \node[text width=6cm,text height=3.5cm,scale=2.5] at ($(current page.north west)+(11,-10)$) {\textcolor{white}{\sffamily\beaulivre{}\\[5pt]\footnotesize\textsc{Écrivez vos livres \\de manière colorée}\\[10pt]\tiny Correspondant à : \texttt{\beaulivre{} 2021/08/11}}}; \node at ($(current page.south)+(1.5,3)$) {\fontsize{16pt}{0pt}\selectfont\textcolor{gray}{\scshape Jinwen XU}}; \node at ($(current page.south)+(1.5,2)$) {\fontsize{12pt}{0pt}\selectfont\textcolor{gray}{Août 2021, à Pékin}}; \end{tikzpicture}% @@ -256,6 +256,7 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne \LevelOneTitle{Les options} +\beaulivre{} propose les options suivantes : \begin{itemize} \item Les options de langue \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French}, etc. @@ -296,9 +297,14 @@ De plus, Source Code Pro est utilisé comme police anglaise sans empattement, Ne \begin{itemize} \item Mode texte pur. Ne pas définir les environnements de type théorème. \end{itemize} +\clearpage + \item \texttt{delaythms} + \begin{itemize} + \item Reportez la définition des environnements de type théorème à la fin du préambule. Utilisez cette option si vous souhaitez que les environnements soient numérotés dans un compteur personnalisé. + \end{itemize} \item \texttt{nothmnum}, \texttt{thmnum} ou \texttt{thmnum=}\meta{counter} \begin{itemize} - \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule. Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article). + \item Les environnements de type théorème ne seront pas numérotés / numérotés dans l'ordre 1, 2, 3... / numérotés dans \meta{counter}. Ici, \meta{counter} doit être un compteur intégré (tel que \texttt{subsection}) ou un compteur défini dans le préambule (avec l'option \texttt{delaythms} activée). Si aucune option n'est utilisée, ils seront numérotés dans \texttt{chapter} (livre) ou \texttt{section} (article). \end{itemize} \item \texttt{regionalref}, \texttt{originalref} \begin{itemize} @@ -429,19 +435,19 @@ Ensuite, créez cet environnement de l'une des cinq manières suivantes : \begin{itemize} \item \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}| \begin{itemize} - \item Définir un environnement non numéroté \meta{name of environment} + \item Définir un environnement \meta{name of environment} non numéroté \end{itemize} \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}| \begin{itemize} - \item Définir un environnement numéroté \meta{name of environment}, numéroté dans l'ordre 1, 2, 3, \dots + \item Définir un environnement \meta{name of environment} numéroté dans l'ordre 1, 2, 3, \dots \end{itemize} \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}[|\meta{numbered like}\lstinline|]| \begin{itemize} - \item Définir un environnement numéroté \meta{name of environment}, qui partage le compteur \meta{numbered like} + \item Définir un environnement \meta{name of environment} numéroté, qui partage le compteur \meta{numbered like} \end{itemize} \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}<|\meta{numbered within}\lstinline|>| \begin{itemize} - \item Définir un environnement numéroté \meta{name of environment}, numéroté dans le compteur \meta{numbered within} + \item Définir un environnement \meta{name of environment} numéroté dans le compteur \meta{numbered within} \end{itemize} \item \lstinline|\CreateTheorem{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)|\\ \lstinline|\CreateTheorem*{|\meta{name of environment}\lstinline|}(|\meta{existed environment}\lstinline|)| @@ -496,7 +502,7 @@ De même, il y a aussi \lstinline|\needgraph| : \end{itemize} -\clearpage +\bigskip \LevelOneTitle{Problèmes connus} \begin{itemize}[itemsep=.6em] diff --git a/macros/unicodetex/latex/beaulivre/beaulivre.cls b/macros/unicodetex/latex/beaulivre/beaulivre.cls index 4da4aadc4f..b7dcdc06fb 100644 --- a/macros/unicodetex/latex/beaulivre/beaulivre.cls +++ b/macros/unicodetex/latex/beaulivre/beaulivre.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{beaulivre} - [2021/08/09 A colorful book style] + [2021/08/11 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} @@ -34,6 +34,7 @@ \DeclareBoolOption[false]{noto} \DeclareBoolOption[false]{biolinum} \DeclareBoolOption[false]{customfont} +\DeclareStringOption{thmnum}[PJL@thmnum@default] \newif\if@colorclass@bfivepaper\@colorclass@bfivepaperfalse \DeclareVoidOption{b5paper}{\@colorclass@bfivepapertrue} @@ -314,7 +315,7 @@ \apptocmd{\ttfamily}{\CJKttfamily}{}{\FAIL} \if@PJLlang@enable@CN -\gappto{\PJLlang@langconfig@schinese}{% +\gappto{\PJLlang@langconfig@CN}{% \def\CJKsffamily{\CJKfamily{SCsans}}% \def\CJKttfamily{\CJKfamily{SCmono}}% \CJKfamily{SCmain}% @@ -322,7 +323,7 @@ \fi \if@PJLlang@enable@TC -\gappto{\PJLlang@langconfig@tchinese}{% +\gappto{\PJLlang@langconfig@TC}{% \def\CJKsffamily{\CJKfamily{TCsans}}% \def\CJKttfamily{\CJKfamily{TCmono}}% \CJKfamily{TCmain}% @@ -330,7 +331,7 @@ \fi \if@PJLlang@enable@JP -\gappto{\PJLlang@langconfig@japanese}{% +\gappto{\PJLlang@langconfig@JP}{% \def\CJKsffamily{\CJKfamily{JPsans}}% \def\CJKttfamily{\CJKfamily{JPmono}}% \CJKfamily{JPmain}% |