summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin259824 -> 259819 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin320372 -> 320703 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex7
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin127775 -> 127775 bytes
-rw-r--r--Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf27
6 files changed, 21 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 1644433da8b..a30d22a12bc 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.74 2015-10-03
+ version : 3.75 2015-10-17
E-mail : akira.yamaji5@gmail.com
Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph
Home page : http://molecoding.cocolog-nifty.com/blog/
@@ -45,7 +45,7 @@
max_bond_width:=0.2; % max fond length/font width
%-----------------------------------------------------------------------
beginfont("EN:Acetamiprid") % Molecular name 1
- MCf(^^30,Ph,4\,!,NH,!,!~dr,N,!,CN)% % Molecular Coding Format
+ MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN)% % Molecular Coding Format
endfont
%-----------------------------------------------------------------------
bye
@@ -64,7 +64,6 @@
% or insert next line
\input mcf_exa_soc-info.aux % filename of souce file : mcf_exa_soc.mf
-
6. How to use mcf2graph with luamplib(LuaLaTeX)
It is possible to write MCF in LaTeX text with luamplib(ver.2.11).
mcf_mplib_exa.tex is example of using luamplib(LuaLaTeX).
@@ -79,7 +78,7 @@
\begin{mplibcode}
font_wd:=100mm; font_ht:=50mm;
beginfont("EN:Acetamiprid") % Molecular name 1
- MCf(^^30,Ph,4\,!,NH,!,!~dr,N,!,CN)% % Molecular Coding Format
+ MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN)% % Molecular Coding Format
endfont
\end{mplibcode}
%----------------------------------------------------------------------------
@@ -123,3 +122,4 @@
ver. 3.72 / 2015-09-22 change command ^^ to < and delete ^^
ver. 3.73 / 2015-09-25 '&#n' can use as '&(#n)'
ver. 3.74 / 2015-10-03 improve bond infomation of checklist
+ ver. 3.75 / 2015-10-17 fix bug in command **
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 4dcb0f30c49..03a1db5eedf 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index d1d69ca9e33..2af185147f8 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index 40bc145445c..aefede167ae 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 2015.9.25
+% Molecular Coding Format manual by Akira Yamaji 2015.10.17
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[dvipdfmx]{graphicx}
@@ -34,16 +34,17 @@
\noindent%
\begin{picture}(180,0)
\put(20,9){{\LARGE\bf Molecular Coding Format manual}\hspace{10mm}
- by Akira Yamaji 2015.9.25}
+ by Akira Yamaji 2015.10.17}
\end{picture}\vspace{-4.2mm}\\
%----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
\MCFtitle{Chain (1)}
\begin{verbatim}
plus(+):anticlockwize,minus(-)clockwize
-bold arrow is default angle and position
<30,-60,60,-60,60,-60,60
+
+ ** bold arrow is default angle and position
\end{verbatim}
\end{minipage}
\MCFstructure
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 2bb6ee316ef..ac8dce674a8 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 7e6e0c53315..8e63ba00dc1 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.74 Copyright (c) 2013-2015 Akira Yamaji
+% mcf2graph ver 3.75 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,
@@ -272,6 +272,16 @@ def @@(text t)(expr s)=
endgroup
enddef;
%-------------------------------------------------------------------------------------------------
+def PP(expr a,b)= op_com[cntP][incr op_cnt[cntP]]:=a; op_par[cntP][op_cnt[cntP]]:=b; enddef;
+def ps_put(expr n,p)=
+ ps_adr[incr cntP]:=n; ps_com[cntP]:=p; op_cnt[cntP]:=0;
+ if lineT<>0: PP(_tmp_line,lineT) fi if rotT<>0: PP(_rot_ang,rotT) fi
+ if lenT<>crR: PP(_chg_len,lenT) fi if envT<>hz: PP(_chg_env,envT) fi
+ if lineT=nl: PP(_tmp_len,0) elseif lineT=no: PP(_adj_ang,0) fi PP(_mk_bond,0)
+ if f_lineT=0: lineT:=si; fi if f_lenT=0: lenT:=crR; fi
+ if f_rotT=0: rotT:=0; fi if f_envT=0: envT:=hz; fi
+enddef;
+%-------------------------------------------------------------------------------------------------
def PG(expr a,b)= comMC[0][incr cntMC[0]]:=a; parMC[0][cntMC[0]]:=b; enddef;
def ps_get(expr n)=
cntC:=cntMC[0]; cntPS:=cntP;
@@ -376,16 +386,6 @@ def proc_bond_atom(expr n)=
endfor
enddef;
%-------------------------------------------------------------------------------------------------
-def PP(expr a,b)= op_com[cntP][incr op_cnt[cntP]]:=a; op_par[cntP][op_cnt[cntP]]:=b; enddef;
-def ps_put(expr n,p)=
- ps_adr[incr cntP]:=n; ps_com[cntP]:=p; op_cnt[cntP]:=0;
- if lineT<>0: PP(_tmp_line,lineT) fi if rotT<>0: PP(_rot_ang,rotT) fi
- if lenT<>crR: PP(_chg_len,lenT) fi if envT<>hz: PP(_chg_env,envT) fi
- if lineT<>nl: if lineT=no: PP(_adj_ang,0) fi PP(_mk_bond,0) fi
- if f_lineT=0: lineT:=si; fi if f_lenT=0: lenT:=crR; fi
- if f_rotT=0: rotT:=0; fi if f_envT=0: envT:=hz; fi
-enddef;
-%-------------------------------------------------------------------------------------------------
def add_atom=
lineB[incr cntB]:=lineT; lineT:=si;
if lenT=crR: lenB[cntB]:=bondL; else: lenB[cntB]:=lenT; lenT:=crR; fi
@@ -761,13 +761,12 @@ enddef;
def checklist_out=
nA:=0; calc_weight_str:="";
message "% Molecular name = "& mol_name;
- message "% There were "&fdr(3)(warning_cnt)&" warnings";
+ message "% There were "&fdr(3)(warning_cnt)&" warnings / Expanded command count= "&decimal(cntMC[0]);
message "% width * height = " & fdr(8)(max_x-min_x)&" * "&fdr(8)(max_y-min_y);
message "% Shift width * height = "& fdr(8)(min_x)&" * "&fdr(8)(min_y);
message "% Bond length = "&fdr(3)(BL)&" Atom size = "&fdr(3)(AL);
message "% Atom count="&fdr(3)(cntA)&" Bond count="&fdr(3)(cntB)&
- " Ring count="&fdr(3)(cntB-cntA+1);
- message "% Hide H = "&fdr(3)(hide_H);
+ " Ring count="&fdr(3)(cntB-cntA+1)&" Hide H ="&fdr(3)(hide_H);
message "%-----------------------------------< atom >< bond >-------";
for i=1 upto cntA: message "% "&fdr(3)(i)&" ("&fdr(10)(xpart(posA[i])/BL)&" ) ("&
fdr(10)(ypart(posA[i])/BL)&" ) "&fixed_l(8)(com_str[strA[i]])&" "&fdr(3)(Bcnt[i]); endfor