ucsmonograph (23nov18)

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

1 files changed, 59 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/ucsmonograph/ucsmonograph.cls b/Master/texmf-dist/tex/latex/ucsmonograph/ucsmonograph.cls
index 4c65147012e..15804d25603 100644
--- a/Master/texmf-dist/tex/latex/ucsmonograph/ucsmonograph.cls
+++ b/Master/texmf-dist/tex/latex/ucsmonograph/ucsmonograph.cls
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ucsmonograph}
-[2018/09/28 v1.1.2 Padrao de monografias da UCS]
+[2018/11/22 v1.2.0 Padrao de monografias da UCS]
 
 
 \RequirePackage{ifthen}
@@ -97,7 +97,7 @@ citecolor=black,
 \RequirePackage{caption}
 
 \RequirePackage[top=3cm,left=3cm,bottom=2cm,right=2cm]{geometry}
-\flushbottom
+\raggedbottom
 
 \RequirePackage{etoolbox}
 \RequirePackage{indentfirst}
@@ -110,6 +110,7 @@ citecolor=black,
 \RequirePackage{xparse}
 \RequirePackage{graphicx}
 \RequirePackage{float}
+\RequirePackage{icomma}
 
 \RequirePackage{adjustbox}
 \newlength\larguraimagem
@@ -212,6 +213,7 @@ citecolor=black,
 \setlength\belowdisplayskip{1\baselineskip plus 5pt minus 5pt}
 \setlength\abovedisplayshortskip{1\baselineskip plus 5pt minus 5pt}
 \setlength\belowdisplayshortskip{1\baselineskip plus 5pt minus 5pt}
+\setlength\jot{2ex}
 }
 
 \setlist[enumerate,1]{labelindent=\parindent,leftmargin=0.6cm+\parindent,nosep,label=\alph*)}
@@ -241,7 +243,8 @@ citecolor=black,
 \pdfbookmark[0]{Capa}{Capa}%
 \begin{capa}%
 \bfseries\centering%
-\expandafter\uppercase\expandafter{\imprimirinstituicao}%
+\expandafter\uppercase\expandafter{\imprimirinstituicao}\\%
+\expandafter\uppercase\expandafter{\@areadoconhecimento}
 \vfill
 \begin{textblock*}{160mm}(30mm, 297mm/4+15mm)%
 \expandafter\uppercase\expandafter{\theauthor}%
@@ -263,7 +266,7 @@ citecolor=black,
 \begin{textblock*}{160mm}(30mm, 297mm/2)%
 \expandafter\uppercase\expandafter{\thetitle}%
 \end{textblock*}%
-\vspace{10mm}
+\vfill
 \abntex@ifnotempty{\imprimirpreambulo}{%
 \hspace{.45\textwidth}%
 \begin{minipage}{.5\textwidth}%
@@ -396,54 +399,72 @@ pdfsubject={#1}
 pdfkeywords={#1}
 }
 }
-\newcommand{\imprimirfolhadeaprovacao}[5][Universidade de Caxias do Sul - UCS]{%
+
+\newcommand\@areadoconhecimento{}
+\newcommand\areadoconhecimento[1]{%
+\renewcommand\@areadoconhecimento{#1}
+}
+
+\newcommand\@avaliadori{}
+\newcommand\avaliadori[1]{%
+\renewcommand\@avaliadori{#1}
+}
+
+\newcommand\@avaliadorii{}
+\newcommand\avaliadorii[1]{%
+\renewcommand\@avaliadorii{#1}
+}
+
+\newcommand\@avaliadorext{}
+\newcommand\avaliadorext[1]{%
+\renewcommand\@avaliadorext{#1}
+}
+
+\newcommand{\imprimirfolhadeaprovacao}[2][\imprimirinstituicao]{%
 \begin{folhadeaprovacao}%
 \begin{center}%
 \bfseries %
 \ABNTEXchapterfont %
-\expandafter\uppercase\expandafter{\theauthor} %
-\vspace{1.5cm} \par
-\expandafter\uppercase\expandafter{\thetitle} %
-\vspace{0.5cm}
+\expandafter\uppercase\expandafter{\theauthor} \par %
+\vfill
+\expandafter\uppercase\expandafter{\thetitle}\par %
 \end{center}
-
 \abntex@ifnotempty{\imprimirpreambulo}{%
 \hspace{.45\textwidth} %
 \begin{minipage}{.5\textwidth}%
 \mdseries%
 \SingleSpacing%
 \imprimirpreambulo%
-\end{minipage}%
-}
 \vspace{24pt} \par %
-\hspace{.45\textwidth}%
-\begin{minipage}{.5\textwidth}%
-\bfseries%
-Aprovado(a) em #2 %
+\bfseries Aprovado(a) em #2 %
 \end{minipage}%
-\vspace{3cm} \par % 
+}
+\vfill 
+\flushbottom
 \noindent\textbf{Banca Examinadora} %
 \begin{SingleSpace} %
 \vspace*{\ABNTEXsignskip}%
 \noindent%
-\rule{\ABNTEXsignwidth}{\ABNTEXsignthickness}\\
-Prof. \imprimirorientador\\
-Universidade de Caxias do Sul - UCS \par
+\imprimirorientador\\
+\imprimirinstituicao
+\ifthenelse{\not\equal{\@avaliadori}{}}{%
+\par
 \vspace*{\ABNTEXsignskip}%
-\noindent%
-\rule{\ABNTEXsignwidth}{\ABNTEXsignthickness}\\
-Prof. #3\\
-Universidade de Caxias do Sul - UCS \par
-\vspace*{\ABNTEXsignskip}
-\noindent
-\rule{\ABNTEXsignwidth}{\ABNTEXsignthickness}\\
-Prof. #4\\
-Universidade de Caxias do Sul - UCS \par
+\noindent\@avaliadori\\
+\imprimirinstituicao
+}{}
+\ifthenelse{\not\equal{\@avaliadorii}{}}{%
+\par
+\vspace*{\ABNTEXsignskip}%
+\noindent\@avaliadorii\\
+\imprimirinstituicao
+}{}
+\ifthenelse{\not\equal{\@avaliadorext}{}}{%
+\par
 \vspace*{\ABNTEXsignskip}
-\noindent %
-\rule{\ABNTEXsignwidth}{\ABNTEXsignthickness}\\
-#5\\
+\noindent\@avaliadorext\\
 #1 %
+}{}
 \end{SingleSpace} %
 \end{folhadeaprovacao} %
 }
@@ -454,6 +475,12 @@ Universidade de Caxias do Sul - UCS \par
 \fonte[\larguraimagem-14pt]{#4}
 }
 
+\WithSuffix\newcommand\incluirimagem*[3][1]{%
+\adjustimage{scale=#1,fbox=1.5pt {\fboxsep} 1pt,gstore
+width=\larguraimagem,center}{#2}
+\fonte[\larguraimagem-14pt]{#3}
+}
+
 \ifthenelse{\boolean{@siglasAtivo}}{%
 \newcommand{\incluirsiglas}[1]{%
 \GlsXtrLoadResources[%