texlive[64561] Master/texmf-dist: abntexto (30sep22)
commits+karl at tug.org
commits+karl at tug.org
Fri Sep 30 22:55:07 CEST 2022
Revision: 64561
http://tug.org/svn/texlive?view=revision&revision=64561
Author: karl
Date: 2022-09-30 22:55:07 +0200 (Fri, 30 Sep 2022)
Log Message:
-----------
abntexto (30sep22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/abntexto/README
trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.pdf
trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.tex
trunk/Master/texmf-dist/tex/latex/abntexto/abntexto.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/abntexto/abntexto.bib
Modified: trunk/Master/texmf-dist/doc/latex/abntexto/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/abntexto/README 2022-09-30 20:54:41 UTC (rev 64560)
+++ trunk/Master/texmf-dist/doc/latex/abntexto/README 2022-09-30 20:55:07 UTC (rev 64561)
@@ -1,7 +1,8 @@
Public Domain Software
-2022-09-25
-1.0.0-alpha
+2022-09-29
+1.1.0-alpha
Elayson
-elaysonabreu at gmail.com
+abntexto dot classe at gmail dot com
-abntexto is a LaTeX class for the elaboration of academic works according to the guidelines of the Associação Brasileira de Normas Técnicas (ABNT).
\ No newline at end of file
+The abntexto is a LaTeX class for the elaboration of academic works according
+to the guidelines of the Associação Brasileira de Normas Técnicas (ABNT).
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.tex 2022-09-30 20:54:41 UTC (rev 64560)
+++ trunk/Master/texmf-dist/doc/latex/abntexto/abntexto-manual.tex 2022-09-30 20:55:07 UTC (rev 64561)
@@ -4,21 +4,25 @@
\usepackage[brazil]{babel}
\usepackage[T1]{fontenc}
-\usepackage[varqu,varl,scale=0.85]{inconsolata}
-\usepackage[matchlowercase]{tgheros} \renewcommand\familydefault\sfdefault
+\usepackage[scale=0.85]{inconsolata}
+\usepackage[matchlowercase]{tgheros} \def\familydefault{\sfdefault}
\usepackage{lipsum} \def\lip{\lipsum[1][1-2]}
\usepackage{graphicx}
\usepackage{xcolor}
+\usepackage[style=abnt]{biblatex} \addbibresource{abntexto.bib}
\usepackage[colorlinks]{hyperref}
+%\let\href=\relax
-% MARKUP DEFS
+% MARKUP
% ================================================
-\def\cs#1{{\ttfamily \string#1}}
-\def\meta#1{\textsf{⟨\textit{\fontseries{c}\selectfont #1}⟩}} % ⟨#1⟩
-\def\cc#1{{\ttfamily \{\meta{#1}\}}}
-\def\kk#1{{\ttfamily [\meta{#1}]}}
+\def\ttnoligs{\ttfamily\@noligs}
+\def\cs#1{{\ttnoligs \string#1}}
+\def\meta#1{{\ttnoligs <#1>}} % ⟨⟩
+\def\cc#1{{\ttnoligs \{\meta{#1}\}}}
+\def\kk#1{{\ttnoligs [\meta{#1}]}}
+
\def\arg{\cc{arg}}
\def\opt{\kk{opt}}
\def\argi{\cc{argi}}
@@ -27,10 +31,9 @@
\def\opti{\kk{opti}}
\def\optii{\kk{optii}}
\def\optiii{\kk{optiii}}
-\def\ccval#1{{\ttfamily \{#1\}}}
-\def\kkval#1{{\ttfamily [#1]}}
-\def\cls#1{\textsf{\textit{#1}}}
-\def\pkg#1{\texttt{#1}}
+\def\ccval#1{{\ttnoligs \{#1\}}}
+\def\kkval#1{{\ttnoligs [#1]}}
+\def\pkg#1{{\ttnoligs #1}}
% VERBATIM
% ================================================
@@ -37,41 +40,41 @@
\def\adef#1{\catcode`#1=13 \begingroup \lccode`\~=`#1\lowercase{\endgroup\def~}}
\def\dodef#1{\catcode`#1=12 }
-\def\verbcatcodes{\let\do=\dodef \dospecials\obeyspaces\catcode`\%=14 }
+\def\verbcatcodes{\let\do=\dodef \dospecials \catcode`\%=14 \catcode`\|=0 }
-\long\def\verbon{\par\begingroup \verbcatcodes
- \catcode`\|=0 % escape char
- \adef\^^I{\space\space\space\space}\adef\^^M{\par\leavevmode}%
+\long\def\verbon{\par\begingroup \verbcatcodes\obeyspaces
+ \adef\^^I{\space\space\space}%
+ \adef\^^M{\par\leavevmode}%
\startverb
}
{\catcode`\|=0 \catcode`\\=12
- |long|gdef|startverb#1\verboff{|verbbox{#1}|par|endgroup |verbreset}
+ |gdef|startverb#1\verboff{|verbbox{#1}|par|endgroup |verbreset}
}
\def\verbbox#1{\def\tnba at placewidth{\hsize \advance\hsize-3cm}%
- \ifx\tnba at savedplace\empty \else \vskip\placeabovespace \fi
+ \ifx\tnba at savedplace\empty\else\vskip\placeabovespace\fi
\parindent=0pt
\ifx\tnba at savedplace\empty\else\tnba at makelegend\fi
- \nobreak\par\nointerlineskip \kern10pt
+ \nobreak\nointerlineskip\vskip10pt
{\verbfont{#1}}%
- \nobreak\nointerlineskip
- \ifx\tnba at savedsrc\empty \else \tnba at makesrc \vskip\placebelowspace \fi
+ \nobreak\nointerlineskip\vskip8pt
+ \ifx\tnba at savedsrc\empty\else\tnba at makesrc\vskip\placebelowspace\fi
}
\def\verbreset{%
\let\tnba at savedplace=\empty
\let\tnba at savedlegend=\empty
\let\tnba at savedsrc=\empty
- \let\@currentlabel=\relax
+ \let\@currentlabel=\empty
}
-\long\def\verbfont{\raggedright\leftskip=6pt \singlesp\ttfamily\@noligs\leftframed}
+\def\verbfont{\raggedright\leftskip=6pt\singlesp\ttnoligs\leftframed}
\long\def\leftframed#1{\setbox0=\vtop{#1}%
\hbox{{\color{graybar}\kern1.5cm\vrule width1pt}\box0}%
}
-% PERSONAL DEFS
+% MISC
% ================================================
-\sizeselectordef\large{14pt}{17pt}
-\sizeselectordef\Large{22pt}{25pt}
+\sizeselectordef\large{14.4pt}{17pt}
+\sizeselectordef\Large{20.74pt}{25pt}
\sizeselectordef\LARGE{25pt}{30pt}
\definecolor{graybar}{gray}{0.75}
@@ -87,6 +90,9 @@
\clubpenalty=10000
\widowpenalty=10000
+\let\cite=\textcite
+\def\appendixlabelwidth{7em}
+
\makeatother
@@ -99,12 +105,12 @@
abntexto\\[0.4em] \Large\itshape\mdseries
Classe para {\upshape\LaTeX}\\[2em] \normalfont\large
Elayson\\[1ex]
- \href{mailto:elaysonabreu at gmail.com}{elaysonabreu at gmail.com}\\[2.5ex]
+ \href{mailto:abntexto.classe at gmail.com}{abntexto dot classe at gmail dot com}\\[2.5ex]
\today\par}
\vskip3in
-{\centering \large\ttfamily 1.0.0-alpha\par}
+{\centering \large\ttfamily 1.1.0-alpha\par}
\newpage
@@ -114,17 +120,17 @@
\section{Apresentação}
-O \cls{abntexto} é uma classe do \LaTeX\ criada para facilitar a utilização das normas da Associação Brasileira de Normas Técnicas (ABNT) em trabalhos acadêmicos (monografias, dissertações, teses).
+O \pkg{abntexto} é uma classe do \LaTeX\ criada para facilitar a utilização das normas da Associação Brasileira de Normas Técnicas (ABNT) em trabalhos acadêmicos (monografias, dissertações, teses).
-Este \emph{não} é um manual sobre \LaTeX\ (ou \TeX, a ferramenta que o constitui) nem tampouco uma descrição detalhada sobre as normas ABNT. Para aprender sobre \LaTeX\ leia \href{https://www.ctan.org/pkg/latex-via-exemplos}{\LaTeXe\ Via Exemplos} ou \href{https://www.ctan.org/pkg/latex2e-help-texinfo}{\LaTeXe: An unofficial reference manual}, disponível também em francês. Além disso, também se pode ler \href{https://www.ctan.org/pkg/texbytopic}{\TeX\ by Topic} para aprender sobre o sistema \TeX.
+Este \emph{não} é um manual sobre \LaTeX\ (ou \TeX, a ferramenta que o constitui) nem tampouco uma descrição detalhada sobre as normas ABNT. Para aprender sobre \LaTeX\ leia \cite{viaexemplos} ou \cite{latex2eunnoficial}, disponível também em francês. Além disso, também se pode ler \cite{texbytopic} para aprender sobre o sistema \TeX\footnote{Note que os livros referenciados não foram realmente citados e isso não é aceito na Norma, no entanto este não é um trabalho acadêmico real, mas um manual.}.
-Já existe uma classe para aplicação das normas ABNT cujo nome é \cls{abntex2}. Mas, diferente desta, o \cls{abntexto} não depende do \cls{memoir}, uma classe de código-fonte e manual extensos e que implementa funções as quais, em sua maioria, não são pertinentes a um documento que use as diretrizes da ABNT.
+Já existe uma classe para aplicação das normas ABNT cujo nome é \pkg{abntex2}. Mas, diferente desta, o \pkg{abntexto} não depende do \pkg{memoir}, uma classe de código-fonte e manual extensos e que implementa funções as quais, em sua maioria, não são pertinentes a um documento que use as diretrizes da ABNT.
-As normas ABNT as quais o \cls{abntexto} se propõe a seguir são aquelas em vigor até o momento da criação deste manual.
+As normas ABNT as quais o \pkg{abntexto} se propõe a seguir são aquelas em vigor até o momento da criação deste manual.
\section{Chamando a classe}
-Digite as linhas em \ref{vb:início} e use \cls{abntexto}.
+Digite as linhas em \ref{vb:início} e use \pkg{abntexto}.
\legend{verb}{Início} \src\me
\label{vb:início}
@@ -209,13 +215,13 @@
\label{vb:topics}
\verbon
\begin{topics}
- \item \label{alínea:x} 1
+ \item \label{al:x} 1
\begin{topics}
\item x
\item y
\item z
\end{topics}
- \item \label{alínea:y} 2
+ \item \label{al:y} 2
\item 3
\end{topics}%
\verboff
@@ -241,12 +247,20 @@
\section{Formatação de {\ttfamily\protect\textbackslash cite} e referências}
-Até o momento esta classe não possui macros para formatação de \cs\cite\ e referências. Utilize \cs{\usepackage\{abnt2cite\}} ou \cs{\usepackage[style=abnt]\{biblatex\}}.
+Até o momento o \pkg{abntexto} não possui macros para formatação de \cs\cite\ e referências. Utilize \cs{\usepackage\{abnt2cite\}} ou \cs{\usepackage[style=abnt]\{biblatex\}}.
\section{Citações}
-Para inserir aspas em citações diretas use \cs\qt\cc{texto}. Mas, se tratando de citações diretas com mais de três linhas, alterne para \cs\quote\ccval{enquoted text \cs\cite\cc{key}}.
+Para inserir aspas em citações diretas use \cs\qt\ccval{texto}. Mas, se tratando de citações diretas com mais de três linhas, alterne para \cs\quote\ccval{texto \cs\cite\cc{key}}.
+\newpage
+
+{\def\section#1#2{\heading{#2}}%
+ \printbibliography\par}
+
+\newpage
+\appendix
+
\section{Código-fonte}
Em progresso\dots
Added: trunk/Master/texmf-dist/doc/latex/abntexto/abntexto.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/abntexto/abntexto.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/abntexto/abntexto.bib 2022-09-30 20:55:07 UTC (rev 64561)
@@ -0,0 +1,25 @@
+ at book{texbytopic,
+author = {Viktor Eijkhout},
+title = {\TeX\ by topic: a \TeX nician’s reference},
+location = {England},
+publisher = {Addison-Wesley},
+date = {1992},
+url = {https://www.ctan.org/pkg/texbytopic},
+urldate = {2022-09-28}
+}
+ at book{viaexemplos,
+author = {Sadao Massago},
+title = {\LaTeXe\ Via Exemplos},
+location = {São Paulo},
+date = {2022-05-17},
+url = {https://www.ctan.org/pkg/latex-via-exemplos},
+urldate = {2022-09-28}
+}
+ at book{latex2eunnoficial,
+author = {Torsten Martinsen and Stephen Gilmore and Karl Berry},
+title = {\LaTeXe: An unofficial reference manual},
+date = {2022-05},
+url = {https://www.ctan.org/pkg/latex2e-help-texinfo},
+urldate = {2022-09-28}
+}
+
Property changes on: trunk/Master/texmf-dist/doc/latex/abntexto/abntexto.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/abntexto/abntexto.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/abntexto/abntexto.cls 2022-09-30 20:54:41 UTC (rev 64560)
+++ trunk/Master/texmf-dist/tex/latex/abntexto/abntexto.cls 2022-09-30 20:55:07 UTC (rev 64561)
@@ -1,9 +1,25 @@
%! Public Domain Software
-%! 2022-09-25
-%! 1.0.0-alpha
+%! 2022-09-29
+%! 1.1.0-alpha
%! Elayson
-%! elaysonabreu at gmail.com
+%! abntexto dot classe at gmail dot com
+% ANNOUNCEMENT
+
+% The implementation of legend areas has been improved.
+
+% Inclusion of the \appendix and \annex macros.
+
+% Removal of \noprotrusion and \extfile macros.
+
+% Better compatibility with the hyperref package.
+
+% The functionality of topics has been improved.
+
+% Footnotes have been adjusted according to the Standard.
+
+% Additions to the manual.
+
%! SUMÁRIO
%! PRÉ-CONFIGURAÇÕES
@@ -15,6 +31,7 @@
%! ALÍNEAS
%! TABELAS
%! ÁREAS DE LEGENDA
+%! NOTAS DE RODAPÉ
%! UTILIDADES
%! IDENTIFICAÇÃO DO TRABALHO
%! PATCHS, HOOKS
@@ -23,27 +40,18 @@
% |sec PRÉ-CONFIGURAÇÕES
% !=======================================================
-% Identificação do formato |TeX| e da classe. Apenas o pacote |pkg=keyval= é carregado nesta classe.
+% Identificação do formato |TeX| e da classe. Apenas o pacote |pkg keyval | é carregado no |pkg abntexto .
% |bcode !------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{abntexto}[2022-09-25 1.0.0-alpha Preparation of works in ABNT standards]
+\ProvidesClass{abntexto}[2022-09-29 1.1.0-alpha Preparation of works in ABNT standards]
\RequirePackage{keyval}
% |ecode !------------------------------------------------
-% Macros auxiliares e sistema |dest=<key|eq val>=.
+% Definição do sistema |emph chave|eq%valor | e de um comando de |emph debug .
-\ifx\csstring\undefined
- \def\tnba at csstring#1{\expandafter\tnba at csstringA\string#1//}
- \def\tnba at csstringA#1#2//{#2}
-\else
- \let\tnba at csstring=\csstring
-\fi
-
-% Definição do sistema |dest=keyval= e de um comando de |dest=debug=.
-
% |bcode !------------------------------------------------
\def\tnba at keyprefix{tnba}
@@ -52,36 +60,24 @@
\def\tnba at setmacrokeys#1{\setkeys{\tnba at keyprefix @#1}}
\def\advancecount#1{\global\advance#1by1 }
-\edef\tnba at bslash{\tnba at csstring\\}
-\def\tnba at addto#1#2{\expandafter\def\expandafter#1\expandafter {#1#2}}
+\def\tnba at addto#1#2{\expandafter\def\expandafter#1\expandafter{#1#2}}
\def\tnba at tobdocument{\tnba at addto\tnba at bdocumenthook}
-\AddToHook{begindocument}{\def\tnba at bdocument{}}
+\let\tnba at bdocumenthook=\empty
+\AddToHook{begindocument}{\def\tnba at inbody{}\tnba at bdocumenthook}
\def\tnba at error{\ClassError{abntexto}}
% |ecode !------------------------------------------------
-% |sec FONTES
-% !================================================
+% |sec FONTE TIPOGRÁFICA
+% !=======================================================
-\def\tnba at inputfonts#1{\@namedef{tnba at fonts@#1}}
+% Apenas o tamanho 12|,pt está definido. Defina outros usando |cs fontsizedef |metac size |metac defs .
-\tnba at inputfonts{Latin Modern}{\usepackage{amssymb,lmodern,bm}}
-
-\tnba at inputfonts{helvetica-clone}{\def\sfdefault{qhv}\def\familydefault{\sfdefault}}
-\tnba at inputfonts{palatino-clone}{\usepackage{newpxtext,newpxmath,bm}}
-\tnba at inputfonts{timesnewroman-clone}{\usepackage{newtxtext,newtxmath,bm}}
-
-\def\fonts#1{\ifcsname tnba at fonts@#1\endcsname
- \csname tnba at fonts@#1\endcsname \else
- \tnba at error{Fonte *#1* desconhecida}\relax \fi
-}
-
-% Apenas o tamanho 12|,pt está definido. Defina outros usando |cs=fontsizedef=|metac=size=|metac=defs=.
-
% |bcode !------------------------------------------------
\def\fontsizedef#1#2{\@namedef{tnba at fontsize@#1}{#2}}
\def\sizeselectordef#1#2#3{\DeclareRobustCommand#1{\@setfontsize#1{#2}{#3}}}
+\def\normalsizedef#1#2{\def\normalsize{\@setfontsize\normalsize{#1}{#2}}}
\def\setfontsize#1{\ifcsname tnba at fontsize@#1\endcsname
\def\tnba at setfontsizehook{\csname tnba at fontsize@#1\endcsname} \else
\let\normalsize=\relax
@@ -89,9 +85,8 @@
}
\AddToHook{begindocument/before}{\tnba at setfontsizehook}
-% |ecode !------------------------------------------------
-\def\spacing#1{\ifx\tnba at bdocument\undefined
+\def\spacing#1{\ifx\tnba at inbody\undefined
\def\tnba at spacinghook{\tnba at spacing{#1}} \else
\tnba at spacing{#1}\fi \ignorespaces
}
@@ -102,10 +97,12 @@
\def\doublesp{\spacing{2}}
\AddToHook{begindocument}{\csname tnba at spacinghook\endcsname}
+% |ecode !------------------------------------------------
-% LAYOUT
-% ================================================
+% |sec |emph LAYOUT
+% !=======================================================
+% |bcode !------------------------------------------------
\def\tnba at keyfamily{paper}
\def\papersizedef#1(#2,#3){\def\tnba at keyfamily{paper}%
@@ -136,7 +133,7 @@
\advance\headsep-\fontcharht\font`1
\ifx\pdfpagewidth\undefined
\ifx\pagewidth\undefined
- \tnba at error{O comando \tnba at bslash paper só suporta saída em PDF. Use o formato PDF ou carregue o pacote *geometry*}\expandafter\enddocument\relax \else
+ \tnba at error{O comando \@backslashchar paper só suporta saída em PDF. Use o formato PDF ou carregue o pacote *geometry*}\expandafter\enddocument\relax \else
\horigin=0pt
\vorigin=0pt
\pagewidth=\paperwidth
@@ -158,7 +155,9 @@
\ifx\tnba at twoside\undefined \else
\csname @twoside\tnba at twoside\endcsname \fi
}
+% |ecode !------------------------------------------------
+% |bcode !------------------------------------------------
\def\pretextual{\paper{twoside=false}%
\let\@oddhead=\empty
\let\@evenhead=\empty
@@ -173,13 +172,13 @@
\justifying
\parindent=1.5cm
}
+% |ecode !------------------------------------------------
-% SUMÁRIO
-% ================================================
+% |sec SUMÁRIO
+% !=======================================================
+% |bcode !------------------------------------------------
\def\thepage{\the\c at page}
-\def\noprotrusion{\kern-1pt\kern1pt}
-\def\extfile#1{\@starttoc{#1}}
\def\extline#1#2#3#4{%
\begingroup
@@ -187,7 +186,7 @@
\extlineshape
\hskip-\leftskip {#3}\nobreak
\leaders\hbox{$\m at th \mkern4.5mu\hbox{.}\mkern4.5mu$}\hfil\nobreak
- \hbox to1.55em{\hss #4\noprotrusion}\par
+ \hbox to1.55em{\hss #4\kern-1pt\kern1pt}\par
\endgroup
}
\def\extlineshape{%
@@ -204,7 +203,7 @@
\usetocifont \nobreak
\extlineshape
\hskip-\leftskip \maybeuctoc{#1}\nobreak\hfil\nobreak
- \hbox to1.55em{\hss #2\noprotrusion}\par
+ \hbox to1.55em{\hss #2\kern-1pt\kern1pt}\par
\endgroup
}
\def\l at subsection {\extline{toc}{2}}
@@ -217,10 +216,12 @@
\def\tociiifont#1{\def\usetociiifont{#1}}
\def\tocivfont#1{\def\usetocivfont{#1}}
\def\tocvfont#1{\def\usetocvfont{#1}}
+% |ecode !------------------------------------------------
-% SECIONAMENTO
-% ================================================
+% |sec SECIONAMENTO
+% !=======================================================
+% |bcode !------------------------------------------------
\def\tnba at nbpar{\interlinepenalty=10000\par}
\def\noindentfirst{\global\everypar={\tnba at wipeepar \setbox7=\lastbox}}
\def\tnba at wipeepar{\global\everypar={}}
@@ -236,7 +237,9 @@
\ifdim\savedlastskip>\dimen0 \vskip\savedlastskip \else #2\fi
}
\def\smartbelowskip#1{#1\global\savedtitleskip=\lastskip \penalty11333}
+% |ecode !------------------------------------------------
+% |bcode !------------------------------------------------
\newcount\sectioncount
\newcount\subsectioncount
\newcount\subsubsectioncount
@@ -254,12 +257,16 @@
\def\subsubsectionmark#1{}
\def\paragraphmark#1{}
\def\subparagraphmark#1{}
+% |ecode !------------------------------------------------
+% |bcode !------------------------------------------------
\def\section#1{\par \smartaboveskip{\penalty351}{\vskip\sectionabove}\noindent
\advancecount\sectioncount
+ \def\@currentlabel{seção~\thesection}%
\setbox0=\hbox{\usesectionfont \thesection\quad}%
{\usesectionfont \hangindent=\wd0 \box0 \maybeucsec{#1}\tnba at nbpar}%
% \noindentfirst
+ \hreftocline{section}%
\addcontentsline{toc}{section}{\protect\extlabelbox{\thesection\hss}#1}%
\nobreak \smartbelowskip{\vskip\sectionbelow}%
}
@@ -268,6 +275,7 @@
\setbox0=\hbox{\usesubsectionfont \thesubsection\quad}%
{\usesubsectionfont \hangindent=\wd0 \box0 #1\tnba at nbpar}%
% \noindentfirst
+ \hreftocline{subsection}%
\addcontentsline{toc}{subsection}{\protect\extlabelbox{\thesubsection\hss}#1}%
\nobreak \smartbelowskip{\vskip\subsectionbelow}%
}
@@ -276,6 +284,7 @@
\setbox0=\hbox{\usesubsubsectionfont \thesubsubsection\quad}%
{\usesubsubsectionfont \hangindent=\wd0 \box0 #1\tnba at nbpar}%
% \noindentfirst
+ \hreftocline{subsubsection}%
\addcontentsline{toc}{subsubsection}{\protect\extlabelbox{\thesubsubsection\hss}#1}%
\nobreak \smartbelowskip{\vskip\subsubsectionbelow}%
}
@@ -284,6 +293,7 @@
\setbox0=\hbox{\useparagraphfont \theparagraph\quad}%
{\useparagraphfont \hangindent=\wd0 \box0 #1\tnba at nbpar}%
% \noindentfirst
+ \hreftocline{paragraph}%
\addcontentsline{toc}{paragraph}{\protect\extlabelbox{\theparagraph\hss}#1}%
\nobreak \smartbelowskip{\vskip\paragraphbelow}%
}
@@ -292,6 +302,7 @@
\setbox0=\hbox{\subsubparagraphfont \thesubparagraph\quad}%
{\usesubparagraphfont \hangindent=\wd0 \box0 #1\tnba at nbpar}%
% \noindentfirst
+ \hreftocline{subparagraph}%
\addcontentsline{toc}{subparagraph}{\protect\extlabelbox{\thesubparagraph\hss}#1}%
\nobreak \smartbelowskip{\vskip\subparagraphbelow}%
}
@@ -298,11 +309,16 @@
\def\heading#1{\noindent
{\usesectionfont \centering \maybeucsec{#1}\tnba at nbpar}%
-% \noindentfirst
\nobreak \vskip\sectionbelow
-% \addcontentsline{toc}{section}{\hbox to\extlabelwidth{}\maybeuctoc{#1}}%
}
+\def\hreftocline#1{\Hy at MakeCurrentHrefAuto{#1}%
+ \Hy at raisedlink{\hyper at anchorstart{\@currentHref}\hyper at anchorend}%
+}
+\tnba at tobdocument{\ifx\hypertarget\undefined \let\hreftocline=\@gobble \fi}
+% |ecode !------------------------------------------------
+
+% |bcode !------------------------------------------------
\def\tociuppercase{\def\maybeuctoc{\MakeUppercase}}
\def\tocilowercase{\let\maybeuctoc=\relax}
\def\sectionuppercase{\def\maybeucsec{\MakeUppercase}}
@@ -319,27 +335,61 @@
\def\subsubsectionspaces#1#2{\def\subsubsectionabove{#1}\def\subsubsectionbelow{#2}}
\def\paragraphspaces#1#2{\def\paragraphabove{#1}\def\paragraphbelow{#2}}
\def\subparagraphspaces#1#2{\def\subparagraphabove{#1}\def\subparagraphbelow{#2}}
+% |ecode !------------------------------------------------
-% CITAÇÕES
-% ================================================
+% |bcode !------------------------------------------------
+\newcount\appendixcount
+\newcount\annexcount
+\def\theappendix{\@Alph\appendixcount}
+\def\theannex{\@Alph\annexcount}
+\def\appendixlabelwidth{8em}
+\def\annexlabelwidth{6.2em}
+
+\def\l at appendix{%
+ \let\extlabelwidth=\appendixlabelwidth
+ \def\extlabelbox##1{\hbox to\extlabelwidth{Apêndice~##1~---~\hfil}}%
+ \l at section
+}
+\def\l at annex{%
+ \let\extlabelwidth=\annexlabelwidth
+ \def\extlabelbox##1{\hbox to\extlabelwidth{Anexo~##1~---~\hfil}}%
+ \l at section
+}
+
+\def\appendix{\def\section##1{\noindent \advance\appendixcount by1
+ {\usesectionfont \centering \maybeucsec{Apêndice~\theappendix~---~##1}\tnba at nbpar}%
+ \addcontentsline{toc}{appendix}{\protect\extlabelbox{\theappendix}##1}%
+ \nobreak \vskip\sectionbelow
+ }%
+}
+\def\annex{\def\section##1{\noindent \advance\annexcount by1
+ {\usesectionfont \centering \maybeucsec{Anexo~\theannex~---~##1}\tnba at nbpar}%
+ \addcontentsline{toc}{annex}{\protect\extlabelbox{\theannex}##1}%
+ \nobreak \vskip\sectionbelow
+ }%
+}
+% |ecode !------------------------------------------------
+
+% |sec CITAÇÕES
+% !=======================================================
+
+% |bcode !------------------------------------------------
\def\qt#1{``#1''}
\def\quote#1{\smartaboveskip{\penalty351}{\vskip\baselineskip}%
-\hfill\vtop{\advance\hsize-4cm \noindent\small #1\getprev}\useprev
+ \hbox to\hsize{\hfil\vtop{\advance\hsize-4cm \noindent\small #1\getprev}}\useprev
\smartbelowskip{\vskip\baselineskip}%
}
+% |ecode !------------------------------------------------
-% ALÍNEAS
-% ================================================
+% |sec ALÍNEAS
+% !=======================================================
+% |bcode !------------------------------------------------
\newcount\topicsdepth
\newcount\topicscount
-\def\topicsindenti{\advance\leftskip\topicslabelwidth}
-\def\topicsindentii{\advance\leftskip\topicslabelwidth \advance\leftskip\topicslabelwidth}
-\def\topicslabelwidth{4ex}
-
\def\topicsitem{\par\leavevmode\noindent \advance\topicscount by1
\def\@currentlabel{alínea~\@alph\topicscount )}%
\kern\dimexpr-\parindent-\topicslabelwidth\relax
@@ -350,23 +400,26 @@
\def\topicslabelii{---}
\def\topics{\par \advance\topicsdepth by1
- \leftskip=\parindent
- \csname topicsindent\romannumeral\topicsdepth\endcsname
+ \ifnum\topicsdepth=1 \advance\leftskip\parindent \fi
+ \advance\leftskip\topicslabelwidth
\edef\topicsmakelabel{\expandafter\noexpand\csname topicslabel\romannumeral\topicsdepth\endcsname}%
\let\item=\topicsitem
\tnba at addto\@esphack\ignorespaces
}
-
\let\endtopics=\par
+% |ecode !------------------------------------------------
% |sec TABELAS
-% ! ================================================
+% !=======================================================
+% |bcode !------------------------------------------------
\newenvironment{table}[1]{\begin{tabular}{#1}}{\end{tabular}}
+% |ecode !------------------------------------------------
-% ÁREAS DE LEGENDA
-% ================================================
+% |sec ÁREAS DE LEGENDA
+% !=======================================================
+% |bcode !------------------------------------------------
%\long\def\@makecaption#1#2{\sbox0{#1~—~#2}%
% \ifdim\wd0>\hsize
% #1~—~#2\par \else
@@ -389,24 +442,28 @@
% \@nameedef{ftype@#1}{\the\numexpr\tnba at lastplacenum+1}
% \@namedef{fnum@#1}{\csname #1name\endcsname ~\csname the#1\csname}
}
+% |ecode !------------------------------------------------
-\def\tnba at makelegend{\advancecount{\csname c@\tnba at savedplace\endcsname}%
- \hfil \hbox{\vtop{\setbox0=\hbox{\legendlabel \tnba at savedlegend}%
+% |bcode !------------------------------------------------
+\def\tnba at makelegend{\hbox to\hsize{\hfil\tnba at makelegendA\hfil}}
+\def\tnba at makelegendA{\advancecount{\csname c@\tnba at savedplace\endcsname}%
+ \vtop{\setbox0=\hbox{\legendlabel \tnba at savedlegend}%
\ifdim\wd0>\legendmaxwidth \hsize=\legendmaxwidth \else \hsize=\wd0 \fi
- \setbox0=\hbox{\legendlabel}\legendlabel
- \vtop{\advance\hsize-\wd0 \tnba at savedlegend}%
- }}%
+ \legendlabel
+ \vtop{\setbox0=\hbox{\legendlabel}\advance\hsize-\wd0 \tnba at savedlegend}%
+ }%
\addcontentsline{\csname ext@\tnba at savedplace\endcsname}%
- {\tnba at savedplace}%
- {\protect\extlabelbox\thelegend \tnba at savedlegend}%
+ {\tnba at savedplace}%
+ {\protect\extlabelbox\thelegend \tnba at savedlegend}%
}
-\def\tnba at makesrc{\vskip8pt
- \hfil \hbox{\vtop{\hsize=\tnba at placewidth
- \setbox0=\hbox{\srclabel}\srclabel
- \vtop{\advance\hsize-\wd0 \tnba at savedsrc\getprev}%
- }}\useprev
+
+\def\tnba at makesrc{\hbox to\hsize{\hfil\tnba at makesrcA\hfil}\useprev}
+\def\tnba at makesrcA{\vtop{\hsize=\tnba at placewidth \srclabel
+ \vtop{\setbox0=\hbox{\srclabel}\advance\hsize-\wd0 \tnba at savedsrc \getprev}}%
}
+% |ecode !------------------------------------------------
+% |bcode !------------------------------------------------
\def\legend#1#2{%
\ifdim\lastskip<0pt \else
\ifnum\lastpenalty=11333 \vskip-\placeabovespace \else
@@ -425,33 +482,49 @@
\def\tnba at savedsrc{#1}%
}
\def\srcname{Fonte}
+% |ecode !------------------------------------------------
-\def\placespaces#1#2{\def\placeabovespace{#1}\def\placebelowspace{#2}}
-
+% |bcode !------------------------------------------------
\let\tnba at savedplace=\empty
\let\tnba at savedlegend=\empty
\let\tnba at savedsrc=\empty
-\long\def\place#1{%
- \ifx\tnba at savedplace\empty \else \vskip\placeabovespace \fi
- \begingroup \setbox0=\hbox{\ignorespaces#1}\edef\tnba at placewidth{\the\wd0}%
+\long\def\place#1{\setbox0=\hbox{\ignorespaces#1}\edef\tnba at placewidth{\the\wd0}%
+ \vskip\placeabovespace
+ \begingroup
\parindent=0pt
- \ifx\tnba at savedplace\empty\else\tnba at makelegend\fi
- \nobreak\par\nointerlineskip
- \hbox to\hsize{\hss\box0\hss}%
- \nobreak\par\nointerlineskip
- \ifx\tnba at savedsrc\empty \else \tnba at makesrc \vskip\placebelowspace \fi
-\par
+ \ifx\tnba at savedplace\empty\else\tnba at makelegend\fi
+ \nointerlineskip\nobreak\vskip10pt
+ \hbox to\hsize{\hfil\box0\hfil}%
+ \nointerlineskip\nobreak\vskip8pt
+ \tnba at makesrc
+ \vskip\placebelowspace
\endgroup
\let\tnba at savedplace=\empty
\let\tnba at savedlegend=\empty
\let\tnba at savedsrc=\empty
- \let\@currentlabel=\relax
+ \let\@currentlabel=\empy
}
+\def\placespaces#1#2{\def\placeabovespace{#1}\def\placebelowspace{#2}}
+% |ecode !------------------------------------------------
-% UTILIDADES
-% ================================================
+% |sec NOTAS DE RODAPÉ
+% !=======================================================
+% As notas de rodapé também foram modificadas.
+
+% |bcode !------------------------------------------------
+\let\footnotesize=\relax
+\def\@makefnmark{\hbox{\@textsuperscript{\selectfont\@thefnmark}}}
+\def\@makefntext#1{\leavevmode \setbox0=\hbox{\@makefnmark\kern2pt}%
+\hangindent=\wd0 \box0 \small #1}
+\def\footnoterule{\kern18pt\hrule width5cm\kern2.6pt}
+% |ecode !------------------------------------------------
+
+% |sec UTILIDADES
+% !=======================================================
+
+% |bcode !------------------------------------------------
\def\getprev{\par\xdef\tnba at getprevA{\the\prevdepth}}
\def\useprev{\par\prevdepth=\tnba at getprevA}
@@ -468,10 +541,12 @@
\def\tnba at EnterS[#1]{\vskip#1\baselineskip}
\def\twonewpage{\newpage\leavevmode\newpage}
+% |ecode !------------------------------------------------
-% IDENTIFICAÇÃO DO TRABALHO
-% ================================================
+% |sec IDENTIFICAÇÃO DO TRABALHO
+% !=======================================================
+% |bcode !------------------------------------------------
%\long\def\indexcarddebug#1{\hbox{\vrule\vbox to7.5cm{\hsize=\hsize %\advance\hsize-2cm \advance\hsize-0.8pt
% \hrule\indexcardA{#1}\vss\indexcardbar\hrule}\vrule}%
%}
@@ -487,14 +562,15 @@
\def\indexcardbar{\hrule\kern1cm}
\def\judgeline#1{\par{\centering \rule{.7\linewidth}{.6pt}\\ #1\Enter[1.5]}}
+% |ecode !------------------------------------------------
-% |sec ?
-% ! ================================================
+% |sec A VÍRGULA COMO SEPARADOR DECIMAL
+% !=======================================================
+% |bcode !------------------------------------------------
{\catcode`,=\active
\gdef,{\futurelet\next\tnba at smartcomma}
}
-
\def\tnba at smartcomma{%
\ifx\next\@sptoken \else
\ifx\next\space \else \mathord \fi\fi
@@ -503,7 +579,9 @@
\mathchardef\tnba at mathcomma\mathcode`\,
\mathcode`\,="8000
+% |ecode !------------------------------------------------
+% |bcode !------------------------------------------------
\ifx\XeTeXversion\undefined
\AddToHook{begindocument/before}{
\let\tnba at hyper@linkstart=\hyper at linkstart
@@ -510,13 +588,14 @@
\protected\def\hyper at linkstart#1#2{\lowercase{\tnba at hyper@linkstart{#1}{#2}}}
}
\fi
+% |ecode !------------------------------------------------
% |sec INICIALIZAÇÃO
-% ! ================================================
+% !=======================================================
% |bcode !------------------------------------------------
\fontsizedef{12pt}{
- \sizeselectordef\normalsize{12pt}{14.5pt}
+ \normalsizedef{12pt}{14.5pt}
\sizeselectordef\small{10pt}{12pt}
}
\setfontsize{12pt}
@@ -568,19 +647,21 @@
\def\makelof{\heading{Lista de figuras}
\def\extlabelwidth{12.5ex}%
\def\extlabelbox##1{\hbox to\extlabelwidth{Figura ##1 ---\hfil}}%
- \extfile{lof}\newpage
+ \@starttoc{lof}\twonewpage
}
\def\makelot{\heading{Lista de tabelas}
- \def\extlabelwidth{12.5ex}
+ \def\extlabelwidth{12.5ex}%
\def\extlabelbox##1{\hbox to\extlabelwidth{Tabela ##1 ---\hfil}}%
- \extfile{lot}\newpage
+ \@starttoc{lot}\twonewpage
}
\def\maketoc{\heading{Sumário}
- \def\extlabelwidth{4ex}
+ \def\extlabelwidth{4ex}%
\def\extlabelbox##1{\hbox to\extlabelwidth{##1\hfil}}%
- \extfile{toc}\newpage
+ \@starttoc{toc}\newpage
}
+\def\topicslabelwidth{4ex}
+
\arrayrulewidth=0.4pt
\topskip=12pt
More information about the tex-live-commits
mailing list.