summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/texfile.h
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2014-05-17 18:06:46 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2014-05-17 18:06:46 +0000
commit8e7ea45ebf7c1c4dbca970656d00684cc5d53720 (patch)
tree8c8a67fb417b3e9ccf6a4dcbd17361f8e36683f2 /Build/source/utils/asymptote/texfile.h
parent02783996c279399df9780678ce424ab563bfee73 (diff)
asy 2.31 sources
git-svn-id: svn://tug.org/texlive/trunk@34080 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/texfile.h')
-rw-r--r--Build/source/utils/asymptote/texfile.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/Build/source/utils/asymptote/texfile.h b/Build/source/utils/asymptote/texfile.h
index 1965b98f758..0a99b4aafd7 100644
--- a/Build/source/utils/asymptote/texfile.h
+++ b/Build/source/utils/asymptote/texfile.h
@@ -60,10 +60,12 @@ void texpreamble(T& out, mem::list<string>& preamble=processData().TeXpreamble,
{
texuserpreamble(out,preamble);
string texengine=settings::getSetting<string>("tex");
+ if(settings::context(texengine))
+ out << "\\disabledirectives[system.errorcontext]%" << newl;
out << "\\def\\ASYprefix{" << stripFile(settings::outname()) << "}" << newl
<< "\\newbox\\ASYbox" << newl
<< "\\newdimen\\ASYdimen" << newl
- << "\\long\\def\\ASYbase#1#2{\\leavevmode\\setbox\\ASYbox=\\hbox{#1}"
+ << "\\long\\def\\ASYbase#1#2{\\leavevmode\\setbox\\ASYbox=\\hbox{#1}%"
<< "\\ASYdimen=\\ht\\ASYbox%" << newl
<< "\\setbox\\ASYbox=\\hbox{#2}\\lower\\ASYdimen\\box\\ASYbox}" << newl;
if(ASYalign)
@@ -72,9 +74,8 @@ void texpreamble(T& out, mem::list<string>& preamble=processData().TeXpreamble,
<< "\\setbox\\ASYbox\\hbox{\\ASYdimen=\\ht\\ASYbox%" << newl
<< "\\advance\\ASYdimen by\\dp\\ASYbox\\kern#3\\wd\\ASYbox"
<< "\\raise#4\\ASYdimen\\box\\ASYbox}%" << newl
- << settings::beginput(texengine)
- << "{#5\\wd\\ASYbox 0pt\\dp\\ASYbox 0pt\\ht\\ASYbox 0pt\\box\\ASYbox#6}"
- << settings::endput(texengine) << "}%" << newl
+ << "\\setbox\\ASYbox=\\hbox{#5\\wd\\ASYbox 0pt\\dp\\ASYbox 0pt\\ht\\ASYbox 0pt\\box\\ASYbox#6}%" << newl
+ << "\\hbox to 0pt{\\kern#1pt\\raise#2pt\\box\\ASYbox\\hss}}%" << newl
<< "\\long\\def\\ASYalignT(#1,#2)(#3,#4)#5#6{%" << newl
<< "\\ASYaligned(#1,#2)(#3,#4){%" << newl
<< settings::beginlabel(texengine) << "%" << newl
@@ -145,10 +146,7 @@ void texdefines(T& out, mem::list<string>& preamble=processData().TeXpreamble,
out << "\\begin{document}" << newl;
latexfontencoding(out);
}
- } else if(settings::context(texengine)) {
- if(!pipe && !settings::getSetting<bool>("inlinetex"))
- out << "\\usemodule[pictex]" << newl;
- } else {
+ } else if(!settings::context(texengine)) {
out << "\\input graphicx" << newl // Fix miniltx path parsing bug:
<< "\\makeatletter" << newl
<< "\\def\\filename@parse#1{%" << newl