From adb889db3567769ee9bc320b6e2ad7f555f96858 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Apr 2011 23:18:19 +0000 Subject: chemfig 0.4a (11apr11) git-svn-id: svn://tug.org/texlive/trunk@22055 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/chemfig/README | 8 +-- .../doc/generic/chemfig/chemfig_doc_en.pdf | Bin 1115478 -> 1116388 bytes .../doc/generic/chemfig/chemfig_doc_en.tex | 6 +-- .../doc/generic/chemfig/chemfig_doc_fr.pdf | Bin 1138588 -> 1138953 bytes .../doc/generic/chemfig/chemfig_doc_fr.tex | 4 +- Master/texmf-dist/tex/generic/chemfig/chemfig.sty | 4 +- Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 59 +++++++++++---------- .../texmf-dist/tex/generic/chemfig/t-chemfig.tex | 10 ++-- 8 files changed, 45 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README index 836ecaee061..0c63eba2ea2 100644 --- a/Master/texmf-dist/doc/generic/chemfig/README +++ b/Master/texmf-dist/doc/generic/chemfig/README @@ -2,9 +2,9 @@ ___________________________________ The ChemFig package - v0.4 + v0.4a - 2011/03/07 + 2011/04/10 ___________________________________ Maintainer: Christian Tellechea @@ -25,8 +25,8 @@ in dvi or pdf mode. ---------------------------------------------------------------------- Cette extension fournit la commande \chemfig{} qui dessine la -représentation en 2D d'une molécule chimique. Le décrit le -dessin selon une syntaxe simple, souple et intuitive. +repr\'esentation en 2D d'une mol\'ecule chimique. Le d\'ecrit +le dessin selon une syntaxe simple, souple et intuitive. Le dessin est fait avec l'extension tikz. ChemFig fonctionne donc en mode dvi ou pdf. diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf index 57180796859..46963d23523 100644 Binary files a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf and b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf differ 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 f6747ab5e0f..b83578545d2 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 | % | | -% | March 7, 2011 | +% | April 10, 2011 | % | | % |_________________________________________________________________| % @@ -1267,7 +1267,7 @@ These commands are independent of the macro \verb-\chemfig- and can be used eith They are especially useful in rings, if care is taken to put braces around the letters A, B, C and D in order to prevent \CF from starting a new atom on these letters: \exemple{Staking in rings}|\chemfig{*5(-\chembelow{A}{B}--\chemabove{C}{D}--)}| -They are sometimes useful for placing pseudo-exponents\idx{ring!charge} which do not change the bounding box of the atoms, so that the bonds do not end up being too short: +They are sometimes useful for placing pseudo-exponents\idx*{ring!charge} which do not change the bounding box of the atoms, so that the bonds do not end up being too short: \exemple{Hydronium ion}*\chemfig{H-\chemabove{\lewis{5|7,O}}{\quad\scriptstyle+}(-[2]H)-H}* \subsection{Chemical reactions}\idx*{chemical reaction} @@ -1550,7 +1550,7 @@ For more flexibility, you can also define nodes using the character ``\verb-@-'' ++(20:2em) ..controls +(210:3em) and +(-120:4em) ..(b);}/ \subsection{Modify the size of a molecule} -\idx{size of molecules}Two parameters determine the default size of a molecule: the font size and the parameter of \idx{\setatomsep} which is 3em the default. We can modify independently these two parameters to change the size of a molecule: +\idx*{size of molecules}Two parameters determine the default size of a molecule: the font size and the parameter of \idx{\setatomsep} which is 3em the default. We can modify independently these two parameters to change the size of a molecule: \exemple{Change the size}/\definesubmol\hho{H-[:30]O-[:-30]H} \chemfig{!\hho} diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf index 44ce3e02a9f..14a81b35887 100644 Binary files a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf and b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf differ 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 292d37847e0..e6d29a6564b 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 | % | | -% | 7 mars 2011 | +% | 10 avril 2011 | % | | % |_________________________________________________________________| % @@ -1411,7 +1411,7 @@ Ensuite, on définit deux alias pour les liaisons horizontales et les atomes qui \definesubmol{y}{(-[0]H)(-[4]OH)} \chemfig{[2]OH-[3]-!x-!x-!y-!x-=[1]O}| -\subsubsection{Représentation \protect\og chaise\protect\fg} +\subsubsection{Représentation "chaise"} \idx*{representation chaise@représentation chaise}On va représenter cette molécule d'$\alpha$-D-glucose : \chemfig{?(-[:190]OH)-[:-50](-[:170]OH)-[:10](-[:-55,0.7]OH)-[:-10](-[6,0.7]OH)-[:130]O-[:190]?(-[:150,0.7]-[2,0.7]OH)} diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty index f9ac1c4fc36..5111fdd5966 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty @@ -1,9 +1,9 @@ % __________________________________________________________________ % | | % | | -% | chemfig v0.4 | +% | chemfig v0.4a | % | | -% | March 7, 2011 | +% | April 10, 2011 | % | | % |__________________________________________________________________| % diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index 870b9d1b5f0..1ac9f1c5ef3 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex @@ -1,9 +1,9 @@ % __________________________________________________________________ % | | % | | -% | chemfig v0.4 | +% | chemfig v0.4a | % | | -% | March 7, 2011 | +% | April 10, 2011 | % | | % |__________________________________________________________________| % @@ -64,10 +64,10 @@ \def#1% } -\CF@def\CF@ver {0.4} -\CF@def\CF@date {2011/03/07} -\CF@def\CF@fr@date {7 mars 2011} -\CF@def\CF@en@date {March 7, 2011} +\CF@def\CF@ver {0.4a} +\CF@def\CF@date {2011/04/10} +\CF@def\CF@fr@date {10 avril 2011} +\CF@def\CF@en@date {April 10, 2011} \CF@def\CF@package@name{chemfig} \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ? @@ -190,19 +190,19 @@ \CF@def\CF@def@submol#1{% \begingroup - \def\CF@tmp@str{#1}% - \catcode`[\@ne\catcode`]\tw@ - \futurelet\CF@toks@a\CF@test@nxttok + \def\CF@tmp@str{#1}% + \catcode`[\@ne\catcode`]\tw@ + \futurelet\CF@toks@a\CF@test@nxttok } \CF@def\CF@test@nxttok{% - \if[\noexpand\CF@toks@a - \expandafter\expandafter\expandafter\CF@grab@optalias\expandafter\expandafter\expandafter{\expandafter\CF@tmp@str\expandafter}% - \else - \CF@swap@fi - \expandafter\endgroup - \expandafter\CF@def@submol@i\expandafter{\CF@tmp@str}{}% - \fi + \if[\noexpand\CF@toks@a + \expandafter\expandafter\expandafter\CF@grab@optalias\expandafter\expandafter\expandafter{\expandafter\CF@tmp@str\expandafter}% + \else + \CF@swap@fi + \expandafter\endgroup + \expandafter\CF@def@submol@i\expandafter{\CF@tmp@str}{}% + \fi } \CF@def\CF@grab@optalias#1#2{% @@ -263,8 +263,8 @@ \CF@def\CF@if@integer#1{% \begingroup - \afterassignment\CF@after@integer - \CF@cnt@cycle0#1\relax + \afterassignment\CF@after@integer + \CF@cnt@cycle0#1\relax } \CF@def\CF@after@integer#1\relax{% @@ -585,6 +585,12 @@ \let\CF@end@offset\@empty \let\CF@bond@outcontentsaved\@empty \def\CF@cycle@anglecorrection{180/\CF@cycle@num}% + \def\CF@default@angle{0}% + \def\CF@default@stringangle{:0}% angle pris par d\'efaut si le champ est vide + \def\CF@default@length{1}% + \let\CF@default@fromatom\@empty% numero de l'atome d'o\`u partent les liaisons par d\'efaut + \let\CF@default@toatom\@empty% num\'ero de l'atome o\`u arrivent les laisons par d\'efaut + \let\CF@default@tikz\@empty \everyeof{\@nil}\endlinechar\m@ne \CF@sanitize@catcode \CF@chemfig@iii @@ -609,15 +615,8 @@ \let\CF@default@angle\pgfmathresult \fi \let\CF@default@stringangle\@empty - \else - \def\CF@default@angle{0}% - \def\CF@default@stringangle{:0}% angle pris par d\'efaut si le champ est vide \fi \let\CF@current@angle\CF@default@angle - \ifCF@incycle\else\def\CF@default@length{1}\fi% longueur de la liaison par d\'efaut sauf pour un cycle o\`u on prend celle en cours - \let\CF@default@fromatom\@empty% numero de l'atome d'o\`u partent les liaisons par d\'efaut - \let\CF@default@toatom\@empty% num\'ero de l'atome o\`u arrivent les laisons par d\'efaut - \let\CF@default@tikz\@empty \if[\expandafter\noexpand\@car#1\@nil \CF@analyse@optarg#1\@nil\CF@remain@molecule \expandafter\CF@set@bondangle\expandafter{\CF@current@stringangle}\CF@current@angle @@ -709,7 +708,7 @@ \aftergroup\CF@chemfig@v \def\CF@next@action{\expandafter\CF@chemfig@iv\expandafter{\CF@sub@mol}}% \fi - }% + }% {\ifx\CF@remain@molecule\@empty \let\CF@next@action\endgroup \else% ce qui reste apr\`es le noeud courant n'est pas vide, ne commence pas par "-=~", ni par une parenth\`ese @@ -757,7 +756,7 @@ \def\CF@next@action{\expandafter\CF@chemfig@iv\expandafter{\CF@sub@mol}}% \fi }% - {\errmessage{Package \CF@package@name\space Error: something went wrong at this point: \detokenize\expandafter{\CF@remain@molecule}^^JIf you think it's a bug, please, send a Minimal Example to the author.}}% + {\errmessage{Package \CF@package@name\space Error: something went wrong here: \detokenize\expandafter{\CF@remain@molecule}^^JIf you think it's a bug, please, send a Minimal Example to the author.}}% \fi}% }% \else @@ -1501,4 +1500,8 @@ v0.4 2011/03/07 dans l'argument de \chemmove, \chemabove, \chembelow, \chemrel. TODO : faut-il \scantoker l'argument de \chemfig pour \^etre d\'efinitivement d\'ebarass\'e de ces histoires de catcode ??? - - Correction d'un bug dans le calcul de l'angle des liaisons \ No newline at end of file + - Correction d'un bug dans le calcul de l'angle des liaisons +---------------------------------------------------------------------- +v0.4a 2011/04/10 + - Correction d'un bug concernant l'argument optionnel en d\'ebut + de mol\'ecule. \ 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 73b20b64dd9..13de61c03db 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 v0.4 | +% | chemfig v0.4a | % | | -% | March 7, 2011 | +% | April 10, 2011 | % | | % |__________________________________________________________________| % @@ -39,10 +39,6 @@ % % The Current Maintainer of this work is Christian Tellechea % -------------------------------------------------------------------- -\ifdefined\tikzpicture -\else - \expandafter\def\csname CF@next@action\endcsname{\usemodule[tikz]}% - \csname CF@next@action\expandafter\endcsname -\fi +\usemodule[tikz] \input chemfig.tex \endinput \ No newline at end of file -- cgit v1.2.3