summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-03 21:17:00 +0000
committerKarl Berry <karl@freefriends.org>2016-11-03 21:17:00 +0000
commitb60ca9e4d571bb8eaf715f6c8e21a0053d59e1a7 (patch)
tree5e661575f5e6bb09aedac88d5decb7dd46e39e37 /Master/texmf-dist/doc
parent7115c2809a8f244352ff9f750f30fb0d8335eabb (diff)
mcf2graph (3nov16)
git-svn-id: svn://tug.org/texlive/trunk@42429 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin246561 -> 246691 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf49
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin433700 -> 434503 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex104
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin122138 -> 122460 bytes
7 files changed, 83 insertions, 80 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index b4cbb0de331..3e8ed27e034 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,8 +1,12 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2016-10-30
+ Changelog of mcf2graph software package by Akira Yamaji 2016-11-03
*******************************************************************************
+[ver. 4.03 / 2016-11-03]
+ -miner update
+ -update MCF syntax manual
+
[ver. 4.02 / 2016-10-30]
- -add finction EXT(),ext()
+ -add function EXT(),ext()
-delete option parameter sw_start_vector
-update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index b144de7a905..6ff2a8d950d 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 : 4.02 2016-10-30
+ version : 4.03 2016-11-03
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 6dcbe03b339..6ddc85e06cd 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 8e32a79bc39..183e980b6bb 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.10.30
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.11.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.02 or later
+input mcf2graph.mf; %% it must be version 4.03 or later
%------------------------------------------------------------------------
sw_auxout:=0;
sw_mol_frame:=0;
@@ -689,6 +689,19 @@ beginfont("EN:Switwch numberingB")
sw_numberB:=3; MCd(1,1)(.5,.1)(<30,!9)
endfont
%***********************************************************************
+beginfont("EN:Switwch clipping")
+ font_ht#:=15mm#;
+ sw_mol_frame:=1;
+ MCf(<30,Ph,4:/Cl,3:/F)
+endfont
+%-----------------------------------------------------------------------
+beginfont("EN:Switwch clipping")
+ font_ht#:=15mm#;
+ sw_mol_frame:=1;
+ sw_clip:=1;
+ MCf(<30,Ph,4:/Cl,3:/F)
+endfont
+%***********************************************************************
beginfont("EN:Switwch Solid ratio=0")
font_ht#:=18mm#;
bond_len#:=8mm#;
@@ -709,6 +722,14 @@ beginfont("EN:Switwch Solid ratio=2")
sw_solid:=2;
MCf(<30,Ph)
endfont
+%-----------------------------------------------------------------------
+beginfont("EN:sw_clip=1")
+ font_ht#:=18mm#;
+ bond_len#:=10mm#;
+ sw_solid:=2;
+ sw_clip:=1;
+ MCf(<30,Ph)
+endfont
%***********************************************************************
beginfont("EN:Switwch Expand")
font_ht#:=20mm#;
@@ -731,13 +752,6 @@ beginfont("EN:Switwch bondtype off")
MCd(1,1)(.85, .5)(<30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
-beginfont("EN:Switwch font frame 0")
- font_ht#:=15mm#;
- margin_left_right:=5mm;
- margin_top_bottom:=2mm;
- sw_font_frame:=0;
- MCf(<30,Ph,4:/Cl,3:/F)
-endfont
beginfont("EN:Switwch font frame 1")
font_ht#:=15mm#;
margin_left_right:=5mm;
@@ -772,19 +786,6 @@ beginfont("EN:Switwch atom frame")
MCf(<30,Ph,1:/Cl,4:/COOH,3:/OH)
endfont
%***********************************************************************
-beginfont("EN:Switwch clipping")
- font_ht#:=15mm#;
- sw_mol_frame:=1;
- MCf(<30,Ph,4:/Cl,3:/F)
-endfont
-%-----------------------------------------------------------------------
-beginfont("EN:Switwch clipping")
- font_ht#:=15mm#;
- sw_mol_frame:=1;
- sw_clip:=1;
- MCf(<30,Ph,4:/Cl,3:/F)
-endfont
-%***********************************************************************
beginfont("EN:MCd()")
font_ht#:=20mm#;
sw_font_frame:=1;
@@ -819,7 +820,7 @@ beginfont("EN:ext()")
bond_len#:=10mm#;
MCf(<30,Ph,4:/Cl,3:/F)
ext(draw p0--(p0+(wd,0))--(p0+(wd,ht));
- draw_vector(p6,a6-180,8mm);)
+ draw_vector(p6,a6-180,l);)
endfont
%***********************************************************************
beginfont("EN:Local setting 1")
@@ -840,12 +841,12 @@ beginfont("EN:Local setting 3")
endfont
%***********************************************************************
save_ratio:=ratio_thickness_bond;
-ratio_thickness_bond:=0.05;
beginfont("EN:Local setting 1")
font_wd#:=15mm#;
font_ht#:=12mm#;
MCf(Ph)
endfont
+ratio_thickness_bond:=0.05;
beginfont("EN:Local setting 2")
font_wd#:=15mm#;
font_ht#:=12mm#;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 2275403c8c1..6716e87e87c 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 ee720dc7eca..9629c6e4744 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.30
+% Molecular Coding Format manual by Akira Yamaji 2016.11.03
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
%%%%\usepackage{graphicx}
@@ -24,7 +24,7 @@
\htman=45mm%
\wdman=94mm%
\htmans=42mm%
-\fontnum=20%
+\fontnum=21%
\tempnum=1%
%----------------------------------------------------------------------------
\font\@strufont=mcf_man_soc\relax%
@@ -70,11 +70,11 @@
%-----------------------------------------------------------------------------
\vspace{10mm}
{\@strufont%
-\makebox[10mm]{}\char0\raisebox{10mm}{\char1}\char2\raisebox{10mm}{\char3}\\
-\makebox[10mm]{}\char4\raisebox{10mm}{\char5}\char6\raisebox{10mm}{\char7}\\
-\makebox[10mm]{}\char8\raisebox{10mm}{\char9}\char10\raisebox{10mm}{\char11}\\
-\makebox[10mm]{}\char12\raisebox{10mm}{\char13}\char14\raisebox{10mm}{\char15}\\
-\makebox[10mm]{}\char16\raisebox{10mm}{\char17}\char18\raisebox{10mm}{\char19}\\}
+\makebox[10mm]{}\char1 \raisebox{10mm}{\char2 }\char3 \raisebox{10mm}{\char4}\\
+\makebox[10mm]{}\char5 \raisebox{10mm}{\char6 }\char7 \raisebox{10mm}{\char8}\\
+\makebox[10mm]{}\char9 \raisebox{10mm}{\char10}\char11\raisebox{10mm}{\char12}\\
+\makebox[10mm]{}\char13\raisebox{10mm}{\char14}\char15\raisebox{10mm}{\char16}\\
+\makebox[10mm]{}\char17\raisebox{10mm}{\char18}\char19\raisebox{10mm}{\char20}\\}
%-----------------------------------------------------------------------------
\twocolumn
\tableofcontents
@@ -709,26 +709,49 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\put(0, 2){\makebox[5mm]{\tt 3}}
\end{picture}
%-----------------------------------------------------------------------------
+\subsubsection{Clipping mode}
+\begin{verbatim}
+ sw_clip:=0;
+ MCf(<30,Ph,4:/Cl,3:/F)
+ ** default: sw_clip=0
+\end{verbatim}
+\MCFstructure
+\begin{verbatim}
+ sw_clip:=1;
+ MCf(<30,Ph,4:/Cl,3:/F)
+\end{verbatim}
+\MCFstructure
+%-----------------------------------------------------------------------------
\subsubsection{Solid mode}
\begin{verbatim}
- (sw_solid=0 : fit to font size)
- ** default
+ (fit to font size)
+ sw_solid=0 ** default
\end{verbatim}
\MCFstructure
%-----------------------------------------
\begin{verbatim}
- (sw_solid=1 : solid ratio bond/font width)
- ratio_bond_width=0.1
- font_width=60mm
- (bond_len#=60mm#*0.1=6mm#)
- ** ignore bond_len#
+ (solid ratio bond/font width)
+ sw_solid:=1;
+ ratio_bond_width=0.1
+ font_width=60mm
+ (bond_len#=60mm#*0.1=6mm#)
+ ** ignore bond_len#
\end{verbatim}
\MCFstructure
%-----------------------------------------
\begin{verbatim}
- (sw_solid=2 : solid bond length)
- bond_len#=10mm#
- ** ignore ratio_bond_width
+ (solid bond length)
+ sw_solid:=2;
+ bond_len#=10mm#
+ ** ignore ratio_bond_width
+\end{verbatim}
+\MCFstructure
+%-----------------------------------------
+\begin{verbatim}
+ (solid bond length,clipping)
+ sw_solid:=2;
+ sw_clip:=1;
+ bond_len#=10mm#
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -759,34 +782,25 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\makebox[30mm]{\tt 0 :default}%
\makebox[30mm]{\tt 1}%
%-----------------------------------------------------------------------------
-\newpage
\subsection{Frame}
%-----------------------------------------------------------------------------
\subsubsection{Font frame}
\begin{verbatim}
- (No font frame)
+ (Draw font frame)
margin_left_right:=5mm;
margin_top_bottom:=2mm;
- sw_font_frame:=0; ** default
- MCf(<30,Ph,4:/Cl,3:/F)
-\end{verbatim}
-\MCFstructure
-\begin{verbatim}
- (Draw font frame)
sw_font_frame:=1;
MCf(<30,Ph,4:/Cl,3:/F)
\end{verbatim}
\MCFstructure
\begin{verbatim}
(Draw frame inside margin)
- sw_font_frame:=2;
- MCf(<30,Ph,4:/Cl,3:/F)
+ sw_font_frame=2
\end{verbatim}
\MCFstructure
\begin{verbatim}
(Draw both frame)
- sw_font_frame:=3;
- MCf(<30,Ph,4:/Cl,3:/F)
+ sw_font_frame=3
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -805,23 +819,6 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
** default: sw_atom_frame=0
\end{verbatim}
\MCFstructure
-%-----------------------------------------------------------------------------
-\subsection{Clipping font}
-\begin{verbatim}
- beginfont()
- sw_clip:=0;
- MCf(<30,Ph,4:/Cl,3:/F)
- endfont
- ** default: sw_clip=0
-\end{verbatim}
-\MCFstructure
-\begin{verbatim}
- beginfont()
- sw_clip:=1;
- MCf(<30,Ph,4:/Cl,3:/F)
- endfont
-\end{verbatim}
-\MCFstructure
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Function}
\subsection{Function MCd()}
@@ -891,6 +888,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
ht: molecular height
p0: origin of molecular structure
n: atom number
+ l: bond length
p[m]: atom position of A[m]
a[m]: branch angle of A[m]
(1<=m<=atom count)
@@ -901,7 +899,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
MCf(<30,Ph,3:/F,4:/Cl)
ext(draw p0--(p0+(wd,0))
--(p0+(wd,ht);
- draw_vector(p6,a6-180,8mm);
+ draw_vector(p6,a6-180,l);
)
endfont
\end{verbatim}
@@ -920,14 +918,14 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
%-----------------------------------------------------------------------------
\subsection{Global parameter setting}
\begin{verbatim}
- ratio_thickness_bond:=0.05;
beginfont() MCf(Ph) endfont
+ ratio_thickness_bond:=0.05;
beginfont() MCf(Ph) endfont
beginfont() MCf(Ph) endfont
\end{verbatim}
\MCFstructure\MCFstructure\MCFstructure
%-----------------------------------------------------------------------------
-\section{Output infomation}
+\section{Output information}
%-----------------------------------------------------------------------------
\subsection{Output molecular information}
\begin{verbatim}
@@ -1333,14 +1331,14 @@ M END
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{F:mcf_man_soc,C:103,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:104,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:114,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:115,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
-\INFO{F:mcf_man_soc,C:113,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:114,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:114,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:115,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}%
%------------------------------------------------------------------------
\end{document}
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 8d127fc8104..29a70504ea3 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