From 68264d1e4e757388b36fe4250909b957a292436b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Dec 2015 00:14:55 +0000 Subject: mcf2graph (26dec15) git-svn-id: svn://tug.org/texlive/trunk@39221 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/README | 12 ++++++------ .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 247915 -> 247967 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 6 +++--- .../doc/metapost/mcf2graph/mcf_man_soc.mf | 4 ++-- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 343407 -> 343468 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 8 ++++---- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 127778 -> 127782 bytes Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf | 12 ++++++------ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index e1a60b95687..78aaceffbd9 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/README +++ b/Master/texmf-dist/doc/metapost/mcf2graph/README @@ -1,9 +1,9 @@ ******************************************************************************** mcf2graph : Convert Molecular Coding Format to graphics with Metafont/Metapost Author : Akira Yamaji - version : 3.76 2015-11-28 + version : 3.77 2015-12-26 E-mail : akira.yamaji5@gmail.com - Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph + Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** 1. Introduction @@ -30,10 +30,10 @@ (11) mcf_example.pdf PDF of (10) typeset with LuaTeX(LuaLaTeX) 3. How to use mcf2graph with Metapost - ( 1) mpost -s ahangle=1 FILENAME output PNG file. (default value is eps) - ( 2) mpost -s ahangle=2 FILENAME output SVG file. - ( 3) mpost -s ahangle=3 FILENAME output MDL Molfile(V2000) - ( 4) mpost -s ahangle=0 FILENAME output no graphic file. + ( 1) mpost -s ahangle=0 FILENAME output no graphic file. + ( 2) mpost -s ahangle=1 FILENAME output PNG file. (default value is 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) ( 6) mpost -s ahlength=2 FILENAME output checklist. diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index d016c29aa8d..a3ddf032288 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf differ diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex index ef5c953c8d0..09ff95cb23e 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 2015.11.8 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2015.12.26 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} @@ -58,8 +58,8 @@ \begin{document} \begin{center} {\LARGE\bf Molecular Coding Format examples}\vspace{5mm}\\ - Author : Akira Yamaji \quad Date : 2015.11.14\\ - Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph\vspace{7mm}\\ + Author : Akira Yamaji \quad Date : 2015.12.26\\ + Located at : http://www.ctan.org/pkg/mcf2graph\vspace{7mm}\\ \end{center} \fontnum=1% \noindent% 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 2e7a14edbed..479f8933924 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 2015.9.25 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2015.12.26 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% input mcf2graph.mf; %------------------------------------------------------------------------ @@ -196,7 +196,7 @@ beginfont("EN:chain strech direction mode 3") ratio_chain_ring:=1; sw_start_vector:=1; MCf(<-30,!6,@(6>45)/'(!3,"{>45}"), - @(3>'(90,-90,90))/'(!,!,!,"{>'(90,-90,90)}") + @(3>'(90,-90,90))/'(!3,"{>'(90,-90,90)}") ) endfont %*********************************************************************** diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index d8c289424d0..5fdae43c638 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf differ diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex index fc0678a82a8..f2b970023e6 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 2015.10.19 +% Molecular Coding Format manual by Akira Yamaji 2015.12.26 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[dvipdfmx]{graphicx} @@ -31,8 +31,8 @@ \begin{document} \begin{center} {\LARGE\bf Molecular Coding Format manual}\vspace{3mm}\\ - Author : Akira Yamaji \quad Date : 2015.11.14\\ - Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph\\ + Author : Akira Yamaji \quad Date : 2015.12.26\\ + Located at : http://www.ctan.org/pkg/mcf2graph\\ \end{center} \hspace{8mm}% \begin{minipage}{145mm} @@ -433,7 +433,7 @@ MCF(<30,!7`1, >'(-90,90,-90) : multi angle enviroment <-30,!6,@(2>45)/'(!3,"{>45}"), - @(6>'(-90,90,-90))/'(!2,"{>(-90,90,-90)}") + @(6>'(-90,90,-90))/'(!3,"{>(-90,90,-90)}") \end{verbatim} \end{minipage} \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 7361bddf513..0e439462c87 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf differ diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf index f848aead7f8..66e0e677619 100644 --- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf +++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mcf2graph ver 3.76 Copyright (c) 2013-2015 Akira Yamaji +% mcf2graph ver 3.77 Copyright (c) 2013-2015 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, @@ -19,18 +19,18 @@ % mcf2graph is METAFONT/METAPOST macro package convert % Molecular Coding Format(MCF) to font(pk)/eps/sgv/png/mdl molfile(V2000) %---------------------------------------------------------------------------------------------- -% This package is located at : http://mirror.ctan.org/pkg/graphics/mcf2graph +% This package is located at : http://www.ctan.org/pkg/mcf2graph % Suggestion or request mail to : akira.yamaji5@gmail.com %---------------------------------------------------------------------------------------------- +% Set output no image file : mpost -s ahangle=0 FILENAME % Set outputformat to "png" : mpost -s ahangle=1 FILENAME % Set outputformat to "svg" : mpost -s ahangle=2 FILENAME % Set outputformat to MDL Molfile : mpost -s ahangle=3 FILENAME -% Set output no image file : mpost -s ahangle=0 FILENAME % Set first font only (for test) : mpost -s ahlength=1 FILENAME % Set output checklist : mpost -s ahlength=2 FILENAME %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% tracingstats:=1; -message " This is mcf2graph ver 3.7 2015.11"; +message " This is mcf2graph ver 3.7 2015.12"; %------------------------------------------------------------------------------------------------- pair posB[],posA[],pairT,Ls,Le,pairA; numeric angB[],angA[],br_ang[],sB[],eB[],f_FON[],atom_w[],atom_h[],atom_d[],strA[],stkB[],stkA[], @@ -758,7 +758,7 @@ def mol_check= fi endfor enddef; -%------------------------------------------------------------------------------------------------- +%------------------------------------------------------------------------------------------------ def checklist_out= nA:=0; calc_weight_str:=""; message "% Molecular name = "& mol_name; @@ -804,4 +804,4 @@ def MOL_out= printf fdr(3)(sB[i])&fdr(3)(eB[i])&fdr(3)(nA)&fdr(3)(nB)&" 0 0"; fi endfor printf "M END"; enddef; -%--------------------------------------------------------------------------------------- +%----------------------------------------------------------------------------------------------- -- cgit v1.2.3