fei (13sep18)

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

5 files changed, 60 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/fei/fei-template.tex b/Master/texmf-dist/doc/latex/fei/fei-template.tex
index 87045916d5b..5af3cdd10f5 100644
--- a/Master/texmf-dist/doc/latex/fei/fei-template.tex
+++ b/Master/texmf-dist/doc/latex/fei/fei-template.tex
@@ -1,4 +1,4 @@
-\documentclass[rascunho,xindy,acronym, symbols]{fei}
+\documentclass[rascunho,xindy,acronym,symbols]{fei}
 \usepackage[utf8]{inputenc}
 
 %%%% -- Configuracoes Iniciais
diff --git a/Master/texmf-dist/doc/latex/fei/fei.pdf b/Master/texmf-dist/doc/latex/fei/fei.pdf
index 695e16b9662..82501dd284a 100644
--- a/Master/texmf-dist/doc/latex/fei/fei.pdf
+++ b/Master/texmf-dist/doc/latex/fei/fei.pdf
diff --git a/Master/texmf-dist/doc/latex/fei/referencias.bib b/Master/texmf-dist/doc/latex/fei/referencias.bib
index 47cf8f0f6f2..c8b31a87a13 100644
--- a/Master/texmf-dist/doc/latex/fei/referencias.bib
+++ b/Master/texmf-dist/doc/latex/fei/referencias.bib
@@ -1,4 +1,3 @@
-
 @Book{art1,
   title         = {The Art of Computer Programming: Fundamental algorithms},
   author        = {Donald Knuth},
@@ -115,7 +114,6 @@
   author        = {Thomas Little Heath},
   year          = 1921,
   publisher     = {Clarendon Press},
-  url           = {http://books.google.com.br/books?id=h4JsAAAAMAAJ},
   number        = {v. 1},
   series        = {A History of Greek Mathematics}
 }
diff --git a/Master/texmf-dist/source/latex/fei/fei.dtx b/Master/texmf-dist/source/latex/fei/fei.dtx
index 6eb9931cdf3..5c0ba61aef1 100644
--- a/Master/texmf-dist/source/latex/fei/fei.dtx
+++ b/Master/texmf-dist/source/latex/fei/fei.dtx
@@ -1282,7 +1282,7 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
 % \fi
 %<*class>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2018/03/02 4.1.1 Modelo da FEI]
+\ProvidesClass{fei}[2018/09/12 4.2 Modelo da FEI]
 
 % passa a opção do xindy pros pacotes que podem utilizá-lo
 \DeclareOption{xindy}{
@@ -1362,7 +1362,35 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
 \setulmarginsandblock{30mm}{20mm}{*}
 \checkandfixthelayout
 
-\linespread{1.25} % espaçamento entre linhas
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% A POLEMICA DO ESPACAMENTO DE "UM E MEIO"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% these are the commands provided by memoir
+% \OnehalfSpacing
+% \DoubleSpacing
+
+% these commands exist natively on LaTeX
+% the values below are magically recommended for one half and double spacing
+% more on their values here https://en.wikibooks.org/wiki/LaTeX/Text_Formatting#Line_Spacing
+% \linespread{1.3}
+% \linespread{1.6}
+
+% this is the value I visually found closer to Word one-half spacing
+% it also adds no extra dependencies
+\linespread{1.5}
+
+% to use the setspace package with memoir, these lines must be added
+% \DisemulatePackage{setspace}
+% \usepackage{setspace}
+
+% then the linespread command presents a totally different behavior
+% also, this command is provided by setspace, which seems promising
+% \spacing{1.5}
+% setspace also provides
+% \onehalfspacing
+% \doublespacing
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \setlength{\parindent}{1.25cm} % recuo do paragrafo
 
 % cabecalho e rodape
@@ -1496,7 +1524,7 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
 % não há recuo no título de nenhum nível de nenhuma seção
 % títulos dos capítulos são em negrito, maiúsculo e com distâncias de 1,5 cm do parágrafo que o sucede
 \renewcommand{\chapter}{\cleardoublepage\pagestyle{plain}%
- \@startsection{chapter}{0}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}
+ \@startsection{chapter}{0}{0pt}{1pt}{1pt}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}
 
 % demais níveis de seção possuem distância de 1,5 linhas do parágrafo sucessor e predecessor
 \renewcommand{\section}{%
@@ -1699,6 +1727,19 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
   \@startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\clearpage\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}%
  \oldprintindex}%
 
