diff options
author | Norbert Preining <norbert@preining.info> | 2019-12-21 03:01:59 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-12-21 03:01:59 +0000 |
commit | 5a9a925f76657ce6e1d54a58bad83ce71f7f324d (patch) | |
tree | 199a0d10675b707034860ef381d71b3a505c12ec /macros/latex/contrib | |
parent | 18d9ec0eba21e6b8c55cdd50afb91c56e02ce7bf (diff) |
CTAN sync 201912210301
Diffstat (limited to 'macros/latex/contrib')
15 files changed, 135 insertions, 101 deletions
diff --git a/macros/latex/contrib/fontsetup/README b/macros/latex/contrib/fontsetup/README index 9b3fba6d43..651488aef1 100644 --- a/macros/latex/contrib/fontsetup/README +++ b/macros/latex/contrib/fontsetup/README @@ -1,5 +1,5 @@ The fontsetup package - (Version 1.000, GPL3) + (Version 1.002, GPL3) This simple package makes it trivial to switch quickly between different quality fonts supporting Mathematics. diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf Binary files differindex a476585f84..3c7feb5474 100644 --- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf +++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex index 80224d5f70..d27ec9dbf8 100644 --- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex +++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex @@ -9,8 +9,8 @@ \textit{by}\\[1ex] {\large Antonis Tsolomitis}\\ University of the Aegean\\ Department of Mathematics\\[1ex] - \textsc{21} November \textsc{2019}\\[1ex] - Version 1.000, \textsc{gpl3} + \textsc{20} December \textsc{2019}\\[1ex] + Version 1.002, \textsc{gpl3} \end{center} This package is a simple wrapper-type package that makes the setup of fonts easy and @@ -52,7 +52,7 @@ University of the Aegean\\ Department of Mathematics\\[1ex] MyriadPro from the installation of Adobe PDF Reader and install the fonts to your system (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). Moreover, install the supplied - MinionGreekSmallCaps.otf as a system font to have access to Greek small caps. + fspmnscel.otf as a system font to have access to Greek small caps. Mathematics is from stix2 with letters replaced from MinionPro. Sans is MyriadPro. \item[msgaramond] Loads the MS-Garamond fonts. These must be system installed @@ -65,7 +65,8 @@ University of the Aegean\\ Department of Mathematics\\[1ex] \item[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows. Thefonts must be system installed (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). The supplied - PalatinoGreekSmallCaps.otf must be also system-installed to allow access to Greek small caps. + fsplpscel.otf must be also + system-installed to allow access to Greek small caps. Mathematics font is texgyrepagella-math. \item[stixtwo] Loads the stix2 fonts, a Times-type font. \item[times] Loads the FreeSerifb fonts, a Times font and stix2 for Mathematics @@ -99,8 +100,8 @@ to use the commercial ones. \medskip \begin{enumerate} -\item Install as system fonts the supplied \verb|MinionGreekSmallcaps.otf| - and \verb|PalatinoGreekSmallCaps.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in +\item Install as system fonts the supplied \verb|fspmnscel.otf| + and \verb|fsplpscel.otf| (in \verb|C:\Windows\Fonts\| on MS-Windows or in \verb|/home/user/.fonts/| in Linux or system-wide install as administrator) \item Repeat the previous step for all MinionPro and MyriadPro fonts from the installation of the free Adobe Acrobat Reader. @@ -212,7 +213,8 @@ Cambria Fonts must be installed as system fonts\\[1cm] \begin{center} {\Large MinionPro (commercial) and Stix2Math: option \verb|minion|}\\ -MinionPro Fonts and the supplied MinionGreekSmallCaps.otf must be installed as system fonts\\[1cm] +MinionPro Fonts and the supplied fspmnscel.otf must +be installed as system fonts\\[1cm] \includegraphics[scale=1.2]{fspsample-minion.pdf} \end{center} @@ -236,7 +238,7 @@ NeoEuler font must be installed in TeX tree\\[1cm] \begin{center} {\Large Linotype Palatino (commercial) and texgyrepagella-math: option \verb|palatino|}\\ -Linotype Palatino Fonts and the supplied PalatinoGreekSmallCaps.otf must be installed as system fonts\\[1cm] +Linotype Palatino Fonts and the supplied fsplpscel.otf must be installed as system fonts\\[1cm] \includegraphics[scale=1.2]{fspsample-palatino.pdf} \end{center} diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf Binary files differindex 949c22c03a..3fcf807041 100644 --- a/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf +++ b/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf b/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf Binary files differindex 5b6435de45..c5231ab0ab 100644 --- a/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf +++ b/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf diff --git a/macros/latex/contrib/fontsetup/fontsetup.sty b/macros/latex/contrib/fontsetup/fontsetup.sty index 92dc687d1a..783c3f1d3d 100644 --- a/macros/latex/contrib/fontsetup/fontsetup.sty +++ b/macros/latex/contrib/fontsetup/fontsetup.sty @@ -1,5 +1,5 @@ %\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fontsetup}[2019/11/07 Easy font setup by Antonis Tsolomitis] +\ProvidesPackage{fontsetup}[2019/12/20 Easy font setup by Antonis Tsolomitis] \typeout{fontsetup: Easy font setup by Antonis Tsolomitis} \chardef\fontsetupdefault=0 % TODO fork cm-unicode or complete lm fonts @@ -12,12 +12,12 @@ \chardef\fontsetupkerkis=7 \chardef\fontsetupfira=8 \chardef\fontsetuptimes=9 -\chardef\fontsetuppalatino=10 %install Linotype Palatino as a System font. Files pala.ttf palai, palab, palabi. Install PalatinoGreekSmallCaps as a System font. +\chardef\fontsetuppalatino=10 %install Linotype Palatino as a System font. Files pala.ttf palai, palab, palabi. Install fspPalatinoGreekSmallCaps as a System font. \chardef\fontsetupstixtwo=11 \chardef\fontsetupneokadmus=12 \chardef\fontsetupmsgaramond=13 %install Microsoft Garamond as a System font. Gara.TTF, Garai, Garabd \chardef\fontsetupebgaramond=14 -\chardef\fontsetupminion=15 % Install MinionPro and provided MinionSC as a system font. +\chardef\fontsetupminion=15 % Install MinionPro and provided fspMinionGreekSmallCaps as a system font. \chardef\fontsetupneoeuler=16 \chardef\fontsetuplibertinus=17 diff --git a/macros/latex/contrib/fontsetup/fspminion.sty b/macros/latex/contrib/fontsetup/fspminion.sty index 2f549a2eee..f39448227f 100644 --- a/macros/latex/contrib/fontsetup/fspminion.sty +++ b/macros/latex/contrib/fontsetup/fspminion.sty @@ -6,7 +6,7 @@ \setmainfont[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro} \setsansfont[SmallCapsFeatures={Numbers=OldStyle}]{Myriad Pro} \newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Minion Pro} -\newfontfamily{\greekfont}[SmallCapsFont=MinionGreekSmallCaps]{Minion Pro} +\newfontfamily{\greekfont}[SmallCapsFont=fspmnscel]{Minion Pro} \RequirePackage[Latin, Greek]{ucharclasses} \setDefaultTransitions{\defaultfont}{} \setTransitionsForLatin{\defaultfont}{} diff --git a/macros/latex/contrib/fontsetup/fsppalatinoot.sty b/macros/latex/contrib/fontsetup/fsppalatinoot.sty index 7234ccc2f1..3487754dde 100644 --- a/macros/latex/contrib/fontsetup/fsppalatinoot.sty +++ b/macros/latex/contrib/fontsetup/fsppalatinoot.sty @@ -3,7 +3,7 @@ \newfontfamily{\defaultfont}[SmallCapsFeatures={Numbers=OldStyle}]{Palatino Linotype} -\newfontfamily{\greekfont}[SmallCapsFont=PalatinoGreekSmallCaps]{Palatino Linotype} +\newfontfamily{\greekfont}[SmallCapsFont=fsplpscel]{Palatino Linotype} \RequirePackage[Latin, Greek]{ucharclasses} \setDefaultTransitions{\defaultfont}{} diff --git a/macros/latex/contrib/fontsetup/system-install-fonts/README-fonts.txt b/macros/latex/contrib/fontsetup/system-install-fonts/README-fonts.txt deleted file mode 100644 index 8558ac3148..0000000000 --- a/macros/latex/contrib/fontsetup/system-install-fonts/README-fonts.txt +++ /dev/null @@ -1,13 +0,0 @@ - - The directory ctan:/macros/latex/contrib/fontsetup/system-install-fonts/ - used to contain the fonts - MinionGreekSmallCaps.otf - and PalatinoGreekSmallCaps.otf - - These fonts have been temporarily removed because some doubt - has been cast on the copyright situation of some of the glyphs - in these fonts. - - They will be restored as soon as the situation has been clarified. - - Petra Rübe-Pugliese for the CTAN Team, 2019-12-17 diff --git a/macros/latex/contrib/fontsetup/system-install-fonts/fsplpscel.otf b/macros/latex/contrib/fontsetup/system-install-fonts/fsplpscel.otf Binary files differnew file mode 100644 index 0000000000..b505b6b96f --- /dev/null +++ b/macros/latex/contrib/fontsetup/system-install-fonts/fsplpscel.otf diff --git a/macros/latex/contrib/fontsetup/system-install-fonts/fspmnscel.otf b/macros/latex/contrib/fontsetup/system-install-fonts/fspmnscel.otf Binary files differnew file mode 100644 index 0000000000..c0e233f43c --- /dev/null +++ b/macros/latex/contrib/fontsetup/system-install-fonts/fspmnscel.otf diff --git a/macros/latex/contrib/hu-berlin-bundle/README.md b/macros/latex/contrib/hu-berlin-bundle/README.md index 568b6dab48..92d36a4a58 100644 --- a/macros/latex/contrib/hu-berlin-bundle/README.md +++ b/macros/latex/contrib/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/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.dtx b/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.dtx index e8b30e087e..4b064957d1 100644 --- a/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.pdf b/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.pdf Binary files differindex 7aadae6672..8c86d29736 100644 --- a/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.pdf +++ b/macros/latex/contrib/hu-berlin-bundle/hu-berlin-bundle.pdf diff --git a/macros/latex/contrib/hu-berlin-bundle/makefile b/macros/latex/contrib/hu-berlin-bundle/makefile index c6f1bec8e8..19382036d3 100644 --- a/macros/latex/contrib/hu-berlin-bundle/makefile +++ b/macros/latex/contrib/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 |