1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
--- texk/xdvik/main.c.orig 2022-02-17 21:04:19 UTC
+++ texk/xdvik/main.c
@@ -39,6 +39,9 @@
#include "filehist.h"
#include "mag.h"
#include "message-window.h"
+#ifdef HAVE_LIBPAPER
+#include <paper.h>
+#endif
#if FREETYPE
# include <ft2build.h>
@@ -54,6 +57,14 @@ static const char *xdvi_kpse_prog_name = TOSTRING(XDVI
#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' */
@@ -656,8 +667,16 @@ init_check_resources(void)
/* paper type */
if (!set_paper_type(resource.paper)) {
- const char **p;
char *helpmsg = xstrdup("Possible paper types are:\n ");
+#ifdef HAVE_LIBPAPER
+ const struct paper *pp;
+
+ for (pp = paperfirst(); pp; pp = papernext(pp)) {
+ helpmsg = xstrcat(helpmsg, papername(pp));
+ helpmsg = xstrcat(helpmsg, " ");
+ }
+#else
+ const char **p;
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 */
@@ -668,6 +687,7 @@ init_check_resources(void)
helpmsg = xstrcat(helpmsg, " ");
}
}
+#endif
helpmsg = xstrcat(helpmsg,
"\n(the names ending with `r' are `rotated' or `landscape' variants).\n"
"Alternatively, you can specify the dimensions as `WIDTHxHEIGHT', followed "
@@ -783,6 +803,9 @@ static void
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, */
@@ -791,12 +814,19 @@ display_version_info(void)
#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");
}
|
