diff options
author | Karl Berry <karl@freefriends.org> | 2023-06-30 20:50:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-06-30 20:50:47 +0000 |
commit | 5b7d9b73c00341679be1760b5a34771669d3083a (patch) | |
tree | 55f28840b5be9b8c23f83654c42f21383150fb31 /Master/texmf-dist/tex/generic/chemfig | |
parent | 531582b50843a91e1e50e85dad99329166b2fef0 (diff) |
chemfig (30jun23)
git-svn-id: svn://tug.org/texlive/trunk@67513 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/chemfig')
-rw-r--r-- | Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index 8dfc68592a4..f3f78f39684 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex @@ -4,9 +4,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \def\CFname {chemfig} % -\def\CFver {1.6d} % +\def\CFver {1.6e} % % % -\def\CFdate {2023/02/18} % +\def\CFdate {2023/06/30} % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -71,7 +71,9 @@ \def\CF_warning#1{\immediate\write-1{Package \CFname\space Warning: #1^^J}} \def\CF_checkprimitive#1#2{% Vérifie que #1 est une primitive et sinon, émet le message #2 et exécute \endinput \begingroup - \edef\__tempa{\meaning#1}\edef\__tempb{\string#1}\expandafter + \edef\__tempa{\meaning#1}% + \edef\__tempb{\string#1}% + \expandafter \endgroup \ifx\__tempa\__tempb\else \CF_error{#2}% @@ -414,6 +416,7 @@ \def\CF_defifempty#1#2#3{\CF_ifempty{#2}{\def#1{#3}}{\def#1{#2}}} \defKV[chemfig]{% atom style = \def\CF_atomstyle {#1}, + baseline = \CF_defifempty\CF_baseline {#1}{0pt},% nouveau v 1.6e chemfig style = \def\CF_chemfigstyle {#1}, cram width = \CF_defifempty\CF_crambasewidth {#1}{1.5ex}, cram dash width = \CF_defifempty\CF_cramdashlength {#1}{1pt}, @@ -444,6 +447,7 @@ \def\resetchemfig{\restoreKV[chemfig]} \setKVdefault[chemfig]{% atom style = {},% code tikz mis à la fin de every node/.style + baseline = {0pt},% nouveau v 1.6e chemfig style = {},% code tikz mis à la fin de l'arugment optionnel de \tikzpicture bond join = false, fixed length = false, @@ -941,19 +945,19 @@ minimum size=0pt,% \unexpanded\expandafter{\CF_atomstyle}% },% - baseline,% + baseline=\CF_baseline,% \unexpanded\expandafter{\CF_chemfigstyle}% ]% }% \begingroup% \endgroup rajouté en sortie de tracé par \CF_chemfigd \let\CF_hooklist\empty \ifboolKV[chemfig]{fixed length} - {% - \CF_macro_fixed_bond_lengthtrue - } - {% - \CF_macro_fixed_bond_lengthfalse - }% + {% + \CF_macro_fixed_bond_lengthtrue + } + {% + \CF_macro_fixed_bond_lengthfalse + }% \ifboolKV[chemfig]{bond join} {% \let\CF_drawaxisbond\CF_drawaxisbondjoin @@ -1154,7 +1158,7 @@ \CF_ifx*\CF_toksa% un cycle ? {% \ifnum\CF_lastaction=2 - \def\CF_currentfromatom{1}% Bugfix 1.6e + \def\CF_currentfromatom{1}% Bugfix 1.6d \CF_insertemptygroup\CF_molecule% insère un groupe vide \else \ifCF_in_cycle @@ -1171,7 +1175,8 @@ \expandafter\CF_parsecyclepreamblewithoptarg\CF_molecule\_nil% \begingroup inclus }% {% - \def\CF_cycle_arcstartangle{0}\def\CF_cycle_arcendangle{360}% + \def\CF_cycle_arcstartangle{0}% + \def\CF_cycle_arcendangle{360}% \let\CF_cycle_arcdirecttikz\empty \expandafter\CF_parsecyclepreamble\CF_molecule\_nil% \begingroup inclus }% @@ -3545,4 +3550,8 @@ v1.6d 2023/02/18 réactionnels - correction d'un bug : \CF_currentfromatom n'était pas initialisé au début d'un cycle et donc le code suivant plantait - \chemfig{AB-[,,2]*3(---)}
\ No newline at end of file + \chemfig{AB-[,,2]*3(---)} +---------------------------------------------------------------------- +v1.6e 2023/06/30 + - nouvelle clé "baseline" pour régler finement l'alignement + vertical d'une molécule
\ No newline at end of file |