From 38f5841b2d128e31223c2cbace56b0416b3e806f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 Nov 2012 00:44:15 +0000 Subject: chemfig (17nov12) git-svn-id: svn://tug.org/texlive/trunk@28287 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/chemfig/chemfig.sty | 4 +- Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 67 ++++++++++++++-------- .../texmf-dist/tex/generic/chemfig/t-chemfig.tex | 4 +- 3 files changed, 48 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/generic/chemfig') diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty index 5a4c73b27d1..951745c8014 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.0f | +% | chemfig v1.0g | % | | -% | February 24, 2012 | +% | November 16, 2012 | % | | % |__________________________________________________________________| % diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index ee82b136586..7cc6e0b119d 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.0f | +% | chemfig v1.0g | % | | -% | February 24, 2012 | +% | November 16, 2012 | % | | % |__________________________________________________________________| % @@ -74,10 +74,10 @@ \def#1% } -\CF@def\CF@ver {1.0f} -\CF@def\CF@date {2012/02/24} -\CF@def\CF@fr@date {24 f\'evrier 2012} -\CF@def\CF@en@date {February 24, 2012} +\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@package@name{chemfig} \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ? @@ -469,7 +469,7 @@ \pgfmathparse{\CF@previous@angle+\expandafter\@gobble\@gobble#1}% \let#2\pgfmathresult \else - \expandafter\def\expandafter#2\expandafter{\@gobble#1} + \expandafter\def\expandafter#2\expandafter{\@gobble#1}% \fi% puis normalise l'angle entre 0 et 360 \ifdim\ifdim#2pt<\z@-\fi#2pt>360pt % si |#2|>360 \pgfmathparse{#2-360*floor(#2/360)}% @@ -592,7 +592,6 @@ \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 @@ -1251,9 +1250,9 @@ \CF@def\CF@lewis@ii#1#2{\CF@lewis@iii#2\@nil{#1}} \CF@def\CF@lewis@iii#1,#2\@nil#3{% + \setbox\CF@lewis@box\hbox{\printatom{#2}}% mettre en dehors de tikzpicture (si \printatom ne passe pas en mode math) \tikzpicture[every node/.style={anchor=base,inner sep=\z@,outer sep=\z@,minimum size=\z@},baseline]% \@makeother;\@makeother:% - \setbox\CF@lewis@box\hbox{\printatom{#2}}% \node(CF@lewis@anchor){}; \def\CF@lewis@remainpos{#1}% \let\CF@lewis@previouspos\@empty @@ -1308,19 +1307,23 @@ \endtikzpicture } +\CF@def\setstacksep#1{\edef\CF@stacksep{\ifx\@empty#1\@empty1.5pt\else\the\dimexpr#1\relax\fi}} +\setstacksep{1.5pt} + \CF@def\Chembelow{\begingroup\let\CF@tmp@str\@gobble\CF@chembelow@i} \CF@def\chembelow{\begingroup\let\CF@tmp@str\@firstofone\CF@chembelow@i} -\CF@def\CF@chembelow@i{\@testopt\CF@chembelow@ii{1.5pt}} +\CF@def\CF@chembelow@i{\@testopt\CF@chembelow@ii\CF@stacksep} \CF@def\CF@chembelow@ii[#1]#2#3{% - \setbox\CF@box@boxa\hbox{\printatom{#2}}\setbox\CF@box@boxb\hbox{\printatom{#3}}% - \vtop{% + \setbox\CF@box@boxa\hbox{\printatom{#2}}% + \expandafter\vtop\CF@tmp@str{to\ht\CF@box@boxa}{% + \offinterlineskip \hbox{\printatom{#2}}% - \hrule width\z@ depth\z@ height#1 + \kern#1\relax \hbox to\wd\CF@box@boxa{\hss\printatom{#3}\hss}% - \CF@tmp@str{\hrule width\z@ depth\z@ height-\dimexpr\ht\CF@box@boxb+\dp\CF@box@boxb+#1\relax}% + \CF@tmp@str\vss }% \endgroup } @@ -1329,14 +1332,15 @@ \CF@def\chemabove{\begingroup\let\CF@tmp@str\@firstofone\CF@chemabove@i} -\CF@def\CF@chemabove@i{\@testopt\CF@chemabove@ii{1.5pt}} +\CF@def\CF@chemabove@i{\@testopt\CF@chemabove@ii\CF@stacksep} \CF@def\CF@chemabove@ii[#1]#2#3{% - \setbox\CF@box@boxa\hbox{\printatom{#2}}\setbox\CF@box@boxb\hbox{\printatom{#3}}% - \vbox{% - \CF@tmp@str{\hrule width\z@ depth\z@ height-\dimexpr\ht\CF@box@boxb+\dp\CF@box@boxb+#1\relax}% + \setbox\CF@box@boxa\hbox{\printatom{#2}}% + \expandafter\vbox\CF@tmp@str{to\ht\CF@box@boxa}{% + \offinterlineskip + \CF@tmp@str\vss \hbox to\wd\CF@box@boxa{\hss\printatom{#3}\hss}% - \hrule width\z@ depth\z@ height#1 + \kern#1\relax \hbox{\printatom{#2}}% }% \endgroup @@ -1770,7 +1774,7 @@ \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}% - \def\CF@arrow@current@style{#6}% + \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 } @@ -2156,8 +2160,9 @@ v1.0a 2011/09/18 \'electrons ---------------------------------------------------------------------- v1.0b 2011/11/29 - - la commande \merge est d\'sormais protég\'ee entre \schemestart - et \schemestop contre des d\'efinitions par d'autres packages. + - la commande \merge est d\'esormais prot\'eg\'ee entre + \schemestart et \schemestop contre des d\'efinitions par d'autres + packages. - \box\z@ est utilis\'e au lieu du maladroit \unhbox\z@ ---------------------------------------------------------------------- v1.0c 2011/11/30 @@ -2177,4 +2182,20 @@ v1.0e 2012/01/13 ---------------------------------------------------------------------- v1.0f 2012/02/24 - correction d'un bug avec \definesubmol, les catcodes n'\'etaient - pas correctement g\'e\'es. \ No newline at end of file + pas correctement g\'er\'es. +---------------------------------------------------------------------- +v1.0g 2012/11/16 + - correction d'un bug dans \CF@direct@arrow pour faire prendre en + compte le style des fl\`eche par d\'efaut + - correction d'un bug dans \CF@lewis@iii : la boite *doit* \^etre + compos\'ee en dehors de l'environnement tikzpicture pour + \'eviter nullfont si jamais \printatom ne passe pas en mode + math. + - correction d'un bug dans \CF@chemfig@iv : si une longueur par + d\'efaut est modifi\'ee par [,] au d\'ebut d'une mol\'ecule + et si des cycles \'etaient emboit\'es, cette longueur n'\'etait + pas appliqu\'ee aux sous-cycles. + - 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 diff --git a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex index a7b44f9dd00..9b0cee38124 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.0f | +% | chemfig v1.0g | % | | -% | February 24, 2012 | +% | November 16, 2012 | % | | % |__________________________________________________________________| % -- cgit v1.2.3