summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-12 20:16:41 +0000
committerKarl Berry <karl@freefriends.org>2019-05-12 20:16:41 +0000
commite4de0e5d25d5e79a19e05ebd11ab237070678bda (patch)
treec80af700b2c68aff66c4173fb176c35e043ca3f9
parent12c147a7ae7d049f28d62a49bcdbe0238f68d445 (diff)
cinzel (12may19)
git-svn-id: svn://tug.org/texlive/trunk@51101 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/cinzel/README28
-rw-r--r--Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdfbin32705 -> 36724 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex6
-rw-r--r--Master/texmf-dist/tex/latex/cinzel/cinzel.sty27
4 files changed, 42 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/fonts/cinzel/README b/Master/texmf-dist/doc/fonts/cinzel/README
index cf1c52d0cad..f6c42a57e9f 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/README
+++ b/Master/texmf-dist/doc/fonts/cinzel/README
@@ -1,4 +1,4 @@
-This is the README for the cinzel package, version 2014-05-24.
+This is the README for the cinzel package, version 2019-05-12.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the Cinzel and Cinzel Decorative families of fonts, designed
@@ -24,12 +24,24 @@ To use, add
\usepackage{cinzel}
-to the preamble of your document. This will activate Cinzel as the
-main (serifed) text font and Cinzel Decorative as the "italic"
-variants.
+to the preamble of your document. This will define
-The black option selects the Black variants as the default bold
-series.
+\cinzel and \textcinzel{...}
+
+and
+
+\cinzelblack and \textcinzelblack{...}
+
+for localized use of Cinzel and the black series,
+respectively. Cinzel Decorative is treated as the italic
+shape.
+
+To activate Cinzel as the main (serifed) text font and
+Cinzel Decorative as the "italic" variants, use the
+"default" option.
+
+The "black" option selects the Black variants as the default
+bold series.
LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
to avoid fontspec may use the type1 option.
@@ -38,10 +50,6 @@ The only figure style is proportional-lining.
Font encodings supported are OT1, T1, LY1 and TS1.
-Command \cinzel allows for localized use of Cinzel (and Cinzel
-Decorative). Command \cinzelblack allows for localized use of the
-Black series.
-
The truetype fonts were downloaded from
http://www.google.com/webfonts and are licensed under the SIL Open
Font License, (version 1.1); the text may be found in the doc
diff --git a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
index 7d1eb61f01e..0a52d98b598 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
index 0e5b480720e..a0eb9c36edb 100644
--- a/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
+++ b/Master/texmf-dist/doc/fonts/cinzel/cinzel-samples.tex
@@ -1,12 +1,12 @@
\documentclass[12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage{cinzel}
+\usepackage[default]{cinzel}
\usepackage{lipsum}
\begin{document}
\thispagestyle{empty}
-\begin{center}\LARGE\bfseries\itshape
-Cinzel and Cinzel Decorative
+\begin{center}\LARGE\bfseries
+\cinzel Cinzel and \Large\itshape Cinzel Decorative
\end{center}
\sloppy
diff --git a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
index 7dbb3ef5a44..0509bdbe877 100644
--- a/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
+++ b/Master/texmf-dist/tex/latex/cinzel/cinzel.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cinzel}
- [2014/05/24 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.]
+ [2019/05/12 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -14,9 +14,11 @@
\fi\fi
\newif\ifcinzel@black \cinzel@blackfalse
+\newif\ifcinzel@default \cinzel@defaultfalse
\DeclareOptionX{type1}{\cinzel@ttffalse}
\DeclareOptionX{black}{\cinzel@blacktrue}
+\DeclareOptionX{default}{\cinzel@defaulttrue}
\ProcessOptionsX\relax
\ifcinzel@ttf
@@ -41,12 +43,14 @@
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf }
- \setmainfont
+ \ifcinzel@default
+ \setmainfont
[ UprightFont = *-Regular ,
ItalicFont = *Decorative-Regular ,
BoldFont = *-\cinzel@boldstyle ,
BoldItalicFont = *Decorative-\cinzel@boldstyle ]
{Cinzel}
+ \fi
\newfontfamily\cinzel
[ UprightFont = *-Regular ,
ItalicFont = *Decorative-Regular ,
@@ -60,13 +64,24 @@
\else % type1
\def\cinzelfamily{Cinzel-LF}
- \newcommand*\cinzel{\fontfamily{\cinzelfamily}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
- \def\rmdefault{\cinzelfamily}
- \def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}
- \newcommand*\cinzelblack{\fontfamily{\cinzelfamily}\fontseries{k}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
+ \newcommand*\cinzel{%
+ \fontfamily{\cinzelfamily}\selectfont
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+ }
+ \ifcinzel@default
+ \def\rmdefault{\cinzelfamily}
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+ \fi
+ \newcommand*\cinzelblack{%
+ \fontfamily{\cinzelfamily}\fontseries{k}\selectfont
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontseries{k}\else\fontshape{\itdefault}\fi\selectfont}
+ }
\fi
+\DeclareTextFontCommand{\textcinzel}{\cinzel}
+\DeclareTextFontCommand{\textcinzelblack}{\cinzelblack}
+
\ifcinzel@ttf
% turn off defaults in case other fonts are selected:
\defaultfontfeatures{}