- Add pTeX support to xdvik. This improvement is imported from

  the latest j1.42 patchset by adjusting it to the 22.87 code base.

- Move files in TEXMFDISTDIR/xdvi to TEXMFDISTDIR/dvips/xdvi.

1 files changed, 53 insertions, 4 deletions

diff --git a/print/tex-xdvik/files/patch-texk-xdvik-main.c b/print/tex-xdvik/files/patch-texk-xdvik-main.c
index 9c82084e6458..c098098c97c8 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-main.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-main.c
@@ -1,5 +1,5 @@
---- main.c.orig	2014-04-03 10:17:12.000000000 +0900
-+++ main.c	2014-08-22 23:24:13.000000000 +0900
+--- texk/xdvik/main.c.orig	2014-09-02 18:41:34.000000000 +0900
++++ texk/xdvik/main.c	2015-01-31 21:35:42.000000000 +0900
 @@ -39,6 +39,9 @@
  #include "filehist.h"
  #include "mag.h"
@@ -10,7 +10,22 @@
  
  #if FREETYPE
  # include <ft2build.h>
-@@ -651,8 +654,16 @@
+@@ -54,6 +57,14 @@
+ #undef STRINGIFY
+ #undef TOSTRING
+ 
++#ifdef	PTEX
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#if	HAVE_FONTCONFIG
++#include <fontconfig/fontconfig.h>
++#endif	/* HAVE_FONTCONFIG */
++#endif	/* PTEX */
++
+ static char XtRBool3[] = "Bool3";	/* resource for Bool3 */
+ 
+ /* get these before setting `application_resources' */
+@@ -651,8 +662,16 @@
  
      /* paper type */
      if (!set_paper_type(resource.paper)) {
@@ -28,7 +43,7 @@
  	const char **paper_types = get_paper_types();
  	for (p = paper_types; p < paper_types + get_paper_types_size(); p += 2) {
  	    if (**p == '\0') { /* next line of list */
-@@ -663,6 +674,7 @@
+@@ -663,6 +682,7 @@
  		helpmsg = xstrcat(helpmsg, " ");
  	    }
  	}
@@ -36,3 +51,37 @@
  	helpmsg = xstrcat(helpmsg,
  			  "\n(the names ending with `r' are `rotated' or `landscape' variants).\n"
  			  "Alternatively, you can specify the dimensions as `WIDTHxHEIGHT', followed "
+@@ -778,6 +798,9 @@
+ display_version_info(void)
+ {
+     printf("%s version %s ", XDVIK_PROGNAME, XDVI_VERSION);
++#ifdef JPVERSION
++    printf("%s ", JPVERSION);
++#endif
+ #ifdef MOTIF
+     printf("(%s, runtime version %d.%d)\n",
+ 	   /* 	   XmVERSION, XmREVISION, XmUPDATE_LEVEL, */
+@@ -786,12 +809,19 @@
+ #else
+     printf("%s\n", XDVI_GUI);
+ #endif
++    printf("Libraries: %s", kpathsea_version_string);
++#ifdef HAVE_LIBPAPER
++    printf(", libpaper");
++#endif
+ #if FREETYPE
+-    printf("Libraries: %s, freetype version %d.%d.%d\n",
+-      kpathsea_version_string, FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
+-#else
+-    printf("Libraries: %s\n", kpathsea_version_string);
++    printf(", freetype version %d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
+ #endif
++#ifdef PTEX
++#if HAVE_FONTCONFIG
++    printf(", fontconfig version %d.%d.%d", FC_MAJOR, FC_MINOR, FC_REVISION);
++#endif /* HAVE_FONTCONFIG */
++#endif /* !PTEX */
++    printf("\n");
+ }
+ 
+