summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-04 21:15:45 +0000
committerKarl Berry <karl@freefriends.org>2016-04-04 21:15:45 +0000
commit17a40eea99838f7f911c046cc779cbf84d5a368c (patch)
treeb34821493c98785d8508456df3229b8143eeb6ed /Master/texmf-dist/metapost
parent053027c68f32a28ada3d56a3acd5bdf63b73942d (diff)
mcf2graph (4apr16)
git-svn-id: svn://tug.org/texlive/trunk@40235 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/metapost')
-rw-r--r--Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf16
1 files changed, 7 insertions, 9 deletions
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 956149c65e2..ce075442a5f 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.86 Copyright (c) 2013-2016 Akira Yamaji
+% mcf2graph ver 3.87 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.3";
+message " This is mcf2graph ver 3.8 2016.4";
%-------------------------------------------------------------------------------------------------
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[],
@@ -39,16 +39,14 @@ numeric angB[],angA[],br_ang[],sB[],eB[],f_FON[],atom_w[],atom_h[],atom_d[],strA
CH[],NH[],NO[],SO[],CCl[],CF[],CBr[],?[],![],Ph[];
path pA,pB,pC,pT;
string info[],tblA[],com_str[],var[],tag[],
- calc_formula,mp_log_name,mol_name,mol_formula,calc_weight_str,info_str;
+ calc_formula,mp_log_name,mol_name,mol_formula,calc_weight_str,info_str,aux_separater;
picture atom_font[],chem_structure,temp_picture;
%-------------------------------------------------------------------------------------------------
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_subst_off:=sw_bond_single:=0;
-numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
-info_str:="\INFO"; aux_max:=20;
-var1:="jobname"; tag1:="F";
-var2:="char_num"; tag2:="C";
+numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095; aux_max:=20;
+aux_separater:=";"; var1:="jobname"; tag1:="F"; var2:="char_num"; tag2:="C";
for i=3 upto aux_max: var[i]:=tag[i]:=""; endfor
%-------------------------------------------------------------------------------------------------
if known green: f_MP:=1;
@@ -568,11 +566,11 @@ enddef;
vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" fi enddef;
def auxfile_out=
for i=1 upto aux_max: exitif var[i]="";
- if i=1: printf "" else: &" ," fi &tag[i]&":"&
+ if i=1: printf "" else: &aux_separater fi &tag[i]&":"&
if string scantokens(var[i]): scantokens(var[i])
elseif numeric scantokens(var[i]): decimal(scantokens(var[i])) fi
endfor
- for i=1 upto info_num: &" ,"&info[i] endfor;
+ for i=1 upto info_num: &aux_separater&info[i] endfor;
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
mc_num:=first_def_number;