asy 2.31 sources

git-svn-id: svn://tug.org/texlive/trunk@34080 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 36 deletions

diff --git a/Build/source/utils/asymptote/runlabel.cc b/Build/source/utils/asymptote/runlabel.cc
index c64b64258e3..6e54c5dcd9e 100644
--- a/Build/source/utils/asymptote/runlabel.cc
+++ b/Build/source/utils/asymptote/runlabel.cc
@@ -161,17 +161,19 @@ array *readpath(const string& psname, bool keep,
   iopipestream gs(cmd,"gs","Ghostscript");
   while(true) {
     stringstream buf;
-    while(true) {
-      string out;
-      gs >> out;
-      if(out.empty() && !gs.running()) break;
-      buf << out;
-      if(out[out.size()-1] == '\n') {
-        gs << newl;
-        break;
-      }
+    string s=gs.readline();
+    if(s.empty() || !gs.running()) break;
+    gs << newl;
+
+#ifdef __APPLE__
+    for(string::iterator i=s.begin(); i != s.end(); ++i) {
+    // Workaround broken stringstream container in MacOS 10.9 libc++.
+      if(isalpha(*i) && *i != 'e') {buf << " ";}
+      buf << *i;
     }
-    if(!gs.running()) break;
+#else    
+    buf << s;
+#endif
     
     if(verbose > 2) cout << endl;
   
@@ -267,7 +269,7 @@ array *readpath(const string& psname, bool keep,
 
 #endif
 namespace run {
-#line 220 "runlabel.in"
+#line 222 "runlabel.in"
 // void label(picture *f, string *s, string *size, transform t, pair position,           pair align, pen p);
 void gen_runlabel0(stack *Stack)
 {
@@ -278,36 +280,34 @@ void gen_runlabel0(stack *Stack)
   string * size=vm::pop<string *>(Stack);
   string * s=vm::pop<string *>(Stack);
   picture * f=vm::pop<picture *>(Stack);
-#line 222 "runlabel.in"
+#line 224 "runlabel.in"
   f->append(new drawLabel(*s,*size,t,position,align,p));
 }
 
-#line 226 "runlabel.in"
+#line 228 "runlabel.in"
 // bool labels(picture *f);
 void gen_runlabel1(stack *Stack)
 {
   picture * f=vm::pop<picture *>(Stack);
-#line 227 "runlabel.in"
+#line 229 "runlabel.in"
   {Stack->push<bool>(f->havelabels()); return;}
 }
 
-#line 231 "runlabel.in"
+#line 233 "runlabel.in"
 // realarray* texsize(string *s, pen p=CURRENTPEN);
 void gen_runlabel2(stack *Stack)
 {
   pen p=vm::pop<pen>(Stack,CURRENTPEN);
   string * s=vm::pop<string *>(Stack);
-#line 232 "runlabel.in"
+#line 234 "runlabel.in"
   texinit();
   processDataStruct &pd=processData();
   
   string texengine=getSetting<string>("tex");
-  const char **abort=texabort(texengine);
   setpen(pd.tex,texengine,p);
   
   double width,height,depth;
-  if(!texbounds(width,height,depth,pd.tex,*s,abort,false,true))
-    {Stack->push<realarray*>(new array(0)); return;}
+  texbounds(width,height,depth,pd.tex,*s);
   
   array *t=new array(3);
   (*t)[0]=width;
@@ -338,8 +338,15 @@ void gen_runlabel3(stack *Stack)
   
   for(size_t i=0; i < n; ++i) {
     tex.setfont(read<pen>(p,i));
-    if(i != 0)
-      tex.verbatimline("\\newpage");
+    if(i != 0) {
+      if(texengine == "context")
+        tex.verbatimline("}\\page\\hbox{%");
+      else if(texengine == "luatex" || texengine == "tex" ||
+              texengine == "pdftex")
+        tex.verbatimline("\\eject");
+      else
+        tex.verbatimline("\\newpage");
+    }
     if(!pdf) {
       tex.verbatimline("\\special{ps:");
       tex.verbatimline(ASYx);
@@ -379,12 +386,9 @@ void gen_runlabel3(stack *Stack)
       cmd.push_back("-sOutputFile=-");
       cmd.push_back(pdfname);
       iopipestream gs(cmd,"gs","Ghostscript");
-      
-      gs.block(false);
       while(true) {
-        string line;
-        gs >> line;
-        if(line.empty() && !gs.running()) break;
+        string line=gs.readline();
+        if(line.empty() || !gs.running()) break;
         ps << line;
       }
       ps.close();
@@ -425,13 +429,13 @@ void gen_runlabel3(stack *Stack)
   {Stack->push<patharray2*>(pdf ? readpath(psname,keep,0.1) : readpath(psname,keep,0.12,-1.0)); return;}
 }
 
-#line 355 "runlabel.in"
+#line 359 "runlabel.in"
 // patharray2* textpath(stringarray *s, penarray *p);
 void gen_runlabel4(stack *Stack)
 {
   penarray * p=vm::pop<penarray *>(Stack);
   stringarray * s=vm::pop<stringarray *>(Stack);
-#line 356 "runlabel.in"
+#line 360 "runlabel.in"
   size_t n=checkArrays(s,p);
   if(n == 0) {Stack->push<patharray2*>(new array(0)); return;}
   
@@ -462,6 +466,7 @@ void gen_runlabel4(stack *Stack)
   push_split(cmd,getSetting<string>("textcommandOptions"));
   cmd.push_back(textname);
   iopipestream typesetter(cmd);
+  typesetter.block(true,false);
   
   mem::vector<string> cmd2;
   cmd2.push_back(getSetting<string>("gs"));
@@ -475,7 +480,7 @@ void gen_runlabel4(stack *Stack)
   cmd2.push_back("-sOutputFile=-");
   cmd2.push_back("-");
   iopipestream gs(cmd2,"gs","Ghostscript");
-  gs.block(false);
+  gs.block(false,false);
 
   // TODO: Simplify by connecting the pipes directly.
   while(true) {
@@ -503,13 +508,13 @@ void gen_runlabel4(stack *Stack)
   {Stack->push<patharray2*>(readpath(psname,keep,0.1)); return;}
 }
 
-#line 428 "runlabel.in"
+#line 433 "runlabel.in"
 // patharray* _strokepath(path g, pen p=CURRENTPEN);
 void gen_runlabel5(stack *Stack)
 {
   pen p=vm::pop<pen>(Stack,CURRENTPEN);
   path g=vm::pop<path>(Stack);
-#line 429 "runlabel.in"
+#line 434 "runlabel.in"
   array *P=new array(0);
   if(g.size() == 0) {Stack->push<patharray*>(P); return;}
   
@@ -539,17 +544,17 @@ namespace trans {
 
 void gen_runlabel_venv(venv &ve)
 {
-#line 220 "runlabel.in"
+#line 222 "runlabel.in"
   addFunc(ve, run::gen_runlabel0, primVoid(), SYM(label), formal(primPicture(), SYM(f), false, false), formal(primString(), SYM(s), false, false), formal(primString(), SYM(size), false, false), formal(primTransform(), SYM(t), false, false), formal(primPair(), SYM(position), false, false), formal(primPair(), SYM(align), false, false), formal(primPen(), SYM(p), false, false));
-#line 226 "runlabel.in"
+#line 228 "runlabel.in"
   addFunc(ve, run::gen_runlabel1, primBoolean(), SYM(labels), formal(primPicture(), SYM(f), false, false));
-#line 231 "runlabel.in"
+#line 233 "runlabel.in"
   addFunc(ve, run::gen_runlabel2, realArray(), SYM(texsize), formal(primString(), SYM(s), false, false), formal(primPen(), SYM(p), true, false));
 #line 251 "runlabel.in"
   addFunc(ve, run::gen_runlabel3, pathArray2() , SYM(_texpath), formal(stringArray() , SYM(s), false, false), formal(penArray() , SYM(p), false, false));
-#line 355 "runlabel.in"
+#line 359 "runlabel.in"
   addFunc(ve, run::gen_runlabel4, pathArray2() , SYM(textpath), formal(stringArray() , SYM(s), false, false), formal(penArray() , SYM(p), false, false));
-#line 428 "runlabel.in"
+#line 433 "runlabel.in"
   addFunc(ve, run::gen_runlabel5, pathArray() , SYM(_strokepath), formal(primPath(), SYM(g), false, false), formal(primPen(), SYM(p), true, false));
 }