xdvik 22.86

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

1 files changed, 37 insertions, 9 deletions

diff --git a/Build/source/texk/xdvik/main.c b/Build/source/texk/xdvik/main.c
index 0ca170dec90..5da0a783442 100644
--- a/Build/source/texk/xdvik/main.c
+++ b/Build/source/texk/xdvik/main.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2013 the xdvik development team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAUL VOJTA OR ANY OTHER AUTHOR OF THIS SOFTWARE BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
 #include "xdvi-config.h"
 
 #include <locale.h>
@@ -17,9 +40,10 @@
 #include "mag.h"
 #include "message-window.h"
 
-#ifdef T1LIB
-#include "t1lib.h"
-#endif /* T1LIB */
+#if FREETYPE
+# include <ft2build.h>
+# include FT_FREETYPE_H
+#endif
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
@@ -85,9 +109,9 @@ static XrmOptionDescRec options[] = {
 #endif
     {"-mfmode",		".mfMode",		XrmoptionSepArg,	(XPointer)NULL	},
     {"-editor",		".editor",		XrmoptionSepArg,	(XPointer)NULL	},
-#ifdef T1LIB
-    {"-not1lib",	".t1lib",		XrmoptionNoArg,		(XPointer)"off"	},
-    {"+not1lib",	".t1lib",		XrmoptionNoArg,		(XPointer)"on"	},
+#if FREETYPE
+    {"-notype1fonts",	".type1",		XrmoptionNoArg,		(XPointer)"off"	},
+    {"+notype1fonts",	".type1",		XrmoptionNoArg,		(XPointer)"on"	},
 #endif
     {"-sourceposition",	".sourcePosition",	XrmoptionSepArg,	(XPointer)NULL	},
     {"-findstring",	".findString",		XrmoptionSepArg,	(XPointer)NULL	},
@@ -407,8 +431,7 @@ display_long_licensing_info(void)
 	  "Xdvik uses the following libraries:\n"
 	  "- The kpathsea library, licensed in part under the GNU General Public\n"
 	  "  License, in part under the GNU Library General Public License.\n"
-	  "- t1lib, licensed in parts under the GNU Library General Public License,\n"
-	  "  in parts under the X Consortium license.\n"
+	  "- FreeType2, licensed under the GNU General Public License.\n"
 	  "There is NO WARRANTY of anything.\n\n", stdout);
 }
 
@@ -759,7 +782,12 @@ display_version_info(void)
 #else
     printf("%s\n", XDVI_GUI);
 #endif
-    printf("Libraries: %s, T1lib version %s\n", kpathsea_version_string, T1LIB_VERSIONSTRING);
+#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);
+#endif
 }