summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-06 21:59:14 +0000
committerKarl Berry <karl@freefriends.org>2017-03-06 21:59:14 +0000
commit611d5ba5f27a5977d135e8a19a6490a3d4314702 (patch)
tree66581a9ab80d29052e2992b300d69e7647053d06 /Master/texmf-dist/doc/metapost
parentaba00871ee9f5f5ac8d46fe9d0b8e29cd8ce1e8b (diff)
mcf2graph (6mar17)
git-svn-id: svn://tug.org/texlive/trunk@43416 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG6
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README11
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin236045 -> 235843 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf81
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin462957 -> 461710 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex170
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin174656 -> 174202 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex19
9 files changed, 159 insertions, 130 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 3b29fbf0e96..25234efce8e 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 2017-02-13
+ Changelog of mcf2graph software package by Akira Yamaji 2017-03-06
*******************************************************************************
+[ver. 4.11 / 2017-03-06]
+ -improve function EXT(),ext()
+ -update MCF syntax manual
+
[ver. 4.10 / 2017-02-13]
-improve function EXT(),ext()
-update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 5fde3c5e34b..61b56015bb6 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.10 2017-02-13
+ version : 4.11 2017-03-06
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -31,12 +31,13 @@
3. How to use mcf2graph with Metapost
Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp
- ( 1) >mpost -s ahangle=0 FILENAME => output no graphic file.
- ( 2) >mpost -s ahangle=1 FILENAME => output PNG file. (default:eps)
- ( 3) >mpost -s ahangle=2 FILENAME => output SVG file.
+ ( 1) >mpost -s ahangle=0 FILENAME => output no graphic file
+ ( 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.
+ ( 6) >mpost -s ahlength=2 FILENAME => output report
+ ( 7) >mpost -s ahlength=3 FILENAME => use Metapost 'label'
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 c906b10a0d9..4e2c7d60b49 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 2017.02.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.10 or later
+input mcf2graph.mf; %%% it must be version 4.11 or later
%-------------------------------------------------------------------------
font_wd#:=33mm#;
font_ht#:=24mm#;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 5512e3d7717..5242e4c5f86 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.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
index 0f8aaf33876..7cce228786d 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 2017.02.13
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2017.03.05
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.10 or later
+input mcf2graph.mf; %% it must be version 4.11 or later
%------------------------------------------------------------------------
sw_auxout:=0;
sw_mol_frame:=0;
@@ -818,45 +818,60 @@ beginfont("EN:MCf() vt")
endfont
%***********************************************************************
beginfont("EN:EXT()")
- margin_left_right:=margin_top_bottom:=5mm;
- font_wd#:=70mm#;
- font_ht#:=35mm#;
- bond_len#:=8mm#;
- sw_font_frame:=3;
- MCd(1,0.8)(0.1,0.5)(<30,Ph,2:/OH,5:/OH)
- MCd(1,0.8)(0.9,0.5)(<30,?6,$(3,6)dl,@(2,5)//O)
+ margin_left_right:=margin_top_bottom:=4mm;
+ font_wd#:=60mm#;
+ font_ht#:=30mm#;
+ ratio_bond_width:=0.08;
+ defaultscale:=0.6;
+ sw_font_frame:=1;
+ sw_solid:=1;
+ MCd(1,0.8)(0.12,0.58)(<30,?6,$(3,6)dl,
+ @(2^35,2^-35)/R,5://O)
+ MCd(1,0.8)(0.88,0.48)(<30,Ph,@(2,3)/R,5:/OH)
EXT(
- draw_vector((0.7w,0.52h), 0,0.2mm,0.4w);
- draw_vector((0.3w,0.48h),180,0.2mm,0.4w);
+ defaultscale:=0.6;
+ draw_vector((0.6w,0.5h),0,0.2mm,0.25w);
+ p3:=(0.48w,0.5h);
+ label.top("H",p3);
+ label.top("+",p3+(em,0.5em));
drawdot p0 withpen pencircle scaled 3pt;
drawdot p1 withpen pencircle scaled 3pt;
drawdot p2 withpen pencircle scaled 3pt;
label.bot("p0",p0);
- label.bot("p1",p1);
- label.bot("p2",p2);
- label("Ox",(0.5w,0.6h));
- label("Red",(0.5w,0.4h));
- use_font(6pt#);
- label("Reaction example",(0.5w,0.8h));
+ label.lft("p1",p1);
+ label.ulft("p2",p2);
+ defaultscale:=0.6;
+ label.bot("Dienone-Phenol Rearrangement",(0.5w,1h));
)
endfont
%***********************************************************************
beginfont("EN:ext()")
- margin_left_right:=margin_top_bottom:=3mm;
font_wd#:=70mm#;
- font_ht#:=25mm#;
- sw_solid:=0;
- MCd(1,0.9)(0.1,0.5)(<30,Ph,3:/F,4:/Cl)
+ font_ht#:=30mm#;
+ ratio_bond_width:=0.065;
+ sw_solid:=1;
+ 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.5wd,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.5wd,0));
+ )
+ MCd(1,1)(0.9,0.5)(<30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1)
+ ext(
+ defaultscale:=0.6;
drawdot p0 withpen pencircle scaled 3pt;
- drawdot A6 withpen pencircle scaled 3pt;
- drawdot B3 withpen pencircle scaled 3pt;
label.bot("p0",p0);
- label.ulft("A6",A6);
- label.rt("B3",B3);
)
- MCd(1,0.9)(0.9,0.5)(<30,Ph,3:/F,4:/Cl)
- ext(draw p0--(p0+(wd,0))--(p0+(wd,ht));)
+ EXT(
+ draw_vector((0.6w,0.5h),0,0.2mm,0.08w);
+ defaultscale:=0.7;
+ label("+",(0.25w,0.5h));
+ label.bot("Diels-Alder Reaction",(0.5w,1h));
+ )
endfont
%***********************************************************************
beginfont("EN:Local setting 1")
@@ -911,16 +926,6 @@ beginfont("EN:Tocopherol","CAS:59-02-9","FM:C29H50O2","MW:430.71")
MCf(<30,Ph,3=?6,7:O,@(1,2,5)/_,8:/*_^60,6:/OH,8\,|,!12,@(4,8)/*_,12:/_)
endfont
%***********************************************************************
-%% Change infomation separater
-beginfont("EN:Ampicillin","CAS:69-53-4","FM:C16H19N3O4S","MW:349.40")
- font_ht#:=15mm#;
- MCf(<45,
- ?4,2:N,2=?5,-1:S,
- @(3^45,4^-45)/*H,1://O^15,5:/*COOH^-18,@(6^35,6^-35)/_,
- 4*\^75,NH,!,//O,!,/*NH2,!,Ph
- )
-endfont
-%***********************************************************************
beginfont("EN:Cholesterol","CAS:57-88-5","FM:C27H46O","MW:386.65")
font_ht#:=15mm#;
MCf(
@@ -1039,3 +1044,5 @@ beginfont("EN:Paclitaxel","CAS:33069-62-4","FM:C47H51NO14","MW:853.91")
endfont
%***********************************************************************
bye
+***************************
+bye
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index eec407f55b5..bf917b47810 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 d9636c5d350..c6bdf96d93e 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 2017.02.13
+% Molecular Coding Format manual by Akira Yamaji 2017.03.06
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\usepackage{graphicx}
@@ -932,48 +932,50 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
h: font height
wd: font width-margin_left_right*2
ht: font height-margin_top_bottom*2
- em: embedded font size
+ aw: atom font size
+ em: label font size
p0: x=margin_left_right
y=margin_top_bottom
n: molecular number
p[m]: molecular origin position
(Function for EXT(),ext())
- draw_vector(pos,angle,thickness,length):
+ draw_vector(pos,angle,thick,length):
draw vector at pos
- use_font(wd#):
- make font for 'label'
label:
- sw_label_mp=0: ** default
- use embedded font
- sw_label_mp=1:
- use original metapost 'label'
+ sw_label=0: use Metafont **default
+ sw_label=1: use Metapost label
- beginfont()
- sw_font_frame:=3;
- %----------------------------------
- MCd(1,0.8)(0.1,0.5)
- (<30,Ph,2:/OH,5:/OH)
- MCd(1,0.8)(0.9,0.5)
- (<30,?6,$(3,6)dl,@(2,5)//O)
- %----------------------------------
- EXT(
- draw_vector((0.7w,0.48h), 0,0.2mm,0.4w):
- draw_vector((0.3w,0.52h),180,0.2mm,0.4w):
- drawdot p0 withpen pencircle scaled 3pt;
- drawdot p1 withpen pencircle scaled 3pt;
- drawdot p2 withpen pencircle scaled 3pt;
- %----------------------------------
- label.bot("p0",p0);
- label.bot("p1",p1);
- label.bot("p2",p2);
- label("Ox",(0.5w,0.6h));
- label("Red",(0.5w,0.4h));
- use_font(6pt#); % **defalt 5pt#
- label("Reaction example",(0.5w,0.8h));
+beginfont()
+ margin_left_right:=margin_top_bottom:=4mm;
+ font_wd#:=60mm#;
+ font_ht#:=30mm#;
+ ratio_bond_width:=0.08;
+ sw_solid:=1;
+ sw_font_frame:=3;
+ %-----------------------------------------
+ MCd(1,0.8)(0.12,0.58)
+ (<30,?6,$(3,6)dl,@(2^35,2^-35)/R,5://O)
+ MCd(1,0.8)(0.88,0.48)
+ (<30,Ph,@(2,3)/R,5:/OH)
+ %-----------------------------------------
+ EXT(
+ defaultscale:=0.6;
+ draw_vector((0.6w,0.5h),0,0.2mm,0.25w);
+ p3:=(0.48w,0.5h);
+ label.top("H",p3);
+ label.top("+",p3+(em,0.5em));
+ drawdot p0 withpen pencircle scaled 3pt;
+ drawdot p1 withpen pencircle scaled 3pt;
+ drawdot p2 withpen pencircle scaled 3pt;
+ label.bot("p0",p0);
+ label.lft("p1",p1);
+ label.ulft("p2",p2);
+ defaultscale:=0.7;
+ label.bot("Dienone-Phenol Rearrangement",
+ (0.5w,1h));
)
- %----------------------------------
- endfont
+endfont
\end{verbatim}
\MCFstructure\\
%-----------------------------------------------------------------------------
@@ -983,6 +985,8 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
(Add extra graphic to molecule)
wd: molecular width
ht: molecular height
+ aw: atom font size
+ em: label font size
p0: origin of molecular structure
l: bond length
An: atom number
@@ -992,32 +996,55 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
B[m]: bond position
B[m]ang: bond angle
- beginfont()
- %----------------------------------
- MCd(1,0.9)(0.1,0.5)(<30,Ph,3:/F,4:/Cl)
+beginfont()
+ font_wd#:=70mm#;
+ font_ht#:=30mm#;
+ ratio_bond_width:=0.065;
+ sw_solid:=1;
+ %-------------------------------------
+ MCd(1,1)(0.1,0.5)
+ (<-210,60`1,60`1,60`1,$(1,3)dl,
+ 1:/R1,4:/R2^-60)
ext(
- drawdot p0 withpen pencircle scaled 3pt;
- drawdot A6 withpen pencircle scaled 3pt;
- drawdot B3 withpen pencircle scaled 3pt;
- label.bot("p0",p0);
- label.ulft("A6",A6);
- label.rt("B3",B3);
+ defaultscale:=0.6;
+ label.bot("Diene",p0+(0.5wd,0));
)
- %----------------------------------
- MCd(1,0.9)(0.9,0.5)(<30,Ph,3:/F,4:/Cl)
- ext(draw p0--(p0+(wd,0))--(p0+(wd,ht));)
- %----------------------------------
- endfont
+ %-------------------------------------
+ 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.5wd,0));
+ )
+ %-------------------------------------
+ MCd(1,1)(0.9,0.5)
+ (<30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1)
+ ext(
+ defaultscale:=0.6;
+ drawdot p0 withpen pencircle scaled 3pt;
+ label.bot("p0",p0);
+ )
+ %-------------------------------------
+ EXT(
+ draw_vector((0.6w,0.5h),0,0.2mm,0.08w);
+ defaultscale:=0.7;
+ label("+",(0.25w,0.5h));
+ label.bot("Diels-Alder Reaction",(0.5w,1h));
+ )
+endfont
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
+\newpage
\subsection{Local parameter setting}
\begin{verbatim}
beginfont() MCf(Ph) endfont
+ %---------------------------
beginfont()
ratio_thickness_bond:=0.05;
MCf(Ph)
endfont
+ %---------------------------
beginfont() MCf(Ph) endfont
\end{verbatim}
\MCFstructure\MCFstructure\MCFstructure
@@ -1025,13 +1052,14 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\subsection{Global parameter setting}
\begin{verbatim}
beginfont() MCf(Ph) endfont
+ %---------------------------
ratio_thickness_bond:=0.05;
+ %---------------------------
beginfont() MCf(Ph) endfont
beginfont() MCf(Ph) endfont
\end{verbatim}
\MCFstructure\MCFstructure\MCFstructure
%-----------------------------------------------------------------------------
-\newpage
\section{Output information}
%-----------------------------------------------------------------------------
\subsection{Output molecular information}
@@ -1044,9 +1072,11 @@ beginfont()
@(2,6)N,@(2,6)/_,@(1,5)//O,
|,-4=?5,2=dl,@(1,3)N,3:/_)
endfont
+%------------------------------------------
beginfont(......)
...........
endfont
+%------------------------------------------
..............
%% Output to mcf_man_soc-info.aux %%
@@ -1064,49 +1094,28 @@ cFM:calculated molecular formula
%-----------------------------------------------------------------------------
\subsection{Output additional information}
\begin{verbatim}
+%------------------------------------------
beginfont("EN:Tocopherol","CAS:59-02-9")
MCf(<30,Ph,3=?6,
7:O,@(1,2,5)/_,8:/*_^60,6:/OH,
8\,|,!12,@(4,8)/*_,12:/_)
endfont
+%------------------------------------------
beginfont(......)
...........
endfont
+%------------------------------------------
..............
%% Output to mcf_man_soc-info.aux %%
F:mcf_man_soc;C:86;EN:Tocopherol;CAS:59-02-9
............................................
-1* F:filename
-2* C:char number
+1* F:filename * default output
+2* C:char number * default output
3 EN:molecular name
4 CAS:CAS number
-*:default output
-
-\end{verbatim}
-\MCFstructure
-%-----------------------------------------------------------------------------
-\subsection{Change aux information delimiter}
-\begin{verbatim}
-aux_delimiter:="/";
-beginfont("EN:Ampicillin","CAS:69-53-4")
- MCf(<45,?4,2:N,2=?5,-1:S,
- @(3^45,4^-45)/*H,1://O^15,
- 5:/*COOH^-18,@(6^35,6^-35)/_,
- 4*\^75,NH,!,//O,!,/*NH2,!,Ph)
-endfont
-beginfont(......)
- ...........
-endfont
-..............
-
-%% Output to mcf_man_soc-info.aux %%
-F:mcf_man_soc/C:90/EN:Ampicillin/CAS:69-53-4
-............................................
-
- **default aux_delimiter=";"
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -1114,7 +1123,7 @@ F:mcf_man_soc/C:90/EN:Ampicillin/CAS:69-53-4
\begin{verbatim}
tag3:="NO"; var3:="inf_NO";
tag4:="EN"; var4:="inf_EN";
- sw_auxfix:=1;
+ sw_auxfix:=1; % ** default sw_auxfix=0
auxtag_out; % output tag list
%--------------------------------------
beginfont("EN:Cholesterol","NO:1")
@@ -1136,9 +1145,7 @@ F:mcf_man_soc/C:90/EN:Ampicillin/CAS:69-53-4
F;C;NO;EN
mcf_man_soc;91;1;Ampicillin
...........................
- ...........................
- ** default sw_auxfix=0
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -1391,6 +1398,15 @@ mcf_exa_soc;5;346.3742;C19H22O6;Gibberellin A3
......................................
......................................
+(aux_delimiter:="/";)
+F:mcf_man_soc/C:1/cMW:349.40462/cFM:C16H19N3O4S/EN:Ampicillin
+F:mcf_man_soc/C:2/cMW:386.6532/cFM:C27H46O/EN:Cholesterol
+F:mcf_exa_soc/C:3/cMW:470.5113/cFM:C26H30O8/EN:Limonin
+F:mcf_exa_soc/C:4/cMW:536.8722/cFM:C40H56/EN:beta-Carotene
+F:mcf_exa_soc/C:5/cMW:346.3742/cFM:C19H22O6/EN:Gibberellin A3
+ .....................................................
+ .....................................................
+
( Tag )
F : filename
C : char number
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 5aabd3d1b3d..fd3a89279af 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 af0caea790b..de5e711d39c 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 2017.02.13
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2017.03.05
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.10 or later
+%%% mcf2graph.mf it must be version 4.11 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
@@ -14,6 +14,7 @@
input mcf2graph.mf;
mp_log_name:="temp-info.aux";
sw_auxout:=1;
+ sw_label:=1;
var3:="mol_wd"; tag3:="Lx";
var4:="cal_MW"; tag4:="cMW";
var5:="cal_FM"; tag5:="cFM";
@@ -95,13 +96,13 @@
font_wd:=90mm; font_ht:=45mm;
beginfont("NO:1","EN:Chlorophyll a","MW:893.49")
MCf(<54,
- {,``1,?5,$(2,5)d,4:N,3\,54~dl,|,?5,$(2,4)d,5:N,
- -2\,54~dl,|,?5,2=d,5:N,-2\~dl,54,|,?5,5=d,5:N,-2\~dl,&#5,
- -1*,24,/*COO!^15,72,//O,&#1,},
- 4\`1.45,Mg,&17,-1*,&11~vb,-1*,&23~vb,
- @(2,9,15,20~zf)/_,8:/!,14\,!!,
- 21*,-6~wf,!2,//O,!,O,!2,!!,|,!13,@(1,5,9,13)/_,
- )
+ {,``1,?5,$(2,5)d,4:N,3\,54~dl,|,?5,$(2,4)d,5:N,
+ -2\,54~dl,|,?5,2=d,5:N,-2\~dl,54,|,?5,5=d,5:N,-2\~dl,&#5,
+ -1*,24,/*COO!^15,72,//O,&#1,},
+ 4\`1.45,Mg,&17,-1*,&11~vb,-1*,&23~vb,
+ @(2,9,15,20~zf)/_,8:/!,14\,!!,
+ 21*,-6~wf,!2,//O,!,O,!2,!!,|,!13,@(1,5,9,13)/_,
+ )
endfont
\end{mplibcode}
\inputINFO{temp-info.aux}%