fei (17dec18)

git-svn-id: svn://tug.org/texlive/trunk@49439 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 28 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/fei/fei.cls b/Master/texmf-dist/tex/latex/fei/fei.cls
index eb892f837b9..ce028530517 100644
--- a/Master/texmf-dist/tex/latex/fei/fei.cls
+++ b/Master/texmf-dist/tex/latex/fei/fei.cls
@@ -14,22 +14,22 @@
 %% See http://www.latex-project.org/lppl.txt
 %% -----------------------------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2018/09/30 4.3 Modelo da FEI]
+\ProvidesClass{fei}[2018/12/17 4.3.1 Modelo da FEI]
 
 \DeclareOption{xindy}{
 \PassOptionsToPackage{\CurrentOption}{imakeidx}
-\PassOptionsToPackage{\CurrentOption}{glossaries}
+\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
 }
 
 \newif\ifglossaries
 \glossariesfalse
 \DeclareOption{symbols}{
 \glossariestrue
-\PassOptionsToPackage{\CurrentOption}{glossaries}
+\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
 }
 \DeclareOption{acronym}{
 \glossariestrue
-\PassOptionsToPackage{\CurrentOption}{glossaries}
+\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
 }
 \newif\ifsublist
 \sublistfalse
@@ -298,6 +298,8 @@ postheadspace=1em
 
 \renewcommand{\cftbeforechapterskip}{0pt} % remove recuo antes de entradas de cap^^c3^^adtulos no sum^^c3^^a1rio
 
+
+
 \renewcommand{\cftchapterfont}{\bfseries} % coloca o titulo de cap^^c3^^adtulos em negrito
 \renewcommand{\cftsubsectionfont}{\bfseries} % coloca o titulo das secoes em negrito
 \renewcommand{\cftsubsubsectionfont}{\bfseries\itshape} % coloca o titulo das secoes em negrito
@@ -430,14 +432,17 @@ postheadspace=1em
 \newenvironment{agradecimentos}{\part*{Agradecimentos}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}}
 
 \RequirePackage{imakeidx}
-\renewcommand{\indexname}{\'Indice}
-\let\oldmakeindex\makeindex
+\indexsetup{level=\part*}
+\addto\captionsbrazil{%
+\renewcommand{\indexname}{\'Indice}%
+}
+
 \let\oldprintindex\printindex
-\renewcommand{\makeindex}{\oldmakeindex[title=\noindent\hfill\'INDICE\hfill\mbox{}]}
-\renewcommand{\printindex}{\addcontentsline{toc}{chapter}{\hspace{\cftchapternumwidth}\'INDICE}%
+\renewcommand{\printindex}{\clearpage\phantomsection\addcontentsline{toc}{chapter}{\hspace{\cftchapternumwidth}\'INDICE}%
 \renewcommand{\chapter}{%
 \@startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\clearpage\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}%
-\oldprintindex}%
+\oldprintindex%
+}%
 
 
 
@@ -445,7 +450,7 @@ postheadspace=1em
 
 \ifglossaries
 \ifsublist
-\RequirePackage[nomain,nonumberlist]{glossaries}
+\RequirePackage[nomain,nonumberlist,section=part]{glossaries-extra}
 \setglossarystyle{alttree}
 \glssetwidest[0]{}
 \glssetwidest[1]{aaaaaaaaaaaa}
@@ -453,7 +458,7 @@ postheadspace=1em
 \renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}\vspace*{-2\baselineskip}}
 
 \else
-\RequirePackage[nomain,nonumberlist,nogroupskip]{glossaries}
+\RequirePackage[nomain,nonumberlist,section=part,nogroupskip]{glossaries-extra}
 
 \newglossarystyle{mylong}{%
 \setglossarystyle{long}% base this style on the long style
@@ -470,11 +475,19 @@ postheadspace=1em
 \renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}}
 \fi
 \addto\captionsbrazil{%
-\renewcommand*{\acronymname}{\noindent\hfill Lista de Abreviaturas \hfill \mbox{}}%
-\renewcommand*{\glssymbolsgroupname}{\noindent\hfill Lista de S\'imbolos \hfill \mbox{}}}
+\renewcommand*{\acronymname}{Lista de Abreviaturas}%
+\renewcommand*{\glssymbolsgroupname}{Lista de S\'imbolos}}
 
 \renewcommand*{\glsclearpage}{\pagestyle{empty}}
 \renewcommand*{\glossarypostamble}{\pagestyle{empty}\cleardoublepage}
+\setabbreviationstyle[acronym]{long-short-user}
+\glstocfalse
+
+\renewcommand{\glsxtrpostdescacronym}{%
+\ifglshasfield{\glsxtruserfield}{\glscurrententrylabel}%
+{ (\glscurrentfieldvalue)}%
+{}%
+}
 \fi
 
 \addto\captionsbrazil{%
@@ -521,6 +534,7 @@ style=abnt]{biblatex}
 bibliography = {REFER\^ENCIAS}
 }
 
+
 \let\oldprintbibliography\printbibliography
 
 \renewcommand{\printbibliography}{%
@@ -538,7 +552,7 @@ bibliography = {REFER\^ENCIAS}
 \urlstyle{same}% URLs nas refer^^c3^^aancias devem ter a mesma fonte do texto
 }
 
-\newcommand*{\citefloat}[1]{\citeauthor*{#1}, \citeyear*{#1}}
+\newcommand*{\citefloat}[1]{\textcite*{#1}}
 
 \renewenvironment{quote}
 {\begin{SingleSpace}\list{}{%