mcf2graph (10apr16)

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

10 files changed, 43 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index dca2d5bbb50..4b8bd40ae1a 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,9 @@
 *******************************************************************************
- Changelog of mcf2graph software package        by Akira Yamaji 2016-04-06
+ Changelog of mcf2graph software package        by Akira Yamaji 2016-04-10
 *******************************************************************************
+[ver. 3.89  / 2016-04-10]
+  -add new bond type bz (broad dotted)
+
 [ver. 3.88  / 2016-04-06]
   -rename variable 'aux_separater' => 'aux_delimiter'
 
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index cd42f764405..54e8f1ae7b3 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/README
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/README
@@ -1,7 +1,7 @@
 ********************************************************************************
  mcf2graph  : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
  Author     : Akira Yamaji
- version    : 3.88 2016-04-06
+ version    : 3.89 2016-04-10
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 30e82898ac1..8898ab0c50c 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index 86755b9bd92..b0cae3f7541 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX   mcf_examples.tex    by A.Yamaji  2016.4.6
+% Example of MCF typeset by LaTeX   mcf_examples.tex    by A.Yamaji  2016.4.10
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage{graphicx}
@@ -48,25 +48,17 @@
   \advance\fontnum\@ne\relax\advance\tnum\@ne\relax%
   \ifnum\tnum=5 \\ \tnum=0\relax \fi%
 }
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% copied from ltcntrl.dtx [2014/04/21 v1.0h LaTeX Kernel (program control)]
-% modified  @for (delimiter=",") to @for@semi (delimiter=";") 
-%--------------------------------------------------------------------------------
-\def\@for@semi#1:=#2\do#3{\expandafter\def\expandafter\@for@tmp\expandafter{#2}%
- \ifx\@for@tmp\@empty \else \expandafter\@for@loop#2;\@nil;\@nil\@@#1{#3}\fi}%
-\def\@for@loop#1;#2;#3\@@#4#5{\def#4{#1}\ifx #4\@nnil \else%
- #5\def#4{#2}\ifx #4\@nnil \else#5\@ifor@loop #3\@@#4{#5}\fi\fi}%
-\def\@ifor@loop#1;#2\@@#3#4{\def#3{#1}\ifx #3\@nnil%
- \expandafter\@for@noop \else #4\relax\expandafter\@ifor@loop\fi#2\@@#3{#4}}%
-\def\@for@noop#1\@@#2#3{}%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%-------------------------------------------------------------------------------
+%  modified latex2e kernel program control (@for delimiter ','=>';')
+\def\@sfor#1#2{\expandafter\def\expandafter\@tmp\expandafter{#1}%
+ \ifx\@tmp\@empty\else\expandafter\@rep#1;\@nil;\@@\@list{#2}\fi}%
+\def\@rep#1;#2\@@#3#4{\def#3{#1}\ifx#3\@nnil%
+ \expandafter\@fornoop\else#4\relax\expandafter\@rep\fi#2\@@#3{#4}}%
+%-------------------------------------------------------------------------------
 \def\inputINFOS#1{\openin\@auxf=#1\CONT@true%
 \loop
-\read\@auxf to \temp@info%
-\ifeof\@auxf\CONT@false\else%
-\@for@semi\@temp:=\temp@info\do{\mol@sel\@temp}%
-\put@char%
-\fi%
+\read\@auxf to \@info%
+\ifeof\@auxf\CONT@false\else\@sfor\@info{\mol@sel\@list}\put@char\fi%
 \ifCONT@ \repeat
 \closein\@auxf}%
 %-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
index fe96aa8e873..2fd83a42d18 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex   by Akira.Yamaji 2016.04.4
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2016.04.10
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 input mcf2graph.mf;
 %------------------------------------------------------------------------
@@ -94,7 +94,7 @@ endfont
 %***********************************************************************
 beginfont("EN:change bond 3")
   ratio_chain_ring:=1;
