chemfig 0.4a (11apr11)

git-svn-id: svn://tug.org/texlive/trunk@22055 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 36 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index f9ac1c4fc36..5111fdd5966 100644
--- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
+++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
@@ -1,9 +1,9 @@
 %  __________________________________________________________________
 % |                                                                  |
 % |                                                                  |
-% |                          chemfig v0.4                            |
+% |                           chemfig v0.4a                          |
 % |                                                                  |
-% |                          March 7, 2011                           |
+% |                          April 10, 2011                          |
 % |                                                                  |
 % |__________________________________________________________________|
 %
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 870b9d1b5f0..1ac9f1c5ef3 100644
--- a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
+++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
@@ -1,9 +1,9 @@
 %  __________________________________________________________________
 % |                                                                  |
 % |                                                                  |
-% |                          chemfig v0.4                            |
+% |                           chemfig v0.4a                          |
 % |                                                                  |
-% |                          March 7, 2011                           |
+% |                          April 10, 2011                          |
 % |                                                                  |
 % |__________________________________________________________________|
 %
@@ -64,10 +64,10 @@
 	\def#1%
 }
 
-\CF@def\CF@ver         {0.4}
-\CF@def\CF@date        {2011/03/07}
-\CF@def\CF@fr@date     {7 mars 2011}
-\CF@def\CF@en@date     {March 7, 2011}
+\CF@def\CF@ver         {0.4a}
+\CF@def\CF@date        {2011/04/10}
+\CF@def\CF@fr@date     {10 avril 2011}
+\CF@def\CF@en@date     {April 10, 2011}
 \CF@def\CF@package@name{chemfig}
 
 \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -190,19 +190,19 @@
 
 \CF@def\CF@def@submol#1{%
 	\begingroup
-	\def\CF@tmp@str{#1}%
-	\catcode`[\@ne\catcode`]\tw@
-	\futurelet\CF@toks@a\CF@test@nxttok
+		\def\CF@tmp@str{#1}%
+		\catcode`[\@ne\catcode`]\tw@
+		\futurelet\CF@toks@a\CF@test@nxttok
 }
 
 \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\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
 }
 
 \CF@def\CF@grab@optalias#1#2{%
@@ -263,8 +263,8 @@
 
 \CF@def\CF@if@integer#1{%
 	\begingroup
-	\afterassignment\CF@after@integer
-	\CF@cnt@cycle0#1\relax
+		\afterassignment\CF@after@integer
+		\CF@cnt@cycle0#1\relax
 }
 
 \CF@def\CF@after@integer#1\relax{%
@@ -585,6 +585,12 @@
 		\let\CF@end@offset\@empty
 		\let\CF@bond@outcontentsaved\@empty
 		\def\CF@cycle@anglecorrection{180/\CF@cycle@num}%
+		\def\CF@default@angle{0}%
+		\def\CF@default@stringangle{:0}% angle pris par d\'efaut si le champ est vide
+		\def\CF@default@length{1}%
+		\let\CF@default@fromatom\@empty% numero de l'atome d'o\`u partent les liaisons par d\'efaut
+		\let\CF@default@toatom\@empty% num\'ero de l'atome o\`u arrivent les laisons par d\'efaut
+		\let\CF@default@tikz\@empty
 		\everyeof{\@nil}\endlinechar\m@ne
 		\CF@sanitize@catcode
 		\CF@chemfig@iii
@@ -609,15 +615,8 @@
 			\let\CF@default@angle\pgfmathresult
 		\fi
 		\let\CF@default@stringangle\@empty
-	\else
-		\def\CF@default@angle{0}%
-		\def\CF@default@stringangle{:0}% angle pris par d\'efaut si le champ est vide
 	\fi
 	\let\CF@current@angle\CF@default@angle
-	\ifCF@incycle\else\def\CF@default@length{1}\fi% longueur de la liaison par d\'efaut sauf pour un cycle o\`u on prend celle en cours
-	\let\CF@default@fromatom\@empty% numero de l'atome d'o\`u partent les liaisons par d\'efaut
-	\let\CF@default@toatom\@empty% num\'ero de l'atome o\`u arrivent les laisons par d\'efaut
-	\let\CF@default@tikz\@empty
 	\if[\expandafter\noexpand\@car#1\@nil
 		\CF@analyse@optarg#1\@nil\CF@remain@molecule
 		\expandafter\CF@set@bondangle\expandafter{\CF@current@stringangle}\CF@current@angle
@@ -709,7 +708,7 @@
 							\aftergroup\CF@chemfig@v
 							\def\CF@next@action{\expandafter\CF@chemfig@iv\expandafter{\CF@sub@mol}}%
 					\fi
-				    }%
+					}%
 					{\ifx\CF@remain@molecule\@empty
 						\let\CF@next@action\endgroup
 					\else% ce qui reste apr\`es le noeud courant n'est pas vide, ne commence pas par "-=~", ni par une parenth\`ese
@@ -757,7 +756,7 @@
 							\def\CF@next@action{\expandafter\CF@chemfig@iv\expandafter{\CF@sub@mol}}%
 						\fi
 						}%
-						{\errmessage{Package \CF@package@name\space Error: something went wrong at this point: \detokenize\expandafter{\CF@remain@molecule}^^JIf you think it's a bug, please, send a Minimal Example to the author.}}%
+						{\errmessage{Package \CF@package@name\space Error: something went wrong here: \detokenize\expandafter{\CF@remain@molecule}^^JIf you think it's a bug, please, send a Minimal Example to the author.}}%
 					\fi}%
 				}%
 		\else
@@ -1501,4 +1500,8 @@ v0.4        2011/03/07
 	  dans l'argument de \chemmove, \chemabove, \chembelow, \chemrel.
 	  TODO : faut-il \scantoker l'argument de \chemfig pour \^etre
 	  d\'efinitivement d\'ebarass\'e de ces histoires de catcode ???
-	- Correction d'un bug dans le calcul de l'angle des liaisons
\ No newline at end of file
+	- Correction d'un bug dans le calcul de l'angle des liaisons
+----------------------------------------------------------------------
+v0.4a       2011/04/10
+	- Correction d'un bug concernant l'argument optionnel en d\'ebut
+	  de mol\'ecule.
\ 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 73b20b64dd9..13de61c03db 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 v0.4                            |
+% |                           chemfig v0.4a                          |
 % |                                                                  |
-% |                          March 7, 2011                           |
+% |                          April 10, 2011                          |
 % |                                                                  |
 % |__________________________________________________________________|
 %
@@ -39,10 +39,6 @@
 %
 % The Current Maintainer of this work is Christian Tellechea
 % --------------------------------------------------------------------
-\ifdefined\tikzpicture
-\else
-	\expandafter\def\csname CF@next@action\endcsname{\usemodule[tikz]}%
-	\csname CF@next@action\expandafter\endcsname
-\fi
+\usemodule[tikz]
 \input chemfig.tex
 \endinput
\ No newline at end of file