From b52c087654644bf3129e35c766b5359e86bd3356 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Aug 2015 22:37:14 +0000 Subject: mcf2graph (14aug15) git-svn-id: svn://tug.org/texlive/trunk@38124 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/README | 8 +-- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 2 + .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 255342 -> 255269 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 74 +++++++++------------ .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 218676 -> 218677 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 107480 -> 107401 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 61 +++++++++-------- 7 files changed, 66 insertions(+), 79 deletions(-) (limited to 'Master/texmf-dist/doc/metapost') diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index bb51260b7db..c326baf4c98 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.55 / 2015-08-07 + version : 3.57 / 2015-08-14 E-mail : akira.yamaji5@gmail.com Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph Home page : http://molecoding.cocolog-nifty.com/blog/ @@ -17,7 +17,7 @@ 2. The distribution of software ( 1) README This file - ( 2) mcf_graph.mf Macro of Metafont / Metapost + ( 2) mcf2graph.mf Macro of Metafont / Metapost ( 3) mcf_manual.tex MCF syntax manual(LaTeX file) ( 4) mcf_man_soc.mf Molecular difinition file for mcf_manual.tex ( 5) mcf_man_soc-032.eps No.32 EPS(with color) file of (4) @@ -59,8 +59,7 @@ ********************************************************** % insert part of info.aux file %------------------------------------------------------------------------- - \MOLinfo{EN:Acetamiprid}{:}{:}{:}{:}{:}{:}{:}{:}{:}{:}{:}% - \MCFinfo{MCF_SOC2}{0}{MCF_SOC2-000.eps}{419.14972}{145.32037}{159.04236}{12}{0}{}% + \INFO{{F:MCF_SOC2}{C:0}{EN:Acetamiprid}}% %------------------------------------------------------------------------- % or insert next line \input mcf_exa_soc-info.aux % filename of souce file : mcf_exa_soc.mf @@ -111,3 +110,4 @@ ver. 3.53 / 2015-07-29 support luamplib(LuaLaTeX) ver. 3.54 / 2015-08-03 maximum item number of MOLinfo can be changed ver. 3.55 / 2015-08-04 support luamplib(v2.11), renew mcf_mplib_exa.tex + ver. 3.57 / 2015-08-14 improve AUX file format 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 3c1e910592b..106785ec022 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -14,6 +14,8 @@ sw_numberB:=0; sw_expand:=0; sw_start_vector:=0; %%%%sw_checklist:=1; +%%%%sw_info_fm:=1; +%%%%sw_info_mw:=1; %%%%sw_MOLfile:=1; %********************************************************************** beginfont("EN:Acetamiprid") diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index 00b3bc86ea2..1d401e46f4a 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 a9f6a37c336..71403126466 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.8.7 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2015.8.14 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} @@ -12,68 +12,54 @@ \setlength\columnsep{8mm} %------------------------------------------------------------------------------- \makeatletter% -\newbox \@stringbox% +\newbox \@stringbox% \newcount \fontnum% \newcount \tnum% -\newcount \Cnt@xlen% -\newcount \Cnt@row% -\newcount \fontw% -\newdimen \font@dim% %------------------------------------------------------------------------------- \def\mol@sel#1{% - \if#1\empty\relax\else% - \edef\@first{\expandafter\@first@param#1;}% - \edef\@second{\expandafter\@second@param#1;}% - \ifx\@first\@EN@ \edef\MOLnameE{\@second}\fi% - \ifx\@first\@JN@ \edef\MOLnameJ{\@second}\fi% - \ifx\@first\@NO@ \edef\MOLnumber{\@second}\fi% - \ifx\@first\@CAS@ \edef\MOLcas{\@second}\fi% - \ifx\@first\@MW@ \edef\MOLmw{\@second}\fi% - \ifx\@first\@FM@ \edef\MOLfomura{\@second}\fi% - \ifx\@first\@USE@ \edef\MOLuse{\@second}\fi% - \ifx\@first\@XLogP@ \edef\MOLXLogP{\@second}\fi% - \ifx\@first\@EXA@ \edef\MOLextA{\@second}\fi% - \ifx\@first\@EXB@ \edef\MOLextB{\@second}\fi% - \fi% -}% +\if#1\empty\relax\else% + \edef\@fst{\expandafter\@fst@param#1;}% + \edef\@sec{\expandafter\@sec@param#1;}% + \ifx\@fst\@F\edef\MOLfile{\@sec}\fi \ifx\@fst\@C\edef\MOLchar{\@sec}\fi% + \ifx\@fst\@Lx\edef\MOLlenx{\@sec}\fi \ifx\@fst\@Ly\edef\MOLleny{\@sec}\fi% + \ifx\@fst\@EN\edef\MOLnameE{\@sec}\fi \ifx\@fst\@JN\edef\MOLnameJ{\@sec}\fi% + \ifx\@fst\@CAS\edef\MOLcas{\@sec}\fi \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi% + \ifx\@fst\@FM\edef\MOLfomura{\@sec}\fi \ifx\@fst\@USE\edef\MOLuse{\@sec}\fi% + \ifx\@fst\@logP\edef\MOLlogP{\@sec}\fi \ifx\@fst\@EXA\edef\MOLextA{\@sec}\fi% + \ifx\@fst\@EXB\edef\MOLextB{\@sec}\fi \ifx\@fst\@NO\edef\MOLnum{\@sec}\fi\fi}% +%------------------------------------------------------------------------------- +\def\@F{F}\def\@C{C}\def\@EN{EN}\def\@JN{JN}\def\@CAS{CAS}\def\@MW{MW}% +\def\@FM{FM}\def\@Lx{Lx}\def\@Ly{Ly}\def\@NO{NO}% +\def\@USE@{USE}\def\@logP@{logP}\def\@EXA@{EXA}\def\@EXB@{EXB}% %------------------------------------------------------------------------------- -\def\@first@param#1:#2;{#1}\def\@second@param#1:#2;{#2}% -\def\@EN@{EN}\def\@JN@{JN}\def\@CAS@{CAS}\def\@NO@{NO}\def\@MW@{MW}\def\@FM@{FM}% -\def\@USE@{USE}\def\@XLogP@{XLogP}\def\@EXA@{EXA}\def\@EXB@{EXB}% -\def\MOL@info@aux#1#2#3{\mol@sel{#1}\mol@sel{#2}\mol@sel{#3}}% -\def\MOLinfo#1#2#3#4#5#6#7#8#9{% - \edef\MOLnameE{}\edef\MOLnameJ{}\edef\MOLnumber{}\edef\MOLcas{}\edef\MOLmw{}% - \edef\MOLfomura{}\edef\MOLuse{}\edef\MOLXLogP{}\edef\MOLextA{}\edef\MOLextB{}% - \mol@sel{#1}\mol@sel{#2}\mol@sel{#3}\mol@sel{#4}\mol@sel{#5}\mol@sel{#6}% - \mol@sel{#7}\mol@sel{#8}\mol@sel{#9}\MOL@info@aux}% -%-------------------------------------------------------------------------------- +\def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}% \def\@stru#1[#2]{\font\@strufont=#1\relax\hbox{\@strufont\char#2}}% -\def\MCFinfo#1#2#3#4#5#6#7#8#9{% +%------------------------------------------------------------------------------- +\def\put@char{% \unitlength=0.01mm\relax \@tempcnta=3200\relax \@tempcntb=3800\relax% \begin{picture}(\@tempcntb,\@tempcnta)% \advance\@tempcnta -300\relax% \put(20,\@tempcnta){\tiny\bf [\the\fontnum] \MOLnameE}% -%--------------------------------------------------------------------------- -% for METAFONT - \put( 0,0){\makebox(\@tempcntb,\@tempcnta){\@stru{#1}[#2]}}% -%%%% for METAPOST -%%%% \put( 0,0){\makebox(\@tempcntb,\@tempcnta){\includegraphics{#3}}}% -%--------------------------------------------------------------------------- + \put( 0,0){\makebox(\@tempcntb,\@tempcnta){\@stru{\MOLfile}[\MOLchar]}}% \end{picture}% \advance\fontnum\@ne\relax\advance\tnum\@ne\relax% \ifnum\tnum=5 \\ \tnum=0\relax \fi% - }% +} +%------------------------------------------------------------------------------- +\def\INFO#1{% + \edef\MOLnameE{}% + \@tfor\@temp:=#1\do{\mol@sel{\@temp}}% + \put@char% +}% +%------------------------------------------------------------------------------- \makeatother %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} {\hspace{20mm} \LARGE\bf Molecular Coding Format examples \hspace{10mm} }% -{\footnotesize\bf by Akira Yamaji 2015.8.3} \vspace{5mm}\\ +{\footnotesize\bf by Akira Yamaji 2015.8.14} \vspace{5mm}\\ \fontnum=1% \noindent% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%% Copy & Paste here from log-file %%%%%%%%%%%%%%% -%%%%%%%%% or \input 'filename'-info.log %%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% \input 'filename'-info.log %------------------------------------------------------------------------ \input mcf_exa_soc-info.aux %------------------------------------------------------------------------ diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index bd1d98404b8..825bb62d07c 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_mplib_exa.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf index 57a4d837976..2247082795e 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/doc/metapost/mcf2graph/mcf_mplib_exa.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex index fdce25becf4..fdcc5d97980 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex @@ -1,47 +1,46 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2015.8.7 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2015.8.14 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass{article} %------------------------------------------------------------------------------- \usepackage{luamplib}% \mplibcodeinherit{enable}% \mplibverbatim{enable}% -\everymplib{if unknown Ph1: input mcf2graph.mf; sw_logout:=1;% +\everymplib{if unknown Ph1: input mcf2graph.mf; sw_logout:=1; sw_info_lenx:=1;% mp_log_name:="temp-info.aux"; fi}% \everyendmplib{write EOF to mp_log_name;}% %------------------------------------------------------------------------------- \makeatletter% \newdimen \MOLwidth% %------------------------------------------------------------------------------- +\def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}% \def\mol@sel#1{% - \if#1\empty\relax\else% - \edef\@first{\expandafter\@first@param#1;}% - \edef\@second{\expandafter\@second@param#1;}% - \ifx\@first\@EN@ \edef\MOLnameE{\@second}\fi% - \ifx\@first\@JN@ \edef\MOLnameJ{\@second}\fi% - \ifx\@first\@NO@ \edef\MOLnumber{\@second}\fi% - \ifx\@first\@CAS@ \edef\MOLcas{\@second}\fi% - \ifx\@first\@MW@ \edef\MOLmw{\@second}\fi% - \ifx\@first\@FM@ \edef\MOLfomura{\@second}\fi% - \ifx\@first\@USE@ \edef\MOLuse{\@second}\fi% - \ifx\@first\@XLogP@ \edef\MOLXLogP{\@second}\fi% - \ifx\@first\@EXA@ \edef\MOLextA{\@second}\fi% - \ifx\@first\@EXB@ \edef\MOLextB{\@second}\fi\fi}% +\if#1\empty\relax\else% + \edef\@fst{\expandafter\@fst@param#1;}% + \edef\@sec{\expandafter\@sec@param#1;}% + \ifx\@fst\@F\edef\MOLfile{\@sec}\fi \ifx\@fst\@C\edef\MOLchar{\@sec}\fi% + \ifx\@fst\@Lx\edef\MOLlenx{\@sec}\fi \ifx\@fst\@Ly\edef\MOLleny{\@sec}\fi% + \ifx\@fst\@EN\edef\MOLnameE{\@sec}\fi \ifx\@fst\@JN\edef\MOLnameJ{\@sec}\fi% + \ifx\@fst\@CAS\edef\MOLcas{\@sec}\fi \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi% + \ifx\@fst\@FM\edef\MOLfomura{\@sec}\fi \ifx\@fst\@USE\edef\MOLuse{\@sec}\fi% + \ifx\@fst\@logP\edef\MOLlogP{\@sec}\fi \ifx\@fst\@EXA\edef\MOLextA{\@sec}\fi% + \ifx\@fst\@EXB\edef\MOLextB{\@sec}\fi \ifx\@fst\@NO\edef\MOLnum{\@sec}\fi\fi}% %------------------------------------------------------------------------------- -\def\@first@param#1:#2;{#1}\def\@second@param#1:#2;{#2}% -\def\@EN@{EN}\def\@JN@{JN}\def\@CAS@{CAS}\def\@NO@{NO}\def\@MW@{MW}\def\@FM@{FM}% -\def\@USE@{USE}\def\@XLogP@{XLogP}\def\@EXA@{EXA}\def\@EXB@{EXB}% -\def\MOL@info@aux#1#2#3{\mol@sel{#1}\mol@sel{#2}\mol@sel{#3}}% -\def\MOLinfo#1#2#3#4#5#6#7#8#9{% %%%% max item number = 12 %%%% - \edef\MOLnameE{}\edef\MOLnameJ{}\edef\MOLnumber{}\edef\MOLcas{}\edef\MOLmw{}% - \edef\MOLfomura{}\edef\MOLuse{}\edef\MOLXLogP{}\edef\MOLextA{}\edef\MOLextB{}% - \mol@sel{#1}\mol@sel{#2}\mol@sel{#3}\mol@sel{#4}\mol@sel{#5}\mol@sel{#6}% - \mol@sel{#7}\mol@sel{#8}\mol@sel{#9}\MOL@info@aux}% +\def\@F{F}\def\@C{C}\def\@EN{EN}\def\@JN{JN}\def\@CAS{CAS}\def\@MW{MW}% +\def\@FM{FM}\def\@Lx{Lx}\def\@Ly{Ly}\def\@NO{NO}\def\@USE@{USE}\def\@logP@{logP}% +\def\@EXA@{EXA}\def\@EXB@{EXB}% +%------------------------------------------------------------------------------- +\newdimen\MOLwidth% +\def\INFO#1{% + \edef\MOLnum{}\edef\MOLnameE{}\edef\MOLlenx{}\edef\MOLmw{}% + \@tfor\@temp:=#1\do{\mol@sel{\@temp}} +}% %-------------------------------------------------------------------------------- -\def\MCFinfo#1#2#3#4#5#6#7#8#9{\MOLwidth#4pt\relax}% -\def\MOLcaption#1#2{\input temp-info.aux\relax\advance\MOLwidth -#1\relax% +\def\MOLcaption#1#2{\input temp-info.aux\relax % +\MOLwidth=\MOLlenx pt% +\advance\MOLwidth -#1\relax% \llap{\makebox[\MOLwidth][l]{\raisebox{#2}% -{\sf NO.\MOLnumber{ }\MOLnameE{ }\tiny (MW:\MOLmw)}}}}% +{\sf NO.\MOLnum{ }\MOLnameE{ }\tiny (MW:\MOLmw)}}}}% \makeatother% %------------------------------------------------------------------------------------ \pagestyle{empty} @@ -53,7 +52,7 @@ %------------------------------------------------------------------------------------ \begin{document} {\LARGE MCF example for luamplib(LuaLaTeX) }% - \hspace{20mm}by Akira Yamaji 2015.8.7\vspace{8mm}\\ + \hspace{20mm}by Akira Yamaji 2015.8.14\vspace{8mm}\\ %------------------------------------------------------------------------------------ \begin{mplibcode} font_wd:=100mm; font_ht:=50mm; @@ -101,8 +100,8 @@ \begin{mplibcode} font_wd:=50mm; font_ht:=40mm; beginfont("NO:4","EN:Gibberellin","MW:346.37"); - MCf( - ^^12,?6`1.3,3=??5,9=??7,12\^160`1.6,&8, + MCf(^^12, + ?6`1.3,3=??5,9=??7,12\^160`1.6,&8, 4\^155~zf`-1.2,O,55,//O^180`1,&2~zb, 3=dr,11=wf,13=wb,7:/COOH,11://Me,1:*/OH,12:/*OH,2:*/Me, @(3^-60,9^60)*/H @@ -158,7 +157,7 @@ endfont; @(5,7,15,16,23,24,32,40,41,48,49,58,59,72,73,82,83,90,91,99, 100,107,113,114,122,123,130,131,140,141,148,149)O, @(1^60,2,26,28,29,51,54,61,63,68,75^60,78,109)*/OH, - @(11,20,35,45,52,55,65,69,86)/*OH,@(^^60,47,57,71)/*H, + @(11,20,35,45,52,55,65,69,86)/*OH,@(47,57,71)/*H^60, @(3,8,13,17,21,33,38,42,56,70,84,92,101,106,111,128,138,142,146,150)/*H^-60, @(4,14,22,34,39,43,81,89,98,102,116,121,125,129,133)*/H^60, @(6,46,50,53,60,67,74)*/H^-60, -- cgit v1.2.3