From 2e46ad31dcf3135c27f3b0f55eb3ac2a7f22aad8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 16 Jun 2020 20:47:51 +0000 Subject: chemfig (16jun20) git-svn-id: svn://tug.org/texlive/trunk@55568 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/chemfig/README | 4 ++-- .../texmf-dist/doc/generic/chemfig/chemfig-en.pdf | Bin 1088180 -> 1087797 bytes .../texmf-dist/doc/generic/chemfig/chemfig-en.tex | 3 +-- .../texmf-dist/doc/generic/chemfig/chemfig-fr.pdf | Bin 1116252 -> 1116449 bytes .../texmf-dist/doc/generic/chemfig/chemfig-fr.tex | 3 +-- Master/texmf-dist/tex/generic/chemfig/chemfig.sty | 1 + Master/texmf-dist/tex/generic/chemfig/chemfig.tex | 11 ++++++++--- .../texmf-dist/tex/generic/chemfig/t-chemfig.tex | 5 ----- 8 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README index ab9a6ebfd66..cad2e431746 100644 --- a/Master/texmf-dist/doc/generic/chemfig/README +++ b/Master/texmf-dist/doc/generic/chemfig/README @@ -2,9 +2,9 @@ ___________________________________ The Chemfig package - v1.54 + v1.55 - 2020/05/21 + 2020/06/15 ___________________________________ Maintainer: Christian Tellechea diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig-en.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig-en.pdf index 3a3df880ef3..5ec811ed99e 100644 Binary files a/Master/texmf-dist/doc/generic/chemfig/chemfig-en.pdf and b/Master/texmf-dist/doc/generic/chemfig/chemfig-en.pdf differ diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig-en.tex b/Master/texmf-dist/doc/generic/chemfig/chemfig-en.tex index 3c6797732b0..d7e5474480c 100644 --- a/Master/texmf-dist/doc/generic/chemfig/chemfig-en.tex +++ b/Master/texmf-dist/doc/generic/chemfig/chemfig-en.tex @@ -218,7 +218,7 @@ \part{Introduction} \section{New in v1.5} \subsection{The primitive \texttt{\protect\textbackslash expanded}} -As of version 1.54, \CF requires a \TeX{} engine that provides the \verb|\expanded| primitive. If this is not available, \CF will not be loaded. It is strongly recommended that you update your \LaTeX{} distribution in order to take advantage of the newer engine that provide for the use of this new primitive. +As of version 1.54, \CF requires a \TeX{} engine that provides the \verb|\expanded| primitive and becomes incompatible with con\TeX t. If \verb|\expanded| is not available or is not a primitive, \CF will not be loaded. It is strongly recommended that you update your \LaTeX{} distribution in order to take advantage of the newer engine that provide for the use of this new primitive. \subsection{The macro \texttt{\protect\textbackslash charge}} Version 1.5 implements the macros \verb|\charge| and \verb|\Charge| (see page~\pageref{charge}) whose purpose is to place arbitrary elements around an atom that can be placed with great precision. These macros will replace the \verb|\lewis| and \verb|\Lewis| macros because they are much more powerful and configurable, even if more verbose. It is therefore important to note that the macros \verb|\lewis| and \verb|\Lewis| \textcolor{red}{\bfseries are no longer documented and will be removed from the \CF package}. @@ -260,7 +260,6 @@ To use this package, start by adding the following code to the preamble: \begin{itemize} \item {\color{blue}\verb-\input chemfig.tex-} with $\varepsilon$\TeX; \item {\color{blue}\verb-\usepackage{chemfig}-} with \LaTeX; - \item {\color{blue}\verb-\usemodule[chemfig]-} with Con\TeX t\falseverb*{ConTeXt@Con\protect\TeX{}t}. \end{itemize} In all cases, the \TIKZ package, if not loaded before, is loaded by \CF. diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.pdf b/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.pdf index 14d02f6fba8..f773cb1b4b2 100644 Binary files a/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.pdf and b/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.pdf differ diff --git a/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.tex b/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.tex index e15417157e4..de76a743a36 100644 --- a/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.tex +++ b/Master/texmf-dist/doc/generic/chemfig/chemfig-fr.tex @@ -218,7 +218,7 @@ \part{Introduction} \section{Nouveau dans la v1.5} \subsection{Primitive \texttt{\protect\textbackslash expanded}} -À partir de la version 1.54, \CF nécessite un moteur \TeX{} fournissant la primitive \texttt{\string\expanded}. Si ce n'est pas le cas, le package \CF ne sera pas chargé : il est donc vivement conseillé de mettre à jour sa distribution \LaTeX{} afin de profiter d'un moteur récent permettant l'utilisation de cette nouvelle primitive. +À partir de la version 1.54, \CF nécessite un moteur \TeX{} fournissant la primitive \texttt{\string\expanded} et devient incompatible avec con\TeX t. Si \verb|\expanded| n'est pas disponible ou n'est pas une primitive, \CF ne sera pas chargé : il est donc vivement conseillé de mettre à jour sa distribution \LaTeX{} afin de profiter d'un moteur récent permettant l'utilisation de cette nouvelle primitive. \subsection{La macro \texttt{\protect\textbackslash charge}} La version 1.5 met en place les macros \verb|\charge| et \verb|\Charge| (voir page~\pageref{charge}) dont le but est de placer atour d'un atome des éléments arbitraires avec une grande précision. Ces macros remplaceront, à terme, les macros \verb|\lewis| et \verb|\Lewis| car elles sont bien plus puissantes et configurables, même si plus verbeuses quant à leur emploi. Il est donc important de noter que les macros \verb|\lewis| et \verb|\Lewis| \textcolor{red}{\bfseries ne sont plus documentées et seront supprimées de l'extension \CF}. @@ -260,7 +260,6 @@ Pour charger \CF, il faut écrire : \begin{itemize} \item {\color{blue}\verb-\input chemfig.tex-} avec $\varepsilon$\TeX; \item {\color{blue}\verb-\usepackage{chemfig}-} avec \LaTeX; - \item {\color{blue}\verb-\usemodule[chemfig]-} avec Con\TeX t; \end{itemize} Dans tous les cas, le package \TIKZ, s'il n'a pas été chargé auparavant, est chargé par \CF. diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty index 48e93146eb7..7586ba25233 100644 --- a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty +++ b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty @@ -1,4 +1,5 @@ \RequirePackage{tikz} +\def\CFfromsty{} \input chemfig.tex \ProvidesPackage\CFname[\CFdate\space v\CFver\space Draw molecule with an easy syntax (CT)] \def\printatom#1{\ensuremath{\mathrm{#1}}}% \printatom pour LaTeX. diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex index 69e966ba31d..456b400edb3 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.54} % +\def\CFver {1.55} % % % -\def\CFdate {2020/05/21} % +\def\CFdate {2020/06/15} % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -3081,4 +3081,9 @@ v1.53 2020/04/27 ---------------------------------------------------------------------- v1.54 2020/05/21 - chemfig ne peut plus fonctionner sans \expanded - - bug : un signe "=" laissé par erreur dans le flux \ No newline at end of file + - bug : un signe "=" laissé par erreur dans le flux + ---------------------------------------------------------------------- +v1.55 2020/06/15 + - chemfig est incompatible avec conTeXt, vu que ce moteur redéfinit + des primitives telles que \expanded, \unexpanded et peut être + d'autres. \ 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 deleted file mode 100644 index 5fc262beaea..00000000000 --- a/Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex +++ /dev/null @@ -1,5 +0,0 @@ -\usemodule[tikz]% -\input chemfig.tex -\expandafter\let\csname CF\string_begintikzpicture\endcsname\starttikzpicture -\expandafter\let\csname CF\string_endtikzpicture\endcsname\stoptikzpicture -\endinput -- cgit v1.2.3