From 54563336da5800024cf4ec710295814020413f5b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 16 Aug 2016 21:47:33 +0000 Subject: udesoftec (16aug16) git-svn-id: svn://tug.org/texlive/trunk@41872 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/bibtex/bst/udesoftec/udesoftec.bst | 2 +- .../doc/latex/udesoftec/udesoftec-doc.pdf | Bin 490398 -> 483073 bytes Master/texmf-dist/source/latex/udesoftec/CHANGELOG | 21 +++ Master/texmf-dist/source/latex/udesoftec/README | 2 +- .../source/latex/udesoftec/udesoftec-doc.tex | 4 +- .../tex/latex/udesoftec/udesoftec-bibcommon.sty | 25 +++- .../tex/latex/udesoftec/udesoftec-biblatex.sty | 162 ++++++++++++++------- .../tex/latex/udesoftec/udesoftec-bst.sty | 17 +-- .../tex/latex/udesoftec/udesoftec-extra.sty | 4 +- .../texmf-dist/tex/latex/udesoftec/udesoftec.cls | 67 ++++++--- 10 files changed, 199 insertions(+), 105 deletions(-) diff --git a/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst b/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst index fb714c5c0f6..908b062c1f4 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-2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf index c1a9574b387..608068ceb2e 100644 Binary files a/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf and b/Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf differ diff --git a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG index 4e9319d5e85..9fc1d92ce6b 100644 --- a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG +++ b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG @@ -1,5 +1,26 @@ 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. +2016/08/15 v1.5.5 +* [udesoftec.cls] fixed cover page to fit new exam regulations +* [udesoftec.cls] fixed bug resulting in xpatch errors due to koma update +* [udesoftec.cls] added template version to English cover page +* [udesoftec-biblatex.sty] updated deprecated code for new biblatex + +2015/09/28 v1.5.4 (unreleased) +* [udesoftec-biblatex.sty] fixed references heading wrong label and missing toc entry +* [udesoftec-biblatex.sty] fixed bbl for @incollection +* [udesoftec-biblatex.sty] changed bbl to raggedright and set bibhang to 1.5em +* [udesoftec-biblatex.sty] some bbl spaces are now non-breaking spaces to improve word-wrap +* [udesoftec-bst.sty] changed bbl to raggedright and set bibhang to 1.5em +* [udesoftec-bst.sty] some bbl spaces are now non-breaking spaces to improve word-wrap + +2015/09/04 v1.5.3 (unreleased) +* [udesoftec-doc.pdf] corrected package dependencies +* [udesoftec-biblatex.sty] fixed incompatibility with \citemulti from udesoftec-bibcommon +* [udesoftec-biblatex.sty] fixed incompatibility with \citequotepar from udesoftec-bibcommon +* [udesoftec-biblatex.sty] defaulting \cite to \citep for compatibility with udesoftec-bst +* [udesoftec.cls] changed quotation style + 2015/09/04 v1.5.2 * [udesoftec.cls] Regression: \acadmicfield was dropped from default title page * [udesoftec.bst] repaired doi error parsing diff --git a/Master/texmf-dist/source/latex/udesoftec/README b/Master/texmf-dist/source/latex/udesoftec/README index 1a74ced0226..48bf2f35d52 100644 --- a/Master/texmf-dist/source/latex/udesoftec/README +++ b/Master/texmf-dist/source/latex/udesoftec/README @@ -3,7 +3,7 @@ udesoftec documentclass and bibstyle Maintainer: J. Peter M. Schuler E-Mail: j.peter.m.schuler at uni dash due dot de Copyright: 2013-2015 J. Peter M. Schuler -Version: 1.5.2 2015/09/04 +Version: 1.5.5 2016/08/15 License: lppl Topic: dissertation diff --git a/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex b/Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex index 3cdc048adfb..8734c261c44 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 2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec \documentclass[de,omit-sd,omit-lol]{udesoftec} \usepackage{udesoftec-extra} @@ -472,7 +472,7 @@ sudo tlmgr update --all sudo tlmgr install udesoftec nag chngcntr hyphenat libertine mweights fontaxes footmisc placeins sudo tlmgr install enumitem todonotes wallpaper marginnote mdframed needspace csquotes glossaries sudo tlmgr install glossaries-german glossaries-english xfor datatool substr xstring tracklang biblatex -sudo tlmgr install logreq regexpatch datetime2 datetime2-german datetime2-english +sudo tlmgr install logreq regexpatch datetime2 datetime2-german datetime2-english mfirstuc \end{lstlisting} Diese Dokumentation gibt im Folgenden Hinweise für eine \LaTeX{}-Konfiguration unter Windows mit diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty index 536971c4ead..6ee31750dc4 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-biblatex.sty %% Copyright 2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-bibcommon}[2015/09/04 v1.5.2 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]% +\ProvidesPackage{udesoftec-bibcommon}[2016/08/15 v1.5.5 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]% \newif\ifprimaryDocumentLanguageGerman @@ -53,6 +53,13 @@ \DeclareOption*{\PackageWarning{udesoftec-bibcommon}{Unknown option \CurrentOption}} \ProcessOptions\relax + + + +\RequirePackage{csquotes} % language dependant quotes and in-quote-quotes +\RequirePackage{regexpatch} % language dependant quotes and in-quote-quotes +\RequirePackage{hyperref} % support doi-links +\RequirePackage{hyphenat} % prevent author names and quotations from hyphenating %%%%%%%%%%%%%%%%%%%%%%%% \providecaptionname{ngerman}{\bbland}{und }% \providecaptionname{english}{\bbland}{and }% @@ -60,9 +67,9 @@ \providecaptionname{ngerman}{\bblheading}{Bibliografie}% \providecaptionname{english}{\bblheading}{Bibliography}% \providecaptionname{british}{\bblheading}{Bibliography}% -\providecaptionname{ngerman}{\bblin}{In: }% -\providecaptionname{english}{\bblin}{In: }% -\providecaptionname{british}{\bblin}{In: }% +\providecaptionname{ngerman}{\bblin}{In:~}% +\providecaptionname{english}{\bblin}{In:~}% +\providecaptionname{british}{\bblin}{In:~}% \providecaptionname{ngerman}{\bbled}{~(Hrsg.)}% \providecaptionname{english}{\bbled}{~(Ed.)}% \providecaptionname{british}{\bbled}{~(Ed.)}% @@ -147,6 +154,8 @@ \providecommand{\bblFontTitle}[1]{#1} + + \ifdocumentIsFinal \providecommand{\bblWarning}[2]{} %for production \else @@ -235,13 +244,13 @@ \message{LaTeX Warning: \noexpand\intextquote is deprecated, use \noexpand\citequote on input line \the\inputlineno }% \citequote[#1]{#2}{#3}% } -\providecommand{\citequote}[3][]{\enquote{#3} \cite[#1]{#2}} -\providecommand{\citequotehidden}[3][]{\cite[#1]{#2}} +\providecommand{\citequote}[3][]{\enquote{#3} \citep[#1]{#2}} +\providecommand{\citequotehidden}[3][]{\citep[#1]{#2}} \providecommand{\citetquotehidden}[3][]{\citet[#1]{#2}} \providecommand{\citetquotepar}[3][]{ \begin{quote} #3\par - \hfill\cite[#1]{#2} + \hfill\citep[#1]{#2} \end{quote} } diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty index ed314af8d5a..e1bb5321611 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty @@ -1,7 +1,7 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-biblatex.sty %% Copyright 2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-biblatex}[2015/09/04 v1.5.2 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]% +\ProvidesPackage{udesoftec-biblatex}[2016/08/15 v1.5.5 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]% % % \newif\ifprimaryDocumentLanguageGerman @@ -54,10 +54,7 @@ \ProcessOptions\relax %%%%%%%%%%%%%%%%%%%%%%%% - \RequirePackage{udesoftec-bibcommon} -\RequirePackage{csquotes} -\RequirePackage{regexpatch} \usepackage[ backend=biber, @@ -67,25 +64,21 @@ %sortcites=true, sorting=nyt, maxcitenames=2, - maxalphanames=2, - firstinits=true, + giveninits=true, terseinits=true, - uniquename=init, + uniquename=false, uniquelist=false, urldate=long, maxbibnames=99]{biblatex} \ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker} -\setlength{\bibhang} {2em} %hanging indentation for list of references +\setlength{\bibhang} {1.5em} %hanging indentation for list of references \setlength{\bibitemsep} {.25em} \setlength{\bibnamesep} {.25em} \setlength{\bibinitsep} {.25em} -% Change order to last name then first name abbreviate without a full stop at the end. This should be at the end! -%@Jörg You could use the starred version \DeclareFieldFormat* to clear -% type-specific formats. But IMO it's more consistent to format @incollection titles like @article titles. I've edited my example accordingly. -% + \DeclareFieldFormat*{title}{\bblFontTitle{#1}} \renewcommand*{\mkbibacro}[1]{#1} \DeclareFieldFormat{isbn}{\mkbibacro{ISBN}\addcolon{}#1} @@ -95,7 +88,7 @@ \renewcommand*{\mkbibnameprefix}[1]{\bblFontAuthorInText{#1}} -\renewcommand*{\mkbibnamelast}[1]{\bblFontAuthorInText{#1}} +\renewcommand*{\mkbibnamefamily}[1]{\bblFontAuthorInText{#1}} \renewcommand*{\labelnamepunct}{\bblAuthorTitleSep} \renewcommand*{\revsdnamedelim}{\bblAuthorsSep} @@ -118,43 +111,48 @@ \DeclareFieldFormat{maintitle}{\bblFontInBookTitle{#1}\isdot} \AtBeginBibliography{% -% \renewcommand*{\revsdnamedelim}{CCCCCCCCCCCC} \renewcommand*{\finalnamedelim}{\bblAuthorsSep} - \renewcommand*{\mkbibnameprefix}[1]{#1} - \renewcommand*{\mkbibnamefirst}[1]{#1} - \renewcommand*{\mkbibnamelast}[1]{#1} - \renewcommand*{\mkbibnameaffix}[1]{#1} +% \renewcommand*{\mkbibnameprefix}[1]{#1} + \renewcommand*{\mkbibnamegiven}[1]{#1} + \renewcommand*{\mkbibnamefamily}[1]{#1} +% \renewcommand*{\mkbibnameaffix}[1]{#1} + \renewcommand*{\bibnamedelimd}{\bblFirstnameSep} \renewcommand*{\multinamedelim}{\bblAuthorsSep} \renewcommand*{\finalnamedelim}{\bblAuthorsSep}% + \doublehyphendemerits=10000 + \raggedright } -\renewbibmacro*{name:last-first}[5]{% - \usebibmacro{name:delim}{#1}% - \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% - \mkbibnamelast{#1}\isdot% - \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% - \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}}% -} -\DeclareNameFormat{last-first}{% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% +%\renewbibmacro*{name:last-first}[5]{% +% \usebibmacro{name:delim}{#1}% +% \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}% +% \mkbibnamelast{#1}\isdot% +% \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}% +% \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}}% +%} + +\DeclareNameFormat{last-first}{ + \usebibmacro{name:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}% } \DeclareNameFormat{default}{% - \usebibmacro{name:last-first}{#1}{#4}{#5}{#7}% + \usebibmacro{name:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}% } \DeclareNameAlias{sortname}{last-first} %alle Autoren in der Biblografie gleich \DefineBibliographyStrings{ngerman}{% - andothers = {\bblFontAuthorInText{\bbletal}}, % we don't use et al in bbl - editor = {\bbled},% - editors = {\bbleds},% - urlseen = {\bbllastaccesswas}% + references = {\bblheading}, + andothers = {\bblFontAuthorInText{\bbletal}}, % we don't use et al in bbl + editor = {\bbled},% + editors = {\bbleds},% + urlseen = {\bbllastaccesswas}% } \DefineBibliographyStrings{english}{% +references = {\bblheading}, andothers = {\bblFontAuthorInText{\bbletal}}, % we don't use et al in bbl editor = {\bbled},% editors = {\bbleds},% @@ -164,6 +162,7 @@ } \DefineBibliographyStrings{british}{% +references = {\bblheading}, andothers = {\bblFontAuthorInText{\bbletal}}, % we don't use et al in bbl editor = {\bbled},% editors = {\bbleds},% @@ -172,8 +171,6 @@ % pages = {{Seiten}{S\adddot}}, } - - \AtEveryBibitem{\clearlist{language}} \AtEveryBibitem{\clearfield{pagetotal}} @@ -181,8 +178,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - \newbibmacro*{byeditor+suffix}{% \ifnameundef{editor} {} @@ -195,19 +190,10 @@ \usebibmacro{byeditorx}% \usebibmacro{bytranslator+others}% } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% \DeclareSourcemap{ -% \maps[datatype = bibtex]{ -% \map{%% 2. Abbreviate an entry such as Adam J[ohn] Smith to Smith, Adam J. -% \step[fieldsource = doi, -% match = \regexp{\[[\_]]+\]}, -% replace = .] -% } -% } -% } -% - - % suppress URL and ISBN if doi present +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% suppress URL and ISBN if doi present \settoggle{bbx:isbn}{false} %deactivate normal isbn output \renewbibmacro*{doi+eprint+url}{% \iffieldundef{doi} @@ -224,11 +210,19 @@ {}% } } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% for compatibility with bibcommon's citemulti +\providecommand{\bibstyle@udesoftec}{} +\providecommand{\bibstyle@udesoftecmulticite}{} +\let\defaultCite\cite% +\let\cite\citep% - - - +\renewcommand*{\citemulti}[1]{% +\let\cite\defaultCite% +\mkbibparens{#1}% +\let\cite\citep% +} \providebibmacro*{date+extrayear}{} @@ -341,6 +335,10 @@ % n.b. the default datelabel=year overrides merging of months and days \ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker} +\defbibheading{udesoftec}[\bibname]{% + \chapter*{#1}% + \addcontentsline{toc}{chapter}{#1}% +} \renewbibmacro*{author}{% \ifboolexpr{ test \ifuseauthor @@ -362,7 +360,7 @@ \usebibmacro{labeltitle}% \setunit*{\addspace}}% \bblFontYearInList{\usebibmacro{date+extrayear}}} - +\renewbibmacro*{in:}{\printtext{\bblin}} \renewbibmacro*{editor}{% \usebibmacro{bbx:editor}{editorstrg}} \renewbibmacro*{editor+others}{% @@ -498,7 +496,7 @@ \usebibmacro{event+venue+date}% \newunit\newblock \newunit\newblock - \iffieldundef{maintitle} + \iffieldundef{series} {\printfield{volume}% \printfield{part}} {}% @@ -529,7 +527,61 @@ {\usebibmacro{related:init}% \usebibmacro{related}} {}% - \usebibmacro{finentry}} + \usebibmacro{finentry} + } + + \DeclareBibliographyDriver{incollection}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{in:}% + \usebibmacro{byeditor+suffix}% + \usebibmacro{maintitle+booktitle}% + \newunit\newblock + \iffieldundef{series} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{series+number}% + \newunit\newblock + \printfield{note}% + \newunit\newblock +% \printlist{organization}% +% \newunit + \usebibmacro{publisher+location+date}% + \newunit\newblock + \usebibmacro{chapter+pages}% + \newunit\newblock + \iftoggle{bbx:isbn} + {\printfield{isbn}} + {}% + \newunit\newblock + \usebibmacro{doi+eprint+url}% + \newunit\newblock + \usebibmacro{addendum+pubstate}% + \setunit{\bibpagerefpunct}\newblock + \usebibmacro{pageref}% + \newunit\newblock + \iftoggle{bbx:related} + {\usebibmacro{related:init}% + \usebibmacro{related}} + {}% + \usebibmacro{finentry} + } + + + + %%%%%%%%%%%% % link whole cite including name diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty index 5eb1a989ed9..97db49fa029 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 2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-bst}[2015/09/04 v1.5.2 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]% +\ProvidesPackage{udesoftec-bst}[2016/08/15 v1.5.5 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]% \newif\ifprimaryDocumentLanguageGerman @@ -55,25 +55,16 @@ \ProcessOptions\relax %%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{udesoftec-bibcommon} -\RequirePackage{hyperref} % support doi-links -\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) \usepackage[elide]{natbib} \bibliographystyle{udesoftec} \providecommand{\bibstyle@udesoftec}{\bibpunct[,~\bblInTextPagePrefix{}]{(}{)}{;}{a}{}{}{}} \providecommand{\bibstyle@udesoftecmulticite}{\bibpunct[,~\bblInTextPagePrefix{}]{}{}{;}{a}{}{}{}} -%%%%%%%%%%%%%%%%%%%%%%%%% - \providecommand{\addbibresource}[1]{} -\setlength{\bibhang} {2em} %hanging indentation for list of references +\setlength{\bibhang} {1.5em} %hanging indentation for list of references \setlength{\itemsep} {.25em} +\renewcommand*{\bibfont}{\raggedright} \endinput% \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty index 431191ffa4b..2d21772027e 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-2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -38,6 +38,6 @@ % and % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-extra}[2015/09/04 v1.5.2 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% +\ProvidesPackage{udesoftec-extra}[2016/08/15 v1.5.5 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% %%%%%%%%%%%%%%%%%%%%%%%%% % empty - everything from 1.4.x is merged into main files \ 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 60f6028ada8..6fe05b2f1b3 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-2015 J. Peter M. Schuler -%% 2015/09/04 v1.5.2 udesoftec +%% 2016/08/15 v1.5.5 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesClass{udesoftec}[2015/09/04 v1.5.2 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% +\ProvidesClass{udesoftec}[2016/08/15 v1.5.5 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% % class is based on KOMA-script http://www.ctan.org/pkg/koma-script \LoadClass{scrbook} \KOMAoptions{ @@ -195,8 +195,15 @@ \fi \else% \fi% -\DeclareOption{bibtex} {\fallBackToBibtextrue} -\DeclareOption{biber} {\fallBackToBibtexfalse} +\def\udesoftec@bblengine{BibTeX} +\DeclareOption{bibtex} { + \fallBackToBibtextrue + \def\udesoftec@bblengine{BibTeX} +} +\DeclareOption{biber} { + \fallBackToBibtexfalse + \def\udesoftec@bblengine{BibLaTeX/Biber} +} \DeclareOption{de} {\primaryDocumentLanguageGermantrue} \DeclareOption{en} {\primaryDocumentLanguageGermanfalse} \DeclareOption{omit-lot} {\documentOmitLOTtrue} @@ -260,12 +267,12 @@ \labelPreTopic{zum Thema} \labelRespectConfidentiality{(Sperrvermerk beachten)} \academicfield{Wirtschaftsinformatik} -\institution{Vorgelegt der Fakult\"at f\"ur Wirtschaftswissenschaften\par der Universit\"at Duisburg-Essen} -\semester{Wintersemester 2015/2016, 8. Fachsemester \udesoftec@academicfield} +\institution{Vorgelegt der Fakult\"at f\"ur Wirtschaftswissenschaften der\par Universit\"at Duisburg-Essen} +\semester{\udesoftec@academicfield -- Sommersemester 2016} \entitle{Englischer Titel der Arbeit} \confidentialitySource{Name der Firma, die auf die Vertraulichkeitserkl\"arung besteht} \date{Dokumentversion: \today \linebreak Templateversion: -\udesoftecversion} +\udesoftecversion{} (with \udesoftec@bblengine)} \authorbox{ \begin{tabularx}{.7\linewidth}{ll} @@ -286,15 +293,15 @@ \abstract{\udesoftec@defaultabstracten} \entitle{} \abstractEn{} - \typeofdoc{Master Thesis} + \typeofdoc{Masters Thesis} \labelPreTopic{about the topic} \labelRespectConfidentiality{(Adhere confidentially clause --- Sperrvermerk beachten)} \academicfield{Business Information Systems} - \institution{Presented to the Faculty of Economics and Business Administration\par of University of Duisburg-Essen} - \semester{Winter semester 2015/2016, 8th Semester in - \udesoftec@academicfield} + \institution{Presented to the Faculty of Economics and Business Administration of\par University of Duisburg-Essen} + \semester{\udesoftec@academicfield{} -- Summer semester 2016} \confidentialitySource{Name of Company which wants the statutory declaration} - \date{Version: \today} + \date{Document version: \today \linebreak Template version: +\udesoftecversion{} (with \udesoftec@bblengine)} \authorbox{ \begin{tabularx}{.7\linewidth}{ll} Author:&Max Mustermann\\ @@ -326,7 +333,8 @@ %%%% microtype %%%%%% % purpose: character protrusion (also known as margin kerning) and font expansion -% purpose-de: optischen Randausgleich verwenden. Beispiele siehe Paket-Doku% source: http://www.ctan.org/pkg/microtype +% purpose-de: optischen Randausgleich verwenden. Beispiele siehe Paket-Doku +% source: http://www.ctan.org/pkg/microtype \usepackage{microtype} %%%%%%%%%%%%%%%%%%%%%% @@ -345,8 +353,9 @@ %%%% l18n %%%%%%%%%%%%% % purpose: localization and utf-8 config % babel has primary language last -\usepackage[\udesoftec@documentLanguage]{babel} \usepackage[utf8]{inputenc} +\usepackage[\udesoftec@documentLanguage]{babel} +\usepackage[autostyle,english=british,german=quotes]{csquotes} \usepackage{hyphenat} % helps with \nohyphens command, which allows to remove hypens from quotes. %%%%%%%%%%%%%%%%%%%%%% @@ -724,7 +733,7 @@ % we need type1cm and cm-super for the bigger fonts - else there would be warnings % source: https://groups.google.com/forum/#!msg/de.comp.text.tex/rVcjvNQI6IA/N-NsfyQzXRwJ \let\defaultchapterformat\chapterformat -\renewcommand{\chapterformat}{% +\newcommand{\udesoftec@chapterformat}{% \begingroup% \setlength{\unitlength}{1mm}% \begin{picture}(20,40)(-2,8)% @@ -747,6 +756,8 @@ \end{picture} % <-- Leerzeichen ist hier beabsichtigt! \endgroup } + +\let\chapterformat\udesoftec@chapterformat %%%%%%%%%%%%%%%%%%%%%% \ifdocumentOmitPageBreaks \let\chapterformat\defaultchapterformat @@ -902,23 +913,27 @@ innerrightmargin=\udesoftec@outerboxmargin,% innerbottommargin=2ex,% } -\usepackage{csquotes} \newcommand*\quotefont{\fontfamily{LinuxLibertineT-LF}} % selects Libertine as the quote font %\newcommand*\quotefont{\normalfont\fontfamily{\sfdefault}} % selects Libertine as the quote font \newcommand*\quotesize{60} % if quote size changes, need a way to make shifts relative % Make commands for the quotes \providecommand{\pictureopenquote}{\tikz[remember picture,overlay,xshift=-3ex,yshift=-.5] \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};} -\providecommand{\pictureclosequote}{\tikz[remember picture,overlay,xshift=4ex,yshift=2ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};} +%\providecommand{\pictureclosequote}{\tikz[remember picture,overlay,xshift=4ex,yshift=2ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};} +\providecommand{\pictureopenquoteen}{\tikz[remember picture,overlay,xshift=-4ex,yshift=-2.5ex] \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};} -\providecommand{\pictureopenquoteen}{\tikz[remember picture,overlay,xshift=-3ex,yshift=-1ex] \node (OQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};} -\providecommand{\pictureclosequoteen}{\tikz[remember picture,overlay,xshift=4ex,yshift=1.5ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};} +% +%\providecommand{\pictureopenquoteen}{% +%\tikz[remember picture,overlay,xshift=-4ex,yshift=-2.7ex] \node (OQ1) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textooquote};% +%\tikz[remember picture,overlay,xshift=-2ex,yshift=-2.5ex] \node (OQ2) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};% +%} +%\providecommand{\pictureclosequoteen}{\tikz[remember picture,overlay,xshift=4ex,yshift=1.5ex] \node (CQ) {\quotefont\fontsize{\quotesize}{\quotesize}\selectfont\textcoquote};} \newenvironment{citequoteparenv}{% \mdfsetup{% innerleftmargin=6ex,% - innerrightmargin=6ex,% + innerrightmargin=2ex,% backgroundcolor=DocumentBright2,% linecolor=DocumentMedium2,% linewidth=.5pt, @@ -927,7 +942,6 @@ \begin{mdframed}% \iflanguage{ngerman}{\pictureopenquote}{\pictureopenquoteen}% }{ - \iflanguage{ngerman}{\pictureclosequote}{\pictureclosequoteen} \end{mdframed}% } \newcommand{\citequotepar}[3][]{% @@ -936,6 +950,12 @@ \par\hfill\small\cite[#1]{#2}% \end{citequoteparenv}% } +\newcommand{\citequoteparnoquote}[3][]{% + \begin{citequoteparenv}% + \sloppy{\small\nohyphens{#3}}% + \par\hfill\small\cite[#1]{#2}% + \end{citequoteparenv}% +} \newenvironment{exampleBox}[1][]{% \mdfsetup{% frametitle={% @@ -1168,11 +1188,12 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \else \usepackage{udesoftec-biblatex} \AtEndDocument{% - \printbibliography + \printbibliography[heading=udesoftec]% } \fi -\usepackage[listings]{scrhack} +% conflict with texlive2016? +% \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{}}% -- cgit v1.2.3