diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/chemfig/README | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf | bin | 1285777 -> 1285258 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf | bin | 1307324 -> 1306604 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex | 10 | ||||
| -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 |
8 files changed, 29 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README index c48be003d38..ca9a9ef0cba 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.0a + v1.0b - 2011/09/18 + 2011/11/29 ___________________________________ 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 Binary files differindex 7cb36af9fe9..b12d22bf6ba 100644 --- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf +++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf 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 977da61b11c..454f16fb24b 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 | % | | -% | September 18, 2011 | +% | November 29, 2011 | % | | % |__________________________________________________________________| % @@ -290,12 +290,8 @@ delim_2 "\\dotfill" \setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt} \part{Introduction} -\section{New in version 1.0a} -Here is what is new in version 1.0a: -\begin{itemize} - \item the \verb-\lewis- and \verb-\Lewis- macros have an optional argument which controls the offset of the Lewis drawings in the odd directions, see page~\pageref{opt.lewis}; - \item the \verb-\setlewisdist- macro sets the distance between the circles representing a pair of electrons, see page~\pageref{setlewisdist}. -\end{itemize} +\section{New in version 1.0b} +Here is what is new in version 1.0b: \CF can be use even though the stmaryrd package is loaded since it defines a ``\verb-\merge-''. \section{Foreword} This package has seen the light of day thanks to the assistance of Christophe \textsc{Casseau}, who had the idea after being confronted with the complexity of the syntax of the \href{http://www.ctan.org/tex-archive/help/Catalogue/entries/ppchtex.html}{\texttt{\textbf{ppchtex}}} package. diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf Binary files differindex cefaaab2900..de57934c960 100644 --- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf +++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf 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 a8f7537aeff..f80ed9d8729 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 | % | | -% | 18 septembre 2011 | +% | 29 novembre 2011 | % | | % |__________________________________________________________________| % @@ -290,12 +290,8 @@ delim_2 "\\dotfill" \setitemize{leftmargin=3em,topsep=0pt,parsep=0pt,itemsep=0pt,label=--} \part{Introduction} -\section{Nouveautés de la version 1.0a} -Voici les nouveautés de la version 1.0a : -\begin{itemize} - \item les macros \verb-\lewis- et \verb-\Lewis- admettent désormais un argument optionnel pour contrôler le décalage des décorations de Lewis dans les directions impaires, voir page~\pageref{opt.lewis}; - \item la macro \verb-\setlewisdist- permet de régler la distance entre les deux disques représentant une paire d'électrons, voir page~\pageref{setlewisdist}. -\end{itemize} +\section{Nouveautés de la version 1.0b} +Voici les nouveautés de la version 1.0b : \CF peut être utilisé même si le package stmaryrd est chargé puisque celui-ci définit aussi une macro \verb-\merge-. \section{Avant propos} Cette extension a pu voir le jour grâce à l'aide de Christophe \textsc{Casseau} qui en a eu l'idée après s'être confronté à la complexité de la syntaxe de l'extension \href{http://www.ctan.org/tex-archive/help/Catalogue/entries/ppchtex.html}{\texttt{\textbf{ppchtex}}}. 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 | % | | % |__________________________________________________________________| % |