summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-29 21:27:54 +0000
committerKarl Berry <karl@freefriends.org>2020-04-29 21:27:54 +0000
commite1dbb2cbe7bf41890a5bd4b7e79421725e7b3938 (patch)
tree71be50198ef455bb059835e114dd314c422a98c9 /Master
parent9dc098550a08a0a6535d68c59ce28ce13fad7593 (diff)
hu-berlin-bundle (29apr20)
git-svn-id: svn://tug.org/texlive/trunk@54938 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex51
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in114
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdfbin570495 -> 307158 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist8
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-template.latex2
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.jpgbin142066 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.pdfbin0 -> 37045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie-logo.pdfbin0 -> 14903 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie.pngbin85677 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile4
-rw-r--r--Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.dtx64
-rw-r--r--Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins79
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-bundle-style.sty6
-rw-r--r--Master/texmf-dist/tex/latex/hu-berlin-bundle/hu-berlin-letter.cls46
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
18 files changed, 72 insertions, 313 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 92d36a4a58b..b803882b22f 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/README.md
@@ -67,6 +67,11 @@ 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.5 (2020-04-28)
+* (general) Changed logo format to `.pdf`
+* (letter) Changed `\ifkomavarempty` to `\ifkomavarempty`, fixes
+ [github-issue nr. 1](https://github.com/LukasCBossert/hu-berlin-bundle/issues/1)
+
### 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.
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex b/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex
deleted file mode 100644
index af0811e452f..00000000000
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/_markdown_hu-berlin-bundle/5743ba341396e7047e5a76bfb9c28dcd.md.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-%</driver> % /* % ██████ ███████ █████ ██████ ███ ███ ███████ % ▄ ██ ▄██ ██ ██ ██ ██ ██ ██ ████ ████ ██ % ████ ██████ █████ ███████ ██ ██ ██ ████ ██ █████ % ▀ ██ ▀██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ % ██ ██ ███████ ██ ██ ██████ ██ ██ ███████ % \markdownRendererEmphasis{/ %<}readme,main>\markdownRendererInterblockSeparator
-{}With this (unofficial) bundle you have several documents which are designed according to the corporate design of the Humboldt-Universität zu Berlin.\markdownRendererInterblockSeparator
-{}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
-{}\markdownRendererCodeSpan{
-make install
-}\markdownRendererInterblockSeparator
-{}If you are using macOS you might be asked for your user account password for the installation.\markdownRendererInterblockSeparator
-{}Further options of this makefile are:\markdownRendererInterblockSeparator
-{}\markdownRendererUlBegin
-\markdownRendererUlItem \markdownRendererCodeSpan{clean}: deletes all unnecessary files\markdownRendererUlItemEnd
-\markdownRendererUlItem \markdownRendererCodeSpan{cleanbundle}: deletes all files except \markdownRendererCodeSpan{.dtx}, \markdownRendererCodeSpan{.md}. You will get the plain version of this bundle. This might be helpful if you send the bundle to someone else.\markdownRendererUlItemEnd
-\markdownRendererUlItem \markdownRendererCodeSpan{ctan}: this will create a zip file which can be used to send to CTAN.\markdownRendererUlItemEnd
-\markdownRendererUlItem \markdownRendererCodeSpan{files}: will only create the files from the \markdownRendererCodeSpan{.dtx}-scratch.\markdownRendererUlItemEnd
-\markdownRendererUlItem \markdownRendererCodeSpan{uninstall}: will erase the locally installed files.\markdownRendererUlItemEnd
-\markdownRendererUlEnd \markdownRendererInterblockSeparator
-{}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
-\markdownRendererUlEnd \markdownRendererInterblockSeparator
-{}\markdownRendererHeadingThree{v1.0.2 (2019-06-22)}\markdownRendererInterblockSeparator
-{}Renaming files for CTAN compatability.\markdownRendererInterblockSeparator
-{}\markdownRendererHeadingThree{v1.0.1 (2019-06-21)}\markdownRendererInterblockSeparator
-{}Internal changes for publishing. Still one documentclass for a letter.\markdownRendererInterblockSeparator
-{}\markdownRendererHeadingThree{v1.0.0 (2019-06-21)}\markdownRendererInterblockSeparator
-{}First release with a documentclass for letter.\markdownRendererInterblockSeparator
-{}\markdownRendererHeadingTwo{Copyright}\markdownRendererInterblockSeparator
-{}Various parts of this bundle have different copyrights. If not otherwise stated the copyright is \markdownRendererLink{The LaTeX project public license (LPPL), version 1.3c}{https://www.latex-project.org/lppl/lppl-1-3c/}{https://www.latex-project.org/lppl/lppl-1-3c/}{}\markdownRendererInterblockSeparator
-{}\markdownRendererHeadingThree{Boilerplate / markdown-template}\markdownRendererInterblockSeparator
-{}The template for the markdown conversion, forked from the pandoc-templates and \markdownRendererLink{JensErat pandoc-scrlttr2}{https://github.com/JensErat/pandoc-scrlttr2}{https://github.com/JensErat/pandoc-scrlttr2}{} is dual-licensed, under both the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license (included below).\markdownRendererInterblockSeparator
-{}\markdownRendererHorizontalRule{}\markdownRendererInterblockSeparator
-{}Copyright (c) 2014, John MacFarlane\ Copyright (c) 2014, Jens Erat\ All rights reserved.\markdownRendererInterblockSeparator
-{}Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\markdownRendererInterblockSeparator
-{}\markdownRendererUlBegin
-\markdownRendererUlItem Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\markdownRendererUlItemEnd
-\markdownRendererUlItem Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\markdownRendererUlItemEnd
-\markdownRendererUlItem Neither the name of John MacFarlane nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.\markdownRendererUlItemEnd
-\markdownRendererUlEnd \markdownRendererInterblockSeparator
-{}THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %</readme,main> % /* % ██ ██████ ███████ █████ ██████ ███ ███ ███████ % ██ ██ ██ ██ ██ ██ ██ ██ ████ ████ ██ % ██ ██████ █████ ███████ ██ ██ ██ ████ ██ █████ % ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ % ██ ██ ██ ███████ ██ ██ ██████ ██ ██ ███████ % \markdownRendererEmphasis{/ %<}driver>\relax \ No newline at end of file
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
deleted file mode 100644
index c3cdfcc2ad9..00000000000
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.markdown.in
+++ /dev/null
@@ -1,114 +0,0 @@
-%</driver>
-% /*
-% ██████ ███████ █████ ██████ ███ ███ ███████
-% ▄ ██ ▄██ ██ ██ ██ ██ ██ ██ ████ ████ ██
-% ████ ██████ █████ ███████ ██ ██ ██ ████ ██ █████
-% ▀ ██ ▀██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
-% ██ ██ ███████ ██ ██ ██████ ██ ██ ███████
-% */
-%<*readme,main>
-
-With this (unofficial) bundle you have several documents which are designed according to the corporate design of the Humboldt-Universität zu Berlin.
-
-
-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)
-and [TeXLive](http://www.tug.org/texlive) -- thus, you
-can easily install it using the respective package manager.
-If you would like to
-install `hu-berlin-bundle` into your local folder manually, do the following:
-Go to your terminal, browse to the folder of this bundle and run
-
-```
-make install
-```
-
-
-If you are using macOS you might be asked for your user account password for the installation.
-
-
-Further options of this makefile are:
-
-* `clean`: deletes all unnecessary files
-* `cleanbundle`: deletes all files except `.dtx`, `.md`. You will get the plain version of this bundle.
-This might be helpful if you send the bundle to someone else.
-* `ctan`: this will create a zip file which can be used to send to CTAN.
-* `files`: will only create the files from the `.dtx`-scratch.
-* `uninstall`: will erase the locally installed files.
-
-
-This bundle is constantly updated. For hints, errors or suggestions use the GitHub repository [https://github.com/LukasCBossert/hu-berlin-bundle](https://github.com/LukasCBossert/hu-berlin-bundle).
-
-## Changelog
-
-All notable changes to this project will be documented in the [README.md](https://github.com/LukasCBossert/hu-berlin-bundle/blob/master/README.md).
-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).
-
-### v1.0.2 (2019-06-22)
- Renaming files for CTAN compatability.
-
-
-### v1.0.1 (2019-06-21)
- Internal changes for publishing. Still one documentclass for a letter.
-
-### v1.0.0 (2019-06-21)
- First release with a documentclass for letter.
-
-## Copyright
-Various parts of this bundle have different copyrights.
-If not otherwise stated the copyright is [The LaTeX project public license (LPPL), version 1.3c](https://www.latex-project.org/lppl/lppl-1-3c/)
-
-
-### Boilerplate / markdown-template
-The template for the markdown conversion,
-forked from the pandoc-templates and [JensErat pandoc-scrlttr2](https://github.com/JensErat/pandoc-scrlttr2) is dual-licensed,
-under both the GPL (v2 or higher, same as pandoc) and the BSD 3-clause license (included below).
-
-----
-
-Copyright (c) 2014, John MacFarlane\\
-Copyright (c) 2014, Jens Erat\\
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of John MacFarlane nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-%</readme,main>
-% /*
-% ██ ██████ ███████ █████ ██████ ███ ███ ███████
-% ██ ██ ██ ██ ██ ██ ██ ██ ████ ████ ██
-% ██ ██████ █████ ███████ ██ ██ ██ ████ ██ █████
-% ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
-% ██ ██ ██ ███████ ██ ██ ██████ ██ ██ ███████
-% */
-%<*driver>
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 8c86d297364..f801de6173d 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
deleted file mode 100644
index 40f4ef85ae9..00000000000
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pkglist
+++ /dev/null
@@ -1,8 +0,0 @@
-graphicx
-marvosym
-scrlttr2
-scrlayer-scrpage
-geometry
-fontspec
-hyperxmp
-hyperref
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 3df5b452dc8..83b0d212425 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$\par
+$addressee$$sep$\\
$endfor$
}
$for(include-before)$
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.jpg b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.jpg
deleted file mode 100644
index e669ea61ed2..00000000000
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.jpg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.pdf b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.pdf
new file mode 100644
index 00000000000..2549d79a0ce
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/hu-berlin-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie-logo.pdf b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie-logo.pdf
new file mode 100644
index 00000000000..5609d8aee5d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie-logo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie.png b/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie.png
deleted file mode 100644
index d79462cc236..00000000000
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/img/texografie.png
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile b/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
index 19382036d33..85956df80de 100644
--- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
+++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/makefile
@@ -34,7 +34,7 @@ md2pdf-letter: files
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-example-lualatex.tex
+ latexmk -lualatex -gg -interaction=nonstopmode hu-berlin-letter-example-lualatex.tex
# How to get information from CTAN
CTAN: $(PROJECT).pkglist
@@ -89,7 +89,7 @@ ctan: $(PROJECT).dtx
@-mkdir archive
@rm -f archive/$(PROJECT)-$(DATE)*.zip
@mkdir $(TDIR)
- @cp $(PROJECT).{dtx,pdf,ins} README.md makefile $(TDIR)
+ @cp $(PROJECT).{dtx,pdf} README.md makefile $(TDIR)
-@rm -f img/.DS_Store
@cp -R img $(TDIR)
@cd $(TEMP); \
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 4b064957d1c..497c7fedbfd 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/12/19 v1.0.4}
+\def\Version{2020/04/28 v1.0.5}
%</internal|cls|sty>
%<*internal>
\iffalse
@@ -304,6 +304,12 @@ 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.5 (2020-04-28)
+* (general) Changed logo format to `.pdf`
+* (letter) Changed `\ifkomavarempty` to `\ifkomavarempty`, fixes
+ [github-issue nr. 1](https://github.com/LukasCBossert/hu-berlin-bundle/issues/1)
+
+
### 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.
@@ -388,8 +394,8 @@ You can easily pick up the basic file structure from \cref{hu-berlin:bundle-stru
.2 hu-berlin-letter-example-markdown.md \DTcomment{example markdown file }.
.2 hu-berlin-letter-template.latex \DTcomment{template for conversion}.
.2 \huberlinFolder img\DTcomment{folder for images}.
-.3 texografie-logo.png\DTcomment{logo of maintainer}.
-.3 hu-berlin-logo.jpg\DTcomment{logo of HU}.
+.3 texografie-logo.pdf\DTcomment{logo of maintainer}.
+.3 hu-berlin-logo.pdf\DTcomment{logo of HU}.
.2 makefile\DTcomment{makefile to generate all required files}.
.2 README.md\DTcomment{README file with information on installation}.
}
@@ -581,7 +587,7 @@ Philosophische Fakultät
% \end{macrocode}
% Now following the reference information
% \begin{macrocode}
-\setkomavar{myref}{}
+\setkomavar{myref}{}
% \end{macrocode}
% \begin{macrocode}
\setkomavar{yourref}{}
@@ -963,13 +969,13 @@ Thank you very much for your letter.
% \end{macrocode}
% Now anything else regarding the institute.
% \begin{macrocode}
-\ifkomavarempty{institute.additional}
+\Ifkomavarempty{institute.additional}
{}
{\usekomavar{institute.additional}\\[1\baselineskip]}
% \end{macrocode}
% What follows is the head of institute and its position name.
% \begin{macrocode}
-\ifkomavarempty{institute.head}
+\Ifkomavarempty{institute.head}
{}
{{\usekomafont{institute.head}%
\usekomavar{institute.head}}\\%
@@ -988,39 +994,39 @@ Thank you very much for your letter.
% \end{macrocode}
% and the sender of the letter.
% \begin{macrocode}
-\ifkomavarempty{fromname}
+\Ifkomavarempty{fromname}
{}
{\textbf{\usekomavar*{fromname}}\\
\usekomavar{fromname}\par}
% \end{macrocode}
% And the reference of correspondence.
% \begin{macrocode}
-\ifkomavarempty{myref}
+\Ifkomavarempty{myref}
{}
{\textbf{\usekomavar*{myref}}\\
\usekomavar{myref}\par}
% \end{macrocode}
% To complete this template we provide the possibility to name further reference fields.
% \begin{macrocode}
-\ifkomavarempty{yourref}
+\Ifkomavarempty{yourref}
{}
{\textbf{\usekomavar*{yourref}}\\
\usekomavar{yourref}\par}
% \end{macrocode}
% \begin{macrocode}
-\ifkomavarempty{yourmail}
+\Ifkomavarempty{yourmail}
{}
{\textbf{\usekomavar*{yourmail}}\\
\usekomavar{yourmail}\par}
% \end{macrocode}
% \begin{macrocode}
-\ifkomavarempty{customer}
+\Ifkomavarempty{customer}
{}
{\textbf{\usekomavar*{customer}}\\
\usekomavar{customer}\par}
% \end{macrocode}
% \begin{macrocode}
-\ifkomavarempty{invoice}
+\Ifkomavarempty{invoice}
{}
{\textbf{\usekomavar*{invoice}}\\
\usekomavar{invoice}\par}
@@ -1028,45 +1034,45 @@ Thank you very much for your letter.
% \begin{macrocode}
\textbf{\usekomavar*{fromaddress}}\\
\usekomavar{fromaddress}
- \ifkomavarempty{fromphone}
+ \Ifkomavarempty{fromphone}
{\par}
{\\\usekomavar*{fromphone}\usekomavar{fromphone}
- \ifkomavarempty{fromfax}
+ \Ifkomavarempty{fromfax}
{\par}
{\\}}
- \ifkomavarempty{fromfax}
+ \Ifkomavarempty{fromfax}
{}
{\usekomavar*{fromfax}\usekomavar{fromfax}\par}
% \end{macrocode}
% Next, emails and url:
% \begin{macrocode}
-\ifkomavarempty{institute.head.mail}
+\Ifkomavarempty{institute.head.mail}
{}
{\usekomavar{institute.head.mail}
- \ifkomavarempty{fromemail}
- {\ifkomavarempty{fromurl}
+ \Ifkomavarempty{fromemail}
+ {\Ifkomavarempty{fromurl}
{\par}
{\\}}
{\\}}
% \end{macrocode}
%
% \begin{macrocode}
-\ifkomavarempty{fromemail}
+\Ifkomavarempty{fromemail}
{}
{\usekomavar{fromemail}
- \ifkomavarempty{fromurl}
+ \Ifkomavarempty{fromurl}
{\par}
{\\}}
% \end{macrocode}
%
% \begin{macrocode}
-\ifkomavarempty{fromurl}
+\Ifkomavarempty{fromurl}
{}
{\usekomavar{fromurl}\par}
% \end{macrocode}
% Now the actual location of the sender
% \begin{macrocode}
-\ifkomavarempty{local}
+\Ifkomavarempty{local}
{}
{\textbf{\usekomavar*{local}}\\
\usekomavar{local}\par}
@@ -1077,27 +1083,27 @@ Thank you very much for your letter.
% \end{macrocode}
% Inform your addressee about the connection possibilities.
% \begin{macrocode}
-\ifkomavarempty{connections}
+\Ifkomavarempty{connections}
{}
{\textbf{\usekomavar*{connections}}\\
\usekomavar{connections}\par}
% \end{macrocode}
% \begin{macrocode}
-\ifkomavarempty{officehours}
+\Ifkomavarempty{officehours}
{}
{\textbf{\usekomavar*{officehours}}\\
\usekomavar{officehours}\par}
% \end{macrocode}
% If there is a barrier free entrance, tell it.
% \begin{macrocode}
-\ifkomavarempty{accessibility}
+\Ifkomavarempty{accessibility}
{}
{\textbf{\usekomavar*{accessibility}}\\
\usekomavar{accessibility}\par}
% \end{macrocode}
% And last the bank connection
% \begin{macrocode}
-\ifkomavarempty{bank}
+\Ifkomavarempty{bank}
{}
{\textbf{\usekomavar*{bank}}\\
\usekomavar{bank}\\
@@ -1274,7 +1280,7 @@ $endif$
\begin{document}
\begin{letter}{%
$for(addressee)$
-$addressee$$sep$\par
+$addressee$$sep$\\
$endfor$
}
$for(include-before)$
@@ -1478,7 +1484,7 @@ $for(include-after)$$include-after$$endfor$
of writing.}
\null\vfill
{\usekomafont{subtitle}{\@date \hfill
- \includegraphics[width=4cm]{texografie}\\}}%
+ \includegraphics[width=4cm]{img/texografie-logo.pdf}\\}}%
\par
\vskip 0em
\restoregeometry
@@ -1644,7 +1650,7 @@ $for(include-after)$$include-after$$endfor$
%---- newcommands
\newcommand{\TeXografie}{Lukas C. Bossert
- (www.TeXografie.de)}
+ (www.texografie.de)}
\newcommand\huberlin{\huberlintitle\xspace}
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
deleted file mode 100644
index 21b553e68a5..00000000000
--- a/Master/texmf-dist/source/latex/hu-berlin-bundle/hu-berlin-bundle.ins
+++ /dev/null
@@ -1,79 +0,0 @@
-%%
-%% This is file `hu-berlin-bundle.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% hu-berlin-bundle.dtx (with options: `install')
-%% ----------------------------------------------------------------
-%% 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.
-%% ----------------------------------------------------------------
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-
-\nopreamble\nopostamble
-
-\usedir{doc/latex/\jobname}
-\generate{
- \file{README.md}{\from{\jobname.dtx}{readme,main}}
- \file{hu-berlin-bundle-bibliography.bib}{\from{\jobname.dtx}{bib}}
- \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
-----------------------------------------------------------------
-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.
-----------------------------------------------------------------
-
-\endpreamble
-\postamble
-
-Copyright (C) 2019-2020
-\endpostamble
-
-\usedir{tex/latex/\jobname}
-\generate{
- \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-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
index fae5a7caa8b..b36336a310b 100644
--- 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
@@ -15,7 +15,7 @@
%% please consider and respect them carefully.
%% ----------------------------------------------------------------
%%
-\def\Version{2019/12/19 v1.0.4}
+\def\Version{2020/04/28 v1.0.5}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{hu-berlin-base}
[\Version\space hu-berlin - package for basic features]
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 63519a6ed6d..f2aa3afc953 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/12/19 v1.0.4}
+\def\Version{2020/04/28 v1.0.5}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{hu-berlin-bundle-style}
[\Version\space hu-berlin - package for style the documentation]
@@ -164,7 +164,7 @@ captions = tableheading,
of writing.}
\null\vfill
{\usekomafont{subtitle}{\@date \hfill
-\includegraphics[width=4cm]{texografie}\\}}%
+\includegraphics[width=4cm]{img/texografie-logo.pdf}\\}}%
\par
\vskip 0em
\restoregeometry
@@ -305,7 +305,7 @@ captions = tableheading,
]{cleveref}
\newcommand{\TeXografie}{Lukas C. Bossert
- (www.TeXografie.de)}
+ (www.texografie.de)}
\newcommand\huberlin{\huberlintitle\xspace}
\newcommand\huberlinFolder{%
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 ea0ad73f80c..a12ded987ac 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/12/19 v1.0.4}
+\def\Version{2020/04/28 v1.0.5}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{hu-berlin-letter}
[\Version\ Humboldt-Universit"at zu Berlin - letter documentclass]
@@ -102,10 +102,10 @@
{\usekomafont{faculty}%
\usekomavar{faculty}\\[1\baselineskip]}
{\usekomafont{institute}\usekomavar{institute}\\[1\baselineskip]}
-\ifkomavarempty{institute.additional}
+\Ifkomavarempty{institute.additional}
{}
{\usekomavar{institute.additional}\\[1\baselineskip]}
-\ifkomavarempty{institute.head}
+\Ifkomavarempty{institute.head}
{}
{{\usekomafont{institute.head}%
\usekomavar{institute.head}}\\%
@@ -113,76 +113,76 @@
\end{minipage}
\textbf{\usekomavar*{date}}\\
\usekomavar{date}\par
-\ifkomavarempty{fromname}
+\Ifkomavarempty{fromname}
{}
{\textbf{\usekomavar*{fromname}}\\
\usekomavar{fromname}\par}
-\ifkomavarempty{myref}
+\Ifkomavarempty{myref}
{}
{\textbf{\usekomavar*{myref}}\\
\usekomavar{myref}\par}
-\ifkomavarempty{yourref}
+\Ifkomavarempty{yourref}
{}
{\textbf{\usekomavar*{yourref}}\\
\usekomavar{yourref}\par}
-\ifkomavarempty{yourmail}
+\Ifkomavarempty{yourmail}
{}
{\textbf{\usekomavar*{yourmail}}\\
\usekomavar{yourmail}\par}
-\ifkomavarempty{customer}
+\Ifkomavarempty{customer}
{}
{\textbf{\usekomavar*{customer}}\\
\usekomavar{customer}\par}
-\ifkomavarempty{invoice}
+\Ifkomavarempty{invoice}
{}
{\textbf{\usekomavar*{invoice}}\\
\usekomavar{invoice}\par}
\textbf{\usekomavar*{fromaddress}}\\
\usekomavar{fromaddress}
- \ifkomavarempty{fromphone}
+ \Ifkomavarempty{fromphone}
{\par}
{\\\usekomavar*{fromphone}\usekomavar{fromphone}
- \ifkomavarempty{fromfax}
+ \Ifkomavarempty{fromfax}
{\par}
{\\}}
- \ifkomavarempty{fromfax}
+ \Ifkomavarempty{fromfax}
{}
{\usekomavar*{fromfax}\usekomavar{fromfax}\par}
-\ifkomavarempty{institute.head.mail}
+\Ifkomavarempty{institute.head.mail}
{}
{\usekomavar{institute.head.mail}
- \ifkomavarempty{fromemail}
- {\ifkomavarempty{fromurl}
+ \Ifkomavarempty{fromemail}
+ {\Ifkomavarempty{fromurl}
{\par}
{\\}}
{\\}}
-\ifkomavarempty{fromemail}
+\Ifkomavarempty{fromemail}
{}
{\usekomavar{fromemail}
- \ifkomavarempty{fromurl}
+ \Ifkomavarempty{fromurl}
{\par}
{\\}}
-\ifkomavarempty{fromurl}
+\Ifkomavarempty{fromurl}
{}
{\usekomavar{fromurl}\par}
-\ifkomavarempty{local}
+\Ifkomavarempty{local}
{}
{\textbf{\usekomavar*{local}}\\
\usekomavar{local}\par}
\vfill
-\ifkomavarempty{connections}
+\Ifkomavarempty{connections}
{}
{\textbf{\usekomavar*{connections}}\\
\usekomavar{connections}\par}
-\ifkomavarempty{officehours}
+\Ifkomavarempty{officehours}
{}
{\textbf{\usekomavar*{officehours}}\\
\usekomavar{officehours}\par}
-\ifkomavarempty{accessibility}
+\Ifkomavarempty{accessibility}
{}
{\textbf{\usekomavar*{accessibility}}\\
\usekomavar{accessibility}\par}
-\ifkomavarempty{bank}
+\Ifkomavarempty{bank}
{}
{\textbf{\usekomavar*{bank}}\\
\usekomavar{bank}\\
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index f48e2e78b80..8ed6a4c7a0c 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -391,7 +391,7 @@ sub prepare {
# redirect to stderr because we want the only stdout to be the
# directory name for ctan2tl to use. Intentionally do not use -q
# so that we have a chance of noticing errors.
- system ("timeout 10s svn update $catfile >&2")
+ system ("timeout 10s svn update $catfile </dev/null >&2")
unless $ENV{"TLPKGINFO_CATALOGUE_NO_UPDATE"};
open (CATFILE, "<$catfile") || die "open($catfile) failed, fixme: $!";
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 04c93454c15..94674467f4f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2790,7 +2790,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'hf-tikz' => 'tex',
'hitszbeamer' => 'tex',
'hrlatex' => 'latex', # requires interaction
- 'hu-berlin-bundle' => 'pdflatex-preserve-pdf --engine lualatex',
+ 'hu-berlin-bundle' => 'luatex',
'hycolor' => 'tex',
'hyperbar' => 'tex',
'intopdf', => 'tex',