From 059925fc0cab13a83a74089aeee51f4b09bbd914 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 19 Apr 2024 03:00:56 +0000 Subject: CTAN sync 202404190300 --- macros/latex/contrib/acmart/README | 2 + macros/latex/contrib/acmart/acmart.dtx | 7 +- macros/latex/contrib/acmart/acmart.pdf | Bin 918804 -> 918998 bytes macros/latex/contrib/acmart/acmguide.pdf | Bin 439778 -> 439778 bytes .../latex/contrib/acmart/samples/sample-acmcp.pdf | Bin 214495 -> 214495 bytes .../contrib/acmart/samples/sample-acmengage.pdf | Bin 400681 -> 400681 bytes .../contrib/acmart/samples/sample-acmlarge.pdf | Bin 611542 -> 611542 bytes .../acmart/samples/sample-acmsmall-biblatex.pdf | Bin 634239 -> 634239 bytes .../acmart/samples/sample-acmsmall-conf.pdf | Bin 1056847 -> 1056847 bytes .../acmart/samples/sample-acmsmall-submission.pdf | Bin 624039 -> 624039 bytes .../contrib/acmart/samples/sample-acmsmall.pdf | Bin 621531 -> 621531 bytes .../contrib/acmart/samples/sample-acmtog-conf.pdf | Bin 569299 -> 569299 bytes .../latex/contrib/acmart/samples/sample-acmtog.pdf | Bin 569061 -> 569061 bytes .../contrib/acmart/samples/sample-manuscript.pdf | Bin 623030 -> 623030 bytes .../acmart/samples/sample-sigconf-authordraft.pdf | Bin 1048753 -> 1048751 bytes .../acmart/samples/sample-sigconf-biblatex.pdf | Bin 622065 -> 622065 bytes .../contrib/acmart/samples/sample-sigconf-i13n.pdf | Bin 1060242 -> 1060242 bytes .../contrib/acmart/samples/sample-sigconf.pdf | Bin 1044964 -> 1044964 bytes .../contrib/acmart/samples/sample-sigplan.pdf | Bin 1053423 -> 1053423 bytes macros/latex/contrib/thesis-ekf/thesis-ekf.dtx | 21 ++- macros/latex/contrib/thesis-ekf/thesis-ekf.pdf | Bin 200001 -> 199974 bytes macros/latex/contrib/ufrgscca/README.md | 5 +- macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf | Bin 593642 -> 593736 bytes macros/latex/contrib/ufrgscca/doc/ufrgscca.tex | 4 +- .../latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty | 10 +- .../contrib/ufrgscca/latex/ufrgscca-base-en.def | 2 +- .../contrib/ufrgscca/latex/ufrgscca-base-ptBR.def | 2 +- .../contrib/ufrgscca/latex/ufrgscca-coord.sty | 10 +- .../latex/contrib/ufrgscca/latex/ufrgscca-core.sty | 13 +- .../contrib/ufrgscca/latex/ufrgscca-cover-ptBR.tex | 2 +- .../contrib/ufrgscca/latex/ufrgscca-cover.sty | 15 +- .../latex/contrib/ufrgscca/latex/ufrgscca-curr.sty | 23 +-- .../contrib/ufrgscca/latex/ufrgscca-forms.sty | 19 +- .../contrib/ufrgscca/latex/ufrgscca-forms.tex | 145 ++++++--------- .../contrib/ufrgscca/latex/ufrgscca-lists.sty | 10 +- .../latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty | 10 +- .../contrib/ufrgscca/latex/ufrgscca-terms-en.tex | 2 +- .../contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex | 2 +- macros/latex/contrib/ufrgscca/latex/ufrgscca.cls | 24 ++- macros/luatex/latex/lua-typo/README.md | 4 + macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf | Bin 16859 -> 16859 bytes macros/luatex/latex/lua-typo/doc/lua-typo-fr.pdf | Bin 107762 -> 107094 bytes macros/luatex/latex/lua-typo/doc/lua-typo.pdf | Bin 215391 -> 215208 bytes macros/luatex/latex/lua-typo/source/lua-typo.dtx | 196 ++++++++++++--------- 44 files changed, 282 insertions(+), 246 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 9ed398e5aa..22919f31f8 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -12,6 +12,8 @@ The production version is the one on CTAN and ACM sites. Changes +Version 2.07. Corrected typo in TELO eISSN. + Version 2.06. Added eISSN for a number of journals. ACM no longer collects or prints authors' postal addresses diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index 8516651ee4..baebaccaab 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -2262,7 +2262,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2024/04/13 v2.06 Typesetting articles for the Association for Computing Machinery] +[2024/04/17 v2.07 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -4346,6 +4346,7 @@ % \changes{1.90}{2023/03/30}{Added TOPML eISSN} % \changes{2.05}{2024/04/04}{New data for TELO} % \changes{2.06}{2024/04/13}{Added eISSN for a number of journals} +% \changes{2.07}{2024/04/17}{Another change for TELO} % % We use the |xkeyval| interface to define journal titles and the relevant % information @@ -4619,8 +4620,8 @@ \or % TELO \def\@journalName{ACM Transactions on Evolutionary Learning and Optimization}% \def\@journalNameShort{ACM Trans. Evol. Learn. Optim.}% - \def\@permissionCodeOne{2688-3007}% - \def\@permissionCodeTwo{2345-6789}% + \def\@permissionCodeOne{2688-299X}% + \def\@permissionCodeTwo{2688-3007}% \or % THRI \def\@journalName{ACM Transactions on Human-Robot Interaction}% \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}% diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf index 6968505073..c19fdf3a8b 100644 Binary files a/macros/latex/contrib/acmart/acmart.pdf and b/macros/latex/contrib/acmart/acmart.pdf differ diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf index 79d2c75930..bd2ce2d7ba 100644 Binary files a/macros/latex/contrib/acmart/acmguide.pdf and b/macros/latex/contrib/acmart/acmguide.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf index 248ec92fda..3f02d1ac9c 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf and b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf index 4f27c502b3..aa7fea6b41 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf and b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf index d40c026b0b..2637448012 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf and b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf index 68416d9b6d..dce1688580 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf index a41acf251c..f4fd622fcf 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf index 2ae43840f3..4086b70e26 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf index 25671b661e..6c3fbbb20a 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf index 750a6f6221..5493a7abf7 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf and b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf index dfe07e0656..be5a4b8e1c 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf and b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf index a0be04191c..a594aaec45 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf and b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf index d27c922559..87c7559042 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf index e763de031c..26d05c90b6 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf index 76c620139f..4404065b41 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf index 1f2896d691..a29449278f 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf index 4d19efa089..7edc0c62bd 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf and b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf differ diff --git a/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx b/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx index 5c97dbe0ea..b8e38e8f7d 100644 --- a/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx +++ b/macros/latex/contrib/thesis-ekf/thesis-ekf.dtx @@ -20,7 +20,7 @@ \ProvidesFile{thesis-ekf.dtx} % %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesClass{thesis-ekf}[2024/04/14 v4.4 Thesis class for Eszterhazy Karoly Catholic University (Eger, Hungary)] +%\ProvidesClass{thesis-ekf}[2024/04/18 v4.5 Thesis class for Eszterhazy Karoly Catholic University (Eger, Hungary)] % %<*driver> \documentclass[nohyperref]{ltxdoc} @@ -62,7 +62,7 @@ % Right brace \} Tilde \~} % % \GetFileInfo{thesis-ekf.cls} -% \title{Thesis class for\\ Eszterházy Károly Catholic University\\\textsf{thesis-ekf.cls}\\[2mm]{\normalsize v4.4 (2024/04/14)}} +% \title{Thesis class for\\ Eszterházy Károly Catholic University\\\textsf{thesis-ekf.cls}\\[2mm]{\normalsize v4.5 (2024/04/18)}} % \author{Tibor Tómács\\{\normalsize\href{mailto:tomacs.tibor@gmail.com}{\texttt{tomacs.tibor@gmail.com}}}} % \date{} % \maketitle @@ -98,7 +98,6 @@ % \item[lmodern] Latin Modern fontkészlethez. |times| opció esetén nem töltődik be. % \item[fixcmex] Latin Modern fontkészlet esetén a nagy operátor jeleket méretezhetővé teszi. |times| opció esetén nem töltődik be. % \item[cmupint] Latin Modern fontkészlet esetén az integráljelek álló alakúak. Csak az |upint| és |times=false| opciók esetén töltődik be. -% \item[etoolbox] Dokumentumkapcsokhoz. % \item[setspace] Sortávolság beállításához. % \item[graphicx] Képek betöltéséhez. % \item[newtxtext] Times fontkészlethez. |times| opció esetén töltődik be. @@ -448,14 +447,16 @@ \RequirePackage{cmupint} \fi \fi -\RequirePackage{etoolbox,graphicx,iftex} +\RequirePackage{graphicx,iftex} \onehalfspacing -\AtEndPreamble{ +\AddToHook{begindocument/before}{ + \ifthesisekf@times \RequirePackage{newtxtext,newtxmath} \fi + \ifx\thesisekf@fontsize\@empty \else \ifx\thesisekf@fontsize\thesisekf@ten @@ -469,10 +470,12 @@ \fi \fi \fi + \RequirePackage{upquote} + } -\AfterEndPreamble{ +\AddToHook{begindocument/end}{ \ifthesisekf@tocnopagenum \hypersetup{pageanchor=false} @@ -539,6 +542,8 @@ \if@thesisekf@nochanged@authorcaption@% \@ifundefined{l@magyar}{}{% \iflanguage{magyar}{\gdef\thesisekf@authorcaption{K\'{e}sz\'{\i}tette}}{}}% + \@ifundefined{l@hungarian}{}{% + \iflanguage{hungarian}{\gdef\thesisekf@authorcaption{K\'{e}sz\'{\i}tette}}{}}% \@ifundefined{l@ngerman}{}{% \iflanguage{ngerman}{\gdef\thesisekf@authorcaption{Autor}}{}}% \@ifundefined{l@german}{}{% @@ -548,6 +553,8 @@ \if@thesisekf@nochanged@supervisorcaption@% \@ifundefined{l@magyar}{}{% \iflanguage{magyar}{\gdef\thesisekf@supervisorcaption{T\'{e}mavezet\H{o}}}{}}% + \@ifundefined{l@hungarian}{}{% + \iflanguage{hungarian}{\gdef\thesisekf@supervisorcaption{T\'{e}mavezet\H{o}}}{}}% \@ifundefined{l@ngerman}{}{% \iflanguage{ngerman}{\gdef\thesisekf@supervisorcaption{Betreuer}}{}}% \@ifundefined{l@german}{}{% @@ -557,6 +564,8 @@ \if@thesisekf@nochanged@logo@% \@ifundefined{l@magyar}{}{% \iflanguage{magyar}{\if@thesisekf@exists@logo@hu@\gdef\thesisekf@logo{\includegraphics{eszterhazy-logo-hu}}\fi}{}}% + \@ifundefined{l@hungarian}{}{% + \iflanguage{hungarian}{\if@thesisekf@exists@logo@hu@\gdef\thesisekf@logo{\includegraphics{eszterhazy-logo-hu}}\fi}{}}% \@ifundefined{l@ngerman}{}{% \iflanguage{ngerman}{\if@thesisekf@exists@logo@de@\gdef\thesisekf@logo{\includegraphics{eszterhazy-logo-de}}\fi}{}}% \@ifundefined{l@german}{}{% diff --git a/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf b/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf index 1e4539c51b..9921d23d23 100644 Binary files a/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf and b/macros/latex/contrib/thesis-ekf/thesis-ekf.pdf differ diff --git a/macros/latex/contrib/ufrgscca/README.md b/macros/latex/contrib/ufrgscca/README.md index 7c4834e2e7..1e45a066dc 100644 --- a/macros/latex/contrib/ufrgscca/README.md +++ b/macros/latex/contrib/ufrgscca/README.md @@ -107,7 +107,10 @@ The Current Maintainer of this work is Alceu Frigeri ## Changelog -* Version 2.8 (this) +* Version 2.9 (this) + - fixing the use of \pdfbookmark after the last hyperref/kernel update (which broke the \MakeForms command). + +* Version 2.8 - code speedup thanks to 'linked' property lists. Code now relies on a more recent l3kernel. * Version 2.7 diff --git a/macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf b/macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf index b0f6dcc88a..6e884521a3 100644 Binary files a/macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf and b/macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf differ diff --git a/macros/latex/contrib/ufrgscca/doc/ufrgscca.tex b/macros/latex/contrib/ufrgscca/doc/ufrgscca.tex index c230090a62..c008210f0a 100644 --- a/macros/latex/contrib/ufrgscca/doc/ufrgscca.tex +++ b/macros/latex/contrib/ufrgscca/doc/ufrgscca.tex @@ -15,7 +15,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -873,7 +873,7 @@ Please note that those '-I' regards TCC-I, while '-II' regards TCC-II. \tsmacro{\SetForm}{form-hash,field,code} \tsmacro{\MakeForm}{form-hash} \end{codesyntax} -\tsobj{\SetForm} can be used to set new forms (or redefine existent ones). \tsobj[meta]{form-hash} being a free identifier. Possible \tsobj[meta]{field} values are \tsobj[key]{heading,title,opening,body,closing,footnone}. \tsobj{\MakeForm} typesets the selected form. +\tsobj{\SetForm} can be used to set new forms (or redefine existent ones). \tsobj[meta]{form-hash} being a free identifier. Possible \tsobj[meta]{field} values are \tsobj[key]{top,heading,bookmark,title,opening,body,closing,footnone}. \tsobj{\MakeForm} typesets the selected form. \end{codedescribe} diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty index 7be544b628..c76d001e5e 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-abnt} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA ABNT layout} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-abnt} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ abnt~layout} } \cs_if_exist:NF \PkgInfo diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-en.def b/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-en.def index 281a093f06..e1f43799f5 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-en.def +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-en.def @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-ptBR.def b/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-ptBR.def index 5eea80143b..dab82b1098 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-ptBR.def +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-base-ptBR.def @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty index f487134fef..e00d211894 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-coord} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA coord commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-coord} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ coordination~ report~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-core.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-core.sty index 17235f5ed3..e02cc14418 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-core.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-core.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-core} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA core commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-core} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~core~commands/data} } \cs_if_exist:NF \PkgInfo @@ -239,6 +239,7 @@ \prop_new_linked:N \l__ufrgscca_forms_prop + \starray_new:n {activity} \starray_def_from_keyval:nn {activity} { @@ -565,7 +566,7 @@ { last = {#3} , first = {#4} , - name = {#2~#4~ #3} , + name = {#2~ #4~ #3} , } } \__ufrgscca_setgender:nn {student.#1}{#5} diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover-ptBR.tex b/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover-ptBR.tex index 9193806500..f3d2fdaefb 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover-ptBR.tex +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover-ptBR.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty index 8ab5c32e66..f9ce37854b 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-cover} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA cover commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-cover} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ cover~pages} } \cs_if_exist:NF \PkgInfo @@ -93,7 +93,10 @@ \NewDocumentCommand{\MakeCoverPages}{m} { \__ufrgscca_student_emptyfields_if_none: - \seq_set_from_clist:Ne \l__ufrgscca_tmp_seq {\prop_item:Nn \l__ufrgscca_coverpages_prop {#1.clist} } +% \seq_set_from_clist:Ne \l__ufrgscca_tmp_seq {\prop_item:Nn \l__ufrgscca_coverpages_prop {#1.clist} } + + \prop_get:NnN \l__ufrgscca_coverpages_prop {#1.clist} \l_tmpa_tl + \seq_set_from_clist:Ne \l__ufrgscca_tmp_seq {\l_tmpa_tl } \seq_map_inline:Nn \l__ufrgscca_tmp_seq { diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-curr.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-curr.sty index 1ae0a418a3..97a0f6148c 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-curr.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-curr.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-curr} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA curricula commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-curr} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ curricula~ commands} } \cs_if_exist:NF \PkgInfo @@ -358,7 +358,7 @@ %% Pre-reqs \bool_gset_false:N \l__ufrgscca_tmp_second_bool - \starray_iterate_over:nn {curricula.sem.class.prereqset} + \starray_iterate_over:nnTF {curricula.sem.class.prereqset} { \seq_gclear:N \l__ufrgscca_tmp_prereq_seq \starray_iterate_over:nnTF {curricula.sem.class.prereqset.prereq} @@ -380,6 +380,9 @@ } } } + {} + {} + \starray_get_prop:nnN {curricula.sem.class}{obs} \l__ufrgscca_tmp_obs_tl \tl_if_empty:NF \l__ufrgscca_tmp_obs_tl { @@ -636,9 +639,9 @@ \draw ( \fp_use:N \l__ufrgscca_tmp_posX_fp , \fp_eval:n {\l__ufrgscca_tmp_pos_tl * \l__ufrgscca_graph_deltaY_fp - 1.25 * \l__ufrgscca_graph_deltaY_fp} ) node[disc,\l__ufrgscca_graph_color_tl](\l__ufrgscca_tmp_name_tl) {\l__ufrgscca_tmp_name_tl \nodepart{lower} \l__ufrgscca_tmp_cred_tl ~\ ~créd.};% - \starray_iterate_over:nn {curricula.sem.class.prereqset} + \starray_iterate_over:nnTF {curricula.sem.class.prereqset} { - \starray_iterate_over:nn {curricula.sem.class.prereqset.prereq} + \starray_iterate_over:nnTF {curricula.sem.class.prereqset.prereq} { \starray_get_prop:nnN {curricula.sem.class.prereqset.prereq}{starred} \l__ufrgscca_tmp_starred_bool \bool_if:NF \l__ufrgscca_tmp_starred_bool @@ -686,8 +689,8 @@ } \path[dep,\l__ufrgscca_graph_color_tl] (\l__ufrgscca_tmp_prereq_name_tl)edge[out=\l__ufrgscca_angOUT_tl,in=\l__ufrgscca_angIN_tl] (\l__ufrgscca_tmp_name_tl); } - } - } + }{}{} %iterate over:TF prereq + }{}{} %iterate over:TF prereqset } diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty index c22bee9a44..7a45554dd3 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-forms} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA forms commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-forms} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ forms~commands} } \cs_if_exist:NF \PkgInfo @@ -257,6 +257,9 @@ \prop_put:Nnn \l__ufrgscca_forms_prop {#1.#2}{#3} } +\NewDocumentCommand{\SetFormX}{mm+m}{ + \prop_put:Nne \l__ufrgscca_forms_prop {#1.#2}{#3} +} %%% % Those variables below are used to set bookmarks at the many forms @@ -266,6 +269,9 @@ \tl_new:N \ReviewerBookMarkTL \bool_new:N \l__ufrgscca_emptyforms_bool +\tl_new:N \l__ufrgscca_booktmp_a_tl +\tl_new:N \l__ufrgscca_booktmp_b_tl + \NewDocumentCommand{\MakeForm}{m} { \begin{center} \noindent @@ -276,6 +282,9 @@ \prop_get:NnNTF \l__ufrgscca_forms_prop {#1.top} \l_tmpa_tl { \l_tmpa_tl } { \UseTerm{cover.topbase}\\ } + \prop_get:NnNTF \l__ufrgscca_forms_prop {#1.bookmark} \l_tmpa_tl + { \l_tmpa_tl } + {} \prop_get:NnNTF \l__ufrgscca_forms_prop {#1.heading} \l_tmpa_tl { {\sc \l_tmpa_tl}\\[6mm] } { \par\vspace{5mm} } diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.tex b/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.tex index 141f97a4fe..e0fcad5038 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.tex +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -34,6 +34,7 @@ \tl_new:N \tmpTabG \tl_new:N \tmpTabMult \tl_new:N \tmpTabAll + \tl_new:N \tmpBookMark \ExplSyntaxOff @@ -49,9 +50,8 @@ %%%%%%%%%%%%%%% %% req form - Internship %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{internshiprequest}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.internrequestform}}{\UseTerm{book.internrequestform}}} -\ExplSyntaxOff +\SetForm{internshiprequest}{heading}{\UseTerm{title.internship}} +\SetForm{internshiprequest}{bookmark}{\PdfTermBookMark{book.internrequestform}} \SetForm{internshiprequest}{title}{\UseTerm{title.requestform}} %%% @@ -100,9 +100,8 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%%%%%%%%%%%%%% %% supervisor`s form - Internship %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{internshipsupervisorform}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.internsupervisorform}}{\UseTerm{book.internsupervisorform}}} -\ExplSyntaxOff +\SetForm{internshipsupervisorform}{heading}{\UseTerm{title.internship}} +\SetForm{internshipsupervisorform}{bookmark}{\PdfTermBookMark{book.internsupervisorform}} \SetForm{internshipsupervisorform}{title}{\UseTerm{title.internsupervisorform}} \SetForm{internshipsupervisorform}{footnote}{\UseTerm{footnote.supervisorsform}} @@ -147,9 +146,8 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%%%%%%%%%%%%%% %% tutor`s form - Internship %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{internshiptutorform}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.interntutorform}}{\UseTerm{book.interntutorform}}} -\ExplSyntaxOff +\SetForm{internshiptutorform}{heading}{\UseTerm{title.internship}} +\SetForm{internshiptutorform}{bookmark}{\PdfTermBookMark{book.interntutorform}} \SetForm{internshiptutorform}{title}{\UseTerm{title.interntutorform}} %%% @@ -197,9 +195,8 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{attendancelist}{heading}{\UseTerm{title.tcc}\exp_args:Nee \pdfbookmark{\UseTerm{book.attendancelist}}{\UseTerm{book.attendancelist}}} -\ExplSyntaxOff +\SetForm{attendancelist}{heading}{\UseTerm{title.tcc}} +\SetForm{attendancelist}{bookmark}{\PdfTermBookMark{book.attendancelist}} \SetForm{attendancelist}{title}{\UseTerm{title.attendancelist}} \SetForm{attendancelist}{opening}{} @@ -224,9 +221,8 @@ Nome do(a) Aluno(a) --- Email\\ %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{calendar-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.calendar-I}}{\UseTerm{book.calendar-I}}} -\ExplSyntaxOff +\SetForm{calendar-I}{heading}{\UseTerm{title.tccI}} +\SetForm{calendar-I}{bookmark}{\PdfTermBookMark{book.calendar-I}} %\SetForm{calendar-I}{heading}{\UseTerm{title.tccI}} \SetForm{calendar-I}{title}{\UseTerm{title.calendar}} @@ -258,11 +254,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{calendar-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.calendar-II}}{\UseTerm{book.calendar-II}}} -\ExplSyntaxOff +\SetForm{calendar-II}{heading}{\UseTerm{title.tccII}} +\SetForm{calendar-II}{bookmark}{\PdfTermBookMark{book.calendar-II}} -%\SetForm{calendar-II}{heading}{\UseTerm{title.tccII}} \SetForm{calendar-II}{title}{\UseTerm{title.calendar}} \SetForm{calendar-II}{opening}{} @@ -306,9 +300,8 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% req form - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{request-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.requestform-I}}{\UseTerm{book.requestform-I}}} -\ExplSyntaxOff +\SetForm{request-I}{heading}{\UseTerm{title.tccI}} +\SetForm{request-I}{bookmark}{\PdfTermBookMark{book.requestform-I}} \SetForm{request-I}{title}{\UseTerm{title.requestform}} \SetForm{request-I}{opening}{ @@ -347,9 +340,8 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% coadvisor - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{coadvisor-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.coadvisorform-I}}{\UseTerm{book.coadvisorform-I}}} -\ExplSyntaxOff +\SetForm{coadvisor-I}{heading}{\UseTerm{title.tccI}} +\SetForm{coadvisor-I}{bookmark}{\PdfTermBookMark{book.coadvisorform-I}} \SetForm{coadvisor-I}{title}{\UseTerm{title.coadvisorform}} \SetForm{coadvisor-I}{opening}{ @@ -393,9 +385,8 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% board approval - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{boardapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.boardapproval-I}}{\UseTerm{book.boardapproval-I}}} -\ExplSyntaxOff +\SetForm{boardapproval-I}{heading}{\UseTerm{title.tccI}} +\SetForm{boardapproval-I}{bookmark}{\PdfTermBookMark{book.boardapproval-I}} \SetForm{boardapproval-I}{title}{\UseTerm{title.boardapproval}} \SetForm{boardapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -423,9 +414,8 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% advisor's approval - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{advisorsapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.advisorapproval-I}}{\UseTerm{book.advisorapproval-I}}} -\ExplSyntaxOff +\SetForm{advisorsapproval-I}{heading}{\UseTerm{title.tccI}} +\SetForm{advisorsapproval-I}{bookmark}{\PdfTermBookMark{book.advisorapproval-I}} \SetForm{advisorsapproval-I}{title}{\UseTerm{title.advisorsapproval-I}} \SetForm{advisorsapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -452,9 +442,8 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% examiner's form - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{examinersform-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.reviewersform-I}}{\UseTerm{book.reviewersform-I}}} -\ExplSyntaxOff +\SetForm{examinersform-I}{heading}{\UseTerm{title.tccI}} +\SetForm{examinersform-I}{bookmark}{\PdfTermBookMark{book.reviewersform-I}} \SetForm{examinersform-I}{title}{\UseTerm{title.reviewersform}} \SetForm{examinersform-I}{footnote}{\UseTerm{footnote.reviewersform}} \SetForm{examinersform-I}{opening}{% @@ -506,9 +495,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% rectify approval - I %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{rectifyapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.rectifyapproval-I}}{\UseTerm{book.rectifyapproval-I}}} -\ExplSyntaxOff +\SetForm{rectifyapproval-I}{heading}{\UseTerm{title.tccI}} +\SetForm{rectifyapproval-I}{bookmark}{\PdfTermBookMark{book.rectifyapproval-I}} \SetForm{rectifyapproval-I}{title}{\UseTerm{title.rectifyapproval}} \SetForm{rectifyapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -550,9 +538,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% req form - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{request-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.requestform-II}}{\UseTerm{book.requestform-II}}} -\ExplSyntaxOff +\SetForm{request-II}{heading}{\UseTerm{title.tccII}} +\SetForm{request-II}{bookmark}{\PdfTermBookMark{book.requestform-II}} \SetForm{request-II}{title}{\UseTerm{title.requestform}} \SetForm{request-II}{opening}{ @@ -603,9 +590,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% coadvisor - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{coadvisor-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.coadvisorform-II}}{\UseTerm{book.coadvisorform-II}}} -\ExplSyntaxOff +\SetForm{coadvisor-II}{heading}{\UseTerm{title.tccII}} +\SetForm{coadvisor-II}{bookmark}{\PdfTermBookMark{book.coadvisorform-II}} \SetForm{coadvisor-II}{title}{\UseTerm{title.coadvisorform}} \SetForm{coadvisor-II}{opening}{ @@ -650,9 +636,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% board approval - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{boardapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.boardapproval-II}}{\UseTerm{book.boardapproval-II}}} -\ExplSyntaxOff +\SetForm{boardapproval-II}{heading}{\UseTerm{title.tccII}} +\SetForm{boardapproval-II}{bookmark}{\PdfTermBookMark{book.boardapproval-II}} \SetForm{boardapproval-II}{title}{\UseTerm{title.boardapproval}} \SetForm{boardapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -686,9 +671,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% advisor's approval - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{advisorsapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.advisorapproval-II}}{\UseTerm{book.advisorapproval-II}}} -\ExplSyntaxOff +\SetForm{advisorsapproval-II}{heading}{\UseTerm{title.tccII}} +\SetForm{advisorsapproval-II}{bookmark}{\PdfTermBookMark{book.advisorapproval-II}} \SetForm{advisorsapproval-II}{title}{\UseTerm{title.advisorsapproval-II}} \SetForm{advisorsapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -715,9 +699,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% receipts - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{receipts-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.receipts-II}}{\UseTerm{book.receipts-II}}} -\ExplSyntaxOff +\SetForm{receipts-II}{heading}{\UseTerm{title.tccII}} +\SetForm{receipts-II}{bookmark}{\PdfTermBookMark{book.receipts-II}} \SetForm{receipts-II}{title}{\UseTerm{title.receipts}} \SetForm{receipts-II}{footnote}{\UseTerm{footnote.receipts}} @@ -748,9 +731,8 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% examiner's form - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{examinersform-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.reviewersform-II}}{\UseTerm{book.reviewersform-II}}} -\ExplSyntaxOff +\SetForm{examinersform-II}{heading}{\UseTerm{title.tccII}} +\SetForm{examinersform-II}{bookmark}{\PdfTermBookMark{book.reviewersform-II}} \SetForm{examinersform-II}{title}{\UseTerm{title.reviewersform}} \SetForm{examinersform-II}{footnote}{\UseTerm{footnote.reviewersform}} @@ -791,9 +773,8 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% examiner's form - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{correctionsform-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.correctionsform-II}}{\UseTerm{book.correctionsform-II}}} -\ExplSyntaxOff +\SetForm{correctionsform-II}{heading}{\UseTerm{title.tccII}} +\SetForm{correctionsform-II}{bookmark}{\PdfTermBookMark{book.correctionsform-II}} \SetForm{correctionsform-II}{title}{\UseTerm{title.correctionsform}} \SetForm{correctionsform-II}{footnote}{\UseTerm{footnote.correctionsform}} @@ -848,9 +829,8 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% rectify approval - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{rectifyapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.rectifyapproval-II}}{\UseTerm{book.rectifyapproval-II}}} -\ExplSyntaxOff +\SetForm{rectifyapproval-II}{heading}{\UseTerm{title.tccII}} +\SetForm{rectifyapproval-II}{bookmark}{\PdfTermBookMark{book.rectifyapproval-II}} \SetForm{rectifyapproval-II}{title}{\UseTerm{title.rectifyapproval}} \SetForm{rectifyapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -988,11 +968,8 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% referall letter- I %%%%%%%%%%%%%%% -%\SetForm{referral-I}{heading}{\UseTerm{title.tccI}} - -\ExplSyntaxOn -\SetForm{referral-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.referral-I}}{\UseTerm{book.referral-I}}} -\ExplSyntaxOff +\SetForm{referral-I}{heading}{\UseTerm{title.tccI}} +\SetForm{referral-I}{bookmark}{\PdfTermBookMark{book.referral-I}} \SetForm{referral-I}{title}{\UseTerm{semester}} \SetForm{referral-I}{opening}{\UseTerm{desc.sacad}} @@ -1042,11 +1019,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% referall letter- II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{referral-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.referral-II}}{\UseTerm{book.referral-II}}} -\ExplSyntaxOff +\SetForm{referral-II}{heading}{\UseTerm{title.tccII}} +\SetForm{referral-II}{bookmark}{\PdfTermBookMark{book.referral-II}} -%\SetForm{referral-II}{heading}{\UseTerm{title.tccII}} \SetForm{referral-II}{title}{\UseTerm{semester}} \SetForm{referral-II}{opening}{\UseTerm{desc.sacad}} @@ -1199,10 +1174,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %% report TCC - I %%%%%%%%%%%%%%% \SetForm{report-I}{top}{} -\ExplSyntaxOn -\SetForm{report-I}{heading}{\vspace*{-5ex}\UseTerm{title.tccI}~ - ~\textbf{\UseTerm{semester}}\exp_args:Nee \pdfbookmark{\UseTerm{book.report-I}}{\UseTerm{book.report-I}}} -\ExplSyntaxOff -%\SetForm{report-I}{title}{} +\SetForm{report-I}{heading}{\vspace*{-5ex}\UseTerm{title.tccI}~ - ~\textbf{\UseTerm{semester}}} +\SetForm{report-I}{bookmark}{\PdfTermBookMark{book.report-I}} + \SetForm{report-I}{preopening}{} %%% @@ -1220,13 +1194,8 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %% report TCC - II %%%%%%%%%%%%%%% \SetForm{report-II}{top}{} -\ExplSyntaxOn -\SetForm{report-II}{heading}{\vspace*{-5ex}\UseTerm{title.tccII}~ - ~\textbf{\UseTerm{semester}}\exp_args:Nee \pdfbookmark{\UseTerm{book.report-II}}{\UseTerm{book.report-II}}} -\ExplSyntaxOff -%\SetForm{report-II}{heading}{\vspace*{-5ex}\UseTerm{title.tccII}~ - ~\textbf{\UseTerm{semester}}} -%\SetForm{report-II}{title}{Relatório Acompanhamento - \UseTerm{semester}} -%\SetForm{report-II}{title}{\vspace*{-2ex}\UseTerm{semester}} -%\SetForm{report-II}{opening}{} +\SetForm{report-II}{heading}{\vspace*{-5ex}\UseTerm{title.tccII}~ - ~\textbf{\UseTerm{semester}}} +\SetForm{report-II}{bookmark}{\PdfTermBookMark{book.report-II}} \SetForm{report-II}{preopening}{} % %%% @@ -1244,11 +1213,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% Boards TCC - II %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{boards}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.boards}}{\UseTerm{book.boards}}} -\ExplSyntaxOff +\SetForm{boards}{heading}{\UseTerm{title.tccII}} +\SetForm{boards}{bookmark}{\PdfTermBookMark{book.boards}} -%\SetForm{boards}{heading}{\UseTerm{title.tccII}} \SetForm{boards}{title}{\UseTerm{board.title}} \SetForm{boards}{opening}{} @@ -1310,11 +1277,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% cocertificate %%%%%%%%%%%%%%% -\ExplSyntaxOn -\SetForm{cocertificate}{heading}{\UseTerm{title.tcc}\exp_args:Nee \pdfbookmark{\UseTerm{book.cocertificate}}{\UseTerm{book.cocertificate}}} -\ExplSyntaxOff +\SetForm{cocertificate}{heading}{\UseTerm{title.tcc}} +\SetForm{cocertificate}{bookmark}{\PdfTermBookMark{book.cocertificate}} -%\SetForm{cocertificate}{heading}{\UseTerm{title.tcc}} \SetForm{cocertificate}{title}{\UseTerm{semester}} \SetForm{cocertificate}{opening}{À quem interessar possa,\\ certificamos que} \SetForm{cocertificate}{body}{% diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty index c6c5ff88a7..9af6195fec 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-lists} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA auxiliary lists commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-lists} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22} , - version .code:n = {2.8} , + date .code:n = {2024/04/17} , + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~Auxiliary~ lists~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty b/macros/latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty index 3b46f85eaa..d0669fee97 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplPackage {ufrgscca-ppc} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA PPC commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-ppc} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~ auxiliary~ PPC-related~ (indicators)~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-en.tex b/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-en.tex index 66bf0efaff..db570d7cfe 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-en.tex +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-en.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex b/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex index 50bc04014e..06c87caa69 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca diff --git a/macros/latex/contrib/ufrgscca/latex/ufrgscca.cls b/macros/latex/contrib/ufrgscca/latex/ufrgscca.cls index 245ac20f40..2c50f893b6 100644 --- a/macros/latex/contrib/ufrgscca/latex/ufrgscca.cls +++ b/macros/latex/contrib/ufrgscca/latex/ufrgscca.cls @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.8} {2024/03/22} +%% This is version {2.9} {2024/04/17} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -27,8 +27,8 @@ \ProvidesExplClass {ufrgscca} - {2024/03/22} - {2.8} + {2024/04/17} + {2.9} {UFRGS/CCA class} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/03/22}, - version .code:n = {2.8} , + date .code:n = {2024/04/17}, + version .code:n = {2.9} , description .code:n = {UFRGS/CCA~a~report~based~class~bundle} } \cs_if_exist:NF \PkgInfo @@ -103,6 +103,20 @@ \prop_if_in:NnTF \l__ufrgscca_terms_prop {#1} {#2} {#3} } +\NewDocumentCommand{\GetTerm}{mm} + { + \prop_get:NnNTF \l__ufrgscca_terms_prop {#1} \l_tmpa_tl + {\tl_gset:Ne #2 \l_tmpa_tl} + {\tl_gset:Nn #2 {}} + } + +\NewDocumentCommand{\PdfTermBookMark}{m} + { + \prop_get:NnNTF \l__ufrgscca_terms_prop {#1} \l_tmpa_tl + {\pdfbookmark{\l_tmpa_tl}{\l_tmpa_tl}} + {} + } + %\prop_new:N \l__ufrgscca_labels_prop diff --git a/macros/luatex/latex/lua-typo/README.md b/macros/luatex/latex/lua-typo/README.md index 801a2603af..a58c92ab75 100644 --- a/macros/luatex/latex/lua-typo/README.md +++ b/macros/luatex/latex/lua-typo/README.md @@ -108,6 +108,10 @@ Changes * v.0.86: - corrected typo in the `signature` function; - compatibility with package `stfloats` added. + +* v.0.87: + - improved page body detection. + - warning about incompability with the `reledmac` package added. -- Copyright 2020--2024 Daniel Flipo diff --git a/macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf b/macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf index 08c3430123..29e39b362c 100644 Binary files a/macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf and b/macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf differ diff --git a/macros/luatex/latex/lua-typo/doc/lua-typo-fr.pdf b/macros/luatex/latex/lua-typo/doc/lua-typo-fr.pdf index 92a1ad5d4e..d32b10b314 100644 Binary files a/macros/luatex/latex/lua-typo/doc/lua-typo-fr.pdf and b/macros/luatex/latex/lua-typo/doc/lua-typo-fr.pdf differ diff --git a/macros/luatex/latex/lua-typo/doc/lua-typo.pdf b/macros/luatex/latex/lua-typo/doc/lua-typo.pdf index 234889f673..9fce36fa85 100644 Binary files a/macros/luatex/latex/lua-typo/doc/lua-typo.pdf and b/macros/luatex/latex/lua-typo/doc/lua-typo.pdf differ diff --git a/macros/luatex/latex/lua-typo/source/lua-typo.dtx b/macros/luatex/latex/lua-typo/source/lua-typo.dtx index 0fdb2395f8..e4ad16ab42 100644 --- a/macros/luatex/latex/lua-typo/source/lua-typo.dtx +++ b/macros/luatex/latex/lua-typo/source/lua-typo.dtx @@ -59,11 +59,13 @@ \usepackage{fontspec} \setmainfont{erewhon} \setsansfont{Cabin}[Scale=MatchLowercase] -\setmonofont{VeraMono.ttf}[ +\setmonofont{iosevka}[ Scale = MatchLowercase, - ItalicFont = VeraMoIt.ttf, - BoldFont = VeraMoBd.ttf, - BoldItalicFont = VeraMoBI.ttf, + Extension = .ttf, + UprightFont = *-regular, + ItalicFont = *-italic, + BoldFont = *-bold, + BoldItalicFont = *-bolditalic, HyphenChar=None, Color=5D1D00, ] @@ -208,7 +210,7 @@ % \pkg{lua-typo}, il suffit d’ajouter dans le préambule la ligne %\\ % |\usepackage[All]{lua-typo}| % -% La version courante (0.85) nécessite un noyau LaTeX récent, +% La version courante (\fileversion) nécessite un noyau LaTeX récent, % 2022/06/01 ou ultérieur. Ceux qui ne disposent que d’un noyau % antérieur à 2021/06/01 reçoivent un message d’erreur % «\texttt{Unable to register callback}» ; une version «rollback » @@ -311,6 +313,13 @@ % |\luatypoMinLen=4| lettres), on le signale. % \end{description} % +% \section{Incompatibilités connues} +% +% La version actuelle de \pkg{lua-typo} est incompatible avec +% l’extension \pkg{reledmac}. Si celle-ci est chargée, aucune +% vérification n’est effectuée par \pkg{lua-typo}, l’utilisateur +% en est informé par un message dans le fichier \file{.log}. +% % \section{Paramétrage personnalisé} % % Pour certaines vérifications faites par \pkg{lua-typo} un @@ -528,9 +537,9 @@ % it can be loaded this way: |\usepackage[All]{lua-typo}[=v0.4]|. % % \enlargethispage*{\baselineskip} -% Version 0.85 requires a LaTeX kernel dated 2022/06/01 or later. -% Another ``rollback’’ version |[=v0.65]| has been added for those -% who run an older kernel. +% The current version (\fileversion) requires a LaTeX kernel dated +% 2022/06/01 or later. Another ``rollback’’ version |[=v0.65]| has +% been added for those who run an older kernel. % % See files \file{demo.tex} and \file{demo.pdf} for a short example % (in French). @@ -615,6 +624,12 @@ % % \end{description} % +% \section{Known issues} +% +% \pkg{lua-typo} is currently incompatible with the \pkg{reledmac} +% package. When the latter is loaded, no check is performed by +% \pkg{lua-typo}, a warning is issued in the \file{.log} file. +% % \section{Customisation} % % Some of the checks mentionned above require tuning, for @@ -752,7 +767,7 @@ %<+scan>\ProvidesPackage{scan-page} %<+dtx>\ProvidesFile{lua-typo.dtx} %<*dtx|sty|scan> - [2024-01-12 v.0.86 Daniel Flipo] + [2024-04-18 v.0.87 Daniel Flipo] % %<*sty> % \fi @@ -1001,8 +1016,20 @@ luatypo = { } % Some defaut values which can be customised in the preamble % are forwarded to Lua AtBeginDocument. % +% \changes{v0.87}{2024/04/18}{Add warning: lua-typo incompatible +% with the `reledmac’ package.} +% % \begin{macrocode} \AtBeginDocument{% + \@ifpackageloaded{reledmac}% + {\PackageWarning{lua-typo}{% + 'lua-typo' is incompatible with\MessageBreak + the 'reledmac' package.\MessageBreak + 'lua-typo' checking disabled.\MessageBreak + Reported}% + \LT@Nonetrue + \directlua{ luatypo.None = true }% + }{}% \directlua{ luatypo.HYPHmax = tex.count.luatypoHyphMax luatypo.PAGEmin = tex.count.luatypoPageMin @@ -1056,10 +1083,10 @@ luatypo = { } \ifLT@None \directlua{ texio.write_nl(' ') - texio.write_nl('***********************************') - texio.write_nl('*** lua-typo loaded with NO option:') + texio.write_nl('************************************') + texio.write_nl('*** lua-typo running with NO option:') texio.write_nl('*** NO CHECK PERFORMED! ***') - texio.write_nl('***********************************') + texio.write_nl('************************************') texio.write_nl(' ') }% \else @@ -2095,6 +2122,7 @@ local check_marginnote = function (head, line, colno, vpos, bpmn) local MarginparPos = luatypo.MarginparPos local margintol = luatypo.MParTol local marginpp = tex.getdimen("marginparpush") + local textht = tex.getdimen("textheight") local pflag = false local ofirst = true local ufirst = true @@ -2158,7 +2186,6 @@ local check_marginnote = function (head, line, colno, vpos, bpmn) last = head head = next end - local textht = tex.getdimen("textheight") % local tht = string.format("%.1fpt", textht/65536) % local bott = string.format("%.1fpt", bottom/65536) % texio.write_nl(' Bottom=' .. bott) @@ -2186,6 +2213,9 @@ end % \changes{v0.86}{2024/01/10}{Package `stfloats’ adds 1sp to the % external \cs{vbox}. Be less picky regarding height test.} % +% \changes{v0.87}{2024/04/18}{\cs{get\_pagebody} improved: it +% failed for crop + hyperref.} +% % \begin{macrocode} local get_pagebody = function (head) local textht = tex.getdimen("textheight") @@ -2199,42 +2229,40 @@ local get_pagebody = function (head) % local dp = string.format("%.1fpt", fn.depth/65536) % texio.write_nl('get_pagebody: TOP VLIST') % texio.write(' ht=' .. ht .. ' dp=' .. dp) +% \end{macrocode} +% Enter the first \node{vlist} found, recursively scan its +% internal \node{vlist}s high enough to include the 'body' +% the height of which is known ('textht')… +% \begin{macrocode} first = fn.list - for n in traverse_id(VLIST,first) do + repeat + for n in traverse_id(VLIST,first) do % \end{macrocode} % Package `stfloats’ seems to add 1sp to the external \cs{vbox} % for each float found on the page. % Add $\pm8$sp tolerance when comparing |n.height| to % |\textheight|. % \begin{macrocode} - if n.subtype == 0 and n.height >= textht-1 and - n.height <= textht+8 then + if n.subtype == 0 and n.height >= textht-1 then + if n.height <= textht+8 then % local ht = string.format("%.1fpt", n.height/65536) % texio.write_nl('BODY found: ht=' .. ht) -% texio.write_nl(', ' .. n.height .. 'sp') +% texio.write('=' .. n.height .. 'sp') % texio.write_nl(' ') - body = n - break - else + body = n + break + else + first = n.list + end + else % texio.write_nl('Skip short VLIST:') % local ht = string.format("%.1fpt", n.height/65536) % local dp = string.format("%.1fpt", n.depth/65536) -% texio.write('ht=' .. ht .. ', ' .. n.height .. 'sp') +% texio.write('ht=' .. ht .. '=' .. n.height .. 'sp') % texio.write('; dp=' .. dp) - local ff = n.list - for nn in traverse_id(VLIST,ff) do -% ht = string.format("%.1fpt", nn.height/65536) -% texio.write_nl(' VLIST: ht=' .. ht) -% texio.write(', ' .. nn.height .. 'sp') - if nn.subtype == 0 and nn.height >= textht-1 and - nn.height <= textht+8 then -% texio.write(' got BODY!') - body = nn - break - end - end - end - end + end + end + until body or not first if not body then texio.write_nl('***lua-typo ERROR: PAGE BODY *NOT* FOUND!***') end @@ -2666,36 +2694,35 @@ check_vtop = function (top, colno, vpos) color_line (head, COLOR) backpar = false end - elseif head and head.id == HLIST and head.subtype == BOX and - head.width > 0 then - if head.height == 0 then + elseif head and head.id == HLIST and head.subtype == BOX then + if head.width > 0 then + if head.height == 0 then % \end{macrocode} % This is a possible margin note. % \begin{macrocode} - bpmn, pflag = check_marginnote(head, line, colno, vpos, bpmn) - if pflag then pageflag = true end - else + bpmn, pflag = check_marginnote(head, line, colno, vpos, bpmn) + if pflag then pageflag = true end + page_bottom, body_bottom = check_EOP(nextnode) + else % \end{macrocode} % Leave |check_vtop| if a two columns box starts. % \begin{macrocode} - local hf = head.list - if hf and hf.id == VLIST and hf.subtype == 0 then -% texio.write_nl('check_vtop: BREAK => multicol') -% texio.write_nl(' ') - break - else -% \end{macrocode} -% \changes{v0.80}{2023/04/18}{hlist-2: added detection of page bottom -% and increment line number and vpos.} -% This is an |\hbox| (f.i.\ centred), let’s update |vpos|, line -% and check for page bottom -% \begin{macrocode} - vpos = vpos + head.height + head.depth - pageline = pageline + 1 - line = pageline - page_bottom, body_bottom = check_EOP (nextnode) + local hf = head.list + if hf and hf.id == VLIST and hf.subtype == 0 then +% texio.write_nl('check_vtop: BREAK => multicol') +% texio.write_nl(' ') + break + end end end +% \end{macrocode} +% \changes{v0.80}{2023/04/18}{hlist-2: added detection of page bottom +% and increment vpos.} +% This is an |\hbox| (f.i.\ centred), let’s update |vpos| and +% check for page bottom. Counter pageline is \emph{not} incremented. +% \begin{macrocode} + vpos = vpos + head.height + head.depth + page_bottom, body_bottom = check_EOP (nextnode) elseif head.id == HLIST and (head.subtype == EQN or head.subtype == ALIGN) and (head.height > 0 or head.depth > 0) then @@ -2810,7 +2837,7 @@ check_vtop = function (top, colno, vpos) local n = head repeat n = n.prev - until n.id == HLIST + until n.id == HLIST and n.subtype == LINE color_line (n, COLOR) end first_bot = false @@ -3036,7 +3063,7 @@ return luatypo.check_page % unless option |None| is selected. % % \begin{macrocode} -\AtEndOfPackage{% +\AtBeginDocument{% \directlua{ if not luatypo.None then luatexbase.add_to_callback @@ -3291,37 +3318,32 @@ local get_pagebody = function (head) repeat fn = fn.next until fn.id == VLIST and fn.height > 0 - first = fn.list local ht = string.format("%.1fpt", fn.height/65536) local dp = string.format("%.1fpt", fn.depth/65536) texio.write_nl("SKIP vlist: ht=" .. ht .. " dp=" .. dp) - for n in traverse_id(VLIST,first) do - if n.subtype == 0 and n.height >= textht-1 and - n.height <= textht+8 then - local ht = string.format("%.1fpt", n.height/65536) - texio.write_nl(' BODY found: ' .. ht) - texio.write(', ' .. n.height .. 'sp') - texio.write_nl(' ') - body = n - break - else - local ht = string.format("%.1fpt", n.height/65536) - local dp = string.format("%.1fpt", n.depth/65536) - texio.write_nl(' SKIP vlist: ht=' .. ht .. ' dp=' .. dp) - local ff = n.list - for nn in traverse_id(VLIST,ff) do - if nn.subtype == 0 and nn.height >= textht-1 and - nn.height <= textht+8 then - ht = string.format("%.1fpt", nn.height/65536) - texio.write_nl(' BODY: ' .. ht) - texio.write(', ' .. nn.height .. 'sp') - texio.write_nl(' ') - body = nn - break - end - end - end - end + first = fn.list + repeat + for n in traverse_id(VLIST,first) do + if n.subtype == 0 and n.height >= textht-1 then + if n.height <= textht+8 then + local ht = string.format("%.1fpt", n.height/65536) + texio.write_nl('BODY found: ht=' .. ht) + texio.write('=' .. n.height .. 'sp') + texio.write_nl(' ') + body = n + break + else + first = n.list + end + else + texio.write_nl('Skip short VLIST:') + local ht = string.format("%.1fpt", n.height/65536) + local dp = string.format("%.1fpt", n.depth/65536) + texio.write('ht=' .. ht .. '=' .. n.height .. 'sp') + texio.write('; dp=' .. dp) + end + end + until body or not first if not body then texio.write_nl('***lua-typo ERROR: PAGE BODY *NOT* FOUND!***') end -- cgit v1.2.3