summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-20 22:22:12 +0000
committerKarl Berry <karl@freefriends.org>2019-12-20 22:22:12 +0000
commit3529377472c47bf61826b148a418bb51af0365d1 (patch)
tree2b1fee9fb430a027fdf4456c9448958b110b6918 /Master
parentf27cb1d537a34677b1291d5365c80cde1416417c (diff)
hu-berlin-bundle (20dec19)
git-svn-id: svn://tug.org/texlive/trunk@53196 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex (renamed from Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/b6c78e8c7fdf104e322be55279aea9bd.md.tex)5
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in5
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdfbin574985 -> 570495 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist2
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-lualatex.tex (renamed from Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.tex)12
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-markdown.md (renamed from Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.md)2
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco (renamed from Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.lco)12
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex4
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile8
-rw-r--r--Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx181
-rw-r--r--Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins13
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-base.sty47
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty26
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls25
15 files changed, 217 insertions, 129 deletions
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md b/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md
index 568b6dab485..92d36a4a58b 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md
@@ -34,6 +34,7 @@ With this (unofficial) bundle you have several documents which are designed acco
Following documents or documentclasses are available:
* letter (`hu-berlin-letter.cls`); via `.tex` and `.md`
+* base package (`hu-berlin-base.sty`)
## Installation of the bundle
`hu-berlin` is part of the distributions [MiKTeX](http://www.miktex.org)
@@ -66,6 +67,9 @@ All notable changes to this project will be documented in the [README.md](https:
This project **does not** adhere to [Semantic Versioning](http://semver.org/).
The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/).
+### v1.0.4 (2019-12-19)
+* Added `hu-berlin-base.sty` as a package which contains all relevant code for documents and documentclasses of the bundle.
+
### v1.0.3 (2019-06-26)
* Changed the main font for compatibility with UNIX-systems (TeX Gyre Heros instead of Verdana).
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/b6c78e8c7fdf104e322be55279aea9bd.md.tex b/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex
index 22491cee48a..af0811e452f 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/b6c78e8c7fdf104e322be55279aea9bd.md.tex
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex
@@ -3,6 +3,7 @@
{}Following documents or documentclasses are available:\markdownRendererInterblockSeparator
{}\markdownRendererUlBegin
\markdownRendererUlItem letter (\markdownRendererCodeSpan{hu-berlin-letter.cls}); via \markdownRendererCodeSpan{.tex} and \markdownRendererCodeSpan{.md}\markdownRendererUlItemEnd
+\markdownRendererUlItem base package (\markdownRendererCodeSpan{hu-berlin-base.sty})\markdownRendererUlItemEnd
\markdownRendererUlEnd \markdownRendererInterblockSeparator
{}\markdownRendererHeadingTwo{Installation of the bundle}\markdownRendererInterblockSeparator
{}\markdownRendererCodeSpan{hu-berlin} is part of the distributions \markdownRendererLink{MiKTeX}{http://www.miktex.org}{http://www.miktex.org}{} and \markdownRendererLink{TeXLive}{http://www.tug.org/texlive}{http://www.tug.org/texlive}{} -- thus, you can easily install it using the respective package manager. If you would like to install \markdownRendererCodeSpan{hu-berlin-bundle} into your local folder manually, do the following: Go to your terminal, browse to the folder of this bundle and run\markdownRendererInterblockSeparator
@@ -21,6 +22,10 @@ make install
{}This bundle is constantly updated. For hints, errors or suggestions use the GitHub repository \markdownRendererLink{https://github.com/LukasCBossert/hu-berlin-bundle}{https://github.com/LukasCBossert/hu-berlin-bundle}{https://github.com/LukasCBossert/hu-berlin-bundle}{}.\markdownRendererInterblockSeparator
{}\markdownRendererHeadingTwo{Changelog}\markdownRendererInterblockSeparator
{}All notable changes to this project will be documented in the \markdownRendererLink{README.md}{https://github.com/LukasCBossert/hu-berlin-bundle/blob/master/README.md}{https://github.com/LukasCBossert/hu-berlin-bundle/blob/master/README.md}{}. This project \markdownRendererStrongEmphasis{does not} adhere to \markdownRendererLink{Semantic Versioning}{http://semver.org/}{http://semver.org/}{}. The markdown syntax is inspired by the conventions proposed by \markdownRendererLink{keepachangelog.com}{http://keepachangelog.com/}{http://keepachangelog.com/}{}.\markdownRendererInterblockSeparator
+{}\markdownRendererHeadingThree{v1.0.4 (2019-12-19)}\markdownRendererInterblockSeparator
+{}\markdownRendererUlBegin
+\markdownRendererUlItem Added \markdownRendererCodeSpan{hu-berlin-base.sty} as a package which contains all relevant code for documents and documentclasses of the bundle.\markdownRendererUlItemEnd
+\markdownRendererUlEnd \markdownRendererInterblockSeparator
{}\markdownRendererHeadingThree{v1.0.3 (2019-06-26)}\markdownRendererInterblockSeparator
{}\markdownRendererUlBegin
\markdownRendererUlItem Changed the main font for compatibility with UNIX-systems (TeX Gyre Heros instead of Verdana).\markdownRendererUlItemEnd
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in
index 6113a816cae..c3cdfcc2ad9 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in
@@ -14,7 +14,7 @@ With this (unofficial) bundle you have several documents which are designed acco
Following documents or documentclasses are available:
* letter (`hu-berlin-letter.cls`); via `.tex` and `.md`
-
+* base package (`hu-berlin-base.sty`)
## Installation of the bundle
@@ -51,6 +51,9 @@ All notable changes to this project will be documented in the [README.md](https:
This project **does not** adhere to [Semantic Versioning](http://semver.org/).
The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/).
+### v1.0.4 (2019-12-19)
+* Added `hu-berlin-base.sty` as a package which contains all relevant code for documents and documentclasses of the bundle.
+
### v1.0.3 (2019-06-26)
* Changed the main font for compatibility with UNIX-systems (TeX Gyre Heros instead of Verdana).
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf
index 7aadae66724..8c86d297364 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist
index 111eed8de14..40f4ef85ae9 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist
@@ -1,6 +1,6 @@
-scrlttr2
graphicx
marvosym
+scrlttr2
scrlayer-scrpage
geometry
fontspec
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.tex b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-lualatex.tex
index 152adfc2dee..5f5ae13d07d 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.tex
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-lualatex.tex
@@ -1,5 +1,5 @@
%%
-%% This is file `hu-berlin-letter.tex',
+%% This is file `hu-berlin-letter-example-lualatex.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -16,7 +16,7 @@
%% ----------------------------------------------------------------
%%
\documentclass{hu-berlin-letter}
-\LoadLetterOption{hu-berlin-letter}
+\LoadLetterOption{hu-berlin-letter-example}
\setkomavar{myref}{}
\setkomavar{yourref}{}
\setkomavar{yourmail}{}
@@ -26,8 +26,8 @@
\usepackage{blindtext}
\begin{document}
\begin{letter}{%
- Erika Musterfrau\\
- Musterweg 43\\
+ Erika Musterfrau\par
+ Musterweg 43\par
56789 Musterhausen%
}
\opening{Sehr geehrte Frau Musterfrau,}
@@ -47,6 +47,6 @@
\end{letter}
\end{document}
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
-%% End of file `hu-berlin-letter.tex'.
+%% End of file `hu-berlin-letter-example-lualatex.tex'.
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.md b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-markdown.md
index e3839341838..22e5f8f6aeb 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.md
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example-markdown.md
@@ -1,6 +1,6 @@
---
documentclass: hu-berlin-letter
-sender: hu-berlin-letter
+sender: hu-berlin-letter-example
subject: Short description
addressee:
- Alexander von Humboldt
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.lco b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco
index 4e2c2ee30f0..46c1cc34bee 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter.lco
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco
@@ -1,5 +1,5 @@
%%
-%% This is file `hu-berlin-letter.lco',
+%% This is file `hu-berlin-letter-example.lco',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -15,10 +15,10 @@
%% please consider and respect them carefully.
%% ----------------------------------------------------------------
%%
-\ProvidesFile{hu-berlin-letter.lco}
+\ProvidesFile{hu-berlin-letter-example.lco}
\setkomavar{fromname}
-[Wissenschaftlicher Mitarbeiter]
-{Dr. Max Mustermann}
+ [Wissenschaftlicher Mitarbeiter]
+ {Dr. Max Mustermann}
\setkomavar{fromemail}{max.mustermann@hu-berlin.de}
\setkomavar{fromphone}{1234}
\setkomavar{fromfax}{5678}
@@ -46,6 +46,6 @@ Philosophische Fakultät
\usekomavar{fromname}
}
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
-%% End of file `hu-berlin-letter.lco'.
+%% End of file `hu-berlin-letter-example.lco'.
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex
index 6d00463b5dc..3df5b452dc8 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex
@@ -61,7 +61,7 @@ $endif$
\begin{document}
\begin{letter}{%
$for(addressee)$
-$addressee$$sep$\\
+$addressee$$sep$\par
$endfor$
}
$for(include-before)$
@@ -76,6 +76,6 @@ $for(include-after)$$include-after$$endfor$
\end{letter}
\end{document}
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
%% End of file `hu-berlin-letter-template.latex'.
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile b/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
index c6f1bec8e8b..19382036d33 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
@@ -31,10 +31,10 @@ examples: files
$(MAKE) md2pdf-letter
md2pdf-letter: files
- pandoc --pdf-engine=lualatex --template hu-berlin-letter-template.latex -o hu-berlin-letter-markdown.pdf hu-berlin-letter.md
+ pandoc --pdf-engine=lualatex --template hu-berlin-letter-template.latex -o hu-berlin-letter-example-markdown.pdf hu-berlin-letter-example-markdown.md
letter: files
- latexmk -lualatex -interaction=nonstopmode hu-berlin-letter.tex
+ latexmk -lualatex -interaction=nonstopmode hu-berlin-letter-example-lualatex.tex
# How to get information from CTAN
CTAN: $(PROJECT).pkglist
@@ -117,10 +117,10 @@ endif
-install: uninstall
+install: uninstall files
@mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(PROJECT)
@cp $(PROJECT).{dtx,ins} $(LOCAL)/source/latex/$(PROJECT)
- @cp hu-berlin-*.cls $(LOCAL)/tex/latex/$(PROJECT)
+ @cp hu-berlin-*.{cls,sty} $(LOCAL)/tex/latex/$(PROJECT)
@cp img/* $(LOCAL)/tex/latex/$(PROJECT)
@cp $(PROJECT).pdf $(LOCAL)/doc/latex/$(PROJECT)
mktexlsr
diff --git a/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx b/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx
index e8b30e087ec..4b064957d1c 100644
--- a/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx
+++ b/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx
@@ -1,6 +1,6 @@
% \iffalse
%<*internal|cls|sty>
-\def\Version{2019/06/26 v1.0.3}
+\def\Version{2019/12/19 v1.0.4}
%</internal|cls|sty>
%<*internal>
\iffalse
@@ -19,6 +19,12 @@
\PackageInfo{hu-berlin}{* * * hu-berlin * * *\MessageBreak
Part of the hu-berlin Bundle}
%</style>
+%<*base>
+\ProvidesPackage{hu-berlin-base}
+ [\Version\space hu-berlin - package for basic features]
+ \PackageInfo{hu-berlin}{* * * hu-berlin * * *\MessageBreak
+ Part of the hu-berlin Bundle}
+%</base>
%</sty>
%<*driver>
\catcode9=12
@@ -153,8 +159,8 @@ You find this bundle versioned and available on [Zenodo](https://doi.org/10.5281
\generate{
\file{README.md}{\from{\jobname.dtx}{readme,main}}
\file{hu-berlin-bundle-bibliography.bib}{\from{\jobname.dtx}{bib}}
- \file{hu-berlin-letter.tex}{\from{\jobname.dtx}{example,letter}}
- \file{hu-berlin-letter.md}{\from{\jobname.dtx}{example,letter-md}}
+ \file{hu-berlin-letter-example-lualatex.tex}{\from{\jobname.dtx}{example,letter}}
+ \file{hu-berlin-letter-example-markdown.md}{\from{\jobname.dtx}{example,letter-md}}
}
\preamble
@@ -171,15 +177,16 @@ please consider and respect them carefully.
\endpreamble
\postamble
-Copyright (C) 2019
+Copyright (C) 2019-2020
\endpostamble
\usedir{tex/latex/\jobname}
\generate{
- \file{hu-berlin-letter.tex}{\from{\jobname.dtx}{example,letter}}
- \file{hu-berlin-letter.lco}{\from{\jobname.dtx}{example,lco}}
+ \file{hu-berlin-letter-example-lualatex.tex}{\from{\jobname.dtx}{example,letter}}
+ \file{hu-berlin-letter-example.lco}{\from{\jobname.dtx}{example,lco}}
\file{hu-berlin-letter.cls}{\from{\jobname.dtx}{cls,letter}}
%
+ \file{hu-berlin-base.sty}{\from{\jobname.dtx}{sty,base}}
\file{hu-berlin-bundle-style.sty}{\from{\jobname.dtx}{sty,style}}
\file{hu-berlin-letter-template.latex}{\from{\jobname.dtx}{template,letter-md}}
}
@@ -260,7 +267,7 @@ With this (unofficial) bundle you have several documents which are designed acco
Following documents or documentclasses are available:
* letter (`hu-berlin-letter.cls`); via `.tex` and `.md`
-
+* base package (`hu-berlin-base.sty`)
## Installation of the bundle
@@ -297,6 +304,9 @@ All notable changes to this project will be documented in the [README.md](https:
This project **does not** adhere to [Semantic Versioning](http://semver.org/).
The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/).
+### v1.0.4 (2019-12-19)
+* Added `hu-berlin-base.sty` as a package which contains all relevant code for documents and documentclasses of the bundle.
+
### v1.0.3 (2019-06-26)
* Changed the main font for compatibility with UNIX-systems (TeX Gyre Heros instead of Verdana).
@@ -368,14 +378,15 @@ You can easily pick up the basic file structure from \cref{hu-berlin:bundle-stru
\footnotesize
\dirtree{%
.1 \huberlinFolder hu-berlin-bundle.
-.2 hu-berlin-bundle.dtx\DTcomment{code and documentation}.
-.2 hu-berlin-bundle.pdf\DTcomment{documentation}.
-.2 hu-berlin-letter.tex \DTcomment{letter}.
-.2 hu-berlin-letter.lco \DTcomment{datafile for letter}.
-.2 hu-berlin-letter.pdf \DTcomment{letter}.
+.2 hu-berlin-bundle.dtx \DTcomment{code and documentation}.
+.2 hu-berlin-bundle.pdf \DTcomment{documentation}.
+.2 hu-berlin-base.sty \DTcomment{basic components of the bundle}.
+.2 hu-berlin-letter-example-lualatex.tex \DTcomment{letter}.
+.2 hu-berlin-letter-example.lco \DTcomment{datafile for letter}.
+.2 hu-berlin-letter-example-lualatex.pdf \DTcomment{letter}.
+.2 hu-berlin-letter-example-markdown.pdf \DTcomment{converted letter from markdown}.
+.2 hu-berlin-letter-example-markdown.md \DTcomment{example markdown file }.
.2 hu-berlin-letter-template.latex \DTcomment{template for conversion}.
-.2 hu-berlin-letter-markdown.pdf \DTcomment{converted letter from markdown}.
-.2 hu-berlin-letter.md \DTcomment{example markdown file }.
.2 \huberlinFolder img\DTcomment{folder for images}.
.3 texografie-logo.png\DTcomment{logo of maintainer}.
.3 hu-berlin-logo.jpg\DTcomment{logo of HU}.
@@ -400,26 +411,26 @@ you get all these various files described above.
\part{Example files}
\chapter{Letter}
\section{From \texttt{.tex}}
-\IfFileExists{hu-berlin-letter.pdf}
+\IfFileExists{hu-berlin-letter-example-lualatex.pdf}
{\includepdf[%
pagecommand={\pagestyle{scrheadings}}
,link
,pages=-
- ,scale=.8
- % ,nup=1x2
- ,frame]{hu-berlin-letter.pdf}}
- {|hu-berlin-letter.pdf| missing!}
+ % ,scale=.5
+ ,nup=2x1
+ ,frame]{hu-berlin-letter-example-lualatex.pdf}}
+ {|hu-berlin-letter-example-lualatex.pdf| missing!}
\section{From \texttt{.md}}
-\IfFileExists{hu-berlin-letter-markdown.pdf}
+\IfFileExists{hu-berlin-letter-example-markdown.pdf}
{\includepdf[%
pagecommand={\pagestyle{scrheadings}}
,link
,pages=-
- ,scale=.8
- % ,nup=1x2
- ,frame]{hu-berlin-letter-markdown.pdf}}
- {|hu-berlin-letter-markdown.pdf| missing!}
+ % ,scale=.5
+ ,nup=2x1
+ ,frame]{hu-berlin-letter-example-markdown.pdf}}
+ {|hu-berlin-letter-example-markdown.pdf| missing!}
\end{document}
@@ -457,7 +468,7 @@ you get all these various files described above.
%
% The first line should provide this information.
% \begin{macrocode}
-\ProvidesFile{hu-berlin-letter.lco}
+\ProvidesFile{hu-berlin-letter-example.lco}
% \end{macrocode}
% Now we set up the personal data.
%
@@ -468,11 +479,11 @@ you get all these various files described above.
% you can also write the position of this person in brackets, this is optional;
% \oarg{position}
% \begin{macrocode}
-[Wissenschaftlicher Mitarbeiter]
+ [Wissenschaftlicher Mitarbeiter]
% \end{macrocode}
% But you need to give a name:
% \begin{macrocode}
-{Dr. Max Mustermann}
+ {Dr. Max Mustermann}
% \end{macrocode}
% The mail address
% \begin{macrocode}
@@ -548,7 +559,7 @@ Philosophische Fakultät
% ,numbersep = 10pt
% ,numberstyle =\footnotesize\ttfamily\color{hu-berlin-grey}
% }]%
-% {hu-berlin-letter.lco}
+% {hu-berlin-letter-example.lco}
%
% \section{\texttt{.tex}-file}
% \begin{macrocode}
@@ -559,7 +570,7 @@ Philosophische Fakultät
% \end{macrocode}
% Now we load the personal data-file which has the ending |.lco|.
% \begin{macrocode}
-\LoadLetterOption{hu-berlin-letter}
+\LoadLetterOption{hu-berlin-letter-example}
% \end{macrocode}
% If you have the HU font installed on your computer,
% you can load it, too:
@@ -599,8 +610,8 @@ Philosophische Fakultät
\begin{letter}{%
% \end{macrocode}
% \begin{macrocode}
- Erika Musterfrau\\
- Musterweg 43\\
+ Erika Musterfrau\par
+ Musterweg 43\par
56789 Musterhausen%
% \end{macrocode}
% Closing now again.
@@ -651,7 +662,7 @@ Philosophische Fakultät
% ,numbersep = 10pt
% ,numberstyle =\footnotesize\ttfamily\color{hu-berlin-grey}
% }]%
-% {hu-berlin-letter.tex}
+% {hu-berlin-letter-example-lualatex.tex}
% \begin{macrocode}
%</letter>
% \end{macrocode}
@@ -673,7 +684,7 @@ documentclass: hu-berlin-letter
% \end{macrocode}
% The following will load the |.lco|-file, you replace that with the name of your |.lco|-file.
% \begin{macrocode}
-sender: hu-berlin-letter
+sender: hu-berlin-letter-example
% \end{macrocode}
% You should also tell a short subject
% \begin{macrocode}
@@ -702,7 +713,7 @@ Thank you very much for your letter.
% ,numbersep = 10pt
% ,numberstyle =\footnotesize\ttfamily\color{hu-berlin-grey}
% }]%
-% {hu-berlin-letter.md}
+% {hu-berlin-letter-example-markdown.md}
% \begin{macrocode}
%</letter-md>
% \end{macrocode}
@@ -712,29 +723,11 @@ Thank you very much for your letter.
% \end{macrocode}
%\part{Guide for Coders}
% \begin{macrocode}
-%<*cls>
-% \end{macrocode}
-%\chapter{Letter}
-% \begin{macrocode}
-%<*letter>
-% \end{macrocode}
-% We load \pkg{scrlttr2} which is the documentclass for letters.
-% Furthermore we set up some options.
-% \begin{macrocode}
-\LoadClass[%
- fontsize=10pt,
- version=last,
-% \end{macrocode}
-% If there is anything to debug, you can enable |visualize|
-% \begin{macrocode}
- % visualize
-% \end{macrocode}
-% \begin{macrocode}
-]{scrlttr2}
+%<*sty>
% \end{macrocode}
-% For debugging also uncomment the \cs{showfields}\marg{fields} commanand.
+%\chapter{hu-berlin-base-package}
% \begin{macrocode}
-% \showfields{head,address,location,refline,foot}
+%<*base>
% \end{macrocode}
% Since we do want to compile with \lualatex,
% we make sure that it will be compilable only with that.
@@ -783,6 +776,52 @@ Thank you very much for your letter.
% \begin{macrocode}
\RequirePackage{marvosym}
% \end{macrocode}
+% And we define various colors from the corporate design manual.
+% \begin{macrocode}
+\RequirePackage{xcolor}
+\definecolor{hu-berlin-blue}{RGB}{0,65,137}
+\definecolor{hu-berlin-green}{RGB}{150,190,20}
+\definecolor{hu-berlin-grey}{RGB}{169,169,169}
+\definecolor{hu-berlin-brown}{RGB}{82,79,60}
+\definecolor{hu-berlin-red}{RGB}{180,0,0}
+% \end{macrocode}
+% That’s all for the base package, so we close it.
+% \begin{macrocode}
+%</base>
+% \end{macrocode}
+% \begin{macrocode}
+%</sty>
+% \end{macrocode}
+% \begin{macrocode}
+%<*cls>
+% \end{macrocode}
+%\chapter{Letter}
+% \begin{macrocode}
+%<*letter>
+% \end{macrocode}
+% We load \pkg{scrlttr2} which is the documentclass for letters.
+% Furthermore we set up some options.
+% \begin{macrocode}
+\LoadClass[%
+ fontsize=10pt,
+ version=last,
+% \end{macrocode}
+% If there is anything to debug, you can enable |visualize|
+% \begin{macrocode}
+ % visualize
+% \end{macrocode}
+% \begin{macrocode}
+]{scrlttr2}
+% \end{macrocode}
+% For debugging also uncomment the \cs{showfields}\marg{fields} commanand.
+% \begin{macrocode}
+% \showfields{head,address,location,refline,foot}
+% \end{macrocode}
+% Since all common and basic features of the bundle
+% are located in a separate package we load that first.
+% \begin{macrocode}
+\RequirePackage{hu-berlin-base}
+% \end{macrocode}
% To get the HU logo on the second and following pages we load \pkg{scrlayer-scrpage}.\fnurl{https://tex.stackexchange.com/a/495258/98739}
% \begin{macrocode}
\RequirePackage{scrlayer-scrpage}
@@ -1100,7 +1139,7 @@ Thank you very much for your letter.
% the corporate design guidlines.\fnurl{https://www.hu-berlin.de/de/hu-intern/design/basiselemente/leitfaden-corporate-design-hu.pdf}
% \begin{macrocode}
\setkomavar{firsthead}{%
- \includegraphics[width=145mm]{hu-berlin-logo.jpg}%
+ \includegraphics[width=145mm]{hu-berlin-logo}%
}
% \end{macrocode}
%
@@ -1121,8 +1160,8 @@ Thank you very much for your letter.
% \begin{macrocode}
\setkomavar*{fromaddress}{Postanschrift:}
\setkomavar{fromaddress}{%
- Humboldt-Universität zu Berlin\\
- Unter den Linden 6\\
+ Humboldt-Universität zu Berlin\par
+ Unter den Linden 6\par
D-10099 Berlin}
% \end{macrocode}
%
@@ -1235,7 +1274,7 @@ $endif$
\begin{document}
\begin{letter}{%
$for(addressee)$
-$addressee$$sep$\\
+$addressee$$sep$\par
$endfor$
}
$for(include-before)$
@@ -1340,8 +1379,6 @@ $for(include-after)$$include-after$$endfor$
\defaultfontfeatures{%
Ligatures = TeX
- ,Scale = MatchLowercase
- ,Numbers = OldStyle
}
% \end{macrocode}
% For fonts we use the available |TeX Gyre Pagella| as main font.\fnurl{http://www.gust.org.pl/projects/e-foundry/tex-gyre}
@@ -1352,16 +1389,17 @@ $for(include-after)$$include-after$$endfor$
% \end{macrocode}
% And we declare also the other fonts, too.
% \begin{macrocode}
-\setmonofont[Scale=1]{TeX Gyre Cursor}
+\setmonofont[%
+ Scale=1
+]{TeX Gyre Cursor}
\setsansfont[%
- ,LetterSpace = .8]{TeX Gyre Adventor-Regular}
+ ,LetterSpace = .8
+]{TeX Gyre Adventor-Regular}
\linespread{1.05}
% \end{macrocode}
% \begin{macrocode}
-\newfontfamily\listingsfont[
- Scale = MatchLowercase,
-]{TeX Gyre Cursor}
-\renewcommand\MacroFont{\listingsfont}
+
+
\RequirePackage{marginnote}
\renewcommand*{\marginfont}{%
@@ -1408,7 +1446,11 @@ $for(include-after)$$include-after$$endfor$
% \begin{macrocode}
\RequirePackage{etoolbox}
%https://tex.stackexchange.com/a/235881/98739
-\AfterEndPreamble{\maketitle}
+\AfterEndPreamble{%
+ \maketitle
+ \renewcommand\MacroFont{\ttfamily}
+ \renewcommand\AltMacroFont{\ttfamily\linespread{.8}}% slanted verbatim
+}
% https://tex.stackexchange.com/a/401466/98739
\makeatletter
@@ -1572,7 +1614,6 @@ $for(include-after)$$include-after$$endfor$
pdfcopyright = {Copyright (c) \the\year . All rights reserved.},
pdfhighlight = /N,
pdfdisplaydoctitle = true,
- pdfdate = {\today},
pdflang = {},%de en
pdfcaptionwriter = {Lukas C. Bossert},
pdfkeywords = {hu-berlin},
@@ -1678,7 +1719,7 @@ $for(include-after)$$include-after$$endfor$
\lstset{%
- basicstyle = \linespread{0.7}\listingsfont
+ basicstyle = \linespread{0.7}\ttfamily
,breaklines = true
,breakatwhitespace
,alsoletter=\\\{\}\*\[\]\-
diff --git a/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins b/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins
index 708003ac6fd..21b553e68a5 100644
--- a/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins
+++ b/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins
@@ -41,8 +41,8 @@
\generate{
\file{README.md}{\from{\jobname.dtx}{readme,main}}
\file{hu-berlin-bundle-bibliography.bib}{\from{\jobname.dtx}{bib}}
- \file{hu-berlin-letter.tex}{\from{\jobname.dtx}{example,letter}}
- \file{hu-berlin-letter.md}{\from{\jobname.dtx}{example,letter-md}}
+ \file{hu-berlin-letter-example-lualatex.tex}{\from{\jobname.dtx}{example,letter}}
+ \file{hu-berlin-letter-example-markdown.md}{\from{\jobname.dtx}{example,letter-md}}
}
\preamble
@@ -59,20 +59,21 @@ please consider and respect them carefully.
\endpreamble
\postamble
-Copyright (C) 2019
+Copyright (C) 2019-2020
\endpostamble
\usedir{tex/latex/\jobname}
\generate{
- \file{hu-berlin-letter.tex}{\from{\jobname.dtx}{example,letter}}
- \file{hu-berlin-letter.lco}{\from{\jobname.dtx}{example,lco}}
+ \file{hu-berlin-letter-example-lualatex.tex}{\from{\jobname.dtx}{example,letter}}
+ \file{hu-berlin-letter-example.lco}{\from{\jobname.dtx}{example,lco}}
\file{hu-berlin-letter.cls}{\from{\jobname.dtx}{cls,letter}}
%
+ \file{hu-berlin-base.sty}{\from{\jobname.dtx}{sty,base}}
\file{hu-berlin-bundle-style.sty}{\from{\jobname.dtx}{sty,style}}
\file{hu-berlin-letter-template.latex}{\from{\jobname.dtx}{template,letter-md}}
}
\endbatchfile
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
%% End of file `hu-berlin-bundle.ins'.
diff --git a/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-base.sty b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-base.sty
new file mode 100644
index 00000000000..fae5a7caa8b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-base.sty
@@ -0,0 +1,47 @@
+%%
+%% This is file `hu-berlin-base.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hu-berlin-bundle.dtx (with options: `sty,base')
+%% ----------------------------------------------------------------
+%% hu-berlin-bundle
+%% Author: Lukas C. Bossert
+%% E-mail: lukas@texografie.de
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See: http://www.latex-project.org/lppl.txt
+%% Various parts my have a different licence,
+%% please consider and respect them carefully.
+%% ----------------------------------------------------------------
+%%
+\def\Version{2019/12/19 v1.0.4}
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+\ProvidesPackage{hu-berlin-base}
+ [\Version\space hu-berlin - package for basic features]
+ \PackageInfo{hu-berlin}{* * * hu-berlin * * *\MessageBreak
+ Part of the hu-berlin Bundle}
+\RequirePackage{ifluatex,luatex85}
+\ifx\directlua\relax
+ \let\directlua\UnDeFiNeD
+\fi
+\ifluatex
+\else
+\GenericError{hu-berlin}%
+ {Please use `LuaLaTeX' as Compiler.^^J I abort here.}
+\fi
+\RequirePackage[english,ngerman]{babel}
+\RequirePackage{graphicx}
+\RequirePackage{fontspec}
+\setmainfont{TeX Gyre Heros}
+\RequirePackage{marvosym}
+\RequirePackage{xcolor}
+\definecolor{hu-berlin-blue}{RGB}{0,65,137}
+\definecolor{hu-berlin-green}{RGB}{150,190,20}
+\definecolor{hu-berlin-grey}{RGB}{169,169,169}
+\definecolor{hu-berlin-brown}{RGB}{82,79,60}
+\definecolor{hu-berlin-red}{RGB}{180,0,0}
+%%
+%% Copyright (C) 2019-2020
+%%
+%% End of file `hu-berlin-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty
index e6a071d41a0..63519a6ed6d 100644
--- a/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty
+++ b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty
@@ -15,7 +15,7 @@
%% please consider and respect them carefully.
%% ----------------------------------------------------------------
%%
-\def\Version{2019/06/26 v1.0.3}
+\def\Version{2019/12/19 v1.0.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{hu-berlin-bundle-style}
[\Version\space hu-berlin - package for style the documentation]
@@ -80,20 +80,17 @@ captions = tableheading,
\defaultfontfeatures{%
Ligatures = TeX
- ,Scale = MatchLowercase
- ,Numbers = OldStyle
}
\setmainfont[%
Ligatures = TeX
,Numbers = OldStyle]{TeX Gyre Pagella}
-\setmonofont[Scale=1]{TeX Gyre Cursor}
+\setmonofont[%
+ Scale=1
+]{TeX Gyre Cursor}
\setsansfont[%
- ,LetterSpace = .8]{TeX Gyre Adventor-Regular}
+ ,LetterSpace = .8
+]{TeX Gyre Adventor-Regular}
\linespread{1.05}
-\newfontfamily\listingsfont[
- Scale = MatchLowercase,
-]{TeX Gyre Cursor}
-\renewcommand\MacroFont{\listingsfont}
\RequirePackage{marginnote}
\renewcommand*{\marginfont}{%
@@ -136,7 +133,11 @@ captions = tableheading,
\RequirePackage{graphicx}
\graphicspath{{img/}}
\RequirePackage{etoolbox}
-\AfterEndPreamble{\maketitle}
+\AfterEndPreamble{%
+ \maketitle
+ \renewcommand\MacroFont{\ttfamily}
+ \renewcommand\AltMacroFont{\ttfamily\linespread{.8}}% slanted verbatim
+}
\makeatletter
\renewcommand*{\maketitle}{%
@@ -276,7 +277,6 @@ captions = tableheading,
pdfcopyright = {Copyright (c) \the\year . All rights reserved.},
pdfhighlight = /N,
pdfdisplaydoctitle = true,
- pdfdate = {\today},
pdflang = {},%de en
pdfcaptionwriter = {Lukas C. Bossert},
pdfkeywords = {hu-berlin},
@@ -367,7 +367,7 @@ captions = tableheading,
\makeatother
\lstset{%
- basicstyle = \linespread{0.7}\listingsfont
+ basicstyle = \linespread{0.7}\ttfamily
,breaklines = true
,breakatwhitespace
,alsoletter=\\\{\}\*\[\]\-
@@ -598,6 +598,6 @@ codecomment/.style={%
link = {\href{#3}{#1}}%
}}
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
%% End of file `hu-berlin-bundle-style.sty'.
diff --git a/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls
index c06442ca76d..ea0ad73f80c 100644
--- a/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls
+++ b/Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls
@@ -15,7 +15,7 @@
%% please consider and respect them carefully.
%% ----------------------------------------------------------------
%%
-\def\Version{2019/06/26 v1.0.3}
+\def\Version{2019/12/19 v1.0.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{hu-berlin-letter}
[\Version\ Humboldt-Universit"at zu Berlin - letter documentclass]
@@ -26,20 +26,7 @@
version=last,
% visualize
]{scrlttr2}
-\RequirePackage{ifluatex,luatex85}
-\ifx\directlua\relax
- \let\directlua\UnDeFiNeD
-\fi
-\ifluatex
-\else
-\GenericError{hu-berlin}%
- {Please use `LuaLaTeX' as Compiler.^^J I abort here.}
-\fi
-\RequirePackage[english,ngerman]{babel}
-\RequirePackage{graphicx}
-\RequirePackage{fontspec}
-\setmainfont{TeX Gyre Heros}
-\RequirePackage{marvosym}
+\RequirePackage{hu-berlin-base}
\RequirePackage{scrlayer-scrpage}
\clearpairofpagestyles
\DeclareNewLayer[
@@ -219,7 +206,7 @@
\setplength{locwidth}{45mm}
\setplength{locheight}{232mm}
\setkomavar{firsthead}{%
- \includegraphics[width=145mm]{hu-berlin-logo.jpg}%
+ \includegraphics[width=145mm]{hu-berlin-logo}%
}
\setkomavar{backaddressseparator}{~\textbar~}
\setkomavar{fromphone}{0000}
@@ -228,8 +215,8 @@
\setkomavar*{fromfax}{Telefax +49 [30] 2093–}
\setkomavar*{fromaddress}{Postanschrift:}
\setkomavar{fromaddress}{%
- Humboldt-Universität zu Berlin\\
- Unter den Linden 6\\
+ Humboldt-Universität zu Berlin\par
+ Unter den Linden 6\par
D-10099 Berlin}
\setkomavar*{date}{Datum:}
\setkomavar*{fromname}{Bearbeiter:}
@@ -237,6 +224,6 @@
\setkomavar*{enclseparator}{Anlage}
\setkomavar*{ccseparator}{Kopie an}
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019-2020
%%
%% End of file `hu-berlin-letter.cls'.