diff options
author | Karl Berry <karl@freefriends.org> | 2015-08-19 22:22:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-08-19 22:22:39 +0000 |
commit | 7841e5cb6baaa23b089e8ad182bc8b5ef612fb29 (patch) | |
tree | 91a484b517bfced6885b6052de60ce5f09eb1508 /Master | |
parent | ee32a98c12dea0596ae127c9d655041e50b8599d (diff) |
udesoftec (19aug15)
git-svn-id: svn://tug.org/texlive/trunk@38164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst | 62 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf | bin | 560885 -> 487848 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/CHANGELOG | 9 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/README | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/UPDATE-INSTRUCTIONS | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/VERSION | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/udesoftec-doc-examplebib.bib | 9 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex | 75 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty | 26 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls | 372 |
11 files changed, 362 insertions, 222 deletions
diff --git a/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst b/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst index a2aec3bab2a..4f09de5b355 100644 --- a/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst +++ b/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec.bst -%% Copyright 2014 J. Peter M. Schuler -%% 2014/11/10 v1.4.5 udesoftec +%% Copyright 2014-2015 J. Peter M. Schuler +%% 2015/08/19 v1.4.7 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -11,7 +11,7 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % -% This work has the LPPL maintenance status `maintained'. +% This work has the LPPL maintenance status 'author-maintained'. % % The current Maintainer of this work is J. Peter M. Schuler % j.peter.m.schuler@uni-due.de @@ -53,10 +53,11 @@ ENTRY publisher school series + standard title type url - urldate + urldate volume year } @@ -365,6 +366,14 @@ FUNCTION {format.authors} % for reference list if$ } +FUNCTION {format.standard} % for reference list +{ standard empty$ + { type "\bblstdseptypenum" * number * "\bblstdsepnumed" * edition * format.authorStyleInList } + { standard format.authorStyleInList + } + if$ +} + FUNCTION {format.editors} { editor empty$ { "" } @@ -1103,6 +1112,23 @@ FUNCTION {misc} empty.misc.check } +FUNCTION {techstandard} +{ output.bibitem + format.standard output + format.title "title" output.check + new.block + format.year output.nonnull + format.doi empty$ + {format.isbn output} + {} + if$ + format.doi output + format.url output + new.block + note output + fin.entry +} + FUNCTION {phdthesis} { output.bibitem format.authors "author" output.check @@ -1319,6 +1345,12 @@ FUNCTION {author.key.organization.label} { author format.lab.names } if$ } +FUNCTION {author.techstandard.label} +{ standard empty$ + { type " " * number * "-" * edition * "(" * } + { standard "(" * } + if$ +} FUNCTION {editor.key.organization.label} { editor empty$ @@ -1354,16 +1386,20 @@ FUNCTION {calc.short.authors} } FUNCTION {calc.label} -{ calc.short.authors - short.list - "(" - * - year duplicate$ empty$ - short.list key field.or.null = or - { pop$ "" } - 'skip$ +{ type$ "techstandard" = + 'author.techstandard.label + { calc.short.authors + short.list + "(" + * + year duplicate$ empty$ + short.list key field.or.null = or + { pop$ "" } + 'skip$ + if$ + 'label := + } if$ - * 'label := } diff --git a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf Binary files differindex 84431897040..d6158f1d1cf 100644 --- a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf +++ b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf diff --git a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG index 30b40cc381f..5714cc31895 100644 --- a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG +++ b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG @@ -1,5 +1,12 @@ The version number of all files is changed for every release. Please refer to the details below in order to see which files were changed. +2015/08/19 v1.4.7 udesoftec +* [udesoftec-doc] fixed documentation for package depencies due to used packages being updated +* [udesoftec.cls] removed deprecated fixltx2e +* [udesoftec.bst] added new doctype @techstandard for better interop with Citavi and standards, refer do documentation for further details +* [udesoftec.bst] fixed a problem with Citavi BibTeX exports having a {\textunderscore } in doi +* [udesoftec.cls] added new command \citemulti{} + 2015/05/14 v1.4.6 * replaced AtBeginDocument with AtEndPreamble for better interop with other packages * changed page margin to fit better to new font and improve readability on 4:3 tablets as well as paper while marginnotes get less space @@ -127,4 +134,4 @@ The version number of all files is changed for every release. Please refer to th * update to udesoftec-cover-uba.pdf: smaller filesize and undamaged PDF file 2013/06/26 -* Initial CTAN Upload
\ No newline at end of file +* Initial CTAN Upload diff --git a/Master/texmf-dist/source/latex/udesoftec/README b/Master/texmf-dist/source/latex/udesoftec/README index 6c0ad74788b..5da8881133f 100644 --- a/Master/texmf-dist/source/latex/udesoftec/README +++ b/Master/texmf-dist/source/latex/udesoftec/README @@ -1,8 +1,8 @@ udesoftec documentclass and bibstyle Maintainer: J. Peter M. Schuler -Copyright: 2013-2014 J. Peter M. Schuler -Version: 2014/11/10 v1.4.5 udesoftec +Copyright: 2013-2015 J. Peter M. Schuler +Version: 2015/08/19 v1.4.7 udesoftec License: lppl Topic: dissertation @@ -35,4 +35,4 @@ Manual Installation: texmf/tex/latex/udesoftec/udesoftec-cover-uba.pdf texmf/tex/latex/udesoftec/udesoftec-cover-ude-de.pdf texmf/tex/latex/udesoftec/udesoftec-cover-ude-en.pdf - texmf/bibtex/bst/udesoftec/udesoftec.bst
\ No newline at end of file + texmf/bibtex/bst/udesoftec/udesoftec.bst diff --git a/Master/texmf-dist/source/latex/udesoftec/UPDATE-INSTRUCTIONS b/Master/texmf-dist/source/latex/udesoftec/UPDATE-INSTRUCTIONS index 471e596d1d5..5ddcc71b267 100644 --- a/Master/texmf-dist/source/latex/udesoftec/UPDATE-INSTRUCTIONS +++ b/Master/texmf-dist/source/latex/udesoftec/UPDATE-INSTRUCTIONS @@ -1 +1,5 @@ -Please look in udesoftec-doc.pdf appendix chapter A.2. In order to know when an update is available a filtered CTAN announce RSS feed is available at http://pipes.yahoo.com/jpmschuler/udesoftec?_render=rss
\ No newline at end of file +Please look in udesoftec-doc.pdf appendix chapter A.2. + +In order to know when an update is available a +filtered CTAN announce RSS feed is available at +http://pipes.yahoo.com/jpmschuler/udesoftec?_render=rss
\ No newline at end of file diff --git a/Master/texmf-dist/source/latex/udesoftec/VERSION b/Master/texmf-dist/source/latex/udesoftec/VERSION index f0066374a28..684fc4355de 100644 --- a/Master/texmf-dist/source/latex/udesoftec/VERSION +++ b/Master/texmf-dist/source/latex/udesoftec/VERSION @@ -1 +1 @@ -2015/05/14 v1.4.6 udesoftec
\ No newline at end of file +2015/08/19 v1.4.7 diff --git a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc-examplebib.bib b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc-examplebib.bib index 78df49dcb77..87f5ed73bf6 100644 --- a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc-examplebib.bib +++ b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc-examplebib.bib @@ -117,3 +117,12 @@ publisher = {Gabler}, isbn = {978-3-8349-2114-7} } +@techstandard{IEEEStd-1016:1998, + year = {1998-09-23}, + title = {IEEE Recommended Practice for Software Design Descriptions}, + edition = {1998}, + number = {1016}, + author = {IEEE}, + type = {IEEE Std}, + standard = {IEEE Std 1016-1998} +}
\ No newline at end of file diff --git a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex index e2ed3d3b9a5..82dbd983f2e 100644 --- a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex +++ b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-doc.tex -%% Copyright 2013-2014 J. Peter M. Schuler -%% 2015/05/14 v1.4.6 udesoftec +%% Copyright 2013-2015 J. Peter M. Schuler +%% 2015/08/19 v1.4.7 udesoftec \documentclass[omit-sd,omit-lol]{udesoftec} \usepackage{udesoftec-extra} @@ -188,8 +188,8 @@ Wörtliche Zitate im Fließtext machen vor allem bei kleineren Auszügen Sinn: \subsection{Quellenangaben im Fließtext} Für Quellenangaben im Fließtext wird folgende Variante genutzt: -\parExample[nicht-wörtliches Zitat]{Merkmale von Patterns sind bspw. Abstraktionsgrad, Domänenbezug und Sprache \cite[541]{Fettke.et.al.2009}.} -\begin{lstlistinglatex}[label=lst:cite,caption=Quellenangaben im Fließtext] +\parExample[nicht-wörtliches Zitat]{Merkmale von Patterns sind u.a. +Abstraktionsgrad, Domänenbezug und Sprache \cite[541]{Fettke.et.al.2009}.} \begin{lstlistinglatex}[label=lst:cite,caption=Quellenangaben im Fließtext] \cite[<Seite>]{<Quelle>} \end{lstlistinglatex} @@ -204,13 +204,64 @@ Wenn der Autorenname im Text erwähnt wird, sollte dieser immer direkt auch die \begin{lstlistinglatex}[label=lst:citeauthor,caption={Autorennamen im Text ohne Quellenangabe}] \citeauthor{<Quelle>} \end{lstlistinglatex}% + \subsection{Mehrere Werke in Quellenangaben} Manchmal wird ein Gedanke durch mehrere unterschiedliche Quellen gestützt. Hier kann man folgendes Verfahren nutzen und bspw. als \lstinline!<prefix>! ein "`vgl. z.\ B."' nutzen: -\parExample[mehrere Werke in Quellenangabe]{Dementsprechend wird für die Usability mit dem Fokus auf das Web, in der Literatur entsprechend der Begriff der Web Usability verwendet \citetext{vgl. z.~B. \citealp[146]{Matera.2006}; \citealp[xix]{Nielsen.et.al.2006}; \citealp[11]{Schweibenz.et.al.2003}}.} -\begin{lstlistinglatex}[label=lst:citealp,caption={Mehrere Werke in Quellenangaben}] -\citetext{<prefix>\citealp[<Seite>]{<Quelle>}; \citealp[<Seite2>]{<Quelle2>}...} +\parExample[mehrere Werke in Quellenangabe]{Dementsprechend wird für die +Usability mit dem Fokus auf das Web, in der Literatur entsprechend der Begriff +der Web Usability verwendet \citemulti{vgl. z.~B. \cite[146]{Matera.2006}; +\cite[xix]{Nielsen.et.al.2006}; \cite[11]{Schweibenz.et.al.2003}}.} +\begin{lstlistinglatex}[label=lst:citemulti,caption={Mehrere Werke in +Quellenangaben}] +\citemulti{<prefix>\cite[<Seite>]{<Quelle>};\cite[<Seite2>]{<Quelle2>}...} \end{lstlistinglatex} +\subsection{Quellenangabe für Normen und Standards (bspw. ISO, DIN)} +Da Normen immer äußerst schwierig in Citavi und BibTeX sind, gibt es einen +neuen Dokumenttyp \lstinline!@techstandard!. Die vollständige Norm-Nummer sollte im BibTeX-Feld \lstinline!standard! ausgegeben +werden. Alternativ wird aus \lstinline!type!,\lstinline!number! und +\lstinline!edition! eine Nummer gebildet. +\begin{lstlistingbibtex}[label=lst:normbib,caption={Angabe einer Norm im +BiB-File}] +@techstandard{IEEEStd-1016:1998, + year = {1998-09-23}, + title = {IEEE Recommended Practice for Software Design Descriptions}, + edition = {1998}, + number = {1016}, + author = {IEEE}, + type = {IEEE Std}, + standard = {IEEE Std 1016-1998} +} +\end{lstlistingbibtex} +Dies kann man im Rahmen des BibTeX-Exports von Citavi einstellen: +\begin{itemize} + \item Den Titel in Citavi anlegen:\begin{enumerate} + \item Dokumententyp: Norm +\item Institution: IEEE +\item Titel:IEEE Recommended Practice for Software Design Descriptions +\item Normtyp:IEEE Std +\item Nummer:1016 +\item Ausgabedatum:1998-09- 23 +\item Freitext 1: IEEE Std 1016-1998 + \end{enumerate} + \item Dann den Export aufrufen: Menu Datei => Exportieren => Exportieren... + \item Alle Titel und Weiter + \item BibTeX und Bearbeiten + \item bei Dokumenttyp zuordnen \enquote{Norm} dem Typ \enquote{techstandard} + zuordnen und Weiter + \item Für Dokumenttyp "Norm"; Feld "Freitext 1" als Wert "standard" + eintragen +\end{itemize} +Aufgrund dessen, dass in der +vollständigen Norm-Nummer allerdings schon das Jahr enthalten ist, wird dieses +nicht im Fließtext zusätzlich ausgegeben. Daher muss für eine Ausgabe analog zu +\textbf{Autorennamen im Text mit Quellenangabe} statt \lstinlinelatex!\citet{}! +ein \lstinlinelatex!\citeauthor{}! mit anschließender Seitenangabe genutzt. +\parExample[Quellenangabe für Normen und Standards (bspw. ISO, DIN)]{Diese +Verfahren sind näher in \citeauthor{IEEEStd-1016:1998} \citetext{S. 16} +geregelt.} \begin{lstlistinglatex}[label=lst:citestd,caption={Quellenangabe für Normen und Standard}] +\citeauthor{IEEEStd-1016:1998} \citetext{S. 16} +\end{lstlistinglatex} \section{Abbildungen} @@ -382,7 +433,9 @@ Unter MacOS kann beispielsweise ein minimales \TeX{}-Live-System wie \href{http: emphstyle=\color{DocumentDark1}] sudo tlmgr update --self sudo tlmgr update --all -sudo tlmgr install udesoftec nag chngcntr hyphenat libertine mweights fontaxes footmisc placeins enumitem todonotes wallpaper marginnote mdframed needspace csquotes glossaries xfor datatool substr xstring +sudo tlmgr install udesoftec nag chngcntr hyphenat libertine mweights fontaxes +footmisc placeins enumitem todonotes wallpaper marginnote mdframed needspace +csquotes glossaries glossaries-german glossaries-english xfor datatool substr xstring tracklang \end{lstlisting} Sollte es zu Problemen kommen, sollten die Fehlermeldungen und die \hyperref[sec:paketlist]{Liste der Pakete im Anhang} genügend Informationen bieten. @@ -392,7 +445,7 @@ Diese Dokumentation gibt im Folgenden Hinweise für eine \LaTeX{}-Konfiguration \item MikTeX >= 2.9 \item TeXnicCenter >= 2.0.2 \item SumatraPDF >= 2.4 - \item Citavi >= 4.1 + \item Citavi >= 5.1 \end{itemize} Unter anderen Systemumgebungen funktioniert dieses Template natürlich genauso, hier müssen Sie lediglich die zusätzlichen Compile-Aufrufe für das Paket "`glossaries"' selbst konfigurieren. @@ -542,8 +595,8 @@ The base documentclass is \emph{scrbook}, which is part of \ctanlink{koma-script \clearpage\section{Changelog}\label{sec:changelog} An \href{http://pipes.yahoo.com/jpmschuler/udesoftec?_render=rss}{RSS feed} is available to annouce new versions of udesoftec. \begingroup - \lstinputlisting[backgroundcolor={},frame=none,nolol,breaklines=true]{CHANGELOG.} + \lstinputlisting[backgroundcolor={},frame=none,nolol,breaklines=true]{CHANGELOG.txt} \endgroup \bibliography{udesoftec-doc-examplebib} % output Literature and use this file as bibtext catalogue -\end{document}
\ No newline at end of file +\end{document} diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty index 95f48ad9308..3e8eb877d1e 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/11/10 v1.4.5 udesoftec +%% Copyright 2013-2015 J. Peter M. Schuler +%% 2015/08/19 v1.4.7 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/08/23 v1.4.4 udesoftec-bst.sty udesoftec bibstyle configuration]% +\ProvidesPackage{udesoftec-bst}[22015/08/19 v1.4.7desoftec-bst.sty udesoftec bibstyle configuration]% %%%%%%%%%%%%%%%%%%%%%%%%% \newif\ifdocumentIsFinal \documentIsFinalfalse @@ -43,6 +43,7 @@ \RequirePackage{hyphenat} % prevent author names and quotations from hyphenating \RequirePackage{scrbase} % support for providecaptionname \RequirePackage{csquotes} % language dependant quotes and in-quote-quotes +\RequirePackage{regexpatch} % language dependant quotes and in-quote-quotes %%% natbib %%%%%%%%%% % purpose: real cite options (in parentheses, out of parentheses, suppressing author etc) @@ -50,7 +51,13 @@ \bibliographystyle{udesoftec} \providecommand{\bibstyle@udesoftec}{\bibpunct[,~\bblInTextPagePrefix{}]{(}{)}{;}{a}{}{}{}} -\providecommand{\doi}[1]{\href{http://dx.doi.org/#1}{doi:\detokenize{#1}}} %use real doi links with doi:<num> as label +\providecommand{\bibstyle@udesoftecmulticite}{\bibpunct[,~\bblInTextPagePrefix{}]{}{}{;}{a}{}{}{}} +%http://tex.stackexchange.com/questions/262103/interpret-tex-commands-and-remove-curly-braces-from-href-content/262133#262133 +\providecommand{\doi}[1]{% + \def\tmpdoi{#1}% + \xpatchcmd*\tmpdoi{{\textunderscore }}{_}{}{}% + \href{http://dx.doi.org/\tmpdoi}{doi:#1}% +}% \providecommand{\bblisbn}[1]{\small{ISBN:\mbox{#1}}} \providecommand{\bblissn}[1]{\small{ISSN:\mbox{#1}}} \providecommand{\bbland}{\& } @@ -59,6 +66,9 @@ \providecommand{\bblAuthorYearSep}{ } % possible to add \newline \providecommand{\bblAuthorTitleSep}{: } % possible to add \newline \providecommand{\bblAuthorTitleSepInEd}{: } +\providecommand{\bblstdseptypenum}{ } +\providecommand{\bblstdsepnumed}{-} +\providecommand{\bblnostandardrepeat}{} \providecaptionname{ngerman}{\bblin}{In: }% \providecaptionname{english}{\bblin}{In: }% \providecaptionname{ngerman}{\bbled}{~(Hrsg.)}% @@ -123,6 +133,12 @@ %\renewcommand{\bibfont}{\sc} +\providecommand{\citemulti}[1]{% +\citetext{% +\bibstyle@udesoftecmulticite% +#1% +\bibstyle@udesoftec% +}} \providecommand{\inquotequote}[1]{\enquote{#1}} @@ -145,4 +161,4 @@ \end{quote} } %%%%%%%%%%%%%%%%%%%%%%%%% -\endinput%
\ No newline at end of file +\endinput% diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty index 5457a183390..76171179d03 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/11/03 v1.4.5 udesoftec +%% Copyright 2013-2015 J. Peter M. Schuler +%% 2015/08/19 v1.4.7 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -32,22 +32,13 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-extra}[2014/11/10 v1.4.5 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% +\ProvidesPackage{udesoftec-extra}[22015/08/19 v1.4.7udesoftec-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 +\endinput% diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls b/Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls index d85be837bd2..278ae4f1f43 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 -%% 2015/05/14 v1.4.6 udesoftec +%% Copyright 2013-2015 J. Peter M. Schuler +%% 2015/08/19 v1.4.7 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -11,12 +11,16 @@ % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. % -% This work has the LPPL maintenance status `maintained'. +% This work has the LPPL maintenance status `author-maintained'. % -% The current Maintainer of this work is J. Peter M. Schuler +% The current maintainer of this work is J. Peter M. Schuler % j.peter.m.schuler@uni-due.de % -% This work consists of the files udesoftec.cls and udesoftec.bst. +% This work consists of the files +% * udesoftec.cls +% * udesoftec.bst +% * udesoftec-bst.sty +% * udesoftec-extra.sty % % As this work is based on years of mostly undocumented improvement, % it includes parts, for which sources can't be identified anymore. Public postings @@ -32,7 +36,8 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesClass{udesoftec}[2015/05/14 v1.4.6 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% +\ProvidesClass{udesoftec}[2015/08/19 v1.4.7 udesoftec.cls Thesis class and +bibstyle for UDE SOFTEC]% %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% @@ -41,12 +46,12 @@ \LoadClass{scrbook} \KOMAoptions{ twoside=true, - headings=openright, % same as documentclassoption openany/openright - numbers=noenddot, % section numbering without dot - bibliography=totoc, + headings=openright, % same as documentclassoption openany/openright + numbers=noenddot, % section numbering without dot + bibliography=totoc, index=totoc, listof=totoc, - headlines=1.5 % the size of the header in lines (1.5 because of pagemark and sepline); 1.25 is default; 1 would be appropriate if only text and no sepline) + headlines=1.5 % the size of the header in lines (1.5 because of pagemark and sepline); 1.25 is default; 1 would be appropriate if only text and no sepline) } %\usepackage{udesoftec-cmd} %%%% nag %%%%%%%%%%%%% @@ -54,11 +59,7 @@ % source: http://www.ctan.org/pkg/nag \RequirePackage[l2tabu, orthodox]{nag} %%%%%%%%%%%%%%%%%%%%%% - -%%%% fixltx2e %%%%%%%% -% purpose: removes some Bugs in LaTeX2e (removes some stupid backwards compatibility) -% source: http://www.ctan.org/pkg/fixltx2e -\usepackage{fixltx2e} + %%%%%%%%%%%%%%%%%%%%%% \usepackage{xstring} \edef\udesoftecversionstring{\csname ver@udesoftec.cls\endcsname} @@ -124,7 +125,7 @@ \documentUsedTodosfalse \templateUseColorfulLinkstrue \templateUseSansSerifFonttrue -\templateUseBookLayoutfalse +\templateUseBookLayoutfalse \templateVawifalse \templateVawiEssenfalse \templateVawiBambergfalse @@ -176,14 +177,14 @@ \DeclareOption{confidential}{\documentOmitCCfalse} \DeclareOption{printlayout}{ - \templateUseColorfulLinksfalse - \templateUseSansSerifFontfalse - \templateUseBookLayouttrue + \templateUseColorfulLinksfalse + \templateUseSansSerifFontfalse + \templateUseBookLayouttrue } \DeclareOption{screenlayout}{ - \templateUseColorfulLinkstrue - \templateUseSansSerifFonttrue - \templateUseBookLayoutfalse + \templateUseColorfulLinkstrue + \templateUseSansSerifFonttrue + \templateUseBookLayoutfalse } \DeclareOption{vawiessen}{ \templateVawitrue @@ -202,9 +203,9 @@ \ProcessOptions\relax \ifprimaryDocumentLanguageGerman - \def\udesoftec@documentLanguage{english,ngerman} % all used languages, primary LAST + \def\udesoftec@documentLanguage{english,ngerman} % all used languages, primary LAST \else - \def\udesoftec@documentLanguage{ngerman,english} + \def\udesoftec@documentLanguage{ngerman,english} \fi %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% @@ -224,7 +225,7 @@ \newcommand{\abstract}[1]{\def\udesoftec@abstract{#1}} \newcommand{\abstractEn}[1]{\def\udesoftec@abstracten{#1}} -\def \udesoftec@templatePageMarkPrefix {} % might be something like "S. " +\def \udesoftec@templatePageMarkPrefix {} % might be something like "S. " %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% @@ -249,15 +250,15 @@ \authorbox{ \begin{tabularx}{.7\linewidth}{ll} von:&Max Mustermann\\ - &Musterstrasse 123\\ - &12345 Musterstadt\\ - \\ + &Musterstrasse 123\\ + &12345 Musterstadt\\ + \\ Gutacher:&Prof. Dr. Stefan Eicker\\ - &Prof. Dr. John Doe\\ - \\ - Betreuer:&Dipl.-Wirt.-Inf Some Body\\ - \\ -\end{tabularx} + &Prof. Dr. John Doe\\ + \\ + Betreuer:&Dipl.-Wirt.-Inf Some Body\\ + \\ +\end{tabularx} } %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% @@ -309,7 +310,7 @@ \newcaptionname{english}{\labelconfidentialityclausetitle}{Confidentially Clause} \def\udesoftec@defaultconfidentialityclause{Die vorliegende \udesoftec@typeofdoc ~enth\"alt vertrauliche Informationen der \emph{\udesoftec@confidentialitySource}, die der Geheimhaltung unterliegen. Ver\"offentlichungen oder Vervielf\"altigungen der \udesoftec@typeofdoc ~-- auch nur auszugsweise -- sind ohne ausdr\"uckliche Genehmigung der \emph{\udesoftec@confidentialitySource} nicht gestattet. Die \udesoftec@typeofdoc ~ist nur den Mitarbeitern des betreuenden Lehrstuhls sowie den Mitgliedern des Pr\"ufungsausschusses zug\"anglich zu machen.\par{} Dieser Sperrvermerk gilt f\"ur die n\"achsten 2 Jahre. Die sich aus diesem Sperrvermerk ergebenden Einschr\"ankungen entfallen nach Ablauf dieses Zeitraums.\par{}} \def\udesoftec@defaultconfidentialityclauseen{This \udesoftec@typeofdoc ~contains confidential data of \emph{\udesoftec@confidentialitySource}. Any publication or duplication of this \udesoftec@typeofdoc ~-- even in part -- is prohibited, excluding cases with explicit permission by \emph{\udesoftec@confidentialitySource}. The \udesoftec@typeofdoc ~is to be made accessible only to the staff of the research group supervising it and the board of examiners.\par{} This confidentially clause is valid for the next 2 years. Any limitations resulting from this confidentially clause do not apply after this period.\par{}} - + % there should always be an additional German cc in English theses \newcommand{\confidentialityclause}{% \iflanguage{english}{% @@ -378,7 +379,7 @@ \\ Supervisor:&Dipl.-Wirt.-Inf Some Body\\ \\ - \end{tabularx} + \end{tabularx} } \fi @@ -396,7 +397,7 @@ \fi % VAWi-Bamberg special (no matter what language) \iftemplateVawiBamberg - \def\udesoftec@templateTitlePageBackground{udesoftec-cover-uba} + \def\udesoftec@templateTitlePageBackground{udesoftec-cover-uba} \fi %%%%%%%%%%%%%%%%%%%%%% @@ -405,11 +406,11 @@ %%%%%%%%%%%%%%%%%%%%%% % VAWi special \iftemplateVawiEssen - \institution{Im Virtuellen Weiterbildungsstudiengang Wirtschaftsinformatik\par der Universit\"at Duisburg-Essen} + \institution{Im Virtuellen Weiterbildungsstudiengang Wirtschaftsinformatik\par der Universit\"at Duisburg-Essen} \labelPreTopic{} \fi \iftemplateVawiBamberg - \institution{Im Virtuellen Weiterbildungsstudiengang Wirtschaftsinformatik} + \institution{Im Virtuellen Weiterbildungsstudiengang Wirtschaftsinformatik} \labelPreTopic{} \fi @@ -474,38 +475,38 @@ \colorlet{allchaptercolor}{black} - + \colorlet{listingBackground}{white!50!UDEbeige} \colorlet{documentTitle}{black} -\colorlet{parExample}{UDEbrightblue} +\colorlet{parExample}{UDEbrightblue} -\colorlet{chapter}{allchaptercolor} % for all chapters, toc etc -\colorlet{section}{allchaptercolor} % for all chapters, toc etc -\colorlet{subsection}{allchaptercolor} % for all chapters, toc etc +\colorlet{chapter}{allchaptercolor} % for all chapters, toc etc +\colorlet{section}{allchaptercolor} % for all chapters, toc etc +\colorlet{subsection}{allchaptercolor} % for all chapters, toc etc -\colorlet{ChapterHeadingBigChapterNumber}{allchaptercolor} % for the special chapter title page design -\colorlet{ChapterHeadingSmallChapterNumer}{allchaptercolor} % for the special chapter title page design -\colorlet{ChapterHeadingSeperatorLine}{allchaptercolor} % for the special chapter title page design -\colorlet{Todo}{orange!30!white} %default color for todo notes -\colorlet{Headsepline}{UDEblue} % seperator between header and text body +\colorlet{ChapterHeadingBigChapterNumber}{allchaptercolor} % for the special chapter title page design +\colorlet{ChapterHeadingSmallChapterNumer}{allchaptercolor} % for the special chapter title page design +\colorlet{ChapterHeadingSeperatorLine}{allchaptercolor} % for the special chapter title page design +\colorlet{Todo}{orange!30!white} %default color for todo notes +\colorlet{Headsepline}{UDEblue} % seperator between header and text body \colorlet{PagemarkBackground}{UDEblue} -\colorlet{PagemarkText}{white} % page number color -\colorlet{HeadmarkText}{black} % textcolor of header text (chapters, sections) -\colorlet{Good}{DarkGreen} % page number color -\colorlet{Bad}{DarkRed} % textcolor of header text (chapters, sections) +\colorlet{PagemarkText}{white} % page number color +\colorlet{HeadmarkText}{black} % textcolor of header text (chapters, sections) +\colorlet{Good}{DarkGreen} % page number color +\colorlet{Bad}{DarkRed} % textcolor of header text (chapters, sections) \iftemplateUseColorfulLinks - \colorlet{LinkExternal} {black!75!green} % URLs in text and bibliography - \colorlet{LinkDoi} {black!75!green} % links to doi in bibliography - \colorlet{LinkInternal} {black!30!UDEblue} % internal links are from TOC or references in text - \colorlet{LinkBibliography} {black!30!UDEblue} % links in citation - \colorlet{LinkAnchor} {black} % not used + \colorlet{LinkExternal} {black!75!green} % URLs in text and bibliography + \colorlet{LinkDoi} {black!75!green} % links to doi in bibliography + \colorlet{LinkInternal} {black!30!UDEblue} % internal links are from TOC or references in text + \colorlet{LinkBibliography} {black!30!UDEblue} % links in citation + \colorlet{LinkAnchor} {black} % not used \else - \colorlet{LinkExternal}{black} % URLs in text and bibliography - \colorlet{LinkDoi}{black} % links to doi in bibliography - \colorlet{LinkInternal}{black} % internal links are from TOC or references in text - \colorlet{LinkBibliography}{black!30!UDEblue} % links in citation - \colorlet{LinkAnchor}{black} % not used + \colorlet{LinkExternal}{black} % URLs in text and bibliography + \colorlet{LinkDoi}{black} % links to doi in bibliography + \colorlet{LinkInternal}{black} % internal links are from TOC or references in text + \colorlet{LinkBibliography}{black!30!UDEblue} % links in citation + \colorlet{LinkAnchor}{black} % not used \fi @@ -536,9 +537,9 @@ \usepackage[T1]{fontenc} \iftemplateUseSansSerifFont - \renewcommand*{\familydefault}{\sfdefault} + \renewcommand*{\familydefault}{\sfdefault} \else - \renewcommand*\familydefault{\rmdefault} + \renewcommand*\familydefault{\rmdefault} \fi \setkomafont{descriptionlabel}{\normalfont\bfseries} \setkomafont{dictumtext}{\normalfont\normalcolor\small} @@ -652,38 +653,38 @@ % create headermarks so the chapter is shown on left page and section on right % new pagestyle "chapter": pagenumber top outer, no line no headmark \iftemplateUseBookLayout - \ihead[\headmark]{\headmark} - % clear outer head (where the normale pagemark is in) - \ohead[]{} - % add pageMark boxes to leftpage lefthead and rightpage righthead (pagemark box needs to know "r" or "l" - \rohead[]{\pagemarkBox{\pagemark}{r}} - \lehead[]{\pagemarkBox{\pagemark}{l}} - - \classdebug{using headline for booklayout} - \automark[section]{chapter} - \defpagestyle{chapter}{ - (0pt,0pt) - {\pagemarkBox{\pagemark}{l}\hfill} - {\hfill\pagemarkBox{\pagemark}{r}} - {\pagemarkBox{\pagemark}{r}\hfill} - (0pt,0pt) - }{{}{}{}} + \ihead[\headmark]{\headmark} + % clear outer head (where the normale pagemark is in) + \ohead[]{} + % add pageMark boxes to leftpage lefthead and rightpage righthead (pagemark box needs to know "r" or "l" + \rohead[]{\pagemarkBox{\pagemark}{r}} + \lehead[]{\pagemarkBox{\pagemark}{l}} + + \classdebug{using headline for booklayout} + \automark[section]{chapter} + \defpagestyle{chapter}{ + (0pt,0pt) + {\pagemarkBox{\pagemark}{l}\hfill} + {\hfill\pagemarkBox{\pagemark}{r}} + {\pagemarkBox{\pagemark}{r}\hfill} + (0pt,0pt) + }{{}{}{}} \else - \ihead[]{} - \ohead[]{} - \lehead[\headmark]{\headmark} - \rehead[]{\pagemarkBox{\pagemark}{r}} - \lohead[\headmark]{\headmark} - \rohead[]{\pagemarkBox{\pagemark}{r}} - \classdebug{using headline for screenlayout} - \automark[chapter]{chapter} - \defpagestyle{chapter}{ - (0pt,0pt) - {\hfill\pagemarkBox{\pagemark}{r}} - {\hfill\pagemarkBox{\pagemark}{r}} - {\hfill\pagemarkBox{\pagemark}{r}} - (0pt,0pt) - }{{}{}{}} + \ihead[]{} + \ohead[]{} + \lehead[\headmark]{\headmark} + \rehead[]{\pagemarkBox{\pagemark}{r}} + \lohead[\headmark]{\headmark} + \rohead[]{\pagemarkBox{\pagemark}{r}} + \classdebug{using headline for screenlayout} + \automark[chapter]{chapter} + \defpagestyle{chapter}{ + (0pt,0pt) + {\hfill\pagemarkBox{\pagemark}{r}} + {\hfill\pagemarkBox{\pagemark}{r}} + {\hfill\pagemarkBox{\pagemark}{r}} + (0pt,0pt) + }{{}{}{}} \fi % custom page behavior for title, part and chapter \renewcommand*{\titlepagestyle}{empty} @@ -692,16 +693,16 @@ %%%%%%%%%%%%%%%%%%%%%% %%%% custom pagemark %%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\pagemarkBox}[2] { +\newcommand{\pagemarkBox}[2] { % the picture has height 0 to change clipping behavior, else the clipping box might be higher than the text line - \begin{picture}(50,0) - \put(-.55,-5.05) { - \put(-2.8,.3){%these relate box to text - \color{PagemarkBackground}\rule{56.7pt}{16pt}}% - \put(5,1){%these relate box to text - \makebox(40,16)[#2]{\textcolor{PagemarkText}\udesoftec@templatePageMarkPrefix\fontseries{b}\fontshape{n}\selectfont #1}}% - } - \end{picture} + \begin{picture}(50,0) + \put(-.55,-5.05) { + \put(-2.8,.3){%these relate box to text + \color{PagemarkBackground}\rule{56.7pt}{16pt}}% + \put(5,1){%these relate box to text + \makebox(40,16)[#2]{\textcolor{PagemarkText}\udesoftec@templatePageMarkPrefix\fontseries{b}\fontshape{n}\selectfont #1}}% + } + \end{picture} } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -710,17 +711,17 @@ % purpose: set page margins, textbody size etc % usage: typearea[BCOR]{DIV} % DIV is auto-calculation of all margins in depencedy of font size -% 10pt = DIV 8;11pt = DIV 10;12pt = DIV 12 -% BCOR is additional inner margin (binding correction) +% 10pt = DIV 8;11pt = DIV 10;12pt = DIV 12 +% BCOR is additional inner margin (binding correction) % special: BCOR adds inner margin and reduces text space. As the default margin sum seems fine we use geometry instead % to adjust for regular printing (e.g. use in a folder), see below "geometry" \usepackage[includehead=false,includefoot=false]{geometry} \iftemplateUseBookLayout - \KOMAoptions{twoside=true} - \KOMAoptions{BCOR=12mm,DIV=10} % for helvetica + \KOMAoptions{twoside=true} + \KOMAoptions{BCOR=12mm,DIV=10} % for helvetica \else - \KOMAoptions{twoside=false} - \KOMAoptions{BCOR=0mm,DIV=10} % for helvetica + \KOMAoptions{twoside=false} + \KOMAoptions{BCOR=0mm,DIV=10} % for helvetica \fi \renewcommand*\chapterheadstartvskip{} @@ -732,28 +733,28 @@ \begin{titlepage} \begin{center} \ThisCenterWallPaper{1}{\udesoftec@templateTitlePageBackground} - \vspace*{30pt} - \begin{minipage}[30em]{.7\linewidth} + \vspace*{30pt} + \begin{minipage}[30em]{.7\linewidth} \begin{center} \Large\udesoftec@typeofdoc\par \normalsize\udesoftec@labelPreTopic\par \vspace*{20pt} {\color{documentTitle}\Huge\textbf{\@title}\par} \vspace*{20pt} - {\color{documentTitle}\huge\textbf{\@subtitle}\par} - \vspace*{20pt} + {\color{documentTitle}\huge\textbf{\@subtitle}\par} + \vspace*{20pt} {\color{documentTitle}\large\textbf{\udesoftec@entitle}\par} - \vspace*{50pt} + \vspace*{50pt} \large\udesoftec@institution \end{center} \end{minipage} - \vfill - \begin{minipage}{.7\linewidth} + \vfill + \begin{minipage}{.7\linewidth} \begin{center} \ifdocumentOmitCC \else \udesoftec@labelRespectConfidentiality\par - \fi + \fi \vspace*{20pt}\Large\@date \end{center} \vspace*{30pt} @@ -767,7 +768,7 @@ \end{minipage}% \end{center}% \end{titlepage}% - \restoregeometry + \restoregeometry } \newcommand{\udesoftecvawibambergmaketitle}{ @@ -778,10 +779,10 @@ \vspace*{0pt} \begin{minipage}[30em]{.7\linewidth} \begin{center} - {\color{documentTitle}\Huge\textbf{\@title}\par} - \vspace*{20pt} - {\color{documentTitle}\huge\textbf{\@subtitle}\par} - \vspace*{20pt} + {\color{documentTitle}\Huge\textbf{\@title}\par} + \vspace*{20pt} + {\color{documentTitle}\huge\textbf{\@subtitle}\par} + \vspace*{20pt} {\color{documentTitle}\large\textbf{\udesoftec@entitle}\par} \vspace*{50pt} \hrule @@ -823,13 +824,13 @@ \fi \let\oldmaketitle\maketitle \renewcommand{\maketitle}{ - \let\oldhbadness\hbadness - \let\oldvbadness\vbadness - \hbadness=10000 - \vbadness=10000 - \oldmaketitle - \let\hbadness\oldhbadness - \let\vbadness\oldvbadness + \let\oldhbadness\hbadness + \let\oldvbadness\vbadness + \hbadness=10000 + \vbadness=10000 + \oldmaketitle + \let\hbadness\oldhbadness + \let\vbadness\oldvbadness } @@ -837,8 +838,8 @@ % special: don't change marginpar, else it will create overfuls with package todonotes \usepackage{marginnote} \ifx\marginfont\undefined - \newcommand{\marginfont}[1]{} - \newcommand{\marginnote}[2][]{\marginpar[#1]{#2}} + \newcommand{\marginfont}[1]{} + \newcommand{\marginnote}[2][]{\marginpar[#1]{#2}} \fi @@ -868,9 +869,9 @@ \newcommand{\ignoreHbadness}[1]{% \let\originalHbadness\hbadness% - \hbadness 100000% - #1 - \hbadness \originalHbadness% + \hbadness 100000% + #1 + \hbadness \originalHbadness% } \newcommand{\figref}[1]{\autoref{fig:#1}} @@ -981,12 +982,12 @@ }\fi } \newcommand{\parExampleWithHeading}[2]{% - \let\defaultCmdFootnote\footnote% - \let\footnote\footnoteCmdForInsideMinipage% + \let\defaultCmdFootnote\footnote% + \let\footnote\footnoteCmdForInsideMinipage% \begin{exampleBox}[#1]% - \small{#2}% - \end{exampleBox}% - \let\footnote\defaultCmdFootnote% + \small{#2}% + \end{exampleBox}% + \let\footnote\defaultCmdFootnote% } @@ -1042,6 +1043,29 @@ commentstyle=\color{DocumentMedium0}, } \lstset{#1} %allow options for new listing }{} +% BibTeX definition from +% http://tex.stackexchange.com/questions/85998/include-bibtex-contents-in-a-listings-block +\lstdefinelanguage{BibTeX} + {keywords={% + @article,@book,@collectedbook,@conference,@electronic,@ieeetranbstctl,% + @inbook,@incollectedbook,@incollection,@injournal,@inproceedings,% + @manual,@mastersthesis,@misc,@patent,@periodical,@phdthesis,@preamble,% + @proceedings,@standard,@string,@techreport,@unpublished,@techstandard% + }, + comment=[l][\itshape]{@comment}, + sensitive=false, + } +\lstnewenvironment{lstlistingbibtex}[1][]{% + \lstset{ + language={BibTeX}, + breaklines=true, + emph={style,leftmargin}, + texcsstyle=*\color{DocumentDark1}, + keywordstyle=\color{DocumentDark3}\textbf, + emphstyle=\color{DocumentDark4}, + } + \lstset{#1} %allow options for new listing +}{} \def\lstinlinelatex{\lstinline[% language={[LaTeX]TeX}, breaklines=true, @@ -1069,38 +1093,38 @@ colorinlistoftodos \ifdocumentOmitTodos - \renewcommand{\listoftodos}{} - \renewcommand{\todo}[2][]{} - \providecommand{\todoDesign}[1]{} - \providecommand{\todoText}[1]{} - \providecommand{\todoFigure}[1]{} + \renewcommand{\listoftodos}{} + \renewcommand{\todo}[2][]{} + \providecommand{\todoDesign}[1]{} + \providecommand{\todoText}[1]{} + \providecommand{\todoFigure}[1]{} \providecommand{\inlinetodo}[1]{} \providecommand{\todoinline}[1]{} \else - \let\defaultTodo\todo - \renewcommand{\todo}[1]{% + \let\defaultTodo\todo + \renewcommand{\todo}[1]{% \documentUsedTodostrue% \defaultTodo[]{#1}% - } - \providecommand{\todoDesign}[1]{% - \documentUsedTodostrue% - \defaultTodo[fancyline,backgroundcolor=DocumentBright2]{#1}% - } - \providecommand{\todoText}[1]{% - \documentUsedTodostrue% - \defaultTodo[fancyline,backgroundcolor=DocumentBright3]{#1}% - } - \providecommand{\todoFigure}[1]{% - \documentUsedTodostrue% - \defaultTodo[fancyline,backgroundcolor=DocumentBright4]{#1}% - } - \providecommand{\inlinetodo}[1]{\documentUsedTodostrue\defaultTodo[inline]{#1}} - \providecommand{\todoinline}[1]{\inlinetodo{#1}} - - \let\defaultListoftodos\listoftodos - \renewcommand{\listoftodos}{ - \defaultListoftodos - } + } + \providecommand{\todoDesign}[1]{% + \documentUsedTodostrue% + \defaultTodo[fancyline,backgroundcolor=DocumentBright2]{#1}% + } + \providecommand{\todoText}[1]{% + \documentUsedTodostrue% + \defaultTodo[fancyline,backgroundcolor=DocumentBright3]{#1}% + } + \providecommand{\todoFigure}[1]{% + \documentUsedTodostrue% + \defaultTodo[fancyline,backgroundcolor=DocumentBright4]{#1}% + } + \providecommand{\inlinetodo}[1]{\documentUsedTodostrue\defaultTodo[inline]{#1}} + \providecommand{\todoinline}[1]{\inlinetodo{#1}} + + \let\defaultListoftodos\listoftodos + \renewcommand{\listoftodos}{ + \defaultListoftodos + } \fi @@ -1110,12 +1134,12 @@ colorinlistoftodos %% special: hyperref needs to be loaded last! (exception hycap) %% purpose: make internal and external links working and colored \usepackage[pdftex,colorlinks=true, - linkcolor=LinkInternal, - anchorcolor=LinkAnchor, - citecolor=LinkBibliography, - filecolor=LinkExternal, - urlcolor=LinkExternal, - hyperindex,linktoc=section,pdfstartview=FitV, + linkcolor=LinkInternal, + anchorcolor=LinkAnchor, + citecolor=LinkBibliography, + filecolor=LinkExternal, + urlcolor=LinkExternal, + hyperindex,linktoc=section,pdfstartview=FitV, pdfpagelabels, bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{hyperref}% \AfterEndPreamble{\def\subsectionautorefname{\sectionautorefname}} @@ -1127,7 +1151,7 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h %%%% hycap %%%%%%%%%%% %% special: directly AFTER hyperref: %% purpose: links to figures and tables should link to top of figure and not to top of caption -%% (which is below figure, so figure wouldn't show but only caption); no other change necessary +%% (which is below figure, so figure wouldn't show but only caption); no other change necessary \usepackage[all]{hypcap} |