Sync XeTeX

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

9 files changed, 21 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/xetexdir/COPYING b/Build/source/texk/web2c/xetexdir/COPYING
index 9543cf2d52a..09ead83bc8e 100644
--- a/Build/source/texk/web2c/xetexdir/COPYING
+++ b/Build/source/texk/web2c/xetexdir/COPYING
@@ -5,7 +5,7 @@
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009-2012 by Jonathan Kew
  Copyright (c) 2010-2012 by Han The Thanh
- Copyright (c) 2012-2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
  Copyright (c) 2012-2013 by Jiang Jiang
 
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
index 3bc79b5e13b..787635c95de 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst_Mac.cpp
@@ -3,7 +3,7 @@
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009 by Jonathan Kew
  Copyright (c) 2012, 2013 by Jiang Jiang
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
index 8feee947b54..90f8e15c240 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
@@ -2,7 +2,7 @@
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009-2012 by Jonathan Kew
- Copyright (c) 2012-2014 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h
index 6ef9e860f42..87a743d99a6 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h
@@ -2,7 +2,7 @@
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009 by Jonathan Kew
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
index 551101e4878..720c558063d 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
@@ -2,7 +2,7 @@
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009 by Jonathan Kew
- Copyright (c) 2012-2014 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index f210dc1435f..2aa3bc2a714 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -2,7 +2,7 @@
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009, 2011 by Jonathan Kew
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
  Copyright (c) 2012, 2013 by Jiang Jiang
 
  SIL Author(s): Jonathan Kew
@@ -2573,12 +2573,16 @@ open_dvi_output(FILE** fptr)
         return open_output(fptr, FOPEN_WBIN_MODE);
     } else {
         const char *p = (const char*)nameoffile+1;
-        char    *cmd, *q;
+        char    *cmd, *q, *bindir = NULL;
         int len = strlen(p);
         while (*p)
             if (*p++ == '\"')
                 ++len;
         len += strlen(outputdriver);
+        if (!kpse_absolute_p(outputdriver, true))
+            bindir = kpse_var_value("SELFAUTOLOC");
+        if (bindir)
+            len += strlen(bindir) + 1;
         if (output_directory)
             len += strlen(output_directory);
         len += 10; /* space for -o flag, quotes, NUL */
@@ -2586,7 +2590,13 @@ open_dvi_output(FILE** fptr)
             if (*p == '\"')
                 ++len;  /* allow extra space to escape quotes in filename */
         cmd = xmalloc(len);
-        strcpy(cmd, outputdriver);
+        if (bindir) {
+            strcpy(cmd, bindir);
+            strcat(cmd, "/");
+            strcat(cmd, outputdriver);
+        } else {
+            strcpy(cmd, outputdriver);
+        }
         strcat(cmd, " -o \"");
         if (output_directory) {
             len = strlen(output_directory);
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
index 5bc174bfc7b..a7edc2388eb 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h
@@ -3,7 +3,7 @@
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009, 2011 by Jonathan Kew
  Copyright (c) 2012, 2013 by Jiang Jiang
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c
index fe2e9c21e5d..00576dc8d59 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c
@@ -3,7 +3,7 @@
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009 by Jonathan Kew
  Copyright (c) 2012, 2013 by Jiang Jiang
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
 
  SIL Author(s): Jonathan Kew
 
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_web.h b/Build/source/texk/web2c/xetexdir/XeTeX_web.h
index 480d2dabe80..6d38fd8b96d 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_web.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_web.h
@@ -3,7 +3,7 @@
  Copyright (c) 1994-2008 by SIL International
  Copyright (c) 2009-2012 by Jonathan Kew
  Copyright (c) 2010-2014 by Han The Thanh
- Copyright (c) 2012-2014 by Khaled Hosny
+ Copyright (c) 2012-2015 by Khaled Hosny
  Copyright (c) 2014 by Peter Breitenlohner
 
  SIL Author(s): Jonathan Kew