summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-11-03 03:02:09 +0000
committerNorbert Preining <norbert@preining.info>2020-11-03 03:02:09 +0000
commit7d12aa3abfed48004f4fb8fa84ee757b6f900726 (patch)
tree684cb1d606f8571edf8bb93cb53b4952f6835bee /macros
parentede2cee3dfac406ff8defae5014e86c839b852ca (diff)
CTAN sync 202011030302
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README.txt (renamed from macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README)4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt10
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdfbin210171 -> 172785 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex1
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib21
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdfbin388363 -> 314272 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex9
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx2
-rw-r--r--macros/latex/contrib/frenchmath/frenchmath.dtx102
-rw-r--r--macros/latex/contrib/frenchmath/frenchmath.ins4
-rw-r--r--macros/latex/contrib/frenchmath/frenchmath.pdfbin476296 -> 477979 bytes
-rw-r--r--macros/latex/contrib/hyperxmp/hyperxmp.dtx135
-rw-r--r--macros/latex/contrib/hyperxmp/hyperxmp.pdfbin1525551 -> 1549965 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/example.pdfbin92605 -> 93675 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/Makefile42
-rw-r--r--macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def2
-rw-r--r--macros/latex/contrib/pkuthss/doc/pkuthss.pdfbin401774 -> 315791 bytes
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt18
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex3
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex5
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex1
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch18
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib29
-rw-r--r--macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex5
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkulogo.pdfbin3828 -> 3530 bytes
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def2
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuthss.cls8
-rw-r--r--macros/latex/contrib/pkuthss/tex/pkuword.pdfbin6579 -> 6280 bytes
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.dtx49
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.ins4
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.pdfbin124970 -> 124789 bytes
-rw-r--r--macros/luatex/latex/semesterplanner/README.md10
-rw-r--r--macros/luatex/latex/semesterplanner/semesterplanner.dtx207
-rw-r--r--macros/luatex/latex/semesterplanner/semesterplanner.ins48
-rw-r--r--macros/luatex/latex/semesterplanner/semesterplanner.pdfbin0 -> 111022 bytes
48 files changed, 618 insertions, 141 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README.txt
index 1fad026530..3b8940e627 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README.txt
@@ -8,6 +8,6 @@ Licence: LaTeX Project Public Licence 1.3 or later
This package provides a simple, nice and easily extensible
biblography/citation style for Chinese LaTeX users.
-This file (README) is *NOT* intended as the documentation for this
-package; please see the file `readme.pdf' instead.
+This file (`README.txt') is *NOT* intended as the documentation for
+this package; please see the file `caspervector.pdf' instead.
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 1fcb3b6c81..2de15cc139 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,13 @@
+2020-11-02, v0.3.5
+
+ * Changes to documentation:
+ - caspervector.bib: add the `type' field for entry `liuxie'.
+ - caspervector.tex: fix "需"/"须" typo.
+ - Add caspervector.bib to copyright lines.
+
+ * Misc:
+ - Add README to the TDS archive.
+
2019-11-13, v0.3.4
* API changes:
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
index a43513a2de..ddf54b7c8f 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
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
index a98f37b11e..0a25336620 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
@@ -15,6 +15,7 @@
%
% This work consists of the following files:
% caspervector.tex
+% caspervector.bib
% caspervector-ay.tex
\documentclass[UTF8]{ctexart}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
index 72484e316a..b6a3ff56f0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
@@ -1,3 +1,23 @@
+% Documentation for biblatex-caspervector
+%
+% Copyright (c) 2012-2019 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
+% your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX version
+% 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% The current maintainer of this work is Casper Ti. Vector.
+%
+% This work consists of the following files:
+% caspervector.tex
+% caspervector.bib
+% caspervector-ay.tex
+
@online{biber,
author = {Kime, Philip and Charette, Fran\c{c}ois},
title = {Biber: A backend bibliography processor for biblatex},
@@ -55,6 +75,7 @@
@book{liuxie,
author = {刘勰},
title = {文心雕龙译注},
+ type = {M},
editor = {陆侃如 and 牟世金},
editortype = {译注},
publisher = {齐鲁书社},
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
index 223d78746d..62da3d0589 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
Binary files differ
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 5465f92b50..d67aee127a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex
@@ -15,6 +15,7 @@
%
% This work consists of the following files:
% caspervector.tex
+% caspervector.bib
% caspervector-ay.tex
\documentclass[UTF8]{ctexart}
@@ -47,13 +48,13 @@
\addbibresource{caspervector.bib}
\begin{document}
-\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.3.4}}
+\title{\textbf{biblatex 参考文献和引用样式:\texttt{caspervector} v0.3.5}}
\author{%
Casper Ti.\ Vector\thanks{\ %
\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.%
}%
}
-\date{2019/11/13}
+\date{2020/11/02}
\maketitle
\section{引言}
@@ -237,7 +238,7 @@ pdflatex texfile
文献的 URL 和(arXiv 等平台的)电子标识码。\\\myemph{%
注:%
\texttt{url} 字段会被自动排版成链接,
- 但 \texttt{eid} 字段须要用户手工定义格式;
+ 但 \texttt{eid} 字段需要用户手工定义格式;
后者的一个示例见第 \ref{sec:faq} 部分。%
}
\item \verb|urldate|:检索日期,或 URL 的访问日期。
@@ -427,7 +428,7 @@ biblatex 3.0--3.3 中有一个 bug\footnote{\ %
\NewBibliographyString{cntranslatoran}
\DefineBibliographyStrings{english}{cntranslatoran = {译注}}
\end{Verbatim}
-因为汉语语法的缘故,中文文献不需要定义 \verb|bytranslatoran|
+因为汉语语法的缘故,中文文献不须要定义 \verb|bytranslatoran|
之类的特殊值;此外考虑到这一用法所需的额外代码,一般而言对于
中文文献直接将 \verb|editortype| 类字段设为“译注”等显然更加方便。
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 bb46b2eb74..c23b4b1dad 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
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{blx-caspervector-base.def}%
- [2019/11/13 v0.3.4 Casper Ti. Vector's biblatex library]
+ [2020/11/02 v0.3.5 Casper Ti. Vector's biblatex library]
\RequireBiber[3]
\newtoggle{bbx:gbk}
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 7823cad294..429ee5db47 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}%
- [2019/11/13 v0.3.4 Chinese punctuations and captions in GBK]
+ [2020/11/02 v0.3.5 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 0bf9e4bace..872d40567f 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}%
- [2019/11/13 v0.3.4 Chinese punctuations and captions in UTF-8]
+ [2020/11/02 v0.3.5 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 e7d66d5c2f..139b83551f 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}%
- [2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex bibstyle]
+ [2020/11/02 v0.3.5 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 e712b44d84..12133338a9 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}%
- [2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex citestyle]
+ [2020/11/02 v0.3.5 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 72e893981c..80682d4e05 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}%
- [2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex bibstyle]
+ [2020/11/02 v0.3.5 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 0b6f918f8d..5a3ac392cf 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}%
- [2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex citestyle]
+ [2020/11/02 v0.3.5 Casper Ti. Vector's numeric biblatex citestyle]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{autocite = superscript}
diff --git a/macros/latex/contrib/frenchmath/frenchmath.dtx b/macros/latex/contrib/frenchmath/frenchmath.dtx
index f9f413d647..14118159e0 100644
--- a/macros/latex/contrib/frenchmath/frenchmath.dtx
+++ b/macros/latex/contrib/frenchmath/frenchmath.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3 of this license
@@ -20,7 +20,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{frenchmath}
- [2019/05/22 v1.4 .dtx frenchmath file]
+ [2020/11/02 v1.5 .dtx frenchmath file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -51,7 +51,7 @@
%</driver>
% \fi
%
-% \CheckSum{692}
+% \CheckSum{249}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -82,13 +82,15 @@
% changements dans la documentation}
% \changes{v1.4}{2019/05/22}{Changement de la définition de fonte up -> UpSh,
% car incompatibilité avec l'extension unicode-math}
+% \changes{v1.5}{2020/11/02}{Ajout des macros étoilées pour les repères du plan et de l'espace
+% et la base (i,j,k)}
%
% \GetFileInfo{frenchmath.sty}
%
% \title{L'extension \textsf{frenchmath}\thanks{Ce document
-% correspond à \textsf{frenchmath}~\fileversion, dernière modification le 22/05/2019.}}
+% correspond à \textsf{frenchmath}~\fileversion, dernière modification le 02/11/2020.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{22 mai 2019}
+% \date{2 novembre 2020}
% \maketitle
%
% \section{Introduction}
@@ -265,14 +267,6 @@
% ce que permet la commande |\cmod| en respectant le bon espacement
% propre au modulo : $ 5 \equiv 53 \cmod{12}$.
%
-% \medskip
-% \DescribeMacro{\Oij} \DescribeMacro{\Oijk}
-% Les repères classiques du plan ou de l'espace seront composés
-% avec des hauteurs de flèches homogénéisées :
-% |\Oij| compose \Oij, |\Oijk| compose \Oijk et |\Ouv| compose \Ouv
-% (utilisé dans le plan complexe). \DescribeMacro{\Ouv}
-% On peut écrire ces commandes en mode texte, sans les délimiteurs du mode mathématique.
-%
% \subsection{Identifiants de \og fonctions\fg classiques}
%
% \DescribeMacro{\pgcd} \DescribeMacro{\ppcm}
@@ -281,10 +275,10 @@
% \footnote{Cette dernière n'est pas implémentée en standard dans \LaTeX\
% (mais dans \textsf{mismath}).}.
%
-% \medskip
-% \DescribeMacro{\Card} \DescribeMacro{\card}
-% Pour le cardinal d'un ensemble, nous proposons |\Card|, cité dans~\cite{RTIN},
-% ou |\card|, cité dans~\cite{AA}.
+% \newpage
+% \DescribeMacro{\card} \DescribeMacro{\Card}
+% Pour le cardinal d'un ensemble, nous proposons |\card|, cité dans~\cite{RTIN} et \cite{AA},
+% ou |\Card|, d'usage courant (cf. Wikipedia).
%
% \medskip
% \DescribeMacro{\Ker} \DescribeMacro{\Hom}
@@ -311,6 +305,27 @@
% On les obtient avec les commandes |\ch|, |\sh| et |\tgh|
% \footnote{La commande \texttt{\bslash th} existe déjà et produit $\th$.}.
%
+% \subsection{Bases et repères}
+%
+% \DescribeMacro{\Oij} \DescribeMacro{\Oijk}
+% Les repères classiques du plan ou de l'espace seront composés
+% avec des hauteurs de flèches homogénéisées :
+% |\Oij| compose \Oij, |\Oijk| compose \Oijk et |\Ouv| compose \Ouv
+% (utilisé dans le plan complexe). \DescribeMacro{\Ouv}
+% On peut écrire ces commandes en mode texte, sans les délimiteurs du mode mathématique.
+%
+% \DescribeMacro{\Oij*} \DescribeMacro{\Oijk*} \DescribeMacro{\Ouv*}
+% Les versions étoilées utilisent le point-virgule et non la virgule
+% comme séparateur après le point O, comme mentionné dans \cite{RTIN}.
+% On obtient \Oij*, \Oijk*, \Ouv*.
+%
+% \DescribeMacro{\ij} \DescribeMacro{\ijk}
+% Enfin les macros |\ij| et |\ijk| composent la base du plan \ij
+% et de l'espace \ijk, en homogénéisant la hauteur des flèches.
+% Notons que la macro |\ij| existait déjà (ligature entre i et j pour le hollandais)
+% et a été redéfinie.
+%
+% \StopEventually{}
%
% \section{Le code}
%
@@ -372,18 +387,6 @@
\newcommand\paral{\mathrel{/\!\!/}} % \parallel existe déjà : ||
\newcommand\ssi{si, et seulement si,\xspace}
\newcommand*\cmod[1]{\quad[#1]}
-\newcommand\Oij{\ensuremath{
- \left(O, \vec{\imath}, \vec{\jmath}\,\right)
- }\xspace
-}
-\newcommand\Oijk{\ensuremath{
- \left(O, \vec{\vphantom{t}\imath}, \vec{\vphantom{t}\jmath},
- \vec{\vphantom{t}\smash{k}}\,\right)
- }\xspace
-}
-\newcommand\Ouv{\ensuremath{
- \left(O, \vec{u}, \vec{v}\,\right)}\xspace
-}
\DeclareMathOperator{\pgcd}{pgcd}
\DeclareMathOperator{\ppcm}{ppcm}
@@ -396,6 +399,47 @@
\DeclareMathOperator{\ch}{ch}
\DeclareMathOperator{\sh}{sh}
\DeclareMathOperator{\tgh}{th} %\th existe déjà
+
+\newcommand\@Oij{\ensuremath{
+ \left(O, \vec{\imath}, \vec{\jmath}\,\right)
+ }\xspace
+}
+\newcommand\@@Oij{\ensuremath{
+ \left(O ; \vec{\imath}, \vec{\jmath}\,\right)
+ }\xspace
+}
+\newcommand\Oij{\@ifstar{\@@Oij}{\@Oij}}
+
+\newcommand\@Oijk{\ensuremath{
+ \left(O, \vec{\vphantom{t}\imath}, \vec{\vphantom{t}\jmath},
+ \vec{\vphantom{t}\smash{k}}\,\right)
+ }\xspace
+}
+\newcommand\@@Oijk{\ensuremath{
+ \left(O ; \vec{\vphantom{t}\imath}, \vec{\vphantom{t}\jmath},
+ \vec{\vphantom{t}\smash{k}}\,\right)
+ }\xspace
+}
+\newcommand\Oijk{\@ifstar{\@@Oijk}{\@Oijk}}
+
+\newcommand\@Ouv{\ensuremath{
+ \left(O, \vec{u}, \vec{v}\,\right)}\xspace
+}
+\newcommand\@@Ouv{\ensuremath{
+ \left(O ; \vec{u}, \vec{v}\,\right)}\xspace
+}
+\newcommand\Ouv{\@ifstar{\@@Ouv}{\@Ouv}}
+
+\AtBeginDocument{\renewcommand\ij{\ensuremath{
+ \left(\vec{\imath}, \vec{\jmath}\,\right)
+ }\xspace
+}}
+\newcommand\ijk{\ensuremath{
+ \left(\vec{\vphantom{t}\imath}, \vec{\vphantom{t}\jmath},
+ \vec{\vphantom{t}\smash{k}}\,\right)
+ }\xspace
+}
+
% \end{macrocode}
%
% \begin{thebibliography}{19}
diff --git a/macros/latex/contrib/frenchmath/frenchmath.ins b/macros/latex/contrib/frenchmath/frenchmath.ins
index 5df632c9fb..54462b10dc 100644
--- a/macros/latex/contrib/frenchmath/frenchmath.ins
+++ b/macros/latex/contrib/frenchmath/frenchmath.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
diff --git a/macros/latex/contrib/frenchmath/frenchmath.pdf b/macros/latex/contrib/frenchmath/frenchmath.pdf
index 29ea11e0cf..9f96baf702 100644
--- a/macros/latex/contrib/frenchmath/frenchmath.pdf
+++ b/macros/latex/contrib/frenchmath/frenchmath.pdf
Binary files differ
diff --git a/macros/latex/contrib/hyperxmp/hyperxmp.dtx b/macros/latex/contrib/hyperxmp/hyperxmp.dtx
index eab2cc3940..a6dd612e77 100644
--- a/macros/latex/contrib/hyperxmp/hyperxmp.dtx
+++ b/macros/latex/contrib/hyperxmp/hyperxmp.dtx
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{hyperxmp}
%<*package>
- [2020/10/05 v5.6 Store hyperref metadata in XMP format]
+ [2020/11/01 v5.7 Store hyperref metadata in XMP format]
%</package>
%
%<*driver>
@@ -264,6 +264,8 @@
% \newcounter{note}
% \newcommand{\usagenote}[1]{^^A
% \refstepcounter{note}^^A
+% \Needspace{\baselineskip}^^A
+% \belowpdfbookmark{Note \thenote: #1}{note.\thenote}^^A
% \paragraph{Note~\thenote: #1}%
% }
%
@@ -302,6 +304,9 @@
% \DeclareRobustCommand{\Dvips}{^^A
% \texorpdfstring{Dvips\SortIndex{dvips}{\texttt{dvips}}}{Dvips}^^A
% }
+% \DeclareRobustCommand{\progname}[1]{^^A
+% \texttt{#1}\SortIndex{#1}{\texttt{#1}}^^A
+% }
% \DeclareRobustCommand{\Lua}{^^A
% Lua\index{Lua}^^A
% }
@@ -1338,8 +1343,8 @@
% via the \Koma\ letter classes (e.g.,~\clsname{scrlttr2}) and the
% \ACMclass\ article class (\clsname{acmart}).
%
-% If a document uses either or \pkgname{babel} or \pkgname{polyglossia}
-% package, it is recommended that it \emph{not} explicitly set
+% If a document uses either the \pkgname{babel} or \pkgname{polyglossia}
+% packages it is recommended that it \emph{not} explicitly set
% \optname{pdflang}. \optname{pdflang} accepts only a single language
% name while \pkgname{hyperxmp} can automatically query \pkgname{babel}
% and \pkgname{polyglossia} for a list of all languages used in the
@@ -1430,6 +1435,7 @@
% \pkgname{totpages} package help generate \optname{pdfpagerange}. For
% documents numbered from~1 to~$n$, a simple
%
+% \Needspace{3\baselineskip}
% \begin{verbatim}
% \hypersetup{%
% pdfpagerange={1-\ref*{TotPages}}
@@ -1475,6 +1481,77 @@
% }
% \end{verbatim}
%
+% \usagenote{Automatic computation of the PDF byte count}
+% \label{note:auto-byte-count}
+%
+% The \schema[PRISM Basic Metadata]{\protect\acro{PRISM} Basic Metadata}
+% schema~\cite{PRISM2012:basic-meta} defines a \xmpprop{prism:byteCount}
+% property that indicates the \acro{PDF} file size in bytes.
+% \pkgname{hyperxmp} computes this value automatically when the document
+% is built using \LuaLaTeX\ but not when using any other \TeX\ engine.
+% (Note that \pkgname{hyperxmp} uses the file size from the
+% \emph{previous} run of \LuaLaTeX\ because the new \acro{PDF} file is
+% not yet complete.)
+%
+% The \progname{latexmk} build tool can be configured to automatically
+% append a line of the form ``|\hypersetup{pdfbytes=|\meta{number}|}|''
+% to the generated |.aux| file. The subsequent build of the document
+% will read the |.aux| file at the end of the preamble and set
+% \optname{pdfbytes} accordingly. The Perl code shown in
+% Figure~\ref{fig:latexmkrc}, derived from code posted by Nelson Posse
+% Lago and John Collins on
+% \url{https://github.com/borisveytsman/acmart/issues/413}, can be
+% included in a \progname{latexmk} configuration file to set
+% \optname{pdfbytes} automatically whenever \progname{latexmk} builds a
+% \pkgname{hyperxmp}-based document using
+% \pdfLaTeX\ (\progname{latexmk}'s |--pdf| option). The code can be
+% adapted, \textit{mutatis mutandis}, to work with \XeLaTeX\ builds
+% (\progname{latexmk}'s |--pdfxe| or |--xelatex| option).
+%
+% \iffalse
+%<*listings>
+% \fi
+\begin{figure}
+ \begin{lstlisting}[
+ language=perl,
+ columns=fullflexible,
+ frame=single,
+ basicstyle=\footnotesize,
+ showstringspaces=false
+ ]
+$pdflatex = 'internal mylatex %O %S';
+
+sub mylatex {
+ my @args = @_;
+ $retval = system 'pdflatex', @args;
+ get_pdf_size();
+ return $retval;
+}
+
+sub get_pdf_size {
+ my $size = (stat($out_dir1 . $root_filename . ".pdf"))[7];
+ open(AUX, '>>', $aux_dir1 . $root_filename . ".aux")
+ || die "Can't open file " . $aux_dir1 . $root_filename . ".aux: $!";
+ if (defined($size)) {
+ print AUX "\\\@ifpackageloaded{hyperxmp}{\\hypersetup{pdfbytes=$size}}{}\n";
+ }
+ close(AUX);
+}
+ \end{lstlisting}
+ \caption{Code to include in a \progname{latexmk} configuration file
+ to automate the assignment of \pkgname{hyperxmp}'s
+ \optname{pdfbytes} option when building with \pdfLaTeX}
+ \label{fig:latexmkrc}
+\end{figure}
+% \iffalse
+%</listings>
+% \fi
+%
+% See \href{http://mirrors.ctan.org/support/latexmk/latexmk.pdf}{the
+% \progname{latexmk} manual} for information on configuration-file
+% naming on different operating systems and explanations of the hooks
+% used in the Figure~\ref{fig:latexmkrc} code.
+%
%
% \StopEventually{^^A
% \section{Help Wanted}
@@ -2653,6 +2730,7 @@
% \end{macro}
%
% \begin{macro}{\hyxmp@concated@metadata}
+% \begin{macro}{\hyxmp@aep@toks}
% Assume that if the document loaded either \pkgname{babel} or
% \pkgname{polyglossia} it will eventually define one or more languages
% that \pkgname{hyperxmp} can list within a \xmpprop{dc:language}
@@ -2675,6 +2753,7 @@
}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\hyxmp@warn@if@no@metadata}
% \begin{macro}{\hyxmp@concated@metadata}
@@ -2792,6 +2871,7 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\hyxmp@aep@toks}
% Right before we reach the |\begin{document}| we check if
% \pkgname{hyperref} was loaded. In normal usage, the document will
% already have done a |\usepackage{hyperref}| because otherwise,
@@ -2857,6 +2937,7 @@
}%
}
% \end{macrocode}
+% \end{macro}
%
% When we reach the |\end{document}| we need to gather up the metadata
% specified explicitly by the user, infer additional metadata where
@@ -3094,11 +3175,25 @@
% \end{macrocode}
%
% Determine the size of the output file from the \emph{previous} run of
-% \LuaLaTeX\ or \pdfLaTeX\@. This action has to be performed before the
+% \LuaLaTeX\@. This action has to be performed before the
% |\begin{document}| because at that point the size of the output file
% is reset to zero. We use |\jobname.pdf| as the name of the output
-% file even in the \LuaLaTeX\ case because |status.output_file_name| is
-% not defined at this point.
+% file because |status.output_file_name| is not defined at this point.
+%
+% It's possible to use \pdfLaTeX's \cs{pdffilesize} primitive to query
+% the size of |\jobname.pdf| under \pdfLaTeX\@. Unfortunately, doing so
+% has a side effect of making \progname{latexmk} view the
+% \acro{PDF} file as an input file, which puts \progname{latexmk} in an
+% infinite build loop. (This was the case for \pkgname{hyperxmp} v5.5
+% and v5.6.) See the discussion at
+% \url{https://github.com/borisveytsman/acmart/issues/413} for more
+% information.
+% \changes{v5.7}{2020/11/01}{Do not automatically compute the
+% \protect\acro{PDF} file size under \protect\pdfLaTeX\ because this confuses
+% \protect\progname{latexmk}. Thanks to John Collins, Nelson Posse Lago,
+% Derek Dreyer, and the other contributors to
+% \protect\href{https://github.com/borisveytsman/acmart/issues/413}{\protect\pkgname{acmart} issue \#413},
+% ``Latexmk goes into an infinite loop even on sample files from ACM''}
% \begin{macrocode}
\ifLuaTeX
\edef\hyxmp@prev@pdf@size{%
@@ -3109,10 +3204,6 @@ if nbytes then
end
}%
}%
-\else
- \ifPDFTeX
- \edef\hyxmp@prev@pdf@size{\pdffilesize{\hyxmp@jobname.pdf}}%
- \fi
\fi
% \end{macrocode}
%
@@ -5609,6 +5700,28 @@ ______</dc:#2>^^J%
%
% \begin{schemadesc}[XMP Media Management]{\protect\acro{XMP} Media Management}
%
+% \begin{macro}{\hyxmp@aep@toks}
+% Once we reach the end of the preamble and know that \cs{@pdftitle} and
+% \cs{@pdfauthor} are no longer expected to change we use those macros
+% (and others) to define one \acro{UUID} for the document
+% (\cs{hyxmp@DocumentID}) and one for the document instance
+% (\cs{hyxmp@InstanceID}). As explained in
+% Section~\ref{sec:initial-prep}, we defer the invocation of
+% \cs{AtEndPreamble} to the end of the file.
+% \changes{v5.7}{2020/10/13}{As requested by Moritz Heckscher, define
+% \protect\cs{hyxmp@DocumentID} and \protect\cs{hyxmp@InstanceID} at
+% the end of the preamble instead of at the end of the document}
+% \begin{macrocode}
+\expandafter\hyxmp@aep@toks\expandafter=\expandafter{%
+ \the\hyxmp@aep@toks
+ \AtEndPreamble{%
+ \@ifmtargexp{\hyxmp@DocumentID}{\hyxmp@def@DocumentID}{}%
+ \@ifmtargexp{\hyxmp@InstanceID}{\hyxmp@def@InstanceID}{}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\hyxmp@mm@schema}
% Add properties defined by the \acro{XMP} Media Management schema to
% the |\hyxmp@xml| macro. According to the \acro{XMP} specification,
@@ -5629,8 +5742,6 @@ ______</dc:#2>^^J%
% the \protect\acro{XMP} packet}
% \begin{macrocode}
\gdef\hyxmp@mm@schema{%
- \@ifmtargexp{\hyxmp@DocumentID}{\hyxmp@def@DocumentID}{}%
- \@ifmtargexp{\hyxmp@InstanceID}{\hyxmp@def@InstanceID}{}%
\hyxmp@add@simple{xmpMM:DocumentID}{\hyxmp@DocumentID}%
\hyxmp@add@simple{xmpMM:InstanceID}{\hyxmp@InstanceID}%
\hyxmp@add@simple{xmpMM:VersionID}{\@pdfversionid}%
diff --git a/macros/latex/contrib/hyperxmp/hyperxmp.pdf b/macros/latex/contrib/hyperxmp/hyperxmp.pdf
index 23e5ed9f76..d62a5dc555 100644
--- a/macros/latex/contrib/hyperxmp/hyperxmp.pdf
+++ b/macros/latex/contrib/hyperxmp/hyperxmp.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf
index b996c5d1b9..ea1a631bda 100644
--- a/macros/latex/contrib/pkuthss/doc/example.pdf
+++ b/macros/latex/contrib/pkuthss/doc/example.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/doc/example/Makefile b/macros/latex/contrib/pkuthss/doc/example/Makefile
deleted file mode 100644
index 7437115a33..0000000000
--- a/macros/latex/contrib/pkuthss/doc/example/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
-# Public domain.
-
-# 被编译的主文件的文件名,不包括扩展名。
-JOB = thesis
-# 这个变量的值可以为 latex、pdflatex 或 xelatex。
-LATEX = latex
-BIBTEX = biber -l zh__pinyin --output-safechars
-DVIPDF = dvipdfmx
-
-# 如果用 LaTeX 编译,则使用 dvipdfmx 将 dvi 转成 pdf。
-ifeq ($(LATEX), latex)
- DODVIPDF = $(DVIPDF) $(JOB)
-endif
-
-# 区分是 Windows 环境还是类 UNIX 环境。
-# 如果是后者,则 GNU make 将可以检测到已经定义 PATH 环境变量。
-ifdef PATH
- MAKE = make
- RM = rm -f
-else
- MAKE = mingw32-make
- RM = del
-endif
-
-doc:
- $(LATEX) $(JOB)
- $(BIBTEX) $(JOB)
- $(LATEX) $(JOB)
- $(LATEX) $(JOB)
- $(DODVIPDF)
-
-clean:
- $(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \
- $(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \
- $(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux
-
-distclean: clean
- $(RM) $(JOB).pdf
-
-# vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
index b503fc729a..4b8d75c4f8 100644
--- a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
+++ b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
@@ -22,7 +22,7 @@
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
}
{
- \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
+ \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { windows }
\ctex_punct_set:n { windows }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
index 97a7442140..837e526455 100644
--- a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
+++ b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
index 820daecd54..aaf026bf9f 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
+++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
@@ -1,3 +1,21 @@
+2020-11-02, v1.8.3
+
+ * Changes to example template:
+ - ctex-fontset-pkuthss.def: update `\ctex_load_zhmap' usage.
+ - Remove Makefile.
+
+ * Changes to package code:
+ - pkuthss.cls: do not let ulem mess with `\emph'.
+ - pkuthss.cls: make `ugly' title page more compliant.
+
+ * Changes to documentation:
+ - pkuthss-chap[12].tex: `须'/`需' typo.
+ - Remove space around `\zhdigits' in date.
+ - Add pkuthss.bib to copyright lines.
+
+ * Misc:
+ - Minor fixes and cosmetics.
+
2019-11-17, v1.8.2
* Misc:
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex
index 5dc80d5285..453d56bb69 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-abs.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex
index 0fd606b7b0..2859463747 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-ack.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
index 2e5152ece5..232f427558 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
@@ -55,7 +56,7 @@
我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。%
}
-中文字体须要用户自行获得。\myemph{%
+中文字体需要用户自行获得。\myemph{%
注:一些中文字体的字库不全,只有 GB2312 字符集内字符的字体信息。
这种情况通常会造成编译生成的 pdf 文件中缺少部分字符,
其中一种典型症状是“〇”字显示不出来。
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 4455b376b7..c7c1c75c18 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
@@ -252,7 +253,7 @@
\texttt{\bfseries\string\setpdfproperties} 命令
用于根据用户设定的文档信息自动设定生成的 pdf 文档的属性。
此命令会在用户调用 \verb|\maketitle| 命令时被自动调用,
-因此通常不须要用户自己使用;
+因此通常不需要用户自己使用;
但用户有时可能不须要输出封面,从而不会调用 \verb|\maketitle| 命令,
此时就须要在设定完文档信息之后调用 \verb|\setpdfproperties|。%
\myemph{注意:须要启用 \texttt{pdfprop} 选项才能使用此命令。}
@@ -324,7 +325,7 @@ $TEXMFDIST/tex/latex/pkuthss/
\end{Verbatim}
如果的确须要修改 pkuthss 文档类的源文件,\myemph{%
- 建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件
+ 建议用户将 \texttt{pkuthss.cls} 或其它须要修改的文件
复制到被编译的主文件所在的目录,
然后对此副本进行修改%
}\footnote{%
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 77de4b0461..0fbd72bd47 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex
index 4d71382198..93fb141f4c 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
index 736ee4c298..68d86f34de 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
index f87f67472f..e085ba1497 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
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 c5485c2a3f..396f9fe6c3 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
index 67174bdfbc..ee9cadcad2 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
@@ -100,12 +100,12 @@ index ac5b0c9..9d2ad60 100644
-
% vim:ts=4:sw=4
diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index 30e05de..4d6ee53 100644
+index 9c5f042..a54d01f 100644
--- a/doc/example/thesis.tex
+++ b/doc/example/thesis.tex
-@@ -16,54 +16,44 @@
+@@ -12,54 +12,44 @@
+ \documentclass[UTF8]{pkuthss}
% 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。
- % 注意:在启用此设定的情况下,可能要多编译一次以产生正确的脚注编号。
%\usepackage[perpage]{footmisc}
-
-% 使用 biblatex 排版参考文献,并规定其格式(详见 biblatex-caspervector 的文档)。
@@ -182,11 +182,11 @@ index 30e05de..4d6ee53 100644
% 以下为正文之前的部分,默认不进行章节编号。
\frontmatter
diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index b699685..e4e58b6 100644
+index 9bc6000..7650e53 100644
--- a/tex/pkuthss-utf8.def
+++ b/tex/pkuthss-utf8.def
@@ -25,13 +25,13 @@
- [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
+ [2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
for the pkuthss document class]
-\def\label@ctitle{题目:}
@@ -207,10 +207,10 @@ index b699685..e4e58b6 100644
\def\label@ckeywords{关键词:}
\def\label@ekeywords{KEYWORDS:\ }
diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 9e68dc3..4b8cb00 100644
+index e34fe2d..477b3f4 100644
--- a/tex/pkuthss.cls
+++ b/tex/pkuthss.cls
-@@ -301,7 +301,7 @@
+@@ -304,7 +304,7 @@
\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
\if@twoside
@@ -219,7 +219,7 @@ index 9e68dc3..4b8cb00 100644
\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
\else
\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -347,13 +347,13 @@
+@@ -350,13 +350,13 @@
\zihao{1}%
\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
@@ -235,7 +235,7 @@ index 9e68dc3..4b8cb00 100644
}
\vfill
% Information about the author.
-@@ -361,19 +361,19 @@
+@@ -364,19 +364,19 @@
% Slightly adjust the line skip when using new font size.
\zihao{3}\linespread{1.75}\selectfont
\def\thss@tmp@len{0.56\textwidth}
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
index a85359a66e..3404e2a59a 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
@@ -1,3 +1,32 @@
+% Documentation for pkuthss.
+%
+% Copyright (c) 2008-2009 solvethis
+% Copyright (c) 2010-2019 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
+% your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX version
+% 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+% The current maintainer of this work is Casper Ti. Vector.
+%
+% This work consists of the following files:
+% pkuthss.tex
+% pkuthss.bib
+% chap/pkuthss-copy.tex
+% chap/pkuthss-abs.tex
+% chap/pkuthss-intro.tex
+% chap/pkuthss-chap1.tex
+% chap/pkuthss-chap2.tex
+% chap/pkuthss-chap3.tex
+% chap/pkuthss-concl.tex
+% chap/pkuthss-encl1.tex
+% chap/pkuthss-ack.tex
+
@online{amsthm,
author = {{Publications Technical Group, American Mathematical Society}},
title = {Using the amsthm Package},
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
index 2e8b081f48..522ebd9d54 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
@@ -16,6 +16,7 @@
%
% This work consists of the following files:
% pkuthss.tex
+% pkuthss.bib
% chap/pkuthss-copy.tex
% chap/pkuthss-abs.tex
% chap/pkuthss-intro.tex
@@ -49,7 +50,7 @@
tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
}
-\newcommand*{\docversion}{v1.8.2}
+\newcommand*{\docversion}{v1.8.3}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
ctitle = {北京大学学位论文模版\\pkuthss \docversion},
@@ -60,7 +61,7 @@
cauthor = {盖茨波·钛·维克托},
eauthor = {Casper Ti.\ Vector},
studentid = {00910???},
- date = {\zhdigits{2019} 年 \zhnumber{11} 月},
+ date = {\zhdigits{2020}年\zhnumber{11}月},
school = {化学与分子工程学院},
cmajor = {化学(?)}, emajor = {Chemistry ... ?},
direction = {据说 Casper 自己也不知道},
diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
index 0d70935c6a..03850ac253 100644
--- a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
Binary files differ
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
index 02e885da95..caf9986940 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2019/11/17 v1.8.2 Labels and captions in GBK encoding
+ [2020/11/02 v1.8.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 9bc6000ac1..a5f2722160 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
+ [2020/11/02 v1.8.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 7f75114da4..0a021b8bd7 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
@@ -23,7 +23,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2019/11/17 v1.8.2 Peking University dissertation document class]
+ [2020/11/02 v1.8.3 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -80,8 +80,8 @@
\RequirePackage{geometry}
% fancyhdr provides utilities for setting up headers and footers.
\RequirePackage{fancyhdr}
-% Provides `\uline' used in `\maketitle'.
-\RequirePackage{ulem}
+% Provides `\uline' used in `\maketitle' (but do not mess with `\emph').
+\RequirePackage[normalem]{ulem}
% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace.
\AtEndOfClass{\RequirePackage{hyperref}}
@@ -381,7 +381,7 @@
}
\vfill
% Date.
- {\zihao{-2}\@date}
+ {\ifthss@opt@ugly\zihao{3}\else\zihao{-2}\fi\@date}
\par\endgroup\end{titlepage}%
}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
index 762067f759..5884b8efd3 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
Binary files differ
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.dtx b/macros/latex/contrib/spacingtricks/spacingtricks.dtx
index 698b64dcb3..3c22a98a8a 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.dtx
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3 of this license
@@ -20,7 +20,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{spacingtricks}
- [2019/09/09 v1.2 .dtx spacingtricks file]
+ [2020/11/02 v1.3 .dtx spacingtricks file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -54,7 +54,7 @@
%</driver>
% \fi
%
-% \CheckSum{905}
+% \CheckSum{165}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -78,20 +78,21 @@
% \changes{v1.0}{2019/06/16}{English translation of the documentation}
% \changes{v1.1}{2019/09/06}{No automatic line breaking at the end of the centered command,
% new length compactitemlist}
-% \changes{v1.2}{2019/09/09}{Removing par command to get the expected centered macro}
+% \changes{v1.2}{2019/09/09}{A bug correction in the last update}
+% \changes{v1.3}{2020/11/02}{Loading the setspace package,
+% small changes in compactlist environment, improvement in dualboxes macro}
%
% \GetFileInfo{spacingtricks.sty}
%
% \title{The \texttt{spacingtricks} package\thanks{This document
% corresponds to \textsf{spacingtricks}~\fileversion, dated \filedate.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{September 09, 2019}
+% \date{November 02, 2020}
% \maketitle
%
% \section{Introduction}
%
-% This package proposes some macros to deal with spacing issues. Thus:
-%
+% This package offers some macros to deal with spacing issues. Thus:
% \begin{compactlist}
% \item "\centered" yields good horizontal centering without vertical spacing;
% \item "\footnote" has been redefined to avoid unsuitable spacings;
@@ -109,15 +110,18 @@
% (figures, tables, text) side by side by adjusting the vertical positioning.
% \end{compactlist}
%
+% \medskip
+% Two other common packages are loaded by \textsf{spacingtricks}:
+% \textsf{setspace} (natively in \LaTeXe),
+% for setting line spacing in a piece of text
+% (with the \texttt{spacing} environment), and
+% \textsf{xspace}~\cite{XSP}, which adds an interword space unless the macro
+% is followed by a punctuation character.
+%
% Otherwise, we provide the package \textsf{arraycols}~\cite{ARCOL},
% wich allows a good management of spacings in \texttt{tabular} and \texttt{array} environments,
% and \textsf{mismath}~\cite{MSMATH} of which several macros tends to improve spacings
% in mathematical formulas.
-% Let us mention also the \textsf{setspace} package (natively in \LaTeXe),
-% which allows to set the space between the lines of text, and
-% at last \textsf{xspace}~\cite{XSP},
-% which is loaded by \textsf{spacingtricks}: it adds a space unless the macro
-% is followed by certain punctuation characters.
%
% \section{Usage}
%
@@ -380,7 +384,7 @@
%
% \medskip
% \DescribeMacro{\compactlistindent}
-% This length (fixed at 1\,em by default) can be modified with "\setlength" to increase
+% This length (fixed at 0.5\,em by default) can be modified with "\setlength" to increase
% or decrease the indentation of the \texttt{compactlist} environment.
% Notice that there are several other ways to construct a compact list in particular
% with the \texttt{noitemsep} key of the \textsf{enumitem} package~\cite{ENUM}.
@@ -411,11 +415,11 @@
% (for several paragraphs and lists), etc.
% The optional \meta{pos} parameter sets the vertical level on which the boxes are aligned:
% a number between 0 (bottom) and 1 (top, default value).
-% Here is a first example with "\dualboxes[0.7]".
+% Here is a first example with "\dualboxes[0.65]".
%
% \medskip
% \psset{xunit=0.5cm,yunit=1.0cm,algebraic=true}
-% \dualboxes[0.7]{\footnotesize
+% \dualboxes[0.65]{\footnotesize
% $\begin{array}{|*{7}{c|}} \hline
% x & -2 & -1 & 0 & 1 & 2 & 3 \\ \hline
% f(x) & -0.96 & -0.71 & 0 & 0.59 & 0.38 & 0.18 \\ \hline
@@ -485,9 +489,13 @@
% within "\dualboxes" arguments,
% just as it's not possible for footnotes or margin notes.
%
+% \StopEventually{}
+%
% \section{Implementation}
% \begin{macrocode}
\RequirePackage{ifthen}
+\RequirePackage{calc}
+\RequirePackage{setspace}
\RequirePackage{xspace}
\newcommand*{\centered}[1]{{\setlength{\parskip}{0pt}\par\noindent\hfill
@@ -535,8 +543,9 @@
}{\end{list}}
\newlength{\compactlistindent}
-\setlength{\compactlistindent}{1em}
+\setlength{\compactlistindent}{0.5em}
\newenvironment*{compactlist}[1][\textbullet]{
+ \par % sometimes necessary
\begin{list}{#1\unskip}{% \unskip suppresses the space created by \xspace
\setlength{\itemsep}{0pt}
\setlength{\parsep}{0pt}
@@ -567,13 +576,13 @@
\newcommand{\@@dualboxes}[3][1]{
\par\noindent
- \raisebox{-#1\height}{#2} \hfill
- \raisebox{-#1\height}{#3} \smallskip
+ \raisebox{\depth-#1\totalheight}{#2} \hfill
+ \raisebox{\depth-#1\totalheight}{#3} \smallskip
}
\newcommand{\@dualboxes}[3][1]{
\par\noindent \hfill
- \raisebox{-#1\height}{#2} \hfill
- \raisebox{-#1\height}{#3} \hfill\mbox{}\smallskip
+ \raisebox{\depth-#1\totalheight}{#2} \hfill
+ \raisebox{\depth-#1\totalheight}{#3} \hfill\mbox{}\smallskip
}
\newcommand{\dualboxes}{\@ifstar{\@@dualboxes}{\@dualboxes}}
% \end{macrocode}
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.ins b/macros/latex/contrib/spacingtricks/spacingtricks.ins
index 9a5c670e8c..28f889e0f1 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.ins
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2019 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.pdf b/macros/latex/contrib/spacingtricks/spacingtricks.pdf
index 607b98a7f7..58d3a0602a 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.pdf
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.pdf
Binary files differ
diff --git a/macros/luatex/latex/semesterplanner/README.md b/macros/luatex/latex/semesterplanner/README.md
new file mode 100644
index 0000000000..bed9ea9ebe
--- /dev/null
+++ b/macros/luatex/latex/semesterplanner/README.md
@@ -0,0 +1,10 @@
+# Semesterplanner
+
+This package encapsules several useful environments for a beautiful printable semester plan.
+It includes a timetable (which is using the schedule-Package) as well as appointments, deadlines and exams.
+
+This package requires color, tikz, schedule and fontawesome. Furthermore documents need to be compiled with LuaLaTeX.
+
+## Repo and documentation
+See https://github.com/nlschn/semesterplanner
+
diff --git a/macros/luatex/latex/semesterplanner/semesterplanner.dtx b/macros/luatex/latex/semesterplanner/semesterplanner.dtx
new file mode 100644
index 0000000000..691f57ee96
--- /dev/null
+++ b/macros/luatex/latex/semesterplanner/semesterplanner.dtx
@@ -0,0 +1,207 @@
+% \iffalse meta-comment%% Copyright (C) 2020 by Niklas Schneider
+% -----------------------------------
+%
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% and version 1.3 or later is part of all distributions of LaTeX% version 2005/12/01 or later.
+%
+% \fi
+%
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\ProvidesPackage{semesterplanner}
+%<package> [2020/11/02v1.0 Creates beautiful semester timetables and more.]
+%
+%<*driver>\documentclass{ltxdoc}\usepackage{semesterplanner}\EnableCrossrefs\CodelineIndex\RecordChanges\begin{document}\DocInput{semesterplanner.dtx}\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{0}
+%
+% \CharacterTable
+% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \
+% Ampersand \&
+% Acute accent \’ Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \‘ Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+%
+% \changes{v1.0}{2020/11/02〉}{Initial version}
+%
+% \GetFileInfo{semesterplanner.sty}
+%
+% \DoNotIndex{}
+%
+% Required Packages.
+\RequirePackage{fontawesome}
+\RequirePackage{color}
+\RequirePackage{schedule}
+\RequirePackage{tikz}
+\usetikzlibrary{shapes}
+
+% Command to encircle the fa-icons with white, so that they are recognizable on colored ground.
+\newcommand*{\encircle}[1]{
+ \begin{minipage}[b][1em][c]{1.5em}
+ \begin{tikzpicture}
+ \node[fill,circle,inner sep=1pt, color = white] {#1};
+ \end{tikzpicture}
+ \end{minipage}
+}
+
+% Color for the platform symbols.
+\definecolor{dodgerblue}{rgb}{0.12, 0.56, 1.0}
+
+% Colors for the course types.
+\definecolor{seminar}{rgb}{1.0, 0.8, 0.0}
+\definecolor{lecture}{rgb}{0.2, 0.7, 1.0}
+\definecolor{tutorial}{rgb}{0.0, 0.8, 0.0}
+\definecolor{meeting}{rgb}{0.8, 0.0, 0.0}
+\definecolor{officehour}{rgb}{0.0, 0.4, 0.6}
+
+% The different course types.
+\NewAppointment{emeeting}{meeting}{white}
+\NewAppointment{electure}{lecture}{white}
+\NewAppointment{etutorial}{tutorial}{white}
+\NewAppointment{eseminar}{seminar}{white}
+\NewAppointment{eofficehour}{officehour}{white}
+
+% Commands to create a new entry in the timetable using the aboev types.
+\newcommand{\lecture}[6]{\electure{\textbf{#1}}{
+ \vspace*{-2.5em}
+ \begin{flushleft}
+ {#2}\\\vspace*{0.75em}{#6}{#3}
+ \end{flushleft}}
+ {#4}{#5}}
+\newcommand{\tutorial}[6]{\etutorial{\textbf{#1}}{
+ \vspace*{-2.5em}
+ \begin{flushleft}
+ {#2}\\\vspace*{0.75em}{#6}{#3}
+ \end{flushleft}}
+ {#4}{#5}}
+\newcommand{\meeting}[6]{\emeeting{\textbf{#1}}{
+ \vspace*{-2.5em}
+ \begin{flushleft}
+ {#2}\\\vspace*{0.75em}{#6}{#3}
+ \end{flushleft}}
+ {#4}{#5}}
+\newcommand{\seminar}[6]{\eseminar{\textbf{#1}}{
+ \vspace*{-2.5em}
+ \begin{flushleft}
+ {#2}\\\vspace*{0.75em}{#6}{#3}
+ \end{flushleft}}
+ {#4}{#5}}
+\newcommand{\officehour}[6]{\eofficehour{\textbf{#1}}{
+ \vspace*{-2.5em}
+ \begin{flushleft}
+ {#2}\\\vspace*{0.75em}{#6}{#3}
+ \end{flushleft}}
+ {#4}{#5}}
+
+% Commands for entries in the three environments. They are a line of a table.
+\newcommand{\appointment}[6]{\textit{#1}&{#2}&{#3}&{#4}&{#5}&{#6}\\}
+\newcommand{\exam}[4]{\textit{#1}&{#2}&{#3}&{#4}\\}
+\newcommand{\deadline}[4]{\textit{#1}&{#2}&{#3}&{#4}\\}
+
+% Commands for symbols of priority
+\newcommand{\pmandatory}{\encircle{\textcolor{red}{\faWarning}}}
+\newcommand{\phigh}{\encircle{\textcolor{red}{\faFlag}}}
+\newcommand{\pmid}{\encircle{\textcolor{yellow}{\faFlag}}}
+\newcommand{\plow}{\encircle{\textcolor{green}{\faFlag}}}
+\newcommand{\pnone}{\encircle{\textcolor{gray}{\faTimesCircle}}}
+
+% Commands for exam types.
+\newcommand{\oral}{\faComment}
+\newcommand{\written}{\faPencil}
+
+% Commands for online platforms.
+\newcommand{\teams}{\encircle{\textcolor{dodgerblue}{\faWindows}}}
+\newcommand{\zoom}{\encircle{\textcolor{dodgerblue}{\faCamera}}}
+\newcommand{\youtube}{\encircle{\textcolor{red}{\faYoutubePlay}}}
+
+% Command for "To be determined" and "To be Announced"
+\newcommand{\tbd}{\faQuestion}
+\newcommand{\tba}{\faBullhorn}
+
+% Command for adding legends to timetable
+\newcommand{\ttlegend}[2]{{\footnotesize\textcolor{#1}{\faSquare}}&{\footnotesize {#2}}\\}
+
+% Environment for the timetable using schedule. Configuration is hardcoded.
+\newenvironment{timetable}
+ {
+ \section*{\faClockO~Timetable}
+ \vspace*{-2em}
+ \CellHeight{1.3cm}
+ \CellWidth{1in}
+ \TimeRange{08:00-18:00}
+ \SubUnits{60}
+ \BeginOn{Monday}
+ \TextSize{\tiny}
+ \FiveDay
+ \TwentyFourHour
+
+ \begin{schedule}
+
+ }
+ {
+ \end{schedule}
+ \vspace*{-1em}
+ }
+
+% Environment for appointment list. Use appointment command to add one.
+% Argument is for caption of the "room" column.
+\newenvironment{appointments}[1][Room]
+{
+ \section*{\faCalendar~Appointments}
+ \begin{tabular}{llllll}
+ \textbf{Date}&\textbf{Time}&\textbf{Course}&\textbf{Description}&\textbf{{#1}}&\textbf{Prio.}\\
+ }
+ {\end{tabular}
+}
+
+% Environment for deadline list. Use dealine command to add one.
+\newenvironment{deadlines}
+{
+ \section*{\faBomb~Deadlines}
+ \begin{tabular}{llll}
+ \textbf{Date}&\textbf{Course}&\textbf{Description}&\textbf{Prio.}\\
+ }
+ {\end{tabular}
+}
+
+% Environment for exam list. Use exam command to add one.
+\newenvironment{exams}
+{
+ \section*{\faStickyNoteO~Exams}
+ \begin{tabular}{llll}
+ \textbf{Date}&\textbf{Time}&\textbf{Course}&\textbf{Type}\\
+ }
+ {\end{tabular}
+}
+
+% Environment for timetable legend. Use \ttlabel command.
+\newenvironment{legend}
+ {
+ \begin{center}
+ \begin{tabular}{ll}
+ }
+ {
+ \end{tabular}
+ \end{center}
+ }
+\endinput
+% \Finale
diff --git a/macros/luatex/latex/semesterplanner/semesterplanner.ins b/macros/luatex/latex/semesterplanner/semesterplanner.ins
new file mode 100644
index 0000000000..3a96270af5
--- /dev/null
+++ b/macros/luatex/latex/semesterplanner/semesterplanner.ins
@@ -0,0 +1,48 @@
+%%
+%% Copyright (C) 2020 by Niklas Schneider
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/semesterplanner}
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2020 by Niklas Schneider
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. The latest version of this license is in:
+
+http://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+
+\endpreamble
+\generate{\file{semesterplanner.sty}{\from{semesterplanner.dtx}{semesterplanner}}}
+
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space〈package〉.sty}\Msg{*}
+\Msg{* To produce the documentation run the file semesterplanner.dtx}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}\endbatchfile \ No newline at end of file
diff --git a/macros/luatex/latex/semesterplanner/semesterplanner.pdf b/macros/luatex/latex/semesterplanner/semesterplanner.pdf
new file mode 100644
index 0000000000..47425cef42
--- /dev/null
+++ b/macros/luatex/latex/semesterplanner/semesterplanner.pdf
Binary files differ