summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-19 20:36:48 +0000
committerKarl Berry <karl@freefriends.org>2016-10-19 20:36:48 +0000
commit1f1b94e0b5f854c19c96b892f28b76689c5596cd (patch)
treeb77cba92522d80b50bef8550d677099af82aa1b2 /Master/texmf-dist/doc/metapost
parent3568d035c66dc3aea3c0c24ccc132fdbb5d355b5 (diff)
mcf2graph (18oct16)
git-svn-id: svn://tug.org/texlive/trunk@42302 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG7
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin246507 -> 246539 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf14
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin423710 -> 424900 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex48
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin122121 -> 122124 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex6
9 files changed, 46 insertions, 39 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 9c09903a52f..14416e27018 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2016-10-14
+ Changelog of mcf2graph software package by Akira Yamaji 2016-10-19
*******************************************************************************
+[ver. 4.00 / 2016-10-19]
+ -change solid mode parameter
+ 1:solid ratio,2:solid length
+ -update MCF syntax manual
+
[ver. 3.99 / 2016-10-14]
-miner update
-update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 8e6448d57bc..f15f95db01b 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.99 2016-10-14
+ version : 4.00 2016-10-19
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
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 95bb5c69b2a..a226e61c5d9 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.10.12
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.10.19
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 3.98 or later
+input mcf2graph.mf; %%% it must be version 4.00 or later
%-------------------------------------------------------------------------
font_wd#:=33mm#;
font_ht#:=24mm#;
@@ -15,8 +15,8 @@ var3:="cal_FM"; tag3:="cFM";
var4:="cal_MW"; tag4:="cMW";
%%%% outputtemplate:="%3c-%j.png";
%%%% sw_auxfix:=1;
-%%%% var3:="len_x"; tag3:="Lx";
-%%%% var4:="len_y"; tag4:="Ly";
+%%%% var3:="mol_wd"; tag3:="mWD";
+%%%% var4:="mol_ht"; tag4:="mHT";
%%%% var5:="cal_MW"; tag5:="cMW";
%%%% var6:="cal_FM"; tag6:="cFM";
%%%% var7:="inf_USE"; tag7:="USE";
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 44b8054eb16..344ff649809 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_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
index c87fb0ac718..ac215938a39 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,18 +1,18 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.10.13
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.10.19
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 3.98 or later
+input mcf2graph.mf; %% it must be version 4.00 or later
%------------------------------------------------------------------------
sw_auxout:=0;
sw_mol_frame:=0;
sw_expand:=0;
sw_start_vector:=0;
+sw_solid:=2;
%%%%%sw_checklist:=1;
%***********************************************************************
font_wd#:=35mm#;
font_ht#:=25mm#;
bond_len#:=6mm#;
-sw_solid:=1;
%***********************************************************************
beginfont("EN:Glycine")
MCf(<30,NH2,!0,!,COOH)
@@ -691,12 +691,16 @@ beginfont("EN:Switwch numberingB")
endfont
%***********************************************************************
beginfont("EN:Switwch Solid ratio")
+ font_wd#:=70mm#;
font_ht#:=20mm#;
bond_len#:=8mm#;
- MCd(1,1)(0,.5)(Ph,4:/Me)
+ MCd(1,1)(0,.5)(Ph)
sw_solid:=1;
+ ratio_bond_width:=0.1;
+ MCd(1,1)(.55,.5)(Ph)
+ sw_solid:=2;
bond_len#:=6mm#;
- MCd(1,1)(1,.5)(Ph,4:/Me)
+ MCd(1,1)(1,.5)(Ph)
endfont
%***********************************************************************
beginfont("EN:Switwch Expand")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index d2a37baa124..3a928ca1b33 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 cb9ea163a93..8f4e56a582c 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.10.13
+% Molecular Coding Format manual by Akira Yamaji 2016.10.19
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\usepackage{graphicx}
@@ -711,21 +711,25 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsubsection{Solid mode}
\begin{verbatim}
- MCd(1,1)(0,.5)(Ph,4:/Me)
- sw_solid:=1;
- bond_len#:=6mm#;
- MCd(1,1)(1,.5)(Ph,4:/Me)
+ sw_solid=1 :
+ ratio_bond_width=0.1
+ font_width=70mm
+ (bond_len#=70mm*0.1=7mm)
+ ** ignore bond_len#
+
+ sw_solid=2 :
+ bond_len#=6mm#
+ ** ignore ratio_bond_width
\end{verbatim}
\MCFstructure\\
\makebox[5mm]{}%
-\makebox[30mm]{\tt 0 :default}%
-\makebox[30mm]{\tt 1}%
+\makebox[25mm]{\tt 0 :default}%
+\makebox[25mm]{\tt 1}%
+\makebox[20mm]{\tt 2}%
%-----------------------------------------------------------------------------
\subsubsection{Expand mode}
\begin{verbatim}
- MCd(1,.5)(0,0.5)(<30,Ph,4:/COOH,3:/NH2)
- sw_expand:=1;
- MCd(1,.5)(1,0.5)(<30,Ph,4:/COOH,3:/NH2)
+ default: sw_expand=0
\end{verbatim}
\MCFstructure\\
\makebox[5mm]{}%
@@ -734,9 +738,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsubsection{Substituent off mode}
\begin{verbatim}
- MCd(1,.5)( 0,0.5)(<30,Ph,4:/Cl,3:/F)
- sw_subst_off:=1;
- MCd(1,.5)( 1,0.5)(<30,Ph,4:/Cl,3:/F)
+ default: sw_subst_off=0
\end{verbatim}
\MCFstructure\\
\makebox[5mm]{}%
@@ -745,9 +747,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsubsection{Single bond mode}
\begin{verbatim}
- MCd(1,.5)( 0,0.5)(<30,Ph,4:/Cl,3:/F)
- sw_bond_single:=1;
- MCd(1,.5)( 1,0.5)(<30,Ph,4:/Cl,3:/F)
+ default: sw_bond_single=0
\end{verbatim}
\MCFstructure\\
\makebox[5mm]{}%
@@ -758,9 +758,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsubsection{Start vector}
\begin{verbatim}
- MCf(<30,Ph,4:/Cl,3:/F)
- sw_start_vector:=1;
- MCf(<30,Ph,4:/Cl,3:/F)
+ default: sw_start_vector=0
\end{verbatim}
\MCFstructure\\
\makebox[5mm]{}%
@@ -839,21 +837,21 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsection{Local setting}
\begin{verbatim}
- beginfont() MCd(1,.4)(0,.5)(Ph) endfont
+ beginfont() MCf(Ph) endfont
beginfont()
ratio_thickness_bond:=0.05;
- MCd(1,.4)(0.5,.5)(Ph)
+ MCf(Ph)
endfont
- beginfont() MCd(1,.4)(1,.5)(Ph) endfont
+ beginfont() MCf(Ph) endfont
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
\subsection{Global setting}
\begin{verbatim}
ratio_thickness_bond:=0.05;
- beginfont() MCd(1,.4)( 0,.5)(Ph) endfont
- beginfont() MCd(1,.4)(.5,.5)(Ph) endfont
- beginfont() MCd(1,.4)( 1,.5)(Ph) endfont
+ beginfont() MCf(Ph) endfont
+ beginfont() MCf(Ph) endfont
+ beginfont() MCf(Ph) endfont
\end{verbatim}
\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 cac18e1243e..58823d3eb6f 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 c69c8f8077b..28c3da998fa 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.10.12
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.10.19
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 3.99 or later
+%%% mcf2graph.mf it must be version 4.00 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
@@ -11,7 +11,7 @@
input mcf2graph.mf;
mp_log_name:="temp-info.aux";
sw_auxout:=1;
- var3:="len_x"; tag3:="Lx";
+ var3:="mol_wd"; tag3:="Lx";
var4:="cal_MW"; tag4:="cMW";
var5:="cal_FM"; tag5:="cFM";
fi}%