summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-23 20:41:09 +0000
committerKarl Berry <karl@freefriends.org>2017-07-23 20:41:09 +0000
commitec67d4a883fa66eed59c390c8d893603f2e5bfaa (patch)
treef82edb844879fb1b32c4c2338d2428ed5cbab24f /Master/texmf-dist/doc/metapost
parent601fb902d34846ca8f52ba74851787c8e90ec58c (diff)
mcf2graph (23jul17)
git-svn-id: svn://tug.org/texlive/trunk@44875 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG11
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf4
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin236199 -> 236356 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf59
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin469776 -> 474345 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex23
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin174306 -> 174509 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex4
10 files changed, 81 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index ace374f67a4..4de23e53dfc 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,15 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2017-07-17
+ Changelog of mcf2graph software package by Akira Yamaji 2017-07-23
*******************************************************************************
+[ver. 4.25 / 2017-07-23]
+ -improve label,arrow emulation
+ -change variable name
+ Bs[] => B[]s
+ Be[] => B[]e
+ B[]ang => B[]dir
+ A[]bra => B[]dir
+ -update MCF syntax manual
+
[ver. 4.24 / 2017-07-17]
-atom font can be changed
-update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 2a6f9d3f4cc..ea893d97259 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.24 2017-07-17
+ version : 4.25 2017-07-23
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 da7547e107d..b0b17391ec1 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 2017.07.17
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2017.07.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.24 or later
+input mcf2graph.mf; %%% it must be version 4.25 or later
%-------------------------------------------------------------------------
font_wd:=33mm;
font_ht:=24mm;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 3faa6d937b8..124f7f52095 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-064.eps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
index 9856d53f03e..18cc3933692 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps
@@ -2,7 +2,7 @@
%%BoundingBox: -1 -1 212 60
%%HiResBoundingBox: -0.09962 -0.09962 211.90288 59.64348
%%Creator: MetaPost 2.000
-%%CreationDate: 2017.07.10:1950
+%%CreationDate: 2017.07.23:0937
%%Pages: 1
%%DocumentResources: procset mpost-minimal
%%+ font NJFVSO-NimbusSanL-Regu ICXWUR-CMR8
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 21e5c047ba9..61053eec416 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -111,9 +111,25 @@ beginfont("EN:Chain 1")
numberB_end:=6;
ratio_chain_ring:=1;
%----------------------------------------------------------------------
- MCf(<30,-60,60,-90,120,-90,60,
- {1^-60,2^60,3^-45,4^30,5^-45,6^60}:/_~dt`.4
+ MCf(<15,-30,45,-45,30,-30,60,
+ {1^-75,2^67.5,3^-60,4^75,5^-75,6^60}:/_~dt
)
+ ext(
+ defaultsize:=4bp;
+ labeloffset:=2bp;
+ drawarrow .7[B7s,B7e]{dir(B7dir-90)}..{dir(B1dir-90)}.7[B1s,B1e];
+ label.ulft("-30",.7[B7s,B7e]);
+ drawarrow .7[B8s,B8e]{dir(B8dir+90)}..{dir(B2dir+90)}.7[B2s,B2e];
+ label.llft("45",.7[B8s,B8e]);
+ drawarrow .7[B9s,B9e]{dir(B9dir-90)}..{dir(B3dir-90)}.7[B3s,B3e];
+ label.ulft("-45",.7[B9s,B9e]);
+ drawarrow .7[B10s,B10e]{dir(B10dir+90)}..{dir(B4dir+90)}.7[B4s,B4e];
+ label.llft("30",.7[B10s,B10e]);
+ drawarrow .7[B11s,B11e]{dir(B11dir-90)}..{dir(B5dir-90)}.7[B5s,B5e];
+ label.ulft("-30",.7[B11s,B11e]);
+ drawarrow .7[B12s,B12e]{dir(B12dir+90)}..{dir(B6dir+90)}.7[B6s,B6e];
+ label.llft("60",.7[B12s,B12e]);
+ )
endfont
%***********************************************************************
beginfont("EN:Chain 2")
@@ -123,8 +139,24 @@ beginfont("EN:Chain 2")
ratio_chain_ring:=1;
%----------------------------------------------------------------------
MCf(<30,!6,
- {1^-60,2^60,3^-60,4^60,5^-60,6^60}:/_~dt`.6
+ {1^-60,2^60,3^-60,4^60,5^-60,6^60}:/_~dt
)
+ ext(
+ defaultsize:=4bp;
+ labeloffset:=2bp;
+ drawarrow .7[B7s,B7e]{dir(B7dir-90)}..{dir(B1dir-90)}.7[B1s,B1e];
+ label.ulft("-60",.7[B7s,B7e]);
+ drawarrow .7[B8s,B8e]{dir(B8dir+90)}..{dir(B2dir+90)}.7[B2s,B2e];
+ label.llft("60",.7[B8s,B8e]);
+ drawarrow .7[B9s,B9e]{dir(B7dir-90)}..{dir(B3dir-90)}.7[B3s,B3e];
+ label.ulft("-60",.7[B9s,B9e]);
+ drawarrow .7[B10s,B10e]{dir(B10dir+90)}..{dir(B4dir+90)}.7[B4s,B4e];
+ label.llft("60",.7[B10s,B10e]);
+ drawarrow .7[B11s,B11e]{dir(B11dir-90)}..{dir(B5dir-90)}.7[B5s,B5e];
+ label.ulft("-60",.7[B11s,B11e]);
+ drawarrow .7[B12s,B12e]{dir(B12dir+90)}..{dir(B6dir+90)}.7[B6s,B6e];
+ label.llft("60",.7[B12s,B12e]);
+ )
endfont
%***********************************************************************
beginfont("EN:Jump and Branch")
@@ -176,7 +208,7 @@ beginfont("EN:Connect atom")
sw_numberA:=1;
ratio_chain_ring:=1;
%----------------------------------------------------------------------
- MCf(<30,!6,3:\,!,&5)
+ MCf(<30,!6,3:\,!,&5~bd)
endfont
%***********************************************************************
beginfont("EN:ring")
@@ -193,8 +225,18 @@ beginfont("EN:rotate 1")
margin_top_bottom:=3mm;
sw_clip:=1;
sw_numberB:=1;
+ ratio_chain_ring:=1;
numberB_end:=5;
- MCf(``1,0,0,<90,0,<-90,0,0,{1,2,3,4,5}=vf,{3,4^180}:/_~dt`.5)
+ defaultsize:=4bp;
+ labeloffset:=2bp;
+ MCf(``1,0,0,<90,0,<-90,0,0,{1,2,3,4,5}=vf,
+ {3,4^180}:/_~dt)
+ ext(
+ drawarrow .7[B6s,B6e]{dir(B6dir+90)}..{dir(B3dir+90)}.7[B3s,B3e];
+ label.urt("90",.7[B6s,B6e]);
+ drawarrow .7[B7s,B7e]{dir(B7dir-90)}..{dir(B4dir-90)}.7[B4s,B4e];
+ label.urt("-90",.7[B7s,B7e]);
+ )
endfont
%***********************************************************************
beginfont("EN:change bond 1")
@@ -935,9 +977,9 @@ beginfont("EN:ext()")
font_ht:=20mm;
MCd(1,0.7)(0,0.5)(<30,?6,3=dl,4:/CH3)
ext(
- B7:=0.37[Bs7,Be7];
label.top("+",A7);
- drawarrow B3{dir 0}..{dir 150}B7;
+ drawarrow B3{dir(B3dir-90)}..
+ {dir(B7dir+90)}0.4[B7s,B7e];
)
MCd(1,0.7)(1,0.5)(<30,?6,4://CH3)
ext(
@@ -1090,3 +1132,6 @@ bye
%%%%
bye
ye
+
+ye
+
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index e3118dfadd2..8ae541b17f1 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 fa6407cebaf..fc91c42fec3 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,7 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2017.07.17
+% Molecular Coding Format manual by Akira Yamaji 2017.07.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
+%%%%\documentclass[a4paper,twoside]{article}
%%%%\usepackage{graphicx}
\usepackage[dvipdfm]{graphicx}
%%%%\usepackage[pdftex]{graphicx}
@@ -13,6 +14,8 @@
\textheight=254mm
\textwidth=168mm
\oddsidemargin=0mm
+%%%%\oddsidemargin=7mm
+%%%%\evensidemargin=-7mm
\unitlength=1mm%
\makeatletter
%----------------------------------------------------------------------------
@@ -95,7 +98,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
real number plus (+): anticlockwize
real number minus(-): clockwize
- <30,-60,60,-90,120,-90,60
+ <15,-30,45,-45,30,-30,60
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -152,7 +155,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
\begin{verbatim}
&n : Connect to An
- <30,!6,3:\,!,&5
+ <30,!6,3:\,!,&5~bd
\end{verbatim}
\MCFstructure
%-----------------------------------------------------------------------------
@@ -1092,12 +1095,12 @@ endfont
l: bond length
An: atom number
A[m]: atom position
- A[m]bra: branch angle of A[m]
+ A[m]dir: branch direction of A[m]
Bn: bond number
- B[m]: bond position(0.5[Bs[m],Be[m]])
- Bs[m]: bond start position
- Be[m]: bond end position
- B[m]ang: bond angle
+ B[m]s: bond start position
+ B[m]e: bond end position
+ B[m]: bond position(0.5[B[m]s,B[m]e])
+ B[m]dir: bond direction
%----------------------------------------
beginfont()
@@ -1107,8 +1110,8 @@ beginfont()
MCd(1,0.7)(0,0.5)(<30,?6,3=dl,4:/CH3)
ext(
label.top("+",A7);
- B7:=0.37[Bs7,Be7];
- drawarrow B3{dir 0}..{dir 150}B7;
+ drawarrow B3{dir(B3dir-90)}..
+ {dir(B7dir+90)}0.4[B7s,B7e];
)
%---------------------------------------
MCd(1,0.7)(1,0.5)(<30,?6,4://CH3)
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 4ad2bfe7c90..c7194b93da4 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 5888f7073a0..108a88466ae 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 2017.07.17
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2017.07.23
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.24 or later
+%%% mcf2graph.mf it must be version 4.25 or later
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%