summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-15 22:16:51 +0000
committerKarl Berry <karl@freefriends.org>2019-12-15 22:16:51 +0000
commit3e527bd25e64ce29a3929576ea1620daea8f8065 (patch)
treec3f54022ab09417a59b86fded423e9c1e53e8f90 /Master/texmf-dist/doc/metapost
parentaa547f10f843ffe675b79a79a90bce546355bb36 (diff)
mcf2graph (15dec19)
git-svn-id: svn://tug.org/texlive/trunk@53137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf15
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin282794 -> 282839 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf22
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin595049 -> 594238 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex24
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin171892 -> 172055 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex4
10 files changed, 47 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index cc25dbbb819..0f6ac19e3d6 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,12 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2019-12-08
+ Changelog of mcf2graph software package by Akira Yamaji 2019-12-15
*******************************************************************************
+[ver. 4.47 / 2019-12-15]
+ -fix bug in fused ring
+ -change option parameter name
+ sw_subst_off => sw_group_off
+ -update MCF manual
+
[ver. 4.46 / 2019-12-08]
-miner update mcf2graph.mf
-update MCF manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 77d1a0633a3..5f7bef71224 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.46 2019-12-08
+ version : 4.47 2019-12-15
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
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 367fa30c048..c3ff7cce03c 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2019.12.08
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2019.12.15
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.46 or later
+input mcf2graph.mf; %%% it must be version 4.47 or later
%-------------------------------------------------------------------------
fsize:=(33mm,24mm);
max_blength:=4.5mm;
@@ -398,3 +398,14 @@ beginfont("EN:Atoropin","MW:289.375")
endfont
%***************************************************************************
bye
+*****
+bye
+*********************************
+beginfont("EN:Atoropin","MW:289.375")
+ MC(<-30,O,!,//O,!,!,Ph,
+ $1:\~zb^-120,|,?7`1.1,6:*\^190`1.25,N,/_,3~wb:#,$3:/!OH~wv)
+endfont
+%***************************************************************************
+bye
+*****
+bye
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 1962c106cc7..495e5707ec5 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_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index 41548467ebf..871b00e1b57 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2019.10.05
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2019.12.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
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 38fdf95c447..10be0a74c88 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2019.10.05
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2019.12.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.45 or later
+input mcf2graph.mf; %% it must be version 4.47 or later
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
@@ -411,25 +411,25 @@ beginfont("EN:Spiro ring ")
MC(<30,!6,4:@,?5)
endfont
%***********************************************************************
-beginfont("EN:substituent 1")
+beginfont("EN:group 1")
fsize:=(60mm,25mm);
sw_trimming:=1;
MC(<30,!,/_,!,/!,!3,/!2,!,/iPr,!3,/tBu,!,/Ph^-30,!)
endfont
%***********************************************************************
-beginfont("EN:substituent 2")
+beginfont("EN:group 2")
fsize:=(70mm,15mm);
sw_trimming:=1;
MC(<-30,!`1,//O,!2`1,/*H,!2`1,*/H,!2`1,*/*H,!2`1,**?3,!`1)
endfont
%***********************************************************************
-beginfont("EN:substituent 3")
+beginfont("EN:group 3")
fsize:=(60mm,18mm);
sw_trimming:=1;
MC(<30,``1,!2,/_`2^30,!2,/!2>lr,!2,/!2>rl,!)
endfont
%***********************************************************************
-beginfont("EN:substituent 3")
+beginfont("EN:group 3")
fsize:=(70mm,18mm);
fmargin:=(2mm,2mm);
sw_numberA:=1;
@@ -438,7 +438,7 @@ beginfont("EN:substituent 3")
MC(<-30,!16,2:/_,4:/!,6:/!2,10:/iPr,14:/tBu,16:/Ph^-60)
endfont
%***********************************************************************
-beginfont("EN:substituent 4")
+beginfont("EN:group 4")
fsize:=(60mm,18mm);
sw_trimming:=1;
fmargin:=(2mm,2mm);
@@ -446,7 +446,7 @@ beginfont("EN:substituent 4")
MC(<-30,!6`1,{2~wf,4~zf,6^-30}:/_)
endfont
%***********************************************************************
-beginfont("EN:substituent 5")
+beginfont("EN:group 5")
fsize:=(60mm,18mm);
sw_trimming:=1;
sw_numberA:=1; numberA_end:=8;
@@ -482,7 +482,7 @@ beginfont("EN:chain strech direction mode 3")
)
endfont
%***********************************************************************
-beginfont("EN:change atom and substituent")
+beginfont("EN:change atom and group")
fsize:=(60mm,15mm);
sw_trimming:=1;
MC(<30,!2,NH,!2,SO,!2,SOO,!)
@@ -856,10 +856,10 @@ beginfont("EN:Switwch Expand")
MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
endfont
%***********************************************************************
-beginfont("EN:Switwch substituent off")
+beginfont("EN:Switwch group off")
fsize:=(60mm,15mm);
MCat(.15, .5)(<30,Ph,4:/Cl,3:/F)
- sw_subst_off:=1;
+ sw_group_off:=1;
MCat(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 5acaf5607ad..fa55769249c 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 6c16180ac59..6758b3cddb5 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 2019.12.08
+% Molecular Coding Format manual by Akira Yamaji 2019.12.15
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\documentclass[a4paper,twoside]{article}
@@ -469,8 +469,8 @@ pk font,PNG,SVG,EPS or MDL MOL file.
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsection{Substituent}
-\subsubsection{Insert substituent}
+\subsection{Group}
+\subsubsection{Insert group}
\begin{verbatim}
/ : single
<30,!,/Me,!,/Et,!3,/Pr,!,/iPr,
@@ -482,7 +482,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsubsection{Insert modified substituent}
+\subsubsection{Insert modified group}
\begin{verbatim}
// : double (double middle)
*/ : wedge forward
@@ -509,14 +509,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsubsection{Add substituent}
+\subsubsection{Add group}
\begin{verbatim}
<-30,!17,2:/_,4:/!,6:/!2,
10:/iPr,14:/tBu,16:/Ph^-60
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsubsection{Add modified substituent}
+\subsubsection{Add modified group}
\begin{verbatim}
~,^,` : change type,angle,length
@@ -568,10 +568,10 @@ pk font,PNG,SVG,EPS or MDL MOL file.
%-----------------------------------------------------------------------------
\subsection{Miscellaneous}
%-----------------------------------------------------------------------------
-\subsubsection{Change atom and Substituent}
+\subsubsection{Change atom and Group}
\begin{verbatim}
NH,SO,SOO :
- inset hetero atom and substituent
+ inset hetero atom and group
simultaneously
<30,!2,NH,!,SO,!,SOO,!
@@ -621,14 +621,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.
%-----------------------------------------------------------------------------
\subsubsection{User definition}
\begin{verbatim}
- user defined substructure
+ user defined parts
iBuOH:='(!,/_,!,OH)
<30,?6,{4,6}:/iBuOH
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
\begin{verbatim}
- Insert user defined substructure
+ Insert user defined parts
<30,!3,/'(!,/_,!,OH),!3
\end{verbatim}
\MCFgraph
@@ -911,9 +911,9 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
\makebox[30mm]{\tt 0 :default}%
\makebox[30mm]{\tt 1}%
%-----------------------------------------------------------------------------
-\subsubsection{Substituent off mode}
+\subsubsection{Group off mode}
\begin{verbatim}
- ** default: sw_subst_off=0
+ ** default: sw_group_off=0
\end{verbatim}
\MCFgraph\\
\makebox[5mm]{}%
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 8d54cc5cbf3..c284c2d563c 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 24b5a19e484..580d18b45fb 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 2019.12.08
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2019.12.15
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.46 or later
+%%% mcf2graph.mf it must be version 4.47 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%