mcf2graph (28nov15)

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

1 files changed, 6 insertions, 5 deletions

diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 8e63ba00dc1..f848aead7f8 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.75       Copyright (c) 2013-2015  Akira Yamaji
+% mcf2graph ver 3.76       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,
@@ -17,7 +17,7 @@
 % OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  mcf2graph is METAFONT/METAPOST macro package convert
-%  Molecular Coding Format(MCF) to font/eps/sgv/png/mdl molfile(V2000)
+%  Molecular Coding Format(MCF) to font(pk)/eps/sgv/png/mdl molfile(V2000)
 %----------------------------------------------------------------------------------------------
 % This package is located at : http://mirror.ctan.org/pkg/graphics/mcf2graph
 % Suggestion or request mail to : akira.yamaji5@gmail.com 
@@ -30,7 +30,7 @@
 % Set output checklist            : mpost -s ahlength=2 FILENAME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tracingstats:=1;
-message " This is mcf2graph ver 3.7  2015.10";
+message " This is mcf2graph ver 3.7  2015.11";
 %-------------------------------------------------------------------------------------------------
 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[],
@@ -45,6 +45,7 @@ sw_numberA:=sw_numberB:=sw_mol_frame:=sw_logout:=sw_solid:=sw_expand:=sw_start_v
 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;
 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
@@ -183,7 +184,7 @@ def set_def_MC=
   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;
   def * == (0,1) enddef;  def \ == *,0 enddef;  def \\ == *,0~dm enddef;
-  def *\ == (0,1),0~wf enddef;  def \* == (0,1),0~zf enddef;
+  def *\ == *,0~wf enddef;  def \* == *,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;
@@ -296,7 +297,7 @@ enddef;
 %-------------------------------------------------------------------------------------------------
 def AUX(expr a,b)(text s)=s addto chem_structure also currentpicture shifted(a,b); clearit; enddef;
 def MCf(text s)= MCd(1,1)(.5,.5)(s); enddef;  % MC fill draw
-%-- MC draw --------------------------------------------------------------------------------------
+%-------------------------------------------------------------------------------------------------
 def MCd(expr RW,RH)(expr FW,FH)(text s)=
   if f_beginchar=0: beginchar(char_num,font_wd#,font_ht#,0); clearit; f_beginchar:=1; fi
   mc_num:=user_def_number; ab_num:=ab_def_number; crR:=-ratio_chain_ring;