diff options
Diffstat (limited to 'macros/latex/contrib')
75 files changed, 445 insertions, 120 deletions
diff --git a/macros/latex/contrib/ccfonts/readme b/macros/latex/contrib/ccfonts/README index 74e92756a6..561711effc 100644 --- a/macros/latex/contrib/ccfonts/readme +++ b/macros/latex/contrib/ccfonts/README @@ -2,10 +2,10 @@ * LaTeX support for the Concrete fonts * * * * cc.fdd: 1999/11/22 v1.0a * -* ccfonts.dtx: 2000/06/30 v1.1 * +* ccfonts.dtx: 2020/03/25 v1.2 * * * ************************************************************ -Copyright (c) Walter Schmidt 1997--2000 +Copyright (c) Walter Schmidt 1997--2020 This program may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -22,6 +22,8 @@ ccfonts.ins. What's new? =========== +2020/03/25: (UF) adapted boldsans version to new LaTeX handling of series defaults. + see https://github.com/latex3/latex2e/issues/299 2000/05/30: bug fix wrt/ amsfonts.sty diff --git a/macros/latex/contrib/ccfonts/ccfonts.dtx b/macros/latex/contrib/ccfonts/ccfonts.dtx index 2480f1f986..5135d128ac 100644 --- a/macros/latex/contrib/ccfonts/ccfonts.dtx +++ b/macros/latex/contrib/ccfonts/ccfonts.dtx @@ -1,4 +1,4 @@ -%\CheckSum{144} +%\CheckSum{146} % % \iffalse meta comment % @@ -23,9 +23,9 @@ \ProvidesFile{ccfonts.drv} %</driver> %<package>\ProvidesPackage{ccfonts} - [2000/06/30 v1.1 (WaS)] + [2020/03/25 v1.2 (WaS)] % -%<*driver> +%<*driver> \documentclass[11pt]{ltxdoc} \usepackage{mflogo,url} \CodelineNumbered @@ -38,7 +38,7 @@ % \GetFileInfo{ccfonts.drv} % \DeleteShortVerb{\|} % \MakeShortVerb{\+} -% +% % \title{The \LaTeXe{} package \texttt{ccfonts}} % \author{Walter Schmidt\thanks{\texttt{walter.schmidt@arcormail.de}}} % \date{(\fileversion{} -- \filedate)} @@ -57,7 +57,7 @@ % (CTAN: \path{fonts/concmath/}) % \item The +.fd+ files for the traditional and mathematical % Concrete fonts (CTAN: \path{macros/latex/contrib/supported/concmath/}) -% \item The +.fd+ files for the European Concrete fonts, +% \item The +.fd+ files for the European Concrete fonts, % which are distributed and installed in conjunction % with the +ccfonts+ package % \end{itemize} @@ -68,7 +68,7 @@ % % % \section{Using the package} -% The \LaTeX{} macro package +ccfonts+ +% The \LaTeX{} macro package +ccfonts+ % supports typesetting with the font family `Concrete'. % Loading this package through % \begin{verse} @@ -86,7 +86,7 @@ % % Notice that you may still have to specify the option +psamsfonts+ % for these packages, so as to prevent them from using design sizes -% of the Euler Fraktur fonts, which may be +% of the Euler Fraktur fonts, which may be % unavailable within your TeX system; this works flawlessly with % version 1.1 of the +ccfonts+ package now. (You need not care for this % subject, unless Euler Fraktur is actually used.) @@ -97,12 +97,12 @@ % \begin{description} % \oitem{boldsans} The semibold series of CM Sans is used % as a replacement for the missing bold series of Concrete. -% (The default behaviour is to use the bold extended version of +% (The default behaviour is to use the bold extended version of % CM Roman.) % \oitem{standard-baselineskips} disables the increased leading. % This can be useful, e.g., when typesetting in narrow columns. % \oitem{exscale} implements scaling of the math extension font. -% For a discussion of this feature see the file +exscale.dtx+. +% For a discussion of this feature see the file +exscale.dtx+. % \oitem{slantedGreek} makes uppercase Greek letters slanted by default. % Regardless of this option, the new commands +\upDelta+ and +\upOmega+ % will always produce an upright \( \Delta \) and \( \Omega \). @@ -123,7 +123,7 @@ % There are no bold math fonts available. % \item % In order to enlarge the default +\baselineskip+, the size-changing -% macros have been redefined, and they are no longer as robust as the +% macros have been redefined, and they are no longer as robust as the % original definitions. This may result in \LaTeX\ errors with % `moving arguments'. As a workaround, you may protect any font-related % commands in moving arguments with a +\protect+ command. In case this @@ -148,14 +148,14 @@ % OMX & ccex & m & n \\ \hline \hline % \multicolumn{4}{|c|}{\textit{Concrete AMS A, B}}\\ \hline % U & msa & m & n \\ \hline -% U & msb & m & n \\ \hline +% U & msb & m & n \\ \hline % \end{tabular} % \end{center} -% Notice, that +% Notice, that % \begin{itemize} % \item the series c (condensed) is available as slanted % and with a font size of 9\,pt only; -% \item the Concrete AMS fonts are only defined +% \item the Concrete AMS fonts are only defined % through the package \textsf{ccfonts}, % i.e., there are no related \texttt{.fd} files. % \end{itemize} @@ -217,7 +217,7 @@ % \end{macrocode} % % \subsubsection{The option \texttt{exscale}} -% The code is simply copied from \texttt{exscale.sty}, +% The code is simply copied from \texttt{exscale.sty}, % with \texttt{xccex} instead of \texttt{cmex}. % \begin{macrocode} \DeclareOption{exscale}{ @@ -262,7 +262,9 @@ % \subsection{The option \texttt{boldsans}} % \begin{macrocode} \DeclareOption{boldsans}{% - \renewcommand{\bfdefault}{sbc}} + \@ifundefined{DeclareFontSeriesDefault}{% + \renewcommand{\bfdefault}{sbc}}{% + \DeclareFontSeriesDefault[rm]{bf}{sbc}}} % \end{macrocode} % % \subsubsection{Processing options} @@ -282,10 +284,10 @@ % \end{macrocode} % % In case the package +amsfonts+ is loaded additionally, -% we must ensure that the Concrete versions of the +% we must ensure that the Concrete versions of the % AMS symbol fonts are used. We execute the font definitions -% AtBeginDocument, so that loading +amsfonts+ with the -% option +psamsfonts+ cannot do any harm. Notice that the option may +% AtBeginDocument, so that loading +amsfonts+ with the +% option +psamsfonts+ cannot do any harm. Notice that the option may % be required for getting the Euler Fraktur fonts right. % \begin{macrocode} \AtBeginDocument{ @@ -294,13 +296,13 @@ <5><6><7><8><9><10>gen*xccam% <10.95><12><14.4><17.28><20.74><24.88>xccam10}{} \DeclareFontFamily{U}{msb}{} - \DeclareFontShape{U}{msb}{m}{n}{% + \DeclareFontShape{U}{msb}{m}{n}{% <5><6><7><8><9><10>gen*xccbm% <10.95><12><14.4><17.28><20.74><24.88>xccbm10}{} } % \end{macrocode} % -% +% % \subsection{Initialization} % We ensure that any package loaded after \texttt{ccfonts} % will find the new value of +\baselineskip+. @@ -331,4 +333,3 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% - diff --git a/macros/latex/contrib/ccfonts/ccfonts.pdf b/macros/latex/contrib/ccfonts/ccfonts.pdf Binary files differindex f55e83e5c3..ec8997b00f 100644 --- a/macros/latex/contrib/ccfonts/ccfonts.pdf +++ b/macros/latex/contrib/ccfonts/ccfonts.pdf diff --git a/macros/latex/contrib/glossaries-extra/CHANGES b/macros/latex/contrib/glossaries-extra/CHANGES index 3972b207c4..ea884160d6 100644 --- a/macros/latex/contrib/glossaries-extra/CHANGES +++ b/macros/latex/contrib/glossaries-extra/CHANGES @@ -1,3 +1,12 @@ +1.45 (2020-04-01): + + * glossaries-extra-stylemods.sty: + + - Bug fix: removed duplication of description in treenoname style + + - New command: \glstreenonameChildDescLoc + + 1.44 (2020-03-23): * glossaries-extra.sty: diff --git a/macros/latex/contrib/glossaries-extra/README b/macros/latex/contrib/glossaries-extra/README index 6710e081c8..8c1893e335 100644 --- a/macros/latex/contrib/glossaries-extra/README +++ b/macros/latex/contrib/glossaries-extra/README @@ -1,4 +1,4 @@ -LaTeX Package : glossaries-extra v1.44 (2020-03-23) +LaTeX Package : glossaries-extra v1.45 (2020-04-01) Author : Nicola Talbot https://www.dickimaw-books.com/contact diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf b/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf Binary files differindex 48d6bff21e..a7bac16a1d 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html index d0813adde4..a01186aa3d 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html @@ -219,7 +219,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;} > <!--l. 235--><p class="noindent" > </p><!--l. 235--><p class="noindent" ><span -class="cmr-17">glossaries-extra.sty v1.44: an extension to the</span> +class="cmr-17">glossaries-extra.sty v1.45: an extension to the</span> <span class="cmr-17">glossaries package</span> </p> @@ -243,7 +243,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table> </div> <!--l. 235--><p class="noindent" ><span -class="cmr-12">2020-03-23</span></p></div> +class="cmr-12">2020-04-01</span></p></div> <div class="abstract" > diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf Binary files differindex c0a595de52..e72737a6dd 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex index b720b1aaa0..0920f2ff4c 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex @@ -225,13 +225,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \DeleteShortVerb{\|} \MakeShortVerb{"} - \title{glossaries-extra.sty v1.44: + \title{glossaries-extra.sty v1.45: an extension to the glossaries package} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2020-03-23} + \date{2020-04-01} \maketitle \begin{abstract} diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx b/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx index c2dcfe0ecb..b9f90f6ca8 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx @@ -1,6 +1,12 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -setambles ".*\.bib=>\nopreamble\nopostamble" +% -section "chapter" +% -doc "glossaries-extra-codedoc.tex" +% -author "Nicola Talbot" +% -macrocode ".*\.tex" +% -macrocode ".*\.bib" % -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty" % -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" @@ -9,17 +15,11 @@ % -src "glossary-topic.sty\Z=>glossary-topic.sty" % -src "(example-glossaries-.+\.tex)\Z=>\1" % -src "(example-glossaries-.+\.bib)\Z=>\1" -% -doc "glossaries-extra-codedoc.tex" -% -section "chapter" -% -setambles ".*\.bib=>\nopreamble\nopostamble" % -comment ".*\.tex" % -comment ".*\.bib" % -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" -% -author "Nicola Talbot" -% -macrocode ".*\.tex" -% -macrocode ".*\.bib" % glossaries-extra -% Created on 2020/3/23 20:29 +% Created on 2020/4/1 13:56 %\fi %\iffalse %<*package> @@ -142,7 +142,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{27175} +\CheckSum{27181} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -182,13 +182,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \raggedright } -\title{glossaries-extra.sty v1.44: +\title{glossaries-extra.sty v1.45: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2020-03-23} +\date{2020-04-01} \begin{document} \DocInput{glossaries-extra.dtx} @@ -233,7 +233,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -25645,7 +25645,7 @@ defined}{}% %automatically loaded by the record option. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Provide convenient shortcut commands for predefined glossary types. %\begin{macro}{\printunsrtacronyms} @@ -28730,7 +28730,7 @@ defined}{}% % First identify package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-stylemods}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} % Provide package options to automatically load required predefined % styles. The simplest method is to just test for the existence of @@ -29800,6 +29800,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameDescLoc}[2]{% + \glstreenonamedesc{#1}\glstreeprelocation#2% + } +% \end{macrocode} +%\end{macro} %\begin{macro}{\glstreenonamechilddesc} %\changes{1.31}{2018-05-09}{new} %The child entry doesn't have the pre-description separator as the @@ -29810,6 +29818,14 @@ defined}{}% }% % \end{macrocode} %\end{macro} +%\begin{macro}{\glstreenonameChildDescLoc} +%\changes{1.45}{2020-04-01}{new} +% \begin{macrocode} + \newcommand{\glstreenonameChildDescLoc}[2]{% + \glstreenonamechilddesc{#1}\glstreechildprelocation#2% + } +% \end{macrocode} +%\end{macro} % \begin{macrocode} \renewglossarystyle{treenoname}{% \renewenvironment{theglossary}% @@ -29823,8 +29839,10 @@ defined}{}% \parindent0pt\relax \glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}% \glstreenonamesymbol{##1}% - \glstreenonamedesc{##1}% - \glstreeDescLoc{##1}{##2}\par +% \end{macrocode} +%\changes{1.45}{2020-04-01}{removed duplicate description} +% \begin{macrocode} + \glstreenonameDescLoc{##1}{##2}\par }% \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax @@ -29833,8 +29851,7 @@ defined}{}% \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - \glstreenonamechilddesc{##2}% - \glstreechildprelocation##3\par + \glstreenonameChildDescLoc{##2}{##3}\par }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}% } @@ -31036,7 +31053,7 @@ defined}{}% %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -31532,7 +31549,7 @@ defined}{}% %Provides additional long styles. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-longextra}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required packages. % \begin{macrocode} @@ -32961,7 +32978,7 @@ defined}{}% %topic. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)] +\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)] % \end{macrocode} %Load required package. % \begin{macrocode} diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra.ins b/macros/latex/contrib/glossaries-extra/glossaries-extra.ins index f1a3cb82b0..cc2f94010c 100644 --- a/macros/latex/contrib/glossaries-extra/glossaries-extra.ins +++ b/macros/latex/contrib/glossaries-extra/glossaries-extra.ins @@ -1,4 +1,4 @@ -% glossaries-extra.ins generated using makedtx version 1.2 2020/3/23 20:29 +% glossaries-extra.ins generated using makedtx version 1.2 2020/4/1 13:56 \input docstrip \preamble diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf Binary files differindex 067fefffb0..f90e2bf9e0 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf Binary files differindex 75dbbba4ea..3ba4c0d2c3 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf Binary files differindex dcfa99bf2a..c070b1a1c1 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf Binary files differindex c2475f0895..b1ca94ef98 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf Binary files differindex 9240549091..e5d3aabee0 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf Binary files differindex af769c2904..5f95e8c10d 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf Binary files differindex fea6372359..4bf0cfc14b 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf Binary files differindex e1b1b380e7..d87c56c028 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf Binary files differindex 0a15892f04..6b2326755e 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf Binary files differindex 0b4c4eb9bf..5ace7e5e2e 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf Binary files differindex 5ffe8cdc19..cf75773e80 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf Binary files differindex a6659eb0ab..44d3c2df33 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf Binary files differindex 8807a83295..6656a68b92 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf Binary files differindex ca7017a576..0dc9e3931c 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf Binary files differindex 3ba1d7d804..1b88b47f31 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf Binary files differindex da5ad2f50c..f376f4b6e8 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf Binary files differindex bc6c45aee0..cdcf6be76a 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf Binary files differindex 2fad6052c9..9d57d9290a 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf Binary files differindex 8f6cb1c9a3..4b0605157c 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf Binary files differindex a84fa9e505..f48bb2ab24 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf Binary files differindex 6e7bee8038..78849f09e4 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf Binary files differindex 138c930a14..3ccebde9f1 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf Binary files differindex 9cf9ba11ff..d0bd830ca0 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf Binary files differindex 4398fabf49..ead60a83b4 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf Binary files differindex 800e23fc95..6aedfbfd3b 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf Binary files differindex 1ab4d05a3b..642c20dbf7 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf Binary files differindex 148f025b1e..32a0b98094 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf Binary files differindex 73ae97a0e1..5da7a933d6 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf Binary files differindex b85e9628db..28bdb492a3 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf Binary files differindex 84b11de45b..3a408d73d1 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf Binary files differindex 7b66ce9069..e381014d44 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf Binary files differindex a4ddbadfec..5c4220a185 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf Binary files differindex c4ec898bac..eee065e89a 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf Binary files differindex c8f28cd6c3..e86ecc0201 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf Binary files differindex b3338a5a3d..8d4c7cdc2e 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf Binary files differindex 9f41dfa065..a4c0b17bda 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf Binary files differindex 8831ce5d7a..3eede737cf 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf Binary files differindex b0cc53ec5a..e37e644536 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf Binary files differindex c4b42d1791..d003fbd686 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf Binary files differindex ac6c68db0a..4b702408d2 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf Binary files differindex da9bf5b1c0..2b624456f4 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf Binary files differindex 724d7d4fd7..f4123f6561 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf Binary files differindex 307d4ba2c9..63142c9f26 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf Binary files differindex f50bc9cacb..b3978b8883 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf Binary files differindex 8f0b50a01f..f2f7259725 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf Binary files differindex 50be7ebdf4..82d972fd7d 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf Binary files differindex d8f7ce0b59..ad37602acd 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf diff --git a/macros/latex/contrib/glossaries-extra/samples/sample.pdf b/macros/latex/contrib/glossaries-extra/samples/sample.pdf Binary files differindex 0896f120ef..61564941cd 100644 --- a/macros/latex/contrib/glossaries-extra/samples/sample.pdf +++ b/macros/latex/contrib/glossaries-extra/samples/sample.pdf diff --git a/macros/latex/contrib/iodhbwm/README.md b/macros/latex/contrib/iodhbwm/README.md index fff5878e17..9716853bf5 100644 --- a/macros/latex/contrib/iodhbwm/README.md +++ b/macros/latex/contrib/iodhbwm/README.md @@ -1,33 +1,34 @@ -iodhbwm -======= +# iodhbwm [![CTAN](https://img.shields.io/ctan/v/iodhbwm.svg)](https://www.ctan.org/pkg/iodhbwm) [![GitHub license](https://img.shields.io/github/license/faltfe/iodhbwm.svg?style=flat-square)](https://github.com/faltfe/iodhbwm/blob/master/LICENSE) [![Build Status](https://img.shields.io/travis/faltfe/iodhbwm/master.svg?style=flat-square)](https://travis-ci.org/faltfe/iodhbwm) --------------------------------------------------------------------------- +--- + This project provides the _unofficial_ template of the [DHBW Mannheim](http://www.dhbw-mannheim.de) for the creation of bachelor thesis, studies or project work with _LaTeX_. The goal of the package is the quick creation of a basic framework without much effort. The documentation is currently only available in German. --------------------------------------------------------------------------- +--- Felix Faltin -Web: <https://github.com/faltfe/iodhbwm> +Web: <https://github.com/faltfe/iodhbwm> E-Mail: ffaltin91@gmail.com --------------------------------------------------------------------------- -Copyright 2018-2019 Felix Faltin +--- + +Copyright 2018-2020 Felix Faltin This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in - <http://www.latex-project.org/lppl.txt> +<http://www.latex-project.org/lppl.txt> and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. @@ -35,9 +36,9 @@ This work has the LPPL maintenance status `maintained'. The Current Maintainer of this work is Felix Faltin. --------------------------------------------------------------------------- +--- If you have any ideas, questions, suggestions or bugs to report, please feel free to contact me. --------------------------------------------------------------------------- +--- diff --git a/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf b/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf Binary files differindex 1de10b8c49..2c383a577c 100644 --- a/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf +++ b/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf diff --git a/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex b/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex index d26a35aa24..fd7f206f61 100644 --- a/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex +++ b/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex @@ -9,7 +9,7 @@ %\usepackage{showframe} \package[vcs=https://github.com/faltfe/iodhbwm,ctan=iodhbwm]{iodhbwm} -\version{1.1.1} +\version{1.2} \title{iodhbwm Klasse} \author{Felix Faltin} @@ -150,9 +150,9 @@ \newcommand{\Version}[1]{\marginpar[\raggedleft v#1]{\raggedright v#1}} \begin{document} - \changes{0.4-alpha}{Add print option, auto-intro-pages and some new commands} - \changes{0.4a-alpha}{Rename \opt{intro/add custom list} into \opt{intro/append custom content}}% - \changes{0.4.1-alpha}{Unterstützung eines Anhang wurde hinzugefügt}% + \changes{1.1}{Erweiterung der Optionen}% + \changes{1.1.1}{Kleinere Fehlerbehebungen innerhalb von listings} + \changes{1.2}{Bereitstellung Englischer Vorlagen (Danke an mickmack1213)} \maketitle @@ -173,7 +173,11 @@ \clearpage \tableofcontents - + + \clearpage + \PrintChanges + \clearpage + \section{Konventionen} % \begin{sourcecode}[listing side comment, comment={Ich bin ein Kommentar},title={Hello world example}] %% Hello again @@ -679,12 +683,11 @@ Um die Autovervollständigung für \thepackage{} zu aktiveren, müssen die Dateien \file{iodhbwm.cwl} und \file{iodhbwm-template.cwl} nach \path|%appdata%\texstudio\completion\user| beziehungsweise nach \path|.config/texstudio/completion/user| kopiert werden. \section{Installation} + \subsection{CTAN} + Das Bundle wird ebenfalls über CTAN zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen. \subsection{Lokale Installation} Eine eigene Installation des Pakets kann in einem lokalen texmf Ordner (lokales Repository) erfolgen. Das Bundle kann manuell aus dem Git-Repository heruntergeladen werden. - - \subsection{CTAN} - Das Bundle wird ebenfalls über CTAN (mit Release der Version v1.0) zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen. - + \subsubsection{MiKTeX} \begin{enumerate} \item Lokales Repository anlegen, welches der \href{http://tug.ctan.org/tds/tds.html}{Verzeichnisstruktur für \LaTeX{} Dateien} entspricht. Die Verzeichnisstruktur könnte wie folgt aussehen:\par \verb|C:\Users\<username>\localtexmf\tex\latex\iodhbwm| @@ -708,8 +711,6 @@ Eine ausführliche Beschreibung befindet sich auf \url{https://tex.stackexchange.com/a/73017/142408}. -% \PrintChanges - \PrintIndex \end{document} diff --git a/macros/latex/contrib/iodhbwm/tex/i18n.def b/macros/latex/contrib/iodhbwm/tex/i18n.def new file mode 100644 index 0000000000..42dda7a3ff --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n.def @@ -0,0 +1,36 @@ +\newcommand{\@addlanguage}[7]{% + \iflanguage{#1}{ + \renewcommand*{\iodhbwm@file@prefix}{i18n/#1/dhbw} + + \def\iodhbwm@bachelor@type@boe{#2} + \def\iodhbwm@bachelor@type@bos{#3} + \def\iodhbwm@bachelor@type@boa{#4} + + \def\iodhbwm@thesis@type@ba{#5} + \def\iodhbwm@thesis@type@pa{#6} + \def\iodhbwm@thesis@type@sa{#7} + + \booltrue{iodhbwm@if@supported@language} + }% + {}% +} + +% ################################################################ +% ### ADD SUPPORTED LANGUAGES HERE +% ################################################################ + +% english +\@addlanguage{english} + {Bachelor of Engineering} + {Bachelor of Science} + {Bachelor of Arts} + {bachelor's thesis} + {project report} + {study report} + +% ################################################################ + +% Print waring if an unsupported language is used +\ifbool{iodhbwm@if@supported@language}{}{% + \PackageWarning{\iodhbwm@pkg@name}{The passed language `\iodhbwm@main@language` was not found.\MessageBreak Using ngerman instead.} +} diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def new file mode 100644 index 0000000000..83412c1939 --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def @@ -0,0 +1,37 @@ +\clearpage + +\ifcsdef{chapter}% +{\chapter*{Declaration}}% +{\section*{Declaration}} + +\thispagestyle{empty} + +\bigskip + +I hereby assure you that I have written my \getThesisType{} on the\bigskip + +\textsc{Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}} + +{\bfseries \getThesisTitle} + +\ifcsempty{iodhbwm@thesis@second@title}{}{% +\bigskip +\textsc{Subject B}\par% +{\bfseries \getThesisSecondTitle}% +}{}\bigskip + +independently and that I have not used any other sources and aids than those indicated. + + +I also assure you that the electronic version submitted is the same as the printed version.$^\ast$ + +{\small$^\ast$ if both versions are required.} + +\vfill + +\begin{tabular}{l} +\hline +\getLocation, \getDate +\end{tabular} + +\clearpage
\ No newline at end of file diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def new file mode 100644 index 0000000000..0d72435ca4 --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def @@ -0,0 +1,57 @@ +\begin{titlepage} + \centering + \ifcsempty{iodhbwm@institute@logo}{% + \includegraphics[height=1.7cm]{\getDHBWLogo} + }{% + \begin{minipage}[c]{.25\textwidth} + \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo} + \end{minipage} + \hfill + \begin{minipage}[c]{.25\textwidth} + \centering + \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo} + \end{minipage} + } + + \bigskip + + \rule{\textwidth}{.5mm}\bigskip + + {\bfseries \getThesisTitle}\smallskip + + \rule{\textwidth}{.5mm}\bigskip + + \textsc{\Large Bachelor's thesis} + + \bigskip + for the degree + + \textsc{\large \getBachelorDegree} + + \bigskip + of the course \getCourseName\par + at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation + + \vfill + + by\par + {\bfseries\large \getAuthor}\bigskip + + Submission on \getSubmissionDate + + \vfill + + \small{% + \begin{tabularx}{\textwidth}{@{}lX@{}} + \toprule + Processing Period: & \getProcessingPeriod\\ + Student id, course: & \getStudentId, \getCourseId\\ + \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}% + Apprenticing company: & \getInstitute\\ + \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}% + Company's supervisor: & \getSupervisor\\ + University's reviewer: & \getReviewer\\ + \end{tabularx} + } + \cleardoublepage +\end{titlepage} diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def new file mode 100644 index 0000000000..31254bc505 --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def @@ -0,0 +1,59 @@ +\begin{titlepage} + \centering + \ifcsempty{iodhbwm@institute@logo}{% + \includegraphics[height=1.5cm]{\getDHBWLogo} + }{% + \begin{minipage}[c]{.25\textwidth} + \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo} + \end{minipage} + \hfill + \begin{minipage}[c]{.25\textwidth} + \raggedleft + \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo} + \end{minipage} + } + + \bigskip + + \Large\textsc{Project report} + + \normalsize + of the course \getCourseName\par + at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation + + \rule{\textwidth}{.5mm}\bigskip + + \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}} + + {\bfseries \getThesisTitle}\bigskip + + \ifcsempty{iodhbwm@thesis@second@title}{}{% + \textsc{\large Subject B}\par + %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};} + {\bfseries \getThesisSecondTitle} + }{} + + \rule{\textwidth}{.5mm} + + \vfill + + \par + {\bfseries\large \getAuthor}\par + \getDate + + \vfill + + \small{% + \begin{tabularx}{\textwidth}{@{}lX@{}} + \toprule + Processing Period: & \getProcessingPeriod\\ + Student id, course: & \getStudentId, \getCourseId\\ + \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}% + Apprenticing company: & \getInstitute\\ + \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}% + Supervisor: & \getSupervisor\\ + Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt} + \end{tabularx} + } + \cleardoublepage +\end{titlepage} diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def new file mode 100644 index 0000000000..51a2c29e6d --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def @@ -0,0 +1,59 @@ +\begin{titlepage} + \centering + \ifcsempty{iodhbwm@institute@logo}{% + \includegraphics[height=1.5cm]{\getDHBWLogo} + }{% + \begin{minipage}[c]{.25\textwidth} + \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo} + \end{minipage} + \hfill + \begin{minipage}[c]{.25\textwidth} + \raggedleft + \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo} + \end{minipage} + } + + \bigskip + + \Large\textsc{Study report} + + \normalsize + of the course \getCourseName\par + at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation + + \rule{\textwidth}{.5mm}\bigskip + + \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}} + + {\bfseries \getThesisTitle}\bigskip + + \ifcsempty{iodhbwm@thesis@second@title}{}{% + \textsc{\large Subject B}\par + %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};} + {\bfseries \getThesisSecondTitle} + }{} + + \rule{\textwidth}{.5mm} + + \vfill + + \par + {\bfseries\large \getAuthor}\par + \getDate + + \vfill + + \small{% + \begin{tabularx}{\textwidth}{@{}lX@{}} + \toprule + Processing Period: & \getProcessingPeriod\\ + Student id, course: & \getStudentId, \getCourseId\\ + \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}% +% Apprenticing company: & \getInstitute\\ + \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}% + Supervisor: & \getSupervisor\\ +% Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt} + \end{tabularx} + } + \cleardoublepage +\end{titlepage} diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def new file mode 100644 index 0000000000..efd704204f --- /dev/null +++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def @@ -0,0 +1,55 @@ +\begin{titlepage} + \centering + \begin{minipage}[c]{.25\textwidth} + \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo} + \end{minipage} + \hfill + \begin{minipage}[c]{.25\textwidth} + \raggedleft + \includegraphics[width=\linewidth,keepaspectratio]{example-image} + \end{minipage} + + \bigskip + + \Large\textsc{Report} + + \normalsize + of the course Information Technology\par + at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation + + \rule{\textwidth}{.5mm}\bigskip + + \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}} + + {\bfseries \getThesisTitle}\bigskip + + \ifcsempty{iodhbwm@thesis@second@title}{}{% + \textsc{\large Subject B}\par + %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};} + {\bfseries \getThesisSecondTitle} + }{} + + \rule{\textwidth}{.5mm} + + \vfill + + \par + {\bfseries\large \getAuthor}\par + \today + + \vfill + + \small{% + \begin{tabularx}{\textwidth}{@{}lX@{}} + \toprule + Processing Period: & \getProcessingPeriod\\ + Student id, course: & \getStudentId, \getCourseId\\ + Department: & \getInstituteSection\\ + Apprenticing company: & \getInstitute\\ + Location: & \getLocation\\ + Supervisor: & \getSupervisor\\ + Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt} + \end{tabularx} + } + \cleardoublepage +\end{titlepage} diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-declaration.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-declaration.def index 93c915f9d1..93c915f9d1 100644 --- a/macros/latex/contrib/iodhbwm/tex/dhbw-declaration.def +++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-declaration.def diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-ba.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-ba.def index f8e05ce8df..5bf27cb638 100644 --- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-ba.def +++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-ba.def @@ -47,9 +47,9 @@ Bearbeitungszeitraum: & \getProcessingPeriod\\ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\ \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}% - Ausbildungsfirma: & \getInstitute\\ + Ausbildungsbetrieb: & \getInstitute\\ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}% - Betreuer der Ausbildungsfirma: & \getSupervisor\\ + Betreuer des Ausbildungsbetriebs: & \getSupervisor\\ Gutachter der Dualen Hochschule: & \getReviewer\\ \end{tabularx} } diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-pa.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def index 790563eceb..1c05221abb 100644 --- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-pa.def +++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def @@ -49,7 +49,7 @@ Bearbeitungszeitraum: & \getProcessingPeriod\\ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\ \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}% - Ausbildungsfirma: & \getInstitute\\ + Ausbildungsbetrieb: & \getInstitute\\ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}% Betreuer: & \getSupervisor\\ Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt} diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-sa.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-sa.def index b1cab1a480..c58239db3a 100644 --- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-sa.def +++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-sa.def @@ -36,7 +36,7 @@ Bearbeitungszeitraum: & \getProcessingPeriod\\ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\ % Abteilung: & \getInstituteSection\\ - Ausbildungsfirma: & \getInstitute\\ + Ausbildungsbetrieb: & \getInstitute\\ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}% Betreuer: & \getSupervisor\\ % Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt} diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage.def index 33b50837a2..1c34e5bf48 100644 --- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage.def +++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage.def @@ -1,42 +1,25 @@ \begin{titlepage} - \begin{minipage}[c]{.30\textwidth} - \includegraphics[height=1.7cm]{dhbw-logo} - \end{minipage} - \hfill - \begin{minipage}[c]{.30\textwidth} - \centering - \includegraphics[height=1.7cm]{example-image} - \end{minipage} - \hfill - \begin{minipage}[c]{.30\textwidth} - \raggedleft - \includegraphics[height=1.7cm]{example-image} - \end{minipage} + \centering + \begin{minipage}[c]{.25\textwidth} + \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo} + \end{minipage} + \hfill + \begin{minipage}[c]{.25\textwidth} + \raggedleft + \includegraphics[width=\linewidth,keepaspectratio]{example-image} + \end{minipage} + + \bigskip - \begin{center} \Large\textsc{Arbeit} \normalsize des Studiengangs Informationstechnik\par der Dualen Hochschule Baden-Württemberg \getDHBWLocation - \end{center} \rule{\textwidth}{.5mm}\bigskip - % \begin{minipage}[t]{.45\textwidth} - % \centering\textsc{Thema A} - % - % \bfseries\large \dots - % \hfill - % \begin{minipage}[t]{.45\textwidth} - % \centering\textsc{Thema B} - % - % \tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}\par - % - % \bfseries\large \dots - % \end{minipage} - % \\[1em] - \centering\textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}} + \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}} {\bfseries \getThesisTitle}\bigskip @@ -50,11 +33,9 @@ \vfill - \begin{center} - von\par + \par \centering{\bfseries\large \getAuthor}\par \today - \end{center} \vfill diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty index 3f9a6e7b06..b52807439e 100644 --- a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty +++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty @@ -7,7 +7,7 @@ % Felix Faltin % E-Mail: ffaltin91@gmail.com % ---------------------------------------------------------- -% Copyright 2017-2019 Felix Faltin +% Copyright 2017-2020 Felix Faltin % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -23,8 +23,8 @@ % % ---------------------------------------------------------- -\newcommand*{\iodhbwm@pkg@version}{v1.1.1} -\newcommand*{\iodhbwm@pkg@date}{2019-09-08} +\newcommand*{\iodhbwm@pkg@version}{v1.2} +\newcommand*{\iodhbwm@pkg@date}{2020-04-01} \newcommand*{\iodhbwm@pkg@info}{Inoffical DHBW Mannheim thesis package} \newcommand*{\iodhbwm@pkg@name}{iodhbwm-templates} @@ -67,11 +67,28 @@ \newbool{iodhbwm@if@print@lof} \newbool{iodhbwm@if@print@location} \newbool{iodhbwm@if@oldpagestyle} +\newbool{iodhbwm@if@supported@language} + +% ---------------------------------------------------------- +% Define language depended settings +% ---------------------------------------------------------- +% Default language: ngerman +\newcommand*{\iodhbwm@file@prefix}{i18n/ngerman/dhbw} + +\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering} +\def\iodhbwm@bachelor@type@bos{Bachelor of Science} +\def\iodhbwm@bachelor@type@boa{Bachelor of Arts} + +\def\iodhbwm@thesis@type@ba{Bachelorarbeit} +\def\iodhbwm@thesis@type@pa{Projektarbeit} +\def\iodhbwm@thesis@type@sa{Studienarbeit} + +\iflanguage{ngerman}{\booltrue{iodhbwm@if@supported@language}}{} +\input{i18n.def} % ---------------------------------------------------------- % Define internal commands % ---------------------------------------------------------- -\newcommand*{\iodhbwm@file@prefix}{dhbw} \newcommand*{\iodhbwm@file@ending}{.def} \edef\iodhbwm@file@titlepage@default{\iodhbwm@file@prefix-titlepage\iodhbwm@file@ending} \edef\iodhbwm@file@titlepage@ba{\iodhbwm@file@prefix-titlepage-ba\iodhbwm@file@ending} @@ -80,13 +97,6 @@ \edef\iodhbwm@file@declaration@default{\iodhbwm@file@prefix-declaration\iodhbwm@file@ending} \edef\iodhbwm@file@abstract@default{\iodhbwm@file@prefix-abstract.inc} -\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering} -\def\iodhbwm@bachelor@type@bos{Bachelor of Science} -\def\iodhbwm@bachelor@type@boa{Bachelor of Arts} - -\def\iodhbwm@thesis@type@ba{Bachelorarbeit} -\def\iodhbwm@thesis@type@pa{Projektarbeit} -\def\iodhbwm@thesis@type@sa{Studienarbeit} \def\iodhbwm@dhbw@location@default{Mannheim} \def\iodhbwm@dhbw@logo@default{dhbw-logo} diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls index 86d6340ed3..c1ffa62ff6 100644 --- a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls +++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls @@ -7,7 +7,7 @@ % Felix Faltin % E-Mail: ffaltin91@gmail.com % ---------------------------------------------------------- -% Copyright 2017-2019 Felix Faltin +% Copyright 2017-2020 Felix Faltin % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -23,8 +23,8 @@ % % ---------------------------------------------------------- -\newcommand*{\iodhbwm@cls@version}{v1.1.1} -\newcommand*{\iodhbwm@cls@date}{2019-09-08} +\newcommand*{\iodhbwm@cls@version}{v1.2} +\newcommand*{\iodhbwm@cls@date}{2020-04-01} \newcommand*{\iodhbwm@cls@info}{Inoffical DHBW Mannheim thesis class} \ProvidesClass{iodhbwm}[% |