summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG7
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README2
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin247652 -> 247578 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex7
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin418934 -> 418934 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin123456 -> 123292 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex4
-rw-r--r--Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf10
9 files changed, 21 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 62fbf8693c7..dca2d5bbb50 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,8 +1,11 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2016-04-04
+ Changelog of mcf2graph software package by Akira Yamaji 2016-04-06
*******************************************************************************
+[ver. 3.88 / 2016-04-06]
+ -rename variable 'aux_separater' => 'aux_delimiter'
+
[ver. 3.87 / 2016-04-04]
- -change aux infomation separater(, => ;)
+ -change aux infomation 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 bdb53ee5e24..cd42f764405 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.87 2016-04-04
+ version : 3.88 2016-04-06
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index be012b753a0..30e82898ac1 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_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index d4344c996ab..86755b9bd92 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.4
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2016.4.6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -50,7 +50,7 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% copied from ltcntrl.dtx [2014/04/21 v1.0h LaTeX Kernel (program control)]
-% modify @for (separater=",") to @for@semi (separater=";")
+% modified @for (delimiter=",") to @for@semi (delimiter=";")
%--------------------------------------------------------------------------------
\def\@for@semi#1:=#2\do#3{\expandafter\def\expandafter\@for@tmp\expandafter{#2}%
\ifx\@for@tmp\@empty \else \expandafter\@for@loop#2;\@nil;\@nil\@@#1{#3}\fi}%
@@ -65,7 +65,8 @@
\read\@auxf to \temp@info%
\ifeof\@auxf\CONT@false\else%
\@for@semi\@temp:=\temp@info\do{\mol@sel\@temp}%
-\put@char\fi%
+\put@char%
+\fi%
\ifCONT@ \repeat
\closein\@auxf}%
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 7a6ac9c106d..d09749bc092 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 acc54e69e88..9d51efa5f0c 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.4
+% Molecular Coding Format manual by Akira Yamaji 2016.04.6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[dvipdfmx]{graphicx}
@@ -1175,15 +1175,15 @@ CAS:CAS number *:default output
\vspace{5mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][37mm]{90mm}
-\MCFtitle{Change aux information separater}
+\MCFtitle{Change aux information delimiter}
\begin{verbatim}
-aux_separater:="/";
+aux_delimiter:="/";
beginfont("EN:Warfarin","CAS:81-81-2")
MCf(...) endfont
%% Output to mcf_man_soc-info.aux %%
F:mcf_man_soc/C:87/EN:Warfarin/CAS:81-81-2
-**default aux_separater=";"
+**default aux_delimiter=";"
\end{verbatim}
\end{minipage}
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 45b22998aab..b1f6dc91ad7 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 c77bd1c2416..97665f04f28 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.4
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2016.4.6
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass{article}
%------------------------------------------------------------------------------
@@ -10,7 +10,7 @@
input mcf2graph.mf;
mp_log_name:="temp-info.aux";
sw_auxout:=1;
- aux_separater:=",";
+ aux_delimiter:=",";
var3:="len_x"; tag3:="Lx";
var4:="calc_weight"; tag4:="MWc";
var5:="calc_formula"; tag5:="FMc";
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index ce075442a5f..ff213020f0c 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.87 Copyright (c) 2013-2016 Akira Yamaji
+% mcf2graph ver 3.88 Copyright (c) 2013-2016 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,
@@ -39,14 +39,14 @@ numeric angB[],angA[],br_ang[],sB[],eB[],f_FON[],atom_w[],atom_h[],atom_d[],strA
CH[],NH[],NO[],SO[],CCl[],CF[],CBr[],?[],![],Ph[];
path pA,pB,pC,pT;
string info[],tblA[],com_str[],var[],tag[],
- calc_formula,mp_log_name,mol_name,mol_formula,calc_weight_str,info_str,aux_separater;
+ calc_formula,mp_log_name,mol_name,mol_formula,calc_weight_str,info_str,aux_delimiter;
picture atom_font[],chem_structure,temp_picture;
%-------------------------------------------------------------------------------------------------
sw_numberA:=sw_numberB:=sw_mol_frame:=sw_auxout:=sw_solid:=sw_expand:=sw_start_vector:=0;
char_num:=str_cnt:=proc_end:=sw_font_frame:=sw_atom_frame:=sw_checklist:=sw_MOLout:=0;
sw_subst_off:=sw_bond_single:=0;
numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095; aux_max:=20;
-aux_separater:=";"; var1:="jobname"; tag1:="F"; var2:="char_num"; tag2:="C";
+aux_delimiter:=";"; var1:="jobname"; tag1:="F"; var2:="char_num"; tag2:="C";
for i=3 upto aux_max: var[i]:=tag[i]:=""; endfor
%-------------------------------------------------------------------------------------------------
if known green: f_MP:=1;
@@ -566,11 +566,11 @@ enddef;
vardef fit_zero(expr n)=if n<=9: "00" elseif n<=99: "0" fi enddef;
def auxfile_out=
for i=1 upto aux_max: exitif var[i]="";
- if i=1: printf "" else: &aux_separater fi &tag[i]&":"&
+ if i=1: printf "" else: &aux_delimiter fi &tag[i]&":"&
if string scantokens(var[i]): scantokens(var[i])
elseif numeric scantokens(var[i]): decimal(scantokens(var[i])) fi
endfor
- for i=1 upto info_num: &aux_separater&info[i] endfor;
+ for i=1 upto info_num: &aux_delimiter&info[i] endfor;
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
mc_num:=first_def_number;