summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/chemfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-28 23:21:14 +0000
committerKarl Berry <karl@freefriends.org>2013-11-28 23:21:14 +0000
commit868273a311e482b0f2d4f227e52b51841c08253f (patch)
treee3b9427e2d94b2d2ff91b553e9f50dd26bacf64f /Master/texmf-dist/tex/generic/chemfig
parentd5690b37f2228a32b2465f503ced8d209a22c3f8 (diff)
chemfig (28nov13)
git-svn-id: svn://tug.org/texlive/trunk@32270 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/chemfig')
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex71
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex4
3 files changed, 50 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 951745c8014..7fa40b6993a 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.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 7cc6e0b119d..4612414d9b9 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.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2012
+% Copyright : Christian Tellechea 2010-2013
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (this file)
@@ -74,10 +74,10 @@
\def#1%
}
-\CF@def\CF@ver {1.0g}
-\CF@def\CF@date {2012/11/16}
-\CF@def\CF@fr@date {16 novembre 2012}
-\CF@def\CF@en@date {November 16, 2012}
+\CF@def\CF@ver {1.0h}
+\CF@def\CF@date {2013/11/28}
+\CF@def\CF@fr@date {28 novembre 2013}
+\CF@def\CF@en@date {November 28, 2013}
\CF@def\CF@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -128,6 +128,7 @@
\newif\ifCF@incycle
\newif\ifCF@cyclearc
\newif\ifCF@definesubmol
+\newif\ifCF@name@dp@adjust
\newdimen\CF@dim
@@ -906,7 +907,7 @@
\or% 4 = liaison Cram pleine de #2 vers #3
\CF@create@normnodes{#2@@}{#3@@}{\CF@cram@basewidth/2}{}%
\expandafter\filldraw\expandafter[\CF@current@bondstyle,line join=bevel](#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
- \or% 5 = liaison Cram pleine de #3 vers #2
+ \or% 5 = liaison Cram creuse de #3 vers #2
\CF@create@normnodes{#3@@}{#2@@}{\CF@cram@basewidth/2}{}%
\expandafter\filldraw\expandafter[\CF@current@bondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
\or% 6 = liaison Cram pointill\'ee de #2 vers #3
@@ -1393,7 +1394,8 @@
\CF@def\CF@remove@equichars#1<>#2\@nil{#1#2}
\CF@def\chemmove{%
- \@testopt\CF@chemmove{}}
+ \@testopt\CF@chemmove{}%
+}
\CF@def\CF@chemmove[#1]#2{%
\ifx\@empty#2\@empty
@@ -1409,9 +1411,9 @@
\CF@def\chemnameinit#1{%
\setbox\CF@stuff@box\hbox{#1}%
- \edef\CF@dp@max{\the\dp\CF@stuff@box}%
+ \xdef\CF@dp@max{\the\dp\CF@stuff@box}%
}
-\chemnameinit{}
+\let\CF@dp@max\z@
\CF@def\CF@parse@molname#1\\#2\@nil{%
\hbox to\CF@wd@stuffbox{\hss#1\hss}%
@@ -1423,18 +1425,24 @@
}
\CF@def\chemname{%
- \@testopt\CF@chemname{1.5ex}%
+ \@ifstar
+ {\CF@name@dp@adjustfalse\CF@chemnam@i}
+ {\CF@name@dp@adjusttrue\CF@chemnam@i}%
+}
+
+\CF@def\CF@chemnam@i{%
+ \@testopt\CF@chemname@ii{1.5ex}%
}
-\CF@def\CF@chemname[#1]#2#3{%
+\CF@def\CF@chemname@ii[#1]#2#3{%
\setbox\CF@stuff@box\hbox{#2}%
\edef\CF@wd@stuffbox{\the\wd\CF@stuff@box}\edef\CF@dp@stuffbox{\the\dp\CF@stuff@box}%
\leavevmode
- \ifdim\CF@dp@max<\CF@dp@stuffbox\let\CF@dp@max\CF@dp@stuffbox\fi
+ \ifdim\CF@dp@max<\CF@dp@stuffbox\global\let\CF@dp@max\CF@dp@stuffbox\fi
\vtop{%
\box\CF@stuff@box
\nointerlineskip
- \kern\dimexpr#1+\CF@dp@max-\CF@dp@stuffbox\relax
+ \kern\dimexpr#1\ifCF@name@dp@adjust+\CF@dp@max-\CF@dp@stuffbox\fi\relax
\CF@parse@molname#3\\\@nil
}%
}
@@ -1766,14 +1774,18 @@
% trace un fl\`eche initi\'ee par (@nom--@nom)
% #1=type de fl\`eche #2=nom depart #3=ancre d\'epart #4=nom arriv\'ee #5=ancre arriv\'ee #6=style fl\`eche
-\CF@def\CF@direct@arrow#1#2#3#4#5#6{%
+\def\CF@direct@arrow#1#2#3#4#5#6{%
+ \expandafter\def\expandafter\CF@arrow@start@name\expandafter{\@gobble#2}%
+ \expandafter\def\expandafter\CF@arrow@end@name\expandafter{\@gobble#4}%
\path[sloped,allow upside down](\@gobble#2\ifx\@empty#3\@empty\else.#3\fi)--(\@gobble#4\ifx\@empty#5\@empty\else.#5\fi)%
coordinate[pos=0,xshift=\CF@arrow@offset](start@direct@arrow)%
coordinate[pos=1,xshift=-\CF@arrow@offset](end@direct@arrow);%
\def\CF@arrow@start@node{start@direct@arrow}%
\def\CF@arrow@end@node{end@direct@arrow}%
- \expandafter\def\expandafter\CF@arrow@start@name\expandafter{\@gobble#2}%
- \expandafter\def\expandafter\CF@arrow@end@name\expandafter{\@gobble#4}%
+ \pgfmathanglebetweenpoints
+ {\pgfpointanchor{\@gobble#2}{\ifx\@empty#3\@empty center\else#3\fi}}
+ {\pgfpointanchor{\@gobble#4}{\ifx\@empty#5\@empty center\else#5\fi}}%
+ \let\CF@arrow@current@angle\pgfmathresult
\ifx\@empty#6\@empty\else\CF@add@tocs\CF@arrow@current@style{#6,}\fi%
\csname\CF@grab@arrow@name#1[]\@nil\expandafter\endcsname\CF@grab@arrow@args#1[]\@nil[][][][][][][][]\@nil
}
@@ -2021,18 +2033,18 @@
\CF@arrow@shift@nodes{#3}%
\CF@arrow@display@label{#1}{0.5}+\CF@arrow@start@node{#2}{0.5}-\CF@arrow@end@node}
-\definearrow5{-U>}{% #4=coeff du rayon de l'arc de cercle #5=1/2 angle
+\definearrow5{-U>}{%
\CF@arrow@shift@nodes{#3}%
\expandafter\draw\expandafter[\CF@arrow@current@style,-CF@full](\CF@arrow@start@node)--(\CF@arrow@end@node)node[midway](Uarrow@arctangent){};%
- \edef\CF@tmp@str{\ifx\@empty#1\@empty[draw=none]\fi}%
+ \edef\CF@tmp@str{[\ifx\@empty#1\@empty draw=none\else\unexpanded\expandafter{\CF@arrow@current@style}\fi]}%
\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
arc[radius=\CF@compound@sep*\CF@current@arrow@length*\ifx\@empty#4\@empty0.333\else#4\fi,start angle=\CF@arrow@current@angle-90,%
delta angle=-\ifx\@empty#5\@empty60\else#5\fi]node(Uarrow@start){};
- \edef\CF@tmp@str{[\ifx\@empty#2\@empty draw=none,\fi-CF@full]}%
+ \edef\CF@tmp@str{[\ifx\@empty#2\@empty draw=none\else\unexpanded\expandafter{\CF@arrow@current@style},-CF@full\fi]}%
\expandafter\draw\CF@tmp@str (Uarrow@arctangent)%
arc[radius=\CF@compound@sep*\CF@current@arrow@length*\ifx\@empty#4\@empty0.333\else#4\fi,start angle=\CF@arrow@current@angle-90,%
delta angle=\ifx\@empty#5\@empty60\else#5\fi]node(Uarrow@end){};
- \edef\CF@tmp@str{\if\string-\expandafter\@car\detokenize{#4.}\@nil-\else+\fi}%
+ \pgfmathparse{#51*#41*cos(\CF@arrow@current@angle)<0?"-":"+"}\let\CF@tmp@str\pgfmathresult
\CF@arrow@display@label{#1}{0}\CF@tmp@str{Uarrow@start}{#2}{1}\CF@tmp@str{Uarrow@end}%
}
@@ -2083,7 +2095,7 @@ v0.2 2010/08/31
l'on \'ecrit \chemfig{*5(=====)}, on obtient deux polygones
r\'eguliers concentriques.
- La s\'equence de contr\^ole \setnodestyle permet de sp\'ecifier
- le style des nœuds dessin\'es par tikz.
+ le style des noeuds dessin\'es par tikz.
----------------------------------------------------------------------
v0.3 2010/11/21
- Am\'elioration de \definesubmol qui accepte les s\'equences de
@@ -2101,7 +2113,7 @@ v0.3 2010/11/21
- Mise en place de la repr\'esentation des m\'ecanismes
r\'eactionnels avec la synatxe "@{<nom>}" devant un atome o\`u
"@{<nom>,<coeff>}" au tout d\'ebut de l'argument d'une liaison.
- Cette syntaxe permet de placer un nœud (au sens de tikz) qui
+ Cette syntaxe permet de placer un noeud (au sens de tikz) qui
deviendra l'extr\'emit\'e des fl\`eches des m\'ecanismes.
Le trac\'e des fl\`eches est faite par la macro \chemmove dont
l'argument optionnel devient celui de l'environnement
@@ -2198,4 +2210,13 @@ v1.0g 2012/11/16
- r\'e-\'ecriture des macros \chemabove et \chembemow pour
prendre en compte le bug (d\'esormais corrig\'e) dans luatex.
- nouvelle macro \setstacksep qui d\'efinit l'espacement par
- d\'efaut dans les macros \chemabove et \chembelow. \ No newline at end of file
+ d\'efaut dans les macros \chemabove et \chembelow.
+----------------------------------------------------------------------
+v1.0h 2013/11/28
+ - \chemname admet maintenant une version \'etoil\'e qui ne tient
+ pas compte des profondeurs pr\'ec\'edentes.
+ - \CF@dp@max est g\'er\'e globalement.
+ - correction d'un bug dans "-U>" : le style de la flèche n'était
+ pris en compte pour l'arc.
+ - correction d'un bug dans \CF@direct@arrow : l'angle de la
+ fl\`eche n'\'etait pas calcul\'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 9b0cee38124..bdcf9ab5ecc 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.0g |
+% | chemfig v1.0h |
% | |
-% | November 16, 2012 |
+% | November 28, 2013 |
% | |
% |__________________________________________________________________|
%