summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/chemfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-16 22:22:41 +0000
committerKarl Berry <karl@freefriends.org>2015-11-16 22:22:41 +0000
commit46ee5d1eeb4e4c40471c0fae622e8fcc810a8261 (patch)
treec7b6fea5dc79a469e851eface75a3e2d2e9c00d8 /Master/texmf-dist/tex/generic/chemfig
parentbe44b80ece41d46cff3569c600b502ecb6e7d78a (diff)
chemfig (16nov15)
git-svn-id: svn://tug.org/texlive/trunk@38874 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/chemfig')
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty4
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex51
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex4
3 files changed, 35 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index 70915480c2c..6ad1fd421f6 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.2a |
+% | chemfig v1.2b |
% | |
-% | 21 october 2015 |
+% | 15 november 2015 |
% | |
% |__________________________________________________________________|
%
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 5a294db3b44..12e64331fdf 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.2a |
+% | chemfig v1.2b |
% | |
-% | 21 october 2015 |
+% | 15 november 2015 |
% | |
% |__________________________________________________________________|
%
@@ -58,6 +58,22 @@
\usechemfigcatcode
+\def\CF@def#1{%
+ \ifdefined#1%
+ \errmessage{Package \CF@package@name\space Error: the macro \string#1\space is already defined. Please, email the author.}%
+ \fi
+ \def#1%
+}
+
+\CF@def\CF@ver {1.2b}
+\CF@def\CF@date {2015/11/15}
+\CF@def\CF@fr@date {15 novembre 2015}
+\CF@def\CF@en@date {25 november 2015}
+\CF@def\CF@package@name{chemfig}
+
+\CF@def\CF@error#1{\errmessage{Package \CF@package@name\space Error: #1.}}
+\CF@def\CF@warning#1{\immediate\write\CF@unused{Package \CF@package@name\space Warning: #1^^J}}
+
% V\'erifie que eTeX est le moteur utilis\'e
\begingroup
\edef\CF@ver{\meaning\eTeXversion}
@@ -66,23 +82,10 @@
\endgroup
\else
\endgroup
- \errmessage{Package chemfig Error: you are not using an eTeX engine, chemfig cannot work.}%
+ \errmessage{Package \CF@package@name\space Error: you are not using an eTeX engine, chemfig cannot work.}%
\expandafter\endinput
\fi
-\def\CF@def#1{%
- \ifdefined#1%
- \errmessage{Package chemfig Error: the macro \string#1\space is already defined. Please, email the author.}%
- \fi
- \def#1%
-}
-
-\CF@def\CF@ver {1.2a}
-\CF@def\CF@date {2015/10/21}
-\CF@def\CF@fr@date {21 octobre 2015}
-\CF@def\CF@en@date {21 october 2015}
-\CF@def\CF@package@name{chemfig}
-
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
\ifdefined\tikzpicture\else
\def\CF@next@action{\input tikz.tex}%
@@ -478,7 +481,7 @@
\if:\CF@three@ea\noexpand\expandafter\@car\@gobble#1\@nil
\pgfmathsetmacro#2{\CF@previous@angle+\expandafter\@gobble\@gobble#1}%
\else
- \CF@exp@second{\def#2}{\@gobble#1}%
+ \pgfmathsetmacro#2{\@gobble#1}%
\fi
\else
\pgfmathsetmacro#2{#1*\CF@angle@increment}%
@@ -530,7 +533,8 @@
\CF@exp@second{\def\CF@remain@molecule}{\romannumeral-`\.\expandafter\noexpand\CF@remain@molecule}%
\CF@exp@macroarg\CF@if@firsttokmatch{\CF@remain@molecule}!%
{\CF@twoexp@second{\def\CF@remain@molecule}{\expandafter\@gobble\CF@remain@molecule}% enl\`eve le "!"
- \ifcat\relax\CF@three@ea\noexpand\expandafter\@car\CF@remain@molecule\@nil*%
+ \ifx\empty\CF@remain@molecule\errmessage{Package \CF@package@name\space Error: no submol name found after "!"}\fi
+ \ifcat\relax\CF@three@ea\noexpand\expandafter\@car\CF@remain@molecule*\@nil
\CF@twoexp@second{\CF@twoexp@second{\def\CF@insert@submol}}{\expandafter\@car\CF@remain@molecule\@nil}%
\else
\CF@exp@second{\CF@twoexp@second{\def\CF@insert@submol}}{\csname CF@@\expandafter\@car\CF@remain@molecule\@nil\endcsname}%
@@ -2403,5 +2407,12 @@ v1.2 2015/10/08
----------------------------------------------------------------------
v1.2a 2015/10/21
- erreur de copier-coller dans le code: une adresse url \'etait
- malencontreusement pr\'esente en plein milieu d'une ligne de
- code \ No newline at end of file
+ malencontreusement pr\'esente en plein milieu d'une ligne de
+ code
+----------------------------------------------------------------------
+v1.2b 2015/11/15
+ - bug dans \CF@seek@submol qui laissait "*" dans le flux de
+ lecture de TeX. Un message d'erreur est \'egalement ajout\'e
+ en cas de "!" en fin de traitement.
+ - correction d'un bug dans \CF@set@bondangle o\`u l'angle [<:a>]
+ n'\'etait pas \'evalu\'e par \pgfmathsetmacro. \ 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 942a31af609..d0bcf42de68 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.2a |
+% | chemfig v1.2b |
% | |
-% | 21 october 2015 |
+% | 15 november 2015 |
% | |
% |__________________________________________________________________|
%