diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/chemfig.sty | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex | 4 |
3 files changed, 21 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty index cb79c8bf454..525b0bc5092 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty @@ -1,13 +1,13 @@ % __________________________________________________________________ % | | % | | -% | chemfig v1.0a | +% | chemfig v1.0b | % | | -% | September 18, 2011 | +% | November 29, 2011 | % | | % |__________________________________________________________________| % -% This is chemfig.sty, the package file for LaTeX. +% This is t-chemfig.tex, the package file for conTeXt. % % Maintainer: Christian Tellechea % E-mail : unbonpetit@gmail.com diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index c04f6155137..5ace4abbf47 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.0a | +% | chemfig v1.0b | % | | -% | September 18, 2011 | +% | November 29, 2011 | % | | % |__________________________________________________________________| % @@ -62,10 +62,10 @@ \def#1% } -\CF@def\CF@ver {1.0a} -\CF@def\CF@date {2011/09/18} -\CF@def\CF@fr@date {18 septembre 2011} -\CF@def\CF@en@date {September 18, 2011} +\CF@def\CF@ver {1.0b} +\CF@def\CF@date {2011/11/29} +\CF@def\CF@fr@date {29 novembre 2011} +\CF@def\CF@en@date {November 29, 2011} \CF@def\CF@package@name{chemfig} \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ? @@ -1472,7 +1472,7 @@ \setbox\z@\hbox{$\vcenter{\hbox{}}$}\edef\CF@delim@math@ht{\the\ht\z@}% \setbox\z@\hbox{#2}\edef\CF@delim@dim{\the\dimexpr(\ht\z@+\dp\z@)/\tw@}% \edef\CF@delim@shift{\the\dimexpr(\ht\z@-\dp\z@)/\tw@-\CF@delim@math@ht}% - \raise\CF@delim@shift\hbox{$\left#1\vrule height\CF@delim@dim depth\CF@delim@dim width\z@\right.$}\unhbox\z@ + \raise\CF@delim@shift\hbox{$\left#1\vrule height\CF@delim@dim depth\CF@delim@dim width\z@\right.$}\box\z@ \raise\CF@delim@shift\hbox{$\left.\vrule height\CF@delim@dim depth\CF@delim@dim width\z@\right#3$}% \endgroup } @@ -1485,7 +1485,7 @@ \begingroup \setbox\z@\hbox{\printatom{#2}}\edef\CF@delim@dim{\the\dimexpr\wd\z@/\tw@}% \tikzpicture[every node/.style={inner sep=\z@,outer sep=\z@,minimum size=\z@},baseline]% - \node[anchor=base west](chem@stuff){\unhbox\z@};% + \node[anchor=base west](chem@stuff){\box\z@};% \node[at=(chem@stuff.north),anchor=east,rotate=-90]{$\left#1\vrule height\CF@delim@dim depth\CF@delim@dim width\z@\right.$};% \node[at=(chem@stuff.south),anchor=west,rotate=-90]{$\left.\vrule height\CF@delim@dim depth\CF@delim@dim width\z@\right#3$};% \endtikzpicture @@ -1542,6 +1542,7 @@ \else \tikzpicture[every node/.style={anchor=base,inner sep=\z@,outer sep=\z@,minimum size=\z@},baseline,remember picture]% \fi + \let\merge\CF@merge \let\+\CF@and \let\arrow\CF@arrow \let\schemestop\CF@schemestop @@ -1766,7 +1767,7 @@ \def\CF@merge@labelup{#2}\def\CF@merge@labeldo{#3}% } -\CF@def\merge#1({% +\CF@def\CF@merge#1({% \CF@merge@grab@chardir#1[][]\@nil \CF@merge@i(} @@ -2134,4 +2135,9 @@ v1.0 2011/06/15 ---------------------------------------------------------------------- v1.0a 2011/09/18 - les macros \Lewis et \lewis admettent un argument optionnel - - la macro \setlewisdist r\`egle la distance entre les 2 \'electrons
\ No newline at end of file + - la macro \setlewisdist r\`egle la distance entre les 2 \'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. + - \box\z@ est utilis\'e au lieu du maladroit \unhbox\z@
\ 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 623d72a1df0..e01465023b7 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.0a | +% | chemfig v1.0b | % | | -% | September 18, 2011 | +% | November 29, 2011 | % | | % |__________________________________________________________________| % |