From 55bbc7059b7f863ced5e0ff091c19fca662a77a6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Feb 2024 21:07:37 +0000 Subject: ufrgscca (25feb24) git-svn-id: svn://tug.org/texlive/trunk@70160 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ufrgscca/README.md | 6 +- .../doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex | 2 +- .../doc/latex/ufrgscca/ufrgscca-forms.tex | 220 +++++++++++---------- .../doc/latex/ufrgscca/ufrgscca-terms-en.tex | 2 +- .../doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex | 30 ++- Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.pdf | Bin 592794 -> 592924 bytes Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.tex | 7 +- .../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 | 93 +++++---- .../tex/latex/ufrgscca/ufrgscca-core.sty | 62 +++++- .../tex/latex/ufrgscca/ufrgscca-cover.sty | 10 +- .../tex/latex/ufrgscca/ufrgscca-curr.sty | 10 +- .../tex/latex/ufrgscca/ufrgscca-forms.sty | 137 ++++++++++--- .../tex/latex/ufrgscca/ufrgscca-lists.sty | 10 +- .../texmf-dist/tex/latex/ufrgscca/ufrgscca-ppc.sty | 10 +- Master/texmf-dist/tex/latex/ufrgscca/ufrgscca.cls | 10 +- 18 files changed, 402 insertions(+), 221 deletions(-) diff --git a/Master/texmf-dist/doc/latex/ufrgscca/README.md b/Master/texmf-dist/doc/latex/ufrgscca/README.md index 10781e740f8..558ac6e182e 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/README.md +++ b/Master/texmf-dist/doc/latex/ufrgscca/README.md @@ -98,7 +98,7 @@ The Current Maintainer of this work is Alceu Frigeri * README.md (this file) - quick introduction -* ufrgscca.tex +* ufrgscca.tex - pakcage/bundle documentation * ufrgscca.pdf - documentation in PDF format @@ -107,6 +107,10 @@ The Current Maintainer of this work is Alceu Frigeri ## Changelog +* Version 2.5 (this) + - Added PDF bookmarcks to each and every Form/Report page. + - Added \studentReviewerSetCase (see manual) + * Version 2.4/2.4a (this) - a few typos (including [l3kernel prop check](https://github.com/latex3/latex3/issues/1460)) - extended \studentfate possible values (see documentation). diff --git a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex index 72349eab9de..e661e6184d0 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex +++ b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/doc/latex/ufrgscca/ufrgscca-forms.tex b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-forms.tex index c8df3c2ce8d..22a74c03ccb 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-forms.tex +++ b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-forms.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -36,7 +36,9 @@ %%%%%%%%%%%%%%% %% req form - Internship %%%%%%%%%%%%%%% -\SetForm{internshiprequest}{heading}{\UseTerm{title.internship}} +\ExplSyntaxOn +\SetForm{internshiprequest}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.internrequestform}}{\UseTerm{book.internrequestform}}} +\ExplSyntaxOff \SetForm{internshiprequest}{title}{\UseTerm{title.requestform}} %%% @@ -85,7 +87,9 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%%%%%%%%%%%%%% %% supervisor`s form - Internship %%%%%%%%%%%%%%% -\SetForm{internshipsupervisorform}{heading}{\UseTerm{title.internship}} +\ExplSyntaxOn +\SetForm{internshipsupervisorform}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.internsupervisorform}}{\UseTerm{book.internsupervisorform}}} +\ExplSyntaxOff \SetForm{internshipsupervisorform}{title}{\UseTerm{title.internsupervisorform}} \SetForm{internshipsupervisorform}{footnote}{\UseTerm{footnote.supervisorsform}} @@ -130,7 +134,9 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%%%%%%%%%%%%%% %% tutor`s form - Internship %%%%%%%%%%%%%%% -\SetForm{internshiptutorform}{heading}{\UseTerm{title.internship}} +\ExplSyntaxOn +\SetForm{internshiptutorform}{heading}{\UseTerm{title.internship}\exp_args:Nee \pdfbookmark{\UseTerm{book.interntutorform}}{\UseTerm{book.interntutorform}}} +\ExplSyntaxOff \SetForm{internshiptutorform}{title}{\UseTerm{title.interntutorform}} %%% @@ -147,8 +153,7 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de \vfill% Considerações d\DataFields{student.tutor}{article} Prof\DataFields{student.tutor}{narticle}. Tutor\DataFields{student.tutor}{narticle} sobre o Estágio: - - \BlankLines{5}% + \BlankLines{6}% \vfill% @@ -161,8 +166,7 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de \vfill Considerações d\ActivityCoord[internship]{article} Prof\ActivityCoord[internship]{narticle}. Coordenador\ActivityCoord[internship]{narticle} sobre o Estágio: - - \BlankLines{5}% + \BlankLines{6}% \vfill% \hfill\parbox[t]{.45\textwidth}{\SignatureDate{\UseLabel{signature.internshipcoord}}} @@ -180,7 +184,9 @@ Data de Início: {\bf \DataFields{student.internship}{start}}\hfill Previsão de %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\SetForm{attendancelist}{heading}{\UseTerm{title.tcc}} +\ExplSyntaxOn +\SetForm{attendancelist}{heading}{\UseTerm{title.tcc}\exp_args:Nee \pdfbookmark{\UseTerm{book.attendancelist}}{\UseTerm{book.attendancelist}}} +\ExplSyntaxOff \SetForm{attendancelist}{title}{\UseTerm{title.attendancelist}} \SetForm{attendancelist}{opening}{} @@ -205,7 +211,11 @@ Nome do(a) Aluno(a) --- Email\\ %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\SetForm{calendar-I}{heading}{\UseTerm{title.tccI}} +\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}{title}{\UseTerm{title.calendar}} \SetForm{calendar-I}{opening}{} @@ -235,7 +245,11 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %%%%%%%%%%%%%%% -\SetForm{calendar-II}{heading}{\UseTerm{title.tccII}} +\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}{title}{\UseTerm{title.calendar}} \SetForm{calendar-II}{opening}{} @@ -279,7 +293,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% req form - I %%%%%%%%%%%%%%% -\SetForm{request-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{request-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.requestform-I}}{\UseTerm{book.requestform-I}}} +\ExplSyntaxOff \SetForm{request-I}{title}{\UseTerm{title.requestform}} \SetForm{request-I}{opening}{ @@ -318,7 +334,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% coadvisor - I %%%%%%%%%%%%%%% -\SetForm{coadvisor-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{coadvisor-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.coadvisorform-I}}{\UseTerm{book.coadvisorform-I}}} +\ExplSyntaxOff \SetForm{coadvisor-I}{title}{\UseTerm{title.coadvisorform}} \SetForm{coadvisor-I}{opening}{ @@ -362,7 +380,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% board approval - I %%%%%%%%%%%%%%% -\SetForm{boardapproval-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{boardapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.boardapproval-I}}{\UseTerm{book.boardapproval-I}}} +\ExplSyntaxOff \SetForm{boardapproval-I}{title}{\UseTerm{title.boardapproval}} \SetForm{boardapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -390,7 +410,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% advisor's approval - I %%%%%%%%%%%%%%% -\SetForm{advisorsapproval-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{advisorsapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.advisorapproval-I}}{\UseTerm{book.advisorapproval-I}}} +\ExplSyntaxOff \SetForm{advisorsapproval-I}{title}{\UseTerm{title.advisorsapproval-I}} \SetForm{advisorsapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -417,7 +439,9 @@ Nome do(a) Aluno(a) --- Email\\ %%%%%%%%%%%%%%% %% examiner's form - I %%%%%%%%%%%%%%% -\SetForm{examinersform-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{examinersform-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.reviewersform-I}}{\UseTerm{book.reviewersform-I}}} +\ExplSyntaxOff \SetForm{examinersform-I}{title}{\UseTerm{title.reviewersform}} \SetForm{examinersform-I}{footnote}{\UseTerm{footnote.reviewersform}} \SetForm{examinersform-I}{opening}{% @@ -469,7 +493,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% rectify approval - I %%%%%%%%%%%%%%% -\SetForm{rectifyapproval-I}{heading}{\UseTerm{title.tccI}} +\ExplSyntaxOn +\SetForm{rectifyapproval-I}{heading}{\UseTerm{title.tccI}\exp_args:Nee \pdfbookmark{\UseTerm{book.rectifyapproval-I}}{\UseTerm{book.rectifyapproval-I}}} +\ExplSyntaxOff \SetForm{rectifyapproval-I}{title}{\UseTerm{title.rectifyapproval}} \SetForm{rectifyapproval-I}{opening}{\UseTerm{desc.studentwork.full}} @@ -511,7 +537,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% req form - II %%%%%%%%%%%%%%% -\SetForm{request-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{request-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.requestform-II}}{\UseTerm{book.requestform-II}}} +\ExplSyntaxOff \SetForm{request-II}{title}{\UseTerm{title.requestform}} \SetForm{request-II}{opening}{ @@ -544,10 +572,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} Os Objetivos do Trabalho e Orientador\DataFields{student.advisor}{narticle}\studentCoadvCase{/Coorientador\DataFields{student.coadvisor}{narticle}}{} seguem sendo os mesmos de TCC I ? \begin{itemize}[tcc,nosep] \item[$\Box$] SIM - \item[$\Box$] NÃO, neste caso \textbf{justifique} a mudança no espaço a seguir: + \item[$\Box$] NÃO, neste caso \textbf{justifique} a mudança no espaço a seguir:\\[1ex] \end{itemize} - \DataFields{student}{reason} } @@ -563,7 +590,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% coadvisor - II %%%%%%%%%%%%%%% -\SetForm{coadvisor-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{coadvisor-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.coadvisorform-II}}{\UseTerm{book.coadvisorform-II}}} +\ExplSyntaxOff \SetForm{coadvisor-II}{title}{\UseTerm{title.coadvisorform}} \SetForm{coadvisor-II}{opening}{ @@ -608,7 +637,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% board approval - II %%%%%%%%%%%%%%% -\SetForm{boardapproval-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{boardapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.boardapproval-II}}{\UseTerm{book.boardapproval-II}}} +\ExplSyntaxOff \SetForm{boardapproval-II}{title}{\UseTerm{title.boardapproval}} \SetForm{boardapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -642,7 +673,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% advisor's approval - II %%%%%%%%%%%%%%% -\SetForm{advisorsapproval-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{advisorsapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.advisorapproval-II}}{\UseTerm{book.advisorapproval-II}}} +\ExplSyntaxOff \SetForm{advisorsapproval-II}{title}{\UseTerm{title.advisorsapproval-II}} \SetForm{advisorsapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -669,7 +702,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% receipts - II %%%%%%%%%%%%%%% -\SetForm{receipts-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{receipts-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.receipts-II}}{\UseTerm{book.receipts-II}}} +\ExplSyntaxOff \SetForm{receipts-II}{title}{\UseTerm{title.receipts}} \SetForm{receipts-II}{footnote}{\UseTerm{footnote.receipts}} @@ -700,7 +735,9 @@ Outras considerações, parecer (se necessário): \BlankLines{5} %%%%%%%%%%%%%%% %% examiner's form - II %%%%%%%%%%%%%%% -\SetForm{examinersform-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{examinersform-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.reviewersform-II}}{\UseTerm{book.reviewersform-II}}} +\ExplSyntaxOff \SetForm{examinersform-II}{title}{\UseTerm{title.reviewersform}} \SetForm{examinersform-II}{footnote}{\UseTerm{footnote.reviewersform}} @@ -741,7 +778,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% examiner's form - II %%%%%%%%%%%%%%% -\SetForm{correctionsform-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{correctionsform-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.correctionsform-II}}{\UseTerm{book.correctionsform-II}}} +\ExplSyntaxOff \SetForm{correctionsform-II}{title}{\UseTerm{title.correctionsform}} \SetForm{correctionsform-II}{footnote}{\UseTerm{footnote.correctionsform}} @@ -761,22 +800,16 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora \item[$\Box$ a)] Está adequado, \begin{enumerate} \item[$\Box$ a.1)] dispensando correções do texto. - \item[$\Box$ a.2)] sendo necessário correções, conforme a seguir (e anotações anexas). - \begin{description}[tcc,noitemsep] - \item[$\Box$] Ortográfica - \item[$\Box$] Regras de Escrita - \item[$\Box$] Equações - \item[$\Box$] Resumo - \item[$\Box$] Abstract - \item[$\Box$] Índice - \item[$\Box$] Introdução - \item[$\Box$] Conclusões - \item[$\Box$] Corpo do Trabalho - \item[$\Box$] Resultados - \item[$\Box$] Adicionar mais exemplos - \item[$\Box$] Figuras - \item[$\Box$] Tabelas - \end{description} + \item[$\Box$ a.2)] sendo necessário correções, conforme a seguir (e anotações anexas). + \begin{tabular}{llp{2em}ll} + $\Box$ & Ortográfica & & $\Box$ & Regras de Escrita \\ + $\Box$ & Resumo & & $\Box$ & Abstract \\ + $\Box$ & Introdução & & $\Box$ & Conclusões \\ + $\Box$ & Resultados & & $\Box$ & Corpo do Trabalho \\ + $\Box$ & Mais exemplos & & $\Box$ & Equações \\ + $\Box$ & Figuras & & $\Box$ & Tabelas \\ + $\Box$ & Índice & & & \\ + \end{tabular} \end{enumerate} \item[$\Box$ b)] Necessita ser revisto/re-escrito,\footnotemark[2] e: \begin{itemize} @@ -784,13 +817,7 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora \item[$\Box$ b.2)] revisarei o trabalho depois de corrigido. \end{itemize} \item[] - \item[$\Box$] Outras considerações (se necessário): \\ - \begin{tabular}{p{0.7\textwidth}} - ~\\\hline - ~\\\hline - ~\\\hline - ~\\\hline - \end{tabular}\\[-1mm] + \item[$\Box$] Outras considerações (se necessário): \BlankLines[-1ex]{6} \end{enumerate} } } @@ -808,7 +835,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% rectify approval - II %%%%%%%%%%%%%%% -\SetForm{rectifyapproval-II}{heading}{\UseTerm{title.tccII}} +\ExplSyntaxOn +\SetForm{rectifyapproval-II}{heading}{\UseTerm{title.tccII}\exp_args:Nee \pdfbookmark{\UseTerm{book.rectifyapproval-II}}{\UseTerm{book.rectifyapproval-II}}} +\ExplSyntaxOff \SetForm{rectifyapproval-II}{title}{\UseTerm{title.rectifyapproval}} \SetForm{rectifyapproval-II}{opening}{\UseTerm{desc.studentwork.full}} @@ -932,7 +961,7 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%% \multicolumn{#1}{p{#2}}{\ \ \ \color{darkerred}\UseLabel{board}: \DataFields{student.reviewer[1]}{email} (\DataFields{student.reviewer[1]}{phone}) / \DataFields{student.reviewer[2]}{email} (\DataFields{student.reviewer[2]}{phone}) / \DataFields{student.reviewer[3]}{email} (\DataFields{student.reviewer[3]}{phone})}\\* \multicolumn{#1}{p{#2}}{{\ \ \ \color{darkerblue}\bf \DataFields{student.advisor}{email} (\DataFields{student.advisor}{phone})} ~~ - ~~ - {\color{darkerred} \DataFields{student.reviewer[2]}{email} (\DataFields{student.reviewer[2]}{phone}) / \DataFields{student.reviewer[3]}{email} (\DataFields{student.reviewer[3]}{phone})}}\\* + {\color{darkerred} \studentReviewerSetCase{2}{\DataFields{student.reviewer[2]}{email} (\DataFields{student.reviewer[2]}{phone})}{} / \studentReviewerSetCase{3}{\DataFields{student.reviewer[3]}{email} (\DataFields{student.reviewer[3]}{phone})}{}}}\\* \multicolumn{#1}{p{#2}}{\ \ \ \UseLabel{remarks}: {\color{red}\textbf{\DataFields{student}{remarks}}}}%\\ \hline } @@ -942,7 +971,12 @@ 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}} +%\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}{title}{\UseTerm{semester}} \SetForm{referral-I}{opening}{\UseTerm{desc.sacad}} @@ -991,7 +1025,11 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% referall letter- II %%%%%%%%%%%%%%% -\SetForm{referral-II}{heading}{\UseTerm{title.tccII}} +\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}{title}{\UseTerm{semester}} \SetForm{referral-II}{opening}{\UseTerm{desc.sacad}} @@ -1079,6 +1117,8 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora \seq_map_inline:Nn \l__ufrgscca_baselist_graded_seq { \studentselect{##1} +% \__ufrgscca_student_emptyfields_if_none: + \__ufrgscca_emptyterm_if_none:nnn {3}{student.reviewer}{} #2\\\hline \studentExtLine{7}{\UseConst{report.tabMult.#1}}\\\hline \bool_if:nT {\l__ufrgscca_checklist_bool} @@ -1113,6 +1153,7 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora \seq_map_inline:Nn #3 { \studentselect{##1} + \__ufrgscca_emptyterm_if_none:nnn {3}{student.reviewer}{} &\\* \multicolumn{#1}{l}{\textbf{\color{#5}\DataFields{student}{name}}}\\* \studentExtLine{#1}{\UseConst{#2}}\\* @@ -1127,7 +1168,9 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %% report TCC - I %%%%%%%%%%%%%%% \SetForm{report-I}{top}{} -\SetForm{report-I}{heading}{\vspace*{-5ex}\UseTerm{title.tccI}~ - ~\textbf{\UseTerm{semester}}} +\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}{opening}{} @@ -1146,7 +1189,10 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %% report TCC - II %%%%%%%%%%%%%%% \SetForm{report-II}{top}{} -\SetForm{report-II}{heading}{\vspace*{-5ex}\UseTerm{title.tccII}~ - ~\textbf{\UseTerm{semester}}} +\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}{} @@ -1164,62 +1210,14 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora \SetForm{report-II}{closing}{} - - -%%%%%%%%%%%%%%% -%% Check List TCC - I -%%%%%%%%%%%%%%% -\SetForm{checklist-I}{heading}{\UseTerm{title.tccI}} -\SetForm{checklist-I}{title}{Check~ List~ TCC~ I~ -~ \UseTerm{semester}} -\SetForm{checklist-I}{opening}{} - -%%% -\SetForm{checklist-I}{opening}{ % - \ActivitySelect{tccI} - { \scriptsize - \begin{longtable}{llllll}% - \CheckList{6}{graded}{Alunos~Com~ Conceito}[black] - \CheckList{6}{ff}{Desistentes~ com~ conceito~ (2o ~ semestre)}[red] - \CheckList{6}{dismiss}{Desistentes~ sem~ conceito~ (1o ~ semestre)}[magenta] - \end{longtable} - } - ~\vfill -} - -%%% -\SetForm{checklist-I}{closing}{} - - -%%%%%%%%%%%%%%% -%% Check List TCC - II -%%%%%%%%%%%%%%% -\SetForm{checklist-II}{heading}{\UseTerm{title.tccII}} -\SetForm{checklist-II}{title}{Check~ List~ TCC~ II~ -~ \UseTerm{semester}} -\SetForm{checklist-II}{opening}{} - -%%% -\SetForm{checklist-II}{opening}{ % - \ActivitySelect{tccII} - { \scriptsize - \begin{longtable}{llllll}% - \CheckList{6}{graded}{Alunos~Com~ Conceito}[black] - \CheckList{6}{ff}{Desistentes~ com~ conceito~ (2o ~ semestre)}[red] - \CheckList{6}{dismiss}{Desistentes~ sem~ conceito~ (1o ~ semestre)}[magenta] - \end{longtable} - } - ~\vfill -} - -%%% -\SetForm{checklist-II}{closing}{} - - - - %%%%%%%%%%%%%%% %% Boards TCC - II %%%%%%%%%%%%%%% -\SetForm{boards}{heading}{\UseTerm{title.tccII}} +\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}{title}{\UseTerm{board.title}} \SetForm{boards}{opening}{} @@ -1276,7 +1274,11 @@ A nota (variando de zero a dez) atribuída por cada membro da banca examinadora %%%%%%%%%%%%%%% %% cocertificate %%%%%%%%%%%%%%% -\SetForm{cocertificate}{heading}{\UseTerm{title.tcc}} +\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}{title}{\UseTerm{semester}} \SetForm{cocertificate}{opening}{À quem interessar possa,\\ certificamos que} \SetForm{cocertificate}{body}{% diff --git a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-en.tex b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-en.tex index 940f8491c02..fcec1b1b7df 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-en.tex +++ b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-en.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex index 84effd20e64..dc424151225 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex +++ b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex @@ -12,7 +12,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -66,6 +66,34 @@ \ActivitySetCoord{Nome Coordenador} \ActivitySetCoordTitle{Coordenador\ActivityCoord[internship]{narticle} da Atividade de Ensino de\newline Estágio Supervisionado Obrigatório} +\SetTerms{% + book.attendancelist = {Lista de Presença} , + book.calendar-I = {TCC I - Calendário} , + book.requestform-I = {\StudentBookMarkTL TCC I 01 - Requerimento de Matricula} , + book.coadvisorform-I = {\StudentBookMarkTL TCC I 02 - Requerimento de Coorientacao} , + book.boardapproval-I = {\StudentBookMarkTL TCC I 03 - Indicacao da Banca} , + book.advisorapproval-I = {\StudentBookMarkTL TCC I 04 - Aprovacao para Avaliacao} , + book.reviewersform-I = {\StudentBookMarkTL TCC I 05 - Formulario de Avaliacao do Trabalho\ReviewerBookMarkTL} , + book.rectifyapproval-I = {\StudentBookMarkTL TCC I 06 - Formulario de Aprovacao de Correcoes} , + book.calendar-II = {TCC II - Calendário} , + book.requestform-II = {\StudentBookMarkTL TCC II 01 - Requerimento de Matricula} , + book.coadvisorform-II = {\StudentBookMarkTL TCC II 02 - Requerimento de Coorientacao} , + book.boardapproval-II = {\StudentBookMarkTL TCC II 03 - Indicacao da Banca} , + book.advisorapproval-II = {\StudentBookMarkTL TCC II 04 - Aprovacao para Apresentacao} , + book.receipts-II = {\StudentBookMarkTL TCC II 04b - recibo de entrega\ReviewerBookMarkTL} , + book.reviewersform-II = {\StudentBookMarkTL TCC II 05 - Formulario de Avaliacao do Trabalho\ReviewerBookMarkTL} , + book.correctionsform-II = {\StudentBookMarkTL TCC II 05b - Formulario de Correcoes\ReviewerBookMarkTL} , + book.rectifyapproval-II = {\StudentBookMarkTL TCC II 06 - Formulario de Aprovacao de Correcoes} , + book.internrequestform = {\StudentBookMarkTL Estagio Obrigatorio 01 - Requerimento de Matricula} , + book.internsupervisorform = {\StudentBookMarkTL Estagio Obrigatorio 02 - Avaliacao Supervisor} , + book.interntutorform = {\StudentBookMarkTL Estagio Obrigatorio 03 - Avaliacao Tutor} , + book.report-I = {TCC I - Relatório \UseTerm{semester}} , + book.referral-I = {\StudentBookMarkTL TCC I - Despacho SACAD} , + book.cocertificate = {\StudentBookMarkTL Certificado coorientação} , + book.report-II = {TCC II - Relatório \UseTerm{semester}} , + book.referral-II = {\StudentBookMarkTL TCC II - Despacho SACAD} , + book.boards = {TCC II - Apresentações} , +} \SetTerms{% title.tcc = Trabalho de Conclusão de Curso , diff --git a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.pdf b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.pdf index 9eca25075cb..5ae4795d7f0 100644 Binary files a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.pdf and b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.pdf differ diff --git a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.tex b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.tex index e7a78b4fdd5..0d5cd7d7ad9 100644 --- a/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.tex +++ b/Master/texmf-dist/doc/latex/ufrgscca/ufrgscca.tex @@ -15,7 +15,7 @@ %% %% The Current Maintainer of this work is Alceu Frigeri %% -%% This is version {2.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% The list of files that compose this work can be found in the README.md file at %% https://ctan.org/pkg/ufrgscca @@ -1052,7 +1052,7 @@ Those commands are only of use when using \tsobj[pkg]{ufrgscca-coord}. \tsmacro{ \end{codedescribe} -\begin{codedescribe}[code,new=2023/11/18,update=2023/12/02,update=2024/01/15]{\studentCase,\studentAdvCase,\studentCoadvCase,\studentDismissCase,\studentNewPageCase,\studentDistinctBoardCase,\studentReviewerCase} +\begin{codedescribe}[code,new=2023/11/18,update=2023/12/02,update=2024/01/15,update=2024/02/22]{\studentCase,\studentAdvCase,\studentCoadvCase,\studentDismissCase,\studentNewPageCase,\studentDistinctBoardCase,\studentReviewerCase,\studentReviewerSetCase} \begin{codesyntax}% \tsmacro{\studentCase}{if-A-B-C,if-D,if-Exam-C,if-Exam-D,if-FF} \tsmacro{\studentAdvCase}{if-more-than-one,if-not} @@ -1060,7 +1060,8 @@ Those commands are only of use when using \tsobj[pkg]{ufrgscca-coord}. \tsmacro{ \tsmacro{\studentDismissCase}{if-dismiss,if-not} \tsmacro{\studentNewPageCase}{if-newpage,if-not} \tsmacro{\studentDistinctBoardCase}{if-distinct,if-not} - \tsmacro{\studentReviewerCase}{if-marked,if-not} + \tsmacro{\studentReviewerCase}{rev-num,if-marked,if-not} + \tsmacro{\studentReviewerSetCase}{rev-num,if-set,if-not} \end{codesyntax} These are a set of auxiliary conditionals, for instance, \tsobj{\StudentCase} will execute \emph{only one} of the \tsobj[meta]{if-} accordingly. \end{codedescribe} diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-abnt.sty index cc62a4bc4df..9618258cc0f 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA ABNT layout} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-abnt} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , 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 c94a4d44ab4..8bb7ff8ce73 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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 81648a69b8f..83bb0e06dcd 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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 109029231ea..db572b8c151 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA coord commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-coord} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , description .code:n = {UFRGS/CCA~ coordination~ report~ commands} } \cs_if_exist:NF \PkgInfo @@ -78,12 +78,6 @@ report-II. bool_set:N = \l__ufrgscca_reportII_bool , report-II. usage:n = general , - checklist-I. bool_set:N = \l__ufrgscca_checklistI_bool , - checklist-I. usage:n = general , - - checklist-II. bool_set:N = \l__ufrgscca_checklistII_bool , - checklist-II. usage:n = general , - boards. bool_set:N = \l__ufrgscca_boards_bool , boards. usage:n = general , @@ -120,8 +114,6 @@ \RequirePackage{ufrgscca-forms} %\RequirePackage{pgfcalendar} -% - \starray_new:n {prof} \starray_def_from_keyval:nn {prof} @@ -526,15 +518,6 @@ } }% -%% -%% DEPRECATED, to be removed. -%% -%\NewDocumentCommand{\boarddate}{mm}{%% -% \SetConsts{% -% date:#1 = {#2} , -% } -%}% -% \NewDocumentCommand{\semester}{m}{%% \SetTerms{% semester = {#1} , @@ -703,10 +686,11 @@ } {\seq_gput_right:cn {l__ufrgscca_#1_list_graded_seq}{#2}} } - + \NewDocumentCommand{\tcreports}{O{}m}{ { + \__ufrgscca_set_reports:n {#1} \bool_if:cF {l__ufrgscca_#2_classified_bool} { \sortstudentlist{#2} } @@ -727,15 +711,15 @@ { \MakeForm{report-I} } \bool_if:NT \l__ufrgscca_reportII_bool { \MakeForm{report-II} } - \bool_if:NT \l__ufrgscca_checklistI_bool - { \MakeForm{checklist-I} } - \bool_if:NT \l__ufrgscca_checklistII_bool - { \MakeForm{checklist-II} } \bool_if:NT \l__ufrgscca_boards_bool { \MakeForm{boards} } \seq_map_inline:cn {l__ufrgscca_baselist_seq} { \studentselect{##1} + \eDataSet{student} + \__ufrgscca_tlset_rem_accents:Ne \StudentBookMarkTL {\eDataFields{name}~-~} + \__ufrgscca_student_emptyfields_if_none: + \bool_if:NT \l__ufrgscca_cocertificate_bool { \studentCoadvCase @@ -751,8 +735,24 @@ \bool_if:NT \l__ufrgscca_revformsI_bool { \SetReviewer{2} + \studentReviewerSetCase{2} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~2} + } \MakeForm{examinersform-I} \SetReviewer{3} + \studentReviewerSetCase{3} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~3} + } \MakeForm{examinersform-I} \MakeForm{rectifyapproval-I} } @@ -765,12 +765,36 @@ \bool_if:NT \l__ufrgscca_revformsII_bool { \SetReviewer{1} + \studentReviewerSetCase{1} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~1} + } \MakeForm{examinersform-II} \MakeForm{correctionsform-II} \SetReviewer{2} + \studentReviewerSetCase{2} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~2} + } \MakeForm{examinersform-II} \MakeForm{correctionsform-II} \SetReviewer{3} + \studentReviewerSetCase{3} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~3} + } \MakeForm{examinersform-II} \MakeForm{correctionsform-II} \MakeForm{rectifyapproval-II} @@ -851,21 +875,6 @@ \l__ufrgscca_table_tl } -\NewDocumentCommand{\CheckList}{mmmO{red}}{ - \seq_if_empty:cF {l__ufrgscca_baselist_#2_seq} - { - &\\ - \multicolumn{#1}{l}{\textbf{\color{#4}#3}}\\\hline - \seq_map_inline:cn {l__ufrgscca_baselist_#2_seq} - { - \studentselect{##1} - &\\[-2ex] - ~\multicolumn{#1}{l}{\textbf{\color{#4}\DataFields{student}{name}}}\\* - \__ufrgscca_checktable_lines:nn {L1,L2,L3}{C1,C2,C3,C4,C5,C6}\hline - } - } - -} \bool_new:N \l__ufrgscca_checklist_bool \bool_set_true:N \l__ufrgscca_checklist_bool diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-core.sty index cc531e31564..d07c1e4670a 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA core commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-core} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , description .code:n = {UFRGS/CCA~core~commands/data} } \cs_if_exist:NF \PkgInfo @@ -186,6 +186,7 @@ grade = 0 , gradetype = , flag-examreview = \c_false_bool , + flag-set = \c_false_bool , } , altreviewer . struct = { first = , @@ -425,6 +426,12 @@ {#2} } +\NewDocumentCommand{\studentReviewerSetCase}{mmm}{ + \starray_term_syntax:n{student.reviewer[#1]} + \bool_if:nTF {\starray_parsed_get_prop:n{flag-set}} + {#2} + {#3} +} \NewDocumentCommand{\studentiterate}{m}{ \starray_iterate_over:nn{student}{#1} @@ -612,6 +619,7 @@ \NewDocumentCommand{\examiner}{O{}mmO{}}{%% \starray_new_term:nn {student.reviewer}{} + \starray_gset_prop:nnn {student.reviewer}{flag-set}{\c_true_bool} \__ufrgscca_set_prof:nnnnn {reviewer}{#1}{#2}{#3}{#4} }% @@ -644,3 +652,47 @@ \def\emptybox{\framebox[3em]{\color{white}W}} + + +%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%% +% +% This below is to create PDF bookmarks without accents (if needed) +% for instance, PDFsam uses bookmarks as file names +% +%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%% + + +\cs_new_protected:Npn \__ufrgscca_tlset_rem_accents:Nn #1#2 + { + \str_set:Ne \l_tmpa_str {#2} + \str_replace_all:Nnn \l_tmpa_str {ã}{a} + \str_replace_all:Nnn \l_tmpa_str {õ}{o} + \str_replace_all:Nnn \l_tmpa_str {ñ}{n} + \str_replace_all:Nnn \l_tmpa_str {á}{a} + \str_replace_all:Nnn \l_tmpa_str {é}{e} + \str_replace_all:Nnn \l_tmpa_str {í}{i} + \str_replace_all:Nnn \l_tmpa_str {ó}{o} + \str_replace_all:Nnn \l_tmpa_str {ú}{u} + \str_replace_all:Nnn \l_tmpa_str {à}{a} + \str_replace_all:Nnn \l_tmpa_str {è}{e} + \str_replace_all:Nnn \l_tmpa_str {ì}{i} + \str_replace_all:Nnn \l_tmpa_str {ò}{o} + \str_replace_all:Nnn \l_tmpa_str {ù}{u} + \str_replace_all:Nnn \l_tmpa_str {ä}{a} + \str_replace_all:Nnn \l_tmpa_str {ë}{e} + \str_replace_all:Nnn \l_tmpa_str {ï}{i} + \str_replace_all:Nnn \l_tmpa_str {ö}{o} + \str_replace_all:Nnn \l_tmpa_str {ü}{u} + \str_replace_all:Nnn \l_tmpa_str {â}{a} + \str_replace_all:Nnn \l_tmpa_str {ê}{e} + \str_replace_all:Nnn \l_tmpa_str {î}{i} + \str_replace_all:Nnn \l_tmpa_str {ô}{o} + \str_replace_all:Nnn \l_tmpa_str {û}{u} + \str_replace_all:Nnn \l_tmpa_str {ç}{c} + \tl_set:Ne #1 {\l_tmpa_str} + } + +\cs_generate_variant:Nn \__ufrgscca_tlset_rem_accents:Nn {Ne} + diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-cover.sty index fa26df00a47..977fa2917f9 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA cover commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-cover} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , 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 2d05f2dd100..752ecfb7400 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA curricula commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-curr} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , 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 7de22441824..a20c73dd50c 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA forms commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-forms} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , description .code:n = {UFRGS/CCA~ forms~commands} } \cs_if_exist:NF \PkgInfo @@ -110,35 +110,106 @@ advisorsapproval-II.code = { \MakeForm{advisorsapproval-II} }, - receipts-I.usage = general, - receipts-I.code = { - \MakeForm{receipts-II} - }, receipts-II.usage = general, receipts-II.code = { - \MakeForm{receipts-II} + \bool_if:nTF \l__ufrgscca_emptyforms_bool + { + \SetReviewer{1} + \tl_set:Nn \ReviewerBookMarkTL {} + \MakeForm{receipts-II} + } + { + \SetReviewer{1} + \studentReviewerSetCase{1} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~1} + } + \MakeForm{receipts-II} + } }, examinersforms-I.usage = general, examinersforms-I.code = { - \SetReviewer{2} - \MakeForm{examinersform-I} - \SetReviewer{3} - \MakeForm{examinersform-I} + \bool_if:nTF \l__ufrgscca_emptyforms_bool + { + \SetReviewer{1} + \tl_set:Nn \ReviewerBookMarkTL {} + \MakeForm{examinersform-I} + } + { + \SetReviewer{2} + \studentReviewerSetCase{2} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~2} + } + \MakeForm{examinersform-I} + \SetReviewer{3} + \studentReviewerSetCase{3} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~3} + } + \MakeForm{examinersform-I} + } }, examinersforms-II.usage = general, examinersforms-II.code = { - \SetReviewer{1} - \MakeForm{receipts-II} - \MakeForm{examinersform-II} - \MakeForm{correctionsform-II} - \SetReviewer{2} - \MakeForm{receipts-II} - \MakeForm{examinersform-II} - \MakeForm{correctionsform-II} - \SetReviewer{3} - \MakeForm{receipts-II} - \MakeForm{examinersform-II} - \MakeForm{correctionsform-II} + \bool_if:nTF \l__ufrgscca_emptyforms_bool + { + \SetReviewer{1} + \tl_set:Nn \ReviewerBookMarkTL {} + \MakeForm{receipts-II} + \MakeForm{examinersform-II} + \MakeForm{correctionsform-II} + } + { + \SetReviewer{1} + \studentReviewerSetCase{1} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~1} + } + \MakeForm{receipts-II} + \MakeForm{examinersform-II} + \MakeForm{correctionsform-II} + \SetReviewer{2} + \studentReviewerSetCase{2} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~2} + } + \MakeForm{receipts-II} + \MakeForm{examinersform-II} + \MakeForm{correctionsform-II} + \SetReviewer{3} + \studentReviewerSetCase{3} + { + \eDataSet{student.reviewer} + \tl_set:Ne \ReviewerBookMarkTL {~-~\eDataFields{name}} + } + { + \tl_set:Nn \ReviewerBookMarkTL {~-~3} + } + \MakeForm{receipts-II} + \MakeForm{examinersform-II} + \MakeForm{correctionsform-II} + } }, rectifyapproval-I.usage = general, rectifyapproval-I.code = { @@ -152,14 +223,19 @@ \NewDocumentCommand{\tcforms}{m}{% + \bool_set_false:N \l__ufrgscca_emptyforms_bool \__ufrgscca_student_emptyfields_if_none: + \eDataSet{student} + \tl_set:Ne \StudentBookMarkTL {\eDataFields{name}~-~} \SetKeys[forms]{#1}% } \NewDocumentCommand{\tcemptyforms}{m} { + \bool_set_true:N \l__ufrgscca_emptyforms_bool \__ufrgscca_emptyfields: + \tl_set:Nn \StudentBookMarkTL {} \SetKeys[forms]{#1}% } @@ -181,6 +257,15 @@ \prop_put:Nnn \l__ufrgscca_forms_prop {#1.#2}{#3} } + +%%% +% Those variables below are used to set bookmarks at the many forms +% They *must* be fully expandable ! +%%% +\tl_new:N \StudentBookMarkTL +\tl_new:N \ReviewerBookMarkTL +\bool_new:N \l__ufrgscca_emptyforms_bool + \NewDocumentCommand{\MakeForm}{m} { \begin{center} \noindent diff --git a/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty b/Master/texmf-dist/tex/latex/ufrgscca/ufrgscca-lists.sty index 8e075be0ca6..d09a23de34a 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA auxiliary lists commands} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca-lists} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19} , - version .code:n = {2.4a} , + date .code:n = {2024/02/25} , + version .code:n = {2.5} , 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 57bb8926bf6..e5ced4a3314 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA PPC commands} %%%%%%% @@ -41,8 +41,8 @@ { name .code:n = {ufrgscca-ppc} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , 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 a0f813deb56..3b57ee521c5 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.4a} {2024/02/19} +%% This is version {2.5} {2024/02/25} %% %% 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/02/19} - {2.4a} + {2024/02/25} + {2.5} {UFRGS/CCA class} @@ -42,8 +42,8 @@ { name .code:n = {ufrgscca} , prefix .code:n = {ufrgscca} , - date .code:n = {2024/02/19}, - version .code:n = {2.4a} , + date .code:n = {2024/02/25}, + version .code:n = {2.5} , description .code:n = {UFRGS/CCA~a~report~based~class~bundle} } \cs_if_exist:NF \PkgInfo -- cgit v1.2.3