summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-25 23:46:31 +0000
committerKarl Berry <karl@freefriends.org>2012-02-25 23:46:31 +0000
commit77419f835b1e89fb4ae178892165e782ffeb84bc (patch)
tree4cef0197e0aa3e8c77b19f4e23ce6c2c6508918b /Master/texmf-dist
parent6a712a6992dfd3ad8562302f2bac0d28bd4a4043 (diff)
chemfig 1.0f
git-svn-id: svn://tug.org/texlive/trunk@25504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/README4
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdfbin1284266 -> 1288975 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.tex38
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdfbin1305362 -> 1309130 bytes
-rw-r--r--Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.tex38
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.sty6
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/chemfig.tex47
-rw-r--r--Master/texmf-dist/tex/generic/chemfig/t-chemfig.tex6
8 files changed, 109 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/generic/chemfig/README b/Master/texmf-dist/doc/generic/chemfig/README
index d3fa111f7b1..44b3807a3da 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.0e
+ v1.0f
- 2012/01/13
+ 2012/02/24
___________________________________
Maintainer: Christian Tellechea
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 6890745753b..0f7947af293 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_en.pdf
Binary files 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 218c768a3ea..b878c81c67d 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 |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -15,7 +15,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)
@@ -1701,6 +1701,40 @@ Water molecule rorated 30\si\degree: \chemfig{[:30]@1H-[::37.775,2]@2O-[::-75.55
\namebond12{\footnotesize0.9584\si\angstrom}
\namebond23{\footnotesize0.9584\si\angstrom}
\arclabel{0.5cm}{1}{2}{3}{\footnotesize104.45\si\degree}|
+
+\subsection{Schéma de Lewis à l'angle près}
+Pour quelques cas très particuliers, il est parfois nécessaire de positionner des schémas de Lewis au degrés près et non plus à des multiples de 45 degrés.
+
+Pour cela, il est relativement facile d'écrire une macro \verb-\mylewis-, admettant un argument optionnel (la longueur du doublet) qui vaut ici 2ex et deux arguments obligatoires; le premier étant le nom de l'atome et le second étant la liste des angles séparés par des virgules.
+
+L'astuce consiste à créer un n\oe ud invisible circulaire qui contient l'atome et tracer les doublets aux angles désirés de façon à ce qu'ils soient tangents à ce cercle :
+
+\exemple*{Doublets au degrés prés}|\makeatletter
+\newcommand\mylewis[3][2ex]{% #1=longueur, #2=atome #3=liste des angles
+ \tikzpicture[baseline,anchor=base]%
+ \node[inner sep=0pt,outer sep=1pt,circle,overlay](atom@@)at(0,0){\phantom{#2}};%
+ \node[inner sep=0pt,outer sep=0pt]at(0,0){#2};%
+ \def\list@angle{#3,}%
+ \loop
+ \expandafter\grab@angle\list@angle\@nil
+ \pgfextractx\CF@dim{\pgfpointanchor{atom@@}\current@angle}\edef\CF@dimax{\the\CF@dim}%
+ \pgfextracty\CF@dim{\pgfpointanchor{atom@@}\current@angle}\edef\CF@dimay{\the\CF@dim}%
+ \pgfmathparse{#1*sin(\current@angle)/2}\let\offset@xx\pgfmathresult
+ \pgfmathparse{#1*cos(\current@angle)/2}\let\offset@yy\pgfmathresult
+ \draw[line width=.4pt,overlay]
+ (\CF@dimax-\offset@xx,\CF@dimay+\offset@yy)--(\CF@dimax+\offset@xx,\CF@dimay-\offset@yy);%
+ \unless\ifx\@empty\list@angle
+ \repeat
+ \endtikzpicture
+}
+\def\grab@angle#1,#2\@nil{\def\current@angle{#1}\def\list@angle{#2}}
+\makeatother
+Essai : \mylewis{Cl}{15}\qquad \mylewis[3ex]{Cl}{-60}\qquad \mylewis[1.5ex]{Cl}{60,120,240,300}
+\bigskip
+
+\chemfig{P(-[:72]\mylewis{Cl}{-18,72,162})(-[:-72]Cl)
+(-[:144]Cl)(-[:-144]Cl)-\mylewis{Cl}{0,90,-90}}|
+
\newpage
\part{Reaction schemes}\label{schemas}
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 9644db637f7..a5c2a7459aa 100644
--- a/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf
+++ b/Master/texmf-dist/doc/generic/chemfig/chemfig_doc_fr.pdf
Binary files 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 bc8dac64b79..07350c24f6f 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 |
% | |
-% | 13 janvier 2012 |
+% | 24 f\'evrier 2012 |
% | |
% |__________________________________________________________________|
%
@@ -15,7 +15,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% L'extension "chemfig" est constituée de ces 8 fichiers :
% chemfig.tex (le code de l'extention)
@@ -1701,6 +1701,40 @@ Molécule d'eau pivotée de +30\si\degree : \chemfig{[:30]@1H-[::37.775,2]@2O-[:
\namebond12{\footnotesize0.9584\si\angstrom}
\namebond23{\footnotesize0.9584\si\angstrom}
\arclabel{0.5cm}{1}{2}{3}{\footnotesize104.45\si\degree}|
+
+\subsection{Schéma de Lewis à l'angle près}
+Pour quelques cas très particuliers, il est parfois nécessaire de positionner des schémas de Lewis au degrés près et non plus à des multiples de 45 degrés.
+
+Pour cela, il est relativement facile d'écrire une macro \verb-\mylewis-, admettant un argument optionnel (la longueur du doublet) qui vaut ici 2ex et deux arguments obligatoires; le premier étant le nom de l'atome et le second étant la liste des angles séparés par des virgules.
+
+L'astuce consiste à créer un n\oe ud invisible circulaire qui contient l'atome et tracer les doublets aux angles désirés de façon à ce qu'ils soient tangents à ce cercle :
+
+\exemple*{Doublets au degrés prés}|\makeatletter
+\newcommand\mylewis[3][2ex]{% #1=longueur, #2=atome #3=liste des angles
+ \tikzpicture[baseline,anchor=base]%
+ \node[inner sep=0pt,outer sep=1pt,circle,overlay](atom@@)at(0,0){\phantom{#2}};%
+ \node[inner sep=0pt,outer sep=0pt]at(0,0){#2};%
+ \def\list@angle{#3,}%
+ \loop
+ \expandafter\grab@angle\list@angle\@nil
+ \pgfextractx\CF@dim{\pgfpointanchor{atom@@}\current@angle}\edef\CF@dimax{\the\CF@dim}%
+ \pgfextracty\CF@dim{\pgfpointanchor{atom@@}\current@angle}\edef\CF@dimay{\the\CF@dim}%
+ \pgfmathparse{#1*sin(\current@angle)/2}\let\offset@xx\pgfmathresult
+ \pgfmathparse{#1*cos(\current@angle)/2}\let\offset@yy\pgfmathresult
+ \draw[line width=.4pt,overlay]
+ (\CF@dimax-\offset@xx,\CF@dimay+\offset@yy)--(\CF@dimax+\offset@xx,\CF@dimay-\offset@yy);%
+ \unless\ifx\@empty\list@angle
+ \repeat
+ \endtikzpicture
+}
+\def\grab@angle#1,#2\@nil{\def\current@angle{#1}\def\list@angle{#2}}
+\makeatother
+Essai : \mylewis{Cl}{15}\qquad \mylewis[3ex]{Cl}{-60}\qquad \mylewis[1.5ex]{Cl}{60,120,240,300}
+\bigskip
+
+\chemfig{P(-[:72]\mylewis{Cl}{-18,72,162})(-[:-72]Cl)
+(-[:144]Cl)(-[:-144]Cl)-\mylewis{Cl}{0,90,-90}}|
+
\newpage
\part{Schémas réactionnels}\label{schemas}
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.sty b/Master/texmf-dist/tex/generic/chemfig/chemfig.sty
index de4d3fa3a9f..5a4c73b27d1 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.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)
diff --git a/Master/texmf-dist/tex/generic/chemfig/chemfig.tex b/Master/texmf-dist/tex/generic/chemfig/chemfig.tex
index 7fc1df916a8..ee82b136586 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.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (this file)
@@ -64,7 +64,7 @@
\else
\endgroup
\errmessage{Package chemfig Error: you are not using the eTeX engine, chemfig cannot work and is not loaded.}%
- \expandafter\endiput
+ \expandafter\endinput
\fi
\def\CF@def#1{%
@@ -74,10 +74,10 @@
\def#1%
}
-\CF@def\CF@ver {1.0e}
-\CF@def\CF@date {2012/01/13}
-\CF@def\CF@fr@date {13 janvier 2012}
-\CF@def\CF@en@date {January 13, 2012}
+\CF@def\CF@ver {1.0f}
+\CF@def\CF@date {2012/02/24}
+\CF@def\CF@fr@date {24 f\'evrier 2012}
+\CF@def\CF@en@date {February 24, 2012}
\CF@def\CF@package@name{chemfig}
\expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ?
@@ -184,24 +184,31 @@
}
\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\@firstoftwo\else\expandafter\@secondoftwo\fi
+ {\expandafter\CF@grab@optalias\expandafter{\CF@tmp@str}}%
+ {\CF@expand@second{%
+ \endgroup
+ \begingroup
+ \CF@sanitize@catcode
+ \CF@def@submol@i
+ }\CF@tmp@str{}%
+ }%
}
\CF@def\CF@grab@optalias#1#2{%
\endgroup
\begingroup
\everyeof{\@nil}\endlinechar\m@ne
+ \CF@sanitize@catcode
\expandafter\assign@tonil\expandafter\CF@tmp@str\scantokens{#2}%
- \CF@expand@second{\endgroup\CF@def@submol@i{#1}}\CF@tmp@str
+ \CF@expand@second{%
+ \CF@sanitize@catcode
+ \CF@def@submol@i{#1}%
+ }\CF@tmp@str
}
\CF@def\CF@def@submol@i#1#2#3{% #1 nom, #2 = code si liaison arrive de droite , #3 = code si liaison arrive de gauche
+ \endgroup
\ifcat\relax\expandafter\noexpand\@car#1\@nil% si #1 est une s\'equence de contr\^ole
\expandafter\ifdefined\@car#1\@nil
\ifCF@definesubmol
@@ -377,7 +384,7 @@
\ifx>\CF@toks@a4%
\else
\ifx<\CF@toks@a5%
- \else0% si 0 --> il y a une erreur non dûe \`a l'utilisateur
+ \else0% si 0 --> il y a une erreur non due \`a l'utilisateur
\fi
\fi
\fi
@@ -2166,4 +2173,8 @@ v1.0d 2011/12/19
v1.0e 2012/01/13
- la gestion des espaces dans les groupes d'atomes est
d\'esormais plus rigoureuse. Plusieurs bugs ont \'et\'e
- corrig\'e \ No newline at end of file
+ corrig\'e
+----------------------------------------------------------------------
+v1.0f 2012/02/24
+ - correction d'un bug avec \definesubmol, les catcodes n'\'etaient
+ pas correctement g\'e\'es. \ 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 5d88ac916f5..a7b44f9dd00 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.0e |
+% | chemfig v1.0f |
% | |
-% | January 13, 2012 |
+% | February 24, 2012 |
% | |
% |__________________________________________________________________|
%
@@ -14,7 +14,7 @@
% Comments, bug reports and suggestions are welcome.
% Licence : Released under the LaTeX Project Public License v1.3c or
% later, see http://www.latex-project.org/lppl.txt
-% Copyright : Christian Tellechea 2010-2011
+% Copyright : Christian Tellechea 2010-2012
%
% The "chemfig" package consists of the 8 following files:
% chemfig.tex (the code of the package)