summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-25 23:12:28 +0000
committerKarl Berry <karl@freefriends.org>2015-09-25 23:12:28 +0000
commit7b3caccd5a070d5419779041629ae27d7a4a3db9 (patch)
treea19fb01eb435cbfd2598e56d25df4ba36bfec49b /Master/texmf-dist/metapost
parent97e34175d0f5e100422fbd133cadfcf6f5e944e6 (diff)
mcf2graph (25sep15)
git-svn-id: svn://tug.org/texlive/trunk@38458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/metapost')
-rw-r--r--Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf27
1 files changed, 13 insertions, 14 deletions
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 3c147f29048..2ecd92f90c3 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.72 Copyright (c) 2013-2015 Akira Yamaji
+% mcf2graph ver 3.73 Copyright (c) 2013-2015 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,
@@ -43,10 +43,9 @@ string info[],tblA[],com_str[],calc_formula,mp_log_name,mol_name,mol_formula,ca
picture atom_font[],chem_structure,temp_picture;
%-------------------------------------------------------------------------------------------------
sw_numberA:=sw_numberB:=sw_mol_frame:=sw_logout:=sw_solid:=sw_expand:=sw_start_vector:=0;
-sw_font_frame:=sw_atom_frame:=sw_checklist:=sw_MOLfile:=0;
+char_num:=str_cnt:=proc_end:=sw_font_frame:=sw_atom_frame:=sw_checklist:=sw_MOLfile:=0;
sw_info_file:=sw_info_char:=1; sw_info_lenx:=sw_info_leny:=sw_info_weight:=sw_info_formula:=0;
-char_num:=str_cnt:=proc_end:=0;
-numberA_start:=1; numberA_end:=4095; numberB_start:=1; numberB_end:=4095;
+numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
if known green: f_MP:=1;
mp_log_name:=jobname&"-info.aux";
if ahlength=1: proc_end:=1; fi % first molecular only
@@ -177,22 +176,22 @@ enddef;
%-------------------------------------------------------------------------------------------------
vardef '(text s)= ''(incr mc_num)(s); mc_num enddef;
def set_def_MC=
- save /,*,//,/*,*/,**,~,^,`,{,},<,>,&,:,=,\,\\,*\,\*,@,$,#,##,|,d,w,z,inside_def_MC;
+ save /,*,//,/*,*/,**,~,^,`,{,},<,>,&,&#,:,=,\,\\,*\,\*,@,$,#,|,d,w,z,inside_def_MC;
inside_def_MC:=1; d:=dl; w:=wf; z:=zf;
- vardef $(text a)tertiary b == $$(a)(b) enddef; vardef @(text a)tertiary b == @@(a)(b) enddef;
- vardef #primary n == n MUL unit_e enddef; vardef ##primary n == -n MUL unit_e enddef;
+ vardef $(text a)tertiary b == $$(a)(b) enddef; tertiarydef a=b == $$(a)(b) enddef;
+ vardef @(text a)tertiary b == @@(a)(b) enddef; tertiarydef a:b == @@(a)(b) enddef;
+ vardef #primary n == n MUL unit_e enddef;
+ def &primary n ==(_cyc,n) enddef; def &# == & # enddef;
tertiarydef a^b == (_tmp_rot,b),a enddef; tertiarydef a`b == (_tmp_len,b),a enddef;
tertiarydef a>b == (_tmp_env,b),a enddef; tertiarydef a~b == (_tmp_line,b),a enddef;
- tertiarydef a=b == $$(a)(b) enddef; tertiarydef a:b == @@(a)(b) enddef;
- def &primary n ==(_cyc,n) enddef; def /primary n ==(_postA,n) enddef;
def * == (0,1) enddef; def \ == *,0 enddef; def \\ == *,0~dm enddef;
def *\ == (0,1),0~wf enddef; def \* == (0,1),0~zf enddef;
def { == (_push,1) enddef; def } == (_pop,1) enddef;
def {{ == (_push,0) enddef; def }} == (_pop,0) enddef; def | == {,} enddef;
def >>primary n == (_chg_env,n) enddef; def ``primary n == (_chg_len,n) enddef;
- def <primary n == (_rot_ang,n) enddef; def ~~primary n == (_chg_line,n) enddef;
- def /secondary n == (_postA,n) enddef; def //secondary n == (_postB,n) enddef;
- def */secondary n == (_postC,n) enddef; def /*secondary n == (_postD,n) enddef;
+ def <primary n == (_rot_ang,n) enddef;
+ def /secondary n == (_postA,n) enddef; def //secondary n == (_postB,n) enddef;
+ def */secondary n == (_postC,n) enddef; def /*secondary n == (_postD,n) enddef;
def **secondary n == (_postE,n) enddef; def */*secondary n == (_postF,n) enddef;
enddef;
%-------------------------------------------------------------------------------------------------
@@ -556,7 +555,7 @@ for i=3 upto 20: ?[i]:='({{,ring i,}}); endfor
Ph:=Ph1:='(?6,(_dl,-2),(_dl,-4),(_dl,-6)); Ph2:='(?6,(_dl,-1),(_dl,-3),(_dl,-5));
!:='((_mk_bond,_arg_ang)); !0:='(<180,180);
for i=1 upto 20: ![i]:='({{,(_get_len,0),! for j==2 upto i::,! endfor,}}); endfor
-Me:='(); Et:=!; Pr:='(!,!); Bu:='(!,!,!);
+Me:='(); Et:=!; Pr:='(!2); Bu:='(!3);
for i=4,5,6: for j=2 upto i-2: ?[i][j]:='((_fuse,i),(j,0)); endfor endfor
%-------------------------------------------------------------------------------------------------
H :='("H");C:='("C");N:='("N");O:='("O");F:='("F");S:='("S");P:='("P");I:='("I");
@@ -805,4 +804,4 @@ def MOL_out=
printf fdr(3)(sB[i])&fdr(3)(eB[i])&fdr(3)(nA)&fdr(3)(nB)&" 0 0"; fi endfor
printf "M END";
enddef;
-%------------------------------------------------------------------------------------------------
+%---------------------------------------------------------------------------------------