summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-14 03:01:12 +0000
committerNorbert Preining <norbert@preining.info>2021-06-14 03:01:12 +0000
commit269940e8e52b921a855083542b9e1109af49af09 (patch)
treeba8b7431f6e4878661215e5a6127aba941f5d711 /graphics
parent2ba4b1ac7860085c0b259aacb0d99bd2c730edbc (diff)
CTAN sync 202106140301
Diffstat (limited to 'graphics')
-rw-r--r--graphics/mcf2graph/CHANGELOG7
-rw-r--r--graphics/mcf2graph/README2
-rw-r--r--graphics/mcf2graph/mcf2graph.mf62
-rw-r--r--graphics/mcf2graph/mcf_data_base.mcf29
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf6
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin319961 -> 319308 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex2
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf6
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin381183 -> 381206 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex2
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin184323 -> 184366 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex47
12 files changed, 87 insertions, 76 deletions
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index 174d21ad00..cb9a0d3779 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2021-06-06
+ Changelog of mcf2graph software package by Akira Yamaji 2021-06-13
*******************************************************************************
+[ver. 4.67 / 2021-06-13]
+ -fix bug in bond color
+ -update mcf_data_base.mcf
+ -update MCF manual,example
+
[ver. 4.66 / 2021-06-06]
-add binary operator in {...}
{ a -- b , ...} : { a,a+1,...,b , ...} (a<b)
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 8a3a382c15..a2477d4372 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.66 2021-06-06
+ version : 4.67 2021-06-13
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 5bbd4639dc..bc0dd5d6b6 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.66 Copyright (c) 2013-2021 Akira Yamaji
+% mcf2graph ver 4.67 Copyright (c) 2013-2021 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -37,7 +37,7 @@
% Set to use plain.mp (label,arrow,atom) : mpost -s labeloffset=2 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message "* This is mcf2graph ver 4.66 2021.06.06";
+message "* This is mcf2graph ver 4.67 2021.06.13";
%-------------------------------------------------------------------------------------------------
newinternal cntA,cntB,cntM,minX,minY,maxX,maxY,sftX,sftY,com,par,envT,envB,lenT,lineT,angT,rotT,
crR,nA,nB,nC,nD,nE,nF,nS,nL,nR,nU,nP,xpos,ypos,markA,markB,saveA,saveB,bondL;
@@ -345,23 +345,23 @@ def endfont=
endchar;
clearit;
%-----------------------------------------------------------------------------------------
- if sw_output=(Font+Info+Temp): proc_info_out(3);
- ef sw_output=(Font+Mcode+Temp): proc_mc_out(2);
- ef sw_output=(Font+Info+Mcode+Temp): proc_info_out(3); proc_mc_out(2);
- ef sw_output=(Font+Report+Temp): proc_report_out(2);
+ if sw_output=Font+Info+Temp: proc_info_out(1,1);
+ ef sw_output=Font+Mcode+Temp: proc_mc_out(1);
+ ef sw_output=Font+Info+Mcode+Temp: proc_info_out(1,1); proc_mc_out(1);
+ ef sw_output=Font+Report+Temp: proc_report_out(1);
fi
%-----------------------------------------------------------------------------------------
- ef sw_output=Info: proc_info_out(1);
- ef sw_output=(Info+Table): proc_info_out(2);
- ef sw_output=(Info+Temp): proc_info_out(3);
- ef sw_output=Mcode: proc_mc_out(1);
- ef sw_output=(Mcode+Temp): proc_mc_out(2);
+ ef sw_output=Info: proc_info_out(1,0);
+ ef sw_output=Info+Table: proc_info_out(2,0);
+ ef sw_output=Info+Temp: proc_info_out(1,1);
+ ef sw_output=Mcode: proc_mc_out(0);
+ ef sw_output=Mcode+Temp: proc_mc_out(1);
ef sw_output=Mfont: proc_mf_out(0);
- ef sw_output=Report: proc_report_out(1);
- ef sw_output=(Report+Temp): proc_report_out(2);
+ ef sw_output=Report: proc_report_out(0);
+ ef sw_output=Report+Temp: proc_report_out(1);
ef sw_output=MOL2k: proc_mol_out(1);
ef sw_output=MOL3k: proc_mol_out(2);
- ef sw_output=(Info+Mcode+Temp): proc_info_out(3); proc_mc_out(2);
+ ef sw_output=Info+Mcode+Temp: proc_mc_out(1); proc_info_out(1,1);
fi
%-----------------------------------------------------------------------------------------------
%% message "* parts_cnt (0)="& decimal(parts_cnt) &" "& decimal(parts_usr-parts_usr_start);
@@ -984,12 +984,10 @@ def MC(text TXT)=
mol_stru[cntM]:=currentpicture;
clearit;
endgroup;
- if sw_output>0: proc_calc(0); fi
- if cntC>0:
- for i=1 upto cntA:
- if colorA[i]<>0: colorA[i]:=0; fi
- if colorB[i]<>0: colorB[i]:=0; fi
- endfor
+ if sw_output>=1: proc_calc(0); fi
+ if cntC>=1:
+ for i=1 upto cntA: if colorA[i]<>0: colorA[i]:=0; fi endfor
+ for i=1 upto cntB: if colorB[i]<>0: colorB[i]:=0; fi endfor
fi
enddef;
%-------------------------------------------------------------------------------------------------
@@ -1646,9 +1644,9 @@ def proc_calc(expr n)=
endgroup
enddef;
%=================================================================================================
-def proc_info_out(expr n)=
+def proc_info_out(expr n,f)=
message "["&decimal(char_num)&"]:"&inf_EN;
- if n=3: file_name_output:="temp-info.aux";
+ if f=1: file_name_output:="temp-info.aux";
else: file_name_output:=jobname&"-info.aux";
fi
%--------------------------------------------------------------------------------------
@@ -1658,7 +1656,7 @@ def proc_info_out(expr n)=
%--------------------------------------------------------------------------------------
for i=1 upto aux_max: exitif tag[i]="";
if i=1: printf "" else: &aux_delimiter fi
- if (n=1)or(n=3): &tag[i]&":" fi
+ if n=1: &tag[i]&":" fi
%-------------------------------------------
if tag[i]="J": & jobname
ef tag[i]="C": & decimal(char_num)
@@ -1685,12 +1683,12 @@ def proc_info_out(expr n)=
ef tag[i]="MC": & inf_MC
fi
endfor ;
- if n=3: printf EOF; fi
+ if f=1: printf EOF; fi
enddef;
%=================================================================================================
-def proc_report_out(expr n)=
+def proc_report_out(expr f)=
message "["&decimal(char_num)&"]:"&inf_EN;
- if n=2: file_name_output:="temp-report.aux";
+ if f=1: file_name_output:="temp-report.aux";
else: file_name_output:=jobname&"-report.txt";
fi
printf "===========================================================================";
@@ -1750,7 +1748,7 @@ def proc_report_out(expr n)=
printf " Fomula Calc: "&cal_FM&" / Input: "
if inf_FM<>"-": &inf_FM&" / "& iif(inf_FM=cal_FM,"MACTCH","NOT MACTCH") fi;
printf "===========================================================================";
- if n=2: printf EOF; fi
+ if f=1: printf EOF; fi
enddef;
%-------------------------------------------------------------------------------------------------
vardef round_auto(expr n)=
@@ -1800,7 +1798,7 @@ def proc_mol_out(expr n)=
fi
enddef;
%=================================================================================================
-def proc_mf_out(expr n)=
+def proc_mf_out(expr f)=
message "["&decimal(char_num)&"]:"&inf_EN;
file_name_output:=jobname&"-mf.aux";
printf "beginfont("
@@ -1810,12 +1808,12 @@ def proc_mf_out(expr n)=
endfor
printf "if check(mc)=0: MC(scantokens(mc)) fi";
printf "endfont";
- if n=1: printf "%-------------------------------------------------------------------------"; fi
+ if f=1: printf "%-------------------------------------------------------------------------"; fi
enddef;
%=================================================================================================
-def proc_mc_out(expr n)=
+def proc_mc_out(expr f)=
message "["&decimal(char_num)&"]:"&inf_EN;
- if n=2: file_name_output:="temp-mc.aux";
+ if f=1: file_name_output:="temp-mc.aux";
else: file_name_output:=jobname&"-"&fit_zero(char_num)&"-"&erase_space(inf_EN)&"-mc.aux";
fi
for i=1 upto mc_row: printf (substring(0,mc_indent[i]) of blank_str)&mc[i]; endfor
@@ -1908,7 +1906,7 @@ S!:='(S,!); S!2:='(S,!,!); S!3:='(S,!,!,!); S!?!:='(S,!,?!); S!??!:='(S,!,??!);
%-------------------------------------------------------------------------------------------------
COO:='(//O,!,O); COO!:='(COO,!); COO!2:='(COO,!,!); COO!??:='(COO,!,?!); COO!3:='(COO,!,!,!);
CO!:='(//O,!); CO!2:='(//O,!,!); CO!3:='(//O,!,!,!); OCO!:='(O,!,//O,!);
-N?!:='(N!,!); N?!2:='(N!,!,!); NH!:='(NH,!); NH!2:='(NH,!,!); NH!3:='(NH,!,!,!);
+N?!:='(N,!,@-2,0); N?!2:='(N!,!,!); NH!:='(NH,!); NH!2:='(NH,!,!); NH!3:='(NH,!,!,!);
NH!?!:='(NH,!,?!); NHCO!:='(NH,!,//O,!); CONH2:='(//O,!,NH2); ??:='(/_^35,/_^-35);
%-------------------------------------------------------------------------------------------------
!OH:='(!,OH); !SH:='(!,SH); !NH2:='(!,NH2); !CO!:='(!,//O,!); !CO!2:='(!,CO!2); !CO!3:='(!,CO!3);
diff --git a/graphics/mcf2graph/mcf_data_base.mcf b/graphics/mcf2graph/mcf_data_base.mcf
index 129239e46d..87fabda340 100644
--- a/graphics/mcf2graph/mcf_data_base.mcf
+++ b/graphics/mcf2graph/mcf_data_base.mcf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.06.06
+% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line '%' comment out
@@ -699,8 +699,9 @@ Cat:antibiotics;EN:Neospiramycin;MW:698.9;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt,
- @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
- @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,-3:/*OH,@8,\*,!,!!,O
+ @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!`-.5,-4:*/_`-.5,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5,-3:/*OH`-.5,
+ @8,\*,!,!!,O
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1
+
@@ -708,24 +709,24 @@ Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1
@5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7,
{-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-6=wf,-1=zb,-5=dl,
{-1,-6}:O,-3:*/_,@-2,\,*/_,!2,
- 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
- @-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O!
+ 17:/_,19:/*_,@18,\,O,!,?6`.7,-1:O,-2:*/_`.5,-4:*/O!`-.5,
+ @-3,\,O,60,?6`.7,-5:O,-4:*/_`.5,-3:/*NH!`-.5,-2:*/O!`-.5
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Spinosad;MW:731.968;EXA:1
+
<30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##,
5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl,
{-1^35}:*/H,{-2^-60}:/*H,-2=?5,2:O,{3^25,7^-25}://O,1:/!,
- @-2,\~zf,O,66,?6`.8,-1:O,-2:/_,{-3,-4,-5}:/O!,8~wf:/Me,5^-65~wf:/H,
- @9,\~zf,O,!,|,?6`.8,2:O,3:/_,-3:/N?!
+ @-2,\~zf,O,66,?6`.7,-1:O,-2:/_`.5,{-3,-4,-5}:/O!`-.5,8~wf:/Me`.5,5^-65~wf:/H,
+ @9,\~zf,O,!,|,?6`.7,2:O,3:/_`.5,-3:/N?!`-.5
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Spiramycin;MW:843.1;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
- @-6,\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_,
- @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
- @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
+ @-6,\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N?!`-.5,-4:*/_`.5,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5,
+ @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH`-.5,{-2^-35,-4}:/*_`.5,
@8,\*,!,!!,O
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1
@@ -734,15 +735,15 @@ Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1
60,60,-60,60,-60,60,-60,60,60,-60,&1,(12,13)=?6[4],##,
{2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH,
18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH,
- @10,*\,O,90,?6`.8,-3:*/OH,-5:/*OH,-4:/*NH2,-1:O,-2:/*_
+ @10,*\,O,90,?6`.7,-3:*/OH`-.5,-5:/*OH`-.5,-4:/*NH2`-.5,-1:O,-2:/*_`.5
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Tylocin;MW:916.10;EXA:1
+
<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
{12,14}=dl,2:O,1:/*!,5:/*OH,3://O,10:/*_,6:/*_,-6://O,-3:/_,
- @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH,-4:*/_,{-1,-2}:/*O!,
- @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,
- @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
+ @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH`-.5,-4:*/_`.5,{-1,-2}:/*O!`-.5,
+ @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5,
+ @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH`-.5,{-2^-35,-4}:/*_`.5,
@8,\*,!,!!,O
+------------------------------------------------------------------------------
Cat:antibiotics;EN:Tilmicosin;MW:869.133;EXA:1
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index a6f4446129..5ec224241a 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.06.06
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.66
-message "* mcf_exa_soc 2021.06.06";
+input mcf2graph.mf; %%% it must be version 4.67
+message "* mcf_exa_soc 2021.06.13";
message "";
%------------------------------------------------------------------------------
fsize:=(35mm,24mm);
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 2a1fe6b1ba..098316c278 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index c60790d138..75d105d7cc 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.06.06
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 16100feb75..fc46f3053b 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.06.06
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.66
+input mcf2graph.mf; %% it must be version 4.67
% ** use data base file 'mcf_data_base.mcf'
-message "mcf_man_soc 2021.06.06"; message "";
+message "mcf_man_soc 2021.06.13"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index 77141eb4dc..c851eb3d2d 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index 005dbfe129..85bf13d593 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2021.06.06
+% Molecular Coding Format manual by Akira Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[pdftex]{graphicx}
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index ace65bc7e6..8d688f8052 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index caf7e50492..5f4255aee6 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.06.06
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.06.13
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.66
+% ** mcf2graph.mf must be version 4.67
% ** use mcf_data_base.mcf
\documentclass{article}
%------------------------------------------------------------------------------
@@ -14,8 +14,8 @@
\everymplib{%
if unknown Ph1: input mcf2graph.mf; fi
outputformat:="eps";
- tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
sw_output:=Font;
+ tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
max_blength:=4.5mm;
defaultfont:="uhvr8r";
defaultsize:=8bp;
@@ -102,13 +102,13 @@ endfont;
%----------------------------------------------------------------------------
\begin{verbatim}
beginfont("EN:Erythromycin","MW:733.93",
- %------------------------------------------------------------------
- ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
- ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
- ": {6^35,11,12^-35}:*/OH, ",
- ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
- ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
- %------------------------------------------------------------------
+ %--------------------------------------------------------------------
+ ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
+ ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
+ ": {6^35,11,12^-35}:*/OH, ",
+ ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_`.5,4:/OH`.-.5,5^-35`-.5:/O!, ",
+ ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_`.5,2:/OH`-.5,3:/N?!`-.5 ")
+ %--------------------------------------------------------------------
fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont;
@@ -116,13 +116,13 @@ endfont;
%----------------------------------------------------------------------------
\begin{mplibcode}
beginfont("EN:Erythromycin","MW:733.93",
- %------------------------------------------------------------------
- ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
- ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
- ": {6^35,11,12^-35}:*/OH, ",
- ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
- ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
- %------------------------------------------------------------------
+ %--------------------------------------------------------------------
+ ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
+ ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
+ ": {6^35,11,12^-35}:*/OH, ",
+ ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_`.5,4:/OH`.-.5,5^-35`-.5:/O!, ",
+ ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_`.5,2:/OH`-.5,3:/N?!`-.5 ")
+ %--------------------------------------------------------------------
fsize:=(120mm,30mm);
if check(mc)=0: MC(scantokens(mc)) fi
ext(defaultscale:=0.8;
@@ -221,10 +221,10 @@ endfont
%--------------------------------------------------------------------------------
\begin{mplibcode}
beginfont("f:mcf_data_base","t:EN","v:Maitotoxin")
- sw_output:=Info+Mcode+Temp; %%%% output temp-info,temp-mc.aux %%%%
- endfont;
+ sw_output:=Info+Mcode+Temp; %%%% output temp-info.aux %%%%
+ if check(mc)=0: MC(scantokens(mc)) fi
+ endfont
\end{mplibcode}
-\verbatiminput{temp-mc.aux} %%%% input temp-mc.aux %%%%
\begin{mplibcode}
beginfont("f:mcf_data_base","t:EN","v:Maitotoxin")
fsize:=(120mm,60mm); fmargin:=(0,3mm); sw_frame:=Outside;
@@ -237,6 +237,7 @@ endfont
\read\auxfile to \info%
\infotovar{\info} %%%% info to variables %%%%
\closein\auxfile%
+\verbatiminput{temp-mc.aux} %%%% input temp-mc.aux %%%%
{\tt ** EN:\EN \quad MW(C):\MW \quad MW(D):\mw \quad FM(C):\fm}%
%--------------------------------------------------------------------------------
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -354,3 +355,9 @@ endfont
\end{verbatim}
%----------------------------------------------------------------------------
\end{document}
+le",(0.5w,0.5h));
+)
+endfont
+\end{verbatim}
+%----------------------------------------------------------------------------
+\end{document}