-  MCf(<30,!5,$(2,4)dr,@(3~bd^-45`2,5~ov^45`2)/Me)
+  MCf(<30,!5,1=bz,$(2,4)dr,@(3~bd^-45`2,5~ov^45`2)/Me)
 endfont
 %***********************************************************************
 beginfont("EN:change bond length1")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index d09749bc092..e4eeb468c3a 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index 9d51efa5f0c..f8eafbc0c66 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%  Molecular Coding Format manual          by  Akira Yamaji 2016.04.6
+%  Molecular Coding Format manual          by  Akira Yamaji 2016.04.10
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage[dvipdfmx]{graphicx}
@@ -295,9 +295,10 @@ zf:wedge dotted, zb:wedge dotted backward
 \begin{verbatim}
 Bn=bond type : change bond type at Bn
 vf : vector forward, vb : vector backward
-tm : triple, dt : dotted, wv : wave
+tm : triple, dt : dotted
+wv : wave
 
-  <30,!5,1=vf,2=vb,3=tm,4=dt,5=wv
+  <30,!6,1=vf,2=vb,3=tm,4=dt,5=bz,5=wv
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -306,10 +307,10 @@ tm : triple, dt : dotted, wv : wave
 \begin{minipage}[t][37mm]{90mm}
 \MCFtitle{Change bond type (3)}
 \begin{verbatim}
-  bd : broad single   ov : over line
-  $(2,4)dr : 2=dr,4=dr
+bd : broad single   bz : broad dotted 
+ov : over line     $(2,4)dr : 2=dr,4=dr
 
-  <30,!5,$(2,4)dr,
+  <30,!5,1=bz,$(2,4)dr,
          @(3~bd^-45`2,5~ov^45`2)/Me
 
 ** 3~bd^-45`2 : ~~bd,^^-45,'`2,3
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
index b1f6dc91ad7..b75682de6d9 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
index 97665f04f28..69487d81d77 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of  MCF typest with LuaLaTeX(luamplib)       by A.Yamaji   2016.4.6
+% Example of  MCF typest with LuaLaTeX(luamplib)       by A.Yamaji   2016.4.10
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass{article}
 %------------------------------------------------------------------------------
@@ -10,7 +10,6 @@
               input mcf2graph.mf;
               mp_log_name:="temp-info.aux";
               sw_auxout:=1; 
-              aux_delimiter:=",";
               var3:="len_x";        tag3:="Lx";
               var4:="calc_weight";  tag4:="MWc";
               var5:="calc_formula"; tag5:="FMc";
@@ -40,10 +39,16 @@
 \def\@MW{MW}\def\@MWc{MWc}\def\@FM{FM}\def\@FMc{FMc}\def\@Lx{Lx}\def\@Ly{Ly}%
 \def\@NO{NO}\def\@USE@{USE}\def\@logP@{logP}\def\@EXA@{EXA}\def\@EXB@{EXB}%
 %-------------------------------------------------------------------------------
+%  modified latex2e kernel program control (@for delimiter ','=>';')
+\def\@sfor#1#2{\expandafter\def\expandafter\@tmp\expandafter{#1}%
+ \ifx\@tmp\@empty\else \expandafter\@rep#1;\@nil;\@nil\@@\@list{#2}\fi}%
+\def\@rep#1;#2\@@#3#4{\def#3{#1}\ifx#3\@nnil%
+ \expandafter\@fornoop\else#4\relax\expandafter\@rep\fi#2\@@#3{#4}}%
+%-------------------------------------------------------------------------------
 \def\inputINFO#1{\openin\@auxf=#1\CONT@true%
 \loop
-\read\@auxf to \tempinfo%
-\ifeof\@auxf\CONT@false\else \@for\@temp:=\tempinfo\do{\mol@sel\@temp} \fi%
+\read\@auxf to \@info%
+\ifeof\@auxf\CONT@false\else \@sfor\@info{\mol@sel\@list}\fi%
 \ifCONT@ \repeat
 \closein\@auxf}%
 %--------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index ff213020f0c..3bca433c396 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.88     Copyright (c) 2013-2016   Akira Yamaji
