diff options
author | Norbert Preining <norbert@preining.info> | 2022-10-31 03:04:01 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-10-31 03:04:01 +0000 |
commit | c7892fe1a11367872de6f3ee0fa074b39824e59c (patch) | |
tree | 4879018aece4cb9f7549756ccadbb1808296d19d /macros/latex/contrib | |
parent | b2c88e6cbb5203ec5d33819454f1499cada7e336 (diff) |
CTAN sync 202210310303
Diffstat (limited to 'macros/latex/contrib')
37 files changed, 242 insertions, 241 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt index 2de15cc139..3d308fe078 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt @@ -1,3 +1,8 @@ +2022-10-30, v0.3.6 + + * API changes: + - Add support for backrefs. + 2020-11-02, v0.3.5 * Changes to documentation: diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf Binary files differindex ddf54b7c8f..262076de2e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf Binary files differindex 62da3d0589..4fe8a1d3bf 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex index d67aee127a..601cef3f8b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex @@ -1,6 +1,6 @@ % Documentation for biblatex-caspervector % -% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector +% Copyright (c) 2012-2016,2018-2019,2022 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -22,7 +22,7 @@ \usepackage[margin = 2cm, centering, includefoot]{geometry} \usepackage[ backend = biber, style = caspervector, utf8, - giveninits = true, sortgiveninits = true + giveninits = true, sortgiveninits = true, backref = true ]{biblatex} \usepackage{iftex, fancyhdr, hyperref, enumitem, fancyvrb, hologo} @@ -48,13 +48,13 @@ \addbibresource{caspervector.bib} \begin{document} -\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.3.5}} +\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.3.6}} \author{% Casper Ti.\ Vector\thanks{\ % \href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.% }% } -\date{2020/11/02} +\date{2022/10/30} \maketitle \section{引言} @@ -518,7 +518,9 @@ biblatex 3.0--3.3 的功能调整导致分类排序失效。% 这两种方法中更加推荐使用前者,因为前者只须手动实现出版年和期号的排版。 \begin{refcontext}[sorting = none] -\printbibliography[category = cited, heading = bibnumbered, title = {本文参考文献}] +\printbibliography[category = cited, heading = bibnumbered, title = {% + 本文参考文献(反向引用页码是设定 \texttt{backref = true} 产生的)% +}] \end{refcontext} \begin{refcontext}[sorting = ecnyt] \printbibliography[notcategory = cited, heading = bibnumbered, title = {% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def index c23b4b1dad..4d326af7ce 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def @@ -1,6 +1,6 @@ % Casper Ti. Vector's biblatex style % -% Copyright (c) 2012-2019 Casper Ti. Vector +% Copyright (c) 2012-2019,2022 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{blx-caspervector-base.def}% - [2020/11/02 v0.3.5 Casper Ti. Vector's biblatex library] + [2022/10/30 v0.3.6 Casper Ti. Vector's biblatex library] \RequireBiber[3] \newtoggle{bbx:gbk} @@ -113,8 +113,9 @@ \renewcommand*{\finalnamedelim}{\ifcitation{\bbx@citebcomma}{\finallistdelim}} \renewcommand*{\multinamedelim}{\ifcitation{\bbx@citebcomma}{\multilistdelim}} \renewcommand*{\postnotedelim}{\bbx@citecomma} -\renewcommand*{\finentrypunct}% - {\iffieldundef{addendum}{\bbx@cepunct{\bbx@cnperiod}{.}}{}} +\renewcommand*{\finentrypunct}{\ifboolexpr{ + test {\iffieldundef{addendum}} and test {\iflistundef{pageref}} +}{\bbx@cepunct{\bbx@cnperiod}{.}}{}} \DefineBibliographyExtras{english}{% \renewcommand*{\finalandcomma}{}% } @@ -135,6 +136,7 @@ {\ifinteger{#1}{{\bbx@cnnr} {#1} {\bbx@cnedition}}{#1}}% {\ifinteger{#1}{\mkbibordedition{#1}~\bibstring{edition}}{#1\isdot}}% } +\DeclareFieldFormat*{mypageref}{\mkbibbrackets{\^{}\,#1}} \newcommand*{\bbx@print}[1]{\iffieldundef{#1}{}{\printfield{#1}}} \newbibmacro*{cntypedelim}[1]{\ifandothers{#1}{}{\printtext{\andothersdelim}}} \newbibmacro*{cein:}% @@ -243,6 +245,13 @@ \printurldate% }% } +\newbibmacro*{addendum+pageref}{% + \printfield{addendum}% + \iflistundef{pageref}{}{% + \bbx@cepunct{}{\setunit{\addspace}}% + \printtext[mypageref]{\printlist[pageref][-\value{listtotal}]{pageref}}% + }% +} \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}\usebibmacro{begentry}% @@ -256,7 +265,7 @@ \usebibmacro{location+publisher+date+note+pages}% \printunit{\bbx@ceperiod}\newblock \usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyDriver{incollection}{% @@ -274,7 +283,7 @@ \usebibmacro{location+publisher+date+note+pages}% \printunit{\bbx@ceperiod}\newblock \usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyDriver{periodical}{% @@ -290,7 +299,7 @@ \printlist{location}\setunit*{\bbx@cecolon}% \printlist{publisher}\printunit{\bbx@ceperiod}\newblock \usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyDriver{article}{% @@ -304,7 +313,7 @@ \usebibmacro{date+volume+number+note+pages}% \printunit{\bbx@ceperiod}\newblock \usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyDriver{patent}{% @@ -320,12 +329,12 @@ \usebibmacro{date}\setunit*{\bbx@cecomma}% \printfield{note}\printunit{\bbx@ceperiod}\newblock \usebibmacro{eid+url+urldate}\printunit{\bbx@ceperiod}\newblock - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyDriver{customf}{% \usebibmacro{bibindex}\usebibmacro{begentry}% - \printfield{addendum}\usebibmacro{finentry}% + \usebibmacro{addendum+pageref}\usebibmacro{finentry}% } \DeclareBibliographyAlias{booklet}{book} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def index 429ee5db47..83650ccb5d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{blx-caspervector-gbk.def}% - [2020/11/02 v0.3.5 Chinese punctuations and captions in GBK] + [2022/10/30 v0.3.6 Chinese punctuations and captions in GBK] \newcommand*\bbx@cnldquot{} \newcommand*\bbx@cnrdquot{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def index 872d40567f..571291605d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{blx-caspervector-utf8.def}% - [2020/11/02 v0.3.5 Chinese punctuations and captions in UTF-8] + [2022/10/30 v0.3.6 Chinese punctuations and captions in UTF-8] \newcommand*\bbx@cnldquot{“} \newcommand*\bbx@cnrdquot{”} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx index 139b83551f..690d19fe9d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{caspervector-ay.bbx}% - [2020/11/02 v0.3.5 Casper Ti. Vector's author-year biblatex bibstyle] + [2022/10/30 v0.3.6 Casper Ti. Vector's author-year biblatex bibstyle] \RequireBibliographyStyle{authoryear-comp} \input{blx-caspervector-base.def} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx index 12133338a9..a58fecebe3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{caspervector-ay.cbx}% - [2020/11/02 v0.3.5 Casper Ti. Vector's author-year biblatex citestyle] + [2022/10/30 v0.3.6 Casper Ti. Vector's author-year biblatex citestyle] \RequireCitationStyle{authoryear-comp} \renewcommand*{\compcitedelim}{\bbx@citebcomma} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx index 80682d4e05..9647c575da 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{caspervector.bbx}% - [2020/11/02 v0.3.5 Casper Ti. Vector's numeric biblatex bibstyle] + [2022/10/30 v0.3.6 Casper Ti. Vector's numeric biblatex bibstyle] \RequireBibliographyStyle{numeric-comp} \input{blx-caspervector-base.def} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx index 5a3ac392cf..da4f7b5a70 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx @@ -23,7 +23,7 @@ % blx-caspervector-utf8.def \ProvidesFile{caspervector.cbx}% - [2020/11/02 v0.3.5 Casper Ti. Vector's numeric biblatex citestyle] + [2022/10/30 v0.3.6 Casper Ti. Vector's numeric biblatex citestyle] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{autocite = superscript} diff --git a/macros/latex/contrib/eolang/DEPENDS.txt b/macros/latex/contrib/eolang/DEPENDS.txt index 11d8637225..d3abb692d7 100644 --- a/macros/latex/contrib/eolang/DEPENDS.txt +++ b/macros/latex/contrib/eolang/DEPENDS.txt @@ -9,3 +9,4 @@ hard pdftexcmds hard ifluatex hard ifxetex hard adjustbox +hard hyperref
\ No newline at end of file diff --git a/macros/latex/contrib/eolang/eolang.dtx b/macros/latex/contrib/eolang/eolang.dtx index 65e87c220a..c7bad93739 100644 --- a/macros/latex/contrib/eolang/eolang.dtx +++ b/macros/latex/contrib/eolang/eolang.dtx @@ -50,7 +50,7 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{eolang} %<*package> -[2022-10-29 0.2.0 Formulas and Graphs for EO Programming Language] +[2022-10-30 0.3.0 Formulas and Graphs for EO Programming Language] %</package> %<*driver> \documentclass{ltxdoc} @@ -126,6 +126,8 @@ % (|\varnothing|), % \item ``|->|'' maps to ``$\mapsto$'' % (|\mapsto|), +% \item ``|~>|'' maps to ``$\phiWave$'' +% (|\phiWave|), % \item ``|!->|'' maps to ``$\phiConst$'' % (|\phiConst|), % \item ``|..>|'' maps to ``$\phiDotted$'' @@ -153,9 +155,9 @@ % \pagestyle{empty} % \usepackage{eolang} % \begin{document} -% A simple object \\ +% A simple object % \phiq{x -> [[@ -> y]]} \\ -% is a decorator of \\ +% is a decorator of % the data object \\ % \phiq{y -> [[\Delta ..> 42]]}. % \end{document} @@ -267,6 +269,27 @@ % \end{document} % \end{docshot} +% This is how you can use |\dfrac| from |amsmath| for large inference rules, +% with the help of |\begin{split}| and |\end{split}|: +% \begin{docshot} +% \documentclass{article} +% \usepackage{amsmath} +% \usepackage{eolang} +% \pagestyle{empty} +% \begin{document} +% \begin{phiquation*} +% \dfrac{\begin{split} +% x->[[@->y, z->42, +% \alpha_0->?, \alpha_1->42]] +% \end{split}}{\begin{split} +% x->[[@->y, z->?, f ~> |pi|( +% \alpha_0->[[ \psi !-> |hello|(12) ]], +% \alpha_1->42)]] +% \end{split}}\text{R2}. +% \end{phiquation*} +% \end{document} +% \end{docshot} + % The |phiquation| environment may be used together with \href{https://ctan.org/pkg/acmart}{acmart}: % \begin{docshot} % \documentclass{acmart} @@ -346,12 +369,22 @@ \iexec[null]{mkdir -p "\eolang@tmpdir/\jobname"}% % \end{macrocode} +% \begin{macro}{\eolang@lineno} +% \changes{0.3.0}{2022/10/30}{New counter for protecting lineno.} +% Then, we define an internal counter to protect line number from changing: +% \begin{macrocode} +\makeatletter\newcounter{eolang@lineno}\makeatother +% \end{macrocode} +% \end{macro} + % \begin{macro}{\eolang@mdfive} % \changes{0.1.0}{2022/10/26}{New supplementary command added to calculate MD5 sum of a file.} % Then, we define a command for MD5 hash calculating of a file: % \begin{macrocode} \RequirePackage{pdftexcmds} -\makeatletter\newcommand\eolang@mdfive[1]{\pdf@filemdfivesum{#1}}\makeatother +\makeatletter +\newcommand\eolang@mdfive[1]{\pdf@filemdfivesum{#1}} +\makeatother % \end{macrocode} % \end{macro} @@ -361,7 +394,9 @@ % \changes{0.0.2}{2022/10/21}{Parsing of symbols ``@,'' ``\^{},'' and ``\&'' enabled (varphi, rho, and sigma)} % \changes{0.1.0}{2022/10/26}{A new Perl script "eolang-phi.pl" added for parsing of phi expressions.} % \changes{0.2.0}{2022/10/29}{Numbers automatically render as "texttt". No need to use vertical bars around them anymore.} -% Then, we create a Perl script for |phiquation| processing: +% \changes{0.3.0}{2022/10/30}{New arrow added, that looks like "leadsto".} +% Then, we create a Perl script for |phiquation| processing using |VerbatimOut| from +% \href{https://ctan.org/pkg/fancyvrb}{fancyvrb}: % \begin{macrocode} \makeatletter \begin{VerbatimOut}{\eolang@tmpdir/eolang-phi.pl} @@ -400,12 +435,15 @@ $tex =~ s/\$/\\xi{}/g; $tex =~ s/-([a-z]+)>/\\mathrel{\\xrightarrow{\\text{\\sffamily\\scshape \1}}}/g; $tex =~ s/!->/\\mathrel{\\phiConst}/g; $tex =~ s/->/\\mathrel{\\mapsto}/g; +$tex =~ s/~>/\\mathrel{\\phiWave}/g; $tex =~ s/:=/\\mathrel{\\vDash}/g; $tex =~ s/..>/\\mathrel{\\phiDotted}/g; -$tex =~ s/\|([^\|]+)\|/\\texttt{\1}{}/g; +$tex =~ s/\|([^\|]+)\|/\\textnormal{\\texttt{\1}}{}/g; $tex =~ s/\[\[/\\llbracket\\mathrel{}/g; $tex =~ s/\]\]/\\mathrel{}\\rrbracket{}/g; if ($env ne 'phiq') { + $tex =~ s/\\begin\{split\}\n/\\begin{split}&/g; + $tex =~ s/\n\s*\\end\{split\}/\\end{split}/g; $tex =~ s/\n\n/\\\\&/g; $tex =~ s/\n/\\\\[-4pt]&/g; $tex =~ s/([^&\s])\s{2}([^\s])/\1 \2/g; @@ -446,13 +484,18 @@ print '\endinput', "\n"; perl "\eolang@tmpdir/eolang-phi.pl" '#1' "\eolang@tmpdir/\jobname/\hash.tex"}% + \setcounter{FancyVerbLine}{\value{eolang@lineno}}% } \newenvironment{phiquation*}% -{\VerbatimEnvironment\begin{VerbatimOut} +{\VerbatimEnvironment% +\setcounter{eolang@lineno}{\value{FancyVerbLine}}% +\begin{VerbatimOut} {\eolang@tmpdir/\jobname/phiquation.tex}} {\end{VerbatimOut}\eolang@process{equation*}} \newenvironment{phiquation}% -{\VerbatimEnvironment\begin{VerbatimOut} +{\VerbatimEnvironment% +\setcounter{eolang@lineno}{\value{FancyVerbLine}}% +\begin{VerbatimOut} {\eolang@tmpdir/\jobname/phiquation.tex}} {\end{VerbatimOut}\eolang@process{equation}} \makeatother @@ -460,12 +503,12 @@ print '\endinput', "\n"; % \end{macro} % \begin{macro}{\phiq} -% \changes{0.0.2}{2022/10/21}{Parsing of additional symbols enabled} +% \changes{0.0.2}{2022/10/21}{Parsing of additional symbols enabled.} % Then, we define |\phiq| command: % \begin{macrocode} -\makeatletter\newcommand\phiq[1]{ +\makeatletter\newcommand\phiq[1]{% \iexec[trace,quiet,stdout=\eolang@tmpdir/\jobname/phiq.tex]{ - /bin/echo '\detokenize{#1}'} + /bin/echo '\detokenize{#1}'}% \def\hash{\eolang@mdfive {\eolang@tmpdir/\jobname/phiq.tex}}% \iexec[null]{cp "\eolang@tmpdir/\jobname/phiq.tex" @@ -481,7 +524,8 @@ print '\endinput', "\n"; % \changes{0.0.2}{2022/10/24}{The Perl file now has a fixed name, which doesn't depend on the name of the TeX job. This file may be shared among jobs, no need to make it uniquely named.} % \changes{0.1.0}{2022/10/26}{There are two Perl scripts now: one for phiquation, another one for sodg.} % \changes{0.2.0}{2022/10/28}{The content of "atom" and "data" boxes is parsed automatically as formulas and numbers, respectively.} -% Then, we create a Perl script for |sodg| graphs processing: +% Then, we create a Perl script for |sodg| graphs processing using |VerbatimOut| from +% \href{https://ctan.org/pkg/fancyvrb}{fancyvrb}: % \begin{macrocode} \makeatletter \begin{VerbatimOut}{\eolang@tmpdir/eolang-sodg.pl} @@ -498,7 +542,7 @@ if (index($tex, "\t") > 0) { $tex =~ s/^\s+|\s+$//g; $tex =~ s/(\\[a-zA-Z]+)\s+/\1/g; $tex =~ s/\n\s+/\n/g; -$tex =~ s/\|([^\|]+)\|/\\texttt{\1}/g; +$tex =~ s/\|([^\|]+)\|/\\textnormal{\\texttt{\1}}/g; my @cmds = split (/\n/g, $tex); foreach my $t (@cmds) { print '% ', $t, "\n"; @@ -528,7 +572,7 @@ foreach my $c (@cmds) { if (not $opts{'data'} eq '') { my $d = $opts{'data'}; if (index($d, '|') == -1) { - $d = '\texttt{' . $d . '}'; + $d = '\textnormal{\texttt{' . $d . '}}'; } $opts{'box'} = $d; } @@ -596,6 +640,14 @@ print '\end{phicture}', "\n", '\endinput'; % \end{macrocode} % \end{macro} +% \begin{macro}{FancyVerbLine} +% Then, we reset the counter for \href{https://ctan.org/pkg/fancyvrb}{fancyvrb}, so that +% it starts counting lines from zero when the document starts rendering: +% \begin{macrocode} +\setcounter{FancyVerbLine}{0} +% \end{macrocode} +% \end{macro} + % \begin{macro}{tikz} % Then, we include |tikz| package and its libraries: % \begin{macrocode} @@ -648,7 +700,9 @@ print '\end{phicture}', "\n", '\endinput'; % \href{https://tex.stackexchange.com/questions/661056}{here}: % \begin{macrocode} \makeatletter\newenvironment{sodg}% -{\VerbatimEnvironment\begin{VerbatimOut} +{\VerbatimEnvironment% +\setcounter{eolang@lineno}{\value{FancyVerbLine}}% +\begin{VerbatimOut} {\eolang@tmpdir/\jobname/sodg.tex}} {\end{VerbatimOut}% \def\hash{\eolang@mdfive @@ -658,6 +712,7 @@ print '\end{phicture}', "\n", '\endinput'; \iexec[trace,stdout=\eolang@tmpdir/\jobname/\hash-post.tex]{ perl "\eolang@tmpdir/eolang-sodg.pl" "\eolang@tmpdir/\jobname/\hash.tex"}% + \setcounter{FancyVerbLine}{\value{eolang@lineno}}% }\makeatother % \end{macrocode} % \end{macro} @@ -682,11 +737,12 @@ print '\end{phicture}', "\n", '\endinput'; % \changes{0.1.0}{2022/10/25}{New command "phic" prints the name of $\varphi$-calculus in both % normal and anonymous mode of "acmart"} % \begin{macrocode} +\RequirePackage{hyperref} \newcommand\phic{% \ifdefined\anon% - \anon[$\alpha$-calculus]{$\varphi$-calculus}% + \anon[\texorpdfstring{$\alpha$}{a}-calculus]{\texorpdfstring{$\varphi$}{phi}-calculus}% \else% - $\varphi$-calculus% + \texorpdfstring{$\varphi$}{phi}-calculus% \fi% } % \end{macrocode} @@ -716,6 +772,16 @@ print '\end{phicture}', "\n", '\endinput'; % \end{macrocode} % \end{macro} +% \begin{macro}{\phiWave} +% \changes{0.3.0}{2022/10/30}{New command "phiWave" added to denote a link to a multi-layer attribute.} +% Then, we define a command to render an arrow for a multi-layer attribute, +% as suggested \href{https://tex.stackexchange.com/questions/198755}{here}: +% \begin{macrocode} +\newcommand\phiWave{% + \mapstochar\mathrel{\mspace{0.45mu}}\leadsto} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\phiDotted} % \changes{0.1.0}{2022/10/27}{New command "phiDotted" added to denote a link to a special attribute.} % Then, we define a command to render an arrow for a special attribute, diff --git a/macros/latex/contrib/eolang/eolang.pdf b/macros/latex/contrib/eolang/eolang.pdf Binary files differindex e2b1d20e83..28befcb7bf 100644 --- a/macros/latex/contrib/eolang/eolang.pdf +++ b/macros/latex/contrib/eolang/eolang.pdf diff --git a/macros/latex/contrib/ffcode/DEPENDS.txt b/macros/latex/contrib/ffcode/DEPENDS.txt index 52a46fbc48..935840f850 100644 --- a/macros/latex/contrib/ffcode/DEPENDS.txt +++ b/macros/latex/contrib/ffcode/DEPENDS.txt @@ -1,5 +1,3 @@ hard xkeyval hard minted hard tcolorbox -hard pgf -hard environ diff --git a/macros/latex/contrib/ffcode/README.md b/macros/latex/contrib/ffcode/README.md index fe0332ddfe..f62fa0aa99 100644 --- a/macros/latex/contrib/ffcode/README.md +++ b/macros/latex/contrib/ffcode/README.md @@ -23,11 +23,10 @@ void r() { \end{document} ``` -The full example and all commands are available in the -[`ffcode.tex`](https://github.com/yegor256/ffcode/blob/master/ffcode.tex) file. +Otherwise, you can download [`ffcode.sty`](https://raw.githubusercontent.com/yegor256/ffcode/gh-pages/ffcode/ffcode.sty) and add to your project. -If you want to contribute yourself, make a fork, then create a branch, -then run `make` in the root directory. +If you want to contribute yourself, make a fork, then create a branch, +then run `l3build ctan` in the root directory. It should compile everything without errors. If not, submit an issue and wait. -Otherwise, make your changes and then run `make` again. If the build is +Otherwise, make your changes and then run `l3build ctan` again. If the build is still clean, submit a pull request. diff --git a/macros/latex/contrib/ffcode/ffcode.dtx b/macros/latex/contrib/ffcode/ffcode.dtx index c6d717c7b5..e3c430c8de 100644 --- a/macros/latex/contrib/ffcode/ffcode.dtx +++ b/macros/latex/contrib/ffcode/ffcode.dtx @@ -50,18 +50,20 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{ffcode} %<*package> -[03.10.2022 0.5.0 Fixed Font Code] +[2022-10-30 0.5.1 Fixed Font Code] %</package> %<*driver> \documentclass{ltxdoc} \usepackage[T1]{fontenc} \usepackage[tt=false,type1=true]{libertine} \usepackage{microtype} +\AddToHook{env/verbatim/begin}{\microtypesetup{protrusion=false}} \usepackage{href-ul} \usepackage{ffcode} \usepackage{amsmath} \usepackage{multicol} \usepackage{xcolor} +\usepackage[dtx,runs=2]{docshots} \PageIndex \EnableCrossrefs \CodelineIndex @@ -86,86 +88,51 @@ % and make sure it looks nice. Install it from CTAN and then % use like this (pay attention to |\ff| command % and |ffcode| environment): -% \begin{multicols}{2} -% \setlength{\parskip}{0pt} -% \raggedcolumns -%\iffalse -%<*verb> -%\fi -\begin{verbatim} -\documentclass{article} -\usepackage{ffcode} -\begin{document} -The function \ff{fibo()} -is recursive: -\begin{ffcode} -int fibo(int n) { - if (n < 2) { - return n; |$\label{ln:ret}$| - } - return fibo(n-1)+fibo(n-2); -} -\end{ffcode} -The line no.~\ref{ln:ret} -terminates it. -\end{document} -\end{verbatim} -%\iffalse -%</verb> -%\fi -% -% \columnbreak -% -% The function \ff{fibo()} is recursive: -% -%\iffalse -%<*verb> -%\fi -\begin{ffcode} -int fibo(int n) { - if (n < 2) { - return n; |$\label{ln:ret}$| - } - return fibo(n-1)+fibo(n-2); -} -\end{ffcode} -%\iffalse -%</verb> -%\fi -% -% The line no.~\ref{ln:ret} terminates it. -% \end{multicols} +% \begin{docshot} +% \documentclass{article} +% \usepackage{ffcode} +% \pagestyle{empty} +% \begin{document} +% The function \ff{fibo()} +% is recursive: +% \begin{ffcode} +% int fibo(int n) { +% if (n < 2) { +% return n; |$\label{ln:ret}$| +% } +% return fibo(n-1)+fibo(n-2); +% } +% \end{ffcode} +% The line no.~\ref{ln:ret} +% terminates it. +% \end{document} +% \end{docshot} % \section{Package Options} -% \begin{macro}{nopygments} +% \DescribeMacro{nopygments} % You have to run |pdflatex| with |--shell-escape| flag % in order to let |minted| (the package we use) to run Pygments % and format the code. If you don't want this to happen, % just use |nopygments| option. -% \end{macro} -% \begin{macro}{noframes} +% \DescribeMacro{noframes} % If you want to omit the light gray frames around |\ff| % texts, use the package option |noframes|. -% \end{macro} -% \begin{macro}{nobars} +% \DescribeMacro{nobars} % To omit the vertical gray bar at the left side of each snippet, % use |nobars| option of the package. -% \end{macro} -% \begin{macro}{nonumbers} +% \DescribeMacro{nonumbers} % To omit the line numbers, use |nonumbers| option of the package. -% \end{macro} -% \begin{macro}{nocn} +% \DescribeMacro{nocn} % By default, the numbering is continuous: line numbers start at the % first snippet and increment until the end of the document. If you % want them to start from one at each snippet, use |nocn| % (stands for ``no continuous numbering'') % option of the package. -% \end{macro} % \section{Typesetting} @@ -178,86 +145,40 @@ int fibo(int n) { % The command |\ff| behaves differently in math mode --- it doesn't % add gray frames: -% \begin{multicols}{2} -% \setlength{\parskip}{0pt} -% \raggedcolumns -%\iffalse -%<*verb> -%\fi -\begin{verbatim} -\documentclass{article} -\usepackage{ffcode} -\begin{document} -\begin{equation} -x = \int_\ff{home}^N f(x). -\end{equation} -\end{document} -\end{verbatim} -%\iffalse -%</verb> -%\fi -% -% \columnbreak -% -%\iffalse -%<*verb> -%\fi -% \begin{equation} +% \begin{docshot} +% \documentclass{article} +% \usepackage{ffcode} +% \usepackage{mathtools} +% \pagestyle{empty} +% \begin{document} +% \begin{equation*} % x = \int_\ff{home}^N f(x). -% \end{equation} -%\iffalse -%</verb> -%\fi -% \end{multicols} +% \end{equation*} +% \end{document} +% \end{docshot} % \section{Line Highlighting} % You can highlight some lines in your |ffcode| environment, % or can use any other additional configuration parameters from % |minted| package: - -% \begin{multicols}{2} -% \setlength{\parskip}{0pt} -% \raggedcolumns -%\iffalse -%<*verb> -%\fi -\begin{verbatim} -\documentclass{article} -\usepackage{ffcode} -\begin{document} -\begin{ffcode*} - {highlightlines={1,4-5}} -while (true) { - print("Hello!") - print("Enter your name:") - scan(x) - print("You name is " + x) -} -\end{ffcode*} -\end{document} -\end{verbatim} -%\iffalse -%</verb> -%\fi -% -% \columnbreak -% -%\iffalse -%<*verb> -%\fi -\begin{ffcode*}{highlightlines={7,10-11}} -while (true) { - print("Hello!") - print("Enter your name:") - scan(x) - print("You name is " + x) -} -\end{ffcode*} -%\iffalse -%</verb> -%\fi -% \end{multicols} +% \begin{docshot} +% \documentclass{article} +% \usepackage[paperwidth=3in]{geometry} +% \usepackage{ffcode} +% \pagestyle{empty} +% \begin{document} +% \begin{ffcode*} +% {highlightlines={1,4-5}} +% while (true) { +% print("Hello!") +% print("Enter your name:") +% scan(x) +% print("You name is " + x) +% } +% \end{ffcode*} +% \end{document} +% \end{docshot} % Using this second argument of |ffcode*| (with the trailing asterisk), % you can provide any other options from |minted| package to the @@ -266,8 +187,7 @@ while (true) { % \StopEventually{} % \section{Implementation} - -% \changes{v0.2.0}{2021/07/10}{Initial version} +% \changes{v0.1.0}{2021/06/10}{Initial version} % First, we parse package options: % \begin{macrocode} @@ -276,10 +196,14 @@ while (true) { \DeclareOptionX{nopygments}{\PassOptionsToPackage{draft=true}{minted}} \newif\ifff@noframes \DeclareOptionX{noframes}{\ff@noframestrue} +% \changes{v0.4.0}{2022/01/09}{Package option "nobars" added.} \newif\ifff@nobars \DeclareOptionX{nobars}{\ff@nobarstrue} +% \changes{v0.2.0}{2021/06/13}{Package options "nonumbers" +% and "noframes" added.} \newif\ifff@nonumbers \DeclareOptionX{nonumbers}{\ff@nonumberstrue} +% \changes{v0.3.0}{2021/09/07}{Package option "nocn" added.} \newif\ifff@nocn \DeclareOptionX{nocn}{\ff@nocntrue} \ProcessOptionsX\relax @@ -306,7 +230,7 @@ while (true) { framerule=1pt,rulecolor=gray,frame=leftline} \fi \else - \renewcommand{\theFancyVerbLine}{\textcolor{gray} + \renewcommand{\theFancyVerbLine}{\textcolor{gray}% {\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}} \ifff@nocn \ifff@nobars @@ -337,10 +261,11 @@ while (true) { % \begin{macro}{\ff@print} % Then, we define supplementary commands |\ff@print| and |\ff@printx|: +% \changes{v0.5.1}{2022/10/30}{Now, the command "ff" ignores italic and bold and always prints "texttt" as it should be.} % \begin{macrocode} \makeatletter \newcommand\ff@print{\begingroup\obeyspaces\ff@printx} -\newcommand\ff@printx[1]{\texttt{#1}\endgroup} +\newcommand\ff@printx[1]{\textnormal{\texttt{#1}}\endgroup} \makeatother % \end{macrocode} % \end{macro} @@ -368,7 +293,7 @@ while (true) { \newcommand\ff[1]{\relax\ifmmode% {\ff@rule\ff@print{#1}}% \else% - {\ff@box{\ff@rule\ff@print{#1}}} + {\ff@box{\ff@rule\ff@print{#1}}}% \fi} \fi\makeatother % \end{macrocode} diff --git a/macros/latex/contrib/ffcode/ffcode.ins b/macros/latex/contrib/ffcode/ffcode.ins index 758b0a2a81..9e7c56593e 100644 --- a/macros/latex/contrib/ffcode/ffcode.ins +++ b/macros/latex/contrib/ffcode/ffcode.ins @@ -48,8 +48,8 @@ SOFTWARE. \endpreamble \generate{\file{ffcode.sty}{\from{ffcode.dtx}{package}}} \obeyspaces -\Msg{*** To finish the installation you have to move the ".sty"} -\Msg{*** file into a directory searched by TeX. To produce the} -\Msg{*** documentation run the file ".dtx" through LaTeX. If any} -\Msg{*** questions, submit a new GitHub issue.} +\Msg{To finish the installation you have to move the ".sty"} +\Msg{file into a directory searched by TeX. To produce the} +\Msg{documentation run the file ".dtx" through LaTeX. If any} +\Msg{questions, submit a new GitHub issue.} \endbatchfile diff --git a/macros/latex/contrib/ffcode/ffcode.pdf b/macros/latex/contrib/ffcode/ffcode.pdf Binary files differindex 1533df9d95..a24f23e4b0 100644 --- a/macros/latex/contrib/ffcode/ffcode.pdf +++ b/macros/latex/contrib/ffcode/ffcode.pdf diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf Binary files differindex a435dc0541..18b82d1f72 100644 --- a/macros/latex/contrib/pkuthss/doc/example.pdf +++ b/macros/latex/contrib/pkuthss/doc/example.pdf diff --git a/macros/latex/contrib/pkuthss/doc/example/spine.tex b/macros/latex/contrib/pkuthss/doc/example/spine.tex index 005e4c3950..8bcb77dd58 100644 --- a/macros/latex/contrib/pkuthss/doc/example/spine.tex +++ b/macros/latex/contrib/pkuthss/doc/example/spine.tex @@ -1,10 +1,11 @@ -% Copyright (c) 2018-2019 Casper Ti. Vector +% Copyright (c) 2018-2019,2022 Casper Ti. Vector % Public domain. \documentclass[UTF8, zihao = -4]{ctexart} \usepackage{calc, geometry, graphicx} -\usepackage[defaultsups]{newtxtext} -\usepackage[cmintegrals, varg]{newtxmath} +% 如须用 xelatex 编译,请参考 pkuthss.cls 修改字体设置。 +\usepackage{textcomp, mathptmx} +\usepackage[scaled = 0.95]{helvet} \pagestyle{empty} \newlength{\colpad} \newcommand{\colwidth}{0.99\ccwd} @@ -37,7 +38,7 @@ \hspace{\colpad} \begin{minipage}[b][\textheight][b]{\miniwidth} % thesis.pdf 应事先编译好,此处会自动提取其首页。 - % 因为要插入 pdf 图片,本文档应用 pdflatex 或 xelatex 编译。 + % 因为要插入 pdf 图片,本文档应用 pdflatex 编译。 \includegraphics[height = \textheight, page = 1]{thesis} \end{minipage} \end{document} diff --git a/macros/latex/contrib/pkuthss/doc/example/thesis.tex b/macros/latex/contrib/pkuthss/doc/example/thesis.tex index dbfd37994d..f12e379aff 100644 --- a/macros/latex/contrib/pkuthss/doc/example/thesis.tex +++ b/macros/latex/contrib/pkuthss/doc/example/thesis.tex @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016,2018-2019,2021 Casper Ti. Vector +% Copyright (c) 2010-2016,2018-2019,2021-2022 Casper Ti. Vector % Copyright (c) 2021 Kurapica % Public domain. % @@ -71,7 +71,7 @@ 生成的 PDF 文件中标记链接的彩色框不会出现在打印版论文中。 如仍须去掉,可在 \texttt{thesis.tex} 导言区加入 - \texttt{\string\hypersetup\{hidelinks\}}。 + \texttt{\string\hypersetup\string{hidelinks\string}}。 若要避免章末空白页,请在调用 pkuthss 文档类时加入 \texttt{openany} 选项。 diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf Binary files differindex 7e96dbb735..d81143c642 100644 --- a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf +++ b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt index 665120151a..89e7fcb899 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt +++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt @@ -1,3 +1,12 @@ +2022-10-30, v1.9.3 + + * Changes to package code: + - Get rid of newtx completely (thank @CastleStar14654). + - pkuthss.cls: fix scrextend, better footnotes (thank @CastleStar14654). + + * Misc: + - Minor fixes and cosmetics. + 2022-05-04, v1.9.2 * Changes to package code: diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex index 4b5073b08a..de7aa296ee 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex @@ -308,8 +308,9 @@ pkuthss 文档模版使用作者编写的 biblatex\cupercite{biblatex} 样式% \begin{itemize} \item 启用 \verb|pkufont| 选项时会调用 unicode-math \cupercite{unicode-math} 宏包(\hologo{XeLaTeX} 编译)或 - newtxtext/newtxmath\cupercite{newtx} 宏包(非 \hologo{XeLaTeX} - 编译),否则会调用 latexsym\cupercite{latexsym} 宏包。 + mathptmx/helvet\cupercite{psnfss} 和 textcomp 宏包(非 + \hologo{XeLaTeX} 编译),此外在非 \hologo{XeLaTeX} 编译或不启用 + \verb|pkufont| 选项时均会调用 latexsym\cupercite{latexsym} 宏包。 \item 启用 \verb|pkufoot| 选项时会调用 tikz\cupercite{tikz} 和 scrextend\cupercite{scrextend} 宏包。 \item 启用 \verb|pkuspace| 选项时会调用 diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex index 7dcf4ff855..c39ea13268 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2019,2021 Casper Ti. Vector +% Copyright (c) 2010-2019,2021-2022 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -89,21 +89,6 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/ 遇到这种情况时,删除掉上述临时目录及其所有内容, 再重新运行 biber 通常便可解决问题。 -就目前而言,amsthm\cupercite{amsthm} 宏包在后于 newtxmath\cupercite{newtx} -宏包被调用时会导致以下的错误: -\begin{Verbatim} -! LaTeX Error: Command \openbox already defined. - Or name \end... illegal, see p.192 of the manual. -\end{Verbatim} -解决此问题的最简单方法是在通过 -\begin{Verbatim} -\usepackage{amsthm} -\end{Verbatim} -调用 amsthm 宏包之前加入以下命令: -\begin{Verbatim} -\let\openbox\relax -\end{Verbatim} - \section{文档格式可能存在的问题} 目前在 \hologo{LaTeX} 中似乎没有一个可以很好地替代其它各类似宏包的 diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex index 396f9fe6c3..70f4bf5360 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2012,2014-2015,2018-2019 Casper Ti. Vector +% Copyright (c) 2010-2012,2014-2015,2018-2019,2022 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -63,6 +63,6 @@ pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote% {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}。% pkuthss 文档模版目前托管在 Gitea 上, 其项目主页是:\\ -\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss} +\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss}。 % vim:ts=4:sw=4 diff --git a/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def b/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def new file mode 120000 index 0000000000..bd7e3e362f --- /dev/null +++ b/macros/latex/contrib/pkuthss/doc/readme/ctex-fontset-pkuthss.def @@ -0,0 +1 @@ +../example/ctex-fontset-pkuthss.def
\ No newline at end of file diff --git a/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg b/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg new file mode 120000 index 0000000000..7fabe3504d --- /dev/null +++ b/macros/latex/contrib/pkuthss/doc/readme/ctexopts.cfg @@ -0,0 +1 @@ +../example/ctexopts.cfg
\ No newline at end of file diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib index 9e1770056e..6f7e3d323c 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib @@ -138,13 +138,13 @@ } @online{graphicx, - author = {Carlisle, D. P.}, - title = {Packages in the `graphics' bundle}, + author = {Carlisle, D. P. and Rahtz, S. P. Q.}, + title = {The graphicx package}, edition = {Ver.~1.2d}, type = {M/OL}, date = {2021-09-16}, url = {https://ctan.org/pkg/graphicx}, - urldate = {2022-05-04}, + urldate = {2022-05-06}, language = {english}, } @@ -170,14 +170,14 @@ language = {english}, } -@online{newtx, - author = {Sharpe, Michael}, - title = {New TX font package}, - edition = {Ver.~1.71}, +@online{psnfss, + author = {Schmidt, Walter}, + title = {Using common PostScript fonts with \hologo{LaTeX}}, + edition = {Ver.~9.3}, type = {M/OL}, - date = {2022-03-02}, - url = {https://ctan.org/pkg/newtx}, - urldate = {2022-05-04}, + date = {2020-03-25}, + url = {https://ctan.org/pkg/psnfss}, + urldate = {2022-05-06}, language = {english}, } diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex index 0bccb1a29b..2def8ad843 100644 --- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex +++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex @@ -51,7 +51,7 @@ } \newif\ifblind\blindfalse -\newcommand*{\docversion}{v1.9.2} +\newcommand*{\docversion}{v1.9.3} \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, ctitle = {北京大学学位论文模版{\thssnl}pkuthss \docversion}, @@ -60,7 +60,7 @@ \texorpdfstring{\thssnl}{: }pkuthss \docversion% }, cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector}, - date = {\zhdigits{2022}年\zhnumber{5}月}, + date = {\zhdigits{2022}年\zhnumber{10}月}, studentid = {00910???}, school = {化学与分子工程学院}, cmajor = {应用化学}, emajor = {Applied Chemistry}, direction = {据说 Casper 自己也不知道}, mentorlines = {2}, diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf Binary files differindex 7789b318aa..8160a06564 100644 --- a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf +++ b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def index 0633806021..46b20d974d 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def @@ -24,7 +24,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2022/05/05 v1.9.2 Labels and captions in GBK encoding + [2022/10/30 v1.9.3 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{Ŀ} diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def index 5d0e25905e..e0358eb18e 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def @@ -24,7 +24,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2022/05/05 v1.9.2 Labels and captions in UTF-8 encoding + [2022/10/30 v1.9.3 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{题目:} diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.cls b/macros/latex/contrib/pkuthss/tex/pkuthss.cls index 22bdde1209..ad3945afba 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls +++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls @@ -25,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2022/05/05 v1.9.2 Peking University dissertation document class] + [2022/10/30 v1.9.3 Peking University dissertation document class] % eg. `\thss@int@boolopt{spacing}{true}' will expand to: % \newif\ifthss@opt@spacing \thss@opt@spacingtrue @@ -112,16 +112,15 @@ UprightFont = *-regular, BoldFont = *-bold, ItalicFont = *-italic, - BoldItalicFont = *-bolditalic + BoldItalicFont = *-bolditalic, + Scale = 0.95 ]{texgyreheros} \else - % `nofontspec' avoids errors like `The font "FangSong" cannot be found'. - % `defaultsups' prevents newtxtext from manipulating footnote marks. - \usepackage[nofontspec, defaultsups]{newtxtext} - \usepackage[varg]{newtxmath} + \RequirePackage{textcomp, mathptmx, latexsym} + \RequirePackage[scaled = 0.95]{helvet} \fi \else - % Provides `\Box' for originauth.tex if XITSMath/newtx is absent. + % Provides `\Box' for originauth.tex if unicode-math is absent. \RequirePackage{latexsym} \fi @@ -133,9 +132,9 @@ % Circled text, cf. <https://tex.stackexchange.com/questions/7032/>. \RequirePackage{tikz} \newcommand*{\thss@int@circled}[1]{% - \scalebox{0.8}{\tikz[baseline = (char.base)]{ + \scalebox{0.8}{\tikz[baseline = {([yshift = -0.1\ccwd] char.base)}]{ \node[ - shape = circle, draw = black, minimum size = 1.25em, inner sep = 0pt + shape = circle, draw = black, minimum size = 1.25\ccwd, inner sep = 0pt ] (char) {#1}; }}% } @@ -144,10 +143,9 @@ \renewcommand*{\thefootnote}% {\protect\thss@int@circled{\arabic{footnote}}} % Provides utility to modify footnote spacing. - % Option used to make sure it does not render interleaf pages totally blank. - \RequirePackage[cleardoublepage = current]{scrextend} - % Set up footnote spacing: whole paragraph indent 2 ccwd, 0.5 ccwd after mark. - \deffootnote{2\ccwd}{0pt}{\thefootnotemark\hspace{0.5\ccwd}} + \RequirePackage{scrextend} + % Set up footnote spacing: whole paragraph indent 1.5 ccwd, 0.5 ccwd after mark. + \deffootnote{1.5\ccwd}{0pt}{\thefootnotemark\hspace{0.5\ccwd}} \fi \ifthss@opt@pkuspace diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.def b/macros/latex/contrib/pkuthss/tex/pkuthss.def index 80239cf01c..c4b2681745 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuthss.def +++ b/macros/latex/contrib/pkuthss/tex/pkuthss.def @@ -23,7 +23,7 @@ % pkuword.eps \ProvidesFile{pkuthss.def} - [2022/05/05 v1.9.2 Labels and captions for the pkuthss document class] + [2022/10/30 v1.9.3 Labels and captions for the pkuthss document class] \def\label@ementor{Directed by\ } \def\euniversity{Peking University} diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf Binary files differindex 8021172ab7..e608ef5def 100644 --- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf +++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf |