diff options
author | Karl Berry <karl@freefriends.org> | 2017-06-06 21:56:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-06-06 21:56:29 +0000 |
commit | d6136de4d8066d5be6ce0996a3e1ff0b01527f14 (patch) | |
tree | 99da759ecf18d87b581d2a799b47262f0334a5ea /Master/texmf-dist/tex | |
parent | ae5c3b73315e3e216f364fa80bc292037be5f590 (diff) |
chemfig (22may17)
git-svn-id: svn://tug.org/texlive/trunk@44513 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/chemfig.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 40 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex | 8 |
3 files changed, 26 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty index f4f5b3b2b4e..03b13b44561 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty @@ -1,10 +1,6 @@ % __________________________________________________________________ % | | -% | | -% | chemfig v1.2d | -% | | -% | 1 december 2015 | -% | | +% | chemfig v1.2e | % |__________________________________________________________________| % % This is chemfig.sty, the package file for LaTeX. @@ -43,4 +39,4 @@ \RequirePackage{tikz} \input chemfig.tex \ProvidesPackage\CF@package@name[\CF@date\space v\CF@ver\space Draw molecule with an easy syntax] -\endinput
\ No newline at end of file +\endinput diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index 675cc865bab..6c4530c9317 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex @@ -1,10 +1,6 @@ % __________________________________________________________________ % | | -% | | -% | chemfig v1.2d | -% | | -% | 1 december 2015 | -% | | +% | chemfig v1.2e | % |__________________________________________________________________| % % This is chemfig.tex, the code of the "chemfig" package. @@ -65,10 +61,10 @@ \def#1% } -\CF@def\CF@ver {1.2d} -\CF@def\CF@date {2015/12/01} -\CF@def\CF@fr@date {1 d\'ecembre 2015} -\CF@def\CF@en@date {1 december 2015} +\CF@def\CF@ver {1.2e} +\CF@def\CF@date {2017/05/20} +\CF@def\CF@fr@date {20 mai 2017} +\CF@def\CF@en@date {20 may 2017} \CF@def\CF@package@name{chemfig} \CF@def\CF@error#1{\errmessage{Package \CF@package@name\space Error: #1.}} @@ -663,9 +659,9 @@ {\def\CF@bond@outnode{% n\CF@last@groupnumber-% \ifx\CF@current@fromatom\@empty - \ifdim\CF@current@angle pt<90pt \number\CF@cnt@atomingroup - \else\ifdim\CF@current@angle pt>270pt \number\CF@cnt@atomingroup\else1\fi - \fi + \ifdim\CF@current@angle pt<90pt \number\CF@cnt@atomingroup + \else\ifdim\CF@current@angle pt>270pt \number\CF@cnt@atomingroup\else1\fi + \fi \else \CF@current@fromatom \fi}% @@ -886,7 +882,7 @@ \or \CF@create@normnodes{#2@@}{#3@@}\CF@double@sep\CF@double@sep \CF@draw@axisbond{#2}{#3}% trace la liaison simple dans l'axe\CF@draw@bond@a(#2@@)--(#3@@); - \begingroup% ajuste \'eventuellement les longueurs des liaisons doubles + \begingroup% ajuste \'eventuellement les longueurs des l(0,0iaisons doubles \ifCF@incycle \ifdim\CF@start@offset=\z@ \CF@edefadd@tocs\CF@current@bondstyle{,shorten <=\CF@doublebond@lengthcorrection pt}% @@ -1727,7 +1723,7 @@ } \CF@def\CF@arrow@b(#1.#2[#3]--#4.#5[#6])#7{% - \def\CF@current@arrowtype{#7}% + \def\CF@current@arrowtype{#7}% nom de la fl\`eche \CF@doifempty\CF@current@arrowtype{\def\CF@current@arrowtype{->}}% \@testopt{\CF@arrow@c(#1.#2[#3]--#4.#5[#6])}{}% } @@ -1919,7 +1915,7 @@ \fi } -\CF@def\CF@grab@arrow@name#1[#2\@nil{#1} +\CF@def\CF@grab@arrow@name#1[#2\@nil{\detokenize{CF@arrow(#1)}} \CF@def\CF@grab@arrow@args#1[#2\@nil{[#2} \CF@def\CF@make@parameter@text#1{% @@ -1940,7 +1936,7 @@ \begingroup \CF@make@parameter@text{#1}% \expandafter\endgroup - \expandafter\def\csname\detokenize{#2}\expandafter\endcsname\the\toks\z@{#3\CF@gobtonil}% + \expandafter\def\csname\detokenize{CF@arrow(#2)}\expandafter\endcsname\the\toks\z@{#3\CF@gobtonil}% } \CF@def\CF@if@stop#1{\CF@if@stop@a#1.\@nil} @@ -2409,7 +2405,8 @@ v1.2 2015/10/08 - \chemrel, \setchemrel et \chemsign sont supprim\'ees. - compatibilit\'e, avec les limitations d'usage, avec la librairie "externalize" : le \begin{tikzpicture} voit - d\'esormais le \end correspondant dans la macro \CF@chemfig@d. + d\'esormais le \end{tikzpicture} correspondant dans la macro + \CF@chemfig@d. ---------------------------------------------------------------------- v1.2a 2015/10/21 - erreur de copier-coller dans le code: une adresse url \'etait @@ -2434,4 +2431,11 @@ v1.2d 2015/12/01 - correction d'un bug dans la fl\`eche "-U" - la version \'etoil\'ee de \setcrambond dessine les liaisons de Cram en pointill\'es sous forme de trait large et non pas sous - forme de triangle.
\ No newline at end of file + forme de triangle. +---------------------------------------------------------------------- +v1.2e 2017/05/20 + - la macro contenant la d\'efinition d'une fl\`eche est + d\'esormais "\CF@arrow(<nom>)", ainsi la macro \0 n'est plus + d\'efinie par \definearrow + - remerciements rajout\'es apr\`es une suppression indue, pour ne + froisser aucune susceptibilit\'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 dc5d2d78238..7bfe48bb120 100644 --- a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex +++ b/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex @@ -1,10 +1,6 @@ % __________________________________________________________________ % | | -% | | -% | chemfig v1.2d | -% | | -% | 1 december 2015 | -% | | +% | chemfig v1.2e | % |__________________________________________________________________| % % This is t-chemfig.tex, the package file for conTeXt. @@ -42,4 +38,4 @@ % -------------------------------------------------------------------- \usemodule[tikz]% \input chemfig.tex -\endinput
\ No newline at end of file +\endinput |