summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/chemfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-25 23:46:31 +0000
committerKarl Berry <karl@freefriends.org>2012-02-25 23:46:31 +0000
commit77419f835b1e89fb4ae178892165e782ffeb84bc (patch)
tree4cef0197e0aa3e8c77b19f4e23ce6c2c6508918b /Master/texmf-dist/tex/generic/chemfig
parent6a712a6992dfd3ad8562302f2bac0d28bd4a4043 (diff)
chemfig 1.0f
git-svn-id: svn://tug.org/texlive/trunk@25504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/chemfig')
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty6
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex47
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex6
3 files changed, 35 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index de4d3fa3a9f..5a4c73b27d1 100644
--- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
+++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 7fc1df916a8..ee82b136586 100644
--- a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
+++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (this file)
@@ -64,7 +64,7 @@
\else
\endgroup
\errmessage{Package chemfig Error: you are not using the eTeX engine, chemfig cannot work and is not loaded.}%
- \expandafter\endiput
+ \expandafter\endinput
\fi
\def\CF@def#1{%
@@ -74,10 +74,10 @@
\def#1%
}
-\CF@def\CF@ver {1.0e}
-\CF@def\CF@date {2012/01/13}
-\CF@def\CF@fr@date {13 janvier 2012}
-\CF@def\CF@en@date {January 13, 2012}
+\CF@def\CF@ver {1.0f}
+\CF@def\CF@date {2012/02/24}
+\CF@def\CF@fr@date {24 f\'evrier 2012}
+\CF@def\CF@en@date {February 24, 2012}
\CF@def\CF@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -184,24 +184,31 @@
}
\CF@def\CF@test@nxttok{%
- \if[\noexpand\CF@toks@a
- \expandafter\expandafter\expandafter\CF@grab@optalias\expandafter\expandafter\expandafter{\expandafter\CF@tmp@str\expandafter}%
- \else
- \CF@swap@fi
- \expandafter\endgroup
- \expandafter\CF@def@submol@i\expandafter{\CF@tmp@str}{}%
- \fi
+ \if[\noexpand\CF@toks@a\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+ {\expandafter\CF@grab@optalias\expandafter{\CF@tmp@str}}%
+ {\CF@expand@second{%
+ \endgroup
+ \begingroup
+ \CF@sanitize@catcode
+ \CF@def@submol@i
+ }\CF@tmp@str{}%
+ }%
}
\CF@def\CF@grab@optalias#1#2{%
\endgroup
\begingroup
\everyeof{\@nil}\endlinechar\m@ne
+ \CF@sanitize@catcode
\expandafter\assign@tonil\expandafter\CF@tmp@str\scantokens{#2}%
- \CF@expand@second{\endgroup\CF@def@submol@i{#1}}\CF@tmp@str
+ \CF@expand@second{%
+ \CF@sanitize@catcode
+ \CF@def@submol@i{#1}%
+ }\CF@tmp@str
}
\CF@def\CF@def@submol@i#1#2#3{% #1 nom, #2 = code si liaison arrive de droite , #3 = code si liaison arrive de gauche
+ \endgroup
\ifcat\relax\expandafter\noexpand\@car#1\@nil% si #1 est une s\'equence de contr\^ole
\expandafter\ifdefined\@car#1\@nil
\ifCF@definesubmol
@@ -377,7 +384,7 @@
\ifx>\CF@toks@a4%
\else
\ifx<\CF@toks@a5%
- \else0% si 0 --> il y a une erreur non dûe \`a l'utilisateur
+ \else0% si 0 --> il y a une erreur non due \`a l'utilisateur
\fi
\fi
\fi
@@ -2166,4 +2173,8 @@ v1.0d 2011/12/19
v1.0e 2012/01/13
- la gestion des espaces dans les groupes d'atomes est
d\'esormais plus rigoureuse. Plusieurs bugs ont \'et\'e
- corrig\'e \ No newline at end of file
+ corrig\'e
+----------------------------------------------------------------------
+v1.0f 2012/02/24
+ - correction d'un bug avec \definesubmol, les catcodes n'\'etaient
+ pas correctement g\'e\'es. \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
index 5d88ac916f5..a7b44f9dd00 100644
--- a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
+++ b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)