summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beuron
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-03 21:58:14 +0000
committerKarl Berry <karl@freefriends.org>2018-01-03 21:58:14 +0000
commita6cb1a9c4e48b5842ddd65d73193db2a0c7e3e01 (patch)
tree2dcf4b9a3142e2827dcab0cf8e67e26d7b5350d5 /Master/texmf-dist/tex/latex/beuron
parenta638bb58b46f0925ed96d71424739a8b698f08e2 (diff)
beuron (3jan18)
git-svn-id: svn://tug.org/texlive/trunk@46197 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beuron')
-rw-r--r--Master/texmf-dist/tex/latex/beuron/beuron.sty173
1 files changed, 126 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/beuron/beuron.sty b/Master/texmf-dist/tex/latex/beuron/beuron.sty
index 41f69ae1904..bb4af5fc76f 100644
--- a/Master/texmf-dist/tex/latex/beuron/beuron.sty
+++ b/Master/texmf-dist/tex/latex/beuron/beuron.sty
@@ -1,9 +1,9 @@
% beuron.sty
% Paket für die Schrift der Beuroner Kunstschule
% Beuronese art script package
-% Version 1.1
-% Autor: Keno Wehr
-% 11. September 2016
+% Version 1.2
+% Autor: K. Wehr
+% 1. Januar 2018
% U.I.O.G.D.
% This work may be distributed and/or modified under the
@@ -16,61 +16,140 @@
\RequirePackage{expl3}
-\ProvidesExplPackage {beuron} {2016/09/11} {1.1} {Beuronese art script package}
+\ProvidesExplPackage {beuron} {2018/01/01} {1.2} {Beuronese art script package}
\RequirePackage{xparse}
+\bool_lazy_or:nnT {\sys_if_engine_xetex_p:} {\sys_if_engine_luatex_p:}
+ {
+ \RequirePackage{fontspec}
+
+ \fontspec_set_family:Nnn \l_beuron_schriftfamilie_tl
+ {
+ FontFace = {c}{n}{BeuronCondensed-Regular.otf},
+ FontFace = {x}{n}{BeuronExtended-Regular.otf}
+ }
+ {
+ Beuron-Regular.otf
+ }
+ }
+
+\cs_generate_variant:Nn \tl_replace_all:Nnn {Nxn}
+
+\box_new:N \l_beuron_mittepunkt_box
+\skip_new:N \l_beuron_mittepunktabstand_skip
+
+\tl_const:Nn \c_beuron_dehnbarer_doppelpunkt_tl
+ {
+ \penalty10000
+ \skip_horizontal:N \l_beuron_mittepunktabstand_skip
+ \c_colon_str
+ \skip_horizontal:N \l_beuron_mittepunktabstand_skip
+ }
+
% #1: Sollen Leerzeichen erhalten bleiben?
% #2: Text
\cs_new_protected:Npn \beuron_replace:nn #1#2
- {
- \tl_set:Nn \l_tmpa_tl {#2}
- \tl_replace_all:Nnn \l_tmpa_tl {Ä} {AE}
- \tl_replace_all:Nnn \l_tmpa_tl {ä} {AE}
- \tl_replace_all:Nnn \l_tmpa_tl {Ö} {OE}
- \tl_replace_all:Nnn \l_tmpa_tl {ö} {OE}
- \tl_replace_all:Nnn \l_tmpa_tl {Ü} {UE}
- \tl_replace_all:Nnn \l_tmpa_tl {ü} {UE}
- \tl_replace_all:Nnn \l_tmpa_tl {ß} {SS}
-
- \bool_if:NF #1
- {
- \tl_replace_all:Nnn \l_tmpa_tl {~} {\slash}
- }
-
- \MakeUppercase{\l_tmpa_tl}
- }
+ {
+ \skip_set:Nn \l_beuron_mittepunktabstand_skip {0em plus0.14em minus0.1em}
+
+ \tl_set:Nn \l_tmpa_tl {#2}
+ \tl_replace_all:Nnn \l_tmpa_tl {Ä} {AE}
+ \tl_replace_all:Nnn \l_tmpa_tl {ä} {AE}
+ \tl_replace_all:Nnn \l_tmpa_tl {Ö} {OE}
+ \tl_replace_all:Nnn \l_tmpa_tl {ö} {OE}
+ \tl_replace_all:Nnn \l_tmpa_tl {Ü} {UE}
+ \tl_replace_all:Nnn \l_tmpa_tl {ü} {UE}
+ \tl_replace_all:Nnn \l_tmpa_tl {ß} {SS}
+ \tl_replace_all:Nxn \l_tmpa_tl {\c_colon_str \c_space_tl} {\c_beuron_dehnbarer_doppelpunkt_tl}
+ \tl_replace_all:Nxn \l_tmpa_tl {\c_colon_str} {\c_beuron_dehnbarer_doppelpunkt_tl}
+
+ \bool_if:NF #1
+ {
+ \hbox_set:Nn \l_beuron_mittepunkt_box {/}
+
+ \tl_replace_all:Nnn \l_tmpa_tl {~}
+ {
+ \skip_horizontal:N \l_beuron_mittepunktabstand_skip
+ \cleaders
+ \box_use:N \l_beuron_mittepunkt_box
+ \skip_horizontal:n {\box_wd:N \l_beuron_mittepunkt_box}
+ \skip_horizontal:N \l_beuron_mittepunktabstand_skip
+ }
+ }
+
+ \l_tmpa_tl
+ }
+
+\cs_generate_variant:Nn \beuron_replace:nn {no}
\NewDocumentCommand \textbeuron {s m}
- {
- \group_begin:
- \usefont{T1}{beuron}{m}{n}
- \beuron_replace:nn {#1}{#2}
- \group_end:
- }
+ {
+ \group_begin:
+ \bool_lazy_or:nnTF {\sys_if_engine_xetex_p:} {\sys_if_engine_luatex_p:}
+ {
+ \fontfamily{\l_beuron_schriftfamilie_tl}
+ \fontseries{m}
+ \fontshape{n}
+ \selectfont
+ }
+ {
+ \usefont{T1}{beuron}{m}{n}
+ }
+ \beuron_replace:no {#1}{#2}
+ \group_end:
+ }
\NewDocumentCommand \textbeuronc {s m}
- {
- \group_begin:
- \usefont{T1}{beuron}{c}{n}
- \beuron_replace:nn {#1}{#2}
- \group_end:
- }
+ {
+ \group_begin:
+ \bool_lazy_or:nnTF {\sys_if_engine_xetex_p:} {\sys_if_engine_luatex_p:}
+ {
+ \fontfamily{\l_beuron_schriftfamilie_tl}
+ \fontseries{c}
+ \fontshape{n}
+ \selectfont
+ }
+ {
+ \usefont{T1}{beuron}{c}{n}
+ }
+ \beuron_replace:no {#1}{#2}
+ \group_end:
+ }
\NewDocumentCommand \textbeuronx {s m}
- {
- \group_begin:
- \usefont{T1}{beuron}{x}{n}
- \beuron_replace:nn {#1}{#2}
- \group_end:
- }
+ {
+ \group_begin:
+ \bool_lazy_or:nnTF {\sys_if_engine_xetex_p:} {\sys_if_engine_luatex_p:}
+ {
+ \fontfamily{\l_beuron_schriftfamilie_tl}
+ \fontseries{x}
+ \fontshape{n}
+ \selectfont
+ }
+ {
+ \usefont{T1}{beuron}{x}{n}
+ }
+ \beuron_replace:no {#1}{#2}
+ \group_end:
+ }
\NewDocumentCommand \beuronOmega { }
- {
- \group_begin:
- \fontencoding{T1}
- \fontfamily{beuron}
- \selectfont
- \symbol{10}
- \group_end:
- }
+ {
+ \group_begin:
+ \bool_lazy_or:nnTF {\sys_if_engine_xetex_p:} {\sys_if_engine_luatex_p:}
+ {
+ \fontfamily{\l_beuron_schriftfamilie_tl}
+ \fontshape{n}
+ \selectfont
+ \symbol{937}
+ }
+ {
+ \fontencoding{T1}
+ \fontfamily{beuron}
+ \fontshape{n}
+ \selectfont
+ \symbol{141}
+ }
+ \group_end:
+ }