From 098258765e1921f3e57f38e424272587103189dd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 31 May 2021 03:00:52 +0000 Subject: CTAN sync 202105310300 --- macros/latex/contrib/bjfuthesis/README.md | 39 +++-- macros/latex/contrib/bjfuthesis/bjfuthesis.cls | 10 +- .../bjfuthesis/documentation/bjfuthesis.pdf | Bin 145721 -> 145720 bytes macros/latex/contrib/bjfuthesis/example/thesis.pdf | Bin 3700470 -> 3700466 bytes macros/latex/contrib/changes/changes.drv | 2 +- macros/latex/contrib/changes/changes.dtx | 48 +++++-- macros/latex/contrib/changes/changes.english.pdf | Bin 368904 -> 369142 bytes .../contrib/changes/changes.english.withcode.pdf | Bin 452979 -> 454516 bytes macros/latex/contrib/changes/changes.ins | 5 +- macros/latex/contrib/changes/changes.ngerman.pdf | Bin 376315 -> 376580 bytes macros/latex/contrib/changes/examples.dtx | 24 +++- .../examples/changes.example.addedmarkup.bf.pdf | Bin 85486 -> 85486 bytes .../changes.example.addedmarkup.colored.pdf | Bin 82295 -> 82295 bytes .../changes.example.addedmarkup.dashuline.pdf | Bin 82935 -> 82935 bytes .../changes.example.addedmarkup.dotuline.pdf | Bin 82553 -> 82553 bytes .../examples/changes.example.addedmarkup.em.pdf | Bin 83749 -> 83749 bytes .../examples/changes.example.addedmarkup.it.pdf | Bin 83749 -> 83749 bytes .../examples/changes.example.addedmarkup.sl.pdf | Bin 84735 -> 84735 bytes .../examples/changes.example.addedmarkup.uline.pdf | Bin 82746 -> 82746 bytes .../changes.example.addedmarkup.uuline.pdf | Bin 85371 -> 85371 bytes .../examples/changes.example.addedmarkup.uwave.pdf | Bin 84759 -> 84759 bytes .../examples/changes.example.addedmarkup.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkup.brackets.pdf | Bin 74370 -> 74370 bytes .../changes.example.authormarkup.footnote.pdf | Bin 99663 -> 99663 bytes .../examples/changes.example.authormarkup.none.pdf | Bin 73913 -> 73913 bytes .../changes.example.authormarkup.subscript.pdf | Bin 82294 -> 82294 bytes .../changes.example.authormarkup.superscript.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkup.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkupposition.left.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkupposition.right.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkupposition.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkuptext.id.pdf | Bin 82295 -> 82295 bytes .../changes.example.authormarkuptext.name.pdf | Bin 83846 -> 83846 bytes .../changes.example.authormarkuptext.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.commandnameprefix.always.pdf | Bin 82295 -> 82295 bytes .../changes.example.commandnameprefix.ifneeded.pdf | Bin 82295 -> 82295 bytes .../changes.example.commandnameprefix.none.pdf | Bin 82295 -> 82295 bytes .../changes.example.commandnameprefix.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.commentmarkup.footnote.pdf | Bin 110514 -> 110514 bytes .../changes.example.commentmarkup.margin.pdf | Bin 78953 -> 78953 bytes .../changes.example.commentmarkup.todo.pdf | Bin 82295 -> 82295 bytes .../changes.example.commentmarkup.uwave.pdf | Bin 81965 -> 81965 bytes .../examples/changes.example.defaultcolor.pdf | Bin 82299 -> 82299 bytes .../examples/changes.example.deletedmarkup.bf.pdf | Bin 84982 -> 84982 bytes .../changes.example.deletedmarkup.colored.pdf | Bin 81125 -> 81125 bytes .../changes.example.deletedmarkup.dashuline.pdf | Bin 82590 -> 82590 bytes .../changes.example.deletedmarkup.dotuline.pdf | Bin 81687 -> 81687 bytes .../examples/changes.example.deletedmarkup.em.pdf | Bin 82891 -> 82891 bytes .../examples/changes.example.deletedmarkup.it.pdf | Bin 82891 -> 82891 bytes .../examples/changes.example.deletedmarkup.sl.pdf | Bin 85110 -> 85110 bytes .../changes.example.deletedmarkup.sout.pdf | Bin 82295 -> 82295 bytes .../changes.example.deletedmarkup.uline.pdf | Bin 82291 -> 82291 bytes .../changes.example.deletedmarkup.uuline.pdf | Bin 88402 -> 88402 bytes .../changes.example.deletedmarkup.uwave.pdf | Bin 83877 -> 83877 bytes .../changes.example.deletedmarkup.wrong.pdf | Bin 82295 -> 82295 bytes .../changes.example.deletedmarkup.xout.pdf | Bin 81521 -> 81521 bytes .../changes/examples/changes.example.draft.pdf | Bin 82295 -> 82295 bytes .../changes/examples/changes.example.final.pdf | Bin 68141 -> 68141 bytes .../changes.example.highlightmarkup.background.pdf | Bin 82295 -> 82295 bytes .../changes.example.highlightmarkup.uuline.pdf | Bin 82970 -> 82970 bytes .../changes.example.highlightmarkup.uwave.pdf | Bin 84357 -> 84357 bytes .../examples/changes.example.listofchanges.all.pdf | Bin 88820 -> 88827 bytes ...hanges.example.listofchanges.compactsummary.pdf | Bin 86749 -> 86747 bytes .../changes.example.listofchanges.list.pdf | Bin 84993 -> 84996 bytes .../changes.example.listofchanges.show.pdf | Bin 89121 -> 89128 bytes .../changes.example.listofchanges.summary.pdf | Bin 97975 -> 97975 bytes .../changes.example.listofchanges.title.pdf | Bin 88388 -> 88389 bytes .../changes.example.listofchanges.wrong.pdf | Bin 84993 -> 84996 bytes .../examples/changes.example.markup.bfit.pdf | Bin 86058 -> 86058 bytes .../examples/changes.example.markup.default.pdf | Bin 82295 -> 82295 bytes .../examples/changes.example.markup.nocolor.pdf | Bin 84681 -> 84681 bytes .../examples/changes.example.markup.underlined.pdf | Bin 84812 -> 84812 bytes .../examples/changes.example.markup.wrong.pdf | Bin 82295 -> 82295 bytes .../examples/changes.example.package.hyperref.pdf | Bin 0 -> 97399 bytes .../changes.example.packageoptions.todonotes.pdf | Bin 104166 -> 104166 bytes .../changes.example.packageoptions.truncate.pdf | Bin 83517 -> 83517 bytes .../changes.example.packageoptions.ulem.pdf | Bin 75270 -> 75270 bytes .../changes.example.packageoptions.xcolor.pdf | Bin 84182 -> 84182 bytes .../examples/changes.example.screenshot.pdf | Bin 143191 -> 143467 bytes .../examples/changes.example.setaddedmarkup.pdf | Bin 94860 -> 94860 bytes .../examples/changes.example.setauthormarkup.pdf | Bin 85414 -> 85414 bytes .../changes.example.setauthormarkupposition.pdf | Bin 93585 -> 93585 bytes .../changes.example.setauthormarkuptext.pdf | Bin 94839 -> 94839 bytes .../examples/changes.example.setcommentmarkup.pdf | Bin 94058 -> 94058 bytes .../examples/changes.example.setdeletedmarkup.pdf | Bin 94091 -> 94091 bytes .../changes.example.sethighlightmarkup.pdf | Bin 93929 -> 93929 bytes .../examples/changes.example.setlocextension.pdf | Bin 0 -> 99681 bytes .../examples/changes.example.setsocextension.pdf | Bin 82295 -> 99585 bytes .../examples/changes.example.setsummarytowidth.pdf | Bin 98926 -> 98926 bytes .../examples/changes.example.setsummarywidth.pdf | Bin 97786 -> 97786 bytes .../examples/changes.example.settruncatewidth.pdf | Bin 96371 -> 96380 bytes .../changes/examples/changes.example.simple.pdf | Bin 92919 -> 92919 bytes macros/latex/contrib/easybook/easybook.dtx | 49 ++++--- macros/latex/contrib/easybook/easybook.pdf | Bin 312353 -> 313205 bytes .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40812 -> 40812 bytes .../reledmac/examples/1-criticalendnotes.pdf | Bin 197491 -> 197491 bytes .../contrib/reledmac/examples/1-criticalnotes.pdf | Bin 195653 -> 195653 bytes .../contrib/reledmac/examples/1-sidenotes.pdf | Bin 291188 -> 291188 bytes .../latex/contrib/reledmac/examples/1-tabular.pdf | Bin 281031 -> 281031 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 197564 -> 197564 bytes .../latex/contrib/reledmac/examples/1-verses.pdf | Bin 197396 -> 197396 bytes .../latex/contrib/reledmac/examples/2-antilabe.pdf | Bin 205373 -> 205373 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 196391 -> 196391 bytes .../reledmac/examples/2-footnote_spacing.pdf | Bin 199862 -> 199862 bytes .../contrib/reledmac/examples/2-glossaries.pdf | Bin 280691 -> 280691 bytes .../latex/contrib/reledmac/examples/2-indexing.pdf | Bin 279825 -> 279825 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 273987 -> 273987 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 289480 -> 289480 bytes .../contrib/reledmac/examples/2-linespacing.pdf | Bin 284653 -> 284653 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 285314 -> 285314 bytes .../contrib/reledmac/examples/2-notes-width.pdf | Bin 203109 -> 203109 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 208756 -> 208756 bytes .../contrib/reledmac/examples/2-performances.pdf | Bin 281669 -> 281669 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31450 -> 31448 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 304788 -> 304788 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 283765 -> 283765 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 196243 -> 196243 bytes .../3-reledpar_columns_different_languages.pdf | Bin 23427 -> 23426 bytes .../contrib/reledmac/examples/3-reledpar_mwe.pdf | Bin 172606 -> 172606 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 32047 -> 32047 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 284905 -> 284905 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190129 -> 190129 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189364 -> 189364 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168145 -> 168145 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189772 -> 189772 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188698 -> 188698 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188752 -> 188752 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188888 -> 188888 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 210267 -> 210267 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 209050 -> 209050 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 201331 -> 201331 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 293347 -> 293347 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 200437 -> 200437 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 221703 -> 221703 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 246378 -> 246378 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 201164 -> 201164 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 197012 -> 197012 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 297750 -> 297750 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 203497 -> 203497 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 192572 -> 192572 bytes macros/latex/contrib/reledmac/migration.pdf | Bin 358157 -> 358155 bytes macros/latex/contrib/reledmac/reledmac.dtx | 159 +++++++++++++++------ macros/latex/contrib/reledmac/reledmac.pdf | Bin 2034959 -> 2041560 bytes macros/latex/contrib/reledmac/reledpar.pdf | Bin 987750 -> 987754 bytes 144 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf create mode 100644 macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf (limited to 'macros/latex') diff --git a/macros/latex/contrib/bjfuthesis/README.md b/macros/latex/contrib/bjfuthesis/README.md index 0f6e8822f5..1be1a5d023 100644 --- a/macros/latex/contrib/bjfuthesis/README.md +++ b/macros/latex/contrib/bjfuthesis/README.md @@ -1,7 +1,32 @@ -# Beijing Forestry University (BJFU) Thesis Template in LaTeX +# 北京林业大学 (BJFU) 毕业论文模板 (LaTeX) Copyright (C) 2021 Liu Changxin -Version 0.1.0 (2021-05-29) +Version 1.0.0 (2021-05-30) + +## Abstract +The bjfuthesis class is a LaTeX document class intended for students in Beijing Forestry University (BJFU) to write their theses. It follows the thesis specification of Beijing Forestry University. + +## 简介 +bjfuthesis是北京林业大学 (BJFU) 毕业生撰写毕业论文使用的LaTeX模板。使用该模板可以快速编写出符合论文格式要求的论文。该模板精心编写,具有使用简单、便捷、可靠的优点。 + +## 使用方法 +1. 下载并安装MiKTeX:https://miktex.org/download +1. 下载并安装Perl:macOS与Linux操作系统已内置Perl,无需安装。使用Windows的用户需下载并安装:https://strawberryperl.com +1. 下载并安装TeXstudio:https://www.texstudio.org +1. 配置TeXstudio: + 1. 点击 Options -> Configure TeXstudio 以打开设置界面 + 1. 在 General -> Language 中选择 zh_CN (Chinese) 将界面设为中文 + 1. 点击 OK 使设置生效 + 1. 再次打开设置 + 1. 勾选左下角的 显示高级选项 + 1. 在 构建 -> 默认编译器 中输入值 txs:///latexmk -xelatex + 1. 点击绿色三角形的构建按钮(有两个构建按钮,左侧的是构建并查看,右侧的是仅构建。请根据需要自行选择) + 1. 当底部的消息栏中显示完成时,你应该便可以看到生成的PDF文件了 + +## Contribute +You can contribute to the template in + + https://github.com/bjfu-projects/bjfuthesis ## License Licensed under the GNU General Public License v3.0 (the "License"); you may not use this file except in compliance with the License. @@ -12,12 +37,4 @@ You may obtain a copy of the License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -## Abstract -The bjfuthesis class is a LaTeX class intended for students in Beijing Forestry University (BJFU) to write their theses. The class is based on the ctexbook class. It modifies some of the layout and style definitions of these packages in order to provide a document layout that should be compatible with Beijing Forestry University Thesis Standard. - -## Installation -Get the latest release of bjfuthesis from - - https://github.com/bjfu-projects/bjfu-thesis \ No newline at end of file +limitations under the License. \ No newline at end of file diff --git a/macros/latex/contrib/bjfuthesis/bjfuthesis.cls b/macros/latex/contrib/bjfuthesis/bjfuthesis.cls index cabf2f3ca8..5395edcc24 100644 --- a/macros/latex/contrib/bjfuthesis/bjfuthesis.cls +++ b/macros/latex/contrib/bjfuthesis/bjfuthesis.cls @@ -17,19 +17,19 @@ \NeedsTeXFormat{LaTeX2e}[2020/10/01] \newcommand*\@iflatexlater{\@ifl@t@r\fmtversion} \@iflatexlater{2020/10/01}{}{\ClassError{bjfuthesis}{The version of LaTeX you installed does not meet the minimum version requirements}} +\RequirePackage{iftex} +\ifXeTeX\else\ClassError{bjfuthesis}{XeLaTeX is required to compile this document}\fi \def\header@text{北京林业大学本科毕业论文} \def\keywords@label@zh{关键词:} \def\keywords@label@en{Keywords: } \def\chartnote@label{注:} -\ProvidesClass{bjfuthesis}[2021/05/29 LaTeX document style for BJFU thesis] +\ProvidesClass{bjfuthesis}[2021/05/30 LaTeX document style for BJFU thesis] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}} \ProcessOptions* \LoadClass[a4paper,oneside,fontset=none]{ctexbook} -\RequirePackage{pdfpages} -\RequirePackage{graphicx} +\RequirePackage{pdfpages,graphicx} \graphicspath{{figures/}} -\RequirePackage{silence} -\RequirePackage{bicaption} +\RequirePackage{silence,bicaption} \DeclareCaptionFormat{bjfucaption}{\textbf{\fontsize{9}{21}\selectfont#1#2#3}} \captionsetup{format=bjfucaption,skip=0pt,labelsep=space} \captionsetup[figure][bi-second]{name=Figure} diff --git a/macros/latex/contrib/bjfuthesis/documentation/bjfuthesis.pdf b/macros/latex/contrib/bjfuthesis/documentation/bjfuthesis.pdf index dca53ae91c..c246213cae 100644 Binary files a/macros/latex/contrib/bjfuthesis/documentation/bjfuthesis.pdf and b/macros/latex/contrib/bjfuthesis/documentation/bjfuthesis.pdf differ diff --git a/macros/latex/contrib/bjfuthesis/example/thesis.pdf b/macros/latex/contrib/bjfuthesis/example/thesis.pdf index b29d4e8cb0..24e4dacf68 100644 Binary files a/macros/latex/contrib/bjfuthesis/example/thesis.pdf and b/macros/latex/contrib/bjfuthesis/example/thesis.pdf differ diff --git a/macros/latex/contrib/changes/changes.drv b/macros/latex/contrib/changes/changes.drv index e8e7868fb1..4f8e28e5ad 100644 --- a/macros/latex/contrib/changes/changes.drv +++ b/macros/latex/contrib/changes/changes.drv @@ -1,6 +1,6 @@ %%% % driver file of changes package -\newcommand{\docversion}{4.0.4} +\newcommand{\docversion}{4.1.0} \documentclass[titlepage, parskip=half, toc=flat, cleardoublepage=empty, captions=nooneline, origlongtable, english]{scrartcl} diff --git a/macros/latex/contrib/changes/changes.dtx b/macros/latex/contrib/changes/changes.dtx index cdb43d7d46..fa99005bae 100644 --- a/macros/latex/contrib/changes/changes.dtx +++ b/macros/latex/contrib/changes/changes.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1263} +% \CheckSum{1275} % % \iffalse meta-comment % @@ -67,6 +67,7 @@ % \changes{v4.0.2}{2021/04/05}{bugfix: documentation with ifthenelse references} % \changes{v4.0.3}{2021/05/09}{bugfix: compile error with cite command in change markup with final option} % \changes{v4.0.4}{2021/05/13}{bugfix: added missing regression.dtx to ctan archive; no code change} +% \changes{v4.1.0}{2021/05/30}{clickable list of changes} % \GetFileInfo{changes.dtx} % \RecordChanges % @@ -106,8 +107,8 @@ % Type some information to the console. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{changes}[2021/05/13 v4.0.4 changes package] -\typeout{*** changes package 2021/05/13 v4.0.4 ***} +\ProvidesPackage{changes}[2021/05/30 v4.1.0 changes package] +\typeout{*** changes package 2021/05/30 v4.1.0 ***} % \end{macrocode} % % Package \docpackage{xkeyval} provides options with key-value-pairs. @@ -1332,7 +1333,7 @@ \IfIsEmpty{#2}% {\def\Changes@locid{}}% {\def\Changes@locid{~(#2)}}% - \addtocontents{\Changes@locextension}{\protect\ChangesListline{#1}{#6\Changes@locid}{#7}{\thepage}}% + \phantomsection\addcontentsline{\Changes@locextension}{#1}{#6\Changes@locid: \truncate{\Changestruncatewidth}{#7}}% }% % \end{macrocode} % @@ -1504,14 +1505,14 @@ % % \begin{macro}{\ChangesListline} % -% Output of a list line. +% Output of a list line, calls \doccommand{contentsline} for output which uses \doccommand{l@change}. % % This command has the following arguments: % \begin{enumerate} % \item change type (added, ...) % \item change description with author -% \item text % \item page +% \item page reference for hyperref % \end{enumerate} % % \begin{macrocode} @@ -1520,31 +1521,43 @@ \@ifundefined{@dotsep}% {\def\@dotsep{4.5}}% {}% - \@dottedtocline{1}{0pt}{2em}{#2: \truncate{\Changes@truncate@width}{#3}}{#4}% + \origcontentsline{change}{#2}{#3}{#4} }{}% } % \end{macrocode} % \end{macro} % +% \begin{macro}{\l@change} +% +% Output of a loc entry. +% +% \begin{macrocode} +\newcommand*\l@change{\@dottedtocline{1}{0pt}{2em}} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\settruncatewidth} % % Set the width of the truncation. % Argument: new width. % \begin{macrocode} \newcommand{\settruncatewidth}[1]{ - \setlength{\Changes@truncate@width}{#1} + \setlength{\Changestruncatewidth}{#1} } % \end{macrocode} % \end{macro} % -% \begin{macro}{\Changes@truncate@width} +% \begin{macro}{\Changestruncatewidth} % % Length for the width of the truncation. % % Default: two third of the text width % +% Normally, the name would be separated by @, as all internal macros are, but this leads +% to compile errors when processing the list of changes, therefore the @ were omitted. +% % \begin{macrocode} -\newlength{\Changes@truncate@width} +\newlength{\Changestruncatewidth} \settruncatewidth{.6\textwidth} % \end{macrocode} % \end{macro} @@ -1583,6 +1596,14 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\phantomsection} +% +% Provide command in case \docpackage{hyperref} is not loaded. +% \begin{macrocode} +\providecommand\phantomsection{} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\listofchanges} % % This command outputs the list of changes. @@ -1661,11 +1682,16 @@ % Print list. % % The \doccommand{ifeof} command is neccessary in the loop too, otherwise there are problems with the last (empty) line of the file. +% +% The output is done with \doccommand{contentsline}, in order to filter the output I have to redefine the command. +% I did not find a better solution than the \doccommand{let} command. % \begin{macrocode} \IfIsInList{\Changes@loc@style}{list}% {% \IfFileExists{\jobname.\Changes@locextension}% {% + \let\origcontentsline\contentsline% + \let\contentsline\ChangesListline% \newread\Changes@InFile% \openin\Changes@InFile=\jobname.\Changes@locextension% \loop\unless\ifeof\Changes@InFile% @@ -1675,12 +1701,14 @@ \fi \repeat \closein\Changes@InFile% + \let\contentsline\origcontentsline% }{% \emph{\changesnoloc}% \PackageWarning{changes}{LaTeX rerun needed for list of changes}% }% }{}% % \end{macrocode} +% % Print summary or compact summary. % % The \doccommand{ifeof} command is neccessary in the loop too, otherwise there are problems with the last (empty) line of the file. diff --git a/macros/latex/contrib/changes/changes.english.pdf b/macros/latex/contrib/changes/changes.english.pdf index 3966c3b985..d6ba8fee86 100644 Binary files a/macros/latex/contrib/changes/changes.english.pdf and b/macros/latex/contrib/changes/changes.english.pdf differ diff --git a/macros/latex/contrib/changes/changes.english.withcode.pdf b/macros/latex/contrib/changes/changes.english.withcode.pdf index fb527586e1..1ee8066abe 100644 Binary files a/macros/latex/contrib/changes/changes.english.withcode.pdf and b/macros/latex/contrib/changes/changes.english.withcode.pdf differ diff --git a/macros/latex/contrib/changes/changes.ins b/macros/latex/contrib/changes/changes.ins index 537ecf5d1e..72e217bcfc 100644 --- a/macros/latex/contrib/changes/changes.ins +++ b/macros/latex/contrib/changes/changes.ins @@ -1,6 +1,6 @@ %% This file creates the needed files from changes.dtx %% -\def\filedate{2021/05/13} +\def\filedate{2021/05/20} \def\batchfile{changes.ins} \input docstrip @@ -136,6 +136,7 @@ Copyright 2007-2021 Ekkart Kleinod \file{examples/changes.example.setsummarywidth.tex}{\from{examples.dtx}{example:setsummarywidth}} \file{examples/changes.example.setsummarytowidth.tex}{\from{examples.dtx}{example:setsummarytowidth}} % + \file{examples/changes.example.setlocextension.tex}{\from{examples.dtx}{example:setlocextension}} \file{examples/changes.example.setsocextension.tex}{\from{examples.dtx}{example:setsocextension}} % \file{examples/changes.example.listofchanges.list.tex}{\from{examples.dtx}{example:listofchanges:list}} @@ -152,6 +153,8 @@ Copyright 2007-2021 Ekkart Kleinod \file{examples/changes.example.packageoptions.xcolor.tex}{\from{examples.dtx}{example:packageoptions.xcolor}} % \file{examples/changes.example.screenshot.tex}{\from{example-screenshot.dtx}{example:screenshot}} +% + \file{examples/changes.example.package.hyperref.tex}{\from{examples.dtx}{example:package.hyperref}} % \file{regression/changes.regression.draft.tex}{\from{regression.dtx}{regression:draft}} \file{regression/changes.regression.final.tex}{\from{regression.dtx}{regression:final}} diff --git a/macros/latex/contrib/changes/changes.ngerman.pdf b/macros/latex/contrib/changes/changes.ngerman.pdf index d96ed9c052..68bf529573 100644 Binary files a/macros/latex/contrib/changes/changes.ngerman.pdf and b/macros/latex/contrib/changes/changes.ngerman.pdf differ diff --git a/macros/latex/contrib/changes/examples.dtx b/macros/latex/contrib/changes/examples.dtx index 9dc8932bfa..0f6f1cdea3 100644 --- a/macros/latex/contrib/changes/examples.dtx +++ b/macros/latex/contrib/changes/examples.dtx @@ -43,12 +43,16 @@ \usepackage{babel} % \end{macrocode} % +%<*example:package.hyperref> +\usepackage{hyperref} +% +% % Different package options. % % \begin{macrocode} -%<*example:simple|example:setsocextension|example:setaddedmarkup|example:setdeletedmarkup|example:setcommentmarkup|example:sethighlightmarkup|example:setauthormarkup|example:setauthormarkupposition|example:setauthormarkuptext|example:listofchanges:list|example:listofchanges:show|example:listofchanges:summary|example:listofchanges:compactsummary|example:listofchanges:all|example:listofchanges:title|example:listofchanges:wrong|example:settruncatewidth|example:setsummarywidth|example:setsummarytowidth> +%<*example:simple|example:setsocextension|example:setlocextension|example:setaddedmarkup|example:setdeletedmarkup|example:setcommentmarkup|example:sethighlightmarkup|example:setauthormarkup|example:setauthormarkupposition|example:setauthormarkuptext|example:listofchanges:list|example:listofchanges:show|example:listofchanges:summary|example:listofchanges:compactsummary|example:listofchanges:all|example:listofchanges:title|example:listofchanges:wrong|example:settruncatewidth|example:setsummarywidth|example:setsummarytowidth|example:package.hyperref> \usepackage{changes} -% +% % %<*example:draft> \usepackage[draft]{changes} @@ -274,6 +278,11 @@ \setsummarytowidth{The longest text you can imagine for the summary.} % % +%<*example:setlocextension> +\setlocextension{changes} +% +% \end{macrocode} +% %<*example:setsocextension> \setsocextension{changes} % @@ -303,24 +312,27 @@ %\verb|\setauthormarkupposition{left}| %\verb|\setauthormarkuptext{name}| %\verb|\settruncatewidth{.3\textwidth}| +%\verb|\setlocextension{changes}| +%\verb|\setsocextension{changes}| %\verb|\setsummarywidth{3cm}| %\verb|\setsummarytowidth{The longest text you can imagine for the summary.}| +%\verb|\usepackage{hyperref}| for linked list of changes -%<*example:listofchanges:list|example:settruncatewidth> +%<*example:listofchanges:list|example:settruncatewidth|example:package.hyperref> \listofchanges -% +% %<*example:listofchanges:summary|example:setsummarywidth|example:setsummarytowidth> \listofchanges[style=summary] % %<*example:listofchanges:compactsummary> \listofchanges[style=compactsummary] % -%<*example:listofchanges:all> +%<*example:listofchanges:all|example:setlocextension|example:setsocextension> \listofchanges \listofchanges[style=summary] \listofchanges[style=compactsummary] -% +% %<*example:listofchanges:title> \listofchanges[title={New title for loc}] \listofchanges[style=summary, title={New title for summary}] diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf index dc0c3dd07a..df9f9e04b7 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf index 9b20a91f4b..d7dd7f81e2 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf index 997338b6fa..c964e3b05b 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf index d22a436c8b..2cf129d8d1 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf index 05fda41a2c..01cf200576 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf index 82efbcff69..9b4a49988e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf index 2d8e55c72e..627b20f2c2 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf index e42b78e69f..1e8f4d499e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf index cf0f7977ca..31a624cf5d 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf index 174d468e10..53e5087ac8 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf index b6afc108f3..4668d0f373 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf index 04849c936c..f63bf8eceb 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf index 8307c1eb34..7c51870ed6 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf index 8526a878c9..2b76eb3e0f 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf index 5722d29e3c..eb6264508c 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf index 614753eae4..4d9021e12c 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf index f92a3815a6..b84a53b145 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf index 4baa2793e8..7b3879afde 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf index bea03c7f39..7173c42d99 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf index 5cc15530ea..9c27447292 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf index e13fbc099e..9fe437fe29 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf index 09d2d962ba..a6b4cd9299 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf index 8f9b11217c..774e45b009 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf index 34e44f4122..a9d1b7c5bd 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf and b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf index 755b71e7b6..5d3cfe194f 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf and b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf index 61d3656b21..c601a4aea9 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf and b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf index 4ae72adfb5..c2804ee36a 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf index a0c6078b41..b5791d9e27 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf and b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf index da26c081e4..a46720e9d2 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf and b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf index c7df7d621f..b1b086b532 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf and b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf index 9dcab9f153..634495f0cc 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf and b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf index 0927c66a56..2ef1544682 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf and b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf index f7bc342800..84159d21ad 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf index 7bd79fce36..60c656e3e2 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf index e41a79f0e1..7484d2369e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf index 5996794da5..3eb4edf507 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf index 71d6ae63da..25f5db7c1e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf index a7360c45e1..f48ae8cf3d 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf index 52c8856fe5..b56242fd5d 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf index 25da40e2a4..2662f57833 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf index 0bc0bb96db..cb7cf60521 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf index 3b29e78138..4229f381ef 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf index a0b414f540..ffd3db58bf 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf index d5e92334b6..788aa63201 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf index 7c88d36d25..fabb36e19c 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf and b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.draft.pdf b/macros/latex/contrib/changes/examples/changes.example.draft.pdf index 7487224028..eb1ed5b9b5 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.draft.pdf and b/macros/latex/contrib/changes/examples/changes.example.draft.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.final.pdf b/macros/latex/contrib/changes/examples/changes.example.final.pdf index ba26534645..9dc5b90c7d 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.final.pdf and b/macros/latex/contrib/changes/examples/changes.example.final.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf index 5454e5cb9e..c8b51542d1 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf and b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf index 44660333cc..bc6f9f0d5a 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf and b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf index b0dde8c21e..08e7613f0a 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf and b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf index 1d91a78803..8006af28ef 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf index d4e2dc9286..d1b193ef31 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf index bf123cce50..d6d66a399f 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf index 65c702e413..f4a59d64fd 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf index 565a258ad9..368186ea21 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf index 64ca9aa1af..c603acac49 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf index 302a98cfcd..3b6047a8ce 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf index 02216b7feb..1ba2c88dab 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf and b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf index e7808d8a3d..df7f3a3191 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf and b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf index e9aa8961aa..2938d22d1c 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf and b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf index 4e857736ad..b8401131e6 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf and b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf index 92d173d497..dcee199e7e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf and b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf b/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf new file mode 100644 index 0000000000..24b246e270 Binary files /dev/null and b/macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf index e4b03e2b5d..00dede22da 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf and b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf index dcc53cb087..544952b9ce 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf and b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf index 8505cb8df9..eea20bfa20 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf and b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf index c14ec5b69d..e7d2afb04e 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf and b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf index f160be560a..4db48cba0c 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf and b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf index 3bd6988e6f..09333a4a5a 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf and b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf index 7daf91ae92..346314b016 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf and b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf index a1d970adaf..7c550e13b8 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf and b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf index 6d5b376fda..8d2c09d293 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf and b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf index 95bb7d328e..9c80d8ee29 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf and b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf index b41d6fad38..86daf81a81 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf and b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf index bad03fbfd1..d035b74730 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf and b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf b/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf new file mode 100644 index 0000000000..7528a69a2c Binary files /dev/null and b/macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf index 985d432902..d3f15eba92 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf and b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf index 35306c3ce1..3404949795 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf and b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf index bb075da847..0fe0ffb611 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf and b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf index 62b2878df3..7a9e0928a6 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf and b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf differ diff --git a/macros/latex/contrib/changes/examples/changes.example.simple.pdf b/macros/latex/contrib/changes/examples/changes.example.simple.pdf index 0c7385b600..be1660fa7d 100644 Binary files a/macros/latex/contrib/changes/examples/changes.example.simple.pdf and b/macros/latex/contrib/changes/examples/changes.example.simple.pdf differ diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index b990509cef..455f92911b 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -23,11 +23,11 @@ % % \changes{v1.20}{2021/01/09}{修改和完善用户文档。} % \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。} -% \changes{v1.25n}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。} +% \changes{v1.25o}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。} % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/05/21\hskip\ccwd\relax v1.25n\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/05/30\hskip\ccwd\relax v1.25o\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -117,7 +117,7 @@ % \end{syntax} % 传递给 \cls{ctexbook} 设置字体,最好不要使用原有的 \opt{fontset} 选项,默认情况下使用自定义字体而不开启这个选项,可根据安装的字体及电脑系统选取。\opt{noto} 与 \opt{none} 选项的相关描述见小节 \ref{subsec:font settings},\opt{overleaf} 是一个各系统通用选项,会检测系统环境选取对应字体。 % \changes{v1.21}{2021/01/12}{默认字体与 \CTeX 一致,不再是自定义字体。} -% \changes{v1.25n}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} +% \changes{v1.25o}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} % \end{function} % % \begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-13]{paper} @@ -168,7 +168,7 @@ % \tn{listoflistings*+}\oarg{键值列表} % \end{syntax} % \tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录,带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录,需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入文本和换页命令等。目录的键值列表选项如下 -% \changes{v1.25n}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} +% \changes{v1.25o}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} % \end{function} % % \begin{function}{multoc,title,format,aftertitle,pagestyle,book,article} @@ -199,7 +199,7 @@ % 双语目录的标题命令目前设置了常用的三个级别,它们将中文标题正常输出,并使中英文标题加入双语目录,这个功能是为国内一些大学的学位论文模板的要求设计,在一般情况和英文模式下不需要使用。 % % 它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \tn{chapter*} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文标题,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。双语目录的格式是一致的,共享使用 \tn{tocset} 的设置,英文目录的章级别标题名及编号的修改方式如下 -% \changes{v1.25n}{2021/05/05}{增加与双语目录配合的标题命令。} +% \changes{v1.25o}{2021/05/05}{增加与双语目录配合的标题命令。} % \end{function} % % \begin{function}{biname,binmuber} @@ -299,7 +299,7 @@ % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。} % \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。} % \changes{v1.24}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} -% \changes{v1.25n}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。} +% \changes{v1.25o}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。} % \end{function} % % \begin{optdesc} @@ -356,7 +356,7 @@ % \ding{229} 以上选项路径为 \opt{subfont/...} % \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。} % \changes{v1.23}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} -% \changes{v1.25n}{2021/05/21}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。} +% \changes{v1.25o}{2021/05/30}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。} % \end{function} % % \begin{optdesc} @@ -381,7 +381,7 @@ % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} % \changes{v1.24}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} -% \changes{v1.25n}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。} +% \changes{v1.25o}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。} % \end{function} % % \begin{optdesc} @@ -516,12 +516,15 @@ % % \subsection{页眉页脚} % \label{subsec:header and footer} -% \begin{function}[EXP,added = 2021-01-13,updated = 2021-04-09]{head-foot,chap-mark,sec-mark,subsec-mark,headrule,footrule,footnoterule} +% \begin{function}[EXP,added = 2021-01-13,updated = 2021-05-30]{head-foot,chap-mark,sec-mark,subsec-mark,chap-label,sec-label,subsec-label,headrule,footrule,footnoterule} % \begin{syntax} % head-foot = <页眉页脚中的内容> % chap-mark = <\tn{chaptermark} 标志命令的内容> % sec-mark = <\tn{sectionmark} 标志命令的内容> % subsec-mark = <\tn{subsectionmark} 标志命令的内容> +% chap-label = <\tn{chaptermark} 标志命令的标签> +% sec-label = <\tn{sectionmark} 标志命令的标签> +% subsec-label = <\tn{subsectionmark} 标志命令的标签> % headrule = <页眉横线格式> % footrule = <页脚横线格式> % footnoterule = <脚注横线格式> @@ -529,6 +532,12 @@ % \ding{229} 以上选项路径为 \opt{hdrset/...} \\ % \opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持。设置章节标志选项 \opt{chap-mark}、\opt{sec-mark} 和 \opt{subsec-mark} 时已做了情形考虑,不需要使用 \tn{markboth} 或 \tn{markright} 命令,其中参数 \#1 代表当前章、节或小节的标题。\opt{chap-mark} 和 \opt{sec-mark} 选项在 \opt{book} 模式时有意义,\opt{sec-mark} 和 \opt{subsec-mark} 选项在 \opt{article} 模式时有意义,这与标准文档类的行为一致。也可以直接重新定义这些标志命令,但此时 \opt{style/uppercase} 选项失效,这时可以用例如 \tn{MakeUppercase} 命令来设置标志内容的大小写。 % +% 标签选项 \opt{chap-label}、\opt{sec-label} 和 \opt{subsec-label} 用于设置标志命令中的标签,包括标题编号和与标题内容之间的距离,它们比标志命令内容的选项更常用 +% +% \begin{ctexexam} +% \hdrset{chap-label = \thechapter\hspace{\ccwd}} +% \end{ctexexam} +% % \opt{headrule}、\opt{footrule} 和 \opt{footnoterule} 三个横线选项一般可以使用 \tn{hrule} width \meta{长度} height \meta{高度} 命令来绘制,脚注横线默认为空。当然,手动绘制横线时线条粗细选项 \opt{style/rulewidth} 会失效。 % \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。} % \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。} @@ -575,7 +584,7 @@ % 上面几个选项用于设置脚注格式,\opt{fnparskip} 和 \opt{fnparindent} 选项仅在 \opt{fnhang = true} 时有效。\opt{fnhang} 用于将脚注设置为悬挂缩进的格式,\opt{fnmark-pos} 选项设置脚注编号的位置,正常文本或是上标形式。\opt{fnmark-num} 选项设置脚注编号的格式,默认为原生样式 \opt{plain},还可以改为 \opt{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括1-10。 % % \opt{fnmark-form} 是脚注标记的格式,在此设置字体命令会覆盖 \opt{subfont/footnote} 的设置,最后一个格式命令可以带有一个参数,这个参数接受脚注编号,一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码,一般用于设置标记与文本间的距离。 -% \changes{v1.25n}{2021/05/12}{增加脚注样式设置选项。} +% \changes{v1.25o}{2021/05/12}{增加脚注样式设置选项。} % \end{function} % % \subsection{目录样式} @@ -594,7 +603,7 @@ % \opt{format} 是目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用无间距重合的 \tn{addvspace} 命令,带有加号的 \opt{format+} 选项用于在已有的格式命令后附加内容。\opt{indent} 是目录中标题在页面左侧的缩进距离,应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令,将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。 % \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。} % \changes{v1.24}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。} -% \changes{v1.25n}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} +% \changes{v1.25o}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberLine} @@ -679,7 +688,7 @@ % \tn{end}\marg{环境名} % \end{syntax} % \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。目前除了表头斜线以及跨页功能存在不足,其它方面已满足对表格绝大多数格式的需求,具体用法可见宏包的说明文档。 -% \changes{v1.25n}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} +% \changes{v1.25o}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} % \end{function} % % \subsection{列表} @@ -843,7 +852,7 @@ % \tn{qtyrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位} % \end{syntax} % \pkg{siunitx} 宏包的 \tn{num} 命令可以输出以科学计数法表示的数值,单位格式化命令 \tn{unit} 包含文字项目(例如字母或数字)时,使用 . 和 \~{} 放置在单元乘积中间,并使用 \_ 和 \^{} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。而 \tn{qty} 命令可用来输出带有单位的量,\tn{qtyrange} 可以输出带有范围和单位的量。 -% \changes{v1.25n}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。} +% \changes{v1.25o}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。} % \end{function} % % \begin{ctexexam} @@ -980,7 +989,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplClass{easybook}{2021/05/21}{1.25n}{beta} +\ProvidesExplClass{easybook}{2021/05/30}{1.25o}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -1372,7 +1381,7 @@ \ifbool{@mainmatter} { \int_if_odd:nT { \CTEX@chapter@numbering } - { \CTEXthechapter\hspace{\ccwd} } + { \eb@mark@chapter@label } }{} }#1 }, @@ -1382,7 +1391,7 @@ \int_compare:nNnT { \c@secnumdepth } > { 0 } { \int_if_odd:nT { \CTEX@section@numbering } - { \CTEXthesection\hspace{0.5\ccwd} } + { \eb@mark@section@label } }#1 }, subsec-mark .cs_set:Np = \eb_fancyhf_subsection_mark:n #1, @@ -1391,9 +1400,15 @@ \int_compare:nNnT { \c@secnumdepth } > { 1 } { \int_if_odd:nT { \CTEX@subsection@numbering } - { \CTEXthesubsection\hspace{0.5\ccwd} } + { \eb@mark@subsection@label } }#1 }, + chap-label .tl_set:N = \eb@mark@chapter@label, + chap-label .initial:n = \CTEXthechapter\hspace{\ccwd}, + sec-label .tl_set:N = \eb@mark@section@label, + sec-label .initial:n = \CTEXthesection\hspace{0.5\ccwd}, + subsec-label .tl_set:N = \eb@mark@subsection@label, + subsec-label .initial:n = \CTEXthesubsection\hspace{0.5\ccwd}, headrule .tl_gset:N = \headrule, headrule .initial:n = diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 2e2c1c01c6..a589705c1e 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf index 58941454e4..4e6cef7423 100644 Binary files a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf and b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf index f367a69313..4a4492ba6d 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf index 97d7d22999..edcc2bf125 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf index 47ab50100e..87fcfccdb0 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf and b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf index bb3d9bba37..3b5e5715b7 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-tabular.pdf and b/macros/latex/contrib/reledmac/examples/1-tabular.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf index d93476179b..c833b9f6ae 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf and b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf index 68530611ee..382ba54302 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses.pdf and b/macros/latex/contrib/reledmac/examples/1-verses.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf index 73b2037b68..319e83f2ea 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf and b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf index d624b0e021..a407c54f18 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf and b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf index a3006e631c..d66bb8eda8 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf and b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf index 22e4df2e14..c75e366e1a 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf and b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf index ca44a14887..471a7a233d 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-indexing.pdf and b/macros/latex/contrib/reledmac/examples/2-indexing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf index 6812d6357c..0561b50d0d 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf and b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf index d66cd97cf6..4cdceb5b2e 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf and b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf index 1419420db7..5fd637fe57 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf and b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf index c4167e889a..494cc2fa3c 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf and b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf index f6e6357404..3237be4be1 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf and b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf index 92303f68a8..e7c505a201 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf index 6ca8890883..65d17ca2e9 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-performances.pdf and b/macros/latex/contrib/reledmac/examples/2-performances.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf index 709761b7b5..62a3ac3b45 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf and b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf index 871639bfac..60abd860ab 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf and b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 8b3c00fbcd..113a237956 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf index ba12c539f1..ff5d2b97c7 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf index 4565ff9184..a7fd40a1ea 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf index 7be2ba4d63..a963695d7c 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index 2434009585..c47c522bb4 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index f855b81f3c..33b19d76f6 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf index d86378d280..4b48dcc44c 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf index c678e20f35..4883912f88 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf index feed6e27ea..6dab47543e 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf index d92e07ab7e..08c01a94bf 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf index ccdc5625ae..7d1d97c5c1 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf index 08f0836796..4f5cf3ccf6 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf index c8f8f491f2..40df495e5a 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index e780168dc8..3bd111bac9 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index 5c14beb4be..7c5e7413e5 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf index 298a355d76..5b42775a42 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index 041a6fbfcf..c8b8d81cf9 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf index 886682aff9..5f21322ee8 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 7dec0ce091..4ac56fd5c9 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf index dc46aa0994..f328cc61d3 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index 21d81aaa9e..842a706a28 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index 7117f720c5..2b2f02ecbb 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index 0b26375b32..353ab235fa 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index b022878627..23415e60b4 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf index 20819048e6..32008aee75 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf index 779bd5474a..6800d46fac 100644 Binary files a/macros/latex/contrib/reledmac/migration.pdf and b/macros/latex/contrib/reledmac/migration.pdf differ diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 5fe0382656..dd6a6f39c0 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -580,7 +580,12 @@ % \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.} % \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\cs{Xstanzaonlyfirst}.} % \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\option{parapparatus} option and nested \protect\cs{edtext}.} -% \changes{v2.37.1}{2021/04/04}{Fix bug with \protect\cs{Xgroupbyline} and two or three columns notes.} +% \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\cs{Xgroupbyline} and two or three columns notes.} +% \changes{v2.38.0}{2021/05/30}{Fix indent bugs with stanza and right-to-left typesetting.} +% \changes{v2.38.0}{2021/05/30}{Fix bug with \protect\cs{lemma} and right-to-left typesetting with \protect\XeLaTeX.} +% \changes{v2.38.0}{2021/05/30}{Add hyperlinks between footnote and lemma when using abbreviated line range.} +% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.} +% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -2394,6 +2399,8 @@ % \paragraph{For critical notes} % \DescribeMacro{\Xtxtbeforenumber} % \cs{Xtxtbeforenumber}\oarg{s}\marg{txt} allows the insertion of \meta{txt} before the line number only when the line number is printed, so taking into account \cs{Xnumberonlyfirstinline} and the like. +% \DescribeMacro{\Xbeforepagenumber} +% \cs{Xbeforepagenumber}\oarg{s}\marg{txt} allows the insertion of \meta{txt} before the page number only when the page number is printed, so when a note spans across two or more pages and the lineation is by page. % \paragraph{For endnotes}\label{pagelineendnotes} % \DescribeMacro{\Xendbeforepagenumber} % \cs{Xendbeforepagenumber}\oarg{s}\marg{text} defines the text before the page number in endnotes. Default value is \verb+p.+ (\enquote{p} followed by a dot). @@ -2457,6 +2464,13 @@ % % \DescribeMacro{\Xendnonumber} \protect\cs{Xendnonumber}\oarg{s} is the same for endnotes. % +% \subsubsection{Disabling page number printing} +% \DescribeMacro{\Xnopagenumberifcurrent}% +% When we use a lineation by page, \macpackage checks if a lemma spans across two page. In this case, it prints the starting end ending page number. +% +% Many times, one of these two page numbers is also the current page number. +% +% In this case, it is possible to disable page number printing, using \cs{Xnopagenumberifcurrent}\oarg{s}. % \subsubsection{Printing pstart number} % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{Xpstart} and \protect\cs{Xonlypstart}} % \changes{v1.18.0}{2015/02/23}{Add \protect\cs{Xpstarteverytime}} @@ -2494,16 +2508,6 @@ % Default value is empty. % % \DescribeMacro{Xstanzaonlyfirst} You can use \cs{Xstanzaonlyfirst}\oarg{s} to print the stanza number only the first time it appears in the apparatus. -% \subsubsection{Disabling line number printing} -% Sometime, we want to print only the stanza or pstart number, but not the line number. -% \DescribeMacro{\Xnolinenumber} -% \DescribeMacro{\Xendnolinenumber} -% The \cs{Xnolinenumber}\oarg{s} macro disables line number printing for critical footnotes. -% -% The \cs{Xendnolinenumber} macro does the same for endnotes. -% -% Note that contrary to \cs{Xnonumber} and \cs{Xnoendnum}, the page/pstartannotation will be printed, if required. -% % \subsubsection{Options for line number annotations}\label{annotation-inapparatus} % \DescribeMacro{\Xlinenumannotationonlyfirst} % By default, the line number annotation (\reff{annotation}) is printed in every note. If you want to print it only the first time for a given annotation @@ -2711,15 +2715,15 @@ % \subsubsection{For all notes} % \DescribeMacro{\Xnotefontsize} % \protect\cs{Xnotefontsize}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \DescribeMacro{\notefontsizeX} % \protect\cs{notefontsizeX}\oarg{s}\marg{command} is used to define the font size of familiar footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \DescribeMacro{\Xendnotefontsize} % \protect\cs{Xendnotefontsize}\oarg{s}\marg{l} is used to define the font size of end critical footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \subsection{Wrapping notes} % \subsubsection{Wrapping lemmas} @@ -4471,7 +4475,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/04/04 v2.37.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/05/30 v2.38.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8265,21 +8269,33 @@ % With \XeLaTeX, you must track whether the language reads left to right (English) or right to left (Arabic). \reledmac defines an \cs{if@RTL} boolean test is not already defined. % \begin{macrocode} \if@RTL% + \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {000}% + {}% + {% + \ifnumequal% + {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}% + {}% + {\write@lemma}% + }% \flag@start@RTL% + \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {000}% + {}% + {% + \ifnumequal% + {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}% + {\write@lemma}% + {}% + }% \else% \flag@start% + \write@lemma% \fi% % \end{macrocode} % We write in the numbered file wether the current \protect\cs{edtext} has a \protect\cs{lemma} in the the second argument. -% \begin{macrocode} - \if@lemmacommand@% - \ifledRcol% - \write\linenum@outR{\string\@lemma}% - \else% - \write\linenum@out{\string\@lemma}% - \fi% - \fi% -% \end{macrocode} % Finally, we are ready to admit the first argument into the current % paragraph. % @@ -8458,14 +8474,25 @@ % \end{macro} % % \begin{macro}{\@lemma} +% \begin{macro}{\write@lemma} % The \protect\cs{@lemma} is written in the numbered file to set which \protect\cs{edtext} has an % \protect\cs{lemma} as second argument. % \begin{macrocode} \newcommand{\@lemma}{% \booltrue{lemmacommand@\the\@edtext@level}% }% +\newcommand{\write@lemma}{% + \if@lemmacommand@% + \ifledRcol% + \write\linenum@outR{\string\@lemma}% + \else% + \write\linenum@out{\string\@lemma}% + \fi% + \fi% +}% % \end{macrocode} % \end{macro} +% \end{macro} % \begin{macro}{\if@lemmacommand@} % \changes{v1.15.0}{2015/01/12}{New boolean \protect\cs{iflemmacommand@}.} % This boolean is set to TRUE inside a \protect\cs{edtext} (or \protect\cs{critext}) when a \protect\cs{lemma} command is called. @@ -9572,11 +9599,10 @@ % \begin{macro}{\ledllfill} % \begin{macro}{\ledrlfill} % These macros are called at the left (\protect\cs{ledllfill}) and the right -% (\protect\cs{ledllfill}) of each numbered line. The initial definitions -% correspond to the original code for \protect\cs{do@line}. +% (\protect\cs{ledllfill}) of each numbered line. % \begin{macrocode} -\newcommand*{\ledllfill}{\hfil} -\newcommand*{\ledrlfill}{} +\newcommand*{\ledllfill}{\unless\if@RTL\hfil\fi}% +\newcommand*{\ledrlfill}{\if@RTL\hfil\fi}% % \end{macrocode} % \end{macro} @@ -12669,7 +12695,7 @@ {\numdef{\tmp}{0}}% \istwofollowinglines@false% \ifnumequal{#4-#2}{1}% - {\istwofollowinglines@true}% + {\istwofollowinglines@true}%% {\ifbypage@% \ifnumequal{#3-#1}{1}% {% @@ -12685,6 +12711,7 @@ % \end{macro} % % \begin{macro}{\printlines} +% \begin{macro}{\printlines@count} % \changes{v2.5.0}{2015/11/13}{\protect\cs{printlines} takes an eighth argument: the line flag} % So, we have decided which part of line number sets will be printed depending on these values. % Now we are ready to print them. @@ -12692,7 +12719,9 @@ % \changes{v0.15.0}{2012/06/11}{Line numbering can be reset at each pstart.} % Arguments are 1) start page number 2) start line number 3) start subline number 4) end page number 5) end line number 6) end subline number 7) font specification 8) side flag % \begin{macrocode} +\newcount\printlines@count% \def\printlines#1|#2|#3|#4|#5|#6|#7|#8|{% + \global\advance\printlines@count by 1% \begingroup% % \end{macrocode} % Decide which part of line number components we will print. @@ -12712,11 +12741,28 @@ \ifcsstring{Xlinenumannotationposition@\@currentseries}{before}% {\@annot@start@print}% {}% +% \end{macrocode} +% Sometime, we need to print the page number. +% However, if both the current page is equal to the page number and we use \cs{Xnopagenumberifcurrent}, we do not want to print it. +% To determine the current page, we need to use crossref mechanism. See \url{https://tex.stackexchange.com/a/239457/7712} for explanation. +% \begin{macrocode} \ifl@d@pnum% - \wrap@edcrossref{\@this@crossref@start}{#1}% - \ifl@d@Xlinenumber% - \csuse{Xpagelinesep@\@currentseries}% - \fi% + \iftoggle{Xnopagenumberifcurrent@\@currentseries}{% + \edlabel{printlines@\the\printlines@count}% + }{}% + \ifboolexpr{% + not test{\ifnumequal{\xpageref{printlines@\the\printlines@count}}{#1}}% + or not togl{Xnopagenumberifcurrent@\@currentseries}% + }% + {% + \csuse{Xbeforepagenumber@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{% + #1% + }% + \ifl@d@Xlinenumber% + \csuse{Xpagelinesep@\@currentseries}% + \fi% + }{}% \fi% \ifl@d@Xlinenumber% \wrap@edcrossref{\@this@crossref@start}{% @@ -12744,9 +12790,9 @@ \ifl@d@Xtwolines% \ifl@d@Xlinenumber% \ifl@d@Xmorethantwolines% - \csuse{Xmorethantwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xmorethantwolines@\@currentseries}}% \else% - \csuse{Xtwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xtwolines@\@currentseries}}% \fi% \fi% \else% @@ -12761,8 +12807,16 @@ {\@annot@end@print}% {}% \ifl@d@pnum% - \wrap@edcrossref{\@this@crossref@end}{#4}% - \csuse{Xpagelinesep@\@currentseries}% + \ifboolexpr{% + not test{\ifnumequal{\xpageref{printlines@\the\printlines@count}}{#4}}% + or not togl{Xnopagenumberifcurrent@\@currentseries}% + }{% + \csuse{Xbeforepagenumber@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{% + #4% + }% + \csuse{Xpagelinesep@\@currentseries}% + }{}% \fi% \ifl@d@Xlinenumber% \ifl@d@elin% @@ -12790,6 +12844,7 @@ }% % \end{macrocode} % \end{macro} +% \end{macro} % \subsubsection{Footnote grouped by line} % \begin{macro}{\prepare@Xgroupbyline} % \cs{prepare@Xgroupbyline} is a macro called on the \cs{meta{XXX}vfootnote} if \cs{Xgroupbyline} is set to true, instead of calling \cs{insert} directly. @@ -14870,9 +14925,9 @@ \ifl@d@Xtwolines% \ifl@d@Xendlinenumber% \ifl@d@Xmorethantwolines% - \csuse{Xendmorethantwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xendmorethantwolines@\@currentseries}}% \else% - \csuse{Xendtwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xendtwolines@\@currentseries}}% \fi% \fi% \else% @@ -15069,6 +15124,8 @@ \newtoggle{Xnolinenumberifannotation@#1}% \csgdef{Xbeforenumber@#1}{0pt}% \csgdef{Xtxtbeforenumber@#1}{}% + \newtoggle{Xnopagenumberifcurrent@#1}% + \csgdef{Xbeforepagenumber@#1}{}% \csgdef{Xafternumber@#1}{0.5em}% \newtoggle{Xnonbreakableafternumber@#1}% \csgdef{Xbeforesymlinenum@#1}{\csuse{Xbeforenumber@#1}}% @@ -15821,6 +15878,8 @@ \newhookcommand@series{Xsymlinenumannotation}% \newhookcommand@series{Xbeforenumber} \newhookcommand@series{Xtxtbeforenumber} + \newhooktoggle@series{Xnopagenumberifcurrent}% + \newhookcommand@series{Xbeforepagenumber}% \newhookcommand@series{Xafternumber} \newhookcommand@series{Xbeforesymlinenum} \newhookcommand@series{Xaftersymlinenum} @@ -19219,10 +19278,14 @@ }% }% }% -\xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock - \hangindent\expandafter - \noexpand\csname sza@0@\endcsname\stanzaindentbase - \hangafter\@ne} + +\def\stanza@hang{% + \leavevmode\startlock% + \hangindent\if@RTL-\fi\expandafter% + \csname sza@0@\endcsname\stanzaindentbase% + \hangafter\@ne% +}% + \def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname \ifnum\count@>\@M\advance\count@-\@M\penalty-\else \penalty\fi\count@} @@ -19273,8 +19336,14 @@ \def\noexpand\stanza@hang{\unexpanded{\leavevmode\null}}% \let\noexpand\endlock\relax% \noexpand\else% - \interlinepenalty% - \@M\rightskip\z@ plus 1fil\relax% + \interlinepenalty\@M% + \unexpanded{% + \ifboolexpr{bool {@RTL} and bool{xetex}}{% + \leftskip\z@ plus 1fil\relax% + }{% + \rightskip\z@ plus 1fil\relax% + }% + }% \noexpand\fi% \noexpand\ifnum\expandafter\noexpand\csname szp@0@\endcsname=\z@% \let\noexpand\sza@penalty% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf index 60151a3fbc..0e3ba600ed 100644 Binary files a/macros/latex/contrib/reledmac/reledmac.pdf and b/macros/latex/contrib/reledmac/reledmac.pdf differ diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf index cee0c73ade..ed94a2657e 100644 Binary files a/macros/latex/contrib/reledmac/reledpar.pdf and b/macros/latex/contrib/reledmac/reledpar.pdf differ -- cgit v1.2.3