+% mcf2graph ver 3.89     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,
@@ -87,7 +87,7 @@ def_com(-4000)(_term,_jp_atom,_jp_atom_abs,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_li
  _dl,_N,_O,_S,_H,_tmp_line,_chg_len,_get_len,_ring_len,_tmp_len,_rot_ang,_set_ang,_adj_ang,_chg_env,
  _tmp_env,_set_colorA,_set_colorB,_postA,_postB,_postC,_postD,_postE,_postF,_set_psA,_stack_reset,
  _set_clr,_set_adr,_mk_bond,_set_atom,_arg_ang,_chg_atom,_tmp_rot,_fuse,_push,_pop,_size_a);
-def_com(1)(si,dl,dr,dm,tm,wf,wb,bd,zf,zb,ov,dt,no,ar,vf,vb,wv,nl);
+def_com(1)(si,dl,dr,dm,tm,wf,wb,bd,bz,zf,zb,ov,dt,no,ar,vf,vb,wv,nl);
 %-------------------------------------------------------------------------------------------------
 def parameter_list=
   sw_checklist,sw_numberA,sw_numberB,sw_mol_frame,sw_auxout,sw_solid,sw_expand,sw_MOLout,
@@ -508,11 +508,15 @@ enddef;
 def wpcs expr n= withpen pencircle scaled n enddef;
 def sqr(expr WD,HT)= ((0,0)--(WD,0)--(WD,HT)--(0,HT)--cycle) enddef;
 def sfB(expr p,l,r)= p shifted ((l,0) rotated r) enddef;
-def z_put(expr PA,PB,PD,CL)= save nA,nC,nD; nC:=length(Le-Ls);
+def wz_put(expr PA,PB,PD,CL)= save nA,nC,nD; nC:=length(Le-Ls);
   for i=0 upto nC/zebra_gap: 
     nA:=zebra_gap*i/nC; nD:=(zebra_gap*i+ratio_zebra_black*zebra_gap)/nC;
     if nD>((nC-zebra_gap)/nC): nD:=1; fi
     fill nA[PB,PA]--nA[PD,PA]--nD[PD,PA]--nD[PB,PA]--cycle Cp(CL); endfor  enddef;
+def bz_put(expr PA,PB,PC,PD,CL)= save nA,nC,nD; nC:=length(Le-Ls);
+  for i=0 upto nC/zebra_gap: 
+    nA:=zebra_gap*i/nC; nD:=(zebra_gap*i+ratio_zebra_black*zebra_gap)/nC;
+    fill nA[PB,PA]--nA[PD,PC]--nD[PD,PC]--nD[PB,PA]--cycle Cp(CL); endfor  enddef;
 def cut_off(expr p,w,h,s)=
   p intersectionpoint sqr(1.1w,1.1h) shifted (s-(.5(1.1w),.5(1.1h))); enddef;
 def clipping(expr SA,SB,PA,PB,LEN)=
@@ -548,8 +552,9 @@ if (nC>0)and(LN<>0):
   elseif LN=wf:fill Ls--sfB(Le,ww,am)--sfB(Le,ww,ap)--cycle;
   elseif LN=wb:fill sfB(Ls,ww,am)--Le--sfB(Ls,ww,ap)--cycle;
   elseif LN=bd:draw pA withpen penrazor rotated ap scaled gap Cp(nB);
-  elseif LN=zf:z_put(Ls,sfB(Le,ww,ap),sfB(Le,ww,am),nB);
-  elseif LN=zb:z_put(Le,sfB(Ls,ww,am),sfB(Ls,ww,ap),nB);
+  elseif LN=bz:bz_put(sfB(Ls,ww,ap),sfB(Le,ww,ap),sfB(Ls,ww,am),sfB(Le,ww,am),nB);
+  elseif LN=zf:wz_put(Ls,sfB(Le,ww,ap),sfB(Le,ww,am),nB);
+  elseif LN=zb:wz_put(Le,sfB(Ls,ww,am),sfB(Ls,ww,ap),nB);
   elseif LN=dt:for i=0 step .75zebra_gap/length(Le-Ls) until 1: drawdot i[Ls,Le]; endfor
   elseif LN=wv:draw_wv;
   elseif LN=ov:erase draw 0.15[Ls,Le]--0.85[Ls,Le] wpcs gap; draw pA Cp(nB);