diff options
author | Karl Berry <karl@freefriends.org> | 2011-04-28 22:41:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-04-28 22:41:52 +0000 |
commit | 89ceb55bc96c0d36600b617ba97186294acfaa06 (patch) | |
tree | c2db7a34c0e4cabd3a196b73af780bb62b7c3e3a | |
parent | 38bf042280d81ae16f304a6beaf48995745f31c6 (diff) |
mychemistry 1.5.1 (28apr11)
git-svn-id: svn://tug.org/texlive/trunk@22242 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/README | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/bondwidth.tex | 58 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/examples.pdf | bin | 541796 -> 541853 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/examples.tex | 12 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.pdf | bin | 887928 -> 888157 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.pdf | bin | 840361 -> 840157 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.tex | 18 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/mychemistry/mychemistry.sty | 98 |
9 files changed, 94 insertions, 121 deletions
diff --git a/Master/texmf-dist/doc/latex/mychemistry/README b/Master/texmf-dist/doc/latex/mychemistry/README index 8c6ac16ef8b..caf794b6c7b 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/README +++ b/Master/texmf-dist/doc/latex/mychemistry/README @@ -1,7 +1,7 @@ -------------------------------------------------------------------------- -the myChemistry package v1.5 -Creating reaction schemes with LaTeX and ChemFig -2011/04/23 +the myChemistry package v1.5.1 +Create reaction schemes with LaTeX and ChemFig +2011/04/27 -------------------------------------------------------------------------- Clemens Niederberger Web: http://www.niederberger-berlin.net/2011/02/latex-mychemistry/ @@ -22,7 +22,7 @@ This work has the LPPL maintenance status `maintained'. The Current Maintainer of this work is Clemens Niederberger. This work consists of the files mychemistry.sty, mychemistry_de.tex, -mychemistry_en.tex, bondwidth.tex, examples.tex and examples.pdf +mychemistry_en.tex, examples.tex -------------------------------------------------------------------------- myChemistry provides commands for typesetting complex reaction schemes with LaTeX and ChemFig. diff --git a/Master/texmf-dist/doc/latex/mychemistry/bondwidth.tex b/Master/texmf-dist/doc/latex/mychemistry/bondwidth.tex deleted file mode 100644 index ec5a5144af8..00000000000 --- a/Master/texmf-dist/doc/latex/mychemistry/bondwidth.tex +++ /dev/null @@ -1,58 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% bondwidth.tex -% change the line width of bonds in ChemFig for all formulae -% 2011/04/02 v0.4 -% ------------------------------------------------------------------- -% Copyright 2011 Clemens Niederberger -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Clemens Niederberger. -% ------------------------------------------------------------------- -% adds the command \setbondwidth{} to ChemFig -% changes the line width of the bonds to -% the specified width. An empty argument will -% restore the default. -% input in the preamble after loading ChemFig -% with \input{bondwidth} -% Please be aware: this has only be tested with -% ChemFig version 0.4; this will NOT work with -% older versions! -% ------------------------------------------------------------------- -% 2011/03/21 - v0.1: initial version -% 2011/03/23 - v0.2: restoring default with empty argument -% 2011/03/24 - v0.3: command setbondwidth rewritten so the -% ifthen-package isn't required anymore -% 2011/04/02 - v0.4: \makeatletter/-other stören, wenn bondwidth.tex -% via sty-file eingebunden => entfernt -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\@mc@bond@width{0.2pt}% default -\def\setbondwidth#1{% set bond width or restore default - \ifx\@empty#1\@empty\def\@mc@bond@width{0.2pt}\else\def\@mc@bond@width{#1}\fi -} -\def\CF@chemfig@ii[#1][#2]{% modify ChemFig's internal command - \edef\CF@tmp@str{[remember picture,every node/.style={anchor=base,inner sep=0pt,outer sep=0pt,minimum size=0pt\ifx\@empty#2\@empty\else,#2\fi},baseline,line width=\@mc@bond@width\ifx\@empty#1\@empty\else,#1\fi]}% - \expandafter\tikzpicture\CF@tmp@str - \begingroup - \let\CF@hook@list\@empty - \ifx\CF@atom@sep\@empty\def\CF@atom@sep{3em}\fi - \ifx\CF@cram@basewidth\@empty\def\CF@cram@basewidth{1.5ex}\fi - \CF@incyclefalse - \CF@cnt@groupnumber\z@ - \let\CF@last@action\z@% - \let\CF@start@offset\@empty - \let\CF@end@offset\@empty - \let\CF@bond@outcontentsaved\@empty - \def\CF@cycle@anglecorrection{180/\CF@cycle@num}% - \everyeof{\@nil}\endlinechar\m@ne - \CF@sanitize@catcode - \CF@chemfig@iii -}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/mychemistry/examples.pdf b/Master/texmf-dist/doc/latex/mychemistry/examples.pdf Binary files differindex 5a180f214f6..7fc375e6aea 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/examples.pdf +++ b/Master/texmf-dist/doc/latex/mychemistry/examples.pdf diff --git a/Master/texmf-dist/doc/latex/mychemistry/examples.tex b/Master/texmf-dist/doc/latex/mychemistry/examples.tex index 2dba57f652d..ba97166aa1f 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/examples.tex +++ b/Master/texmf-dist/doc/latex/mychemistry/examples.tex @@ -1,10 +1,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------------------------------------------------------------------------- % % - myChemistry - mychemistry_en.tex -------------------------------------------------- % -% - Creating reaction schemes with LaTeX and ChemFig ---------------------------------- % +% - Create reaction schemes with LaTeX and ChemFig ------------------------------------ % % ------------------------------------------------------------------------------------- % % - Clemens Niederberger -------------------------------------------------------------- % -% - 2011/04/23 ------------------------------------------------------------------------ % +% - 2011/04/27 ------------------------------------------------------------------------ % % ------------------------------------------------------------------------------------- % % - http://www.niederberger-berlin.net/2011/02/latex-mychemistry/ --------------------- % % - kontakt@niederberger-berlin.net --------------------------------------------------- % @@ -27,7 +27,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. - % % - - % % - This work consists of the files mychemistry.sty, mychemistry_de.tex, - % -% - mychemistry_en.tex and bondwidth.tex - % +% - mychemistry_en.tex, examples.tex - % % ------------------------------------------------------------------------------------- % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[DIV10,titlepage,toc=index]{scrartcl} @@ -36,8 +36,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{standalone} \usepackage{scrhack} % verbessert KOMAs Zusammenspiel mit floats -\usepackage{emerald} % chemfig-Schrift -\usepackage[utf8x]{inputenc} % Zeichenkodierung: Eingabe +\usepackage{emerald} % Schriftarten +\usepackage[utf8]{inputenx} % Zeichenkodierung: Eingabe \usepackage[T1]{fontenc} % Text-Ausgabe-Codierung \usepackage{textcomp,mathcomp} \usepackage[english]{babel} % Sprache @@ -103,7 +103,7 @@ keywordstyle=[20]\color{blue}, morekeywords=[20]{rxn,rxnfloat,rxnscheme,tikzpicture}, texcsstyle=[30]\color{code}, - moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setbondwidth,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, + moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, fancyvrb=true } diff --git a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.pdf b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.pdf Binary files differindex 5d8bb9e9151..76e3bb2c12a 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.pdf +++ b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.pdf diff --git a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.tex b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.tex index 07a85abe8a2..3aa64b7039f 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.tex +++ b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_de.tex @@ -1,10 +1,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------------------------------------------------------------------------- % % - myChemistry - mychemistry_de.tex -------------------------------------------------- % -% - Creating reaction schemes with LaTeX and ChemFig ---------------------------------- % +% - Create reaction schemes with LaTeX and ChemFig ------------------------------------ % % ------------------------------------------------------------------------------------- % % - Clemens Niederberger -------------------------------------------------------------- % -% - 2011/04/23 ------------------------------------------------------------------------ % +% - 2011/04/27 ------------------------------------------------------------------------ % % ------------------------------------------------------------------------------------- % % - http://www.niederberger-berlin.net/2011/02/latex-mychemistry/ --------------------- % % - kontakt@niederberger-berlin.net --------------------------------------------------- % @@ -27,7 +27,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. - % % - - % % - This work consists of the files mychemistry.sty, mychemistry_de.tex, - % -% - mychemistry_en.tex and bondwidth.tex - % +% - mychemistry_en.tex, examples.tex - % % ------------------------------------------------------------------------------------- % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[DIV10,titlepage,toc=index]{scrartcl} @@ -36,8 +36,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{etoolbox} \usepackage{scrhack} % verbessert KOMAs Zusammenspiel mit floats -\usepackage{emerald} % chemfig-Schrift -\usepackage[utf8]{inputenc} % Zeichenkodierung: Eingabe +\usepackage{emerald} % Schriftarten +\usepackage[utf8]{inputenx} % Zeichenkodierung: Eingabe \usepackage[T1]{fontenc} % Text-Ausgabe-Codierung \usepackage{textcomp,mathcomp} \usepackage[makeindex]{splitidx} % Index; Kompilieren: makeindex -sl index.ist *.idx @@ -129,7 +129,7 @@ keywordstyle=[20]\color{blue}, morekeywords=[20]{rxn,rxnfloat,rxnscheme,tikzpicture}, texcsstyle=[30]\color{code}, - moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlabel,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setbondwidth,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, + moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlabel,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, fancyvrb=true } @@ -249,6 +249,7 @@ \newcommand{\CF}{{\ECFAugie ChemFig}\xspace} % ChemFig in der originalen Schrift \newcommand{\zB}{\mbox{z.\,B.}\xspace} \newcommand{\TikZ}{\mbox{Ti{\bfseries\itshape k}Z}\xspace} +% folgender Befehl ist eine Kopie von CHristian Tellecheas \newcommand\NEU[1][0pt]{\leavevmode\llap{\footnotesize\ECFTeenSpirit\color{red}Neu\kern\dimexpr20pt+#1\relax}} \newlength{\tmplength} % - für Beispiele --------------------------------------------------------------------- % @@ -348,8 +349,6 @@ Die Voreinstellungsbefehle wurden umbenannt und der Befehl \lstinline+\mCsetup+ Es gibt den neuen Befehl \lstinline+\chemand+, der ein $+$ erzeugt, siehe \ref{ssec:chemand}. -Wenn man \CF v0.4 oder v0.4a verwendet, wird die Datei \lstinline+bondwidth.tex+ eingebunden, die den Befehl \lstinline+\setbondwidth{<dicke>}+ bereitstellt. Damit kann die Liniendicke der Bindungen von \CF-Formeln verändert werden. - Und auch das ist vielleicht ganz angenehm: alle \mC-Befehle in den Listings der Dokumentation sind nun anklickbare Hyperlinks, die auf ihre Beschreibung in der Befehlsreferenz verweisen. \subsubsection{Version 1.4} @@ -373,6 +372,8 @@ Die Default-Platzierung von \lstinline+rxnscheme+ wurde von \lstinline+H+ in \ls Die konkreten Einsatz-Beispiele wurden aus der Dokumentation ausgelagert und befinden sich in der Datei \texttt{examples.tex} bzw. \texttt{examples.pdf}. +Die Befehle \lstinline+\arrow+, \lstinline+\reactant+, \lstinline+\mesomeric+, \lstinline+\transition+, \lstinline+\anywhere+, \lstinline+\dummy+, \lstinline+\branch+ und \lstinline+\chemand+ sind nur innerhalb der Umgebungen \lstinline+rxn+ und \lstinline+rxnscheme+ definiert. + \subsection{Lizenz} \mC v\mCversion\ steht unter der \LaTeX\ Project Public License Version 1.3 oder später.\newline(\url{http://www.latex-project.org/lppl.txt}) @@ -529,7 +530,7 @@ Die Reaktanden und Pfeile können nicht nur durch Schlüsselwörter und Winkel a \arrow[start.-40,-|>]{\tiny$\text{R}^1=\text{Alkyl}$} {\tiny$\text{R}^2=\text{Alkyl}$} \end{rxn} \end{Example} -Im letzen Beispiel wurden dem ersten Reaktanden der \lstinline+<name>+ \lstinline+start+ gegeben. Darauf konnten sich die Pfeile in Zeilen 5 und 7 in der Positionierung beziehen. Der \emph{zuvor vergebene Name} fungiert als Anker für den nächsten Reaktanden oder Pfeil, wenn die Positionierung nach dem Muster +Im letzten Beispiel wurden dem ersten Reaktanden der \lstinline+<name>+ \lstinline+start+ gegeben. Darauf konnten sich die Pfeile in Zeilen 5 und 7 in der Positionierung beziehen. Der \emph{zuvor vergebene Name} fungiert als Anker für den nächsten Reaktanden oder Pfeil, wenn die Positionierung nach dem Muster \begin{lstlisting} <anker>.<winkel> \end{lstlisting} @@ -1783,7 +1784,7 @@ Viel Spaß mit \mC! \section{Dank} Ich schulde Dank für Bugreports und Vorschläge: -F.\,Chervet, Ferghun, V.\,Garibal. +F.\,Chervet, Ferghun, V.\,Garibal und C.\,Tellechea (der mir ein paar essentielle Dinge klar machte). \renewcommand{\indexname}{Stichwortverzeichnis} \printindex diff --git a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.pdf b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.pdf Binary files differindex c7a97b04807..933e61fee3c 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.pdf +++ b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.pdf diff --git a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.tex b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.tex index 70243a291ca..c318a50d0e2 100644 --- a/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.tex +++ b/Master/texmf-dist/doc/latex/mychemistry/mychemistry_en.tex @@ -1,10 +1,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------------------------------------------------------------------------- % % - myChemistry - mychemistry_en.tex -------------------------------------------------- % -% - Creating reaction schemes with LaTeX and ChemFig ---------------------------------- % +% - Create reaction schemes with LaTeX and ChemFig ------------------------------------ % % ------------------------------------------------------------------------------------- % % - Clemens Niederberger -------------------------------------------------------------- % -% - 2011/04/23 ------------------------------------------------------------------------ % +% - 2011/04/27 ------------------------------------------------------------------------ % % ------------------------------------------------------------------------------------- % % - http://www.niederberger-berlin.net/2011/02/latex-mychemistry/ --------------------- % % - kontakt@niederberger-berlin.net --------------------------------------------------- % @@ -27,7 +27,7 @@ % - The Current Maintainer of this work is Clemens Niederberger. - % % - - % % - This work consists of the files mychemistry.sty, mychemistry_de.tex, - % -% - mychemistry_en.tex and bondwidth.tex - % +% - mychemistry_en.tex, examples.tex - % % ------------------------------------------------------------------------------------- % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[DIV10,titlepage,toc=index]{scrartcl} @@ -36,8 +36,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{etoolbox} \usepackage{scrhack} % verbessert KOMAs Zusammenspiel mit floats -\usepackage{emerald} % chemfig-Schrift -\usepackage[utf8x]{inputenc} % Zeichenkodierung: Eingabe +\usepackage{emerald} % Schriftarten +\usepackage[utf8]{inputenx} % Zeichenkodierung: Eingabe \usepackage[T1]{fontenc} % Text-Ausgabe-Codierung \usepackage{textcomp,mathcomp} \usepackage[makeindex]{splitidx} % Index; Kompilieren: makeindex -sl index.ist *.idx @@ -127,7 +127,7 @@ keywordstyle=[20]\color{blue}, morekeywords=[20]{rxn,rxnfloat,rxnscheme,tikzpicture}, texcsstyle=[30]\color{code}, - moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlabel,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setbondwidth,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, + moretexcs=[30]{anywhere,arrow,branch,chemabove,chemand,chembelow,chemfig,chemmove,chemname,chemrel,chemsign,ce,color,compound,declarecompound,draw,dummy,elmove,floatplacement,floatstyle,Hpl,Hyd,lewis,listof,makeinvisible,makevisible,marrow,mCsetup,merge,mesomeric,node,nu,om,op,ox,pgfpositionnodelater,reactant,restylefloat,setarrowlabel,setarrowlength,setarrowline,setatomsep,setatomsize,setbondlength,setbondshape,setcrambond,setmergelength,setrcndist,setrxnalign,setschemealign,setschemename,si,SI,textcolor,transition,vflipnext}, fancyvrb=true } @@ -347,8 +347,6 @@ The commands to customize \mC have been renamed and the command\linebreak\lstinl There is the new command \lstinline+\chemand+, which produces a $+$, see \ref{ssec:chemand}. -If you're using \CF v0.4 or v0.4a, \mC inputs the file \lstinline+bondwith.tex+ which provides the command \lstinline+\setbondwidth{<width>}+ with which you can change the line thickness of bonds. - And you might find this one nice: every \mC command in a listing in this do\-cu\-mentation is a hyperlink referring to the corresponding entry in the command reference. \subsubsection{Version 1.4} @@ -372,6 +370,8 @@ The default placement identifier of \lstinline+rxnscheme+ has been changed from The example section has been moved from this manual to the file \texttt{examples.tex} or \texttt{examples.pdf}, resp. +The commands \lstinline+\arrow+, \lstinline+\reactant+, \lstinline+\mesomeric+, \lstinline+\transition+, \lstinline+\anywhere+, \lstinline+\dummy+, \lstinline+\branch+ and \lstinline+\chemand+ are only defined inside the \lstinline+rxn+ and \lstinline+rxnscheme+ environments. + \subsection{Licence} \mC v\mCversion\ underlies the The \LaTeX\ project public license\\(\url{http://www.latex-project.org/lppl.txt}). @@ -1782,7 +1782,7 @@ Have fun with \mC! \section{Thanks} I owe thanks for bug reports and suggestions to: -F.\,Chervet, Ferghun, V.\,Garibal. +F.\,Chervet, Ferghun, V.\,Garibal and C.\,Tellechea (who pointed out some essential issues). \printindex \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/mychemistry/mychemistry.sty b/Master/texmf-dist/tex/latex/mychemistry/mychemistry.sty index 60a6b968d60..38325495786 100644 --- a/Master/texmf-dist/tex/latex/mychemistry/mychemistry.sty +++ b/Master/texmf-dist/tex/latex/mychemistry/mychemistry.sty @@ -1,10 +1,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------------------------------------------------------------------------- % % - myChemistry - mychemistry.sty ----------------------------------------------------- % -% - Creating reaction schemes with LaTeX and ChemFig ---------------------------------- % +% - Create reaction schemes with LaTeX and ChemFig ------------------------------------ % % ------------------------------------------------------------------------------------- % % - Clemens Niederberger -------------------------------------------------------------- % -% - 2011/04/23 ------------------------------------------------------------------------ % +% - 2011/04/27 ------------------------------------------------------------------------ % % ------------------------------------------------------------------------------------- % % - http://www.niederberger-berlin.net/2011/02/latex-mychemistry/ --------------------- % % - kontakt@niederberger-berlin.net --------------------------------------------------- % @@ -26,8 +26,8 @@ % - - % % - The Current Maintainer of this work is Clemens Niederberger. - % % - - % -% - This work consists of the files mychemistry.sty, mychemistry_de.tex and - % -% - mychemistry_en.tex - % +% - This work consists of the files mychemistry.sty, mychemistry_de.tex, - % +% - mychemistry_en.tex, examples.tex - % % ------------------------------------------------------------------------------------- % % - 2011/02/24 version 1.0 - % % - first release to CTAN - % @@ -101,6 +101,10 @@ % - arrow types <=>> and <<=> added - % % - arrow type -+> modified: more flexible - % % - bugfixes in error-handling - % +% - 2011/04/27 version 1.5.1 - % +% - removed bondwidth.tex - % +% - \arrow, \reactant, \mesomeric, \transition, \anywhere, \dummy, \branch, - % +% - and \chemand only defined inside scheme environments - % % ------------------------------------------------------------------------------------- % % - TODO: - % % - work on how chemistry-packages are automatically loaded; - % @@ -111,10 +115,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Paket Info % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\mC@version{1.5} -\def\mC@date@de{23. April 2011} -\def\mC@date@en{April 23rd 2011} -\def\mC@date{2011/04/23} +\def\mC@version{1.5.1} +\def\mC@date@de{27. April 2011} +\def\mC@date@en{April 27th 2011} +\def\mC@date{2011/04/27} \def\mC@name{myChemistry} \ProvidesPackage{mychemistry}[\mC@date\space v\mC@version] \typeout{} @@ -125,15 +129,6 @@ % myChemistry Informationen ----------------------------------------------------------- % \def\mCversion{\mC@version} \def\mCdate#1{\csname mC@date@#1\endcsname} -% additional für ChemFig v0.4 --------------------------------------------------------- % -\def\mC@CFversion@test{0.4}% -\IfFileExists{bondwidth.tex}{% - \ifx\CF@ver\mC@CFversion@test\input{bondwidth}\fi -}{}% -\def\mC@CFversion@test{0.4a} -\IfFileExists{bondwidth.tex}{% - \ifx\CF@ver\mC@CFversion@test\input{bondwidth}\fi -}{}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Optionen, z.T. auch an chemexec weitergeben %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -259,15 +254,18 @@ \def\mC@false{false} % Optional Argument Analysis ---------------------------------------------------------- % % Prüfen ob #2 in #1 enthalten ist +% (das Makro ist eine Kopie von \CF@if@instr in chemfig.tex von Christian Tellechea) \def\mC@if@instr#1#2{% \def\mC@if@instr@i##1#2##2\@nil{\ifx\@empty##2\@empty\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}% \mC@if@instr@i#1\@@nil#2\@nil } % Am ersten , splitten, #1 in #3 speichern, #2 in \mC@remainargs +% (das Makro ist eine Kopie von \CF@analyze@movearg in chemfig.tex von Christian Tellechea) \def\mC@splitfirst#1,#2\@nil#3{% \def#3{#1}\def\mC@remainargs{#2}% } % ein durch , in 3 Teile getrenntes Argument splitten +% (das Makro ist eine Abwandlung von \CF@analyze@movearg in chemfig.tex von Christian Tellechea) \def\mC@splitarg#1{ \mC@if@instr{#1}{,}{\expandafter\mC@splitfirst#1\@nil\mC@firstarg}{\def\mC@firstarg{#1}} \expandafter\mC@if@instr\expandafter{\mC@remainargs}{,}{\expandafter\mC@splitfirst\mC@remainargs\@nil\mC@secondarg}{\expandafter\def\expandafter\mC@secondarg\expandafter{\mC@remainargs}} @@ -286,7 +284,8 @@ \def\mC@vert@i{90} \def\mC@vert@ii{-90} \def\mC@vert@iii{270} -% Richtung in Bezug auf node oder nicht? +% Richtung in Bezug auf node oder nicht? +% (nur eine Kopie/Variante von \mC@splitfirst, das wiederum eine Kopie von \CF@analyze@movearg in chemfig.tex von Christian Tellechea ist) \def\mC@split@angle#1.#2\@nil#3{\def#3{#1}\def\mC@direction{#2}} \def\mC@wowo@node#1{\mC@if@instr{#1}{.}{\expandafter\mC@split@angle#1\@nil\mC@referred@node}{\def\mC@direction{#1}}} % Winkel bestimmen: @@ -443,7 +442,7 @@ } % ------------------------------------------------------------------------------------- % % Pfeil zeichnen: -\def\arrow{\@ifnextchar[{\mC@arrow@ii}{\mC@arrow@i}} +\def\mC@arrow{\@ifnextchar[{\mC@arrow@ii}{\mC@arrow@i}} \def\mC@arrow@i#1#2{ \node[on chain=going {at=(\tikzchainprevious.0)},minimum size=0,inner sep=3pt,outer sep=0,anchor=180,shift=(0:.5*\mC@rxn@node@distance)] (@mC@arrow@start){}; \node[on chain=going {at=(\tikzchainprevious.0),shift=($(0:.5*\mC@arrow@factor*\mC@arrow@length)$)}, minimum size=0,inner sep=3pt,outer sep=0] (@mC@arrow@end){}; @@ -756,6 +755,14 @@ \mC@rxnscheme@i% } \def\mC@rxnscheme@i#1{% + \let\arrow\mC@arrow% + \let\reactant\mC@reactant% + \let\mesomeric\mC@mesomeric% + \let\transition\mC@transition% + \let\anywhere\mC@anywhere% + \let\dummy\mC@dummy% + \let\branch\mC@branch% + \let\chemand\mC@chemand% \def\mC@rs@caption{#1}% \rxnfloat% \ifx\mC@rs@align\mC@rs@center \centering \fi% @@ -773,6 +780,14 @@ \label{\mC@rs@currentlabel}% \fi \endrxnfloat% + \let\arrow\relax% + \let\reactant\relax% + \let\mesomeric\relax% + \let\transition\relax% + \let\anywhere\relax% + \let\dummy\relax% + \let\branch\relax% + \let\chemand\relax% } % ------------------------------------------------------------------------------------- % @@ -808,6 +823,14 @@ \mC@rxn@i } \def\mC@rxn@i{% + \let\arrow\mC@arrow% + \let\reactant\mC@reactant% + \let\mesomeric\mC@mesomeric% + \let\transition\mC@transition% + \let\anywhere\mC@anywhere% + \let\dummy\mC@dummy% + \let\branch\mC@branch% + \let\chemand\mC@chemand% \hspace*{0pt}% \ifx\mC@reaction@align\mC@reaction@center% \center% @@ -834,6 +857,15 @@ \ifx\mC@reaction@align\mC@reaction@right% \endflushright% \fi + \let\arrow\relax% + \let\arrow\relax% + \let\reactant\relax% + \let\mesomeric\relax% + \let\transition\relax% + \let\anywhere\relax% + \let\dummy\relax% + \let\branch\relax% + \let\chemand\relax% } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -841,11 +873,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Standardreaktand -------------------------------------------------------------------- % % \reactant[<pos>,<name>,<tikz>]{<something>} -\def\reactant{\@ifnextchar[{\reactant@ii}{\reactant@i}} -\def\reactant@i#1{ +\def\mC@reactant{\@ifnextchar[{\mC@reactant@ii}{\mC@reactant@i}} +\def\mC@reactant@i#1{ \expandafter\node\expandafter[\mC@reactant@visible,on chain=going {at=(\tikzchainprevious.0)},anchor=180,shift=(0:\mC@rxn@node@distance)]{\scantokens{\relax#1}}; } -\def\reactant@ii[#1]#2{ +\def\mC@reactant@ii[#1]#2{ \let\mC@remainargs\@empty\mC@splitarg{#1} \ifx\@empty\mC@firstarg% erste Option: <pos>, zweite Option: <name>, dritte Option: <tikz> \def\mC@angle{0} @@ -858,15 +890,14 @@ \ifx\mC@referred@node\@empty\def\mC@referred@node{\tikzchainprevious}\fi \expandafter\expandafter\expandafter\node\expandafter\expandafter\expandafter[\expandafter\mC@thirdarg\expandafter,\mC@reactant@visible,on chain=going {at=(\mC@referred@node.\mC@angle)},anchor=\mC@anchor,shift=(\mC@angle:\mC@rxn@node@distance)](\mC@secondarg){\scantokens{\relax#2}}; } -\let\reactand\reactant % Mesomerie --------------------------------------------------------------------------- % % \mesomeric[<pos>,<name>,<tikz>]{<something>} -\def\mesomeric{\@ifnextchar[{\mesomeric@ii}{\mesomeric@i}} -\def\mesomeric@i#1{ +\def\mC@mesomeric{\@ifnextchar[{\mC@mesomeric@ii}{\mC@mesomeric@i}} +\def\mC@mesomeric@i#1{ \node[on chain=going {at=(\tikzchainprevious.0),shift=($(0:\mC@rxn@node@distance)$)},anchor=180,shift=(0:\mC@rxn@node@distance),inner sep=1pt,left delimiter={[},right delimiter={]}]{\tikzpicture[start branch]\scantokens{\relax#1}\endtikzpicture}; } -\def\mesomeric@ii[#1]#2{ +\def\mC@mesomeric@ii[#1]#2{ \let\mC@remainargs\@empty\mC@splitarg{#1} \ifx\@empty\mC@firstarg% erste Option: <pos>, zweite Option: <name>, dritte Option: <tikz> \def\mC@angle{0} @@ -888,7 +919,7 @@ % Anywhere ---------------------------------------------------------------------------- % % \anywhere{<pos>,<name>,<tikz>}{<something>} -\def\anywhere#1#2{ +\def\mC@anywhere#1#2{ \let\mC@remainargs\@empty\mC@splitarg{#1}% erste Option: <pos>, zweite Option: <name>, dritte Option: <tikz> \ifx\mC@firstarg\@empty \PackageError{mychemistry}{\string\anywhere: positioning missing}{See the myChemistry package documentation for explanation} @@ -910,18 +941,18 @@ % Dummy ------------------------------------------------------------------------------- % % \dummy[<name>] -\def\dummy{\@ifnextchar[{\mC@dummy@i}{\mC@dummy@ii}} +\def\mC@dummy{\@ifnextchar[{\mC@dummy@i}{\mC@dummy@ii}} \def\mC@dummy@i[#1]{\draw node[on chain,xshift=-\mC@rxn@node@distance](#1){};} \def\mC@dummy@ii{\draw node[on chain,xshift=-\mC@rxn@node@distance]{};} % Uebergangszustand ------------------------------------------------------------------- % % \transition[<pos>,<name>,<tikz>]{<something>} -\def\transition{\@ifnextchar[{\transition@ii}{\transition@i}} -\def\transition@i#1{ +\def\mC@transition{\@ifnextchar[{\mC@transition@ii}{\mC@transition@i}} +\def\mC@transition@i#1{ \expandafter\node\expandafter[\mC@reactant@visible,on chain=going {at=(\tikzchainprevious.0)},anchor=180,shift=(0:\mC@rxn@node@distance),anchor=180,inner sep=3pt,left delimiter={[},right delimiter={]}](mC@transition@name){\scantokens{\relax#1}}; \node at ($(mC@transition@name.north east)+(.7em,0)$) {$\ddagger$}; } -\def\transition@ii[#1]#2{ +\def\mC@transition@ii[#1]#2{ \let\mC@remainargs\@empty\mC@splitarg{#1} \ifx\@empty\mC@firstarg% erste Option: <pos> \def\mC@angle{0} @@ -973,21 +1004,20 @@ \mC@branch@iii{#2}} \def\mC@branch@iii#1{ \expandafter\expandafter\expandafter\node\expandafter\expandafter\expandafter[\expandafter\mC@branch@positioning\expandafter,\mC@thirdarg](\mC@secondarg){\tikzpicture[start branch]\scantokens{\relax#1}\endtikzpicture};}% scantokens nötig, da sonst eine Dreifachbindung ~ vor () mit falschem catcode interpretiert wird -\def\branch{\mC@branch} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Sonstiges --------------------------------------------------------------------------- % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Elektronenverschiebungspfeile ------------------------------------------------------- % -\def\elmove{\@ifnextchar[{\mC@elmove@i}{\mC@elmove@ii}} +\def\mC@elmove{\@ifnextchar[{\mC@elmove@i}{\mC@elmove@ii}} \def\mC@elmove@i[#1]#2#3#4#5{\chemmove{\draw[#1](#2).. controls +(#3) and +(#5)..(#4);}} \def\mC@elmove@ii#1#2#3#4{\chemmove{\draw[->,red,shorten <=3pt,shorten >=1pt](#1).. controls +(#2) and +(#4)..(#3);}} +\let\elmove\mC@elmove % Plus -------------------------------------------------------------------------------- % \def\mC@chemand{\@ifnextchar[{\mC@chemand@ii}{\mC@chemand@i}} \def\mC@chemand@i{\reactant{\chemsign[0pt]{+}}} \def\mC@chemand@ii[#1]{\reactant[#1]{\chemsign[0pt]{+}}} -\def\chemand{\mC@chemand} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Setup myChemistry ------------------------------------------------------------------- % |