summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-08 21:59:11 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-05-08 21:59:11 +0000
commit7568a8a3ce78bfea1ec78e2ff6846c34b2506622 (patch)
treeec032e39bc8868863b648dfa61658ea70b81392d /Master
parent05a10c0d3c6f5066f3a73d5a1f9a18bfa3387572 (diff)
engrec v1.1 (2008/05/07)
git-svn-id: svn://tug.org/texlive/trunk@7953 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/engrec/Changements10
-rw-r--r--Master/texmf-dist/doc/latex/engrec/Changes10
-rw-r--r--Master/texmf-dist/doc/latex/engrec/LISEZMOI48
-rw-r--r--Master/texmf-dist/doc/latex/engrec/README39
-rw-r--r--Master/texmf-dist/doc/latex/engrec/engrec.pdfbin167145 -> 281508 bytes
-rw-r--r--Master/texmf-dist/source/latex/engrec/Makefile190
-rw-r--r--Master/texmf-dist/source/latex/engrec/engrec.dtx330
-rw-r--r--Master/texmf-dist/source/latex/engrec/engrec.ins45
-rw-r--r--Master/texmf-dist/tex/latex/engrec/engrec.sty148
9 files changed, 415 insertions, 405 deletions
diff --git a/Master/texmf-dist/doc/latex/engrec/Changements b/Master/texmf-dist/doc/latex/engrec/Changements
deleted file mode 100644
index 88b89db48d6..00000000000
--- a/Master/texmf-dist/doc/latex/engrec/Changements
+++ /dev/null
@@ -1,10 +0,0 @@
-Changements
-
-%%% 2004-05-22
-
-ENGREC 1 2004-05-20
-
-1re version publique.
-
---
-Yvon Henel, le TeXnicien de surface \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/engrec/Changes b/Master/texmf-dist/doc/latex/engrec/Changes
deleted file mode 100644
index 6ae99372cdb..00000000000
--- a/Master/texmf-dist/doc/latex/engrec/Changes
+++ /dev/null
@@ -1,10 +0,0 @@
-Changes
-
-%%% 2004-05-22
-
-ENGREC 1 2004-05-20
-
-1st public version.
-
---
-Yvon Henel, le TeXnicien de surface \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/engrec/LISEZMOI b/Master/texmf-dist/doc/latex/engrec/LISEZMOI
index f53e2c6dd64..48218b4278f 100644
--- a/Master/texmf-dist/doc/latex/engrec/LISEZMOI
+++ b/Master/texmf-dist/doc/latex/engrec/LISEZMOI
@@ -1,37 +1,49 @@
-% -*- coding: iso-8859-15 -*-
-%%% 2004-05-22
+% -*- coding: utf-8 -*-
+% Time-stamp: <2008-05-07T19:42:06 (cest) [yvon sur hypatie]>
-ENGREC 1 2004-05-20
+ENGREC 1.1 2008-05-07
+Édition du cinquantenaire
Ce lot comprend
-
-% le module lui-même
+------------------------------------------------------------
+% le module lui-même
engrec.sty
% documentation bilingue OnlyDescription
engrec.pdf
% pour *nix make
Makefile
% sources
-engrec.dtx
-engrec.ins
-% CTAN-ware
-engrec.xml
-engrec.tpm
+engrec.dtx engrec.ins
% partie anglaise
-README
-Changes
-% partie française
+README
+% partie française
LISEZMOI % ce fichier
-Changements
-Description :
-Deux macros \engrec et \EnGrec pour numéroter, par exemple
+------------------------------------------------------------
+ DESCRIPTION :
+
+Deux macros \engrec et \EnGrec pour numéroter, par exemple
des listes, avec des minuscules ou des majuscules grecques.
Leur syntaxe est celle de \alph.
+------------------------------------------------------------
Pour utilisateur *nix :
make help
-pour obtenir de l'aide
+pour obtenir de l’aide
+
+============================================================
+ CHANGEMENTS.
+============================================================
+ENGREC 1.1 2008-05-07
+
+Requiert amstext et non plus tout amsmath
+Utilise \ensuremath{...} au lieu de $...$
+
+------------------------------------------------------------
+
+ENGREC 1 2004-05-20
+1re version publique.
--
-Yvon Henel, le TeXnicien de surface \ No newline at end of file
+Yvon Henel, le TeXnicien de surface
+le.texnicien.de.surface@wanadoo.fr
diff --git a/Master/texmf-dist/doc/latex/engrec/README b/Master/texmf-dist/doc/latex/engrec/README
index 76e5ba23b31..c791bf99703 100644
--- a/Master/texmf-dist/doc/latex/engrec/README
+++ b/Master/texmf-dist/doc/latex/engrec/README
@@ -1,9 +1,9 @@
-%%% 2004-05-22
-
-ENGREC 1 2004-05-20
-
-This bundle should contain
-
+% Time-stamp: <2008-05-07T19:38:51 (cest) [yvon sur hypatie]>
+ENGREC 1.1 2008-05-07
+50th anniversary edition
+------------------------------------------------------------
+This bundle should contain:
+------------------------------------------------------------
% the package itself
engrec.sty
% bilingual OnlyDescription documentation
@@ -11,26 +11,33 @@ engrec.pdf
% for *nix make
Makefile
% sources
-engrec.dtx
-engrec.ins
-% CTAN-ware
-engrec.xml
-engrec.tpm
+engrec.dtx engrec.ins
% english only part
README % this file
-Changes
% french only part
LISEZMOI
-Changements
-
+------------------------------------------------------------
Description:
Two macros \engrec and \EnGrec to enumerate, for example
some lists, with lower case or upper case greek letters.
They have the syntax of \alph.
-
+------------------------------------------------------------
For *nix users:
make help
for help!
+============================================================
+ CHANGES.
+============================================================
+ENGREC 1.1 2008-05-07
+50th anniversary edition
+
+Requires package amstext instead of amsmath
+Uses \ensuremath{...} instead of $...$
+------------------------------------------------------------
+ENGREC 1 2004-05-20
+1st public version.
+
--
-Yvon Henel, le TeXnicien de surface \ No newline at end of file
+Yvon Henel, le TeXnicien de surface
+le.texnicien.de.surface@wanadoo.fr
diff --git a/Master/texmf-dist/doc/latex/engrec/engrec.pdf b/Master/texmf-dist/doc/latex/engrec/engrec.pdf
index 29e9a4ca65b..8501782cd0a 100644
--- a/Master/texmf-dist/doc/latex/engrec/engrec.pdf
+++ b/Master/texmf-dist/doc/latex/engrec/engrec.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/engrec/Makefile b/Master/texmf-dist/source/latex/engrec/Makefile
index eb1f4af3a22..ada9b1ac727 100644
--- a/Master/texmf-dist/source/latex/engrec/Makefile
+++ b/Master/texmf-dist/source/latex/engrec/Makefile
@@ -1,39 +1,43 @@
# ---------------------------------------------------------------
-# Makefile for the paresse package by Y. Henel
+# Makefile for the modroman 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
-#
-# documentation bilingue / bilingual documentation
+# hacked to obtain my modroman.xml
# ---------------------------------------------------------------
+PKGNAME = engrec
+VERSION=1-1 # Edition du cinquantenaire
-SRCDIR=engrec
-INSTALLDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/tex/latex/engrec
-DOCDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/doc/latex/engrec
-SOURCEDIR=`kpsewhich --expand-path='$$TEXMFLOCAL'`/source/latex/engrec
-VERSION=1
+TEX= \
+ $(PKGNAME).sty \
-TEX= engrec.sty \
-
-DOC= engrec.pdf \
-
-
-FRADOC= \
+DOC= \
+ $(PKGNAME).pdf \
LISEZMOI \
- Changements \
-
-ENGDOC= \
- README \
- Changes \
+ README
SOURCE= \
Makefile \
- engrec.dtx \
- engrec.ins \
-
-XML= engrec.xml \
-
-TPM= engrec.tpm
+ $(PKGNAME).dtx \
+ $(PKGNAME).ins \
+
+PRODUITS = \
+ $(PKGNAME).sty \
+ $(PKGNAME).pdf \
+
+DECHETS = \
+ $(PKGNAME).glo \
+ $(PKGNAME).gls \
+ $(PKGNAME).idx \
+ $(PKGNAME).ilg \
+ $(PKGNAME).ind \
+ $(PKGNAME).aux \
+ $(PKGNAME).log \
+ $(PKGNAME).toc
+
+REPERTS = \
+ doc \
+ tex \
+ source
# ---------------------------------------------------------------
@@ -53,121 +57,65 @@ TPM= engrec.tpm
pdflatex $<
pdflatex $<
-.dvi.ps:
- dvips -o $(*D)/$(*F).ps $(*D)/$(*F)
-
# ---------------------------------------------------------------
-sty: engrec.sty
-
-# ---------------------------------------------------------------
+all: $(PKGNAME).sty $(PKGNAME).pdf
help:
- @-echo "******************************************************"
- @-echo "* Choisir une des options :"
- @-echo "= Choose one of the options:"
- @-echo "* 'doc' -> engrec.pdf"
- @-echo "* 'sty' -> engrec.sty"
- @-echo "* 'dist'-> engrec.sty & doc"
- @-echo "* 'clean' petit nettoyage"
- @-echo "* 'distclean' (encore plus propre)"
- @-echo "* 'tar' -> engrec-VERSION.tar.gz"
- @-echo "* 'install-fra' pour l'installation"
- @-echo "* de l'extension et de la documentation."
- @-echo "************ OU / OR ***********"
- @-echo "= 'install-eng' for an installation"
- @-echo "= of the English version of package and documentation."
- @-echo "************ NOTA BENE ***********"
- @-echo "* l'installation est faite par defaut dans TEXMFLOCAL "
- @-echo "= by default installs in TEXMFLOCAL"
- @-echo "* c'est a dire :"
- @-echo "* that is : "
- @-echo `kpsewhich --expand-path='$$TEXMFLOCAL'`
- @-echo "******************************************************"
-
-dist: sty engrec.pdf
+ @-echo "************************************************************"
+ @-echo "* *"
+ @-echo "* Choisir une des options : *"
+ @-echo "* 'all' -> engrec.sty *"
+ @-echo "* 'doc' pour la documentation *"
+ @-echo "* 'doc' for the documentation *"
+ @-echo "* 'sty' -> engrec.sty *"
+ @-echo "* 'dist'-> engrec.sty & doc *"
+ @-echo "* 'clean' petit nettoyage *"
+ @-echo "* 'distclean' (encore plus propre) *"
+ @-echo "* *"
+ @-echo "************************************************************"
+
+dist: all clean
# ---------------------------------------------------------------
clean:
- @-rm -f engrec.glo engrec.gls engrec.idx engrec.ilg
- @-rm -f engrec.ind engrec.aux engrec.log engrec.toc
- @-rm -f engrec.dvi engrec.ps
+ @-rm -f $(DECHETS)
@-rm -f *~
distclean: clean
- @-rm -f engrec.sty
- @-rm -f engrec.pdf
+ @-rm -f $(PRODUITS)
# ---------------------------------------------------------------
-tar: dist clean
- echo engrec-$(VERSION).tar.gz
- -rm -f engrec-$(VERSION).tar.gz
- tar czCf .. engrec-$(VERSION).tar.gz \
- $(SRCDIR)/README \
- $(SRCDIR)/LISEZMOI \
- $(SRCDIR)/Changes \
- $(SRCDIR)/Changements \
- $(SRCDIR)/Makefile \
- $(SRCDIR)/engrec.dtx \
- $(SRCDIR)/engrec.sty \
- $(SRCDIR)/engrec.ins \
- $(SRCDIR)/engrec.pdf \
- $(SRCDIR)/engrec.xml \
- $(SRCDIR)/engrec.tpm
-
-# ---------------------------------------------------------------
-
-texlive: sty doc clean
- @-rm -rf texmf
- mkdir -p texmf/tex/latex/engrec
- mkdir -p texmf/doc/latex/engrec
- mkdir -p texmf/source/latex/engrec
- mkdir -p texmf/tpm/package
- mkdir -p texmf/doc/html/catalogue/entries
- cp $(TEX) texmf/tex/latex/engrec
- cp $(DOC) texmf/doc/latex/engrec
- cp $(ENGDOC) texmf/doc/latex/engrec
- cp $(FRADOC) texmf/doc/latex/engrec
- cp $(SOURCE) texmf/source/latex/engrec
- cp $(TPM) texmf/tpm/package
- cp $(XML) texmf/doc/html/catalogue/entries
+texlive: all clean
+ @-rm -rf $(REPERTS)
+ @-mkdir -p tex/latex/$(PKGNAME)
+ @-mkdir -p doc/latex/$(PKGNAME)
+ @-mkdir -p source/latex/$(PKGNAME)
+ @-cp $(TEX) tex/latex/$(PKGNAME)
+ @-cp $(DOC) doc/latex/$(PKGNAME)
+ @-cp $(SOURCE) source/latex/$(PKGNAME)
+ @-mkdir -p $(PKGNAME)
+ @-cp $(DOC) ./$(PKGNAME)
+ @-cp $(SOURCE) ./$(PKGNAME)
# ---------------------------------------------------------------
zip: texlive
- -@rm -f engrec-$(VERSION).zip
- zip -r engrec-$(VERSION).zip texmf
- @-rm -r texmf/
-
-# ---------------------------------------------------------------
-
-install-fra: sty doc
- if [ ! -d $(INSTALLDIR) ]; then mkdir -p $(INSTALLDIR); fi
- if [ ! -d $(DOCDIR) ]; then mkdir -p $(DOCDIR); fi
- if [ ! -d $(SOURCEDIR) ]; then mkdir -p $(SOURCEDIR); fi
- install -m644 $(TEX) $(INSTALLDIR)
- install -m644 $(DOC) $(DOCDIR)
- install -m644 $(FRADOC) $(DOCDIR)
- install -m644 $(SOURCE) $(SOURCEDIR)
- texhash
-# ---------------------------------------------------------------
+ @-rm -f $(PKGNAME).zip
+ @-zip -r $(PKGNAME) $(REPERTS)
+ @-rm -rf $(REPERTS)
+ @mv $(PKGNAME).zip $(PKGNAME).tds.zip
+ @zip -r $(PKGNAME) $(PKGNAME)
+ @zip -r $(PKGNAME) $(PKGNAME).tds.zip
+ @-rm -rf $(PKGNAME)
+ @-rm -f $(PKGNAME).tds.zip
-install-eng: sty doc
- if [ ! -d $(INSTALLDIR) ]; then mkdir -p $(INSTALLDIR); fi
- if [ ! -d $(DOCDIR) ]; then mkdir -p $(DOCDIR); fi
- if [ ! -d $(SOURCEDIR) ]; then mkdir -p $(SOURCEDIR); fi
- install -m644 $(TEX) $(INSTALLDIR)
- install -m644 $(DOC) $(DOCDIR)
- install -m644 $(ENGDOC) $(DOCDIR)
- install -m644 $(SOURCE) $(SOURCEDIR)
- texhash
# ---------------------------------------------------------------
-install: install-eng
-
-doc: sty engrec.pdf
+$(PKGNAME).sty: $(PKGNAME).ins $(PKGNAME).dtx
+doc: $(PKGNAME).ins $(PKGNAME).pdf
# ---------------------------------------------------------------
# echu e an abaden
-# Le \TeX nicien de surface 2004-05-20
+# Le \TeX nicien de surface 2008-05-04
diff --git a/Master/texmf-dist/source/latex/engrec/engrec.dtx b/Master/texmf-dist/source/latex/engrec/engrec.dtx
index 35288068139..ecaac44b0fc 100644
--- a/Master/texmf-dist/source/latex/engrec/engrec.dtx
+++ b/Master/texmf-dist/source/latex/engrec/engrec.dtx
@@ -1,8 +1,9 @@
% \iffalse meta-comment
% -*- mode: LaTeX; coding: iso-8859-15 -*-
-%
-%%%% Copyright (C) 2004 by Yvon Henel <Yvon.Henel@wanadoo.fr>
-%%%% --------------------------------------------------------
+% Time-stamp: <2008-05-07T21:09:22 (cest) [yvon sur hypatie]>
+% Copyright (C) 2004, 2008 by Yvon Henel
+% dit «le TeXnicien de surface» <le.texnicien.de.surface@wanadoo.fr>
+% ------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.2
@@ -18,8 +19,8 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\def\PackageName{engrec}
-%<package>\def\fileversion{v1}
-%<package>\def\filedate{2004/05/20}
+%<package>\def\fileversion{v1.1}
+%<package>\def\filedate{2008/05/07}
%<package>\def\fileinfo{fichier engrec.sty par Le TeXnicien de surface}
%<package>\ProvidesPackage{engrec}
%<package> [\filedate\space\fileversion\space\fileinfo]
@@ -27,7 +28,7 @@
\documentclass[a4paper]{ltxdoc}
\usepackage[latin9]{inputenc}
\usepackage[T1]{fontenc}
-\usepackage{engrec}
+\usepackage{engrec}[2008/05/07]
\usepackage{xspace,url,multicol,ifthen}
\IfFileExists{lmodern.sty}{\usepackage{lmodern}}{}
\usepackage[english,frenchb]{babel}
@@ -41,18 +42,19 @@
\makeatletter
%%% quelques redéfinition de commande de la classe ltxdoc.cls ou de
%%% l'extension doc.sty pour une documentation en français.
-\GlossaryPrologue{\section*{{Changements --
- Changes}}\markboth{{Changements -- Changes}}{{Changements -- Changes}}}
+\GlossaryPrologue{%
+ \section*{{Changements -- Changes}}%
+ \markboth{{Changements -- Changes}}{{Changements -- Changes}}}
\IndexPrologue{\section*{Index}\markboth{Index}{Index}%
\begin{Morciau}\selectlanguage{french}
Les nombres en italique renvoient à la page où l'entrée est
décrite ; les nombres soulignés renvoient à la ligne de code de la
définition ; les nombres en caractères romains renvoient à la
ligne de code où l'entrée est utilisée.\EnAnglais Numbers
- written in italic refer to the page where the corresponding
- entry is described; numbers underlined refer to the code line of
- the definition; numbers in roman refer to the code line where
- the entry is used.\end{Morciau}}
+ written in italic refer to the page where the corresponding
+ entry is described; numbers underlined refer to the code line of
+ the definition; numbers in roman refer to the code line where
+ the entry is used.\end{Morciau}}
\renewcommand{\SpecialMainEnvIndex}[1]{%
\@bsphack\special@index{%
#1\actualchar
@@ -90,7 +92,7 @@
%</driver>
% \fi
%
-% \CheckSum{330}
+% \CheckSum{444}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -110,7 +112,10 @@
%
% \GetFileInfo{engrec.sty}
%
-% \changes{v1}{2004/05/20}{1\iere version publique. 1st public version.}
+% \changes{v1}{2004/05/20}{1\iere version publique. 1st public version.}
+% \changes{v1.1}{2008/05/04}{Recquiert \texttt{amstext} au lieu de
+% \texttt{amsmath}. Demands \texttt{amstext} instead of \texttt{amsmath}.}
+% \changes{v1.1}{2008/05/04}{Utilise \cs{ensuremath}. Uses \cs{ensuremath}.}
%
% \DoNotIndex{\newcommand,\newenvironment,\i,\ae,\oe,\DeclareOption,^^A
% \alpha, \beta, \gamma, \delta, \epsilon,^^A
@@ -125,15 +130,17 @@
% \Upsilon, \ExecuteOptions, \providecommand, \newif,^^A
% \fi, \if, \or, \ifnum,\ifcase, \def, \expandafter,^^A
% \RequirePackage, \@ctrerr, \ProcessOptions,\relax,^^A
-% \text, \textup \csname, \endcsname, \value, \else, \Omega}
+% \text, \textup \csname, \endcsname, \value, \else, \Omega, \ensuremath}
%
% \title{Le module \textsf{engrec}\thanks{Ce document correspond au
-% fichier \textsf{engrec}~\fileversion, du \filedate.}\\
-% The package \textsf{engrec}\thanks{This document corresponds to the
-% file \textsf{engrec}~\fileversion, dated \filedate.}}
+% fichier \textsf{engrec}~\fileversion, du \filedate. Édition
+% du cinquantenaire.}\\
+% The package \textsf{engrec}\thanks{Corresponds to the
+% file \textsf{engrec}~\fileversion, dated \filedate. 50th
+% anniversary edition.}}
%
-% \author{Le \TeX nicien de
-% surface\thanks{\texttt{Yvon.Henel@wanadoo.fr}}}
+% \author{Le \TeX nicien de surface\thanks{%
+% \texttt{le.texnicien.de.surface@wanadoo.fr}}}
%
% \maketitle
%
@@ -206,32 +213,33 @@
% \texttt{sigma}, \texttt{varphi}, \texttt{sloped}, \texttt{slgreek}.
% \end{Morciau}
% \begin{Morciau}[Module~chargé/Loaded~Package]
-% Ce module nécessite \NomDeModule{amsmath} dont il utilise la
+% Ce module nécessite \NomDeModule{amstext} dont il utilise la
% commande \cs{text} pour définir les macros comme \cs{Alpha} qui sont
% les \og noms \fg des majuscules grecques qui n'en ont pas
% d'habitude car leur forme est semblable à celle d'une lettre
% latine : {\ttfamily Alpha, Beta, Epsilon, Zeta, Eta, Iota,
-% Mu, Nu, Omicron, Rho, Tau, Chi}. \cs{Alpha} est égale à
-% \cs{text\{A\}}, elle peut être employée en mode mathématique et
-% donne \text{A}.
+% Mu, Nu, Omicron, Rho, Tau, Chi}. Par exemple \cs{Alpha} est égale à
% \EnAnglais
-% This package requires \NomDeModule{amsmath} for it uses \cs{text}
+% This package requires \NomDeModule{amstext} for it uses \cs{text}
% defined there to create macros such as \cs{Alpha} which are the
% `names' of the upper case greek letters which have usually no names
% since their shape is similar to the shape of a latin character,
% viz.: {\ttfamily Alpha, Beta, Epsilon, Zeta, Eta, Iota, Mu, Nu,
-% Omicron, Rho, Tau, Chi}. \cs{Alpha} is equal to \cs{text\{A\}} and
-% so may be used in mathematical mode to give \text{A}.
+% Omicron, Rho, Tau, Chi}. \cs{Alpha}, e. g., is equal to
% \end{Morciau}
+% \hspace*{\stretch{1}}\cs{text}|{|\cs{rmfamily}\cs{upshape}| A}|\hspace*{\stretch{1}}
% \begin{Morciau}[omicron/]
-% Il définit également la minuscule \texttt{omicron}. La macro
-% \cs{omicron} est définie comme o et apparaît comme $\omicron$. Il en donne
-% une version toujours droite avec \cs{upomicron} : $\upomicron$.
+% Il définit également la minuscule \texttt{omicron}.
+% \cs{omicron} est définie comme ci-dessous et
+% apparaît comme $\omicron$. Il en donne une version toujours droite avec
+% \cs{upomicron} : \upomicron.
% \EnAnglais
% The lower case \texttt{omicron} is also provided by \cs{omicron} and
-% defined as o which is printed $\omicron$. There is also an always upright
-% version with \cs{upomicron}: $\upomicron$.
+% defined as shown below which is printed
+% $\omicron$. There is also an always upright version with
+% \cs{upomicron}:~\upomicron.
% \end{Morciau}
+% \hspace*{\stretch{1}}\cs{text}|{|\cs{rmfamily}\cs{itshape}| o}|\hspace*{\stretch{1}}
% \begin{Morciau}[Le code/The Code]
% Le code des macros \cs{engrec}, \cs{EnGrec} et des macros
% auxiliaires associées |\@grec| et |\@Grec| est repris quasi verbatim
@@ -246,54 +254,25 @@
% \begin{Morciau}[Exemple/Example]
% On crée un compteur, on l'initialise à 1, on en fait écrire la valeur par
% \cs{engrec} puis on l'augmente de 1 et on fait écrire sa valeur par
-% \cs{engrec} 23 fois. Puis la même chose avec \cs{EnGrec}.
+% \cs{engrec} 24 fois grace à \cs{whiledo} de \texttt{ifthen}. Puis la même
+% chose avec \cs{EnGrec}.
% \EnAnglais
% We create a counter, initialise it to 1, make \cs{engrec} write its value then
-% we add 1 and write its value with \cs{engrec} 23 times. Then the same with
-% \cs{EnGrec}.
+% we add 1 and write its value with \cs{engrec} 24 times with the help of
+% \cs{whiledo} from \texttt{ifthen}. Then the same with \cs{EnGrec}.
% \end{Morciau}
% \bgroup \setlength{\parindent}{0pt}
-% |\newcounter{montruc} \setcounter{montruc}{1} \engrec{montruc}|\\
-% |\stepcounter{montruc} \engrec{montruc}| \(\times 23\)
+% |\newcounter{montruc} \setcounter{montruc}{1}|\\
+% |\whiledo{\value{montruc}<25}{\engrec{montruc} \stepcounter{montruc}}|
%
-% \newcounter{montruc} \setcounter{montruc}{1} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc} \stepcounter{montruc} \engrec{montruc}
-% \stepcounter{montruc} \engrec{montruc} \stepcounter{montruc}
-% \engrec{montruc}
-%
-% |\setcounter{montruc}{1} \EnGrec{montruc}|\\
-% |\stepcounter{montruc} \EnGrec{montruc}| \(\times 23\)
+% \newcounter{montruc} \setcounter{montruc}{1}
+% \whiledo{\value{montruc}<25}{\engrec{montruc} \stepcounter{montruc}}
%
-% \setcounter{montruc}{1} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc} \stepcounter{montruc} \EnGrec{montruc}
-% \stepcounter{montruc} \EnGrec{montruc} \stepcounter{montruc}
-% \EnGrec{montruc}
+% |\newcounter{montruc} \setcounter{montruc}{1}|\\
+% |\whiledo{\value{montruc}<25}{\EnGrec{montruc} \stepcounter{montruc}}|
+%
+% \setcounter{montruc}{1}
+% \whiledo{\value{montruc}<25}{\EnGrec{montruc} \stepcounter{montruc}}
% \egroup
%^^A
% \StopEventually{}
@@ -311,8 +290,8 @@
\newif\if@varrho
\newif\if@varsigma
\newif\if@varphi
-\newif\if@upomicron % utiliser \upomicron ou bien \omicron ?
-\newif\if@upgreek % toutes les minuscules grecques debout !
+\newif\if@upomicron
+\newif\if@upgreek
% \end{macrocode}
% On définit les options. Chacune fixe à \texttt{true} ou
% \texttt{false} le booléen correspondant.
@@ -339,122 +318,155 @@
\ExecuteOptions{varepsilon,theta,pi,rho,sigma,varphi,sloped,slgreek}
\ProcessOptions\relax
% \end{macrocode}
-% On charge le module \NomDeModule{amsmath}.
+% On charge le module \NomDeModule{amstext} qui fournit la macro \cs{text}.
% \begin{macrocode}
-\RequirePackage{amsmath}
+\RequirePackage{amstext}
% \end{macrocode}
% On charge le module \NomDeModule{upgreek} si l'option \texttt{upgreek} a été
% choisie.
% \begin{macrocode}
\if@upgreek \RequirePackage{upgreek}\fi
% \end{macrocode}
+%
+% \begin{macro}{\Alpha}
% On définit les macros \og manquantes \fg de telle sorte que chaque
% lettre grecque ait sa macro. On utilise \cs{providecommand} au cas
-% où un module se chargerait de les définir.
-% \begin{macrocode}
-\providecommand{\Alpha}{\text{A}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Beta}{\text{B}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Epsilon}{\text{E}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Zeta}{\text{Z}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Eta}{\text{H}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Iota}{\text{I}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Kappa}{\text{K}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Mu}{\text{M}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Nu}{\text{N}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Omicron}{\text{O}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Rho}{\text{P}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Tau}{\text{T}}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\Chi}{\text{X}}
-% \end{macrocode}
+% où un module se chargerait de les définir. On fixe la famille romaine et la
+% forme droite avec \cs{rmfamily} et \cs{upshape}.
+% \changes{v1.1}{2008/05/07}{Fixe la forme romain droit. Fix roman upshape.}
+%
% \begin{macrocode}
-\providecommand{\omicron}{o}
-% \end{macrocode}
-% \begin{macrocode}
-\providecommand{\upomicron}{\textup{o}}
+\providecommand{\Alpha}{\text{\rmfamily\upshape A}}
+\providecommand{\Beta}{\text{\rmfamily\upshape B}}
+\providecommand{\Epsilon}{\text{\rmfamily\upshape E}}
+\providecommand{\Zeta}{\text{\rmfamily\upshape Z}}
+\providecommand{\Eta}{\text{\rmfamily\upshape H}}
+\providecommand{\Iota}{\text{\rmfamily\upshape I}}
+\providecommand{\Kappa}{\text{\rmfamily\upshape K}}
+\providecommand{\Mu}{\text{\rmfamily\upshape M}}
+\providecommand{\Nu}{\text{\rmfamily\upshape N}}
+\providecommand{\Omicron}{\text{\rmfamily\upshape O}}
+\providecommand{\Rho}{\text{\rmfamily\upshape P}}
+\providecommand{\Tau}{\text{\rmfamily\upshape T}}
+\providecommand{\Chi}{\text{\rmfamily\upshape X}}
+\providecommand{\omicron}{\text{\rmfamily\itshape o}}
+\providecommand{\upomicron}{\text{\rmfamily\upshape o}}
% \end{macrocode}
-% \DescribeMacro{\engrec} Le code est copié sur celui de \cs{alph}
-% dans \texttt{latex.ltx}.
+% \end{macro}
+% \begin{macro}{\engrec}
+% Le code est copié sur celui de \cs{alph} dans \texttt{latex.ltx}.
% \begin{macrocode}
\def\engrec#1{\expandafter\@grec\csname c@#1\endcsname}
% \end{macrocode}
-% \DescribeMacro{\@grec} Le code est copié sur celui de |\@alph| dans
-% \texttt{latex.ltx} avec les interventions des options.
+% \end{macro}
+% \begin{macro}{\@grec}
+% Le code est copié sur celui de |\@alph| dans \texttt{latex.ltx} avec les
+% interventions des options. On utilise \cs{ensuremath} au lieu de |$ $| pour
+% permettre l'utilisation au milieu des mathématiques.
% \begin{macrocode}
\if@upgreek
\def\@grec#1{%
- \ifcase#1\or $\upalpha$\or $\upbeta$\or $\upgamma$\or $\updelta$\or
- \if@varepsilon $\upvarepsilon$\else $\upepsilon$\fi \or $\upzeta$\or
- $\upeta$\or \if@vartheta $\upvartheta$\else $\uptheta$\fi \or
- $\upiota$\or $\upkappa$\or $\uplambda$\or $\upmu$\or $\upnu$\or
- $\upxi$\or $\upomicron$\or \if@varpi $\upvarpi$\else $\uppi$\fi \or
- \if@varrho $\upvarrho$\else $\uprho$\fi \or
- \if@varsigma $\upvarsigma$\else $\upsigma$\fi \or
- $\uptau$\or $\upupsilon$\or \if@varphi $\upvarphi$\else $\upphi$\fi
- \or $\upchi$\or $\uppsi$\or $\upomega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\upalpha}\or
+ \ensuremath{\upbeta}\or
+ \ensuremath{\upgamma}\or
+ \ensuremath{\updelta}\or
+ \if@varepsilon \ensuremath{\upvarepsilon}\else \ensuremath{\upepsilon}\fi \or
+ \ensuremath{\upzeta}\or
+ \ensuremath{\upeta}\or
+ \if@vartheta \ensuremath{\upvartheta}\else \ensuremath{\uptheta}\fi \or
+ \ensuremath{\upiota}\or
+ \ensuremath{\upkappa}\or
+ \ensuremath{\uplambda}\or
+ \ensuremath{\upmu}\or
+ \ensuremath{\upnu}\or
+ \ensuremath{\upxi}\or
+ \ensuremath{\upomicron}\or
+ \if@varpi \ensuremath{\upvarpi}\else \ensuremath{\uppi}\fi \or
+ \if@varrho \ensuremath{\upvarrho}\else \ensuremath{\uprho}\fi \or
+ \if@varsigma \ensuremath{\upvarsigma}\else \ensuremath{\upsigma}\fi \or
+ \ensuremath{\uptau}\or
+ \ensuremath{\upupsilon}\or
+ \if@varphi \ensuremath{\upvarphi}\else \ensuremath{\upphi}\fi \or
+ \ensuremath{\upchi}\or
+ \ensuremath{\uppsi}\or
+ \ensuremath{\upomega}\else
+ \@ctrerr\fi}%
\else
\def\@grec#1{%
- \ifcase#1\or $\alpha$\or $\beta$\or $\gamma$\or $\delta$\or
- \if@varepsilon $\varepsilon$\else $\epsilon$\fi \or $\zeta$\or
- $\eta$\or \if@vartheta $\vartheta$\else $\theta$\fi \or
- $\iota$\or $\kappa$\or $\lambda$\or $\mu$\or $\nu$\or $\xi$\or
- \if@upomicron $\upomicron$\else $\omicron$\fi\or
- \if@varpi $\varpi$\else $\pi$\fi \or
- \if@varrho $\varrho$\else $\rho$\fi \or
- \if@varsigma $\varsigma$\else $\sigma$\fi \or
- $\tau$\or $\upsilon$\or \if@varphi $\varphi$\else $\phi$\fi \or
- $\chi$\or $\psi$\or $\omega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\alpha}\or
+ \ensuremath{\beta}\or
+ \ensuremath{\gamma}\or
+ \ensuremath{\delta}\or
+ \if@varepsilon \ensuremath{\varepsilon}\else \ensuremath{\epsilon}\fi \or
+ \ensuremath{\zeta}\or
+ \ensuremath{\eta}\or
+ \if@vartheta \ensuremath{\vartheta}\else \ensuremath{\theta}\fi \or
+ \ensuremath{\iota}\or
+ \ensuremath{\kappa}\or
+ \ensuremath{\lambda}\or
+ \ensuremath{\mu}\or
+ \ensuremath{\nu}\or
+ \ensuremath{\xi}\or
+ \if@upomicron \ensuremath{\upomicron}\else \ensuremath{\omicron}\fi\or
+ \if@varpi \ensuremath{\varpi}\else \ensuremath{\pi}\fi \or
+ \if@varrho \ensuremath{\varrho}\else \ensuremath{\rho}\fi \or
+ \if@varsigma \ensuremath{\varsigma}\else \ensuremath{\sigma}\fi \or
+ \ensuremath{\tau}\or
+ \ensuremath{\upsilon}\or
+ \if@varphi \ensuremath{\varphi}\else \ensuremath{\phi}\fi \or
+ \ensuremath{\chi}\or
+ \ensuremath{\psi}\or
+ \ensuremath{\omega}\else
+ \@ctrerr\fi}
\fi
% \end{macrocode}
-% \DescribeMacro{\EnGrec} Le code est encore copié sur celui de
-% \cs{alph} dans \texttt{latex.ltx}.
+% \end{macro}
+% \begin{macro}{\EnGrec}
+% Le code est encore copié sur celui de \cs{alph} dans \texttt{latex.ltx}.
% \begin{macrocode}
\def\EnGrec#1{\expandafter\@Grec\csname c@#1\endcsname}
% \end{macrocode}
-% \DescribeMacro{\@Grec} C'est encore pareil. Ici, pas de variante
-% pour les majuscules.
+% \end{macro}
+% \begin{macro}{\@Grec}
+% C'est encore pareil. Ici, pas de variante pour les majuscules.
% \begin{macrocode}
\def\@Grec#1{%
- \ifcase#1\or $\Alpha$\or $\Beta$\or $\Gamma$\or $\Delta$\or
- $\Epsilon$\or $\Zeta$\or $\Eta$\or $\Theta$\or $\Iota$\or
- $\Kappa$\or $\Lambda$\or $\Mu$\or $\Nu$\or $\Xi$\or
- $\Omicron$\or $\Pi$\or $\Rho$\or $\Sigma$\or $\Tau$\or $\Upsilon$\or
- $\Phi$\or $\Chi$\or $\Psi$\or $\Omega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\Alpha}\or
+ \ensuremath{\Beta}\or
+ \ensuremath{\Gamma}\or
+ \ensuremath{\Delta}\or
+ \ensuremath{\Epsilon}\or
+ \ensuremath{\Zeta}\or
+ \ensuremath{\Eta}\or
+ \ensuremath{\Theta}\or
+ \ensuremath{\Iota}\or
+ \ensuremath{\Kappa}\or
+ \ensuremath{\Lambda}\or
+ \ensuremath{\Mu}\or
+ \ensuremath{\Nu}\or
+ \ensuremath{\Xi}\or
+ \ensuremath{\Omicron}\or
+ \ensuremath{\Pi}\or
+ \ensuremath{\Rho}\or
+ \ensuremath{\Sigma}\or
+ \ensuremath{\Tau}\or
+ \ensuremath{\Upsilon}\or
+ \ensuremath{\Phi}\or
+ \ensuremath{\Chi}\or
+ \ensuremath{\Psi}\or
+ \ensuremath{\Omega}\else
+ \@ctrerr\fi}
% \end{macrocode}
+% \end{macro}
% \iffalse
%</package>
% \fi
% \Finale \PrintChanges\PrintIndex
\endinput
-
%%% Local Variables:
%%% mode: latex
%%% TeX-master: t
%%% End:
-
-
-% \ifthenelse{\equal\string{#2}\string{}}{\let\EngTitre =
-% \TitreMorciau{#1}}{% \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/engrec/engrec.ins b/Master/texmf-dist/source/latex/engrec/engrec.ins
index 13233f3f851..5aeaf890e69 100644
--- a/Master/texmf-dist/source/latex/engrec/engrec.ins
+++ b/Master/texmf-dist/source/latex/engrec/engrec.ins
@@ -1,7 +1,7 @@
%%% 2004-05-22
%%
-%% Copyright (C) 2004 by Yvon Henel Le TeXnicien de surface
-%% <Yvon.Henel@wanadoo.fr>
+%% Copyright (C) 2004, 2008 by Yvon Henel
+%% dit «le TeXnicien de surface» <le.texnicien.de.surface@wanadoo.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -18,8 +18,8 @@
\preamble
This is a generated file.
-Copyright (C) 2004 Y. Henel, le TeXnicien de surface
-<Yvon.Henel@wanadoo.fr>
+Copyright (C) 2004, 2008 by Yvon Henel
+dit «le TeXnicien de surface» <le.texnicien.de.surface@wanadoo.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.2 of this license
@@ -34,23 +34,22 @@ and version 1.2 or later is part of all distributions of LaTeX version
\askforoverwritefalse
\generate{\file{engrec.sty}{\from{engrec.dtx}{package}}}
-\Msg{****************************************************************}
-\Msg{*}
-\Msg{* Pour finir l'installation vous devez placer}
-\Msg{* le fichier suivant dans un répertoire parcouru par TeX.}
-\Msg{*}
-\Msg{* \space\space engrec.sty}
-\Msg{*}
-\Msg{* Pour produire la documentation faire : }
-\Msg{* pdflatex engrec.dtx}
-\Msg{* makeindex -s gind engrec }
-\Msg{* makeindex -s gglo -o engrec.gls engrec.glo}
-\Msg{* pdflatex engrec.dtx}
-\Msg{*}
-\Msg{* puis placez engrec.pdf dans un répertoire de documentation}
-\Msg{* comme par exemple texmf-local/doc/latex/engrec}
-\Msg{*}
-\Msg{********************* TeXez dans la joie ! *********************}
-\Msg{****************************************************************}
-
+\obeyspaces
+\Msg{**********************************************************************}
+\Msg{* Pour finir l'installation vous devez placer *}
+\Msg{* le fichier suivant dans un dossier parcouru par TeX. *}
+\Msg{* *}
+\Msg{* engrec.sty *}
+\Msg{* *}
+\Msg{* Pour produire la documentation faire : *}
+\Msg{* pdflatex engrec.dtx *}
+\Msg{* makeindex -s gind engrec *}
+\Msg{* makeindex -s gglo -o engrec.gls engrec.glo *}
+\Msg{* pdflatex engrec.dtx *}
+\Msg{* *}
+\Msg{* puis placez engrec.pdf dans un dossier de documentation *}
+\Msg{* comme par exemple texmf-local/doc/latex/engrec *}
+\Msg{* *}
+\Msg{* TeXez dans la joie ! *}
+\Msg{**********************************************************************}
\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/engrec/engrec.sty b/Master/texmf-dist/tex/latex/engrec/engrec.sty
index 1e751c7d182..e51707d21d0 100644
--- a/Master/texmf-dist/tex/latex/engrec/engrec.sty
+++ b/Master/texmf-dist/tex/latex/engrec/engrec.sty
@@ -7,8 +7,8 @@
%% engrec.dtx (with options: `package')
%% This is a generated file.
%%
-%% Copyright (C) 2004 Y. Henel, le TeXnicien de surface
-%% <Yvon.Henel@wanadoo.fr>
+%% Copyright (C) 2004, 2008 by Yvon Henel
+%% dit «le TeXnicien de surface» <le.texnicien.de.surface@wanadoo.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -19,12 +19,10 @@
%%
%% and version 1.2 or later is part of all distributions of LaTeX version
%% 1999/12/01 or later.
-%%%% Copyright (C) 2004 by Yvon Henel <Yvon.Henel@wanadoo.fr>
-%%%% --------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\def\PackageName{engrec}
-\def\fileversion{v1}
-\def\filedate{2004/05/20}
+\def\fileversion{v1.1}
+\def\filedate{2008/05/07}
\def\fileinfo{fichier engrec.sty par Le TeXnicien de surface}
\ProvidesPackage{engrec}
[\filedate\space\fileversion\space\fileinfo]
@@ -34,8 +32,8 @@
\newif\if@varrho
\newif\if@varsigma
\newif\if@varphi
-\newif\if@upomicron % utiliser \upomicron ou bien \omicron ?
-\newif\if@upgreek % toutes les minuscules grecques debout !
+\newif\if@upomicron
+\newif\if@upgreek
\DeclareOption{upright}{\@upomicrontrue}
\DeclareOption{sloped}{\@upomicronfalse}
\DeclareOption{upgreek}{\@upgreektrue}
@@ -54,55 +52,109 @@
\DeclareOption{phi}{\@varphifalse}
\ExecuteOptions{varepsilon,theta,pi,rho,sigma,varphi,sloped,slgreek}
\ProcessOptions\relax
-\RequirePackage{amsmath}
+\RequirePackage{amstext}
\if@upgreek \RequirePackage{upgreek}\fi
-\providecommand{\Alpha}{\text{A}}
-\providecommand{\Beta}{\text{B}}
-\providecommand{\Epsilon}{\text{E}}
-\providecommand{\Zeta}{\text{Z}}
-\providecommand{\Eta}{\text{H}}
-\providecommand{\Iota}{\text{I}}
-\providecommand{\Kappa}{\text{K}}
-\providecommand{\Mu}{\text{M}}
-\providecommand{\Nu}{\text{N}}
-\providecommand{\Omicron}{\text{O}}
-\providecommand{\Rho}{\text{P}}
-\providecommand{\Tau}{\text{T}}
-\providecommand{\Chi}{\text{X}}
-\providecommand{\omicron}{o}
-\providecommand{\upomicron}{\textup{o}}
+\providecommand{\Alpha}{\text{\rmfamily\upshape A}}
+\providecommand{\Beta}{\text{\rmfamily\upshape B}}
+\providecommand{\Epsilon}{\text{\rmfamily\upshape E}}
+\providecommand{\Zeta}{\text{\rmfamily\upshape Z}}
+\providecommand{\Eta}{\text{\rmfamily\upshape H}}
+\providecommand{\Iota}{\text{\rmfamily\upshape I}}
+\providecommand{\Kappa}{\text{\rmfamily\upshape K}}
+\providecommand{\Mu}{\text{\rmfamily\upshape M}}
+\providecommand{\Nu}{\text{\rmfamily\upshape N}}
+\providecommand{\Omicron}{\text{\rmfamily\upshape O}}
+\providecommand{\Rho}{\text{\rmfamily\upshape P}}
+\providecommand{\Tau}{\text{\rmfamily\upshape T}}
+\providecommand{\Chi}{\text{\rmfamily\upshape X}}
+\providecommand{\omicron}{\text{\rmfamily\itshape o}}
+\providecommand{\upomicron}{\text{\rmfamily\upshape o}}
\def\engrec#1{\expandafter\@grec\csname c@#1\endcsname}
\if@upgreek
\def\@grec#1{%
- \ifcase#1\or $\upalpha$\or $\upbeta$\or $\upgamma$\or $\updelta$\or
- \if@varepsilon $\upvarepsilon$\else $\upepsilon$\fi \or $\upzeta$\or
- $\upeta$\or \if@vartheta $\upvartheta$\else $\uptheta$\fi \or
- $\upiota$\or $\upkappa$\or $\uplambda$\or $\upmu$\or $\upnu$\or
- $\upxi$\or $\upomicron$\or \if@varpi $\upvarpi$\else $\uppi$\fi \or
- \if@varrho $\upvarrho$\else $\uprho$\fi \or
- \if@varsigma $\upvarsigma$\else $\upsigma$\fi \or
- $\uptau$\or $\upupsilon$\or \if@varphi $\upvarphi$\else $\upphi$\fi
- \or $\upchi$\or $\uppsi$\or $\upomega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\upalpha}\or
+ \ensuremath{\upbeta}\or
+ \ensuremath{\upgamma}\or
+ \ensuremath{\updelta}\or
+ \if@varepsilon \ensuremath{\upvarepsilon}\else \ensuremath{\upepsilon}\fi \or
+ \ensuremath{\upzeta}\or
+ \ensuremath{\upeta}\or
+ \if@vartheta \ensuremath{\upvartheta}\else \ensuremath{\uptheta}\fi \or
+ \ensuremath{\upiota}\or
+ \ensuremath{\upkappa}\or
+ \ensuremath{\uplambda}\or
+ \ensuremath{\upmu}\or
+ \ensuremath{\upnu}\or
+ \ensuremath{\upxi}\or
+ \ensuremath{\upomicron}\or
+ \if@varpi \ensuremath{\upvarpi}\else \ensuremath{\uppi}\fi \or
+ \if@varrho \ensuremath{\upvarrho}\else \ensuremath{\uprho}\fi \or
+ \if@varsigma \ensuremath{\upvarsigma}\else \ensuremath{\upsigma}\fi \or
+ \ensuremath{\uptau}\or
+ \ensuremath{\upupsilon}\or
+ \if@varphi \ensuremath{\upvarphi}\else \ensuremath{\upphi}\fi \or
+ \ensuremath{\upchi}\or
+ \ensuremath{\uppsi}\or
+ \ensuremath{\upomega}\else
+ \@ctrerr\fi}%
\else
\def\@grec#1{%
- \ifcase#1\or $\alpha$\or $\beta$\or $\gamma$\or $\delta$\or
- \if@varepsilon $\varepsilon$\else $\epsilon$\fi \or $\zeta$\or
- $\eta$\or \if@vartheta $\vartheta$\else $\theta$\fi \or
- $\iota$\or $\kappa$\or $\lambda$\or $\mu$\or $\nu$\or $\xi$\or
- \if@upomicron $\upomicron$\else $\omicron$\fi\or
- \if@varpi $\varpi$\else $\pi$\fi \or
- \if@varrho $\varrho$\else $\rho$\fi \or
- \if@varsigma $\varsigma$\else $\sigma$\fi \or
- $\tau$\or $\upsilon$\or \if@varphi $\varphi$\else $\phi$\fi \or
- $\chi$\or $\psi$\or $\omega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\alpha}\or
+ \ensuremath{\beta}\or
+ \ensuremath{\gamma}\or
+ \ensuremath{\delta}\or
+ \if@varepsilon \ensuremath{\varepsilon}\else \ensuremath{\epsilon}\fi \or
+ \ensuremath{\zeta}\or
+ \ensuremath{\eta}\or
+ \if@vartheta \ensuremath{\vartheta}\else \ensuremath{\theta}\fi \or
+ \ensuremath{\iota}\or
+ \ensuremath{\kappa}\or
+ \ensuremath{\lambda}\or
+ \ensuremath{\mu}\or
+ \ensuremath{\nu}\or
+ \ensuremath{\xi}\or
+ \if@upomicron \ensuremath{\upomicron}\else \ensuremath{\omicron}\fi\or
+ \if@varpi \ensuremath{\varpi}\else \ensuremath{\pi}\fi \or
+ \if@varrho \ensuremath{\varrho}\else \ensuremath{\rho}\fi \or
+ \if@varsigma \ensuremath{\varsigma}\else \ensuremath{\sigma}\fi \or
+ \ensuremath{\tau}\or
+ \ensuremath{\upsilon}\or
+ \if@varphi \ensuremath{\varphi}\else \ensuremath{\phi}\fi \or
+ \ensuremath{\chi}\or
+ \ensuremath{\psi}\or
+ \ensuremath{\omega}\else
+ \@ctrerr\fi}
\fi
\def\EnGrec#1{\expandafter\@Grec\csname c@#1\endcsname}
\def\@Grec#1{%
- \ifcase#1\or $\Alpha$\or $\Beta$\or $\Gamma$\or $\Delta$\or
- $\Epsilon$\or $\Zeta$\or $\Eta$\or $\Theta$\or $\Iota$\or
- $\Kappa$\or $\Lambda$\or $\Mu$\or $\Nu$\or $\Xi$\or
- $\Omicron$\or $\Pi$\or $\Rho$\or $\Sigma$\or $\Tau$\or $\Upsilon$\or
- $\Phi$\or $\Chi$\or $\Psi$\or $\Omega$\else\@ctrerr\fi}
+ \ifcase#1\or
+ \ensuremath{\Alpha}\or
+ \ensuremath{\Beta}\or
+ \ensuremath{\Gamma}\or
+ \ensuremath{\Delta}\or
+ \ensuremath{\Epsilon}\or
+ \ensuremath{\Zeta}\or
+ \ensuremath{\Eta}\or
+ \ensuremath{\Theta}\or
+ \ensuremath{\Iota}\or
+ \ensuremath{\Kappa}\or
+ \ensuremath{\Lambda}\or
+ \ensuremath{\Mu}\or
+ \ensuremath{\Nu}\or
+ \ensuremath{\Xi}\or
+ \ensuremath{\Omicron}\or
+ \ensuremath{\Pi}\or
+ \ensuremath{\Rho}\or
+ \ensuremath{\Sigma}\or
+ \ensuremath{\Tau}\or
+ \ensuremath{\Upsilon}\or
+ \ensuremath{\Phi}\or
+ \ensuremath{\Chi}\or
+ \ensuremath{\Psi}\or
+ \ensuremath{\Omega}\else
+ \@ctrerr\fi}
\endinput
%%
%% End of file `engrec.sty'.