summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-24 23:12:46 +0000
committerKarl Berry <karl@freefriends.org>2015-02-24 23:12:46 +0000
commit998e0574c61935f455335c25a36f268e159dc797 (patch)
tree989d4b114d657d5c83701f8d3c9558af5891733d /Master/texmf-dist/tex/generic
parent6393e0fa1c1b3ab125e43ddbeecbdca740f7d6ac (diff)
chemfig (24feb15)
git-svn-id: svn://tug.org/texlive/trunk@36374 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex32
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex4
3 files changed, 23 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 8afac04a939..dda7d7f4e13 100644
--- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
+++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
@@ -1,9 +1,9 @@
% __________________________________________________________________
% | |
% | |
-% | chemfig v1.1 |
+% | chemfig v1.1a |
% | |
-% | 15 february 2015 |
+% | 23 february 2015 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index a97657cdc9e..a4769ad330b 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.1 |
+% | chemfig v1.1a |
% | |
-% | 15 february 2015 |
+% | 23 february 2015 |
% | |
% |__________________________________________________________________|
%
@@ -76,10 +76,10 @@
\def#1%
}
-\CF@def\CF@ver {1.1}
-\CF@def\CF@date {2015/02/15}
-\CF@def\CF@fr@date {15 f\'evrier 2015}
-\CF@def\CF@en@date {15 february 2015}
+\CF@def\CF@ver {1.1a}
+\CF@def\CF@date {2015/02/23}
+\CF@def\CF@fr@date {23 f\'evrier 2015}
+\CF@def\CF@en@date {23 february 2015}
\CF@def\CF@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -416,14 +416,14 @@
\def\CF@start@offset{#1}\def\CF@end@offset{#2}%
}
-\expandafter\CF@def\expandafter\CF@grab@bondoffset\string#(#1)#2\@nil{%
- \ifx\@empty#1\@empty
+\CF@def\CF@grab@bondoffset#1(#2)#3\@nil{%
+ \ifx\@empty#2\@empty
\else
- \CF@if@instr{#1},%
- {\CF@analyse@bondoffset#1\@nil}%
- {\def\CF@start@offset{#1}}%
+ \CF@if@instr{#2},%
+ {\CF@analyse@bondoffset#2\@nil}%
+ {\def\CF@start@offset{#2}}%
\fi
- \def\CF@remain@afterbond{#2}%
+ \def\CF@remain@afterbond{#3}%
}
\CF@def\CF@analyse@bond#1#2{%
@@ -2351,4 +2351,10 @@ v1.1 2015/02/13
cycles afin que les polygones soient r\'eguliers.
\enablefixedbondlength permet cette fonctionnalit\'e pour
toutes les macros \chemfig (m\^eme non \'etoil\'ee) tandis que
- \disablefixedbondlength le d\'esactive. \ No newline at end of file
+ \disablefixedbondlength le d\'esactive.
+----------------------------------------------------------------------
+v1.1a 2015/02/23
+ - correction d'un bug dans \CF@grab@bondoffset. Si \chemfig est
+ dans l'argument d'une macro, les # sont doubl\'es par l'action
+ de \scantokens de la macro \CF@chemfig@iv et il faut un
+ argument d\'elimit\'e avant "(" pour absorber tous les #. \ 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 84c6b51d39a..a427cffef5f 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.1 |
+% | chemfig v1.1a |
% | |
-% | 15 february 2015 |
+% | 23 february 2015 |
% | |
% |__________________________________________________________________|
%