chemfig 1.0e (13jan12)

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

3 files changed, 43 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 52b1a023e03..de4d3fa3a9f 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.0d                           |
+% |                          chemfig v1.0e                           |
 % |                                                                  |
-% |                        December 19, 2011                         |
+% |                         January 13, 2012                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 3d836fb23c0..7fc1df916a8 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.0d                           |
+% |                          chemfig v1.0e                           |
 % |                                                                  |
-% |                        December 19, 2011                         |
+% |                         January 13, 2012                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %
@@ -74,10 +74,10 @@
 	\def#1%
 }
 
-\CF@def\CF@ver         {1.0d}
-\CF@def\CF@date        {2011/12/19}
-\CF@def\CF@fr@date     {19 d\'ecembre 2011}
-\CF@def\CF@en@date     {December 12, 2011}
+\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@package@name{chemfig}
 
 \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -209,10 +209,10 @@
 			\fi
 		\fi
 		\ifx\@empty#2\@empty
-			\expandafter\def\@car#1\@nil{\@empty#3}%
+			\CF@expand@second{\expandafter\def\@car#1\@nil}{\expandafter\@empty\romannumeral-`\.\noexpand#3}%
 		\else
 			\expandafter\def\@car#1\@nil{%
-				\romannumeral
+				\romannumeral-`\.% donnera le d\'eveloppement souhait\'e en 1 coup
 				\ifdim\CF@current@angle pt>90pt
 					\ifdim\CF@current@angle pt<270pt
 						\expandafter\expandafter\expandafter\@firstoftwo
@@ -222,7 +222,7 @@
 				\else
 					\expandafter\@secondoftwo
 				\fi
-				{\z@#2}{\z@#3}}%
+				{\noexpand#2}{\noexpand#3}}%
 		\fi
 	\else
 		\ifcsname CF@@#1\endcsname
@@ -231,10 +231,10 @@
 			\fi
 		\fi
 		\ifx\@empty#2\@empty
-			\expandafter\def\csname CF@@#1\endcsname{\@empty#3}% "\@empty" car tout ça sera 1-d\'evelopp\'e lorsque rencontr\'ee
+			\CF@expand@second{\expandafter\def\csname CF@@#1\endcsname}{\expandafter\@empty\romannumeral-`\.\noexpand#3}%
 		\else
 			\expandafter\def\csname CF@@#1\endcsname{%
-				\romannumeral% donnera le d\'eveloppement souhait\'e en 1 coup
+				\romannumeral-`\.% donnera le d\'eveloppement souhait\'e en 1 coup
 				\ifdim\CF@current@angle pt>90pt
 					\ifdim\CF@current@angle pt<270pt
 						\expandafter\expandafter\expandafter\@firstoftwo
@@ -244,7 +244,7 @@
 				\else
 					\expandafter\@secondoftwo
 				\fi
-				{\z@#2}{\z@#3}}%
+				{\noexpand#2}{\noexpand#3}}%
 		\fi
 	\fi
 }
@@ -335,9 +335,8 @@
 \CF@def\CF@seek@node#1#2#3{% cherche un noeud au d\'ebut de #1 l'assigne dans la sc #2 et met le reste dans #3
 	\let#2\@empty
 	\def#3{#1}%
-	\futurelet\CF@toks@a\CF@gobble@tonil#1\relax\@nil
-	\ifx\CF@toks@a\@sptoken\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
-		{\expandafter\CF@seek@node@i\expandafter{\CF@after@space#1\@nil}#2#3}% ignore l'espace qui commence un groupe d'atome
+	\CF@if@firsttokmatch{#1}{ }%
+		{\expandafter\CF@seek@node@i\expandafter{\romannumeral-`\.\noexpand#1}#2#3}% ignore les espaces au d\'ebut du groupe d'atome
 		{\CF@seek@node@i{#1}#2#3}%
 }
 
@@ -643,7 +642,7 @@
 }
 
 \CF@def\CF@chemfig@v{%
-	\let\CF@next@action\CF@chemfig@v% \`a prioi, on reboucle
+	\let\CF@next@action\CF@chemfig@v% \`a priori, on reboucle
 	\ifx\CF@remain@molecule\@empty
 		\let\CF@next@action\endgroup
 	\else
@@ -684,7 +683,8 @@
 						\let\CF@last@action\tw@
 						}%
 				\fi
-				\ifx\CF@remain@molecule\@empty% plus rien apr\`es la liaison -> ins\`ere un groupe vide
+				\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF@remain@molecule}\relax
+				% s'il ne reste plus rien apr\`es la liaison (sans tenir compte de l'espace devant)-> ins\`ere un groupe vide
 					\CF@insert@emptygroup\CF@remain@molecule
 				\fi
 				}%
@@ -930,7 +930,7 @@
 
 \CF@def\CF@draw@bond@i{\expandafter\draw\expandafter[\CF@current@bondstyle]}
 
-\CF@def\CF@hook@drawall{% dessine tous les crochets contenus dansla sc \CF@hook@draw
+\CF@def\CF@hook@drawall{% dessine tous les crochets contenus dans la sc \CF@hook@draw
 	\unless\ifx\CF@hook@drawlist\@empty
 		\expandafter\CF@hook@drawfirst\CF@hook@drawlist\@nil% trace un lien de crochet \`a crochet
 		\expandafter\CF@hook@drawall
@@ -990,9 +990,12 @@
 	\CF@remove@movearg\CF@current@atomgroup% enl\`eve les "@{<nom>}"
 	\CF@if@instr{#3}?%
 		{\CF@remove@hook\CF@current@atomgroup
-		\ifx\@empty\CF@current@atomgroup\let\CF@current@atomgroup\CF@empty@node\fi}%
+		\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF@current@atomgroup}\relax
+			\let\CF@current@atomgroup\CF@empty@node
+		\fi
+		}%
 		\relax
-	\ifx\@empty#2\@empty%
+	\ifx\@empty#2\@empty
 	\else
 		\ifnum#2<\@ne
 			\immediate\write\CF@unused{Package \CF@package@name\space Warning: no atom found at position #2, pershaps you mispelled the optional argument of the bond.}%
@@ -1198,27 +1201,21 @@
 	\expandafter\CF@hook@parselist@i\CF@hook@list\@nil
 }
 
-\CF@def\CF@remove@hook#1{% enl\`eve tous les crochets (et leurs arguments optionnels) de la sc #1
-	\expandafter\CF@if@instr\expandafter{#1}{?[}%
-		{\expandafter\expandafter\expandafter\def\expandafter\expandafter\expandafter#1%
-			\expandafter\expandafter\expandafter{\expandafter\CF@remove@opthook#1\@nil}%
-		\CF@remove@hook#1%
-		}%
-		{\CF@remove@hook@i#1}%
-}
-
-\CF@def\CF@remove@hook@i#1{%
+\CF@def\CF@remove@hook#1{%
 	\expandafter\CF@if@instr\expandafter{#1}?%
-		{\expandafter\expandafter\expandafter\def\expandafter\expandafter\expandafter#1%
-			\expandafter\expandafter\expandafter{\expandafter\CF@remove@singlehook#1\@nil}%
-		\CF@remove@hook@i#1%
-		}%
+		{\expandafter\CF@remove@hook@i\expandafter\relax#1\@nil#1%
+		\CF@remove@hook#1%
+		}
 		\relax
 }
 
-\CF@def\CF@remove@opthook#1?[#2]#3\@nil{#1#3}
+\CF@def\CF@remove@hook@i#1?#2\@nil#3{%
+	\CF@if@firsttokmatch{#2}[%
+		{\CF@remove@hook@ii#1?#2\@nil#3}
+		{\expandafter\def\expandafter#3\expandafter{\@gobble#1#2}}%
+}
 
-\CF@def\CF@remove@singlehook#1?#2\@nil{#1#2}
+\CF@def\CF@remove@hook@ii#1?[#2]#3\@nil#4{\expandafter\def\expandafter#4\expandafter{\@gobble#1#3}}
 
 \CF@def\setlewis{\@testopt\CF@setlewis{0.3ex}}
 
@@ -2164,4 +2161,9 @@ v1.0d      2011/12/19
     - les cercles des cycles \'etaient trac\'es au mauvais moment. La
       longueur de la liaison qui les pr\'ec\'edait influait sur le
       rayon du cercle : \chemfig{-[,0.5]**6(------)} donnait un bug
-      \`a l'affichage.
\ No newline at end of file
+      \`a l'affichage.
+----------------------------------------------------------------------
+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
diff --git a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
index ce387c09a30..5d88ac916f5 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.0d                           |
+% |                          chemfig v1.0e                           |
 % |                                                                  |
-% |                        December 19, 2011                         |
+% |                         January 13, 2012                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %