summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-20 23:15:51 +0000
committerKarl Berry <karl@freefriends.org>2015-11-20 23:15:51 +0000
commitd092745105741bf835e2735a9d93e8775c70d1ce (patch)
tree624672c37039d3ba9efe31456414537f86a04548
parentac00a0f196d83884f1543e50de7864b4078a3ba1 (diff)
chemfig (20nov15)
git-svn-id: svn://tug.org/texlive/trunk@38906 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/README4
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdfbin1047474 -> 1047364 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex4
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdfbin1073117 -> 1072996 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex33
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex4
8 files changed, 30 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README
index 947c6fbed9b..13c91679b25 100644
--- a/Master/texmf-dist/doc/generic/chemfig/README
+++ b/Master/texmf-dist/doc/generic/chemfig/README
@@ -2,9 +2,9 @@ ___________________________________
The
ChemFig package
- v1.2b
+ v1.2c
- 2015/11/15
+ 2015/11/20
___________________________________
Maintainer: Christian Tellechea
diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf
index f2af23a9bfc..3a96eb0088e 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex
index 6228908e78a..9894da95894 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.2b |
+% | chemfig v1.2c |
% | |
-% | 15 november 2015 |
+% | 20 november 2015 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf
index b33125e43cd..cd3b49191c5 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex
index 3d9bc250ade..76fbb7dbffa 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.2b |
+% | chemfig v1.2c |
% | |
-% | 15 novembre 2015 |
+% | 20 novembre 2015 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 6ad1fd421f6..6237bcd0055 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.2b |
+% | chemfig v1.2c |
% | |
-% | 15 november 2015 |
+% | 20 november 2015 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 12e64331fdf..69157ae4049 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.2b |
+% | chemfig v1.2c |
% | |
-% | 15 november 2015 |
+% | 20 november 2015 |
% | |
% |__________________________________________________________________|
%
@@ -65,10 +65,10 @@
\def#1%
}
-\CF@def\CF@ver {1.2b}
-\CF@def\CF@date {2015/11/15}
-\CF@def\CF@fr@date {15 novembre 2015}
-\CF@def\CF@en@date {25 november 2015}
+\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@package@name{chemfig}
\CF@def\CF@error#1{\errmessage{Package \CF@package@name\space Error: #1.}}
@@ -487,6 +487,7 @@
\pgfmathsetmacro#2{#1*\CF@angle@increment}%
\fi% puis normalise l'angle entre 0 et 360
\ifdim\ifdim#2pt<\z@-\fi#2pt>360pt \pgfmathsetmacro#2{#2-360*floor(#2/360)}\fi% si |#2|>360
+ \ifdim#2pt<\z@\pgfmathsetmacro#2{#2+360}\fi
}%
}
@@ -950,7 +951,6 @@
\def\CF@previous@bond{#1}%
}
-
\CF@def\CF@draw@axisbond@nojoin#1#2{\CF@draw@bond@a(#1@@)--(#2@@);}
\CF@def\CF@draw@axisbond@join#1#2{% dessine une liaison simple dans l'axe avec raccord r\'etrograde
@@ -1742,12 +1742,12 @@
% #7 : angle fl\`eche #8 : longueur fl\`eche #9 : style tikz de la fl\`eche
\CF@def\CF@arrow@e(#1.#2[#3]--#4.#5[#6])#7#8#9{%
\let\CF@arrow@current@style\CF@arrow@style
- \if\CF@arobas\expandafter\@car\detokenize{#1.}\@nil% "." au cas o\`u #1 est vide
+ \if\CF@arobas\expandafter\@car\detokenize{#1.}\@nil% si #1 commence par @
\if\CF@arobas\expandafter\@car\detokenize{#4.}\@nil
\CF@expadd@tocs\CF@direct@arrow@list{\expandafter\CF@direct@arrow\expandafter{\CF@current@arrowtype}{#1}{#2}{#4}{#5}{#9}}%
\let\CF@next@action\CF@schemestart@c
\else
- \CF@doifnotempty\CF@arrow@current@style{\CF@add@tocs\CF@arrow@current@style,}%
+ \CF@doifnotempty\CF@arrow@current@style{\CF@add@tocs\CF@arrow@current@style,}%
\CF@doifnotempty{#9}{\CF@add@tocs\CF@arrow@current@style{#9,}}%
\CF@display@compound{}{#3}%
\def\CF@next@nodename{#4}%
@@ -1758,7 +1758,7 @@
\def\CF@next@nodestyle{#6}%
\fi
\else
- \CF@doifnotempty\CF@arrow@current@style{\CF@add@tocs\CF@arrow@current@style,}%
+ \CF@doifnotempty\CF@arrow@current@style{\CF@add@tocs\CF@arrow@current@style,}%
\CF@doifnotempty{#9}{\CF@add@tocs\CF@arrow@current@style{#9,}}%
\if\CF@arobas\expandafter\@car\detokenize{#2.}\@nil
\errmessage{Package \CF@package@name\space Error: syntax "(<name>--@<name>)" is not allowed}%
@@ -1814,8 +1814,8 @@
\def\CF@arrow@start@node{start@direct@arrow}%
\def\CF@arrow@end@node{end@direct@arrow}%
\pgfmathanglebetweenpoints
- {\pgfpointanchor{\@gobble#2}{\CF@ifempty{#3}{center}{#3}}}
- {\pgfpointanchor{\@gobble#4}{\CF@ifempty{#5}{center}{#5}}}%
+ {\pgfpointanchor{\@gobble#2}{\ifx\@empty#3\@empty center\else#3\fi}}% Ne pas utiliser \CF@ifempty ici !!!
+ {\pgfpointanchor{\@gobble#4}{\ifx\@empty#5\@empty center\else#5\fi}}%
\let\CF@arrow@current@angle\pgfmathresult
\CF@doifnotempty{#6}{\CF@add@tocs\CF@arrow@current@style{#6,}}%
\csname\CF@grab@arrow@name#1[]\@nil\expandafter\endcsname\CF@grab@arrow@args#1[]\@nil[][][][][][][][]\@nil
@@ -2415,4 +2415,11 @@ v1.2b 2015/11/15
lecture de TeX. Un message d'erreur est \'egalement ajout\'e
en cas de "!" en fin de traitement.
- correction d'un bug dans \CF@set@bondangle o\`u l'angle [<:a>]
- n'\'etait pas \'evalu\'e par \pgfmathsetmacro. \ No newline at end of file
+ n'\'etait pas \'evalu\'e par \pgfmathsetmacro.
+----------------------------------------------------------------------
+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
diff --git a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
index d0bcf42de68..29b76e4aed8 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.2b |
+% | chemfig v1.2c |
% | |
-% | 15 november 2015 |
+% | 20 november 2015 |
% | |
% |__________________________________________________________________|
%