chemfig (1dec15)

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

3 files changed, 30 insertions, 18 deletions

diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 6237bcd0055..f4f5b3b2b4e 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.2c                          |
+% |                           chemfig v1.2d                          |
 % |                                                                  |
-% |                         20 november 2015                         |
+% |                          1 december 2015                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 69157ae4049..675cc865bab 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.2c                          |
+% |                           chemfig v1.2d                          |
 % |                                                                  |
-% |                         20 november 2015                         |
+% |                          1 december 2015                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %
@@ -65,10 +65,10 @@
 	\def#1%
 }
 
-\CF@def\CF@ver         {1.2c}
-\CF@def\CF@date        {2015/11/20}
-\CF@def\CF@fr@date     {20 novembre 2015}
-\CF@def\CF@en@date     {20 november 2015}
+\CF@def\CF@ver         {1.2d}
+\CF@def\CF@date        {2015/12/01}
+\CF@def\CF@fr@date     {1 d\'ecembre 2015}
+\CF@def\CF@en@date     {1 december 2015}
 \CF@def\CF@package@name{chemfig}
 
 \CF@def\CF@error#1{\errmessage{Package \CF@package@name\space Error: #1.}}
@@ -265,8 +265,14 @@
 
 \CF@def\CF@cycle@inraduiscoeff{0.75}% coeff multiplicateur du rayon des arcs dans les cycles
 
-\CF@def\setcrambond#1#2#3{%
-	\def\CF@cram@basewidth{#1}%
+\CF@def\CF@donoclip#1;{}
+\CF@def\setcrambond{%
+	\@ifstar
+		{\let\CF@clipcramornot\CF@donoclip\CF@setcrambond}
+		{\def\CF@clipcramornot{\clip}\CF@setcrambond}%
+}
+\CF@def\CF@setcrambond#1#2#3{%
+	\CF@ifempty{#1}{\def\CF@cram@basewidth{1.5ex}}{\def\CF@cram@basewidth{#1}}%
 	\CF@ifempty{#2}{\def\CF@cram@dashlength{1pt}}{\def\CF@cram@dashlength{#2}}%
 	\CF@ifempty{#3}{\def\CF@cram@dashsep{2pt}}{\def\CF@cram@dashsep{#3}}%
 }
@@ -922,14 +928,14 @@
 	\or% 6 = liaison Cram pointill\'ee de #2 vers #3
 		\scope
 			\CF@create@normnodes{#2@@}{#3@@}{\CF@cram@basewidth/2}{}%
-			\clip(#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
+			\CF@clipcramornot(#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
 			\expandafter\draw\expandafter[\CF@current@bondstyle,dash pattern=on \CF@cram@dashlength off \CF@cram@dashsep,line width=\CF@cram@basewidth](#2@@)--(#3@@);
 		\endscope
 		\let\CF@joinbond\z@
 	\or% 7 = liaison Cram pointill\'ee de #3 vers #2
 		\scope
 			\CF@create@normnodes{#3@@}{#2@@}{\CF@cram@basewidth/2}{}%
-			\clip(#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
+			\CF@clipcramornot(#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
 			\expandafter\draw\expandafter[\CF@current@bondstyle,dash pattern=on \CF@cram@dashlength off \CF@cram@dashsep,line width=\CF@cram@basewidth](#3@@)--(#2@@);
 		\endscope
 		\let\CF@joinbond\z@
@@ -2077,10 +2083,10 @@
 	\CF@ifempty{#5}%
 		{\def\CF@Uarrow@absangle{60}}
 		{\pgfmathsetmacro\CF@Uarrow@absangle{abs(#5)}}% ne prendre en compte que la valeur absolue de l'angle
-		\edef\CF@tmp@str{[\CF@ifempty{#1}{draw=none}{\unexpanded\expandafter{\CF@arrow@current@style}}]}%
+	\edef\CF@tmp@str{[\CF@ifempty{#1}{draw=none}{\unexpanded\expandafter{\CF@arrow@current@style}},-]}%
 	\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
 		arc[radius=\CF@compound@sep*\CF@current@arrow@length*\CF@Uarrow@radius,start angle=\CF@arrow@current@angle-90,delta angle=-\CF@Uarrow@absangle]node(Uarrow@start){};
-		\edef\CF@tmp@str{[\CF@ifempty{#2}{draw=none}{\unexpanded\expandafter{\CF@arrow@current@style}}]}%
+	\edef\CF@tmp@str{[\CF@ifempty{#2}{draw=none}{\unexpanded\expandafter{\CF@arrow@current@style}}]}%
 	\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
 		arc[radius=\CF@compound@sep*\CF@current@arrow@length*\CF@Uarrow@radius,start angle=\CF@arrow@current@angle-90,delta angle=\CF@Uarrow@absangle]node(Uarrow@end){};
 	\pgfmathsetmacro\CF@tmp@str{\CF@Uarrow@radius*cos(\CF@arrow@current@angle)<0?"-":"+"}%
@@ -2421,5 +2427,11 @@ v1.2c      2015/11/20
     - Correction d'un bug dans \CF@set@bondangle : l'angle renvoy\'e
       pouvait \^etre n\'egatif
     - Correction d'un bug dans \CF@direct@arrow : la macro \CF@ifempty
-      n'est pas correctement développée dans l'argument de
-      \pgfpointanchor
\ No newline at end of file
+      n'est pas correctement d\'evelopp\'ee dans l'argument de
+      \pgfpointanchor
+----------------------------------------------------------------------
+v1.2d      2015/12/01
+    - correction d'un bug dans la fl\`eche "-U"
+    - la version \'etoil\'ee de \setcrambond dessine les liaisons de
+      Cram en pointill\'es sous forme de trait large et non pas sous
+      forme de triangle.
\ 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 29b76e4aed8..dc5d2d78238 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.2c                          |
+% |                           chemfig v1.2d                          |
 % |                                                                  |
-% |                         20 november 2015                         |
+% |                          1 december 2015                         |
 % |                                                                  |
 % |__________________________________________________________________|
 %