+% \begin{filecontents*}{\jobname.xmpdata}
+% \Title        {Classe LaTeX FEI}
+% \Author       {Douglas De Rizzo Meneghetti}
+% \Copyright    {Copyright \copyright\ 2018 "Douglas De Rizzo Meneghetti"}
+% \Keywords     {manual\sep
+%                latex\sep
+%                tipografia}
+% \Publisher    {Baking International}
+% \Subject      {This is where you put the abstract.}
+% \end{filecontents*}
+
+% \usepackage[a-1b,mathxmp]{pdfx} 
+
 % hyperlinks entre partes do documento
 % deve ser o último a ser carregado, exceto pelo abntex2cite, simplesmente porque deu erro quando tentei
 % funcionou posicionado antes do glossaries, possibilitando links das variaveis para lista de simbolos
@@ -1789,8 +1830,7 @@ A seguir, as descrições dos arquivos auxiliares gerados durante o processo de
                 uniquelist=false,
                 isbn=false,
                 doi=false,
-                style=abnt,
-                extradate]{biblatex}
+                style=abnt]{biblatex}
 \setlength{\bibitemsep}{1.0\baselineskip}
 
 \DefineBibliographyStrings{brazil}{%
diff --git a/Master/texmf-dist/tex/latex/fei/fei.cls b/Master/texmf-dist/tex/latex/fei/fei.cls
index 9a8031f32f8..15eae294ccf 100644
--- a/Master/texmf-dist/tex/latex/fei/fei.cls
+++ b/Master/texmf-dist/tex/latex/fei/fei.cls
@@ -14,7 +14,7 @@
 %% See http://www.latex-project.org/lppl.txt
 %% -----------------------------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2018/03/02 4.1.1 Modelo da FEI]
+\ProvidesClass{fei}[2018/09/12 4.2 Modelo da FEI]
 
 \DeclareOption{xindy}{
  \PassOptionsToPackage{\CurrentOption}{imakeidx}
@@ -75,7 +75,15 @@
 \setulmarginsandblock{30mm}{20mm}{*}
 \checkandfixthelayout
 
-\linespread{1.25} % espa^^c3^^a7amento entre linhas
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\linespread{1.5}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \setlength{\parindent}{1.25cm} % recuo do paragrafo
 
 \makepagestyle{title} % pagina de titulo
@@ -185,7 +193,7 @@
  \@startsection{part}{-1}{0pt}{\baselineskip}{\baselineskip}{\cleardoublepage\fontsize{12pt}{14.4pt}\centering\bfseries\MakeUppercase}}
 
 \renewcommand{\chapter}{\cleardoublepage\pagestyle{plain}%
- \@startsection{chapter}{0}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}
+ \@startsection{chapter}{0}{0pt}{1pt}{1pt}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}
 
 \renewcommand{\section}{%
  \@startsection{section}{1}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\MakeUppercase}}
@@ -357,6 +365,8 @@
   \@startsection{chapter}{0}{0pt}{0pt}{1.5cm}{\clearpage\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}%
  \oldprintindex}%
 
+
+
 \RequirePackage[pdftex,pdfborder={0 0 0},colorlinks={false}]{hyperref}
 
 \ifglossaries
@@ -439,8 +449,7 @@
                 uniquelist=false,
                 isbn=false,
                 doi=false,
-                style=abnt,
-                extradate]{biblatex}
+                style=abnt]{biblatex}
 \setlength{\bibitemsep}{1.0\baselineskip}
 
 \DefineBibliographyStrings{brazil}{%