From 9913fb8461243c1606b55dabd26ad4871aac1929 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Aug 2014 21:18:53 +0000 Subject: udesoftec (24aug14) git-svn-id: svn://tug.org/texlive/trunk@35033 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/udesoftec/udesoftec-bst.sty | 15 +++--- .../tex/latex/udesoftec/udesoftec-extra.sty | 15 +++++- .../texmf-dist/tex/latex/udesoftec/udesoftec.cls | 62 +++++++++++----------- 3 files changed, 52 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex/udesoftec') diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty index 29c80817079..c94d65365ec 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-bst.sty %% Copyright 2013-2014 J. Peter M. Schuler -%% 2014/06/22 v1.4.2 udesoftec +%% 2014/08/23 v1.4.4 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,7 +32,7 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-bst}[2014/05/27 v1.4.1 udesoftec-bst.sty udesoftec bibstyle configuration]% +\ProvidesPackage{udesoftec-bst}[2014/08/23 v1.4.4 udesoftec-bst.sty udesoftec bibstyle configuration]% %%%%%%%%%%%%%%%%%%%%%%%%% \newif\ifdocumentIsFinal \documentIsFinalfalse @@ -49,11 +49,13 @@ \usepackage[elide]{natbib} \bibliographystyle{udesoftec} -\providecommand{\bibstyle@udesoftec}{\bibpunct{(}{)}{;}{a}{}{}{}} +\providecommand{\bibstyle@udesoftec}{\bibpunct[,~\bblInTextPagePrefix{}]{(}{)}{;}{a}{}{}{}} \providecommand{\doi}[1]{\href{http://dx.doi.org/#1}{doi:\detokenize{#1}}} %use real doi links with doi: as label \providecommand{\bblisbn}[1]{\small{ISBN:\mbox{#1}}} \providecommand{\bblissn}[1]{\small{ISSN:\mbox{#1}}} \providecommand{\bbland}{\& } +\providecaptionname{ngerman}{\bbland}{und }% +\providecaptionname{english}{\bbland}{and }% \providecommand{\bblAuthorYearSep}{ } % possible to add \newline \providecommand{\bblAuthorTitleSep}{: } % possible to add \newline \providecommand{\bblAuthorTitleSepInEd}{: } @@ -63,8 +65,8 @@ \providecaptionname{english}{\bbled}{~(Ed.)}% \providecaptionname{ngerman}{\bbleds}{~(Hrsg.)}% \providecaptionname{english}{\bbleds}{~(Eds.)}% -\providecaptionname{ngerman}{\bbledn}{~Aufl.}% -\providecaptionname{english}{\bbledn}{~edn}% +\providecaptionname{ngerman}{\bbledn}{Aufl.}% +\providecaptionname{english}{\bbledn}{edn}% \providecaptionname{ngerman}{\bbletal}{et~al.}% \providecaptionname{english}{\bbletal}{et~al.}% \providecaptionname{ngerman}{\bblpp}{S.~}% @@ -83,6 +85,7 @@ \providecaptionname{english}{\bbllastaccesswas}{Last checked: }% \renewcommand{\bibfont}{\raggedright} +\providecommand{\bblInTextPagePrefix}[1]{} \providecommand{\bblurldate}[1]{ (\bbllastaccesswas #1)} \providecommand{\bblVolumeOfSeries}[2]{ (#2~#1)} \providecommand{\bblSeries}[1]{ (#1)} @@ -102,7 +105,7 @@ } \fi \providecommand{\bblyear}[1]{\ifnumber{#1}{#1}{\bblnoyear}} -\providecommand{\bbledGenerateEdition}[1]{\ifnumber{#1}{\bbledOrdinal{#1}~\bbledn}{#1}} +\providecommand{\bbledGenerateEdition}[1]{\ifnumber{#1}{\bbledOrdinal{#1}\bbledn}{#1}} \providecommand{\englishordinal}[1]{\ifcase #1\or 1\textsuperscript{st}\or 2\textsuperscript{nd}\or 3\textsuperscript{rd}\else #1\textsuperscript{th}\fi} \providecommand{\germanordinal}[1]{#1.} diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty index e44d598c28c..47bb69c534f 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-extra.sty %% Copyright 2013-2014 J. Peter M. Schuler -%% 2014/05/27 v1.4.1 udesoftec +%% 2014/08/23 v1.4.4 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,11 +32,22 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-extra}[2014/06/22 v1.4.2 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% +\ProvidesPackage{udesoftec-extra}[2014/08/16 v1.4.4 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% %%%%%%%%%%%%%%%%%%%%%%%%% \makeatletter +\renewcommand{\doi}[1]{\href{http://dx.doi.org/#1}{doi:{#1}}} + +\renewcommand{\bblInTextPagePrefix}[1]{\bblp} +\providecommand{\bblMultiCiteSeparator}{; } +\providecommand{\citemulti}[1]{% +\citetext{% +\bibpunct[,~\bblInTextPagePrefix{}]{}{}{;}{a}{}{}{}% +#1% +\bibstyle@udesoftec% +}} + \makeatother %%%%%%%%%%%%%%%%%%%%%%%%%% \endinput% \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls index f887d20c281..4417f2f2f98 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec.cls %% Copyright 2013-2014 J. Peter M. Schuler -%% 2014/06/22 v1.4.2 udesoftec +%% 2014/08/23 v1.4.4 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,7 +32,7 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesClass{udesoftec}[2014/06/22 v1.4.2 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% +\ProvidesClass{udesoftec}[2014/08/23 v1.4.4 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% @@ -60,8 +60,9 @@ % source: http://www.ctan.org/pkg/fixltx2e \usepackage{fixltx2e} %%%%%%%%%%%%%%%%%%%%%% - - +\usepackage{xstring} +\edef\udesoftecversionstring{\csname ver@udesoftec.cls\endcsname} +\StrLeft{\udesoftecversionstring}{27}[\udesoftecversion] \usepackage{libertine} @@ -242,7 +243,8 @@ \semester{Wintersemester 2011/2012, 8. Fachsemester \academicfield} \entitle{Englischer Titel der Arbeit} \confidentialitySource{Name der Firma, die auf die Vertraulichkeitserkl\"arung besteht} -\date{Version: \today} +\date{Dokumentversion: \today \linebreak Templateversion: +\udesoftecversion} \authorbox{ \begin{tabularx}{.7\linewidth}{ll} @@ -311,6 +313,7 @@ % there should always be an additional German cc in English theses \newcommand{\confidentialityclause}{% \iflanguage{english}{% + \cleardoublepage \chapter*{\labelconfidentialityclausetitle} % English heading \udesoftec@defaultconfidentialityclauseen % English text \selectlanguage{ngerman} % prepare German @@ -318,6 +321,7 @@ \udesoftec@defaultconfidentialityclause % German text \selectlanguage{english} % switching back to English }{ + \cleardoublepage \chapter*{\labelconfidentialityclausetitle} \udesoftec@defaultconfidentialityclause } @@ -334,8 +338,8 @@ \def\udesoftec@defaultstatutorydeclarationenprefix{The statutory declaration needs to be in German, so the following excerpt is in German:} \newcommand{\statutorydeclaration}{ - \iflanguage{english}{ + \cleardoublepage \chapter*{\labelstatutorydeclarationheading} \udesoftec@defaultstatutorydeclarationenprefix \selectlanguage{ngerman} @@ -343,6 +347,7 @@ \udesoftec@defaultstatutorydeclaration \selectlanguage{english} }{ + \cleardoublepage \chapter*{\labelstatutorydeclarationheading} \udesoftec@defaultstatutorydeclaration @@ -1136,12 +1141,11 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \deftranslation[to=ngerman]{Acronyms}{Abkürzungsverzeichnis} \deftranslation[to=ngerman]{Glossary}{Glossar} \makeglossaries - - +\AtEndDocument{\ifdefined\udesoftec@usedlistofitems@acronyms\label{udesoftec:needsloa}\fi}% \newcommand{\printacronyms}{% -\printglossary[type=\acronymtype,style=myAcronymStyle]% +\@ifundefined{r@udesoftec:needsloa}{}{\printglossary[type=\acronymtype,style=myAcronymStyle]}% } -\newcommand{\acr}[1]{\gls{#1}} +\newcommand{\acr}[1]{\gls{#1}\gdef\udesoftec@usedlistofitems@acronyms{}} \newglossarystyle{myAcronymStyle}{% % put the glossary in the itemize environment: @@ -1167,24 +1171,23 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \usepackage{udesoftec-bst} \usepackage[listings]{scrhack} - % make list of x conditional due to their usage % http://tex.stackexchange.com/questions/33193/how-to-determine-whether-a-list-of-figures-is-empty \AtEndEnvironment{figure}{\gdef\udesoftec@usedlistofitems@figure{}}% \AtEndDocument{\ifdefined\udesoftec@usedlistofitems@figure\label{udesoftec:needslof}\fi}% \let\defaultlistoffigures\listoffigures -\renewcommand{\listoffigures}{\@ifundefined{r@udesoftec:needslof}{}{\defaultlistoffigures}}% +\renewcommand{\listoffigures}{\@ifundefined{r@udesoftec:needslof}{}{\cleardoublepage\defaultlistoffigures}}% \AtEndEnvironment{lstlisting}{\gdef\udesoftec@usedlistofitems@listing{}}% \AtEndEnvironment{lstlisting-latex}{\gdef\udesoftec@usedlistofitems@listing{}}% \AtEndDocument{\ifdefined\udesoftec@usedlistofitems@listing\label{udesoftec:needslol}\fi}% \let\defaultlstlistoflistings\lstlistoflistings -\renewcommand{\lstlistoflistings}{\@ifundefined{r@udesoftec:needslol}{}{\defaultlstlistoflistings}}% +\renewcommand{\lstlistoflistings}{\@ifundefined{r@udesoftec:needslol}{}{\cleardoublepage\defaultlstlistoflistings}}% \AtEndEnvironment{table}{\gdef\udesoftec@usedlistofitems@table{}}%\AtBeginDocument{\ifdefined\udesoftec@usedlistofitems@table\label{udesoftec:needslot}\fi}% \AtEndDocument{\ifdefined\udesoftec@usedlistofitems@table\label{udesoftec:needslot}\fi}% \let\defaultlistoftables\listoftables -\renewcommand{\listoftables}{\@ifundefined{r@udesoftec:needslot}{}{\defaultlistoftables}}% +\renewcommand{\listoftables}{\@ifundefined{r@udesoftec:needslot}{}{\cleardoublepage\defaultlistoftables}}% @@ -1194,24 +1197,19 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \pagenumbering{alph} % title page is "a" - internal trick to prevent two pages with same name \hypertarget{titlepage}{}\pdfbookmark[-1]{\@title}{titlepage} % % - \maketitle % Komplett automatisch generiert anhand von Metadaten - \cleardoublepage% + \maketitle% \pagenumbering{Roman} % I,II,III,IV... - all pre-content pages are roman upper - - \ifdocumentOmitCC\else\cleardoublepage\confidentialityclause\fi% - \ifdocumentOmitA\else\cleardoublepage\printabstract\fi% - \ifdocumentOmitTOC\else\cleardoublepage - \hypertarget{tocpage}{} - \pdfbookmark{\contentsname}{topage} - \tableofcontents - \fi - \ifdocumentOmitLOF\else\cleardoublepage\listoffigures\fi - \ifdocumentOmitLOT\else\cleardoublepage\listoftables\fi - \ifdocumentOmitLOL\else\cleardoublepage\lstlistoflistings\fi - \ifdocumentOmitLOA\else\cleardoublepage\printacronyms\fi - - \newlength{\imagewidth} - \setlength\imagewidth\linewidth + \ifdocumentOmitCC\else\confidentialityclause\fi% + \ifdocumentOmitA\else\printabstract\fi% + \ifdocumentOmitTOC\else% + \cleardoublepage\hypertarget{tocpage}{}\pdfbookmark{\contentsname}{topage}% + \tableofcontents% + \fi% + \ifdocumentOmitLOF\else\listoffigures\fi% + \ifdocumentOmitLOT\else\listoftables\fi% + \ifdocumentOmitLOL\else\lstlistoflistings\fi% + \ifdocumentOmitLOA\else\printacronyms\fi% + \newlength{\imagewidth}\setlength\imagewidth\linewidth% \mainmatter } @@ -1224,4 +1222,4 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \fi \ifdocumentOmitSD\else\statutorydeclaration\fi -} \ No newline at end of file +} -- cgit v1.2.3