summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost/mcf2graph
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-30 21:13:16 +0000
committerKarl Berry <karl@freefriends.org>2020-08-30 21:13:16 +0000
commit60f804ac1611688a14b28d3f7e614866d4e66973 (patch)
treefc91376d75f3d621a1c59214c571358912bbab79 /Master/texmf-dist/doc/metapost/mcf2graph
parentb3ce6bf1f797b134ca88af1975d9bcfa3a71f162 (diff)
mcf2graph (30aug20)
git-svn-id: svn://tug.org/texlive/trunk@56217 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost/mcf2graph')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG6
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf6
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin306240 -> 306332 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex38
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf31
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin576529 -> 575278 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex48
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin201822 -> 201949 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex4
10 files changed, 78 insertions, 57 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index e3145060537..b3bcfd022ec 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,10 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2020-08-10
+ Changelog of mcf2graph software package by Akira Yamaji 2020-08-30
*******************************************************************************
+[ver. 4.52 / 2020-08-30]
+ -improve aux file output,input
+ -update MCF manual,example
+
[ver. 4.51 / 2020-08-10]
-improve aux file output,input
-add style file mcf_setup.sty
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 016dcd6c045..7f830cef14d 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.51 2020-08-10
+ version : 4.52 2020-08-30
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 f2a973c7cf6..8cbd78defec 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 2020.08.10
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.51 or later
+input mcf2graph.mf; %%% it must be version 4.52 or later
%-------------------------------------------------------------------------
fsize:=(33mm,24mm);
max_blength:=4.5mm;
@@ -11,7 +11,7 @@ max_blength:=4.5mm;
%%%%sw_aframe:=1;
%%%%sw_mframe:=1;
%%%%sw_expand:=1;
-tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw";
+tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%%%%tag5:="mi";
%%%%tag6:="w1";
%%%%tag7:="h1";
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 709aff08097..b412a69a436 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 fcbacc1ec87..784d2d61a2e 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 2020.08.10
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -13,19 +13,24 @@
\textheight=280mm
\parindent=0mm
\setlength\columnsep{8mm}
-%-------------------------------------------------------------------------------
+%-----------------------------------------------------------------------------
\makeatletter%
-\newbox \@stringbox%
-\newcount \fontnum%
+\newbox \f@box%
+\newcount \f@num%
\newcount \tnum%
\tnum=0%
\font\labelM=cmtt8 at 6pt\relax%
-%-------------------------------------------------------------------------------
+%-----------------------------------------------------------------------------
\newif\ifCONT@%
\newread\@auxf%
%------------------------------------------------------------------------
-\fontnum=1%
+\f@num=1%
\unitlength=0.01mm%
+%------------------------------------------------------------------------
+\edef\jobname{mcf_exa_soc}%
+\edef\f@ext{pk}%
+%%%%\edef\f@ext{mps}%
+%%%%\edef\f@ext{png}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
\begin{center}
@@ -37,24 +42,30 @@
** MW:Molecular weight calculated by mcf2graph}\vspace{3mm}\\
%------------------------------------------------------------------------
\noindent%
-\openin\@auxf=mcf_exa_soc-info.aux%
+\openin\@auxf=\jobname-info.aux%
\CONT@true%
\loop%
\read\@auxf to \@info%
\ifeof\@auxf\CONT@false\else\@sfor\@info{\tag@var\@list}%
%------------------------------------------------------------
\begin{picture}(3750,3300)%
- \put(20,3000){\footnotesize\bf \the\fontnum:\EN}%
+ \put(20,3000){\footnotesize\bf \the\f@num:\EN}%
\put(20,2750){\labelM MW:\mw { / }FM:\fm}%
\put(20,2530){\labelM MW:\MW(data)}%
\put( 0,0){%
\makebox(3750,2530){%
- \font\@strufont=\File\relax\hbox{\@strufont\char\Char}%
+ \ifx\f@ext\@pk{\font\@font=\jobname\@font\char\f@num}%
+ \else%
+ \edef\f@file{\jobname-\z@num\f@num.\f@ext}%
+ \setbox\f@box=\hbox{\font\@font=\jobname\@font\char\f@num}%
+ \includegraphics[width=\wd\f@box,height=\ht\f@box]{\f@file}%
+%%%% \includegraphics{\f@file}%
+ \fi%
}%
}%
\end{picture}%
%------------------------------------------------------------
- \advance\fontnum1\relax%
+ \advance\f@num1\relax%
\advance\tnum1\relax%
\ifnum\tnum=5 \\ \tnum=0 \fi%
\fi%
@@ -63,3 +74,10 @@
%------------------------------------------------------------------------
\end{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+tnum=5 \\ \tnum=0 \fi%
+\fi%
+\ifCONT@ \repeat%
+\closein\@auxf%
+%------------------------------------------------------------------------
+\end{document}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 e2ff60943ef..ea8912bda76 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 2020.08.10
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.51 or later
+input mcf2graph.mf; %% it must be version 4.52 or later
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
@@ -869,48 +869,55 @@ beginfont("EN:Switwch Expand")
endfont
%***********************************************************************
beginfont("EN:Switwch group off")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,12mm);
MCat(.15, .5)(<30,Ph,4:/Cl,3:/F)
sw_group_off:=1;
MCat(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch bondtype off")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,12mm);
MCat(.15, .5)(<30,Ph,4:/Cl,3:/F)
sw_single:=1;
MCat(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch font frame 1")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=1;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 2")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=2;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 3")
- fsize:=(40mm,12mm);
- fmargin:=(5mm,2mm);
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
sw_fframe:=3;
MC(<30,Ph)
endfont
+beginfont("EN:Switwch font frame 4")
+ fsize:=(40mm,10mm);
+ fmargin:=(5mm,1.5mm);
+ sw_fframe:=4;
+ MC(<30,Ph)
+ ext(drawdot(0,0);drawdot(w,0);drawdot(w,h);drawdot(0,h);)
+endfont
%***********************************************************************
beginfont("EN:Switwch molecular frame")
sw_fframe:=1;
- fsize:=(40mm,15mm);
+ fsize:=(40mm,11mm);
msize:=(1,1);
sw_mframe:=1;
MC(<30,Ph)
endfont
%***********************************************************************
beginfont("EN:Switwch atom frame")
- fsize:=(60mm,15mm);
+ fsize:=(60mm,10mm);
sw_aframe:=1;
MC(<30,COOH,!,COOH)
endfont
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 19f2435a1b7..233e70eecd7 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 9f33673c13a..4664a2eea00 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 2020.08.10
+% Molecular Coding Format manual by Akira Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\documentclass[a4paper,twoside]{article}
@@ -34,7 +34,6 @@
\fnum=29%
%----------------------------------------------------------------------------
\edef\MCFjobname{mcf_man_soc}%
-\edef\@pk{pk}%
%----------------------------------------------------------------------------
\edef\fext{pk}%
%%\edef\fext{mps}%
@@ -47,10 +46,7 @@
\def\MCFgraph{%
\ifx\fext\@pk{\hspace{5mm}\@strufont\char\fnum}%
\else%
-\ifnum\fnum<10\edef\pre@zero{00}%
-\else\ifnum\fnum<100\edef\pre@zero{0}%
-\else\edef\pre@zero{}\fi\fi%
-\edef\file@name{\MCFjobname-\pre@zero\the\fnum.\fext}%
+\edef\file@name{\MCFjobname-\z@num\fnum.\fext}%
\setbox\fbox=\hbox{\@strufont\char\fnum}%
\hspace{5mm}\includegraphics[width=\wd\fbox,height=\ht\fbox]{\file@name}%
\fi%
@@ -865,27 +861,18 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
** default: sw_expand=0
\end{verbatim}
\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
%-----------------------------------------------------------------------------
\subsubsection{Group off mode}
\begin{verbatim}
** default: sw_group_off=0
\end{verbatim}
-\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
+\MCFgraph
%-----------------------------------------------------------------------------
\subsubsection{Single bond mode}
\begin{verbatim}
** default: sw_single=0
\end{verbatim}
-\MCFgraph\\
-\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
+\MCFgraph
%-----------------------------------------------------------------------------
\subsection{Frame}
%-----------------------------------------------------------------------------
@@ -906,6 +893,11 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
sw_fframe=3
\end{verbatim}
\MCFgraph
+\begin{verbatim}
+ (Draw small dot at corner)
+ sw_fframe=4
+\end{verbatim}
+\MCFgraph
%-----------------------------------------------------------------------------
\subsubsection{Molecular frame}
\begin{verbatim}
@@ -1391,7 +1383,7 @@ beginfont("EN:beta-Carotene") .... endfont
\end{verbatim}
\paragraph{(Setting)}
\begin{verbatim}
-tag1:="F"; tag2:="C"; tag3:="mw"; tag4:="fm";
+tag1:="F"; tag2:="C"; tag3:="mw"; tag4:="fm"; tag5:="EN";
\end{verbatim}
\paragraph{(Output)}
\begin{verbatim}
@@ -1401,12 +1393,12 @@ F:mcf_man_soc;C:2;mw:386.6532;fm:C27H46O;EN:Cholesterol
F:mcf_exa_soc;C:3;mw:470.5113;fm:C26H30O8;EN:Limonin
F:mcf_exa_soc;C:4;mw:536.8722;fm:C40H56;EN:beta-Carotene
-(sw_aux_out=2 (3))
-F;C;mw;fm(;EN)
-mcf_man_soc;1;349.40462;C16H19N3O4S(;Ampicillin)
-mcf_man_soc;2;386.6532;C27H46O(;Cholesterol)
-mcf_exa_soc;3;470.5113;C26H30O8(;Limonin)
-mcf_exa_soc;4;536.8722;C40H56(;beta-Carotene)
+(sw_aux_out=2)
+F;C;mw;fm
+mcf_man_soc;1;349.40462;C16H19N3O4S;Ampicillin
+mcf_man_soc;2;386.6532;C27H46O;Cholesterol
+mcf_exa_soc;3;470.5113;C26H30O8;Limonin
+mcf_exa_soc;4;536.8722;C40H56;beta-Carotene
(aux_delimiter="/")
F:mcf_man_soc/C:1/mw:349.40462/fm:C16H19N3O4S/EN:Ampicillin
@@ -1632,14 +1624,14 @@ endfont;
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{F:mcf_man_soc,C:138,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:139,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
-\INFO{F:mcf_man_soc,C:138,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:139,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
%------------------------------------------------------------------------
\end{document}
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 3275834c6b1..314b6cbe23f 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 e6fc0eb02df..d35a55eed20 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 2020.08.10
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2020.08.30
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.51 or later
+%%% mcf2graph.mf it must be version 4.52 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%