From 29ac634381f6a33480ef3663d3208d6c3f38d6b9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 16 Feb 2013 22:42:39 +0000 Subject: paresse (16feb13) git-svn-id: svn://tug.org/texlive/trunk@29137 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/paresse/paresse-en.pdf | Bin 477348 -> 477661 bytes .../texmf-dist/doc/latex/paresse/paresse-ex-en.pdf | Bin 93880 -> 93880 bytes .../texmf-dist/doc/latex/paresse/paresse-ex-fr.pdf | Bin 93596 -> 93596 bytes Master/texmf-dist/doc/latex/paresse/paresse-fr.pdf | Bin 503261 -> 503633 bytes Master/texmf-dist/doc/latex/paresse/paresse.pdf | Bin 487605 -> 489776 bytes Master/texmf-dist/source/latex/paresse/LISEZMOI | 4 +-- Master/texmf-dist/source/latex/paresse/Makefile | 6 ++-- Master/texmf-dist/source/latex/paresse/README | 4 +-- .../source/latex/paresse/paresse-TEST.zip | Bin 6242 -> 6251 bytes .../source/latex/paresse/paresse-doc.dtx | 16 ++++++---- Master/texmf-dist/source/latex/paresse/paresse.dtx | 34 ++++++++++++--------- Master/texmf-dist/source/latex/paresse/paresse.ins | 4 +-- Master/texmf-dist/tex/latex/paresse/paresse.sty | 8 ++--- Master/texmf-dist/tex/latex/paresse/paresseold.sto | 2 +- .../texmf-dist/tex/latex/paresse/paresseutf8.sto | 2 +- 15 files changed, 45 insertions(+), 35 deletions(-) diff --git a/Master/texmf-dist/doc/latex/paresse/paresse-en.pdf b/Master/texmf-dist/doc/latex/paresse/paresse-en.pdf index a4ad53a3f50..707e4cf90b9 100644 Binary files a/Master/texmf-dist/doc/latex/paresse/paresse-en.pdf and b/Master/texmf-dist/doc/latex/paresse/paresse-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/paresse/paresse-ex-en.pdf b/Master/texmf-dist/doc/latex/paresse/paresse-ex-en.pdf index 531b71732d2..01364d627ed 100644 Binary files a/Master/texmf-dist/doc/latex/paresse/paresse-ex-en.pdf and b/Master/texmf-dist/doc/latex/paresse/paresse-ex-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/paresse/paresse-ex-fr.pdf b/Master/texmf-dist/doc/latex/paresse/paresse-ex-fr.pdf index 727fe9ae40f..e0af60738eb 100644 Binary files a/Master/texmf-dist/doc/latex/paresse/paresse-ex-fr.pdf and b/Master/texmf-dist/doc/latex/paresse/paresse-ex-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/paresse/paresse-fr.pdf b/Master/texmf-dist/doc/latex/paresse/paresse-fr.pdf index 7a3b8f8f3e9..b2444884bd7 100644 Binary files a/Master/texmf-dist/doc/latex/paresse/paresse-fr.pdf and b/Master/texmf-dist/doc/latex/paresse/paresse-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/paresse/paresse.pdf b/Master/texmf-dist/doc/latex/paresse/paresse.pdf index 2fd62029191..fd9863db904 100644 Binary files a/Master/texmf-dist/doc/latex/paresse/paresse.pdf and b/Master/texmf-dist/doc/latex/paresse/paresse.pdf differ diff --git a/Master/texmf-dist/source/latex/paresse/LISEZMOI b/Master/texmf-dist/source/latex/paresse/LISEZMOI index a9a101f7cd3..178de1082a5 100755 --- a/Master/texmf-dist/source/latex/paresse/LISEZMOI +++ b/Master/texmf-dist/source/latex/paresse/LISEZMOI @@ -1,9 +1,9 @@ % -*- coding: utf-8 -*- -% Time-stamp: <2011-04-19 18:02:56 yvon> +% Time-stamp: <2013-02-16 10:25:05 novatux> ====================================================================== -PARESSE version 4 2011/04/19 +PARESSE version 4.1 2013/02/16 ====================================================================== diff --git a/Master/texmf-dist/source/latex/paresse/Makefile b/Master/texmf-dist/source/latex/paresse/Makefile index 6c05bf23a5f..c36bb56210f 100755 --- a/Master/texmf-dist/source/latex/paresse/Makefile +++ b/Master/texmf-dist/source/latex/paresse/Makefile @@ -1,12 +1,12 @@ # --------------------------------------------------------------- -# Time-stamp: <2011-04-19 16:58:31 yvon> +# Time-stamp: <2013-02-16 10:51:17 novatux> # Makefile for the paresse package by Y. Henel # modified version of the Makefile of the kerntest package # many thanks to Harald Harders whose kerntest.xml I have also # hacked to obtain my paresse.xml # --------------------------------------------------------------- PKGNAME=paresse -VERSION=4 +VERSION=4.1 TESTSRCUTIL= \ ex-com-utf8-tame.tex \ @@ -198,6 +198,6 @@ $(TEXDOC): $(PKGNAME).ins $(PKGNAME).dtx $(PKGNAME)-doc.dtx $(PDFDOC): $(TEXDOC) # --------------------------------------------------------------- # echu e an abaden -# Le \TeX nicien de surface 2011/04/17 +# Le \TeX nicien de surface 2011/04/17, 2013/02/16 diff --git a/Master/texmf-dist/source/latex/paresse/README b/Master/texmf-dist/source/latex/paresse/README index 1b196663346..d26dabd8924 100755 --- a/Master/texmf-dist/source/latex/paresse/README +++ b/Master/texmf-dist/source/latex/paresse/README @@ -1,8 +1,8 @@ -% Time-stamp: <2011-04-19 18:03:42 yvon> +% Time-stamp: <2013-02-16 10:28:53 novatux> ====================================================================== -PARESSE version 4 2011/04/19 +PARESSE version 4.1 2013/02/16 ====================================================================== diff --git a/Master/texmf-dist/source/latex/paresse/paresse-TEST.zip b/Master/texmf-dist/source/latex/paresse/paresse-TEST.zip index c6a0d0608d8..8944a7f180f 100644 Binary files a/Master/texmf-dist/source/latex/paresse/paresse-TEST.zip and b/Master/texmf-dist/source/latex/paresse/paresse-TEST.zip differ diff --git a/Master/texmf-dist/source/latex/paresse/paresse-doc.dtx b/Master/texmf-dist/source/latex/paresse/paresse-doc.dtx index 37c313f2d4a..5bb05124199 100644 --- a/Master/texmf-dist/source/latex/paresse/paresse-doc.dtx +++ b/Master/texmf-dist/source/latex/paresse/paresse-doc.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment %-*- coding: iso-8859-15 -*- -% Time-stamp: <2011-04-20 16:48:37 yvon> +% Time-stamp: <2013-02-16 10:40:24 novatux> % -------------------------------------------------------------------- % -% Copyright (C) 2011 +% Copyright (C) 2011, 2013 % by Yvon Henel alias le TeXnicien de surface % % @@ -68,9 +68,13 @@ \newcommand\BOP{\discretionary{}{}{}} \newcommand\Option[1]{\textsc{#1}} \newcommand\Pkg[1]{\textsf{#1}} -\newcommand\NOUVO{% - \marginpar{\hspace*{\stretch{1}}% - \textbf{N (v4)}\hspace*{.5em}}\xspace} +\newcommand\NOUVO[1][1]{% + \ifthenelse + {\equal{#1}{5}} + {\marginpar{\hspace*{\stretch{1}}% + \textbf{N (v5)}\hspace*{.5em}}}% + {}} + \EnableCrossrefs \CodelineIndex @@ -288,7 +292,7 @@ With a mail Claudio \textsc{Beccari} kindly informed me that there was an encoding of the greek alphabet with latin letters some 15~years before I commited this extension. This encoding was devised by Sylvio \textsc{Levi} who, at the time, was designing the first greek font for -\TeX, using the correspondance between greek and us keyboard. Claudio +\TeX, using the correspondance between greek and US keyboard. Claudio wrote to me, and I can't but agree with him, that if one is used to \textsc{Levi}'s encoding, one would rather keep one's habit in order to use \Pkg{paresse}. diff --git a/Master/texmf-dist/source/latex/paresse/paresse.dtx b/Master/texmf-dist/source/latex/paresse/paresse.dtx index 79c32d7f3dd..7b413fdbcb3 100644 --- a/Master/texmf-dist/source/latex/paresse/paresse.dtx +++ b/Master/texmf-dist/source/latex/paresse/paresse.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment %-*- coding: iso-8859-15 -*- -% Time-stamp: <2011-04-20 16:47:35 yvon> +% Time-stamp: <2013-02-16 10:32:18 novatux> % -------------------------------------------------------------------- % -% Copyright (C) 2011 +% Copyright (C) 2011, 2013 % by Yvon Henel alias le TeXnicien de surface % % @@ -23,8 +23,8 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<*common> -\def\fileversion{v4} -\def\filedate{2011/04/19} +\def\fileversion{v4.1} +\def\filedate{2013/02/16} \def\fileinfo{fichier paresse par le TeXnicien de surface} % %<*package> @@ -48,9 +48,12 @@ \newcommand\BOP{\discretionary{}{}{}} \newcommand\Option[1]{\textsc{#1}} \newcommand\Pkg[1]{\textsf{#1}} -\newcommand\NOUVO{% - \marginpar{\hspace*{\stretch{1}}% - \textbf{N (v4)}\hspace*{.5em}}\xspace} +\newcommand\NOUVO[1][1]{% + \ifthenelse + {\equal{#1}{4.1}} + {\marginpar{\hspace*{\stretch{1}}% + \textbf{N (v4.1)}\hspace*{.5em}}}% + {}} % commentez la ligne suivante pour avoir un document avec le code % \OnlyDescription @@ -97,6 +100,7 @@ % \changes{v3}{2010/03/19}{Option for Sylvio \textsc{Levi}'s encoding} % \changes{v4}{2011/04/16}{Documentation of the code in English} % \changes{v4}{2011/04/16}{paresse goes utf8} +% \changes{v4.1}{2013/02/16}{Using skeyval-bc instead of (moving forward) skeyval} % % \GetFileInfo{paresse.sty} % @@ -192,20 +196,22 @@ % % \subsection{The sty file} % -% From this 4th version, I use \Pkg{skeyval} for it provides -% toggle-keys. \Pkg{skeyval} loads \Pkg{xkeyval} the macros of -% which I use to manage options. +% From the 4th version, I have used \Pkg{skeyval} for it provides +% toggle-keys. But times are a-changing and so is \Pkg{skeyval}. +% From this version 4.1, I use \Pkg{skeyval-bc} which retains the old +% ways of \Pkg{skeyval}. \Pkg{skeyval-bc} loads \Pkg{xkeyval} the +% macros of which I use to manage options. % % \Pkg{ifluatex} and \Pkg{ifxetex} are required to take care of % \hologo{LuaLaTeX} and \hologo{XeLaTeX} respectively. % % \begin{macrocode} -\RequirePackage{skeyval} +\RequirePackage{skeyval-bc} \RequirePackage{ifluatex} \RequirePackage{ifxetex} % \end{macrocode} % -% With \cmd{\define@bitogkeys}, from \Pkg{skeyval}, I define nine +% With \cmd{\define@bitogkeys}, from \Pkg{skeyval-bc}, I define nine % pairs of complementary toggle keys. If one of the pair is set to % \texttt{true}, the other will be automatically set to \texttt{false} % and vice-versa. @@ -244,7 +250,7 @@ % The prefix of the \emph{secret} macros of this package is % |GA@|. Here I define the macros which will print the correct % character according to the chosen options. \cs{iftogon} is provided -% by \Pkg{skeyval}. +% by \Pkg{skeyval-bc}. % \begin{macrocode} \iftogon{GA@varepsilon}{% \def\GA@epsilon{\varepsilon}}{\def\GA@epsilon{\epsilon}} @@ -370,7 +376,7 @@ % % This is almost the content of the version~3 of % \texttt{paresse.sty}. The changes are the use of toggles provided by -% \Pkg{skeyval} and the appearance of \PSVerb{Z} to obtain \S --- +% \Pkg{skeyval-bc} and the appearance of \PSVerb{Z} to obtain \S --- % which is always available through \cs{S}\footnote{So could I speak % of \PSVerb{Z} in terms of ``shortcut''?}. % diff --git a/Master/texmf-dist/source/latex/paresse/paresse.ins b/Master/texmf-dist/source/latex/paresse/paresse.ins index 685a5fdcaa7..f5079fc407d 100644 --- a/Master/texmf-dist/source/latex/paresse/paresse.ins +++ b/Master/texmf-dist/source/latex/paresse/paresse.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2011 +%% Copyright (C) 2011, 2013 %% by Yvon Henel alias Le TeXnicien de surface %% %% @@ -18,7 +18,7 @@ \preamble This is a generated file. -Copyright (C) 2011 +Copyright (C) 2011, 2013 by Yvon Henel, alias le TeXnicien de surface diff --git a/Master/texmf-dist/tex/latex/paresse/paresse.sty b/Master/texmf-dist/tex/latex/paresse/paresse.sty index e3242423c4b..82e02574f6d 100644 --- a/Master/texmf-dist/tex/latex/paresse/paresse.sty +++ b/Master/texmf-dist/tex/latex/paresse/paresse.sty @@ -7,7 +7,7 @@ %% paresse.dtx (with options: `common,package') %% This is a generated file. %% -%% Copyright (C) 2011 +%% Copyright (C) 2011, 2013 %% by Yvon Henel, alias le TeXnicien de surface %% %% @@ -21,12 +21,12 @@ %% and version 1.2 or later is part of all distributions of LaTeX %% version 1999/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\fileversion{v4} -\def\filedate{2011/04/19} +\def\fileversion{v4.1} +\def\filedate{2013/02/16} \def\fileinfo{fichier paresse par le TeXnicien de surface} \ProvidesPackage{paresse} [\filedate\space\fileversion\space\fileinfo] -\RequirePackage{skeyval} +\RequirePackage{skeyval-bc} \RequirePackage{ifluatex} \RequirePackage{ifxetex} \define@bitogkeys[GA]{paresse.sty}[GA@]{legacy}[true]{levi}{}{} diff --git a/Master/texmf-dist/tex/latex/paresse/paresseold.sto b/Master/texmf-dist/tex/latex/paresse/paresseold.sto index c7f7ab1727b..be2832354f9 100644 --- a/Master/texmf-dist/tex/latex/paresse/paresseold.sto +++ b/Master/texmf-dist/tex/latex/paresse/paresseold.sto @@ -7,7 +7,7 @@ %% paresse.dtx (with options: `oldpack') %% This is a generated file. %% -%% Copyright (C) 2011 +%% Copyright (C) 2011, 2013 %% by Yvon Henel, alias le TeXnicien de surface %% %% diff --git a/Master/texmf-dist/tex/latex/paresse/paresseutf8.sto b/Master/texmf-dist/tex/latex/paresse/paresseutf8.sto index 7464644e6eb..0f232d83c47 100644 --- a/Master/texmf-dist/tex/latex/paresse/paresseutf8.sto +++ b/Master/texmf-dist/tex/latex/paresse/paresseutf8.sto @@ -7,7 +7,7 @@ %% paresse.dtx (with options: `utf8pack') %% This is a generated file. %% -%% Copyright (C) 2011 +%% Copyright (C) 2011, 2013 %% by Yvon Henel, alias le TeXnicien de surface %% %% -- cgit v1.2.3