summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-12 22:01:08 +0000
committerKarl Berry <karl@freefriends.org>2017-05-12 22:01:08 +0000
commitd519d77fb8050b65038daca80ba4e323a9834072 (patch)
tree7849058d498c4c79795c80369bb87f28b791c1e6 /Master/texmf-dist/tex
parent2c06b20f0baed397e5425399d978b209064a2ceb (diff)
udesoftec (12may17)
git-svn-id: svn://tug.org/texlive/trunk@44308 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/udesoftec/udesoftec-bibcommon.sty5
-rw-r--r--Master/texmf-dist/tex/latex/udesoftec/udesoftec-biblatex.sty39
-rw-r--r--Master/texmf-dist/tex/latex/udesoftec/udesoftec-bst.sty5
-rw-r--r--Master/texmf-dist/tex/latex/udesoftec/udesoftec-extra.sty4
-rw-r--r--Master/texmf-dist/tex/latex/udesoftec/udesoftec.cls181
5 files changed, 121 insertions, 113 deletions
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%