From 421666a3551c85693aa8880d01fa24d9a0ec5dd9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Apr 2016 21:42:17 +0000 Subject: mcf2graph (28apr16) git-svn-id: svn://tug.org/texlive/trunk@40804 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 9 +++- Master/texmf-dist/doc/metapost/mcf2graph/README | 33 +----------- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 15 ++++-- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 247583 -> 247719 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 24 ++++----- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 419722 -> 419705 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 60 ++++++++++----------- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 123292 -> 123503 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 35 ++++++------ 9 files changed, 80 insertions(+), 96 deletions(-) (limited to 'Master/texmf-dist/doc/metapost/mcf2graph') diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 4b8bd40ae1a..122e186f119 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG +++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG @@ -1,6 +1,11 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2016-04-10 + Changelog of mcf2graph software package by Akira Yamaji 2016-04-28 ******************************************************************************* +[ver. 3.90 / 2016-04-28] + -add parameter 'sw_auxfix' + fixed aux information format is added + It is easy to use with spreadsheet software + [ver. 3.89 / 2016-04-10] -add new bond type bz (broad dotted) @@ -8,7 +13,7 @@ -rename variable 'aux_separater' => 'aux_delimiter' [ver. 3.87 / 2016-04-04] - -change aux infomation delimiter(, => ;) + -change aux information delimiter(, => ;) a lot of molecular name include ',' [ver. 3.86 / 2016-04-02] diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 54e8f1ae7b3..33b39bda791 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.89 2016-04-10 + version : 3.90 2016-04-28 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -37,35 +37,7 @@ ( 5) >mpost -s ahlength=1 FILENAME => output first definition only (for test) ( 6) >mpost -s ahlength=2 FILENAME => output checklist. -4. Molecular definition file example - - %----------------------------------------------------------------------- - input mcf2graph.mf; % input main system - %-- preamble ----------------------------------------------------------- - sw_auxout:=1; % aux(information) file output on > - sw_numberA:=0; % numbering atom off > - sw_numberB:=0; % numbering bond off > - sw_expand:=0; % substituent expand mode off > - sw_start_vector:=0; % start vector output off > Gloval setting - sw_font_frame:=0; % font frame off > - font_wd#:=60mm#; % font width > - font_ht#:=40mm#; % font height > - var3:="calc_weight"; tag3:="MWc"; > AUX file table - var4:="calc_formula"; tag4:="FMc"; > - %-- molecular definition ----------------------------------------------- - beginfont("EN:Acetamiprid") % molecular 1 - sw_font_frame:=1; % > Local setting - MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN) % MCF - endfont % - beginfont("EN:Imidacloprid") % molecular 2 - sw_start_vector:=1; % > Local setting - MCf(<30,Ph,1:N,6:/Cl,3\,!, % MCF - |,?5,1:N,3:NH,2\\,!,NO2) % - endfont % - %----------------------------------------------------------------------- - bye - -5. License +4. License 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, including without limitation the rights @@ -84,4 +56,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -%---------------------------------------------------------------------------- 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 387d6e15386..74092f1aaac 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.04.2 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.04.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% input mcf2graph.mf; %------------------------------------------------------------------------- @@ -12,10 +12,15 @@ sw_frame:=0; sw_atom_frame:=0; sw_expand:=0; sw_start_vector:=0; -%%%% var3:="len_x"; tag3:="Lx"; -%%%% var4:="len_y"; tag4:="Ly"; -%%%% var5:="calc_weight"; tag5:="MWc"; -%%%% var6:="calc_formula"; tag6:="FMc"; +%%%% sw_auxfix:=1; +%%%% var3:="len_x"; tag3:="Lx"; +%%%% var4:="len_y"; tag4:="Ly"; +%%%% var5:="cal_MW"; tag5:="cMW"; +%%%% var6:="cal_FM"; tag6:="cFM"; +%%%% var7:="inf_USE"; tag7:="USE"; +%%%% var8:="inf_EXA"; tag8:="EXA"; +%%%% var9:="inf_EXB"; tag9:="EXB"; +%%%% auxtag_out; %%%% sw_checklist:=1; %%%% sw_MOLout:=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 index 8898ab0c50c..96197a932a1 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 b0cae3f7541..9a17eac7008 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 2016.4.10 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2016.4.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} @@ -20,20 +20,20 @@ %------------------------------------------------------------------------------- \def\mol@sel#1{% \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\@USE\edef\MOLuse{\@sec}\fi% - \ifx\@fst\@FM\edef\MOLfm{\@sec}\fi \ifx\@fst\@FMc\edef\CALfm{\@sec}\fi% - \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi \ifx\@fst\@MWc\edef\CALmw{\@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}% + \edef\@tag{\expandafter\@fst@param#1;}% + \edef\@var{\expandafter\@sec@param#1;}% + \ifx\@tag\@F\edef\MOLfile{\@var}\fi \ifx\@tag\@C\edef\MOLchar{\@var}\fi% + \ifx\@tag\@Lx\edef\MOLlenx{\@var}\fi \ifx\@tag\@Ly\edef\MOLleny{\@var}\fi% + \ifx\@tag\@EN\edef\MOLnameE{\@var}\fi \ifx\@tag\@JN\edef\MOLnameJ{\@var}\fi% + \ifx\@tag\@CAS\edef\MOLcas{\@var}\fi \ifx\@tag\@USE\edef\MOLuse{\@var}\fi% + \ifx\@tag\@FM\edef\MOLfm{\@var}\fi \ifx\@tag\@FMc\edef\CALfm{\@var}\fi% + \ifx\@tag\@MW\edef\MOLmw{\@var}\fi \ifx\@tag\@MWc\edef\CALmw{\@var}\fi% + \ifx\@tag\@logP\edef\MOLlogP{\@var}\fi \ifx\@tag\@EXA\edef\MOLextA{\@var}\fi% + \ifx\@tag\@EXB\edef\MOLextB{\@var}\fi \ifx\@tag\@NO\edef\MOLnum{\@var}\fi\fi}% %------------------------------------------------------------------------------- \def\@F{F}\def\@C{C}\def\@EN{EN}\def\@JN{JN}\def\@CAS{CAS}% \def\@MW{MW}\def\@MWc{MWc}\def\@FM{FM}\def\@FMc{FMc}\def\@Lx{Lx}\def\@Ly{Ly}% -\def\@NO{NO}\def\@USE@{USE}\def\@logP@{logP}\def\@EXA@{EXA}\def\@EXB@{EXB}% +\def\@NO{NO}\def\@USE{USE}\def\@logP{logP}\def\@EXA{EXA}\def\@EXB{EXB}% %------------------------------------------------------------------------------- \def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}% \def\@stru#1[#2]{\font\@strufont=#1\relax\hbox{\@strufont\char#2}}% diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index e4eeb468c3a..e72faab65e2 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 f8eafbc0c66..19ef435e1c8 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.04.10 +% Molecular Coding Format manual by Akira Yamaji 2016.04.28 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[dvipdfmx]{graphicx} @@ -30,18 +30,18 @@ %-------------------------------------------------------------------- \def\mol@sel#1{% \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\@EN\edef\MOLnameE{\@sec}\fi% - \ifx\@fst\@NO\edef\MOLnum{\@sec}\fi - \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi - \ifx\@fst\@FMc\edef\CALfm{\@sec}\fi + \edef\@tag{\expandafter\@fst#1;}% + \edef\@var{\expandafter\@sec#1;}% + \ifx\@tag\@F\edef\MOLfile{\@var}\fi% + \ifx\@tag\@C\edef\MOLchar{\@var}\fi% + \ifx\@tag\@EN\edef\MOLnameE{\@var}\fi% + \ifx\@tag\@NO\edef\MOLnum{\@var}\fi + \ifx\@tag\@MW\edef\MOLmw{\@var}\fi + \ifx\@tag\@cFM\edef\CALfm{\@var}\fi \fi}% -\def\@F{F}\def\@C{C}\def\@EN{EN}\def\@NO{NO}\def\@MW{MW}\def\@FMc{FMc}% -\def\@fst@param#1:#2;{#1}% -\def\@sec@param#1:#2;{#2}% +\def\@F{F}\def\@C{C}\def\@EN{EN}\def\@NO{NO}\def\@MW{MW}\def\@cFM{cFM}% +\def\@fst#1:#2;{#1}% +\def\@sec#1:#2;{#2}% \def\put@char{% \begin{picture}(120,45)% \put(10,35){\bf [\MOLnum] \MOLnameE}% @@ -83,8 +83,8 @@ sw_start_vector:=0; % start vector output off > sw_font_frame:=0; % font frame off > font_wd#:=60mm#; % font width > font_ht#:=40mm#; % font height > -var3:="calc_weight"; tag3:="MWc"; > AUX file table -var4:="calc_formula"; tag4:="FMc"; > +var3:="cal_MW"; tag3:="cMW"; > AUX file table +var4:="cal_FM"; tag4:="cFM"; > outputformat:="png"; hppp:=vppp:=0.1; > PNG output outputtemplate:="%j-%3c.png"; > %------------------------------------------------------------------------- @@ -117,11 +117,11 @@ bye 'filename'-info.aux : for use in \TeX, it takes over filename, char number, molecular information,etc. \begin{verbatim} -F:mcf_man_soc;C:0;MWc:893.48962;FMc:C55H72MgN4O5;NO:1;EN:Chlorophyll a;MW:893.49 +F:mcf_man_soc;C:0;cMW:893.48962;cFM:C55H72MgN4O5;NO:1;EN:Chlorophyll a;MW:893.49 \end{verbatim} ( tag : variable )\\ -F:filename C:char number,MWc:molecular weight calculated, -FMc:molecular formula calculated\\ +F:filename C:char number,cMW:molecular weight calculated, +cFM:molecular formula calculated\\ NO:serial number, EN:english name, MW:molecular weight from literature data\vspace{5mm}\\ %---------------------------------------------------------------------------- @@ -136,14 +136,14 @@ MW:molecular weight from literature data\vspace{5mm}\\ %-------------------------------------------------------------------- \def\mol@sel#1{% \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\@EN\edef\MOLnameE{\@sec}\fi% - \ifx\@fst\@NO\edef\MOLnum{\@sec}\fi - \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi - \ifx\@fst\@FMc\edef\CALfm{\@sec}\fi + \edef\@tag{\expandafter\@fst@param#1;}% + \edef\@var{\expandafter\@sec@param#1;}% + \ifx\@tag\@F\edef\MOLfile{\@var}\fi% + \ifx\@tag\@C\edef\MOLchar{\@var}\fi% + \ifx\@tag\@EN\edef\MOLnameE{\@var}\fi% + \ifx\@tag\@NO\edef\MOLnum{\@var}\fi + \ifx\@tag\@MW\edef\MOLmw{\@var}\fi + \ifx\@tag\@FMc\edef\CALfm{\@var}\fi \fi}% \def\@F{F}\def\@C{C}\def\@EN{EN}\def\@NO{NO}\def\@MW{MW}\def\@FMc{FMc}% \def\@fst@param#1:#2;{#1}% @@ -163,13 +163,13 @@ MW:molecular weight from literature data\vspace{5mm}\\ %-------------------------------------------------------------------- \begin{document} \unitlength=1mm% -\INFO{F:mcf_man_soc ,C:0 ,MWc:893.48962 ,FMc:C55H72MgN4O5% +\INFO{F:mcf_man_soc ,C:0 ,cMW:893.48962 ,cFM:C55H72MgN4O5% ,NO:1 ,EN:Chlorophyll a ,MW:893.49}% \end{document} %-------------------------------------------------------------------- \end{verbatim}% %############################################################################ -\INFO{F:mcf_man_soc ,C:0 ,MWc:893.48962 ,FMc:C55H72MgN4O5% +\INFO{F:mcf_man_soc ,C:0 ,cMW:893.48962 ,cFM:C55H72MgN4O5% ,NO:1 ,EN:Chlorophyll a ,MW:893.49}% \newpage %---------------------------------------------------------------------------- @@ -1148,10 +1148,10 @@ beginfont() MCd(1,.4)( 1,.5)(Ph) endfont \begin{minipage}[t][37mm]{90mm} \MCFtitle{Output molecular information} \begin{verbatim} -var3:="calc_weight"; tag3:="MWc"; -var4:="calc_formula"; tag4:="FMc"; +var3:="calc_weight"; tag3:="cMW"; +var4:="calc_formula"; tag4:="cFM"; %% Output to mcf_man_soc-info.aux %% -F:mcf_man_soc;C:85;MWc:194.19174;FMc:C8H10N4O2 +F:mcf_man_soc;C:85;cMW:194.19174;cFM:C8H10N4O2 MWc:calculated molecular weight FMc:calculated molecular formula 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 b75682de6d9..36cfaddf07d 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 69487d81d77..0c47c8960c1 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.4.10 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.4.27 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass{article} %------------------------------------------------------------------------------ @@ -10,9 +10,9 @@ input mcf2graph.mf; mp_log_name:="temp-info.aux"; sw_auxout:=1; - var3:="len_x"; tag3:="Lx"; - var4:="calc_weight"; tag4:="MWc"; - var5:="calc_formula"; tag5:="FMc"; + var3:="len_x"; tag3:="Lx"; + var4:="cal_MW"; tag4:="cMW"; + var5:="cal_FM"; tag5:="cFM"; fi}% \everyendmplib{write EOF to mp_log_name;}% %------------------------------------------------------------------------------ @@ -21,22 +21,23 @@ \newif\ifCONT@% \newread\@auxf% %------------------------------------------------------------------------------ -\def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}% +\def\@fst@param#1:#2;{#1}% +\def\@sec@param#1:#2;{#2}% \def\mol@sel#1{% \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\@USE\edef\MOLuse{\@sec}\fi% - \ifx\@fst\@FM\edef\MOLfm{\@sec}\fi \ifx\@fst\@FMc\edef\CALfm{\@sec}\fi% - \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi \ifx\@fst\@MWc\edef\CALmw{\@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}% + \edef\@tag{\expandafter\@fst@param#1;}% + \edef\@var{\expandafter\@sec@param#1;}% + \ifx\@tag\@F\edef\MOLfile{\@var}\fi \ifx\@tag\@C\edef\MOLchar{\@var}\fi% + \ifx\@tag\@Lx\edef\MOLlenx{\@var}\fi \ifx\@tag\@Ly\edef\MOLleny{\@var}\fi% + \ifx\@tag\@EN\edef\MOLnameE{\@var}\fi \ifx\@tag\@JN\edef\MOLnameJ{\@var}\fi% + \ifx\@tag\@CAS\edef\MOLcas{\@var}\fi \ifx\@tag\@USE\edef\MOLuse{\@var}\fi% + \ifx\@tag\@FM\edef\MOLfm{\@var}\fi \ifx\@tag\@cFM\edef\CALfm{\@var}\fi% + \ifx\@tag\@MW\edef\MOLmw{\@var}\fi \ifx\@tag\@cMW\edef\CALmw{\@var}\fi% + \ifx\@tag\@logP\edef\MOLlogP{\@var}\fi \ifx\@tag\@EXA\edef\MOLextA{\@var}\fi% + \ifx\@tag\@EXB\edef\MOLextB{\@var}\fi \ifx\@tag\@NO\edef\MOLnum{\@var}\fi\fi}% %------------------------------------------------------------------------------- \def\@F{F}\def\@C{C}\def\@EN{EN}\def\@JN{JN}\def\@CAS{CAS}% -\def\@MW{MW}\def\@MWc{MWc}\def\@FM{FM}\def\@FMc{FMc}\def\@Lx{Lx}\def\@Ly{Ly}% +\def\@MW{MW}\def\@cMW{cMW}\def\@FM{FM}\def\@cFM{cFM}\def\@Lx{Lx}\def\@Ly{Ly}% \def\@NO{NO}\def\@USE@{USE}\def\@logP@{logP}\def\@EXA@{EXA}\def\@EXB@{EXB}% %------------------------------------------------------------------------------- % modified latex2e kernel program control (@for delimiter ','=>';') @@ -205,3 +206,5 @@ endfont; \MOLcaption{110mm}{70mm}\\% %---------------------------------------------------------------------------- \end{document} +ment} +ment} -- cgit v1.2.3