unamthesis (29mar17)

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

1 files changed, 34 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/unamthesis/UNAMThesis.sty b/Master/texmf-dist/tex/latex/unamthesis/UNAMThesis.sty
index 0d7bb58d360..e0ad81bc6af 100644
--- a/Master/texmf-dist/tex/latex/unamthesis/UNAMThesis.sty
+++ b/Master/texmf-dist/tex/latex/unamthesis/UNAMThesis.sty
@@ -1,8 +1,8 @@
-%% UNAMThesis.sty  05/apr/2013
-%% Copyright (c) 2008-2013 Julio A. Freyre-Gonzalez
+%% UNAMThesis.sty  14/feb/2017
+%% Copyright (c) 2008-2017 Julio A. Freyre-Gonzalez
 % Style for Universidad Nacional Aut\'{o}noma de M\'{e}xico theses (grad and undergrad)
 % UNAMThesis {Thesis: Universidad Nacional Aut\'{o}noma de M\'{e}xico}{11pt}{report}
-\typeout{Thesis: Universidad Nacional Aut\'{o}noma de M\'{e}xico `UNAMThesis' <05 apr 2013>.}
+\typeout{Thesis: Universidad Nacional Aut\'{o}noma de M\'{e}xico `UNAMThesis' <14 feb 2017>.}
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -25,17 +25,19 @@
 %
 % Julio A. Freyre-Gonzalez, PhD
 % Professor in Regulatory Systems Biology
+% Head of the Regulatory Systems Biology Group
 % Center for Genomic Sciences, UNAM
 % Av. Universidad S/N, Col. Chamilpa, 62210
 % Cuernavaca, Morelos, Mexico
 % jfreyre@ccg.unam.mx
 % jfreyreg@gmail.com
-% http://unam.academia.edu/JulioAugustoFreyreGonzalez
-% http://network.nature.com/people/jfreyre
-% http://www.researcherid.com/rid/B-8231-2008
+% http://orcid.org/0000-0001-7061-7637
+% http://unam.academia.edu/jfreyre
+% https://www.researchgate.net/profile/Julio_Augusto_Freyre-Gonzalez/
 %%
 %%
 % ChangeLog
+% 14/feb/2017 jfreyre v2.1 add academictitle command and cosmetic updates
 % 05/apr/2013 jfreyre v2.02 minor update
 % 16/may/2011 jfreyre v2.01 fix minor typos
 % 12/may/2011 jfreyre v2.0  proved in LaTeX standard enviroment (first public release)
@@ -54,7 +56,7 @@
 % Hence no doubleside option.
 %
 
-\ProvidesPackage{UNAMThesis}[2013/04/05 v2.02 (J.A. Freyre-Gonzalez)]
+\ProvidesPackage{UNAMThesis}[2017/02/14 v2.1 (J.A. Freyre-Gonzalez)]
 
 \RequirePackage{graphicx}
 \RequirePackage{setspace}
@@ -72,7 +74,7 @@
 \footskip .4in
 
 \doublespacing
-\def\baselinestretch{1.5}
+%\def\baselinestretch{1.5}
 
 % If using the report style, use - instead of . in the figure, table and equation numbers.
 \@ifundefined{thechapter}{}{\def\thefigure{\thechapter-\arabic{figure}}}
@@ -108,6 +110,9 @@
 \def\department#1{\gdef\@department{#1}}
 \def\@department{}
 
+\def\academictitle{\gdef\@degreetitle{t\'{i}tulo}}
+\def\@degreetitle{grado}
+
 \def\supervisor#1{\gdef\@supervisor{#1}}
 
 \def\prevdegrees#1{\gdef\@prevdegrees{#1}}
@@ -117,8 +122,8 @@
 \def\degree#1{\setbox0\hbox{#1}	 %for side effect of setting \@degreeart
   \gdef\@degree{#1}}
 % \and is used inside the \degree argument to separate two degrees
-\def\and{\gdef\@degreeart{los grados} \par y \par}
-\def\@degreeart{el grado}
+\def\and{\xdef\@degreeart{los \@degreetitle s} \par y \par}
+\edef\@degreeart{el \@degreetitle}
 
 % Use \date as \thesisdate
 \let\@thesisdate=\@date
@@ -132,7 +137,6 @@
 
 \supervisor{supervisor undefined}
 \degree{degree undefined}
-\degreemonth{degreemonth undefined}
 \degreeyear{degreeyear undefined}
 
 %% Define all the environments needed for the frontmatter
@@ -140,21 +144,21 @@
 %% useful to interface with Scientific Workplace
 
 \newenvironment{dedication}
-{\newpage\thispagestyle{empty}\setlength{\topskip}{0in}\def\baselinestretch{1}\@normalsize
+{\newpage\thispagestyle{empty}\setlength{\topskip}{0in}\begin{singlespace}\@normalsize
 \begin{flushright}\vspace*{-1ex}\vspace*{\fill}\vspace*{\fill}\vspace*{\fill}\vspace*{\fill}\slshape}
-{\vfill\vfill\vfill\vfill\vfill\end{flushright}\newpage}
+{\vfill\vfill\vfill\vfill\vfill\end{flushright}\end{singlespace}\newpage}
 
 \newcommand{\makededication}[1]{\begin{dedication}#1\end{dedication}}
 
 \newenvironment{acknowledgements}
-{\newpage\chapter*{Agradecimientos}\def\baselinestretch{1}\@normalsize}
-{\par\newpage}
+{\newpage\chapter*{Agradecimientos}\begin{singlespace}\@normalsize}
+{\end{singlespace}\par\newpage}
 
 \newcommand{\makeacknowledgements}[1]{\begin{acknowledgements}#1\end{acknowledgements}}
 
 \newenvironment{foreword}
-{\newpage\chapter*{Pr\'{o}logo}\def\baselinestretch{1}\@normalsize}
-{\par\newpage}
+{\newpage\chapter*{Pr\'{o}logo}\begin{singlespace}\@normalsize}
+{\end{singlespace}\par\newpage}
 
 \newcommand{\makeforeword}[1]{\begin{foreword}#1\end{foreword}}
 
@@ -164,11 +168,10 @@
 por\\
 \@author\\[\baselineskip]}
 \par
-\def\baselinestretch{1}\@normalsize
 \end{center}
 \par
-\subsection*{Resumen}\small\def\baselinestretch{1}\@normalsize}
-{\newpage}
+\subsection*{Resumen}\small\begin{singlespace}\@normalsize}
+{\end{singlespace}\newpage}
 
 \newcommand{\makeresumen}[1]{\begin{resumen}#1\end{resumen}}
 
@@ -180,11 +183,10 @@ por\\
 by\\
 \@author\\[\baselineskip]}
 \par
-\def\baselinestretch{1}\@normalsize
 \end{center}
 \par
-\subsection*{Abstract}\small\def\baselinestretch{1}\@normalsize}
-{\newpage}
+\subsection*{Abstract}\small\begin{singlespace}\@normalsize}
+{\end{singlespace}\newpage}
 
 \def\maketitle{
 \begin{titlepage}
@@ -208,23 +210,23 @@ by\\
 {\scshape\@department}\par
 % Title
 \vfill\vfill
-{\def\baselinestretch{1}\Large\scshape\@title\par}
+{\begin{singlespace}\Large\scshape\@title\par\end{singlespace}}
 \vfill\vfill
 % Degree, author, supervisor and date
 \makebox[8cm][s]{\Huge T E S I S}\\[8pt]
-QUE PARA OBTENER EL GRADO DE:\\[3pt]
+QUE PARA OBTENER \uppercase\expandafter{\@degreeart} DE:\\[3pt]
 {\scshape\@degree}\\[16pt]
 PRESENTA:\\[3pt]
 {\scshape\@author}\par
 \vfill
 {\small DIRECTOR DE TESIS:\\{\scshape\@supervisor}}\par
 \vfill
-{\scshape\@city\hfill\@degreemonth, \@degreeyear}
+{\scshape\@ifundefined{@city}{\relax}{\@city\hfill}\@ifundefined{@degreemonth}{\@degreeyear}{\@degreemonth, \@degreeyear}}
 \end{minipage}
 \end{titlepage}
 \begin{titlepage}
 \centering\large
-{\def\baselinestretch{1.2}\Large\bfseries\@title\par}
+{\setstretch{1.2}\Large\bfseries\@title\par}
 por\par
 {\Large\@author}
 \par
@@ -239,7 +241,7 @@ en \@instituteart
 \@ifundefined{@institute}{\relax}{{\scshape\@institute}\par}
 {\Large\scshape\Unam}
 \par
-\@city. \@degreemonth, \@degreeyear
+\@ifundefined{@city}{\@ifundefined{@degreemonth}{\@degreeyear}{\@degreemonth, \@degreeyear}}{\@city. \@degreemonth, \@degreeyear}
 \end{titlepage}}
 
 % You can use the titlepage environment to do it all yourself if you
@@ -250,13 +252,13 @@ en \@instituteart
 \renewenvironment{titlepage}
 {\newpage\thispagestyle{empty}
 \parindent 0pt \parskip 10pt plus 1fil minus 1fil
-\def\baselinestretch{1}\@normalsize\vbox to \vsize\bgroup\vbox to 8.9in\bgroup}
+\begin{singlespace}\@normalsize\vbox to \vsize\bgroup\vbox to 8.9in\bgroup}
 % The \kern0pt pushes any depth into the height.  Thanks to Richard Stone.
-{\par\kern 0pt\egroup\vss\egroup\newpage}
+{\par\kern 0pt\egroup\vss\egroup\end{singlespace}\newpage}
 
 % The quotenat environment implements the quotation style commonly used at
 % beginning of a chapter, just like in D. Knuth's Art of Computer Programming
 \newenvironment{quotenat}
 {\begin{flushright}\begin{minipage}[b]{5.25 in}\raggedleft
-\def\baselinestretch{1}\small}
-{\end{minipage}\end{flushright}}
+\begin{singlespace}\small}
+{\end{singlespace}\end{minipage}\end{flushright}}