summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG6
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README4
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin248085 -> 247916 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex16
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin419072 -> 419062 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex24
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin123595 -> 123296 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex32
-rw-r--r--Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf9
11 files changed, 56 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 130584a3b46..1e7f54b543e 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,10 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2016-03-24
+ Changelog of mcf2graph software package by Akira Yamaji 2016-04-01
*******************************************************************************
+[ver. 3.86 / 2016-04-02]
+ -change aux output format(command => csv)
+ -update MCF syntax manual
+
[ver. 3.85 / 2016-03-24]
-change aux output control
-update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index afa70443a9c..a7f1cd5c91a 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.85 2016-03-24
+ version : 3.86 2016-04-02
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -31,7 +31,7 @@
3. How to use mcf2graph with Metapost
( 1) >mpost -s ahangle=0 FILENAME => output no graphic file.
- ( 2) >mpost -s ahangle=1 FILENAME => output PNG file. (default 0:eps)
+ ( 2) >mpost -s ahangle=1 FILENAME => output PNG file. (default:eps)
( 3) >mpost -s ahangle=2 FILENAME => output SVG file.
( 4) >mpost -s ahangle=3 FILENAME => output MDL Molfile(V2000)
( 5) >mpost -s ahlength=1 FILENAME => output first definition only (for test)
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
index 16b3e823749..697bc56d1fc 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.03.24
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.04.2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
input mcf2graph.mf;
%-------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 315de5e8602..3a9d85158c6 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_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index 5520b2c7291..9752ba06246 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.2.27
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2016.4.2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -15,6 +15,8 @@
\newbox \@stringbox%
\newcount \fontnum%
\newcount \tnum%
+\newif\ifCONT@%
+\newread\@auxf%
%-------------------------------------------------------------------------------
\def\mol@sel#1{%
\if#1\empty\relax\else%
@@ -47,7 +49,15 @@
\ifnum\tnum=5 \\ \tnum=0\relax \fi%
}
%-------------------------------------------------------------------------------
-\def\INFO#1{\@tfor\@temp:=#1\do{\mol@sel\@temp}\put@char}%
+\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}%
+\put@char\fi%
+\ifCONT@ \repeat
+\closein\@auxf}%
%-------------------------------------------------------------------------------
\makeatother
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -60,7 +70,7 @@
\fontnum=1%
\noindent%
%------------------------------------------------------------------------
-\input mcf_exa_soc-info.aux
+\inputINFO{mcf_exa_soc-info.aux}%
%------------------------------------------------------------------------
\end{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 05ffe66f8ed..6fc91555202 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.03.24
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.04.2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
input mcf2graph.mf;
%------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 451e193dde8..79712057dba 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 a8426aac7c2..8ae0ac72530 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.03.24
+% Molecular Coding Format manual by Akira Yamaji 2016.04.2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[dvipdfmx]{graphicx}
@@ -52,7 +52,7 @@
\end{picture}%
}
%----------------------------------------------------------------------------
-\def\INFO#1{\@tfor\@temp:=#1\do{\mol@sel\@temp}\put@char}%
+\def\INFO#1{\@for\@temp:=#1\do{\mol@sel\@temp}\put@char}%
%----------------------------------------------------------------------------
\begin{document}
\begin{center}
@@ -115,8 +115,8 @@ bye
\noindent%
{\bf (Molecular information output)}
\begin{verbatim}
-\INFO{{F:mcf_man_soc}{C:0}{MWc:893.48962}{FMc:C55H72MgN4O5}
- {NO:1}{EN:Chlorophyll a}{MW:893.49}}%
+F:mcf_man_soc ,C:0 ,MWc:893.48962 ,FMc:C55H72MgN4O5
+ ,NO:1 ,EN:Chlorophyll a ,MW:893.49
\end{verbatim}
'filename'-info.aux : for use in \TeX, it takes over filename,
char number, molecular information,etc.\\
@@ -158,19 +158,19 @@ MW:molecular weight from literature data\vspace{5mm}\\
\end{picture}%
}
%--------------------------------------------------------------------
-\def\INFO#1{\@tfor\@temp:=#1\do{\mol@sel\@temp}\put@char}%
+\def\INFO#1{\@for\@temp:=#1\do{\mol@sel\@temp}\put@char}%
\makeatother
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{{F:mcf_man_soc}{C:0}{MWc:893.48962}{FMc:C55H72MgN4O5}%
-{NO:1}{EN:Chlorophyll a}{MW:893.49}}%
+\INFO{F:mcf_man_soc ,C:0 ,MWc:893.48962 ,FMc:C55H72MgN4O5%
+ ,NO:1 ,EN:Chlorophyll a ,MW:893.49}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
-\INFO{{F:mcf_man_soc}{C:0}{MWc:893.48962}{FMc:C55H72MgN4O5}%
-{NO:1}{EN:Chlorophyll a}{MW:893.49}}%
+\INFO{F:mcf_man_soc ,C:0 ,MWc:893.48962 ,FMc:C55H72MgN4O5%
+ ,NO:1 ,EN:Chlorophyll a ,MW:893.49}%
\newpage
%----------------------------------------------------------------------------
\noindent
@@ -1150,8 +1150,7 @@ beginfont() MCd(1,.4)( 1,.5)(Ph) endfont
var3:="calc_weight"; tag3:="MWc";
var4:="calc_formula"; tag4:="FMc";
%% Output to mcf_man_soc-info.aux %%
-\INFO{{F:mcf_man_soc}{C:82}
- {MWc:194.19174}{FMc:C8H10N4O2}}%
+F:mcf_man_soc,C:82,MWc:194.19174,FMc:C8H10N4O2
MWc:calculated molecular weight
FMc:calculated molecular formula
\end{verbatim}
@@ -1165,8 +1164,7 @@ FMc:calculated molecular formula
beginfont("EN:Caffeine","CAS:58-08-2")
MCf(...) endfont
%% Output to mcf_man_soc-info.aux %%
-\INFO{{F:mcf_man_soc}{C:83}{EN:Caffeine}
- {CAS:58-08-2}}%
+F:mcf_man_soc ,C:83 ,EN:Caffeine ,CAS:58-08-2
*F:filename *C:char number EN:molecular name
CAS:CAS number *:default output
\end{verbatim}
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 e182c1ddcec..a8933bdcbd7 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/doc/metapost/mcf2graph/mcf_mplib_exa.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
index e44fc63a721..3309cb5bf90 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.3.24
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.4.2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass{article}
%------------------------------------------------------------------------------
@@ -18,6 +18,8 @@
%------------------------------------------------------------------------------
\makeatletter%
\newdimen \MOLwidth%
+\newif\ifCONT@%
+\newread\@auxf%
%------------------------------------------------------------------------------
\def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}%
\def\mol@sel#1{%
@@ -37,14 +39,18 @@
\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}%
%-------------------------------------------------------------------------------
-\def\INFO#1{%
- \edef\MOLnum{}\edef\MOLnameE{}\edef\MOLlenx{}\edef\MOLmw{}%
- \@tfor\@temp:=#1\do{\mol@sel{\@temp}}
-}%
+\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%
+\ifCONT@ \repeat
+\closein\@auxf}%
%--------------------------------------------------------------------------------
\newdimen\MOLwidth%
\newdimen\heightCap%
-\def\MOLcaption#1#2{\input temp-info.aux\relax %
+\def\MOLcaption#1#2{%
\MOLwidth=\MOLlenx pt%
\advance\MOLwidth -#1\relax%
\heightCap=#2%
@@ -89,7 +95,7 @@
)
endfont
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{0mm}{35mm}\hspace{8mm}%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -103,7 +109,7 @@
)
endfont
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{0mm}{45mm}\vspace{6mm}\\%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -116,7 +122,7 @@
)
endfont
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{0mm}{35mm}\hspace{8mm}%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -130,7 +136,7 @@ beginfont("NO:4","EN:Gibberellin A3","MW:346.37");
)
endfont;
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{0mm}{38mm}\vspace{5mm}\\%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -145,7 +151,7 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93");
)
endfont;
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{30mm}{52mm}\hspace{8mm}%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -165,7 +171,7 @@ beginfont("NO:6","EN:Vancomycin","MW:1449.25");
)
endfont;
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{55mm}{50mm}\vspace{6mm}\\%
%----------------------------------------------------------------------------
\begin{mplibcode}
@@ -191,7 +197,7 @@ endfont;
)
endfont
\end{mplibcode}
-\input{temp-info.aux}%
+\inputINFO{temp-info.aux}%
\MOLcaption{110mm}{70mm}\\%
%----------------------------------------------------------------------------
\end{document}
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index b2fb9522a7e..956149c65e2 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.85 Copyright (c) 2013-2016 Akira Yamaji
+% mcf2graph ver 3.86 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,
@@ -567,13 +567,12 @@ enddef;
%-------------------------------------------------------------------------------------------------
vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" fi enddef;
def auxfile_out=
- printf info_str&"{"
for i=1 upto aux_max: exitif var[i]="";
- &"{"&tag[i]&":"&
+ if i=1: printf "" else: &" ," fi &tag[i]&":"&
if string scantokens(var[i]): scantokens(var[i])
- elseif numeric scantokens(var[i]): decimal(scantokens(var[i])) fi &"}"
+ 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: &" ,"&info[i] endfor;
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
mc_num:=first_def_number;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 08:03:06 +0000