summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG15
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README11
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf10
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin235016 -> 235065 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps4
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf40
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin474538 -> 475648 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex62
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin179479 -> 179634 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex54
10 files changed, 103 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index f5a81270fb4..a103f960870 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,19 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2018-04-16
+ Changelog of mcf2graph software package by Akira Yamaji 2018-06-03
*******************************************************************************
+[ver. 4.32 / 2018-06-03]
+ -add commands C[],N[],O[],S[]
+ X[1] : "{X^+^}"
+ X[-1] : "{X^-^}"
+ -change option parameter name
+ sw_MOLout => sw_mol_out
+ sw_auxout => sw_aux_out
+ -improve MOL file output
+ sw_mol_out=0 : no MOL file
+ sw_mol_out=1 : MOL file V2000
+ sw_mol_out=2 : MOL file V3000
+ -update MCF manual and examples
+
[ver. 4.31 / 2018-04-16]
-add command */*n , n:*\* , |<=n
*/*n : /n~wv
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 6cf444033df..53e803731d3 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/README
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.31 2018-04-16
+ version : 4.32 2018-06-03
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -11,7 +11,7 @@
structure diagrams. This 'Coding' is named from coding(programing) technique
adressing,grouping,macro,etc. There are no Meta language commands in MCF.
mcf2graph.mf(METAFONT/METAPOST macro) convert MCF file to graphics file
- (pk font/PNG/SVG/EPS) or MDL MOL file(V2000).
+ (pk font/PNG/SVG/EPS) or MDL MOL file.
2. The distribution of software
( 1) README This file
@@ -35,9 +35,10 @@
( 2) >mpost -s ahangle=1 FILENAME => output PNG file (default:eps)
( 3) >mpost -s ahangle=2 FILENAME => output SVG file
( 4) >mpost -s ahangle=3 FILENAME => output MDL Molfile(V2000)
- ( 5) >mpost -s ahlength=1 FILENAME => output first definition only (for test)
- ( 6) >mpost -s ahlength=2 FILENAME => output report
- ( 7) >mpost -s ahlength=3 FILENAME => use plain.mp 'label','drawarrow'
+ ( 5) >mpost -s ahangle=4 FILENAME => output MDL Molfile(V3000)
+ ( 6) >mpost -s ahlength=1 FILENAME => output first definition only (for test)
+ ( 7) >mpost -s ahlength=2 FILENAME => output report
+ ( 8) >mpost -s ahlength=3 FILENAME => use plain.mp 'label','drawarrow'
4. License
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
index 5f6a527ede7..c510dcc2e47 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,14 +1,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2018.04.16
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2018.06.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.31 or later
+input mcf2graph.mf; %%% it must be version 4.32 or later
%-------------------------------------------------------------------------
font_wd:=33mm;
font_ht:=24mm;
max_bond_length:=4.5mm;
%-------------------------------------------------------------------------
sw_select:=1;
-sw_auxout:=1;
+sw_aux_out:=1;
sw_font_frame:=0;
sw_atom_frame:=0;
%%%% sw_expand:=1;
@@ -25,7 +25,7 @@ var4:="cal_MW"; tag4:="cMW";
%%%% var9:="inf_EXA"; tag9:="EXA";
%%%% auxtag_out;
%%%% sw_report:=1;
-%%%% sw_MOLout:=1;
+%%%% sw_mol_out:=1;
%%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png";
%***************************************************************************
beginfont("EN:Acetamiprid","MW:222.676")
@@ -222,7 +222,7 @@ endfont
beginfont("EN:Gibberellin A3","MW:346.379");
MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb,
5:@,40~zf`1,O,50,//O^180,14~zb:&,
- 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1^60,4^60}:*/H)
+ 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60)
endfont;
%**************************************************************************
beginfont("EN:Cholesterol","MW:386.664")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 763f58b333d..ea64258787c 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
index 1aee7834309..6e3f08e73da 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
@@ -1,8 +1,8 @@
%!PS-Adobe-3.0 EPSF-3.0
%%BoundingBox: -1 -1 212 60
%%HiResBoundingBox: -0.09962 -0.09962 211.90288 59.64348
-%%Creator: MetaPost 2.000
-%%CreationDate: 2017.08.27:1449
+%%Creator: MetaPost 2.00
+%%CreationDate: 2018.06.03:2010
%%Pages: 1
%%DocumentResources: procset mpost-minimal
%%+ font NJFVSO-NimbusSanL-Regu ICXWUR-CMR8
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
index 18d32da7acf..bae2cbb6d62 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2018.04.16
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2018.06.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.31 or later
+input mcf2graph.mf; %% it must be version 4.32 or later
%------------------------------------------------------------------------
-sw_auxout:=0;
+sw_aux_out:=0;
sw_mol_frame:=0;
sw_expand:=0;
sw_solid:=2;
@@ -273,21 +273,12 @@ beginfont("EN:change bond 3")
sw_clip:=1;
ratio_chain_ring:=1;
margin_top_bottom:=3mm;
- MCf(<30,!3,1=dt,3=wv)
+ MCf(<30,!7,1=dt,3=wv,5=bd,7=bz)
endfont
%***********************************************************************
beginfont("EN:change bond 4")
font_ht:=12mm;
bond_len:=8mm;
- sw_clip:=1;
- ratio_chain_ring:=1;
- margin_top_bottom:=3mm;
- MCf(<30,!3,1=bd,3=bz)
-endfont
-%***********************************************************************
-beginfont("EN:change bond 5")
- font_ht:=12mm;
- bond_len:=8mm;
margin_top_bottom:=3mm;
sw_clip:=1;
ratio_chain_ring:=1;
@@ -322,16 +313,17 @@ beginfont("EN:change ring length")
endfont
%***********************************************************************
beginfont("EN:Insert atom")
- sw_clip:=1;
- font_ht:=10mm;
+ font_wd:=70mm;
+ font_ht:=12mm;
MCf(<30,!2,O,!2,N,!2)
endfont
%***********************************************************************
beginfont("EN:change atom")
- font_ht:=18mm;
- MCa(.5,1)(<30,!6,2:O,{3,5}:N)
+ font_wd:=70mm;
+ font_ht:=10mm;
+ MCa(0,0.5)(<-30,!4,2:O,{3,4}:N)
sw_numberA:=1;
- MCa(.5,.05)(<30,!6,2:O,{3,5}:N)
+ MCa(1,0.5)(<-30,!4,2:O,{3,4}:N)
endfont
%***********************************************************************
beginfont("EN:change atom brock address 1")
@@ -366,6 +358,13 @@ beginfont("EN:change atom relative adress")
MCd(1,.88)(1,.5)(?6,4:\,?6)
endfont
%***********************************************************************
+beginfont("EN:Charged atom")
+ sw_clip:=1;
+ font_wd:=60mm;
+ font_ht:=15mm;
+ MCf(<-30,!2,N[1],!2,O[-1])
+endfont
+%***********************************************************************
beginfont("EN:fused ring")
font_ht:=18mm;
margin_top_bottom:=1.5mm;
@@ -953,6 +952,8 @@ beginfont("EN:EXT()")
font_ht:=30mm;
ratio_bond_width:=0.065;
sw_solid:=1;
+ sw_label_emu:=1;
+ %
MCa(0.1,0.5)(<-210,60`1,60`1,60`1,{1,3}=dl,1:/R1,4:/R2^-60)
ext(
defaultscale:=0.6;
@@ -968,6 +969,7 @@ beginfont("EN:EXT()")
drawarrow (0.52w,0.5h)..(0.6w,0.5h);
defaultscale:=0.7;
label("+",(0.25w,0.5h));
+ ratio_thickness_char:=0.125;
label.bot("Diels-Alder Reaction",(0.5w,h));
)
endfont
@@ -1055,7 +1057,7 @@ beginfont("EN:Gibberellin A3","CAS:77-06-5","FM:C19H22O6","MW:346.37");
font_ht:=20mm;
MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb,
5:@,40~zf`1,O,50,//O^180,14~zb:&,
- 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1^60,4^60}:*/H)
+ 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60)
endfont
%***************************************************************************
beginfont("EN:Quinine","CAS:130-95-0","FM:C20H24N2O2","MW:324.42")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index e6ba522d695..c976c47ff4a 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index d5e694c8ca4..f39d7cbf80c 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2018.04.16
+% Molecular Coding Format manual by Akira Yamaji 2018.06.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\documentclass[a4paper,twoside]{article}
@@ -85,7 +85,6 @@
\linethickness{0.08mm}%
%----------------------------------------------------------------------------
\newpage
-\setcounter{page}{1}
\section{Introduction}
Molecular Coding Format(MCF) is new linear notation
represent chemical structure diagrams.
@@ -93,7 +92,7 @@ This 'Coding' is named from coding(programing) technique
like adressing,grouping,macro,etc.
There are no Meta language commands in MCF.
mcf2graph convert MCF file to graphics file
-pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
+pk font,PNG,SVG,EPS or MDL MOL file.\\
%-----------------------------------------------------------------------------
\section{MCF syntax}
\subsection{Make bond}
@@ -227,28 +226,17 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\begin{verbatim}
Bn=bond type : change bond type at Bn
dt : dotted / wv : wave
-
- <30,!3,1=dt,3=wv
-\end{verbatim}
-\MCFstructure
-\vspace{-3mm}%
-\begin{verbatim}
- dt wv
-\end{verbatim}
-%-----------------------------------------------------------------------------
-\subsubsection{Broad}
-\begin{verbatim}
bd : broad / bz : broad dotted
- <30,!3,1=bd,3=bz
+ <30,!7,1=dt,3=wv,5=bd,7=bz
\end{verbatim}
\MCFstructure
\vspace{-3mm}%
\begin{verbatim}
- bd bz
+ dt wv bd bz
\end{verbatim}
%-----------------------------------------------------------------------------
-\subsubsection{Change multi bond type}
+\subsubsection{Change multiple bond type}
\begin{verbatim}
{2,4,6}=dr : 2=dr,4=dr,6=dr
@@ -294,7 +282,6 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
-\newpage
\subsection{Change atom}
\subsubsection{Insert atom}
\begin{verbatim}
@@ -307,9 +294,9 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\subsubsection{Addressed atom}
\begin{verbatim}
2:O : change A2 C to O
- {3,5}:N : change A3,A5 C to N
+ {3,4}:N : change A3,A4 C to N
- <30,!6,2:O,{3,5}:N
+ <30,!4,2:O,{3,4}:N
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -346,6 +333,14 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
+\subsubsection{Charged atom}
+\begin{verbatim}
+ N[1]:N+ / O[-1]:O-
+
+ <-30,!2,N[1],!2,O[-1]
+\end{verbatim}
+\MCFstructure
+%-----------------------------------------------------------------------------
\subsection{Fuse ring}
\subsubsection{Attached 1 bond}
\begin{verbatim}
@@ -1053,6 +1048,8 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
p[m]: molecular origin position
w[m]: molecular width
h[m]: molecular height
+ ratio_thickness_char:
+ pen thickness / char width
%----------------------------------------
beginfont()
@@ -1064,17 +1061,13 @@ beginfont()
MCd(1,1)(0.1,0.5)
(<-210,60`1,60`1,60`1,{1,3}=dl,
1:/R1,4:/R2^-60)
- ext(
- defaultscale:=0.6;
- label.bot("Diene",p0+(0.5w,0));
- )
+ ext(defaultscale:=0.6;
+ label.bot("Diene",p0+(0.5w,0));)
%---------------------------------------
MCd(1,1)(0.4,0.5)
(<-30,-60`1,1=dl,1:/R3,2:/R4^60)
- ext(
- defaultscale:=0.6;
- label.bot("Dienophile",p0+(0.5w,0));
- )
+ ext(defaultscale:=0.6;
+ label.bot("Dienophile",p0+(0.5w,0));)
%---------------------------------------
MCd(1,1)(0.9,0.5)
(<30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1)
@@ -1083,6 +1076,7 @@ beginfont()
drawarrow (0.52w,0.5h)..(0.6w,0.5h);
defaultscale:=0.7;
label("+",(0.25w,0.5h));
+ ratio_thickness_char:=0.125;
label.bot("Diels-Alder Reaction",
(0.5w,h));
)
@@ -1245,7 +1239,7 @@ drawarrow & drawdblarrow:
13=dl,6=wf,8=wb,
5:@,40~zf`1,O,60,//O^180,14~zb:&,
2:/COOH,7://_,13:*/OH,8:/*OH,
- 14:*/_,{1^60,4^60}:*/H
+ 14:*/_,{1,4}:*/H^60
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -1494,15 +1488,17 @@ cFM : molecular formula calculated
\newpage
%------------------------------------------------------------------------
\noindent%
-\subsection{Molfile output}
+\subsection{MOL file output}
\paragraph{(Insert option parameter setting)}
\begin{verbatim}
- sw_MOLout:=1;
- ** default : sw_MOLout=0
+ sw_mol_out:=1; (V2000)
+ sw_mol_out:=2; (V3000)
+ ** default : sw_mol_out=0
\end{verbatim}
\paragraph{(Command line)}
\begin{verbatim}
- >mpost -s ahangle=3 FILENAME (molecular definition file)
+ >mpost -s ahangle=3 FILENAME (molecular definition file) V2000
+ >mpost -s ahangle=4 FILENAME (molecular definition file) V3000
\end{verbatim}
\paragraph{(Output)}
\begin{verbatim}
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
index 461372c8694..e7c1fd164ab 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
index 8d9ce8d6572..98a89ef5d1b 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2018.04.16
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2018.06.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.31 or later
+%%% mcf2graph.mf it must be version 4.32 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
@@ -10,7 +10,7 @@
\mplibcodeinherit{enable}%
\mplibverbatim{enable}%
\everymplib{if unknown Ph1: input mcf2graph.mf; fi
- sw_auxout:=1;
+ sw_aux_out:=1;
sw_label_emu:=1;
sw_font_frame:=4;
max_bond_length:=4.5mm;
@@ -138,7 +138,7 @@ beginfont("NO:4","EN:Gibberellin A3","MW:346.37");
MCa(0.8,0.5)(
<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb,
5:@,40~zf`1,O,60,//O^180,14~zb:&,
- 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1^60,4^60}:*/H)
+ 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60)
EXT(
label.lrt("("&inf_EN&")",(0,h));
defaultscale:=0.8;
@@ -154,7 +154,7 @@ endfont;
13=dl,6=wf,8=wb,
5:@,40~zf`1,O,60,//O^180,14~zb:&,
2:/COOH,7://_,13:*/OH,8:/*OH,
-14:*/_,{1^60,4^60}:*/H)
+14:*/_,{1,4}:*/H^60)
\end{verbatim}
\end{minipage}
\vspace{7mm}\\
@@ -256,7 +256,7 @@ $12:\*^-15,O,60,//O,-60)
%----------------------------------------------------------------------------
\noindent
\begin{mplibcode}
-font_wd:=80mm; font_ht:=65mm;
+font_wd:=80mm; font_ht:=70mm;
beginfont("NO:6","EN:Vancomycin","MW:1449.25");
MCa(0.9,0)(
<30,
@@ -357,17 +357,16 @@ font_wd:=160mm;
font_ht:=75mm;
max_bond_length:=5mm;
%------------------------------------------------------------------------
-Om:='("{O^-^}");
-MCa(0.33, 1)(<30,Om,!0,//O,!,//O,!2,//O,!,Om)
-MCa(0.66, 1)(<30,Om,!0,//O,!4,//O,!,Om,-4`1:\,//O,!,Om,4:/OH^-165)
-MCa(1, 1)(<30,Om,!0,//O,!2,!~dr,!,//O,!,Om,-4`1:\,//O,!,Om)
-MCa(1, 0.55)(<30,Om,!0,//O,!4,//O,!,Om,-4:\`1,//O,!,Om)
-MCa(1, 0.05)(<30,Om,!0,//O,!3,//O,!,//O,!,Om,-4:\`1,//O,!,Om)
-MCa(0.66,0.05)(<30,Om,!0,//O,!3,//O,!,//O,!,Om)
-MCa(0.33,0.05)(<30,Om,!0,//O,!3,//O,!,"{S-CoA}")
-MCa(0, 0.05)(<30,Om,!0,//O,!3,//O,!,Om)
-MCa(0, 0.55)(<30,Om,!0,//O,!,!~dr,!,//O,!,Om)
-MCa(0, 1)(<30,Om,!0,//O,!3,//O,!,Om,3:/OH)
+MCa(0.33, 1)(<30,O[-1],!0,//O,!,//O,!2,//O,!,O[-1])
+MCa(0.66, 1)(<30,O[-1],!0,//O,!4,//O,!,O[-1],-4`1:\,//O,!,O[-1],4:/OH^-165)
+MCa(1, 1)(<30,O[-1],!0,//O,!2,!~dr,!,//O,!,O[-1],-4`1:\,//O,!,O[-1])
+MCa(1, 0.55)(<30,O[-1],!0,//O,!4,//O,!,O[-1],-4:\`1,//O,!,O[-1])
+MCa(1, 0.05)(<30,O[-1],!0,//O,!3,//O,!,//O,!,O[-1],-4:\`1,//O,!,O[-1])
+MCa(0.66,0.05)(<30,O[-1],!0,//O,!3,//O,!,//O,!,O[-1])
+MCa(0.33,0.05)(<30,O[-1],!0,//O,!3,//O,!,"{S-CoA}")
+MCa(0, 0.05)(<30,O[-1],!0,//O,!3,//O,!,O[-1])
+MCa(0, 0.55)(<30,O[-1],!0,//O,!,!~dr,!,//O,!,O[-1])
+MCa(0, 1)(<30,O[-1],!0,//O,!3,//O,!,O[-1],3:/OH)
%-------------------------------------------------------------------------
EXT(
defaultfont:="uhvr8r";
@@ -418,17 +417,16 @@ beginfont("EN:TCA cycle")
font_wd:=160mm;
font_ht:=75mm;
max_bond_length:=5mm;
-Om:='("{O^-^}");
-MCa(0.33, 1)(<30,Om,!0,//O,!,//O,!2,//O,!,Om)
-MCa(0.66, 1)(<30,Om,!0,//O,!4,//O,!,Om,-4`1:\,//O,!,Om,4:/OH^-165)
-MCa(1, 1)(<30,Om,!0,//O,!2,!~dr,!,//O,!,Om,-4`1:\,//O,!,Om)
-MCa(1, 0.55)(<30,Om,!0,//O,!4,//O,!,Om,-4:\`1,//O,!,Om)
-MCa(1, 0.05)(<30,Om,!0,//O,!3,//O,!,//O,!,Om,-4:\`1,//O,!,Om)
-MCa(0.66,0.05)(<30,Om,!0,//O,!3,//O,!,//O,!,Om)
-MCa(0.33,0.05)(<30,Om,!0,//O,!3,//O,!,"{S-CoA}")
-MCa(0, 0.05)(<30,Om,!0,//O,!3,//O,!,Om)
-MCa(0, 0.55)(<30,Om,!0,//O,!,!~dr,!,//O,!,Om)
-MCa(0, 1)(<30,Om,!0,//O,!3,//O,!,Om,3:/OH)
+MCa(0.33, 1)(<30,O[-1],!0,//O,!,//O,!2,//O,!,O[-1])
+MCa(0.66, 1)(<30,O[-1],!0,//O,!4,//O,!,O[-1],-4`1:\,//O,!,O[-1],4:/OH^-165)
+MCa(1, 1)(<30,O[-1],!0,//O,!2,!~dr,!,//O,!,O[-1],-4`1:\,//O,!,O[-1])
+MCa(1, 0.55)(<30,O[-1],!0,//O,!4,//O,!,O[-1],-4:\`1,//O,!,O[-1])
+MCa(1, 0.05)(<30,O[-1],!0,//O,!3,//O,!,//O,!,O[-1],-4:\`1,//O,!,O[-1])
+MCa(0.66,0.05)(<30,O[-1],!0,//O,!3,//O,!,//O,!,O[-1])
+MCa(0.33,0.05)(<30,O[-1],!0,//O,!3,//O,!,"{S-CoA}")
+MCa(0, 0.05)(<30,O[-1],!0,//O,!3,//O,!,O[-1])
+MCa(0, 0.55)(<30,O[-1],!0,//O,!,!~dr,!,//O,!,O[-1])
+MCa(0, 1)(<30,O[-1],!0,//O,!3,//O,!,O[-1],3:/OH)
EXT(
defaultfont:="uhvr8r";
defaultscale:=0.75;