From 0e88b763ff27e0080e257110badde4da88918d9d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Jan 2021 22:45:03 +0000 Subject: hu-berlin-bundle (11jan21) git-svn-id: svn://tug.org/texlive/trunk@57391 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/lualatex/hu-berlin-bundle/README.md | 3 + .../lualatex/hu-berlin-bundle/hu-berlin-bundle.pdf | Bin 301369 -> 305252 bytes .../hu-berlin-bundle/hu-berlin-letter-example.lco | 2 +- .../lualatex/hu-berlin-bundle/hu-berlin-bundle.dtx | 81 ++++++++++++++++----- .../lualatex/hu-berlin-bundle/hu-berlin-base.sty | 2 +- .../hu-berlin-bundle/hu-berlin-bundle-style.sty | 2 +- .../lualatex/hu-berlin-bundle/hu-berlin-letter.cls | 59 +++++++++++---- 7 files changed, 111 insertions(+), 38 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/README.md b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/README.md index c3087484247..40b582c70b3 100644 --- a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/README.md +++ b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/README.md @@ -67,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.9 (2021/01/10) +* (letter) making everything multi-lingual (at least German and English); German is default language. You can load English e.g. by `documentclass[english]{hu-berlin-letter}` (addresses [issue No. 3](https://github.com/LukasCBossert/hu-berlin-bundle/issues/3)) + ### v1.0.8 (2020/10/30) * (letter) replacing actual logo with a dummy text (due to possible copyright conflicts). The correct logo has to be called `hu-berlin-logo.pdf` diff --git a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-bundle.pdf b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-bundle.pdf index 56c521ac5ad..3d08232e457 100644 Binary files a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-bundle.pdf and b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-bundle.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-letter-example.lco b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-letter-example.lco index 7de725eb8de..a06644e41f2 100644 --- a/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-letter-example.lco +++ b/Master/texmf-dist/doc/lualatex/hu-berlin-bundle/hu-berlin-letter-example.lco @@ -35,7 +35,7 @@ Philosophische Fakultät \setkomavar{institute.additional}{Here you can add more text.} \setkomavar{institute.head}[Dekanin]{Prof. Dr. Maike Musterfrau} \setkomavar{institute.head.mail}{maike.musterfrau@hu-berlin.de} -\setkomavar{local}{% +\setkomavar{office}{% Mohrenstraße 40/41\\ Zimmer X\\ D-10117 Berlin} diff --git a/Master/texmf-dist/source/lualatex/hu-berlin-bundle/hu-berlin-bundle.dtx b/Master/texmf-dist/source/lualatex/hu-berlin-bundle/hu-berlin-bundle.dtx index 20c78fce0f7..738f1cee2d2 100644 --- a/Master/texmf-dist/source/lualatex/hu-berlin-bundle/hu-berlin-bundle.dtx +++ b/Master/texmf-dist/source/lualatex/hu-berlin-bundle/hu-berlin-bundle.dtx @@ -1,6 +1,6 @@ % \iffalse %<*internal|cls|sty> -\def\Version{2020/10/30 v1.0.8} +\def\Version{2021/01/10 v1.0.9} % %<*internal> \iffalse @@ -304,6 +304,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.9 (2021/01/10) +* (letter) making everything multi-lingual (at least German and English); German is default language. You can load English e.g. by `documentclass[english]{hu-berlin-letter}` (addresses [issue No. 3](https://github.com/LukasCBossert/hu-berlin-bundle/issues/3)) + + ### v1.0.8 (2020/10/30) * (letter) replacing actual logo with a dummy text (due to possible copyright conflicts). The correct logo has to be called `hu-berlin-logo.pdf` @@ -557,7 +562,7 @@ Philosophische Fakultät \setkomavar{institute.head.mail}{maike.musterfrau@hu-berlin.de} % \end{macrocode} % \begin{macrocode} -\setkomavar{local}{% +\setkomavar{office}{% Mohrenstraße 40/41\\ Zimmer X\\ D-10117 Berlin} @@ -826,6 +831,17 @@ Thank you very much for your letter. % \end{macrocode} % We load \pkg{scrlttr2} which is the documentclass for letters. % Furthermore we set up some options. +% The default language is German. But all strings are also +% available for English. You can load English as option to the +% documentclass. +% \begin{macrocode} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrlttr2}} +\DeclareOption{english}{\PassOptionsToPackage{ngerman,main=english}{babel}} +\DeclareOption{ngerman}{\PassOptionsToPackage{ngerman}{babel}} +\ExecuteOptions{ngerman} +\ProcessOptions\relax +% \end{macrocode} +% Now the documentclass itself. % \begin{macrocode} \LoadClass[% fontsize=10pt, @@ -907,8 +923,35 @@ Thank you very much for your letter. \let\enclold\encl \renewcommand\encl[1]{\vskip0ptplus1filll\enclold{#1}} % \end{macrocode} -% We define new |komavar|s. -% +% We define new |komavar|s and we make it for +% German and for English as well. +% \begin{macrocode} +\providecaptionname{english}{\hubCCseparator}{Copy to} +\providecaptionname{english}{\hubEnclSeparator}{Attachment} +\providecaptionname{english}{\hubMyRef}{Reference:} +\providecaptionname{english}{\hubFromName}{Clerk:} +\providecaptionname{english}{\hubDate}{Date:} +\providecaptionname{english}{\hubAddress}{Postal address:} +\providecaptionname{english}{\hubConnections}{Public transport:} +\providecaptionname{english}{\hubOffice}{Office:} +\providecaptionname{english}{\hubBank}{Bank:} +\providecaptionname{english}{\hubOfficeHours}{Consultation hours:} +\providecaptionname{english}{\hubAccessibility}{Entrance:} +% \end{macrocode} +% Now for German. +% \begin{macrocode} +\providecaptionname{ngerman}{\hubCCseparator}{Kopie an} +\providecaptionname{ngerman}{\hubEnclSeparator}{Anlage} +\providecaptionname{ngerman}{\hubMyRef}{Geschäftszeichen:} +\providecaptionname{ngerman}{\hubFromName}{Bearbeiter:} +\providecaptionname{ngerman}{\hubDate}{Datum:} +\providecaptionname{ngerman}{\hubAddress}{Postanschrift:} +\providecaptionname{ngerman}{\hubConnections}{Verkehrsverbindungen:} +\providecaptionname{ngerman}{\hubOffice}{Sitz:} +\providecaptionname{ngerman}{\hubBank}{Bank:} +\providecaptionname{ngerman}{\hubOfficeHours}{Sprechzeiten:} +\providecaptionname{ngerman}{\hubAccessibility}{Eingang:} +% \end{macrocode} % First the possibility to name the faculty, % \begin{macrocode} \newkomavar{faculty} @@ -936,27 +979,27 @@ Thank you very much for your letter. % \end{macrocode} % Since there are many buildings with offices we tell where to find the sender % \begin{macrocode} -\newkomavar{local} -\setkomavar*{local}{Sitz:} +\newkomavar{office} +\setkomavar*{office}{\hubOffice} % \end{macrocode} % and how to get there. % \begin{macrocode} \newkomavar{connections} -\setkomavar*{connections}{Verkehrsverbindungen:} +\setkomavar*{connections}{\hubConnections} % \end{macrocode} % Furthermore we inform about office hours % \begin{macrocode} \newkomavar{officehours} -\setkomavar*{officehours}{Sprechzeiten:} +\setkomavar*{officehours}{\hubOfficeHours} % \end{macrocode} % and if there is accessibility for wheelchairs etc. % \begin{macrocode} \newkomavar{accessibility} -\setkomavar*{accessibility}{{\large\reflectbox{\Wheelchair}} Eingang:} +\setkomavar*{accessibility}{{\large\reflectbox{\Wheelchair}} \hubAccessibility} % \end{macrocode} % \begin{macrocode} \newkomavar{bank} -\setkomavar*{bank}{Bankverbindung:} +\setkomavar*{bank}{\hubBank} \setkomavar{bank}{Deutsche Bank PGK AG} \newkomavar{IBAN} \setkomavar{IBAN}{\mbox{IBAN DE95 1007 0848 0512 6206 01}} @@ -1099,10 +1142,10 @@ Thank you very much for your letter. % \end{macrocode} % Now the actual location of the sender % \begin{macrocode} -\Ifkomavarempty{local} +\Ifkomavarempty{office} {} - {\textbf{\usekomavar*{local}}\\ - \usekomavar{local}\par} + {\textbf{\usekomavar*{office}}\\ + \usekomavar{office}\par} % \end{macrocode} % The last information section should be pinned to the bottom. % \begin{macrocode} @@ -1200,7 +1243,7 @@ Thank you very much for your letter. % \end{macrocode} % % \begin{macrocode} -\setkomavar*{fromaddress}{Postanschrift:} +\setkomavar*{fromaddress}{\hubAddress} \setkomavar{fromaddress}{% Humboldt-Universität zu Berlin\\ Unter den Linden 6\\ @@ -1215,21 +1258,21 @@ Thank you very much for your letter. % \end{macrocode} % % \begin{macrocode} -\setkomavar*{date}{Datum:} +\setkomavar*{date}{\hubDate} % \end{macrocode} % % \begin{macrocode} -\setkomavar*{fromname}{Bearbeiter:} +\setkomavar*{fromname}{\hubFromName} % \end{macrocode} % % \begin{macrocode} -\setkomavar*{myref}{Geschäftszeichen:} +\setkomavar*{myref}{\hubMyRef} % \end{macrocode} % \begin{macrocode} -\setkomavar*{enclseparator}{Anlage} +\setkomavar*{enclseparator}{\hubEnclSeparator} % \end{macrocode} % \begin{macrocode} -\setkomavar*{ccseparator}{Kopie an} +\setkomavar*{ccseparator}{\hubCCseparator} % \end{macrocode} % \begin{macrocode} % \RequirePackage{hyperref} diff --git a/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-base.sty b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-base.sty index e9374e3c922..2fae7aed0bd 100644 --- a/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-base.sty +++ b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-base.sty @@ -15,7 +15,7 @@ %% please consider and respect them carefully. %% ---------------------------------------------------------------- %% -\def\Version{2020/10/30 v1.0.8} +\def\Version{2021/01/10 v1.0.9} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{hu-berlin-base} [\Version\space hu-berlin - package for basic features] diff --git a/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-bundle-style.sty b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-bundle-style.sty index aac3b0f1157..c8e31e8c57a 100644 --- a/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-bundle-style.sty +++ b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-bundle-style.sty @@ -15,7 +15,7 @@ %% please consider and respect them carefully. %% ---------------------------------------------------------------- %% -\def\Version{2020/10/30 v1.0.8} +\def\Version{2021/01/10 v1.0.9} \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/lualatex/hu-berlin-bundle/hu-berlin-letter.cls b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-letter.cls index e584c456bee..125f0812e85 100644 --- a/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-letter.cls +++ b/Master/texmf-dist/tex/lualatex/hu-berlin-bundle/hu-berlin-letter.cls @@ -15,12 +15,17 @@ %% please consider and respect them carefully. %% ---------------------------------------------------------------- %% -\def\Version{2020/10/30 v1.0.8} +\def\Version{2021/01/10 v1.0.9} \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesClass{hu-berlin-letter} [\Version\ Humboldt-Universit"at zu Berlin - letter documentclass] \ClassInfo{hu-berlin}{* * * hu-berlin * * *\MessageBreak Part of the hu-berlin Bundle } +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrlttr2}} +\DeclareOption{english}{\PassOptionsToPackage{ngerman,main=english}{babel}} +\DeclareOption{ngerman}{\PassOptionsToPackage{ngerman}{babel}} +\ExecuteOptions{ngerman} +\ProcessOptions\relax \LoadClass[% fontsize=10pt, version=last, @@ -72,6 +77,28 @@ \def\stopletter{} \let\enclold\encl \renewcommand\encl[1]{\vskip0ptplus1filll\enclold{#1}} +\providecaptionname{english}{\hubCCseparator}{Copy to} +\providecaptionname{english}{\hubEnclSeparator}{Attachment} +\providecaptionname{english}{\hubMyRef}{Reference:} +\providecaptionname{english}{\hubFromName}{Clerk:} +\providecaptionname{english}{\hubDate}{Date:} +\providecaptionname{english}{\hubAddress}{Postal address:} +\providecaptionname{english}{\hubConnections}{Public transport:} +\providecaptionname{english}{\hubOffice}{Office:} +\providecaptionname{english}{\hubBank}{Bank:} +\providecaptionname{english}{\hubOfficeHours}{Consultation hours:} +\providecaptionname{english}{\hubAccessibility}{Entrance:} +\providecaptionname{ngerman}{\hubCCseparator}{Kopie an} +\providecaptionname{ngerman}{\hubEnclSeparator}{Anlage} +\providecaptionname{ngerman}{\hubMyRef}{Geschäftszeichen:} +\providecaptionname{ngerman}{\hubFromName}{Bearbeiter:} +\providecaptionname{ngerman}{\hubDate}{Datum:} +\providecaptionname{ngerman}{\hubAddress}{Postanschrift:} +\providecaptionname{ngerman}{\hubConnections}{Verkehrsverbindungen:} +\providecaptionname{ngerman}{\hubOffice}{Sitz:} +\providecaptionname{ngerman}{\hubBank}{Bank:} +\providecaptionname{ngerman}{\hubOfficeHours}{Sprechzeiten:} +\providecaptionname{ngerman}{\hubAccessibility}{Eingang:} \newkomavar{faculty} \newkomafont{faculty}{\bfseries\fontsize{8.5}{10}\selectfont} \newkomavar{institute} @@ -80,16 +107,16 @@ \newkomafont{institute.head}{\bfseries} \newkomavar{institute.head}% \newkomavar{institute.head.mail}% -\newkomavar{local} -\setkomavar*{local}{Sitz:} +\newkomavar{office} +\setkomavar*{office}{\hubOffice} \newkomavar{connections} -\setkomavar*{connections}{Verkehrsverbindungen:} +\setkomavar*{connections}{\hubConnections} \newkomavar{officehours} -\setkomavar*{officehours}{Sprechzeiten:} +\setkomavar*{officehours}{\hubOfficeHours} \newkomavar{accessibility} -\setkomavar*{accessibility}{{\large\reflectbox{\Wheelchair}} Eingang:} +\setkomavar*{accessibility}{{\large\reflectbox{\Wheelchair}} \hubAccessibility} \newkomavar{bank} -\setkomavar*{bank}{Bankverbindung:} +\setkomavar*{bank}{\hubBank} \setkomavar{bank}{Deutsche Bank PGK AG} \newkomavar{IBAN} \setkomavar{IBAN}{\mbox{IBAN DE95 1007 0848 0512 6206 01}} @@ -169,10 +196,10 @@ \Ifkomavarempty{fromurl} {} {\usekomavar{fromurl}\par} -\Ifkomavarempty{local} +\Ifkomavarempty{office} {} - {\textbf{\usekomavar*{local}}\\ - \usekomavar{local}\par} + {\textbf{\usekomavar*{office}}\\ + \usekomavar{office}\par} \vfill \Ifkomavarempty{connections} {} @@ -220,7 +247,7 @@ \setkomavar*{fromphone}{Telefon +49 [30] 2093–} \setkomavar{fromfax}{0000} \setkomavar*{fromfax}{Telefax +49 [30] 2093–} -\setkomavar*{fromaddress}{Postanschrift:} +\setkomavar*{fromaddress}{\hubAddress} \setkomavar{fromaddress}{% Humboldt-Universität zu Berlin\\ Unter den Linden 6\\ @@ -229,11 +256,11 @@ Humboldt-Universität zu Berlin\\ UdL 6\\ D-10099 Berlin} -\setkomavar*{date}{Datum:} -\setkomavar*{fromname}{Bearbeiter:} -\setkomavar*{myref}{Geschäftszeichen:} -\setkomavar*{enclseparator}{Anlage} -\setkomavar*{ccseparator}{Kopie an} +\setkomavar*{date}{\hubDate} +\setkomavar*{fromname}{\hubFromName} +\setkomavar*{myref}{\hubMyRef} +\setkomavar*{enclseparator}{\hubEnclSeparator} +\setkomavar*{ccseparator}{\hubCCseparator} %% %% Copyright (C) 2019-2020 %% -- cgit v1.2.3