From 61fb10ef8524429784dd835fee2523a635ed8580 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 22 Oct 2020 20:50:52 +0000 Subject: hu-berlin-bundle (22oct20) git-svn-id: svn://tug.org/texlive/trunk@56732 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/hu-berlin-bundle/README.md | 5 +++ .../latex/hu-berlin-bundle/hu-berlin-bundle.pdf | Bin 307158 -> 367917 bytes .../hu-berlin-bundle/hu-berlin-letter-example.lco | 6 ++-- .../latex/hu-berlin-bundle/hu-berlin-bundle.dtx | 34 +++++++++++++++++---- .../tex/latex/hu-berlin-bundle/hu-berlin-base.sty | 2 +- .../hu-berlin-bundle/hu-berlin-bundle-style.sty | 2 +- .../latex/hu-berlin-bundle/hu-berlin-letter.cls | 14 +++++++-- 7 files changed, 49 insertions(+), 14 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 b803882b22f..31ca809bcbe 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.6 (2020-10-22) +* (letter) changed address separator +* (letter) fixed empty minipage when no metadata given +* (letter) changed default backaddress + ### v1.0.5 (2020-04-28) * (general) Changed logo format to `.pdf` * (letter) Changed `\ifkomavarempty` to `\ifkomavarempty`, fixes 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 f801de6173d..d66602637eb 100644 Binary files a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf and b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-bundle.pdf differ diff --git a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco index 46c1cc34bee..7de725eb8de 100644 --- a/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco +++ b/Master/texmf-dist/doc/latex/hu-berlin-bundle/hu-berlin-letter-example.lco @@ -23,9 +23,9 @@ \setkomavar{fromphone}{1234} \setkomavar{fromfax}{5678} \setkomavar{fromurl}{www.hu-berlin.de} -\setkomavar{backaddress}{HU Berlin\\ -Unter den Linden 6\\ -D-10099 Berlin} +%% \setkomavar{backaddress}{HU Berlin\\ +%% Unter den Linden 6\\ +%% D-10099 Berlin} \setkomavar{faculty}{% Philosophische Fakultät } 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 497c7fedbfd..efce1463da0 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{2020/04/28 v1.0.5} +\def\Version{2020/10/22 v1.0.6} % %<*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.6 (2020-10-22) +* (letter) changed address separator +* (letter) fixed empty minipage when no metadata given +* (letter) changed default backaddress + + ### v1.0.5 (2020-04-28) * (general) Changed logo format to `.pdf` * (letter) Changed `\ifkomavarempty` to `\ifkomavarempty`, fixes @@ -511,10 +517,11 @@ you get all these various files described above. % If your backaddress is to long % – it will be set up automatically – % you can redefine it. +% % \begin{macrocode} -\setkomavar{backaddress}{HU Berlin\\ -Unter den Linden 6\\ -D-10099 Berlin} +%% \setkomavar{backaddress}{HU Berlin\\ +%% Unter den Linden 6\\ +%% D-10099 Berlin} % \end{macrocode} % Selfexplaining: the faculty. % \begin{macrocode} @@ -960,11 +967,19 @@ Thank you very much for your letter. % \end{macrocode} % then the faculty % \begin{macrocode} +\Ifkomavarempty{faculty} +% \end{macrocode} +% This is a fake space to avoid any trouble +% if no custom metadata are given. +% \begin{macrocode} + {\hspace*{1em}} {\usekomafont{faculty}% \usekomavar{faculty}\\[1\baselineskip]} % \end{macrocode} % and the institute. % \begin{macrocode} +\Ifkomavarempty{institute} + {} {\usekomafont{institute}\usekomavar{institute}\\[1\baselineskip]} % \end{macrocode} % Now anything else regarding the institute. @@ -1166,8 +1181,15 @@ Thank you very much for your letter. % \begin{macrocode} \setkomavar*{fromaddress}{Postanschrift:} \setkomavar{fromaddress}{% - Humboldt-Universität zu Berlin\par - Unter den Linden 6\par + Humboldt-Universität zu Berlin\\ + Unter den Linden 6\\ + D-10099 Berlin} +% \end{macrocode} +% The default backaddress is slightly changed: +% \begin{macrocode} +\setkomavar{backaddress}{% + Humboldt-Universität zu Berlin\\ + UdL 6\\ D-10099 Berlin} % \end{macrocode} % 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 b36336a310b..14fdb4a7949 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{2020/04/28 v1.0.5} +\def\Version{2020/10/22 v1.0.6} \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 f2aa3afc953..a0c68983dd3 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{2020/04/28 v1.0.5} +\def\Version{2020/10/22 v1.0.6} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{hu-berlin-bundle-style} [\Version\space hu-berlin - package for style the documentation] 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 a12ded987ac..377be9f6835 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{2020/04/28 v1.0.5} +\def\Version{2020/10/22 v1.0.6} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{hu-berlin-letter} [\Version\ Humboldt-Universit"at zu Berlin - letter documentclass] @@ -99,8 +99,12 @@ \raggedright \fontsize{7}{8.5}\selectfont \begin{minipage}[t][64mm]{\useplength{locwidth}} +\Ifkomavarempty{faculty} + {\hspace*{1em}} {\usekomafont{faculty}% \usekomavar{faculty}\\[1\baselineskip]} +\Ifkomavarempty{institute} + {} {\usekomafont{institute}\usekomavar{institute}\\[1\baselineskip]} \Ifkomavarempty{institute.additional} {} @@ -215,8 +219,12 @@ \setkomavar*{fromfax}{Telefax +49 [30] 2093–} \setkomavar*{fromaddress}{Postanschrift:} \setkomavar{fromaddress}{% - Humboldt-Universität zu Berlin\par - Unter den Linden 6\par + Humboldt-Universität zu Berlin\\ + Unter den Linden 6\\ + D-10099 Berlin} +\setkomavar{backaddress}{% + Humboldt-Universität zu Berlin\\ + UdL 6\\ D-10099 Berlin} \setkomavar*{date}{Datum:} \setkomavar*{fromname}{Bearbeiter:} -- cgit v1.2.3