diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst | 276 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/udesoftec/udesoftec-doc.pdf | bin | 483073 -> 483671 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/CHANGELOG | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/udesoftec/udesoftec-doc.tex | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty | 39 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls | 181 |
10 files changed, 296 insertions, 233 deletions
diff --git a/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst b/Master/texmf-dist/bibtex/bst/udesoftec/udesoftec.bst index 908b062c1f4..48c1e0a475f 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 -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 udesoftec % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -53,7 +53,7 @@ ENTRY title type url - urldate + urldate volume year } @@ -67,12 +67,21 @@ FUNCTION {init.state.consts} #1 'mid.sentence := #2 'after.sentence := #3 'after.block := - #4 'before.bibitemtitle := - #5 'before.year := + #4 'before.bibitemtitle := + #5 'before.year := } STRINGS { s t } +FUNCTION {output.justdonothing} +{ 's := + output.state mid.sentence = + { "" * write$ } + { "" * write$ } +if$ + s +} + FUNCTION {output.justdo} { 's := output.state mid.sentence = @@ -100,23 +109,23 @@ FUNCTION {output.nonnull} "\newblock " write$ } { - output.state before.all = - 'write$ + output.state before.all = + 'write$ { - output.state before.bibitemtitle = - {"\bblAuthorTitleSep{}" * write$ } - { - output.state before.bibitemtitle = - 'write$ - { output.state before.year = - {"\bblAuthorYearSep{}" * write$ } - {add.period$ " " * write$ } - if$ - } - if$ - } - if$ - } + output.state before.bibitemtitle = + {"\bblAuthorTitleSep{}" * write$ } + { + output.state before.bibitemtitle = + 'write$ + { output.state before.year = + {"\bblAuthorYearSep{}" * write$ } + {add.period$ " " * write$ } + if$ + } + if$ + } + if$ + } if$ } if$ @@ -135,13 +144,13 @@ FUNCTION {output.nonnull2} "\newblock " write$ } { - output.state before.all = + output.state before.all = 'write$ - { output.state before.year = - {"\bblAuthorYearSep" * write$ } - {add.period$ " " * write$ } - if$ - } + { output.state before.year = + {"\bblAuthorYearSep" * write$ } + {add.period$ " " * write$ } + if$ + } if$ } if$ @@ -175,17 +184,17 @@ FUNCTION {fin.entry} FUNCTION {new.block} { output.state before.all = - 'skip$ + 'skip$ { output.state before.bibitemtitle = - 'skip$ - { - output.state before.year = - {before.bibitemtitle 'output.state := } - {after.block 'output.state := } - if$ - } - if$ - } + 'skip$ + { + output.state before.year = + {before.bibitemtitle 'output.state := } + {after.block 'output.state := } + if$ + } + if$ + } if$ } @@ -353,8 +362,8 @@ FUNCTION {format.authorStyleInList} { duplicate$ empty$ { pop$ "" } { - "\bblFontAuthorInList{" swap$ * "}" * - } + "\bblFontAuthorInList{" swap$ * "}" * + } if$ } @@ -362,7 +371,7 @@ FUNCTION {format.authors} % for reference list { author empty$ { "" } { author format.names format.authorStyleInList - } + } if$ } @@ -438,9 +447,9 @@ FUNCTION {format.title} { title empty$ { "" } { "\bblFontBookTitle{" title * "}" * - before.bibitemtitle 'output.state := + before.bibitemtitle 'output.state := - } + } if$ } @@ -572,8 +581,8 @@ FUNCTION {format.date} FUNCTION {format.year} { - "\bblFontYearInList{\bblYear{" format.date * "}}" * - before.year 'output.state := + "\bblFontYearInList{\bblYear{" format.date * "}}" * + before.year 'output.state := } FUNCTION {format.yearpublished} @@ -589,7 +598,7 @@ FUNCTION {format.standardpublished} FUNCTION {format.btitle} { - "\bblFontBookTitle{" title * "}" * + "\bblFontBookTitle{" title * "}" * before.bibitemtitle 'output.state := } @@ -609,13 +618,14 @@ FUNCTION {either.or.check} } FUNCTION {format.bvolume} -{ volume empty$ +{ + "volume and number" number either.or.check + volume empty$ { "" } { series empty$ - 'skip$ + { "\bblSeries{\bblvol{} " * volume * "}" } { "\bblVolumeOfSeries{" * volume * "}{" * series * "}" } if$ - "volume and number" number either.or.check } if$ } @@ -624,19 +634,23 @@ FUNCTION {format.number.series} { volume empty$ { number empty$ { series empty$ - { "" } - { "\bblSeries{" * series * "}" } - if$ - } + { "" } + { "\bblSeries{" * series * "}" } + if$ + } { series empty$ - 'skip$ - { "\bblVolumeOfSeries{" * volume * "}{" * series * "}" } - if$ - } - if$ + { "" } + { "\bblVolumeOfSeries{" * number * "}{" * series * "}" } + if$ + } + if$ } - { "" } - if$ + { series empty$ + { "" } + { "\bblVolumeOfSeries{" * volume * "}{" * series * "}" } + if$ + } + if$ } FUNCTION {format.edition} @@ -795,19 +809,20 @@ FUNCTION {article} author format.key output format.year output.nonnull format.title "title" output.check - new.block + new.block journal format.journaltitle "journal" output.check + eid empty$ { format.vol.num.pages output.justdo } { format.vol.num.eid output.justdo } if$ + format.doi empty$ - {format.issn output} - {} - if$ - format.doi output - format.url output - format.urldate output.justdo + { format.issn output + format.url output + format.urldate output.justdo} + { format.doi output} + if$ new.block note output fin.entry @@ -821,28 +836,28 @@ FUNCTION {book} } { format.authors output.nonnull - "author and editor" editor either.or.check + "author and editor" editor either.or.check } - if$ + if$ format.year output.nonnull format.btitle "title" output.check - format.bvolume output + format.bvolume output new.block format.number.series output new.sentence - format.edition output + format.edition output publisher "publisher" output.check format.address output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output + {format.isbn output format.url output - format.urldate output.justdo + format.urldate output.justdo} + {} + if$ + format.doi output new.block note output fin.entry @@ -858,12 +873,12 @@ FUNCTION {booklet} howpublished output format.address output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output + {format.isbn output format.url output - format.urldate output.justdo + format.urldate output.justdo} + {} + if$ + format.doi output new.block note output fin.entry @@ -882,7 +897,7 @@ FUNCTION {inbook} format.year output.nonnull format.btitle "title" output.check - format.bvolume output + format.bvolume output format.chapter.pages "chapter and pages" output.check new.block format.number.series output @@ -892,12 +907,12 @@ FUNCTION {inbook} format.edition output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output + {format.isbn output format.url output - format.urldate output.justdo + format.urldate output.justdo} + {} + if$ + format.doi output new.block note output fin.entry @@ -911,22 +926,25 @@ FUNCTION {incollection} format.title "title" output.check new.block - format.in.ed.booktitle "booktitle" output.check - format.bvolume output - format.number.series output - format.chapter.pages output - new.sentence - format.edition output - publisher "publisher" output.check - format.address output + format.in.ed.booktitle "booktitle" output.check + + format.bvolume output.justdonothing + + format.chapter.pages output + new.sentence + format.edition output + publisher "publisher" output.check + format.address output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output - format.url output - format.urldate output.justdo + { format.isbn output + format.url output + format.urldate output.justdo + } + { format.doi output + } + if$ + new.block note output fin.entry @@ -940,7 +958,7 @@ FUNCTION {inproceedings} format.title "title" output.check new.block - format.in.ed.booktitle "booktitle" output.check + format.in.ed.booktitle "booktitle" output.check format.bvolume output format.number.series output new.sentence @@ -948,7 +966,7 @@ FUNCTION {inproceedings} { organization publisher new.sentence.checkb organization output publisher output - + } { organization output @@ -959,12 +977,12 @@ FUNCTION {inproceedings} format.pages output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output + {format.isbn output format.url output - format.urldate output.justdo + format.urldate output.justdo} + {} + if$ + format.doi output new.block note output fin.entry @@ -976,7 +994,7 @@ FUNCTION {manual} { output.bibitem format.authors output author format.key output - format.year output.nonnull + format.year output.nonnull format.btitle "title" output.check organization address new.block.checkb organization output @@ -1047,14 +1065,14 @@ FUNCTION {techstandard} format.isbn output } if$ + format.url output + format.urldate output } { new.sentence format.doi output } if$ - format.url output - format.urldate output new.block note output @@ -1091,12 +1109,12 @@ FUNCTION {proceedings} publisher output format.address output format.doi empty$ - {format.isbn output} - {} - if$ - format.doi output + {format.isbn output format.url output - format.urldate output.justdo + format.urldate output.justdo} + {} + if$ + format.doi output new.block note output fin.entry @@ -1134,6 +1152,31 @@ FUNCTION {unpublished} fin.entry } +MACRO {jan} {""} + +MACRO {feb} {""} + +MACRO {mar} {""} + +MACRO {apr} {""} + +MACRO {may} {""} + +MACRO {jun} {""} + +MACRO {jul} {""} + +MACRO {aug} {""} + +MACRO {sep} {""} + +MACRO {oct} {""} + +MACRO {nov} {""} + +MACRO {dec} {""} + + FUNCTION {default.type} { misc } @@ -1215,7 +1258,7 @@ FUNCTION {author.key.organization.label} } FUNCTION {author.techstandard.label} { standard empty$ - { ' type " " * number * "-" * edition * "(" * } + { 'type " " * number * "-" * edition * "(" * } { standard format.authorStyleInText "(" * } if$ } @@ -1266,8 +1309,7 @@ FUNCTION {calc.label} '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 608068ceb2e..7a3c9a08a45 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 9fc1d92ce6b..f67ed88971b 100644 --- a/Master/texmf-dist/source/latex/udesoftec/CHANGELOG +++ b/Master/texmf-dist/source/latex/udesoftec/CHANGELOG @@ -1,5 +1,15 @@ 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. - + +2017/05/12 v1.6.0 +* Internal fixes due to new build tool +* [udesoftec.cls] removing PDF warnings +* [udesoftec-biblatex.sty] new compatibility with biblatex>3.5 new naming scheme +* [udesoftec.cls] fixed list of abbreviations +* [udesoftec.bst] fixed compatibility issue with MikTeX +* [udesoftec.bst] fixed issue with @incollection missing volume argument resulting in error +* [udesoftec.bst] removed url+urldate from output if DOI is present +* [udesoftec.bst] fixed issue with @article which has month set resulting in warning + 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 diff --git a/Master/texmf-dist/source/latex/udesoftec/README b/Master/texmf-dist/source/latex/udesoftec/README index 48bf2f35d52..43ca296fcc4 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.5 2016/08/15 +Version: 1.6.0 2017/05/12 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 8734c261c44..e20cc8aee18 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 -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 udesoftec \documentclass[de,omit-sd,omit-lol]{udesoftec} \usepackage{udesoftec-extra} @@ -398,6 +398,9 @@ Beschreibungslisten können auch mit festem Umbruch gesetzt werden: \chapter{FAQ} +\section{Warning: Biber: there were undefined citations} +Ist aktuell ein known issue, allerdings kann kein Fehler in der Ausgabe festgestellt werden. + \section{BibTeX Fehler: Paragraph ended before \ldots parsedate was complete.} Irgendwo gibt es in der .bib-Datei ein Fehlerhaftes Datum (urldate). Das Datum sollte im Format dd.mm.yyyy oder yyyy-mm-dd vorliegen (oder weder \enquote{.} diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty index 6ee31750dc4..ab27a39f0e1 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty @@ -1,7 +1,8 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-biblatex.sty %% Copyright 2015 J. Peter M. Schuler -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 udesoftec + % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +40,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-bibcommon}[2016/08/15 v1.5.5 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]% +\ProvidesPackage{udesoftec-bibcommon}[2017/05/12 v1.6.0 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]% \newif\ifprimaryDocumentLanguageGerman diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty index e1bb5321611..e6dbc9deee1 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty @@ -1,7 +1,8 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-biblatex.sty %% Copyright 2015 J. Peter M. Schuler -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 udesoftec + % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +40,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-biblatex}[2016/08/15 v1.5.5 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]% +\ProvidesPackage{udesoftec-biblatex}[2017/05/12 v1.6.0 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]% % % \newif\ifprimaryDocumentLanguageGerman @@ -70,15 +71,18 @@ uniquelist=false, urldate=long, maxbibnames=99]{biblatex} +\@ifpackageloaded{biblatex_legacy} +{ \ExecuteBibliographyOptions{labeldate,sorting=nyt,pagetracker} - +}{ +\ExecuteBibliographyOptions{labeldateparts,sorting=nyt,pagetracker} +} \setlength{\bibhang} {1.5em} %hanging indentation for list of references \setlength{\bibitemsep} {.25em} \setlength{\bibnamesep} {.25em} \setlength{\bibinitsep} {.25em} - \DeclareFieldFormat*{title}{\bblFontTitle{#1}} \renewcommand*{\mkbibacro}[1]{#1} \DeclareFieldFormat{isbn}{\mkbibacro{ISBN}\addcolon{}#1} @@ -113,31 +117,29 @@ \AtBeginBibliography{% \renewcommand*{\finalnamedelim}{\bblAuthorsSep} % \renewcommand*{\mkbibnameprefix}[1]{#1} + \renewcommand*{\mkbibnamelast}[1]{#1} \renewcommand*{\mkbibnamegiven}[1]{#1} \renewcommand*{\mkbibnamefamily}[1]{#1} % \renewcommand*{\mkbibnameaffix}[1]{#1} \renewcommand*{\bibnamedelimd}{\bblFirstnameSep} \renewcommand*{\multinamedelim}{\bblAuthorsSep} \renewcommand*{\finalnamedelim}{\bblAuthorsSep}% + \renewcommand*{\revsdnamepunct}{} \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:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}% -} - -\DeclareNameFormat{default}{% - \usebibmacro{name:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}% + \toggletrue{abx@bool@giveninits}% + \DeclareNameAlias{default}{family-given}% + \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}}% + } \DeclareNameAlias{sortname}{last-first} %alle Autoren in der Biblografie gleich @@ -211,6 +213,7 @@ references = {\bblheading}, } } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % for compatibility with bibcommon's citemulti \providecommand{\bibstyle@udesoftec}{} \providecommand{\bibstyle@udesoftecmulticite}{} @@ -333,8 +336,6 @@ references = {\bblheading}, \printdate}% \newunit}} -% 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}% diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty index 97db49fa029..925c91403bc 100644 --- a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty +++ b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty @@ -1,7 +1,8 @@ % !Mode:: "TeX:UTF-8" %% udesoftec-bst.sty %% Copyright 2015 J. Peter M. Schuler -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 udesoftec + % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +40,7 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{udesoftec-bst}[2016/08/15 v1.5.5 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]% +\ProvidesPackage{udesoftec-bst}[2017/05/12 v1.6.0 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]% \newif\ifprimaryDocumentLanguageGerman diff --git a/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty b/Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty index 2d21772027e..8c23033a100 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 -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 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}[2016/08/15 v1.5.5 udesoftec-extra.sty additions which are currently optional and may break former behaviour]% +\ProvidesPackage{udesoftec-extra}[2017/05/12 v1.6.0 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 6fe05b2f1b3..9d488bf97fb 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 -%% 2016/08/15 v1.5.5 udesoftec +%% 2017/05/12 v1.6.0 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,8 @@ % http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf \NeedsTeXFormat{LaTeX2e}% -\ProvidesClass{udesoftec}[2016/08/15 v1.5.5 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]% +\ProvidesClass{udesoftec}[2017/05/12 v1.6.0 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{ @@ -989,87 +990,6 @@ \let\footnote\defaultCmdFootnote% } -\usepackage{listings} -\lstset{% -frame=single,% -basicstyle=\scriptsize,% -breaklines=true,% -backgroundcolor=\color{DocumentBright0},% -rulecolor=\color{DocumentMedium0},% -keywordstyle=\color{DocumentDark1}, -stringstyle=\color{DocumentDark2}, -commentstyle=\color{DocumentMedium0}, -} -%add support for german utf-8 umlauts: -% source: http://stackoverflow.com/questions/1116266/listings-in-latex-with-utf-8-or-at-least-german-umlauts -\lstset{ - literate={ö}{{\"o}}1 - {ä}{{\"a}}1 - {ü}{{\"u}}1 - {Ä}{{\"A}}1 - {Ö}{{\"O}}1 - {Ü}{{\"U}}1 - {ß}{{\ss}}1 -} -%default design -\lstset{% - frame=single,% - basicstyle=\fontfamily{\ttdefault}\tiny,% - breaklines=true,% - backgroundcolor=\color{DocumentBright0},% - rulecolor=\color{DocumentMedium0},% - keywordstyle=\color{DocumentDark1}, - stringstyle=\color{DocumentDark2}, - commentstyle=\color{DocumentMedium0}, - framesep=\udesoftec@outerboxmargin, - rulesep=0ex, - numberbychapter=true, - captionpos=b, -} -\lstnewenvironment{lstlistinglatex}[1][]{% - \lstset{ - language={[LaTeX]TeX}, - breaklines=true, - moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidSource,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms}, - morekeywords={figure,document,itemize,enumerate,description,final,omit-todos,tabularx}, - emph={style,leftmargin}, - texcsstyle=*\color{DocumentDark1}, - keywordstyle=\color{DocumentDark3}\textbf, - emphstyle=\color{DocumentDark4}, - } - \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, - moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms}, - morekeywords={figure,document,description,itemize,enumerate,final,omit-todos,tabularx}, - texcsstyle=*\color{DocumentDark1}, - keywordstyle=\color{DocumentDark3}\textbf, -]} \usepackage[ ngerman, textsize=tiny, @@ -1172,9 +1092,9 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h } -\AtEndDocument{% - \printglossary% -} +%\AtEndDocument{% +% \printglossary% +%} \newcommand{\figref}[1]{\autoref{fig:#1}} \newcommand{\eng}[1]{engl.: \emph{\english{#1}}} \newcommand{\entode}[1]{engl. für \emph{\english{#1}}} @@ -1193,7 +1113,88 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \fi % conflict with texlive2016? -% \usepackage[listings]{scrhack} +%\usepackage[listings]{scrhack} +\usepackage{listings} +\lstset{% +frame=single,% +basicstyle=\scriptsize,% +breaklines=true,% +backgroundcolor=\color{DocumentBright0},% +rulecolor=\color{DocumentMedium0},% +keywordstyle=\color{DocumentDark1}, +stringstyle=\color{DocumentDark2}, +commentstyle=\color{DocumentMedium0}, +} +%add support for german utf-8 umlauts: +% source: http://stackoverflow.com/questions/1116266/listings-in-latex-with-utf-8-or-at-least-german-umlauts +\lstset{ + literate={ö}{{\"o}}1 + {ä}{{\"a}}1 + {ü}{{\"u}}1 + {Ä}{{\"A}}1 + {Ö}{{\"O}}1 + {Ü}{{\"U}}1 + {ß}{{\ss}}1 +} +%default design +\lstset{% + frame=single,% + basicstyle=\fontfamily{\ttdefault}\tiny,% + breaklines=true,% + backgroundcolor=\color{DocumentBright0},% + rulecolor=\color{DocumentMedium0},% + keywordstyle=\color{DocumentDark1}, + stringstyle=\color{DocumentDark2}, + commentstyle=\color{DocumentMedium0}, + framesep=\udesoftec@outerboxmargin, + rulesep=0ex, + numberbychapter=true, + captionpos=b, +} +\lstnewenvironment{lstlistinglatex}[1][]{% + \lstset{ + language={[LaTeX]TeX}, + breaklines=true, + moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidSource,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms}, + morekeywords={figure,document,itemize,enumerate,description,final,omit-todos,tabularx}, + emph={style,leftmargin}, + texcsstyle=*\color{DocumentDark1}, + keywordstyle=\color{DocumentDark3}\textbf, + emphstyle=\color{DocumentDark4}, + } + \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, + moretexcs={\citeauthor,\autoref,\includegraphics,\citet,\citetext,\citealp,\inlinetodo,\todo,\entitle,\authorbox,\city,\typeofdoc,\semester,\confidentialitySource,\academicfield,\institution,\abstract,\abstractEn,\printacronyms}, + morekeywords={figure,document,description,itemize,enumerate,final,omit-todos,tabularx}, + texcsstyle=*\color{DocumentDark1}, + keywordstyle=\color{DocumentDark3}\textbf, +]} % 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{}}% @@ -1212,7 +1213,11 @@ bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,bookmarksnumbered=true]{h \newcommand{\acr}[1]{\gls{#1}\gdef\udesoftec@usedlistofitems@acronyms{}} \AtEndDocument{\ifdefined\udesoftec@usedlistofitems@acronyms\label{udesoftec:needsloa}\fi}% -\newcommand{\udesoftecprintacronyms}{\@ifundefined{r@udesoftec:needsloa}{}{\printacronyms[style=myAcronymStyle]}}% + +\providecaptionname{ngermen}{\udesoftecAcronymsTitle}{Abkürzungsverzeichnis}% +\providecaptionname{english}{\udesoftecAcronymsTitle}{Acronyms}% +\providecaptionname{british}{\udesoftecAcronymsTitle}{Acronyms}% +\newcommand{\udesoftecprintacronyms}{\@ifundefined{r@udesoftec:needsloa}{}{\printacronyms[style=myAcronymStyle,title=\udesoftecAcronymsTitle]}}% \AfterEndPreamble{ \udesoftecoverride% |