diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-11 21:55:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-11 21:55:22 +0000 |
commit | a33f60e20f19ec0a00810f07db905f91903845ab (patch) | |
tree | 309ce37b9a401787cd80026feb327139f5ebb8df /Master/texmf-dist/doc/metapost/mcf2graph | |
parent | d26e36a7af1638a97846cd2a0fe89af663d5b08a (diff) |
mcf2graph (11nov18)
git-svn-id: svn://tug.org/texlive/trunk@49129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost/mcf2graph')
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 12 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/README | 25 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf | 8 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf | bin | 235044 -> 281254 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps (renamed from Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps) | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf | bin | 476093 -> 571393 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex | 43 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf | bin | 179526 -> 179611 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex | 4 |
11 files changed, 58 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 51a7cac05e6..55ceeec4f0a 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG +++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG @@ -1,6 +1,16 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2018-06-18 + Changelog of mcf2graph software package by Akira Yamaji 2018-11-11 ******************************************************************************* +[ver. 4.34 / 2018-11-11] + -change default driver(graphicx,hyperref) + dvipdfmx => pdftex + -change file name + mcf_man_soc-064.eps => mcf_man_soc-064.mps + -change command-line parameter settings + -change option parameter name + sw_report => sw_rep_out + -update MCF manual + [ver. 4.33 / 2018-06-18] -change syntax n:& n:& => n:# diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 02d15fa1245..7ddecdd5322 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.33 2018-06-18 + version : 4.34 2018-11-11 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -19,11 +19,11 @@ ( 3) mcf2graph.mf Macro of Metafont / Metapost ( 4) mcf_manual.tex MCF syntax manual(LaTeX file) ( 5) mcf_man_soc.mf Molecular difinition file for mcf_manual.tex - ( 6) mcf_man_soc-064.eps No.64 EPS(with color) file of (4) + ( 6) mcf_man_soc-064.mps No.64 EPS(with color) file of (4) ( 7) mcf_manual.pdf PDF of (4) (used LaTeX,dvipdfmx) ( 8) mcf_example.tex LaTeX example, Make file 'mcf_exa_soc-info.aux' before typeset - >mpost -s ahangle=0 mcf_exa_soc.mf + >mpost -s ahlength=1 -s bboxmargin=0 mcf_exa_soc.mf ( 9) mcf_exa_soc.mf Molecular difinition file for mcf_example.tex (10) mcf_example.pdf PDF of (8) (used LaTeX,dvipdfmx) (11) mcf_mplib_exa.tex luamplib(LuaLaTeX) example @@ -31,14 +31,17 @@ 3. How to use mcf2graph with Metapost Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp - ( 1) >mpost -s ahangle=0 FILENAME => output no graphic file - ( 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 ahangle=4 FILENAME => output MDL Molfile(V3000) - ( 6) >mpost -s ahlength=1 FILENAME => output first definition only (for test) - ( 7) >mpost -s ahlength=2 FILENAME => output report - ( 8) >mpost -s ahlength=3 FILENAME => use plain.mp 'label','drawarrow' + ( 1) >mpost -s bboxmargin=0 FILENAME => output no graphic file + ( 2) >mpost -s bboxmargin=1 FILENAME => output first font only (for test) + ( 3) >mpost -s ahangle=1 FILENAME => output PNG file (default:eps) + ( 4) >mpost -s ahangle=2 FILENAME => output SVG file + ( 5) >mpost -s ahangle=3 FILENAME => output EPS file + ( 6) >mpost -s ahlength=1 FILENAME => output aux file + ( 7) >mpost -s ahlength=2 FILENAME => output report file + ( 8) >mpost -s ahlength=5 FILENAME => output MDL Molfile(V2000) + ( 9) >mpost -s ahlength=6 FILENAME => output MDL Molfile(V3000) + (10) >mpost -s labeloffset=1 FILENAME => use plain.mp 'label','drawarrow' + (11) >mpost -s labeloffset=2 FILENAME => atomfont="uhvr8r" 4. License Permission is hereby granted, free of charge, to any person obtaining a copy 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 b97f73ae3f4..b346a94eb53 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -1,14 +1,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2018.06.18 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2018.11.11 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.33 or later +input mcf2graph.mf; %%% it must be version 4.34 or later %------------------------------------------------------------------------- font_wd:=33mm; font_ht:=24mm; max_bond_length:=4.5mm; %------------------------------------------------------------------------- sw_select:=1; -sw_aux_out:=1; +%%%sw_aux_out:=1; sw_font_frame:=0; sw_atom_frame:=0; %%%% sw_expand:=1; @@ -24,7 +24,7 @@ var4:="cal_MW"; tag4:="cMW"; %%%% var8:="inf_USE"; tag8:="USE"; %%%% var9:="inf_EXA"; tag9:="EXA"; %%%% auxtag_out; -%%%% sw_report:=1; +%%%% sw_rep_out:=1; %%%% sw_mol_out:=1; %%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png"; %*************************************************************************** diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf Binary files differindex c050d3b9fe7..42370c3c64c 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex index 460e6b14c1a..14a9321470f 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 2018.06.18 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2018.11.11 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} 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.mps index 38a5af157e0..614deac5da2 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps @@ -2,7 +2,7 @@ %%BoundingBox: -1 -1 212 60 %%HiResBoundingBox: -0.09962 -0.09962 211.90288 59.64348 %%Creator: MetaPost 2.00 -%%CreationDate: 2018.06.18:0626 +%%CreationDate: 2018.11.10:1325 %%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 2c171b5cb80..99b0756f6ab 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf @@ -1,14 +1,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2018.06.18 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2018.11.11 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.33 or later +input mcf2graph.mf; %% it must be version 4.34 or later %------------------------------------------------------------------------ sw_aux_out:=0; sw_mol_frame:=0; sw_expand:=0; sw_solid:=2; %%%%%sw_arrow:=1; -%%%%%sw_report:=1; +%%%%%sw_rep_out:=1; %*********************************************************************** font_wd:=35mm; font_ht:=25mm; diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf Binary files differindex 638d03bcdd0..04ed3615aed 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex index 7697177abfc..03aae71f77b 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex @@ -1,14 +1,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format manual by Akira Yamaji 2018.06.18 +% Molecular Coding Format manual by Akira Yamaji 2018.11.11 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} %%%%\documentclass[a4paper,twoside]{article} %%%%\usepackage{graphicx} -\usepackage[dvipdfmx]{graphicx} -%%%%\usepackage[pdftex]{graphicx} -%%%%\usepackage{epstopdf} -\usepackage[dvipdfmx]{hyperref} -%%%%\usepackage[pdftex]{hyperref} +\usepackage[pdftex]{graphicx} +\usepackage{epstopdf} +%%%%\usepackage[dvipdfmx]{graphicx} +\usepackage[pdftex]{hyperref} +%%%%\usepackage[dvipdfmx]{hyperref} \hypersetup{colorlinks=true,linkcolor=blue} \topmargin=-18mm \textheight=254mm @@ -552,7 +552,8 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\ MCa(1,0.5)(<30,Ph,{1,5}:N,3:/COOH,4:/NO2) ext(label.urt("(cmr8)",p0+(0,h));) \end{verbatim} -\hspace{5mm}\includegraphics{mcf_man_soc-064.eps}% for dvipdfmx +\hspace{5mm}\includegraphics{mcf_man_soc-064.mps}% for pdftex +%%%%\hspace{5mm}\includegraphics{mcf_man_soc-064.eps}% for dvipdfmx %%%%\hspace{5mm}\includegraphics[width=7cm]{mcf_man_soc-064.png}% for dvipdfmx %%%%\MCFstructure % for Metafont \advance\fontnum\@ne\relax\advance\tempnum\@ne\relax% @@ -1308,13 +1309,13 @@ drawarrow & drawdblarrow: %------------------------------------------------------------------------- input mcf2graph.mf; % input macro %------------------------------------------------------------------------- -sw_auxout:=1; % aux(information) file output on > Gloval setting +sw_aux_out:=1; % aux(information) file output on > Gloval setting font_wd:=60mm; % font width > font_ht:=40mm; % font height > var3:="cal_MW"; tag3:="cMW"; > AUX file table var4:="cal_FM"; tag4:="cFM"; > -%%%% sw_report:=1; > Report output -%%%% sw_MOLout:=1; > MOL file output +%%%% sw_rep_out:=1; > Report output +%%%% sw_mol_out:=1; > MOL file output outputformat:="png"; hppp:=vppp:=0.1; > PNG output outputtemplate:="%j-%3c.png"; > %------------------------------------------------------------------------- @@ -1364,12 +1365,12 @@ bye \subsection{Information auxfile output} \paragraph{(Insert option parameter setting)} \begin{verbatim} - sw_auxout:=1; - ** default : sw_auxout=0 + sw_aux_out:=1; + ** default : sw_aux_out=0 \end{verbatim} \paragraph{(Command line)} \begin{verbatim} - >mpost -s ahangle=0 FILENAME (molecular definition file) + >mpost -s ahlength=1 -s bboxmargin=0 FILENAME \end{verbatim} \paragraph{(Sourse)} \begin{verbatim} @@ -1430,12 +1431,12 @@ cFM : molecular formula calculated \subsection{Report output} \paragraph{(Insert option parameter setting)} \begin{verbatim} - sw_report:=1; - ** default : sw_report=0 + sw_rep_out:=1; + ** default : sw_rep_out=0 \end{verbatim} \paragraph{(Command line)} \begin{verbatim} - >mpost -s ahangle=0 -s ahlength=2 FILENAME (molecular definition file) + >mpost -s ahlength=2 -s bboxmargin=0 FILENAME \end{verbatim} \paragraph{(Output)} \begin{verbatim} @@ -1492,14 +1493,14 @@ cFM : molecular formula calculated \subsection{MOL file output} \paragraph{(Insert option parameter setting)} \begin{verbatim} - sw_mol_out:=1; (V2000) - sw_mol_out:=2; (V3000) + sw_mol_out:=1; % MOL(V2000) + sw_mol_out:=2; % MOL(V3000) ** default : sw_mol_out=0 \end{verbatim} \paragraph{(Command line)} \begin{verbatim} - >mpost -s ahangle=3 FILENAME (molecular definition file) V2000 - >mpost -s ahangle=4 FILENAME (molecular definition file) V3000 + >mpost -s ahlength=5 -s bboxmargin=0 FILENAME % MOL(V2000) + >mpost -s ahlength=6 -s bboxmargin=0 FILENAME % MOL(V3000) \end{verbatim} \paragraph{(Output)} \begin{verbatim} @@ -1552,7 +1553,7 @@ M END \everymplib{if unknown Ph1: input mcf2graph.mf; mp_log_name:="temp-info.aux"; - sw_auxout:=1; + sw_aux_out:=1; fi}% %-------------------------------------------------------------------- \begin{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 Binary files differindex ede67444775..0920ba4f397 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf 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 9d8b2e2c4f4..83777181665 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 2018.06.18 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2018.11.11 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% mcf2graph.mf it must be version 4.33 or later +%%% mcf2graph.mf it must be version 4.34 or later \documentclass{article} %------------------------------------------------------------------------------ \usepackage{luamplib}% |