summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/venturisadf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-07-08 00:06:22 +0000
committerKarl Berry <karl@freefriends.org>2010-07-08 00:06:22 +0000
commit1d490fd8026612964fb96c1928048d2066e15f0f (patch)
treee071273c6b3ce8e803fdf0cedcd5becc620e5915 /Master/texmf-dist/tex/latex/venturisadf
parent9929af2610f53bfd77c2aef355393c812688969b (diff)
venturisadf 1.005 (6jul10)
git-svn-id: svn://tug.org/texlive/trunk@19277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/venturisadf')
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturis.sty48
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturis2.sty31
-rw-r--r--Master/texmf-dist/tex/latex/venturisadf/venturisold.sty17
3 files changed, 68 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturis.sty b/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
index 3ed5fae327f..d746f39c7cb 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturis.sty
@@ -1,4 +1,4 @@
-%% Copyright 2008 Clea F. Rees
+%% Copyright 2010 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,37 +14,55 @@
%
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturis}[2008/11/05 v1.004 VenturisADF PS]
+\ProvidesPackage{venturis}[2010/07/03 v1.005 VenturisADF PS]
+\RequirePackage{xkeyval}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
\RequirePackage{nfssext-cfr}
-\DeclareOption{osf}{%
- \gdef\lfosf{j}}
-\DeclareOption{lf}{%
- \gdef\lfosf{}}
-\ExecuteOptions{osf}
-\ProcessOptions*
-\renewcommand{\rmdefault}{yvt\lfosf}
+%:boolkeys for roman osf/lf
+\define@boolkey{venturis.sty}[venturis@]{osf}[true]{%
+ \ifventuris@osf
+ \def\venturis@lfosf{j}%
+ \else
+ \def\venturis@lfosf{}%
+ \fi}
+\define@boolkey{venturis.sty}[venturis@]{lf}[true]{%
+ \ifventuris@lf
+ \def\venturis@lfosf{}%
+ \else
+ \def\venturis@lfosf{j}%
+ \fi}
+
+%:defaults to ensure everything is defined to something
+\ExecuteOptionsX{osf=true}
+
+%:options override defaults
+\ProcessOptionsX
+
+%:make Venturis default for roman text, implementing the relevant option
+\renewcommand{\rmdefault}{yvt\venturis@lfosf}
+%:make Venturis Sans default for sans-serif text
\renewcommand{\sfdefault}{yv1}
+
%:introduce special titling commands
\DeclareRobustCommand{\vtstyle}[1][]{%
- \edef\vt@shape{#1}
- \def\tempo{ol}
- \def\temps{yv1}
- \def\tempr{yvt}
+ \edef\vt@shape{#1}%
+ \def\tempo{ol}%
+ \def\temps{yv1}%
+ \def\tempr{yvt}%
\not@math@alphabet\vtstyle\relax
%:because the titling fonts have limited availability, don't use the \tistyle set-up, but choose the family explicitly in case we're currently using sans or typewriter - note, though, that some are also called as small-caps commands in certain sans-serif variants (though the seriffed variant seems not to match anything...)
\ifx\vt@shape\tempo
\fontfamily{yvtd}\fontshape{ol}\selectfont
\else
- \edef\tempf{\expandafter\exfs@get@base\f@family\@nil}
+ \edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
\ifx\tempf\temps
\fontfamily{yv1d}\selectfont
\else
\ifx\tempf\tempr
\fontfamily{yvtd}\selectfont
\else
- \PackageWarning{venturis.sty}{\tempf is unknown. This command requires that yv1 or yvt be active in order to determine whether serif or sans-serif titling is required. I am going to guess that you want serif titling. If this is wrong, be sure to activate yv1 first or copy and adapt the styling command from venturis.sty.}
+ \PackageWarning{venturis.sty}{\tempf is unknown. This command requires that yv1 or yvt be active in order to determine whether serif or sans-serif titling is required. I am going to guess that you want serif titling. If this is wrong, be sure to activate yv1 first or copy and adapt the styling command from venturis.sty.}%
\fontfamily{yvtd}\selectfont
\fi
\fi
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty b/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
index 73a64305024..e28fcbaef45 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturis2.sty
@@ -1,4 +1,4 @@
-%% Copyright 2008 Clea F. Rees
+%% Copyright 2010 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,10 +14,37 @@
%
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturis2}[2008/11/05 v1.004 VenturisADFNo2 PS]
+\ProvidesPackage{venturis2}[2010/07/03 v1.005 VenturisADFNo2 PS]
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
\RequirePackage{nfssext-cfr}
\renewcommand{\rmdefault}{yv2}
\renewcommand{\sfdefault}{yv3}
+%:introduce special titling commands
+\DeclareRobustCommand{\vtstyle}[1][]{%
+ \edef\vt@shape{#1}%
+ \def\tempo{ol}%
+ \def\temps{yv3}%
+ \def\tempr{yv2}%
+ \not@math@alphabet\vtstyle\relax
+%:because the titling fonts have limited availability, don't use the \tistyle set-up which won't work with venturis2 in any case, but choose the family explicitly in case we're currently using sans or typewriter
+\ifx\vt@shape\tempo
+ \fontfamily{yvtd}\fontshape{ol}\selectfont
+ \else
+ \edef\tempf{\expandafter\exfs@get@base\f@family\@nil}%
+ \ifx\tempf\temps
+ \fontfamily{yv1d}\selectfont
+ \else
+ \ifx\tempf\tempr
+ \fontfamily{yvtd}\selectfont
+ \else
+ \PackageWarning{venturis.sty}{\tempf is unknown. This command requires that yv2 or yv3 be active in order to determine whether serif or sans-serif titling is required. I am going to guess that you want serif titling. If this is wrong, be sure to activate yv3 first or copy and adapt the styling command from venturis.sty.}%
+ \fontfamily{yvtd}\selectfont
+ \fi
+ \fi
+ \fi
+ }
+\DeclareTextFontCommand{\textvt}{\vtstyle}
+\DeclareTextFontCommand{\textvtl}{\vtstyle[ol]}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty b/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
index c72b11a024e..0fa213688d7 100644
--- a/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
+++ b/Master/texmf-dist/tex/latex/venturisadf/venturisold.sty
@@ -1,4 +1,4 @@
-%% Copyright 2008 Clea F. Rees
+%% Copyright 2010 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,21 +14,16 @@
%
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{venturisold}[2008/11/05 v1.004 VenturisOldADF PS]
+\ProvidesPackage{venturisold}[2010/07/03 v1.005 VenturisOldADF PS]
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
-%\RequirePackage{nfssext-cfr}
-%\DeclareOption{reg}{%
- \renewcommand{\rmdefault}{yvo}%}
-%\DeclareOption{alt}{%
-% \renewcommand{\rmdefault}{yvoa}}
-%\ExecuteOptions{reg}
-%\ProcessOptions
+\RequirePackage{nfssext-cfr}
+%:Make Venturis Old default for roman text
+\renewcommand{\rmdefault}{yvo}
%:introduce special titling commands
\DeclareRobustCommand{\vtstyle}[1][]{% allow an optional argument for consistency with venturis.sty
\not@math@alphabet\vtstyle\relax
- \fontfamily{yvod}\selectfont
- }
+ \fontfamily{yvod}\selectfont}
\DeclareTextFontCommand{\textvt}{\vtstyle}
\DeclareTextFontCommand{\textvtl}{\vtstyle}
\endinput