From c578b93af21861e49bd86a013f553a967e684d2d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Mar 2011 00:27:01 +0000 Subject: tabvar (10mar11) git-svn-id: svn://tug.org/texlive/trunk@21678 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tabvar/tabvar.1 | 4 +- Master/texmf-dist/tex/latex/tabvar/tabvar.2 | 4 +- Master/texmf-dist/tex/latex/tabvar/tabvar.3 | 4 +- Master/texmf-dist/tex/latex/tabvar/tabvar.cfg | 11 ++++- Master/texmf-dist/tex/latex/tabvar/tabvar.sty | 68 +++++++++++++++++---------- 5 files changed, 57 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.1 b/Master/texmf-dist/tex/latex/tabvar/tabvar.1 index 3ba41ff40ce..28907d3e5fa 100644 --- a/Master/texmf-dist/tex/latex/tabvar/tabvar.1 +++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.1 @@ -1,8 +1,8 @@ %!PS %%BoundingBox: -1 -1 25 13 %%HiResBoundingBox: -0.09962 -0.09962 24.0099 12.05476 -%%Creator: MetaPost 1.208 -%%CreationDate: 2010.08.23:1154 +%%Creator: MetaPost 1.211 +%%CreationDate: 2011.03.10:1728 %%Pages: 1 %%BeginProlog %%EndProlog diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.2 b/Master/texmf-dist/tex/latex/tabvar/tabvar.2 index 65ae7118f4f..56f872825a1 100644 --- a/Master/texmf-dist/tex/latex/tabvar/tabvar.2 +++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.2 @@ -1,8 +1,8 @@ %!PS %%BoundingBox: -1 -1 25 13 %%HiResBoundingBox: -0.09962 -0.09962 24.0099 12.05476 -%%Creator: MetaPost 1.208 -%%CreationDate: 2010.08.23:1154 +%%Creator: MetaPost 1.211 +%%CreationDate: 2011.03.10:1728 %%Pages: 1 %%BeginProlog %%EndProlog diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.3 b/Master/texmf-dist/tex/latex/tabvar/tabvar.3 index 5a281bb6034..04285ea2e10 100644 --- a/Master/texmf-dist/tex/latex/tabvar/tabvar.3 +++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.3 @@ -1,8 +1,8 @@ %!PS %%BoundingBox: -1 -2 25 2 %%HiResBoundingBox: -0.09962 -1.63043 24.0099 1.63043 -%%Creator: MetaPost 1.208 -%%CreationDate: 2010.08.23:1154 +%%Creator: MetaPost 1.211 +%%CreationDate: 2011.03.10:1728 %%Pages: 1 %%BeginProlog %%EndProlog diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.cfg b/Master/texmf-dist/tex/latex/tabvar/tabvar.cfg index 4ff62822214..6c35e2d6ca2 100644 --- a/Master/texmf-dist/tex/latex/tabvar/tabvar.cfg +++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.cfg @@ -1,11 +1,18 @@ - %% Fichier de configuration de l'extension `tabvar.sty'. %% %% D\'ecommenter la ligne suivante pour que les variantes MetaPost -%% des fl\`eches soient utilis\'ees \`a la place de la fonte tabvar.pfb. +%% des fl\`eches soient utilis\'ees \`a la place de la fonte tabvar.pfb +%% (d\'econseill\'e en g\'en\'eral et *jamais* sous LuaLaTeX ou XeLaTeX). %% %%\FlechesMPtrue %% +%% Choix d'une des 4 variantes pour les fl\`eches PostScript +%% +%%\FlechesPS1 % (d\'efaut) +%%\FlechesPS2 % assorties \`a la police Fourier +%%\FlechesPS3 +%%\FlechesPS4 +%% %% Ce param\`etre permet d'augmenter la largeur des colonnes contenant %% des fl\`eches (essayer 1.3, 1.5, etc.), sa valeur par d\'efaut est 1 : %% diff --git a/Master/texmf-dist/tex/latex/tabvar/tabvar.sty b/Master/texmf-dist/tex/latex/tabvar/tabvar.sty index bd9f9fdd410..39aa7655537 100644 --- a/Master/texmf-dist/tex/latex/tabvar/tabvar.sty +++ b/Master/texmf-dist/tex/latex/tabvar/tabvar.sty @@ -21,12 +21,11 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% -%% Copyright (C) Daniel Flipo 2003-2010 +%% Copyright (C) Daniel Flipo 2003-2011 %% \NeedsTeXFormat{LaTeX2e}[1997/06/01] \ProvidesFile{tabvar.sty} - [2010/08/22 v1.4 (Daniel Flipo)] - + [2011/03/10 v1.5 (Daniel Flipo)] \newif\ifFlechesMP \FlechesMPfalse \DeclareOption{FlechesMP}{\FlechesMPtrue} \DeclareOption{FlechesPS}{\FlechesMPfalse} @@ -41,40 +40,57 @@ \input{supp-pdf} \DeclareGraphicsRule{*}{mps}{*}{} \fi -\newsavebox{\arup} -\newsavebox{\ardown} -\newsavebox{\arhor} +\providecommand{\f@size}{10} +\newcommand{\TVarrowscale}{\strip@pt\dimexpr\f@size pt/10\relax} \newcommand*{\TVarrowscolstretch}{1} \newcommand*{\TV@arrowcol@stretch}[1]{% \makebox[\TVarrowscolstretch\width][c]{#1}} -\providecommand{\f@size}{10} -\newcommand{\TVarrowscale}{\strip@pt\dimexpr\f@size pt/10\relax} -\sbox{\arup}{\includegraphics[scale=\TVarrowscale]{tabvar.1}} -\sbox{\ardown}{\includegraphics[scale=\TVarrowscale]{tabvar.2}} -\sbox{\arhor}{\includegraphics[scale=\TVarrowscale]{tabvar.3}} -\newcommand{\FlecheCm}{% - \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\arup}}}} -\newcommand{\FlecheDm}{% - \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\ardown}}}} -\newcommand{\FlecheHm}{% - \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\arhor}}}} +\newcommand*{\enearrow}{\enearrowi} +\newcommand*{\esearrow}{\esearrowi} +\newcommand*{\eastarrow}{\eastarrowi} +\newcommand*{\FlechesPS}[1]{% + \renewcommand*{\enearrow}{% + \csname enearrow\romannumeral#1\endcsname}% + \renewcommand*{\esearrow}{% + \csname esearrow\romannumeral#1\endcsname}% + \renewcommand*{\eastarrow}{% + \csname eastarrow\romannumeral#1\endcsname}% +} \AtBeginDocument{% \ifFlechesMP - \newcommand{\FlecheC}{\FlecheCm}% - \newcommand{\FlecheD}{\FlecheDm}% - \newcommand{\FlecheH}{\FlecheHm}% + \newsavebox{\arup}% + \newsavebox{\ardown}% + \newsavebox{\arhor}% + \sbox{\arup}{\includegraphics[scale=\TVarrowscale]{tabvar.1}}% + \sbox{\ardown}{\includegraphics[scale=\TVarrowscale]{tabvar.2}}% + \sbox{\arhor}{\includegraphics[scale=\TVarrowscale]{tabvar.3}}% + \newcommand*{\FlecheC}{% + \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\arup}}}}% + \newcommand*{\FlecheD}{% + \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\ardown}}}}% + \newcommand*{\FlecheH}{% + \TV@arrowcol@stretch{\raisebox{.5ex}{\usebox{\arhor}}}}% \else \DeclareFontFamily{U}{tv}{}% \DeclareFontShape{U}{tv}{m}{n}{<->tabvar}{}% \DeclareSymbolFont{tvsymbols}{U}{tv}{m}{n}% - \DeclareMathSymbol{\enearrow}{\mathrel}{tvsymbols}{"25}% - \DeclareMathSymbol{\esearrow}{\mathrel}{tvsymbols}{"26}% - \DeclareMathSymbol{\eastarrow}{\mathrel}{tvsymbols}{"21}% - \newcommand{\FlecheC}{% + \DeclareMathSymbol{\eastarrowi}{\mathrel}{tvsymbols}{"21}% + \DeclareMathSymbol{\enearrowi}{\mathrel}{tvsymbols}{"25}% + \DeclareMathSymbol{\esearrowi}{\mathrel}{tvsymbols}{"26}% + \DeclareMathSymbol{\eastarrowii}{\mathrel}{tvsymbols}{"31}% + \DeclareMathSymbol{\enearrowii}{\mathrel}{tvsymbols}{"35}% + \DeclareMathSymbol{\esearrowii}{\mathrel}{tvsymbols}{"36}% + \DeclareMathSymbol{\eastarrowiii}{\mathrel}{tvsymbols}{"3B}% + \DeclareMathSymbol{\enearrowiii}{\mathrel}{tvsymbols}{"3F}% + \DeclareMathSymbol{\esearrowiii}{\mathrel}{tvsymbols}{"40}% + \DeclareMathSymbol{\eastarrowiv}{\mathrel}{tvsymbols}{"46}% + \DeclareMathSymbol{\enearrowiv}{\mathrel}{tvsymbols}{"4A}% + \DeclareMathSymbol{\esearrowiv}{\mathrel}{tvsymbols}{"4B}% + \newcommand*{\FlecheC}{% \TV@arrowcol@stretch{\ensuremath{\enearrow}}}% - \newcommand{\FlecheD}{% + \newcommand*{\FlecheD}{% \TV@arrowcol@stretch{\ensuremath{\esearrow}}}% - \newcommand{\FlecheH}{% + \newcommand*{\FlecheH}{% \TV@arrowcol@stretch{\ensuremath{\eastarrow}}}% \fi} \newdimen\TVextraheight -- cgit v1.2.3