diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-02 21:03:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-02 21:03:50 +0000 |
commit | ee5ebfe4eb2a5ae172138dfcd1aa620218151093 (patch) | |
tree | e9e3d4b709e180664694d1c6b5100060e680e678 | |
parent | 85a89d410c53a59d26062f19ae15f0fd3e9a2dc1 (diff) |
litetable (2mar24)
git-svn-id: svn://tug.org/texlive/trunk@70352 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf | bin | 299902 -> 304570 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-cn.tex | 96 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf | bin | 87775 -> 106969 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-demo.tex | 42 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-en.pdf | bin | 179002 -> 178911 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/litetable/litetable-en.tex | 124 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/litetable/litetable.cls | 102 |
7 files changed, 186 insertions, 178 deletions
diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf Binary files differindex 61c1752a5e9..6e91dd6280d 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf +++ b/Master/texmf-dist/doc/latex/litetable/litetable-cn.pdf diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex b/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex index 3843b12293b..cf2cc129ad3 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex +++ b/Master/texmf-dist/doc/latex/litetable/litetable-cn.tex @@ -8,10 +8,9 @@ \PassOptionsToPackage{quiet}{xeCJK} \PassOptionsToPackage{quiet, no-math}{fontspec} \documentclass[11pt]{article} -\usepackage{geometry,pdfpages,caption,indentfirst,setspace} +\usepackage{geometry,pdfpages,caption,indentfirst,setspace,xeCJK} \captionsetup[table]{name={\textsc{Table}},labelsep=period} \usepackage[level]{datetime} -\usepackage{unicode-math,xeCJK,fontawesome5} \usepackage{authblk,xltxtra,bigfoot,enumitem} \usepackage{booktabs,diagbox,ragged2e,tabularx} \renewcommand\tabularxcolumn[1]{>{\Centering}m{#1}} @@ -21,8 +20,8 @@ \setCJKmainfont{Chiron Sung HK} [BoldFont=Chiron Sung HK Bold, ItalicFont=Kaiti SC] -\usepackage{hyperref,cprotect,xcolor,verbatim,tikz} - +\usepackage{hyperref,xcolor,tikz} +\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} \definecolor{pkgcolor}{Hsb}{103,.8,.5} \definecolor{moducolor}{Hsb}{290,.8,.5} \definecolor{cmdcolor}{Hsb}{188,.8,.5} @@ -41,22 +40,19 @@ \definecolor{W5}{HTML}{5270CC} \definecolor{W6}{HTML}{8F52CC} \definecolor{W7}{HTML}{CC52AD} -\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} - \def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1”}} \def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1”}} \def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1”}} \def\datechange#1#2{% \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}} \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}} -\makeatother \title{\bfseries\pkg{LiteTable} -- 多彩的课程表\textsf{\LaTeX} 模板} \author{\href{https://www.hdu.edu.cn}{杭州电子科技大学}, 夏明宇} \yyyymmdddate \date{\today} \affil{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}} -\date{\today\quad Version 2.4b\thanks{% +\date{\today\quad Version 2.4c\thanks{% \url{https://github.com/xiamyphys/litetable}}} \begin{document} \maketitle @@ -73,9 +69,7 @@ \section{Introduction} \subsection{本模板的目的} -本模板提供了一个多彩的课程表设计. - -如果你在使用本模板时遇到问题,或者有更好的建议,或者你想参与本模板或本人其他模板的开发,欢迎通过邮件 \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com} 联络我. +本模板提供了一个多彩的课程表设计. 如果在使用本模板时遇到问题或有更好的建议,或者你想参与本模板或本人其他模板的开发,欢迎通过邮件 \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com} 联络我. 同样,你也可以加入我的\textsf\LaTeX{} 技術交流群 \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} 与我交流,来获取模板的内测版本. @@ -87,17 +81,18 @@ 然而我强烈建议您使用终端机去执行以下命令,以将所有宏集更新到最新版本,并安装此模板 \begin{verbatim} - sudo tlmgr update --self - sudo tlmgr update --all + sudo tlmgr update --self --all \end{verbatim} -如果您所在的地区存在网路封锁(如 GFW 干扰),你可以选择合适的镜像网站或其他方法\footnote{请遵守当地的网路条例.}. 欲详细了解,请前往 \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my TEX distribution?} +如果您所在的地区存在网路封锁(如 GFW 干扰),你可以选择合适的镜像网站或其他方法\footnote{请遵守当地的网路条例.}. 欲详细了解,请前往 \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \textsf{\TeX} distribution?} -本模板提供了两个选项:\mode{direction} 和 \mode{font}. 只需将你要使用的选项模式分别添加在你的 \verb|.tex| 文件中命令 \verb|\documentclass[ ]{litetable}| 的方括号中即可. +本模板提供了两个选项:\mode{direction} 和 \mode{font}. 将你要使用的选项模式添加在 \verb|.tex| 文件中命令 \verb|\documentclass[ ]{litetable}| 的方括号中即可. \subsection{兼容性} 所使用的测试环境为 macOS + MacTeX 2023 / Overleaf,都可在 \XeLaTeX{} 编译方式下顺利运行, Windows, Linux 和 Unix 平台兼容性未知. +此模板在 macOS 平台开发,使用 ``Heiti SC'' 字体. 如果你未安装此字体,请在命令 \verb|\documentclass{litetable}| 后使用命令 \verb|\setCJKfamilyfont{zhhei}{ }| 将 ``Heiti SC'' 替换为电脑中存在的字体. + \section{\pkg{LiteTable} 的全局选项} \begin{verbatim} \documentclass[options]{litetable} @@ -107,57 +102,52 @@ 此选项有两个模式,\mode{portrait} 和 \mode{landscape}, 可使课程表纵向或横向显示,默认为纵向. \subsection{\mode{font} 选项} -此选项有两个模式,\mode{times} 和 \mode{libertinus},可使字体为 ``Times New Roman'' 或 ``Libertinus'',默认为 ``Times New Roman''\footnote{在使用 ``Libertinus'' 模式前请确保电脑中已安装该字体.}. +此选项有两个模式,\mode{times} 和 \mode{libertinus},可使字体为 ``Times New Roman'' 或 ``Libertinus'',默认为 ``Times New Roman''\footnote{使用 \mode{libertinus} 模式时请确保已安装该字体.}. \section{\pkg{LiteTable} 的命令} \subsection{\cmd{makeframe} 命令} \begin{verbatim} - \makeframe{Timetable -- Semester 5} + \makeframe[Sem 6]{Axia's Timetable} \end{verbatim} -此命令可建立一个标题为 ``Timetable -- Semester 5'' 的空白课程表. +此命令有两个参数,用于建立空白课程表. 第二个参数用于设置标题,第一个可选参数用于在标题右侧添加可跳转至第二页的学期按钮. \subsection{\cmd{weeklist} 命令} \begin{verbatim} \weeklist{ - \bfseries\textcolor{W1}{\faIcon{moon}~星期一}, - \bfseries\textcolor{W2}{\faIcon{fire}~星期二}, - \bfseries\textcolor{W3}{\faIcon{water}~星期三}, - \bfseries\textcolor{W4}{\faIcon{tree}~星期四}, - \bfseries\textcolor{W5}{\faIcon{coins}~星期五}, - \bfseries\textcolor{W6}{\faIcon{mountain}~星期六}; + \textcolor{W1}{星期一}, \textcolor{W2}{星期二}, + \textcolor{W3}{星期三}, \textcolor{W4}{星期四}, + \textcolor{W5}{星期五}, \textcolor{W6}{星期六}; 0,.175,.35,.525,.7,.875,1 } \end{verbatim} -此命令可在课程表顶部添加工作日,你可以自由决定显示样式,包括前面的 logo\footnote{由 \pkg{fontawesome5} 宏集支持.}. 你可以自定义课程表中每一列的宽度,如上图所示. - \begin{figure}[!ht] \centering \tikz -{ - \tikzset{every node/.style={font=\footnotesize}} - \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0); - \draw ({-5.10 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|}; - \draw ({0.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|}; - \draw ({.175*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.175|}; - \draw ({.350*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.35|}; - \draw ({.525*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.525|}; - \draw ({.700*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.7|}; - \draw ({.875*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.875|}; - \draw ({1.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|}; - \node [above] at ({.0875*5.1 in},0) {\textcolor{W1}{\faIcon{moon}~星期一}}; - \node [above] at ({.2625*5.1 in},0) {\textcolor{W2}{\faIcon{fire}~星期二}}; - \node [above] at ({.4375*5.1 in},0) {\textcolor{W3}{\faIcon{water}~星期三}}; - \node [above] at ({.6125*5.1 in},0) {\textcolor{W4}{\faIcon{tree}~星期四}}; - \node [above] at ({.7875*5.1 in},0) {\textcolor{W5}{\faIcon{coins}~星期五}}; - \node [above] at ({.9375*5.1 in},0) {\textcolor{W6}{\faIcon{mountain}~星期六}}; -} -\caption*{命令 \cmd{weeklist} 中的第二行数组与坐标相对应.} + { + \tikzset{every node/.style={font=\footnotesize}} + \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0); + \draw ({-5.10 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|}; + \draw ({0.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|}; + \draw ({.175*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.175|}; + \draw ({.350*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.35|}; + \draw ({.525*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.525|}; + \draw ({.700*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.7|}; + \draw ({.875*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.875|}; + \draw ({1.00*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|}; + \node [above] at ({.0875*5.1 in},0) {\textcolor{W1}{星期一}}; + \node [above] at ({.2625*5.1 in},0) {\textcolor{W2}{星期二}}; + \node [above] at ({.4375*5.1 in},0) {\textcolor{W3}{星期三}}; + \node [above] at ({.6125*5.1 in},0) {\textcolor{W4}{星期四}}; + \node [above] at ({.7875*5.1 in},0) {\textcolor{W5}{星期五}}; + \node [above] at ({.9375*5.1 in},0) {\textcolor{W6}{星期六}}; + } + \caption*{命令 \cmd{weeklist} 中的第二行数组与坐标相对应.} \end{figure} -课程表可根据你输入的时间组数自动生成相应的列数. 如上方代码共有 5 个工作日,就会生成 5 列的课程表. +此命令可在课程表顶部添加工作日,你可以自由决定显示样式,甚至是前面的 logo. 你可以自定义课程表中每一列的宽度,如图所示. 课程表可根据你输入的时间组数自动生成相应的列数. 如上方代码共有 5 个工作日,就会生成 5 列的课程表. \subsection{\cmd{timelist} 命令} \begin{verbatim} @@ -231,14 +221,16 @@ \subsection{\cmd{more} 命令} \begin{verbatim} - \more{ · School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024} + \more{· School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024} \end{verbatim} + 此命令可在课程表末尾添加备注信息. \subsection{\cmd{sticker} 命令} \begin{verbatim} \sticker{favicon} \end{verbatim} + 在使用此命令后页面的右下方会添加一张贴纸. \section{版本历史} @@ -246,7 +238,7 @@ 课程表的设计源于\href{https://www.hdu.edu.cn}{杭州电子科技大学}杭电助手学生课表页面(仅本校师生可访问). 页面排版十分精美,于是本人使用 \textsf{\LaTeX{}} 复刻出了课程表样式,并制作成模板分享给大家. \textsf{\bfseries Version 1.0} 于01/09/2023完成开发,并发布在 \href{https://www.latexstudio.net/index/details/index/mid/3625.html}{\textsf{\LaTeX}工作室} (杭州萧山)上,赢得了许多人的喜爱. - +\clearpage \setlist[itemize]{noitemsep, topsep=0pt} \datechange{2023/11/01}{Version 2.0a} \begin{itemize} @@ -286,14 +278,18 @@ \item 支持设置默认首末周. \end{itemize} -\datechange{\today}{Version 2.4b} +\datechange{2024/03/01}{Version 2.4b} \begin{itemize} \item 修复了在 \mode{landscape} 模式中添加超过 7 个工作日时 \emph{分辨率溢出}的错误. \item 支持自定义课程表中每一列的宽度. \item 优化圆角设计,支持自定义圆角半径. + \item 感谢 @egreg 在 \TeX{} Exchange 上提供的 \href{https://tex.stackexchange.com/a/711657/299948}{输出数组中每一列元素个数} 的代码方案. \end{itemize} -感谢 @egreg 在 \TeX{} Exchange 上提供的 \href{https://tex.stackexchange.com/a/711657/299948}{输出数组中每一列元素个数} 的代码. +\datechange{\today}{Version 2.4c} +\begin{itemize} + \item 支持在标题右侧添加学期按钮. +\end{itemize} \appendix \includepdf[pages={1,3}]{litetable-demo.pdf} diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf Binary files differindex 154f6aa089a..136369231ab 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf +++ b/Master/texmf-dist/doc/latex/litetable/litetable-demo.pdf diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex b/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex index 86851122dc4..f2210298bf2 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex +++ b/Master/texmf-dist/doc/latex/litetable/litetable-demo.tex @@ -1,6 +1,7 @@ \documentclass[times]{litetable} + % \setCJKfamilyfont{zhhei}{Chiron Sung HK} -% \renewcommand*{\heiti}{\CJKfamily{zhhei}} + \corner{6 pt} \sticker{favicon} @@ -21,7 +22,7 @@ \weeks{Week 1 -- 16} \begin{tikzpicture} - \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 6} + \makeframe[SEM 6]{Axia\!\texttt{'}\!s Timetable} % Mon. \course[H5]{7}{8}{凝聚态物理}{第6教研楼 · 中225}{Mn Chen} @@ -50,18 +51,18 @@ \rotatepage \weeklist{ - \bfseries\textcolor{W1}{\faIcon{moon}~Monday}, - \bfseries\textcolor{W2}{\faIcon{fire}~Tuesday}, - \bfseries\textcolor{W3}{\faIcon{water}~Wednesday}, - \bfseries\textcolor{W4}{\faIcon{tree}~Thursday}, - \bfseries\textcolor{W5}{\faIcon{coins}~Friday}, - \bfseries\textcolor{W6}{\faIcon{mountain}~Saturday}, - \bfseries\textcolor{W7}{\faIcon{sun}~Sunday}; + \bfseries\sffamily\textcolor{W1}{\faIcon{moon}~Monday}, + \bfseries\sffamily\textcolor{W2}{\faIcon{fire}~Tuesday}, + \bfseries\sffamily\textcolor{W3}{\faIcon{water}~Wednesday}, + \bfseries\sffamily\textcolor{W4}{\faIcon{tree}~Thursday}, + \bfseries\sffamily\textcolor{W5}{\faIcon{coins}~Friday}, + \bfseries\sffamily\textcolor{W6}{\faIcon{mountain}~Saturday}, + \bfseries\sffamily\textcolor{W7}{\faIcon{sun}~Sunday}; 0,.16,.32,.48,.64,.8,.9,1 } \begin{tikzpicture} - \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 6} + \makeframe[SEM 6]{Axia\!\texttt{'}\!s Timetable} % Mon. \course[H5]{7}{8}{Introduction to Cond.}{Building 6 · Middle 225}{Mn Chen} @@ -93,7 +94,6 @@ 8:05,8:55,10:00,10:50,11:40,13:30,14:20,15:15,16:05,18:30,19:20,20:10; 8:50,9:40,10:45,11:35,12:25,14:15,15:05,16:00,16:50,19:15,20:05,20:55 } - \weeklist { \heiti\bfseries\textcolor{W1}{\faIcon{moon}~星期一}, @@ -107,7 +107,7 @@ \weeks{Week 1 -- 18} \begin{tikzpicture} - \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 5} % make title & background + \makeframe[SEM 5]{Axia\!\texttt{'}\!s Timetable} % make title & background % Mon. \course[H1]{1}{2}{羽毛球}{羽毛球场}{Ys Yu} \course[H7]{3}{5}{光学镜头设计实验}{第6教研楼 · 南402}{Hao Ying}[Week 5 -- 15] @@ -130,23 +130,23 @@ \course[H8]{6}{7}{光电创新实践4}{第6教研楼 · 南302}{Ql Huang}[Week 5 -- 16] \course[H5]{8}{9}{研究生组会}{第6教研楼 · 中}{Yuan Li} \more{ · Hangzhou Asian Games: 23 / 09 / 2023 -- 08 / 10 / 2023 · School Starts: 11 / 09 / 2023 - · Winter Vacation: 26 / 01 / 2024} + · Winter Vacation: 26 / 01 / 2024} \end{tikzpicture} \rotatepage \weeklist{ - \bfseries\textcolor{W1}{\faIcon{moon}~Monday}, - \bfseries\textcolor{W2}{\faIcon{fire}~Tuesday}, - \bfseries\textcolor{W3}{\faIcon{water}~Wednesday}, - \bfseries\textcolor{W4}{\faIcon{tree}~Thursday}, - \bfseries\textcolor{W5}{\faIcon{coins}~Friday}, - \bfseries\textcolor{W6}{\faIcon{mountain}~Saturday}; + \bfseries\sffamily\textcolor{W1}{\faIcon{moon}~Monday}, + \bfseries\sffamily\textcolor{W2}{\faIcon{fire}~Tuesday}, + \bfseries\sffamily\textcolor{W3}{\faIcon{water}~Wednesday}, + \bfseries\sffamily\textcolor{W4}{\faIcon{tree}~Thursday}, + \bfseries\sffamily\textcolor{W5}{\faIcon{coins}~Friday}, + \bfseries\sffamily\textcolor{W6}{\faIcon{mountain}~Saturday}; 0,.175,.35,.525,.7,.875,1 } \begin{tikzpicture} - \makeframe{Axia\!\texttt{'}\!s Timetable -- Semester 5} % make title + \makeframe[SEM 5]{Axia\!\texttt{'}\!s Timetable} % make title % Mon. \course[H1]{1}{2}{Badminton}{Badminton Court}{Ys Yu} \course[H7]{3}{5}{Lens Design Expt.}{Building 6 · South 402}{Hao Ying}[Week 5 -- 15] @@ -169,7 +169,7 @@ \course[H8]{6}{7}{Innovative Practice 4}{Building 6 · South 302}{Ql Huang}[Week 5 -- 16] \course[H5]{8}{9}{Group Meeting}{Building 6 · Middle}{Yuan Li} \more{ · Hangzhou Asian Games: 23 / 09 / 2023 -- 08 / 10 / 2023 - · School Starts: 11 / 09 / 2023 · Winter Vacation: 26 / 01 / 2024 } + · School Starts: 11 / 09 / 2023 · Winter Vacation: 26 / 01 / 2024 } \end{tikzpicture} \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf b/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf Binary files differindex ea044888071..33f8659677c 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf +++ b/Master/texmf-dist/doc/latex/litetable/litetable-en.pdf diff --git a/Master/texmf-dist/doc/latex/litetable/litetable-en.tex b/Master/texmf-dist/doc/latex/litetable/litetable-en.tex index 5ec75d33d12..267f0f83464 100644 --- a/Master/texmf-dist/doc/latex/litetable/litetable-en.tex +++ b/Master/texmf-dist/doc/latex/litetable/litetable-en.tex @@ -5,24 +5,23 @@ %% * either version 1.3c of this license or any later * %% * version. * %% ****************************************************** -\PassOptionsToPackage{quiet}{xeCJK} -\PassOptionsToPackage{quiet, no-math}{fontspec} +% \PassOptionsToPackage{quiet}{xeCJK} +% \PassOptionsToPackage{quiet, no-math}{fontspec} \documentclass[11pt]{article} \usepackage{geometry,pdfpages,caption,indentfirst,setspace} \captionsetup[table]{name={\textsc{Table}},labelsep=period} \usepackage[level]{datetime} -\usepackage{unicode-math,xeCJK,fontawesome5} \usepackage{authblk,xltxtra,bigfoot,enumitem} \usepackage{booktabs,diagbox,ragged2e,tabularx} \renewcommand\tabularxcolumn[1]{>{\Centering}m{#1}} \usepackage[toc]{multitoc} \usepackage[mono=false]{libertine} % \setstretch{1.15} -\setCJKmainfont{Chiron Sung HK} -[BoldFont=Chiron Sung HK Bold, - ItalicFont=Kaiti SC] -\usepackage{hyperref,cprotect,xcolor,verbatim,tikz} - +% \setCJKmainfont{Chiron Sung HK} +% [BoldFont=Chiron Sung HK Bold, +% ItalicFont=Kaiti SC] +\usepackage{hyperref,xcolor,tikz} +\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} \definecolor{pkgcolor}{Hsb}{103,.8,.5} \definecolor{moducolor}{Hsb}{290,.8,.5} \definecolor{cmdcolor}{Hsb}{188,.8,.5} @@ -41,22 +40,19 @@ \definecolor{W5}{HTML}{5270CC} \definecolor{W6}{HTML}{8F52CC} \definecolor{W7}{HTML}{CC52AD} -\hypersetup{colorlinks,urlcolor=H6,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output} - \def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1”}} \def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1”}} \def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1”}} \def\datechange#1#2{% \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}} \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}} -\makeatother \title{\bfseries The \pkg{LiteTable} Template: Colorful Timetable} \author{Xia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}} \yyyymmdddate \date{\today} \affil{\href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}} -\date{\today\quad Version 2.4b\thanks{% +\date{\today\quad Version 2.4c\thanks{% \url{https://github.com/xiamyphys/litetable}}} \begin{document} \maketitle @@ -87,17 +83,18 @@ For portable version, simply download latest \verb|litetable.cls| file from \hre However, I strongly suggest that you should use terminal/cmd to implement the commands to update all the packages (and install this package) to the latest version or switch to portable version instead \begin{verbatim} - sudo tlmgr update --self - sudo tlmgr update --all + sudo tlmgr update --self --all \end{verbatim} -If you are in some areas with awful Internet environment (such as GFW), you can choose proper mirror source or use other means\footnote{Please comply with local network regulations.}. To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \TeX{} distribution?} +If you are in some areas with awful Internet environment (such as GFW), you can choose proper mirror source or use other means\footnote{Please comply with local network regulations.}. To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \textsf{\TeX} distribution?} -The template provides two options, \mode{direction} and \mode{font}. Just add the modes of the options you want separately in the square bracket of the command \verb|\documentclass[ ]{litetable}| in your \verb|.tex| file. +The template provides two options, \mode{direction} and \mode{font}. Add the modes of the options you want in the square bracket of the command \verb|\documentclass[ ]{litetable}| in \verb|.tex| file. \subsection{Compatibility} The test environments are macOS + Mac\TeX{} 2023 / Overleaf and they all work fine for \XeLaTeX{} compiler, Windows, Linux and Unix platforms compatibility unknown. +This template is developed on macOS platform and using the font ``Heiti SC''. If this font is not installed on your computer, please use the command \verb|\setCJKfamilyfont{zhhei}{ }| after \verb|\documentclass{litetable}| to replace ``Heiti SC'' to the font exists in your computer. + \section{Global Options of \pkg{LiteTable}} \begin{verbatim} \documentclass[options]{litetable} @@ -107,57 +104,52 @@ The test environments are macOS + Mac\TeX{} 2023 / Overleaf and they all work fi This option has two modes, \mode{portrait} and \mode{landscape}, which can make the timetable displayed portrait or horizontally. \subsection{The \mode{font} option} -This option has two modes, \mode{times} and \mode{libertinus}, which can make the font to be ``Times New Roman'' or ``Libertinus'', and the default mode is ``Times New Roman''.\footnote{Please ensure that your computer has been already installed the font ``Libertinus'' when using this option.} +This option has two modes, \mode{times} and \mode{libertinus}, which can make the font to be ``Times New Roman'' or ``Libertinus'', and the default mode is ``Times New Roman''\footnote{Please ensure that your computer has been already installed the font when using this option.}. \section{Commands of \pkg{LiteTable}} \subsection{The \cmd{makeframe} command} \begin{verbatim} - \makeframe{Timetable -- Semester 5} + \makeframe[Sem 6]{Timetable} \end{verbatim} -This command can create an empty class schedule with the title ``Timetable -- Semester 5''. +This command has two variables can create an empty class schedule. The second variable can assign the title while the first optional one can add a button that forward to the next page on the right. \subsection{The \cmd{weeklist} command} \begin{verbatim} \weeklist{ - \bfseries\textcolor{W1}{\faIcon{moon}~Monday}, - \bfseries\textcolor{W2}{\faIcon{fire}~Tuesday}, - \bfseries\textcolor{W3}{\faIcon{water}~Wednesday}, - \bfseries\textcolor{W4}{\faIcon{tree}~Thursday}, - \bfseries\textcolor{W5}{\faIcon{coins}~Friday}; + \textcolor{W1}{Monday}, \textcolor{W2}{Tuesday}, + \textcolor{W3}{Wednesday}, \textcolor{W4}{Thursday}, + \textcolor{W5}{Friday}; 0,.17,.34,.56,.78,1 } \end{verbatim} -This command can add workdays to the top side of the timetable, you can also adjust the format that you like, such as name, color and even the icon\footnote{Supports by the \pkg{fontawesome5} package.} before it. - -You can also custom every width of the columns in the timetable, just like the Figure above. - \begin{figure}[!ht] \centering \tikz -{ - \tikzset{every node/.style={font=\small}} - \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0); - \draw ({-5.1 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|}; - \draw ({0.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|}; - \draw ({.17*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.17|}; - \draw ({.34*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.34|}; - \draw ({.56*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.56|}; - \draw ({.78*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.78|}; - \draw ({1.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|}; - \node [above] at ({.085*5.1 in},0) {\sffamily\textcolor{W1}{\faIcon{moon}~Monday}}; - \node [above] at ({.255*5.1 in},0) {\sffamily\textcolor{W2}{\faIcon{fire}~Tuesday}}; - \node [above] at ({.45*5.1 in},0) {\sffamily\textcolor{W3}{\faIcon{water}~Wednesday}}; - \node [above] at ({.67*5.1 in},0) {\sffamily\textcolor{W4}{\faIcon{tree}~Thursday}}; - \node [above] at ({.89*5.1 in},0) {\sffamily\textcolor{W5}{\faIcon{coins}~Friday}}; -} -\caption*{The second line of array in the \cmd{weeklist} command corresponds to the axis coordinates.} + { + \tikzset{every node/.style={font=\small}} + \draw [thick,->,>=stealth] ({-1/16*5.1 in},0) -- (5.1 in,0); + \draw ({-5.1 in/16},-.1) --++ (0,.2) node [above] {\verb|-1/15|}; + \draw ({0.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|0|}; + \draw ({.17*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.17|}; + \draw ({.34*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.34|}; + \draw ({.56*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.56|}; + \draw ({.78*5.1 in},-.1) --++ (0,.2) node [above] {\verb|.78|}; + \draw ({1.0*5.1 in},-.1) --++ (0,.2) node [above] {\verb|1|}; + \node [above] at ({.085*5.1 in},0) {\sffamily\textcolor{W1}{Monday}}; + \node [above] at ({.255*5.1 in},0) {\sffamily\textcolor{W2}{Tuesday}}; + \node [above] at ({.45*5.1 in},0) {\sffamily\textcolor{W3}{Wednesday}}; + \node [above] at ({.67*5.1 in},0) {\sffamily\textcolor{W4}{Thursday}}; + \node [above] at ({.89*5.1 in},0) {\sffamily\textcolor{W5}{Friday}}; + } + \caption*{The second line of array in the \cmd{weeklist} command corresponds to the axis coordinates.} \end{figure} -The timetable can automatically generate the corresponding number of columns based on the number of workdays you enter. For example, the code above has 5 workdays, a 5-column timetable will be generated. + +This command can add workdays to the top side of the timetable, you can adjust the format (the icon before it), every width of the columns in the timetable like the figure. The timetable can automatically generate the corresponding number of columns based on the number of workdays you enter. For example, the code above has 5 workdays, a 5-column timetable will be generated. \subsection{The \cmd{timelist} command} \begin{verbatim} @@ -214,7 +206,7 @@ This command can assign the default value of the 7th variable of the command \cm There are 7 variables in this command. \begin{itemize} - \item The 1st one is the color of the class that you want, from ``H1'' to ``H9'', it's optional and the default value is ``H1''. + \item The 1st one is the color of the class, from ``H1'' to ``H9'', it's optional and the default is ``H1''. \item The 2nd -- 6th ones is the starting number and ending number, name, address, teacher(s) of the class. \item The last one is the start week and end week of the timetable, it's optional and the default value is the value that you've adjusted in the command \cmd{weeks} or it will be ``Week 1 -- 12''. \end{itemize} @@ -231,46 +223,48 @@ This command can switch the current weekday to the next day, then the course wil \subsection{The \cmd{more} command} \begin{verbatim} - \more{ · School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024} + \more{· School Start: 04 / 03 / 2024 · Summer Vacation: 05 / 07 / 2024} \end{verbatim} + This command can add remark at the end of the class schedule. \subsection{The \cmd{sticker} command} \begin{verbatim} \sticker{favicon} \end{verbatim} + There will be a sticker on the southeast of the page after you add, otherwise it won't. \section{Version History} -The design of this course schedule originated from the student course schedule web page (only teachers and students of this school can access) of the \href{https://www.hduhelp.cn/}{HDUHelp} in \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}. The layout is very beautiful and then I used \textsf{\LaTeX} to imitate that style and made a class schedule template to share with everyone. - -\textsf{\bfseries Version 1.0} was finished on 2023/09/01 and released on \href{https://www.latexstudio.net}{\textsf{\LaTeX} Studio} (Hangzhou), where has won the favor of many people. +The design of this course schedule originated from the student course schedule web page (only personnel of this school can access) of the \href{https://www.hduhelp.cn/}{HDUHelp} in \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}. The layout is very beautiful and I used \textsf{\LaTeX} to imitate that style and made a template to share with everyone. +\textsf{\bfseries Version 1.0} was finished on 2023/09/01 and released on \href{https://www.latexstudio.net}{\textsf{\LaTeX} Studio} (Hsiaoshan, Hangzhou), where has won the favor of many people. +\clearpage \setlist[itemize]{noitemsep, topsep=0pt} \datechange{2023/11/01}{Version 2.0a} \begin{itemize} - \item Supports the course block's corners be round or sharp. - \item Supports multiply class schedules in one \verb|.tex| file. + \item Supports to set the course block's corners be round or sharp. + \item Supports to add multiply class schedules in one \verb|.tex| file. \end{itemize} \datechange{2023/11/05}{Version 2.1a} \begin{itemize} - \item Supports the libertinus font. + \item Supports to use the libertinus font. \end{itemize} \datechange{2024/01/31}{Version 2.2a} \begin{itemize} \item Fixed the bug of resolution exceeded. \item Changed paper type to US letter. - \item Support custom course start time and end time. - \item Support add sticker as you like at the southeast of the page. + \item Support to custom course start time and end time. + \item Support to add sticker as you like at the southeast of the page. \item Provide simplified Chinese documentation. \end{itemize} \datechange{2024/02/02}{Version 2.3a} \begin{itemize} - \item Supports automatically generate the corresponding number of rows based on the number of time groups you enter. + \item Supports to generate the corresponding number of rows based on the number of time groups you enter automatically. \item Timetable can be displayed portrait or horizontally as you like. \end{itemize} @@ -281,19 +275,23 @@ The design of this course schedule originated from the student course schedule w \datechange{2024/02/24}{Version 2.4a} \begin{itemize} - \item Supports custom workday display style. - \item Supports hiding time and only showing course program number vertically aligned. - \item Supports setting default first and last week. + \item Supports to custom workday display style. + \item Supports to hide time and only showing course program number vertically aligned. + \item Supports to set default first and last week. \end{itemize} -\datechange{\today}{Version 2.4b} +\datechange{2024/03/01}{Version 2.4b} \begin{itemize} \item Fixed the error of \emph{resolution exceed} in the \mode{landscape} mode and added over 7 workdays. - \item Supports custom every width of the columns in the timetable. + \item Supports to custom every width of the columns in the timetable. \item Optimized the design of round corners, supports custom the radius of corners. + \item Thanks for @egreg's code solution on \TeX{} StackExchange for \href{https://tex.stackexchange.com/a/711657/299948}{Printing the number of each rows' elements in an array respectively}. \end{itemize} -\small Thanks for @egreg's code on \TeX{} Exchange for \href{https://tex.stackexchange.com/a/711657/299948}{print number of each rows' elements of an array}. +\datechange{\today}{Version 2.4c} +\begin{itemize} + \item Supports to add the `Semester' button on the right side of the title. +\end{itemize} \appendix \includepdf[pages={2,4},nup=1x2,pagecommand={ diff --git a/Master/texmf-dist/tex/latex/litetable/litetable.cls b/Master/texmf-dist/tex/latex/litetable/litetable.cls index f965a8a69c8..a52c0d5abd8 100644 --- a/Master/texmf-dist/tex/latex/litetable/litetable.cls +++ b/Master/texmf-dist/tex/latex/litetable/litetable.cls @@ -14,7 +14,7 @@ \NeedsTeXFormat{LaTeX2e} \PassOptionsToPackage{quiet}{xeCJK} \PassOptionsToPackage{no-math}{fontspec} -\ProvidesClass{litetable}[2024/02/24/ v2.4b LiteTable document class] +\ProvidesClass{litetable}[2024/03/03/ v2.4c LiteTable document class] % ---------- 全局选项 ---------- % \RequirePackage{kvoptions} @@ -69,6 +69,9 @@ \definecolor{darkergray}{HTML}{F1F3F5} % 深色块 \definecolor{lightergray}{HTML}{FCFDFE} % 浅色块 \definecolor{blackgray}{HTML}{1A1D21} % 序号颜色 +\definecolor{SEM}{HTML}{DEEAF8} % 学期按钮 +\definecolor{SEM*}{HTML}{3085F3} +\definecolor{SEM**}{HTML}{007DC3} \pagecolor{lightergray} \definecolor{H1}{HTML}{74A7A2} % 深绿 \definecolor{H1*}{HTML}{E9EEED} @@ -190,73 +193,82 @@ \gdef\@weeknum{\arraycount[1]{weeklist}} \RequirePackage{fontawesome5} +\RequirePackage[hidelinks]{hyperref} \newcounter{number} -\def\sticker#1{\gdef\@sticker{#1}} -\def\corner#1{\gdef\@corner{#1}} -\def\makeframe#1{ - \ifcsname @corner\endcsname - \tikzset{corner/.style={rounded corners=\@corner}} - \else - \tikzset{corner/.style={}} - \fi - \draw [darkergray] (0,0) rectangle (\pagewidth,\pageheight); - \fill [fill=darkergray,corner] (0,0) rectangle (\pagewidth,{1.5*\pageheight/(2*\@classnum+3.5)});% 顶部深灰色块 - \node at (.5*\pagewidth,{.75*\pageheight/(2*\@classnum+3.5)}) {\huge\bfseries\sffamily #1}; % 标题 +\tikzset{ + hyperlink node/.style={ + alias=sourcenode, + append after command={ + let \p1 = (sourcenode.north west), + \p2 = (sourcenode.south east), + \n1 = {\x2-\x1}, \n2 = {\y1-\y2} in + node [inner sep=0pt, outer sep=auto, anchor=north west,at=(\p1)] + {\Acrobatmenu{#1}{\XeTeXLinkBox{\phantom{\rule{\n1}{\n2}}}}} + } + } +} +\NewDocumentCommand{\makeframe}{ o m }{ + \draw [lightergray] (0,0) rectangle (\pagewidth,\pageheight); + \fill [fill=darkergray] (0,0) rectangle (\pagewidth,{1.5*\pageheight/(2*\@classnum+3.5)});% 顶部深灰色块 + \node at (.5*\pagewidth,{.75*\pageheight/(2*\@classnum+3.5)}) {\huge\bfseries\sffamily #2}; % 标题 + \IfNoValueF{#1}{ + \node [outer sep=auto,hyperlink node=NextPage,left,rectangle,fill=SEM,text=SEM*,draw=none,inner sep=1.75ex,rounded corners=6pt] at (.98*\pagewidth,{.75*\pageheight/(2*\@classnum+3.5)}) {\large\sffamily\;$\rightleftharpoons$~#1\;}; % 学期 + } - \ifodd\@classnum + \ifodd\@classnum \foreach \a in {2,4,...,\@classnum,\@classnum+2} - \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5),corner] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环) + \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环) \else \foreach \a in {2,4,...,\@classnum} - \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5),corner] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环) - \fill [fill=darkergray,yshift=(2.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5),corner] (0,0) rectangle (\pagewidth,{\pageheight/(2*\@classnum+3.5)}); % 底部深灰色块 - \fi - - \foreach \a in {0,1,2,...,\@classnum} - \draw [densely dashed,gray!75,yshift=(2.5+2*\a)*\pageheight/(2*\@classnum+3.5)] (0,0)--(\pagewidth,0); % 分割虚线 + \fill [fill=darkergray,yshift=(2*\a-1.5)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{2*\pageheight/(2*\@classnum+3.5)}); % 中间深灰色块(循环) + \fill [fill=darkergray,yshift=(2.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5)] (0,0) rectangle (\pagewidth,{\pageheight/(2*\@classnum+3.5)}); % 底部深灰色块 + \fi + \foreach \a in {0,1,2,...,\@classnum} + \draw [densely dashed,gray!75,yshift=(2.5+2*\a)*\pageheight/(2*\@classnum+3.5)] (0,0)--(\pagewidth,0); % 分割虚线 - % 时间标注 - \setcounter{number}{0} - \ifcsempty{@timelist}{ - \foreach \a in {1,2,...,\@classnum} + % 时间标注 + \setcounter{number}{0} + \ifcsempty{@timelist}{ + \foreach \a in {1,2,...,\@classnum} { \node [yshift=(1.5+2*\a)*\pageheight/(2*\@classnum+3.5)] at(\pagewidth/32,0) {\bfseries\large\color{blackgray}\texttt{\refstepcounter{number}\thenumber}}; } - }{ - \foreach \x in {1,2,...,\@classnum} - { - \node [yshift=(2*\x+.9)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) - {\bfseries\color{blackgray}\texttt{\refstepcounter{number}\thenumber}}; - \node[yshift=(2*\x+1.55)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) - {\color{darkgray}\texttt{\arrayitem{timelist}{1}{\x}}}; - \node[yshift=(2*\x+2.1)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) - {\color{darkgray}\texttt{\arrayitem{timelist}{2}{\x}}}; - } + }{ + \foreach \x in {1,2,...,\@classnum} + { + \node [yshift=(2*\x+.9)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) + {\bfseries\color{blackgray}\texttt{\refstepcounter{number}\thenumber}}; + \node[yshift=(2*\x+1.55)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) + {\color{darkgray}\texttt{\arrayitem{timelist}{1}{\x}}}; + \node[yshift=(2*\x+2.1)*\pageheight/(2*\@classnum+3.5)] at (\pagewidth/32,0) + {\color{darkgray}\texttt{\arrayitem{timelist}{2}{\x}}}; } + } - % 星期标注 - \foreach \a in {1,2,...,\@weeknum} + % 星期标注 + \foreach \a in {1,2,...,\@weeknum} \node [xshift=\pagewidth/16] at ({.5*(\arrayitem{weeklist}{2}{\a}+\arrayitem{weeklist}{2}{\a+1})*15*\pagewidth/16},{2*\pageheight/(2*\@classnum+3.5)}) {\arrayitem{weeklist}{1}{\a}}; - \ifcsname @sticker\endcsname + \ifcsname @sticker\endcsname \node [opacity=.3,above left,yshift=(1.5+2*\@classnum)*\pageheight/(2*\@classnum+3.5),inner sep=0pt,outer sep=auto,scale=15] at (\pagewidth,{\pageheight/(2*\@classnum+3.5)}) {\includegraphics[width=\dimeval{\pagewidth/16/\@weeknum}]{\@sticker}};\fi } \newcounter{weekday} \def\newday{\addtocounter{weekday}{1}} \AtEndEnvironment{tikzpicture}{\setcounter{weekday}{0}} - +\def\sticker#1{\gdef\@sticker{#1}} +\def\corner#1{\gdef\@corner{#1}} \def\weeks#1{\gdef\@weeks{#1}} -\ifcsname @weeks\endcsname - \relax -\else - \let\@weeks\relax -\fi \NewDocumentCommand{\course}{O{H1} m m m m m O{\@weeks}} { + \ifcsname @corner\endcsname + \tikzset{corner/.style={rounded corners=\@corner}} + \else + \tikzset{corner/.style={}} + \fi \fill [#1,corner, yshift=(2*(#2-1))*\pageheight/(2*\@classnum+3.5), xshift=\pagewidth/16] @@ -288,11 +300,13 @@ ({.5*(\arrayitem{weeklist}{2}{\theweekday+1}+\arrayitem{weeklist}{2}{\theweekday+2})*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)}) {\heiti\bfseries\small #6}; % teacher + \ifcsname @weeks\endcsname \node [#1**,above left, yshift=2*#3*\pageheight/(2*\@classnum+3.5), xshift=\pagewidth/16] at ({\arrayitem{weeklist}{2}{\theweekday+2}*15*\pagewidth/16},{2.5*\pageheight/(2*\@classnum+3.5)}) - {\heiti\footnotesize #7}; % weeks + {\heiti\footnotesize #7}; + \fi % weeks } \def\more#1{ |