mcf2graph (5mar16)

git-svn-id: svn://tug.org/texlive/trunk@39945 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 12 deletions

diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 9f5ef880e50..2b79e0b9c5c 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.82       Copyright (c) 2013-2016  Akira Yamaji
+% mcf2graph ver 3.83     Copyright (c) 2013-2016  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,
@@ -30,7 +30,7 @@
 % Set output checklist            : mpost -s ahlength=2 FILENAME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tracingstats:=1;
-message " This is mcf2graph ver 3.8  2016.2";
+message " This is mcf2graph ver 3.8  2016.3";
 %-------------------------------------------------------------------------------------------------
 pair    posB[],posA[],pairT,Ls,Le,pairA;
 numeric angB[],angA[],br_ang[],sB[],eB[],f_FON[],atom_w[],atom_h[],atom_d[],strA[],stkB[],stkA[],
@@ -41,8 +41,8 @@ path    pA,pB,pC,pT;
 string  info[],tblA[],com_str[],calc_formula,mp_log_name,mol_name,mol_formula,calc_weight_str;
 picture atom_font[],chem_structure,temp_picture;
 %-------------------------------------------------------------------------------------------------
-sw_numberA:=sw_numberB:=sw_mol_frame:=sw_logout:=sw_solid:=sw_expand:=sw_start_vector:=0;
-char_num:=str_cnt:=proc_end:=sw_font_frame:=sw_atom_frame:=sw_checklist:=sw_MOLfile:=0;
+sw_numberA:=sw_numberB:=sw_mol_frame:=sw_auxout:=sw_solid:=sw_expand:=sw_start_vector:=0;
+char_num:=str_cnt:=proc_end:=sw_font_frame:=sw_atom_frame:=sw_checklist:=sw_MOLout:=0;
 sw_info_lenx:=sw_info_leny:=sw_info_weight:=sw_info_formula:=sw_subst_off:=sw_bond_single:=0;
 sw_info_file:=sw_info_char:=1;
 numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
@@ -54,7 +54,7 @@ if known green:  f_MP:=1;
   if     ahangle=0: def shipit = enddef;                       % No image file
   elseif ahangle=1: outputformat:="png"; hppp:=vppp:=0.1;      % PNG format
   elseif ahangle=2: outputformat:="svg";                       % SVG format
-  elseif ahangle=3: sw_MOLfile:=1; def shipit = enddef;        % MDL Molefile on
+  elseif ahangle=3: sw_MOLout:=1; def shipit = enddef;         % MDL Molefile on
   fi
   outputtemplate:="%j-%3c."&outputformat;
   def beginchar(text s)= beginfig(char_num) enddef; def endchar = endfig enddef;
@@ -88,7 +88,7 @@ def_com(-4000)(_term,_jp_atom,_jp_atom_abs,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_li
 def_com(1)(si,dl,dr,dm,tm,wf,wb,bd,zf,zb,ov,dt,no,ar,vf,vb,wv,nl);
 %-------------------------------------------------------------------------------------------------
 def parameter_list=
-  sw_checklist,sw_numberA,sw_numberB,sw_mol_frame,sw_logout,sw_solid,sw_expand,sw_MOLfile,
+  sw_checklist,sw_numberA,sw_numberB,sw_mol_frame,sw_auxout,sw_solid,sw_expand,sw_MOLout,
   sw_start_vector,sw_atom_frame,sw_font_frame,sw_subst_off,sw_bond_single,
   margin_left_right,margin_top_bottom,ratio_atom_bond,ratio_thickness_bond,ratio_char_bond,
   ratio_chain_ring,offset_atom,offset_atom#,max_bond_width,ratio_bondgap_bond,ratio_zebra_black,
@@ -117,10 +117,10 @@ enddef;
 %-------------------------------------------------------------------------------------------------
 def endfont=
   if sw_font_frame=1: AUX(0,0)(draw_frame(font_wd,font_ht,(0,0),0.2pt);) fi
-  if (sw_logout=1)or(sw_checklist=1)or(sw_MOLfile=1): mol_check; fi
-  if sw_logout=1:    logfile_out; fi
+  if (sw_auxout=1)or(sw_checklist=1)or(sw_MOLout=1): mol_check; fi
+  if sw_auxout=1:    auxfile_out; fi
   if sw_checklist=1: checklist_out; fi
-  if sw_MOLfile=1:   MOL_out; fi
+  if sw_MOLout=1:   MOLfileout; fi
   if f_beginchar=1:
      char_num:=char_num+1; currentpicture:=chem_structure; chem_structure:=nullpicture;
      endchar; fi
@@ -310,7 +310,7 @@ def MCd(expr RW,RH)(expr FW,FH)(text s)=
   stkA[0]:=stkB[0]:=stkL[0]:=stkM[0]:=strAT:=f_lineT:=f_lenT:=f_envT:=f_rotT:=0;
   eB[0]:=1; com_str[0]:=""; lineT:=si; str_cnt:=2000; posA[0]:=posB[0]:=posB[1]:=(0,0);
   if (sw_numberA>=1)or(sw_numberB>=1): ratio_atom_bond:=0.25; fi
-  if (sw_expand=1)or(sw_MOLfile=1): expand_set; fi
+  if (sw_expand=1)or(sw_MOLout=1): expand_set; fi
   ''(0)(s,(_term,0));  proc_bond_atom(1); cntA_skeleton:=cntA; cntB_skeleton:=cntB;
   if cntP>0: ps_get(1); fi
   font_use_check;
@@ -548,7 +548,7 @@ enddef;
 vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" fi enddef;
 def info_c(expr sw,c,cc)= if sw=1: &"{"&c&":"&cc&"}" fi enddef;
 def info_n(expr sw,c,n)=  if sw=1: &"{"&c&":"&decimal(n)&"}" fi enddef;
-def logfile_out=
+def auxfile_out=
   printf "\INFO{"
     info_c(sw_info_file,"F",jobname)  info_n(sw_info_char,"C",char_num)
     info_n(sw_info_lenx,"Lx",len_x)   info_n(sw_info_leny,"Ly",len_y)
@@ -798,7 +798,7 @@ def checklist_out=
   message "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%";
 enddef;
 %------------------------------------------------------------------------------------------------
-def MOL_out=
+def MOLfileout=
   mp_log_name:=jobname&"-"&fit_zero(char_num)&decimal(char_num)&"-"&mol_name&".mol";
   printf ""; printf "  -MCFtoMOL- "&fixed_l(20)(info[1]); printf "";
   printf fdr(3)(cntA)&fdr(3)(cntB)&"  0  0  0  0  0  0  0  0999 V2000";