From 7f500dc20e0f8799274c9eda0cc7d2cf317f94ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Apr 2024 20:16:07 +0000 Subject: ufrgscca (21apr24) git-svn-id: svn://tug.org/texlive/trunk@71033 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/ufrgscca/ufrgscca-abnt.sty | 10 ++-- .../tex/latex/ufrgscca/ufrgscca-base-en.def | 2 +- .../tex/latex/ufrgscca/ufrgscca-base-ptBR.def | 2 +- .../tex/latex/ufrgscca/ufrgscca-coord.sty | 36 +++++++------ .../tex/latex/ufrgscca/ufrgscca-core.sty | 14 +++-- .../tex/latex/ufrgscca/ufrgscca-cover.sty | 10 ++-- .../tex/latex/ufrgscca/ufrgscca-curr.sty | 10 ++-- .../tex/latex/ufrgscca/ufrgscca-forms.sty | 60 +++++++++++++--------- .../tex/latex/ufrgscca/ufrgscca-lists.sty | 10 ++-- .../texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty | 10 ++-- Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls | 16 +++--- 11 files changed, 100 insertions(+), 80 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty index c76d001e5e2..e5f9a55f54f 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA ABNT layout} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-abnt} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ abnt~layout} } \cs_if_exist:NF \PkgInfo diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-en.def b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-en.def index e1f43799f50..a6d20f03495 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-en.def +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-en.def @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-ptBR.def b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-ptBR.def index dab82b10981..06214fc3691 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-ptBR.def +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-base-ptBR.def @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-coord.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-coord.sty index e00d2118947..a0ba2b2727c 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-coord.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-coord.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA coord commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-coord} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ coordination~ report~ commands} } \cs_if_exist:NF \PkgInfo @@ -689,8 +689,10 @@ \seq_map_inline:cn {l__ufrgscca_baselist_seq} { \studentselect{##1} - \eDataSet{student} - \__ufrgscca_tlset_rem_accents:Ne \StudentBookMarkTL {\eDataFields{name}~-~} + \DataGet{student}{name}{\l_tmpa_tl} + \tl_put_right:Nn \l_tmpa_tl {~-~} + \__ufrgscca_tlset_rem_accents:Ne \StudentBookMarkTL {\l_tmpa_tl} + \__ufrgscca_student_emptyfields_if_none: \bool_if:NT \l__ufrgscca_cocertificate_bool @@ -710,8 +712,8 @@ \studentReviewerSelect{2} \studentReviewerSetCase{2} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~2} @@ -720,8 +722,8 @@ \studentReviewerSelect{3} \studentReviewerSetCase{3} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~3} @@ -740,8 +742,8 @@ \studentReviewerSelect{1} \studentReviewerSetCase{1} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~1} @@ -751,8 +753,8 @@ \studentReviewerSelect{2} \studentReviewerSetCase{2} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~2} @@ -762,8 +764,8 @@ \studentReviewerSelect{3} \studentReviewerSetCase{3} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~3} diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty index e02cc144183..325724f4f7f 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA core commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-core} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~core~commands/data} } \cs_if_exist:NF \PkgInfo @@ -405,6 +405,10 @@ \starray_get_prop:nn{#1}{#2} } +\NewDocumentCommand{\DataGet}{mmm}{ + \starray_get_prop:nnN{#1}{#2}{#3} +} + \NewDocumentCommand{\studentReviewerSelect}{m}{ \starray_set_iter:nn {student.reviewer}{#1} } diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty index f9ce37854bf..6ad4cadcf5f 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA cover commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-cover} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ cover~pages} } \cs_if_exist:NF \PkgInfo diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-curr.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-curr.sty index 97a0f6148c3..43b6ac7492e 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-curr.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-curr.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA curricula commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-curr} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ curricula~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-forms.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-forms.sty index 7a45554dd30..29cca50279f 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-forms.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-forms.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA forms commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-forms} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ forms~commands} } \cs_if_exist:NF \PkgInfo @@ -55,14 +55,21 @@ %%%%%%% %%% End of cut-n-paste %%%%%%% - - - + \RequirePackage{starray} \RequirePackage{amsfonts} +\keys_define:nn { ufrgscca.forms } + { + noxtrbookmarks .usage:n = load , + noxtrbookmarks .bool_set:N = \l__ufrgscca_noxtrbookmarks_bool , + } + +\ProcessKeyOptions[ufrgscca.forms]\relax + + \cs_generate_variant:Nn \tl_gset:Nn {Ne} \DeclareKeys[forms]{ @@ -122,8 +129,8 @@ \studentReviewerSelect{1} \studentReviewerSetCase{1} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~1} @@ -143,8 +150,8 @@ \studentReviewerSelect{2} \studentReviewerSetCase{2} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~2} @@ -153,8 +160,8 @@ \studentReviewerSelect{3} \studentReviewerSetCase{3} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~3} @@ -176,8 +183,8 @@ \studentReviewerSelect{1} \studentReviewerSetCase{1} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~1} @@ -188,8 +195,8 @@ \studentReviewerSelect{2} \studentReviewerSetCase{2} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~2} @@ -200,8 +207,8 @@ \studentReviewerSelect{3} \studentReviewerSetCase{3} { - \eDataSet{student.reviewer} - \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + \DataGet{student.reviewer}{name}{\ReviewerBookMarkTL} + \tl_put_left:Nn \ReviewerBookMarkTL {~-~} } { \tl_set:Nn \ReviewerBookMarkTL {~-~3} @@ -225,8 +232,9 @@ \NewDocumentCommand{\tcforms}{m}{% \bool_set_false:N \l__ufrgscca_emptyforms_bool \__ufrgscca_student_emptyfields_if_none: - \eDataSet{student} - \tl_set:Ne \StudentBookMarkTL {\eDataFields{name}~-~} + \DataGet{student}{name}{\StudentBookMarkTL} + \tl_put_right:Nn \StudentBookMarkTL {~-~} + \SetKeys[forms]{#1}% } @@ -282,9 +290,13 @@ \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 } + \bool_if:NTF \l__ufrgscca_noxtrbookmarks_bool {} + { + \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/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty index 9af6195fece..16add4b3853 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA auxiliary lists commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-lists} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17} , - version .code:n = {2.9} , + date .code:n = {2024/04/20} , + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~Auxiliary~ lists~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty index d0669fee97a..d136068d076 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA PPC commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-ppc} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~ auxiliary~ PPC-related~ (indicators)~ commands} } \cs_if_exist:NF \PkgInfo diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls index 2c50f893b6f..4515dc3b062 100644 --- a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls +++ b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.9} {2024/04/17} +%% This is version {2.10} {2024/04/20} %% %% 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/04/17} - {2.9} + {2024/04/20} + {2.10} {UFRGS/CCA class} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/04/17}, - version .code:n = {2.9} , + date .code:n = {2024/04/20}, + version .code:n = {2.10} , description .code:n = {UFRGS/CCA~a~report~based~class~bundle} } \cs_if_exist:NF \PkgInfo @@ -110,10 +110,12 @@ {\tl_gset:Nn #2 {}} } -\NewDocumentCommand{\PdfTermBookMark}{m} +\NewDocumentCommand{\pdfTermBookMark}{m} { \prop_get:NnNTF \l__ufrgscca_terms_prop {#1} \l_tmpa_tl - {\pdfbookmark{\l_tmpa_tl}{\l_tmpa_tl}} + { + \pdfbookmark{\l_tmpa_tl}{\l_tmpa_tl} + } {} } -- cgit v1.2.3