texlive[45635] Master/texmf-dist: mcf2graph (28oct17)
commits+karl at tug.org
commits+karl at tug.org
Sun Oct 29 22:22:31 CET 2017
Revision: 45635
http://tug.org/svn/texlive?view=revision&revision=45635
Author: karl
Date: 2017-10-29 22:22:31 +0100 (Sun, 29 Oct 2017)
Log Message:
-----------
mcf2graph (28oct17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
trunk/Master/texmf-dist/doc/metapost/mcf2graph/README
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
trunk/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
===================================================================
--- trunk/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,6 +1,9 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2017-09-15
+ Changelog of mcf2graph software package by Akira Yamaji 2017-10-29
*******************************************************************************
+[ver. 4.29 / 2017-10-29]
+ -miner update mcf2graph.mf
+
[ver. 4.28 / 2017-09-15]
-change syntax #n
#n => $n
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/README
===================================================================
--- trunk/Master/texmf-dist/doc/metapost/mcf2graph/README 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/doc/metapost/mcf2graph/README 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.28 2017-09-15
+ version : 4.29 2017-10-29
E-mail : mcf2graph at gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
===================================================================
--- trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2017.09.15
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2017.10.29
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.28 or later
+input mcf2graph.mf; %%% it must be version 4.29 or later
%-------------------------------------------------------------------------
font_wd:=33mm;
font_ht:=24mm;
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
===================================================================
--- trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2017.09.15
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2017.10.29
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.28 or later
+input mcf2graph.mf; %% it must be version 4.29 or later
%------------------------------------------------------------------------
sw_auxout:=0;
sw_mol_frame:=0;
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
===================================================================
--- trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2017.09.15
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2017.10.29
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.28 or later
+%%% mcf2graph.mf it must be version 4.29 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
Modified: trunk/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
===================================================================
--- trunk/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf 2017-10-29 01:21:34 UTC (rev 45634)
+++ trunk/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf 2017-10-29 21:22:31 UTC (rev 45635)
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.28 Copyright (c) 2013-2017 Akira Yamaji
+% mcf2graph ver 4.29 Copyright (c) 2013-2017 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,
@@ -31,7 +31,7 @@
% Set to use plain.mp label,arrow : mpost -s ahlength=3 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message " This is mcf2graph ver 4.2 2017.9";
+message " This is mcf2graph ver 4.2 2017.10";
%-------------------------------------------------------------------------------------------------
newinternal nA,nB,nC,nD,nE,nF,char_num,str_cnt,sub_usr,sub_int,tbl_cnt;
numeric save_para[],comD[][],parD[][],cntD[],tbl_str_wd[],tbl_atom[],tbl_subst[][],tbl_atom_wt[],
@@ -224,11 +224,11 @@
%=================================================================================================
vardef '(text s)= ''(incr sub_usr)(s); sub_usr enddef;
%-------------------------------------------------------------------------------------------------
-def ''(expr k)(text s)=
+def ''(expr k)(text TXT)=
begingroup
if unknown inside_def_MC:: set_def_MC fi
cntD[k]:=0;
- for list==s::
+ for list==TXT::
if known list::
if pair list:: comD[k][incr cntD[k]]:=xpart(list); parD[k][cntD[k]]:=ypart(list);
elseif numeric list::
@@ -246,17 +246,14 @@
endgroup
enddef;
%-------------------------------------------------------------------------------------------------
-vardef '''(text s)=
+vardef '''(text TXT)=
sub_int:=sub_int+1;
cntD[sub_int]:=0;
- for list==s::
- cntD[sub_int]:=cntD[sub_int]+1;
+ for list==TXT:: cntD[sub_int]:=cntD[sub_int]+1;
if numeric list::
- comD[sub_int][cntD[sub_int]]:=_numeric;
- parD[sub_int][cntD[sub_int]]:=list;
+ comD[sub_int][cntD[sub_int]]:=_numeric; parD[sub_int][cntD[sub_int]]:=list;
elseif pair list::
- comD[sub_int][cntD[sub_int]]:=xpart(list);
- parD[sub_int][cntD[sub_int]]:=ypart(list);
+ comD[sub_int][cntD[sub_int]]:=xpart(list); parD[sub_int][cntD[sub_int]]:=ypart(list);
fi
endfor
sub_int %------- Retern value -------
@@ -288,42 +285,40 @@
PA(_pop,0) if a>=1:: PA(_cyc_eB,0) else:: PA(_cyc_eB,list) fi
enddef;
%==================================================================================================
-vardef change_bond(text t)(expr e) =
+vardef change_bond(expr a)(expr e) =
sub_int:=sub_int+1;
cntD[sub_int]:=0;
if known e:: if numeric e::
- if (e>=si)and(e<=bd_):: if e==dl:: PP(t)(_dl) else:: PX(t)(_set_line,e) fi
+ if (e>=si)and(e<=bd_):: if e==dl:: PP(a)(_dl) else:: PX(a)(_set_line,e) fi
elseif (e>=?3)and(e<=?20)::
- for list==t::
- if list>=sub_int_start:: for i==1 upto cntD[list]:: FR(parD[list][i])(e-?3+3) endfor
- else:: FR(list)(e-?3+3) fi
- endfor
- elseif e==Ph1:: FR(t)(6) PA(_dl,-2) PA(_dl,-4)
- elseif e==Ph2:: FR(t)(6) PA(_dl,-1) PA(_dl,-3) PA(_dl,-5)
- elseif e==JP_AT:: PA(_jp_bond,t)
+ if a>=sub_int_start:: for i==1 upto cntD[a]:: FR(parD[a][i])(e-?3+3) endfor
+ else:: FR(a)(e-?3+3)
+ fi
+ elseif e==Ph1:: FR(a)(6) PA(_dl,-2) PA(_dl,-4)
+ elseif e==Ph2:: FR(a)(6) PA(_dl,-1) PA(_dl,-3) PA(_dl,-5)
+ elseif e==JP_AT:: PA(_jp_bond,a)
elseif comD[e][1]==_fuse::
- if comD[e][2]<=6:: for list==t:: FFR(list)(parD[e][1])(comD[e][2]) endfor
- elseif (comD[e][2]>=11)and(comD[e][2]<=15)::
- for list==t:: FRR(list)(parD[e][1])(comD[e][2]) endfor
+ if comD[e][2]<=6:: FFR(a)(parD[e][1])(comD[e][2])
+ elseif (comD[e][2]>=11)and(comD[e][2]<=15):: FRR(a)(parD[e][1])(comD[e][2])
fi
fi
- elseif color e:: color_list[incr cntC]:=e; PX(t)(_set_colorB,cntC)
+ elseif color e:: color_list[incr cntC]:=e; PX(a)(_set_colorB,cntC)
fi fi
sub_int %------- Retern value -------
enddef;
%-------------------------------------------------------------------------------------------------
-vardef change_atom(text t)(expr e)=
+vardef change_atom(expr a)(expr e)=
sub_int:=sub_int+1;
cntD[sub_int]:=0;
if known e:: if numeric e::
- if (e>=H)and(e<=U):: if e==N:: PP(t)(_N) elseif e==O:: PP(t)(_O) elseif e==S:: PP(t)(_S)
- else:: PX(t)(_chg_atom,e)
+ if (e>=H)and(e<=U):: if e==N:: PP(a)(_N) elseif e==O:: PP(a)(_O) elseif e==S:: PP(a)(_S)
+ else:: PX(a)(_chg_atom,e)
fi
- elseif e==NH:: PA(_set_clr,1) PP(t)(_N) PX(t)(_postH,H) PA(_set_clr,0)
- elseif e==JP_AT:: PA(_jp_atom,t)
+ elseif e==NH:: PA(_set_clr,1) PP(a)(_N) PX(a)(_postH,H) PA(_set_clr,0)
+ elseif e==JP_AT:: PA(_jp_atom,a)
fi
- elseif pair e:: PA(_set_clr,1) PX(t)(xpart(e),ypart(e)) PA(_set_clr,0)
- elseif color e:: color_list[incr cntC]:=e; PX(t)(_set_colorA,cntC)
+ elseif pair e:: PA(_set_clr,1) PX(a)(xpart(e),ypart(e)) PA(_set_clr,0)
+ elseif color e:: color_list[incr cntC]:=e; PX(a)(_set_colorA,cntC)
fi fi
sub_int %------- Retern value -------
enddef;
@@ -379,13 +374,13 @@
endgroup;
enddef;
%==================================================================================================
-def ext_puts(expr PA)(expr STR)=
+def ext_puts(expr a)(expr STR)=
begingroup
save cp,sA,pC;
pair cp;
string sA;
picture pC;
- cp:=PA;
+ cp:=a;
nB:=defaultscale*defaultsize;
nC:=0;
%------------------------------------------------------------------------------------------------
@@ -473,26 +468,25 @@
def sub_add(expr a,b)=
cntD[sub_int]:=cntD[sub_int]+1; comD[sub_int][cntD[sub_int]]:=a; parD[sub_int][cntD[sub_int]]:=b;
enddef;
+%-------------------------------------------------------------------------------------------------
def sub_add_op(expr a,b)=
op_cnt[cntP]:=op_cnt[cntP]+1; op_com[cntP][op_cnt[cntP]]:=a; op_par[cntP][op_cnt[cntP]]:=b;
enddef;
-def sub_pro(text t)(expr a)=
- for list==t::
- if list>=sub_int_start:: for i==1 upto cntD[list]:: sub_add(a,parD[list][i]) endfor
- else:: sub_add(a,list) fi
- endfor
+%-------------------------------------------------------------------------------------------------
+def sub_pro(expr c)(expr a)=
+ if c>=sub_int_start:: for i==1 upto cntD[c]:: sub_add(a,parD[c][i]) endfor
+ else:: sub_add(a,c) fi
enddef;
-def sub_ext(text t)(expr a,b)=
- for list==t::
- if list>=sub_int_start::
- for i==1 upto cntD[list]::
- if comD[list][i]<>_numeric:: sub_add(comD[list][i],parD[list][i])
- else:: sub_add(_set_adr,parD[list][i]) sub_add(a,b) fi
- endfor
- else:: sub_add(_set_adr,list) sub_add(a,b) fi
- endfor
+%-------------------------------------------------------------------------------------------------
+def sub_ext(expr c)(expr a,b)=
+ if c>=sub_int_start::
+ for i==1 upto cntD[c]::
+ if comD[c][i]<>_numeric:: sub_add(comD[c][i],parD[c][i])
+ else:: sub_add(_set_adr,parD[c][i]) sub_add(a,b) fi
+ endfor
+ else:: sub_add(_set_adr,c) sub_add(a,b) fi
enddef;
-%-------------------------------------------------------------------------------------------------
+%=================================================================================================
def MCa(expr FW,FH)(text s)= MCd(1,1)(FW,FH)(s) enddef;
def MCc(expr RW,RH)(text s)= MCd(RW,RH)(0.5,0.5)(s) enddef;
def MCf(text s)= MCd(1,1)(0.5,0.5)(s) enddef;
@@ -1236,7 +1230,7 @@
enddef;
%==================================================================================================
def proc_auxfile_out=
- message "%["&decimal(char_num)&"]:"&inf_EN;
+ message "["&decimal(char_num)&"]:"&inf_EN;
for i=1 upto aux_max: exitif tag[i]="";
if i=1: printf "" else: &aux_delimiter fi if sw_auxfix=0: &tag[i]&":" fi &
if string scantokens(var[i]): scantokens(var[i])
More information about the tex-live-commits
mailing list