mcf2graph (3aug15)

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

1 files changed, 10 insertions, 12 deletions

diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 03890a729b2..9aee49e6677 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.53      Copyright (c) 2013-2015  Akira Yamaji
+% mcf2graph ver 3.54      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,
@@ -30,7 +30,7 @@
 % Set output checklist            : mpost -s ahlength=2 FILENAME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tracingstats:=1;
-message " This is mcf2graph ver 3.5  2015.7 ";
+message " This is mcf2graph ver 3.5  2015.8 ";
 newinternal com,par,cntA,cntB,adrS,adrA,adrB,dx,nX,i,u,j,k,v,xp,yp,nA,nB;
 %-------------------------------------------------------------------------------------------------
 pair    posB[],posA[],pairT,Ls,Le,pairA;
@@ -45,7 +45,7 @@ picture atom_font[],chem_structure,temp_picture;
 sw_numberA:=sw_numberB:=sw_frame:=sw_logout:=sw_solid:=sw_expand:=sw_start_vector:=0;
 sw_atom_frame:=sw_checklist:=sw_MOLfile:=char_num:=str_cnt:=size_changed:=proc_end:=0;
 if known green:  f_MP:=1;
-  mp_log_name:=jobname&"-info.log";
+  mp_log_name:=jobname&"-info.aux";
   if     ahlength=1: proc_end:=1;  fi                          % first molecular only
   if     ahlength=2: sw_checklist:=1; def shipit = enddef; fi  % checklist on
   if     ahangle=0: def shipit = enddef;                       % No image file
@@ -74,7 +74,7 @@ ratio_pen_wd:=1.4;            ratio_bondgap_bond:=0.15;  ratio_zebra_gap:=0.12;
 ratio_zebra_black:=0.4;       ratio_wedge_bond:=0.15;    font_gap:=.066;
 offset_thick#:=0.2pt#;        offset_gap#:=0.3pt#;       offset_zebra_gap#:=0.1pt#;
 par_s=ASCII("{"); par_e=ASCII("}"); score_u=ASCII("_"); hat=ASCII("^");
-for i:=1 upto 16: info[i]:=":"; endfor
+max_info_num:=12; for i:=1 upto max_info_num: info[i]:=":"; endfor
 def def_com(expr n)(text tx)= nA:=n; forsuffixes list=tx:: list:=nA; nA:=nA+1; endfor enddef;
 def_com(-4000)(_term,_jp_atom,_jp_atom_abs,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_line,_chg_line,
  _dl,_tmp_line,_chg_len,_get_len,_ring_len,_tmp_len,_rot_ang,_set_ang,_adj_ang,_chg_env,
@@ -171,8 +171,8 @@ def set_def_MC=
   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 {  == (_push,1) enddef; def }  == (_pop,1)  enddef;
+  def {{ == (_push,0) enddef; def }} == (_pop,0)  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;
@@ -498,12 +498,10 @@ enddef;
 %-------------------------------------------------------------------------------------------------
 vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" fi enddef;
 def logfile_out=
-  printf "%------------------------------------------------------------------";
-  printf "\MOLinfo{"&info[1]&"}{"&info[2]&"}{"&info[3]&"}{"&info[4]&"}%";
-  printf "{"&info[5]&"}{"&info[ 6]&"}{"&info[ 7]&"}{"&info[ 8]&"}"&
-         "{"&info[9]&"}{"&info[10]&"}{"&info[11]&"}{"&info[12]&"}%";
-  printf "\MCFinfo{"&jobname&"}"&"{"&decimal(char_num)&"}"&"{"&mp_filename&"}"&"{"&decimal(len_x)
-     &"}"&"{"&decimal(len_y)&"}"&"{"&decimal(ratio_bond_width)&"}"&"{"&decimal(cntA)&"}"&"{}{}%";
+  printf "%";
+  printf "\MOLinfo" for i=1 upto max_info_num: &"{"&info[i]&"}" endfor &"%";
+  printf "\MCFinfo{"&jobname&"}{"&decimal(char_num)&"}{"&mp_filename&"}{"&decimal(len_x)
+        &"}{"&decimal(len_y)&"}{"&decimal(ratio_bond_width)&"}{"&decimal(cntA)&"}{}{}%";
 enddef;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 mc_num:=first_def_number;