summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/README4
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdfbin1284232 -> 1273339 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex6
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdfbin1305634 -> 1295450 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex6
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex51
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex4
8 files changed, 41 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README
index 50546b63386..be86da32a20 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.0c
+ v1.0d
- 2011/11/30
+ 2011/12/19
___________________________________
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 531e3af7472..0326da8184f 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 f58929ab29b..7f19c727a63 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex
@@ -3,7 +3,7 @@
% | |
% | ChemFig Documentation |
% | |
-% | November 30, 2011 |
+% | December 19, 2011 |
% | |
% |__________________________________________________________________|
%
@@ -95,11 +95,11 @@
\fi
}
-\newcommand\make@car@active[2]{%
+\newcommand\make@car@active[1]{%
\catcode`#1\active
\begingroup
\lccode`\~`#1\relax
- \lowercase{\endgroup\def~{#2}}%
+ \lowercase{\endgroup\def~}%
}
\newif\if@exstar
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 e8a169aaddb..78029fe3638 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 ef6f151435a..95d2dc219f0 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex
@@ -3,7 +3,7 @@
% | |
% | Documentation de ChemFig |
% | |
-% | 30 novembre 2011 |
+% | 19 decembre 2011 |
% | |
% |__________________________________________________________________|
%
@@ -95,11 +95,11 @@
\fi
}
-\newcommand\make@car@active[2]{%
+\newcommand\make@car@active[1]{%
\catcode`#1\active
\begingroup
\lccode`\~`#1\relax
- \lowercase{\endgroup\def~{#2}}%
+ \lowercase{\endgroup\def~}%
}
\newif\if@exstar
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index b323185a1df..52b1a023e03 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.0c |
+% | chemfig v1.0d |
% | |
-% | November 30, 2011 |
+% | December 19, 2011 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index dd35a276863..3d836fb23c0 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.0c |
+% | chemfig v1.0d |
% | |
-% | November 30, 2011 |
+% | December 19, 2011 |
% | |
% |__________________________________________________________________|
%
@@ -74,10 +74,10 @@
\def#1%
}
-\CF@def\CF@ver {1.0b}
-\CF@def\CF@date {2011/11/30}
-\CF@def\CF@fr@date {30 novembre 2011}
-\CF@def\CF@en@date {November 30, 2011}
+\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@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -586,6 +586,7 @@
\ifnum\CF@last@action=\thr@@
\ifCF@incycle
\def\CF@default@angle{0}%
+ \def\CF@default@length{1}%
\else
\ifnum\CF@cnt@cycle=\z@% si c'est le d\'ebut d'un cycle
\pgfmathparse{\CF@previous@angle+180+\CF@cycle@anglecorrection}% on met la liaison \`a +180° + correction
@@ -611,16 +612,26 @@
\unless\ifx\@empty\CF@current@tikz\let\CF@default@tikz\CF@current@tikz\fi
\CF@seek@submol
\fi
- \ifCF@incycle% si on commence un cycle
- \let\CF@current@angle\CF@previous@angle
- \else
- \let\CF@current@angle\CF@default@angle
- \fi
\edef\CF@default@stringangle{:\CF@default@angle}%
\let\CF@current@length\CF@default@length
\let\CF@current@fromatom\CF@default@fromatom
\let\CF@current@toatom\CF@default@toatom
\let\CF@current@tikz\CF@default@tikz
+ \ifCF@incycle% si on commence un cycle
+ \let\CF@current@angle\CF@previous@angle
+ \ifCF@cyclearc% on doit tracer l'arc de cercle dans le cycle ?
+ \pgfmathparse{\CF@cycle@inraduiscoeff*\CF@current@length*\CF@atom@sep/(2*tan(180/\CF@cycle@num))}%
+ \let\CF@cyclearc@radius\pgfmathresult
+ \pgfmathparse{\CF@current@angle+\CF@initcycle@angle+180/\CF@cycle@num+90}
+ \let\CF@cyclearc@initangle\pgfmathresult
+ \pgfmathparse{\CF@current@length*\CF@atom@sep/(2*sin(180/\CF@cycle@num))}%
+ \node[at=(\CF@bond@outnode),shift=(\CF@cyclearc@initangle:\pgfmathresult pt)](arccenter){};% le centre de l'arc
+ \node[at=(arccenter),shift=(\CF@cyclearc@startangle:\CF@cyclearc@radius pt)](initarc){};% le d\'ebut de l'arc
+ \expandafter\draw\expandafter[\CF@cyclearc@directtikz](initarc) arc (\CF@cyclearc@startangle:\CF@cyclearc@endangle:\CF@cyclearc@radius pt);
+ \fi
+ \else
+ \let\CF@current@angle\CF@default@angle
+ \fi
\ifnum\CF@last@action=\z@
\let\CF@previous@angle\CF@default@angle
\node(CF@node){};
@@ -723,16 +734,6 @@
\pgfmathparse{-180/\CF@cycle@num-90+\CF@cycle@anglecorrection}%
\fi
\let\CF@initcycle@angle\pgfmathresult
- \ifCF@cyclearc% on doit tracer l'arc de cercle dans le cycle ?
- \pgfmathparse{\CF@cycle@inraduiscoeff*\CF@current@length*\CF@atom@sep/(2*tan(180/\CF@cycle@num))}%
- \let\CF@cyclearc@radius\pgfmathresult
- \pgfmathparse{\CF@current@angle+\CF@initcycle@angle+180/\CF@cycle@num+90}
- \let\CF@cyclearc@initangle\pgfmathresult
- \pgfmathparse{\CF@current@length*\CF@atom@sep/(2*sin(180/\CF@cycle@num))}%
- \node[at=(\CF@bond@outnode),shift=(\CF@cyclearc@initangle:\pgfmathresult pt)](arccenter){};% le centre de l'arc
- \node[at=(arccenter),shift=(\CF@cyclearc@startangle:\CF@cyclearc@radius pt)](initarc){};% le d\'ebut de l'arc
- \expandafter\draw\expandafter[\CF@cyclearc@directtikz](initarc) arc (\CF@cyclearc@startangle:\CF@cyclearc@endangle:\CF@cyclearc@radius pt);
- \fi
\aftergroup\CF@chemfig@v
\def\CF@next@action{\expandafter\CF@chemfig@iv\expandafter{\CF@sub@mol}}%
\fi
@@ -2157,4 +2158,10 @@ v1.0b 2011/11/29
----------------------------------------------------------------------
v1.0c 2011/11/30
- la macro \+ n'est plus explicitement \'ecrite
- - v\'erifie que eTeX est le moteur utilis\'e \ No newline at end of file
+ - v\'erifie que eTeX est le moteur utilis\'e
+----------------------------------------------------------------------
+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
diff --git a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex
index ba9f2033656..ce387c09a30 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.0c |
+% | chemfig v1.0d |
% | |
-% | November 30, 2011 |
+% | December 19, 2011 |
% | |
% |__________________________________________________________________|
%