summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx54
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin578392 -> 578268 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex22
-rw-r--r--macros/latex/contrib/ffcode/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/ffcode/README.md2
-rw-r--r--macros/latex/contrib/ffcode/ffcode.pdfbin108113 -> 118496 bytes
-rw-r--r--macros/latex/contrib/ffcode/ffcode.sty25
-rw-r--r--macros/latex/contrib/ffcode/ffcode.tex40
-rw-r--r--macros/latex/contrib/hecthese/README.md2
-rw-r--r--macros/latex/contrib/hecthese/hecthese-en.ins6
-rw-r--r--macros/latex/contrib/hecthese/hecthese-en.pdfbin529572 -> 531417 bytes
-rw-r--r--macros/latex/contrib/hecthese/hecthese-fr.ins6
-rw-r--r--macros/latex/contrib/hecthese/hecthese.dtx80
-rw-r--r--macros/latex/contrib/hecthese/hecthese.pdfbin503487 -> 518709 bytes
14 files changed, 144 insertions, 94 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index c21f742ba7..2150fef75c 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/09/06}{1.29p}
+\ProvidesExplClass{easybook}{2021/09/06}{1.30}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,14 +297,14 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/09/06}{1.29p}
+\ProvidesExplPackage{easybase}{2021/09/06}{1.30}
{Typeset Chinese theses or books}
-\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
\cs_generate_variant:Nn \dim_set:Nn { NV }
\cs_generate_variant:Nn \dim_sign:n { V }
\cs_generate_variant:Nn \int_to_arabic:n { v }
\cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
+\cs_generate_variant:Nn \skip_add:Nn { NV,Nv }
\cs_generate_variant:Nn \skip_set:Nn { NV }
\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
\cs_generate_variant:Nn \ctex_define:nn { nx }
@@ -1131,7 +1131,7 @@
\seq_if_in:NnF \c__ctex_headings_seq { subparagraph }
{
\ctex_define:nn { tocset }
- { #1/belowoffset .dim_set:c = l__eb_toc_#1_offset_dim }
+ { #1/belowskip .skip_set:c = l__eb_toc_#1_below_skip }
}
\seq_pop:NN \c__ctex_headings_seq \l_tmpa_tl
\titlecontents{#1}
@@ -1155,7 +1155,7 @@
\c__ctex_headings_seq \eb_toc_assign_keys:n
\ctex_define:n { tocset/list .meta:nn = { ctex/tocset/list } {#1} }
\eb_clist_map_inline:nn
- { format,format+,format~+,indent,rule,numsep,belowoffset }
+ { format,format+,format~+,indent,rule,numsep,belowskip }
{
\ctex_define:nn { tocset }
{
@@ -1186,9 +1186,9 @@
\newbool{eb@titletoc@hang@fix}
\ctex_define:nn { tocset }
{
- lolskip .skip_set:N = \l__eb_toc_lolskip_skip,
+ lolskip .skip_set:N = \eb@toc@lolskip,
lolskip .initial:n = 0.8pc,
- belowoffset .dim_set:N = \l__eb_toc_offset_dim,
+ belowoffset .skip_set:N = \l__eb_toc_offset_skip,
belowoffset .initial:n =
{ \bool_if:NTF \l__eb_class_book_bool { -1pc } { -0.35pc } },
line-align .bool_set:N = \l__eb_toc_line_align_bool,
@@ -1303,7 +1303,7 @@
list/format = \addvspace{0.2pc},
list/indent = 0em,
list/rule = \tocrule{$\cdot$},
- list/belowoffset =
+ list/belowskip =
{ \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
}
@@ -1414,10 +1414,10 @@
{
\eb_appto_cmd:Nn \@chapter
{
- \skip_if_eq:nnF { \l__eb_toc_lolskip_skip } { \c_zero_skip }
+ \skip_if_eq:nnF { \eb@toc@lolskip } { \c_zero_skip }
{
\addtocontents{lol}
- {\protect\addvspace{\skip_use:N \l__eb_toc_lolskip_skip}}
+ {\protect\addvspace{\skip_use:N \eb@toc@lolskip}}
}
}
}
@@ -1542,9 +1542,9 @@
\tl_set_eq:Nc \eb@toc@title { list#4name }
\IfValueT{#3}{\keys_set:nn { eb/listoc } {#3}}
\eb_title_number_intoc_spec:nn {#2} {#1}
- \dim_add:Nv
- \l__eb_toc_offset_dim { l__eb_toc_#4_offset_dim }
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
+ \skip_add:Nv
+ \l__eb_toc_offset_skip { l__eb_toc_#4_below_skip }
+ \vspace*{\dim_use:N \l__eb_toc_offset_skip}
\eb_toc_start_multi_column_ext:n {#5}
\group_end:
}
@@ -1568,12 +1568,12 @@
\tl_set:Nn \eb@bitoc@title { Contents }
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
\eb_title_mark_notoc:n { \eb@toc@title }
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
+ \vspace*{\dim_use:N \l__eb_toc_offset_skip}
\eb_toc_start_multi_column_ext:n { toc }#3
\IfBooleanT{#1}
{
\eb_title_mark_notoc:n { \eb@bitoc@title }
- \vspace*{\dim_use:N \l__eb_toc_offset_dim}
+ \vspace*{\dim_use:N \l__eb_toc_offset_skip}
\eb_toc_start_multi_column_ext:n { tec }
}
\group_end:
@@ -2075,9 +2075,9 @@
\cs_new_protected:Npn \setexercise #1
{ \keys_set:nn { eb/exercise } {#1} }
\cs_new_protected:Npn \addtcbstyle #1#2
- { \tcbset{tc-#1/.append~style = {#2}} }
+ { \tcbset{#1/.append~style = {#2}} }
\cs_new_protected:Npn \newtcbstyle #1#2
- { \tcbset{tc-#1/.style = {#2}} }
+ { \tcbset{#1/.style = {#2}} }
\cs_new_protected:Npn \tcbappstyle
{ \@ifstar{\newtcbstyle}{\addtcbstyle} }
\ctex_at_end_package:nn { tcolorbox }
@@ -2129,7 +2129,6 @@
{ \exp_args:NV \bibliographystyle \l__eb_bib_otherstyle_tl }
\tl_if_empty:NF \l__eb_bib_cite_style_tl
{ \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
- \skip_zero:N \bibsep
\AtEndEnvironment{thebibliography}
{\bool_if:NT \l__eb_toc_multi_column_bool { \end{multicols} }}
\NewDocumentCommand{\printbibliography}{st+o}
@@ -2146,6 +2145,7 @@
\exp_args:NV \bibliography \l__eb_bib_datafile_clist
\group_end:
}
+ \skip_zero:N \bibsep
}
\cs_new_protected:Npn \eb_put_biblatex:n #1
{ \PassOptionsToPackage{#1}{biblatex} }
@@ -2400,11 +2400,11 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.29p}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.30}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
-\newtcbstyle{theorem}
+\newtcbstyle{tc-theorem}
{
enhanced~jigsaw,pad~at~break* = 3pt,
opacityback = 0,
@@ -2415,7 +2415,7 @@
top = \eb@tc@line@skip,bottom = \eb@tc@line@skip,
middle = \eb@tc@line@skip
}
-\newtcbstyle{outline}
+\newtcbstyle{tc-outline}
{
enhanced,nofloat,
tikznode~boxed~title,
@@ -2428,14 +2428,14 @@
arc = 3pt,
left = 2pc,right = 2pc,top = 1.5pc,bottom = 1pc
}
-\newtcbstyle{exercise}
+\newtcbstyle{tc-exercise}
{
blank,on~line,center,
sharpish~corners,
fontupper = \Large\sffamily,
beforeafter~skip = 3.75ex plus .2ex minus .1ex
}
-\newtcbstyle{easybox}
+\newtcbstyle{tc-easybox}
{
enhanced~jigsaw,pad~at~break* = 3pt,
center~title,
@@ -2449,7 +2449,7 @@
titlerule = 0pt,
beforeafter~skip = 1.75ex plus .2ex minus .1ex
}
-\newtcbstyle{ebparbox}
+\newtcbstyle{tc-ebparbox}
{
frame~hidden,
enhanced~jigsaw,pad~at~break* = 3pt,
@@ -2459,15 +2459,15 @@
middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip,
beforeafter~skip = 1.75ex plus .2ex minus .1ex
}
-\newtcbstyle{ebemph}{on~line,blank}
-\newtcbstyle{eblink}
+\newtcbstyle{tc-ebemph}{on~line,blank}
+\newtcbstyle{tc-eblink}
{
standard~jigsaw,on~line,
top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt,
boxrule = 0.75pt,arc = 1pt,
opacityback = 0.2
}
-\newtcbstyle{ebfbox}
+\newtcbstyle{tc-ebfbox}
{
on~line,sharpish~corners,
top = 2pt,bottom = 2pt,left = 1pt,right = 1pt,
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index a72a5948a3..62b5067a0f 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 83b27dad58..e8425fef2d 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -12,7 +12,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.29p,
+ version = v1.30,
date = 2021/09/06,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
@@ -727,23 +727,23 @@
\subsection{目录样式}
\label{subsec:catalog style}
-模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式，\module*{level} 代表 \code{part}、\code{chapter}、\code{section}、\code{subsection}、\code{figure}、\code{table} 和 \code{lstlisting} 级别的目录，而使用 \code{list} 级别可以统一设置图片、表格和代码目录的样式。目前目录支持适用于论文的常规样式，如果您需要例如段落或更复杂的样式可以使用本模块基于的 \cs*{titlecontents} 命令。
+模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式，\module*{level} 代表 \code{part}、\code{chapter}、\code{section}、\code{subsection}、\code{figure}、\code{table} 或 \code{lstlisting} 目录级别，而使用 \code{list} 级别可以统一设置图片、表格和代码目录的样式。目前目录支持适用于论文的常规样式，如果您需要例如段落或更复杂的样式可以使用本模块基于的 \cs*{titlecontents} 命令。
\begin{options}
- \keyval-{format}{目录标题格式}\Module{/<level>}
+ \keyval-{format}{目录标题格式}\Module{/level}
各级别目录中标题的格式，可以设置字体和加入垂直间距等，垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。
\keyval-{format+}{目录标题格式}
与 \option{format} 用法一样，只是在已有的格式命令后附加代码。
\keyval-{indent}{刚性长度}
各级别目录中的标题左边缩进距离，通常标题级别越低缩进越大。
\keyval-{rule}{目录引导线样式}
- 引导线选项 \option{rule} 中一般应当使用 \cs{tocrule} 命令绘制引导线，将会在接下来介绍。
+ 引导线选项 \option{rule} 中一般应当使用 \cs{tocrule} 命令绘制引导线，将会在下面介绍。
\keyval-{numsep}{刚性长度}\Default{1em}
有编号的标题在各级别目录中编号与标题的间距，默认距离统一为 \code{1em}。
\end{options}
\begin{commands}
\command{tocrule}[\sarg\oarg{引导点间距}\darg{放大因子}\marg{引导点}\oarg{页码格式}]
- 目录命令 \cs{tocrule} 生成目录引导线，需要在 \meta{目录引导线样式} 中使用。带有星号的命令会使当前级别的目录引导线右边与页码相连而不是对齐。\meta{引导点间距} 需带有长度单位，\meta{放大因子} 不带单位，为 \meta{引导点} 的放大倍数，\meta{引导点} 一般为英文句号或 \cs*{cdot} 中心点符号。\meta{页码格式} 的代码位于页码前面，可以设置页码字体和距离等，最后一个命令可以带有一个参数，这个参数为页码编号。
+ 目录命令 \cs{tocrule} 生成目录引导线，需要在引导线选项 \option{rule} 中使用。带有星号的命令会使当前级别的目录引导线右边与页码相连而不是对齐。\meta{引导点间距} 需带有长度单位，\meta{放大因子} 不带单位，为 \meta{引导点} 的放大倍数，\meta{引导点} 一般为英文句号或 \cs*{cdot} 中心点符号。\meta{页码格式} 的代码位于页码前面，可以设置页码字体和距离等，最后一个命令可以带有一个参数，这个参数为页码编号。
\command*{CTEXnumberline}[\marg{编号级别}]
目录命令 \cs*{CTEXnumberline} 用于在 C\TeX 文档类的 \option*{tocline} 选项中设置目录标签的编号，它已经被重新定义，使得目录编号后间距选项 \option{numsep} 仍然有效。\meta{编号级别} 为 \code{chapter} 和 \code{section} 等，也可用参数 \code{\#1} 代替当前级别类型，标题名用参数 \code{\#2} 代替一般不变。
\begin{ctexexam}
@@ -760,11 +760,11 @@
\end{commands}
\begin{options}
- \keyval-{belowoffset}{刚性长度}\Module{tocset}\Default{-1pc}
+ \keyval-{belowskip}{弹性长度}\Module{/level}\Default{0pc}
+ 图片、表格和代码三种目录命令标题下方的额外间距，\module*{level} 代表 \code{figure}、\code{table} 或 \code{lstlisting}。这个距离也可以使用 \code{list} 级别统一设置，或直接用 C\TeX 标题选项 \option*{afterskip} 修改。
+ \keyval-{belowoffset}{弹性长度}\Module{tocset}\Default{-1pc}
主文档目录标题下方的间距补偿，一般为负值，用于抵消 \option{format} 中额外的垂直间距。
- \keyval-{belowoffset}{刚性长度}\Module{/<level>}\Default{0pc}
- \module*{level} 代表 \code{figure}、\code{table} 和 \code{lstlisting} 三个级别目录标题下方间距补偿，也可以使用 \code{list} 统一设置，一般为正值。这个距离也可以用 C\TeX 标题下方距离选项修改。
- \keyval-{lolskip}{弹性长度}\Module{tocset}\Default{0.8pc}
+ \keyval-{lolskip}{弹性长度}\Default{0.8pc}
代码目录中每章代码标题的额外距离，与 C\TeX 的表格和图片目录中每章间的标题距离选项 \option*{lotskip} 和 \option*{lofskip} 类似，在 \cls*{article} 模式中此选项失效。
\keyval-{tocline-fig}{图片目录标签}
图片目录标签，选项参数中 \code{\#1} 代表编号，还可包含标签名称，默认标签名称与图片题注名称一致。
@@ -971,11 +971,11 @@
使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg*{tcolorbox} 宏包，它们 \meta{配置选项} 的键值列表同样由 \pkg*{tcolorbox} 提供支持，具体选项可见宏包文档的 Option Keys 一节，可以进行边距、字体及背景颜色等各种个性化设置，一些配置会覆盖预设。
\begin{commands}
\command{newtcbstyle}[\marg{盒子风格}\marg{键值列表}]
- 新建或重置一个名为 \code{tc-}\meta{盒子风格} 的 \pkg*{tcolorbox} 宏包盒子风格，可以与 \cs{addtcbstyle} 命令联用。
+ 新建或重置一个名称为 \meta{盒子风格} 的 \pkg*{tcolorbox} 宏包盒子风格，可以与 \cs{addtcbstyle} 命令联用。
\command{addtcbstyle}[\marg{盒子风格}\marg{键值列表}]
修改已存在的 \pkg*{tcolorbox} 宏包盒子风格。这个命令可以调整以下即将介绍的预置盒子风格，对于预置盒子来说参数 \meta{盒子风格} 即为它们对应的环境或命令名。
\begin{ctexexam}
- \newtcbstyle{mytcb} % 新建一个盒子风格tc-mytcb
+ \newtcbstyle{mytcb} % 新建一个盒子风格mytcb
{
colback = Snow,colframe = LimeGreen,coltext = Coral,
fontupper = \bfseries,arc = 6pt,
diff --git a/macros/latex/contrib/ffcode/DEPENDS.txt b/macros/latex/contrib/ffcode/DEPENDS.txt
index e1cb6ed564..b7535d747d 100644
--- a/macros/latex/contrib/ffcode/DEPENDS.txt
+++ b/macros/latex/contrib/ffcode/DEPENDS.txt
@@ -1,5 +1,4 @@
hard microtype
hard xkeyval
hard minted
-hard minted
hard tcolorbox
diff --git a/macros/latex/contrib/ffcode/README.md b/macros/latex/contrib/ffcode/README.md
index f6944deee4..13e012d767 100644
--- a/macros/latex/contrib/ffcode/README.md
+++ b/macros/latex/contrib/ffcode/README.md
@@ -1,4 +1,4 @@
-[![make](https://github.com/yegor256/ffcode/actions/workflows/make.yml/badge.svg)](https://github.com/yegor256/ffcode/actions/workflows/make.yml)
+[![make](https://github.com/yegor256/ffcode/actions/workflows/latexmk.yml/badge.svg)](https://github.com/yegor256/ffcode/actions/workflows/latexmk.yml)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/ffcode/blob/master/LICENSE.txt)
This LaTeX package helps you write source code in your academic papers
diff --git a/macros/latex/contrib/ffcode/ffcode.pdf b/macros/latex/contrib/ffcode/ffcode.pdf
index 9e84d15f60..d10d38424d 100644
--- a/macros/latex/contrib/ffcode/ffcode.pdf
+++ b/macros/latex/contrib/ffcode/ffcode.pdf
Binary files differ
diff --git a/macros/latex/contrib/ffcode/ffcode.sty b/macros/latex/contrib/ffcode/ffcode.sty
index f478a0b5d6..f4c23b51bb 100644
--- a/macros/latex/contrib/ffcode/ffcode.sty
+++ b/macros/latex/contrib/ffcode/ffcode.sty
@@ -21,7 +21,7 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ffcode}[2021/06/13 0.2.0 Fixed Font Code]
+\ProvidesPackage{ffcode}[2021/09/07 0.3.0 Fixed Font Code]
\RequirePackage{microtype}
\RequirePackage{xkeyval}
@@ -31,6 +31,8 @@
\DeclareOptionX{noframes}{\noframestrue}
\newif\ifnonumbers
\DeclareOptionX{nonumbers}{\nonumberstrue}
+\newif\ifnocn
+\DeclareOptionX{nocn}{\nocntrue}
\ProcessOptionsX\relax
\ifnopygments
@@ -41,22 +43,31 @@
\setminted{breaklines}
\usemintedstyle{bw}
\ifnonumbers
- \newminted[ffcode]{text}{framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
+ \newminted[ffcode]{text}{framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape,highlightcolor=gray!30}
\else
\renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}}
- \newminted[ffcode]{text}{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,
- rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
+ \ifnocn
+ \newminted[ffcode]{text}{linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
+ \else
+ \newminted[ffcode]{text}{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
+ \fi
\fi
+\makeatletter
+\newcommand\ffprint{\begingroup\obeyspaces\@ffprint}
+\newcommand{\@ffprint}[1]{\texttt{#1}\endgroup}
+\makeatother
+
+\newcommand\ffcoderule{\vrule height 6pt depth 1pt width 0pt}
\ifnoframes
- \newcommand{\ff}[1]{\vrule height 6pt depth 1pt width 0pt\texttt{#1}}
+ \newcommand{\ff}[1]{\ffcoderule\ffprint{#1}}
\else
\RequirePackage{tcolorbox}
- \newtcbox{\codebox}{nobeforeafter,colframe=gray!80!white,
+ \newtcbox{\ffcodebox}{nobeforeafter,colframe=gray!80!white,
colback=gray!5!white,boxrule=0.1pt,arc=1pt,
boxsep=1.2pt,left=0.5pt,right=0.5pt,top=0.2pt,bottom=0.2pt,
tcbox raise base}
- \newcommand{\ff}[1]{\codebox{\vrule height 6pt depth 1pt width 0pt\texttt{#1}}}
+ \newcommand{\ff}[1]{\ffcodebox{\ffcoderule\ffprint{#1}}}
\fi
\endinput
diff --git a/macros/latex/contrib/ffcode/ffcode.tex b/macros/latex/contrib/ffcode/ffcode.tex
index e14a39517f..c1fbc40483 100644
--- a/macros/latex/contrib/ffcode/ffcode.tex
+++ b/macros/latex/contrib/ffcode/ffcode.tex
@@ -25,9 +25,10 @@
\usepackage{amsmath}
\usepackage{multicol}
\usepackage{ffcode}
+\usepackage{xcolor}
\title{\ff{ffcode}: \LaTeX{} Package \\ for Fixed-Font Code Blocks}
\author{Yegor Bugayenko}
-\date{0.2.0 2021/06/13}
+\date{0.3.0 2021/09/07}
\begin{document}
\pagenumbering{gobble}
\raggedbottom
@@ -88,6 +89,43 @@ texts, use the package option \ff{noframes}.
To omit the line numbers, use the \ff{nonumbers} option of the package.
+By default, the numbering is continuous: line numbers start at the
+first snippet and increment until the end of the document. If you
+want them to start from one at each snippet, use \ff{nocn}
+(stands for ``no continuous numbering'')
+option of the package.
+
+You can highlight some lines in your \ff{ffcode} environment,
+or can use any other additional configuration parameters from
+the \ff{minted} package:
+
+\begin{multicols}{2}
+\setlength{\parskip}{0pt}
+\scriptsize
+\raggedcolumns
+\begin{verbatim}
+\begin{ffcode*}{highlightlines={1,4-5}}
+while (true) {
+ print("Hello!")
+ print("Enter your name:")
+ scan(x)
+ print("You name is " + x)
+}
+\end{ffcode*}
+\end{verbatim}
+
+\columnbreak
+
+\begin{ffcode*}{highlightlines={7,10-11}}
+while (true) {
+ print("Hello!")
+ print("Enter your name:")
+ scan(x)
+ print("You name is " + x)
+}
+\end{ffcode*}
+\end{multicols}
+
More details about this package you can find
in the \ff{yegor256/ffcode} GitHub repository.
diff --git a/macros/latex/contrib/hecthese/README.md b/macros/latex/contrib/hecthese/README.md
index 21059b9bb1..23b16651ff 100644
--- a/macros/latex/contrib/hecthese/README.md
+++ b/macros/latex/contrib/hecthese/README.md
@@ -11,7 +11,7 @@ later version.
VERSION
-1.4
+1.5
******************************************************************
La version française de cette description est à la suite de la
diff --git a/macros/latex/contrib/hecthese/hecthese-en.ins b/macros/latex/contrib/hecthese/hecthese-en.ins
index 3d31507f8c..1ae1debc5a 100644
--- a/macros/latex/contrib/hecthese/hecthese-en.ins
+++ b/macros/latex/contrib/hecthese/hecthese-en.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright 2017-2020 HEC Montréal
+%% Copyright 2017-2021 HEC Montréal
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -19,7 +19,7 @@
This is a stripped version of the original file.
-Copyright 2017-2020 HEC Montreal
+Copyright 2017-2021 HEC Montreal
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -85,7 +85,7 @@ and the derived files listed in the README file.
\obeyspaces
\Msg{*********************************************************}
-\Msg{* hecthese document class v1.4 *}
+\Msg{* hecthese document class v1.5 *}
\Msg{* *}
\Msg{* hecthese document class has been installed and is *}
\Msg{* ready for use. Read the hecthese.pdf file to learn *}
diff --git a/macros/latex/contrib/hecthese/hecthese-en.pdf b/macros/latex/contrib/hecthese/hecthese-en.pdf
index 4a910a893c..47eade535f 100644
--- a/macros/latex/contrib/hecthese/hecthese-en.pdf
+++ b/macros/latex/contrib/hecthese/hecthese-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/hecthese/hecthese-fr.ins b/macros/latex/contrib/hecthese/hecthese-fr.ins
index 4a036fb0c6..5c6ac83965 100644
--- a/macros/latex/contrib/hecthese/hecthese-fr.ins
+++ b/macros/latex/contrib/hecthese/hecthese-fr.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright 2017-2019 HEC Montréal
+%% Copyright 2017-2021 HEC Montréal
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -19,7 +19,7 @@
This is a stripped version of the original file.
-Copyright 2017-2020 HEC Montreal
+Copyright 2017-2021 HEC Montreal
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -85,7 +85,7 @@ and the derived files listed in the README file.
\obeyspaces
\Msg{*********************************************************}
-\Msg{* Classe hecthese v1.4 *}
+\Msg{* Classe hecthese v1.5 *}
\Msg{* *}
\Msg{* La classe hecthese est installee et prete a l'emploi. *}
\Msg{* Consultez le document hecthese.pdf afin de prendre *}
diff --git a/macros/latex/contrib/hecthese/hecthese.dtx b/macros/latex/contrib/hecthese/hecthese.dtx
index c27db40e29..c5b1952eee 100644
--- a/macros/latex/contrib/hecthese/hecthese.dtx
+++ b/macros/latex/contrib/hecthese/hecthese.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-% Copyright 2017-2020 HEC Montreal
+% Copyright 2017-2021 HEC Montreal
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -25,7 +25,7 @@
\ProvidesFile{hecthese.dtx}
%</dtx>
%<class>\NeedsTeXFormat{LaTeX2e}
-%<class>\ProvidesClass{hecthese}[2020/08/24 v1.4 Class for dissertations and theses at HEC Montreal]
+%<class>\ProvidesClass{hecthese}[2021/09/07 v1.5 Class for dissertations and theses at HEC Montreal]
%<*driver>
\documentclass[10pt,english,french]{ltxdoc}
\usepackage[utf8]{inputenc}
@@ -132,6 +132,8 @@
% \DoNotIndex{\label,\ref,\caption,\hline,\multicolumn,\oui,\non,\cmd}
% \DoNotIndex{\dots,\url,\clearpage,\bibitem}
% \DoNotIndex{\hectheseTitre,\biblio}
+% \changes{1.5}{2021-09-07}{Corrig\'e l'impl\'ementation de chapterbib. /
+% Fixed the chapterbib implementation.}
% \changes{1.4}{2020-08-24}{Beaucoup de corrections de bogues et de mises \`{a} jour (voir d\'{e}p\^{o}t Git). /
% Lots of bug fixes and updates (see Git repository).}
% \changes{1.3.2}{2019-03-25}{Coquille dans la dtx et changement du lien vers le gabarit anglais pour MacOS.}
@@ -195,7 +197,7 @@
% et l'\'{e}diteur de code TeXStudio\cite{texstudio} ont \'{e}t\'{e} utilis\'{e}s et ses fonctionnalit\'{e}s ont
% \'{e}t\'{e} test\'{e}es avec les compilateurs +latex+, +pdflatex+, +bibtex+ et +makeindex+. La classe
% a \'{e}galement \'{e}t\'{e} test\'{e}e avec la distribution MiK\TeX\footnote{Un immense merci \`{a} Franck Jeannot pour avoir effectu\'{e} ces tests!},
-% de même qu'avec les versions 2017 à 2019 de TeXLive.
+% avec les versions 2017 à 2020 de TeXLive de m\^eme qu'avec l'application Web Overleaf.
% Nous vous invitons \`{a} la tester avec vos propres distributions TeX et
% \'{e}diteurs de codes et \`{a} l'utiliser de la m\^{e}me mani\`{e}re dont vous vous servez de vos outils pour vos
% autres travaux en {\LaTeX}.
@@ -205,7 +207,8 @@
% and the \TeX Studio code editor\cite{texstudio} were used. Its features were tested with the
% +latex+, +pdflatex+, +bibtex+ and +makeindex+ compilers. The class has also been tested with the
% MiK\TeX\ distribution\footnote{A big ``thank you!'' goes to Franck Jeannot for making the tests.}
-% and WinEdt code editor, as well as with the 2017 to 2019 versions of TeXLive.
+% and WinEdt code editor, with the 2017 to 2020 versions of TeXLive as well as with the Overleaf
+% web application.
% We invite you to test the class with your own distribution and code editor and to use it like
% you would with any other work you do with \LaTeX.
% \fi
@@ -215,8 +218,8 @@
% \ifnum\frenchdoc=1
% \begin{HECwarning}{Utilisateurs de Overleaf et de MacOS}
% Pour une raison encore non r\'{e}solue, le processus d'installation d\'{e}crit ci-dessous ne fonctionne
-% pas sous MacOS. Vous devez donc \lien{http://bit.ly/frhecthesemac}{t\'{e}l\'{e}charger} une version
-% pr\'{e}install\'{e}e de la classe pour vous en servir.
+% pas sous MacOS. Vous devez donc \lien{https://www.overleaf.com/read/njbvvqtmytqk}{t\'{e}l\'{e}charger cette version
+% pr\'{e}install\'{e}e} de la classe pour vous en servir.
%
% Si vous \^{e}tes un utilisateur d'Overleaf, utilisez \'{e}galement la version pr\'{e}install\'{e}e mentionn\'{e}e ci-dessus
% pour d\'{e}marrer un projet.
@@ -226,7 +229,7 @@
% \else
% \begin{HECwarning}{Overleaf and MacOS users}
% For a reason still unresolved, the installation process described hereunder doesn't work on
-% MacOS. You must \lien{http://bit.ly/enhecthesemac2}{download} a preinstalled version of the
+% MacOS. You must \lien{https://www.overleaf.com/read/yqybpzfqqhzx}{download this preinstalled version} of the
% class to work with it.
%
% If you are an Overleaf user, please use the preinstalled version mentioned above to start a project.
@@ -393,7 +396,7 @@
% vous ajouterez les +packages+, commandes et environnements n\'{e}cessaires \`{a} votre r\'{e}daction.
%
% La r\'{e}daction en tant que telle se fera dans les autres fichiers. Chaque fichier repr\'{e}sente une
-% section de votre travail. Leur nom est donc, comme on le dit en chinois, \emph{self-explanatory}.
+% section de votre travail. Leur nom est donc, comme on le dit en anglais, \emph{self-explanatory}.
% Vous pourrez en ajouter ou en supprimer \`{a} votre guise. Assurez-vous seulement
% d'inclure les fichiers ajout\'{e}s dans le gabarit avec la commande \cmd{\include}, de supprimer les
% \cmd{\include} relatifs aux fichiers supprim\'{e}s, mais surtout, de respecter les r\`{e}gles du
@@ -473,15 +476,15 @@
% \fi
% \end{DescribeMacro}
%
-% \begin{DescribeMacro}{english,frenchb}
+% \begin{DescribeMacro}{english,french}
% \ifnum\frenchdoc=1
-% Les options +english+ et +frenchb+ sont propres au +package+ +babel+\cite{babel} et servent \`{a} indiquer
+% Les options +english+ et +french+ sont propres au +package+ +babel+\cite{babel} et servent \`{a} indiquer
% au compilateur la ou les langues utilis\'{e}es dans le document. La derni\`{e}re langue de la liste
% est la langue par d\'{e}faut du document. M\^{e}me si ces options sont propres \`{a} +babel+, nous
% les ins\'{e}rons dans les options de la classe pour qu'elles s'appliquent globalement \`{a}
% tous les +packages+ qui pourraient en avoir besoin.
% \else
-% +frenchb+ and +english+ options come from the +babel+ package\cite{babel} and they are used to
+% +french+ and +english+ options come from the +babel+ package\cite{babel} and they are used to
% indicate to the compiler in which language(s) the document is written. The last language in the
% options list is the document's default language. Even if these options come from the +babel+ package,
% they are inserted in the \cmd{\documentclass} command so they can be applied globally to all
@@ -1004,7 +1007,7 @@
% pr\'{e}conis\'{e} dans le \emph{Guide de r\'{e}daction}.
%
% Si vous r\'{e}digez votre th\`{e}se ou m\'{e}moire en anglais, nous vous recommandons d'utiliser le style bibliographique
-% +apa+ duquel est inspir\'{e} le style HEC Montr\'{e}al.
+% +apalike+.
%
% Afin de vous conformer au format de citation pr\'{e}conis\'{e} par le \emph{Guide de r\'{e}daction}, nous vous recommandons
% enfin d'utiliser la commande \cmd{\citep} lorsque vous citez vos sources.
@@ -1019,8 +1022,7 @@
% Caroline Archambault\cite{stylehec}. This style also supports the \emph{author-year} citation format that is
% recommended for use in the \emph{Guidelines}.
%
-% If you write your dissertation or thesis in English, we suggest you use the +apa+ bibliography style, which served
-% as inspiration for the HEC Montr\'{e}al bibliography style.
+% If you write your dissertation or thesis in English, we suggest you use the +apalike+ bibliography style.
%
% In order to fully comply with the \emph{Guidelines}, we recommend you use the \cmd{\citep} command when citing
% your sources.
@@ -2344,28 +2346,7 @@
%%
\HECgenererTitres
%</articles>
-%<*classique>
%%
-%<*francais>
-%% STYLE BIBLIOGRAPHIQUE
-%%
-%% On utilise par defaut le style bibliographique francais issu du package
-%% francais-bst. L'utilisation de ce style n'est pas obligatoire. Consultez
-%% la documentation pour connaitre la liste des styles compatibles avec la
-%% langue de redaction de votre these ou memoire.
-%%
-\bibliographystyle{francais}
-%</francais>
-%<*anglais>
-%% BIBLIOGRAPHY STYLE
-%%
-%% We use the default apa bibliography style. Using this style isn't mandatory.
-%% Read the class' documentation to learn more about the styles compatible with
-%% the language of your dissertation or thesis.
-%%
-\bibliographystyle{apa}
-%</anglais>
-%</classique>
%%
%<*francais>
%% MISE EN FORME DE LA TABLE DES MATIERES
@@ -2376,6 +2357,8 @@
%% quel niveau vous voulez voir repertories dans la TDM.
%</francais>
%<*anglais>
+%% TABLE OF CONTENTS LAYOUT
+%%
%% All document divisions up to the subsections are included in the table
%% of contents. If you want a more detailled table of contents, change
%% the following two commands so they match the level of detail you want
@@ -2507,6 +2490,27 @@
%<anglais>%% BEGINNING OF THE DISSERTATION OR THESIS
%%
\begin{document}
+%<*francais>
+%%
+%% STYLE BIBLIOGRAPHIQUE
+%%
+%% On utilise par defaut le style bibliographique francais issu du package
+%% francais-bst. L'utilisation de ce style n'est pas obligatoire. Consultez
+%% la documentation pour connaitre la liste des styles compatibles avec la
+%% langue de redaction de votre these ou memoire.
+%%
+\bibliographystyle{francais}
+%</francais>
+%<*anglais>
+%%
+%% BIBLIOGRAPHY STYLE
+%%
+%% We use the default apalike bibliography style. Using this style isn't mandatory.
+%% Read the class' documentation to learn more about the styles compatible with
+%% the language of your dissertation or thesis.
+%%
+\bibliographystyle{apalike}
+%</anglais>
%% Pages liminaires / frontmatter
\frontmatter
@@ -2624,8 +2628,6 @@
%<francais> %% Configuration de la bibliographie generale
%<anglais> %% General bibliography configuration
\HECbibliographieGenerale
- %<francais>\bibliographystyle{francais}
- %<anglais>\bibliographystyle{apa}
%</articles>
%<francais>%% Inscrivez le nom de votre fichier .bib entre les accolades.
%<anglais>%% Write the name of your .bib file between the curly braces.
@@ -2769,7 +2771,7 @@
\chapter*{}
\begin{HECdedication}
- %% Writte your dedication here.
+ %% Write your dedication here.
\end{HECdedication}
%</anglais>
%</dedicace>
@@ -2975,7 +2977,7 @@
%% Inscrivez le nom de votre fichier .bib entre les accolades.
%</francais>
%<*anglais>
-\bibliographystyle{apa}
+\bibliographystyle{apalike}
%% Write the name of your .bib file between the curly braces.
%</anglais>
\bibliography{}
diff --git a/macros/latex/contrib/hecthese/hecthese.pdf b/macros/latex/contrib/hecthese/hecthese.pdf
index 65ae1e4e6e..e75c631b33 100644
--- a/macros/latex/contrib/hecthese/hecthese.pdf
+++ b/macros/latex/contrib/hecthese/hecthese.pdf
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 19:01:55 +0000