summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-06 22:02:27 +0000
committerKarl Berry <karl@freefriends.org>2017-06-06 22:02:27 +0000
commite475dfed3e42316a82b5102a9c3f5349683231cc (patch)
treeebed2aa523daa7d0ed99632ca5ce3fc01ea94b7c
parent289116fcf3cec3b7fe8d462c6563c1c46ba9e13f (diff)
dviinfox (5jun17)
git-svn-id: svn://tug.org/texlive/trunk@44515 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am1
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in1
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/dviinfox/dviinfox.pl366
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst1
l---------Master/bin/amd64-freebsd/dviinfox1
l---------Master/bin/amd64-netbsd/dviinfox1
l---------Master/bin/armel-linux/dviinfox1
l---------Master/bin/armhf-linux/dviinfox1
l---------Master/bin/i386-cygwin/dviinfox1
l---------Master/bin/i386-darwin/dviinfox1
l---------Master/bin/i386-freebsd/dviinfox1
l---------Master/bin/i386-linux/dviinfox1
l---------Master/bin/i386-netbsd/dviinfox1
l---------Master/bin/i386-solaris/dviinfox1
l---------Master/bin/powerpc-darwin/dviinfox1
l---------Master/bin/powerpc-linux/dviinfox1
l---------Master/bin/sparc-solaris/dviinfox1
-rwxr-xr-xMaster/bin/win32/dviinfox.exebin0 -> 1536 bytes
l---------Master/bin/x86_64-cygwin/dviinfox1
l---------Master/bin/x86_64-darwin/dviinfox1
l---------Master/bin/x86_64-darwinlegacy/dviinfox1
l---------Master/bin/x86_64-linux/dviinfox1
l---------Master/bin/x86_64-solaris/dviinfox1
-rw-r--r--Master/texmf-dist/doc/latex/dviinfox/LICENSE24
-rw-r--r--Master/texmf-dist/doc/latex/dviinfox/README.md81
-rwxr-xr-xMaster/texmf-dist/scripts/dviinfox/dviinfox.pl366
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dviinfox.tlpsrc1
30 files changed, 862 insertions, 1 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index efd046a584c..3ab5444c91c 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -108,6 +108,7 @@ texmf_other_scripts = \
diadia/diadia.lua \
dosepsbin/dosepsbin.pl \
dviasm/dviasm.py \
+ dviinfox/dviinfox.pl \
ebong/ebong.py \
epspdf/epspdf.tlu \
epspdf/epspdftk.tcl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 8e0d2d71767..dc62ae9562a 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -323,6 +323,7 @@ texmf_other_scripts = \
diadia/diadia.lua \
dosepsbin/dosepsbin.pl \
dviasm/dviasm.py \
+ dviinfox/dviinfox.pl \
ebong/ebong.py \
epspdf/epspdf.tlu \
epspdf/epspdftk.tcl \
diff --git a/Build/source/texk/texlive/linked_scripts/dviinfox/dviinfox.pl b/Build/source/texk/texlive/linked_scripts/dviinfox/dviinfox.pl
new file mode 100755
index 00000000000..39330951047
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/dviinfox/dviinfox.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/env perl
+
+# dviinfox
+# ========
+#
+# This script is a joint effort of
+# Dag Langmyhr, Department of Informatics, University of Oslo
+# (dag at ifi.uio.no)
+# and
+# Hironobu Yamashita, Japanese TeX Development Community
+# (h.y.acetaminophen at gmail.com)
+#
+# A program to print information about a DVI file.
+#
+# Usage: dviinfox [options] file1 file2 ...
+# where the flags indicate which information is desired.
+# -f Give information about the fonts used.
+# -p Give information about the number of pages.
+# -v List the program version number.
+# -h Show help message.
+# No options will provide all information available.
+#
+# Example:
+# % dviinfox alltt.dvi
+# alltt.dvi: DVI format 2; 3 pages
+# Magnification: 1000/1000
+# Size unit: 1000x25400000/(1000x473628672)dum = 0.054dum = 1.000sp
+# Page size: 407ptx682pt = 14.340cmx23.970cm
+# Stack size: 8
+# Comment: " TeX output 1995.07.07:1513"
+# Font 27: cmr9 at 9.000 (design size 9.000, checksum=1874103239)
+# Font 26: cmsy6 at 6.000 (design size 6.000, checksum=1906386187)
+# Font 21: cmr8 at 8.000 (design size 8.000, checksum=2088458503)
+# Font 20: cmsy10 at 12.000 (design size 10.000, checksum=555887770)
+# Font 16: cmr12 at 12.000 (design size 12.000, checksum=1487622411)
+# Font 15: cmtt12 at 17.280 (design size 12.000, checksum=3750147412)
+# Font 14: cmr17 at 17.280 (design size 17.280, checksum=1154739572)
+# Font 13: cmsy10 at 10.000 (design size 10.000, checksum=555887770)
+# Font 7: cmr10 at 10.000 (design size 10.000, checksum=1274110073)
+# Font 6: cmr7 at 7.000 (design size 7.000, checksum=3650330706)
+
+use strict;
+
+my $Prog = "dviinfox";
+my $Version = "1.04";
+my $Author = "Dag Langmyhr and Hironobu Yamashita";
+
+my $True = 1;
+my $False = 0;
+
+my $List_all = $True;
+my $List_fonts = $False;
+my $List_pages = $False;
+
+# DVI commands:
+my $DVI_Filler = "\337"; # 223 = 0xdf
+my $DVI_Font = "\363"; # 243 = 0xf3
+my $DVI_Post = "\370"; # 248 = 0xf8
+my $DVI_Post_post = "\371"; # 249 = 0xf9
+my $DVI_Pre = "\367"; # 247 = 0xf7
+my $XDV_Font = "\374"; # 252 = 0xfc
+
+my $Unit;
+
+if (!@ARGV) {
+ show_usage();
+ print "Try \"$Prog -h\" for more information.\n";
+}
+
+Param:
+foreach (@ARGV) {
+ /^-f$/ && do {
+ $List_fonts = $True; $List_all = $False; next Param; };
+ /^-p$/ && do {
+ $List_pages = $True; $List_all = $False; next Param; };
+ /^-v$/ && do {
+ show_version(); next Param; };
+ /^-h$/ && do {
+ show_help(); next Param; };
+ /^-/ && do {
+ print STDERR "$Prog: Unknown option '$_' ignored.\n"; next Param; };
+
+ &Read_DVI_file($_);
+}
+
+exit 0;
+
+# Only sub definitions from here on
+
+sub show_version {
+ print "This is $Prog $Version, by $Author\n";
+}
+
+sub show_usage {
+ show_version();
+ print "Usage: $Prog [-f][-p][-v] file...\n";
+}
+
+sub show_help {
+ show_usage();
+ print "A program to print information about a DVI file.\n";
+ print "Options:\n";
+ print " -f Give information about the fonts used.\n";
+ print " -p Give information about the number of pages.\n";
+ print " -v List the program version number.\n";
+ print " -h Show help message.\n";
+ exit 0;
+}
+
+sub Read_DVI_file {
+ local($_) = @_;
+ my ($c, $cn);
+ my $IS_XDV = 0;
+
+ print "$_: ";
+
+ open(F, $_) || do { print STDERR "Could not open!\n\n"; exit 1; };
+
+ # First, read info at start of DVI file:
+
+ if (($c = getc(F)) ne $DVI_Pre) {
+ printf STDERR ("Not a DVI file (first byte is 0x%02x, not 0x%02x)!\n\n",
+ ord($c), ord($DVI_Pre));
+ close F; exit 1;
+ };
+
+ my $Format = ord(getc(F));
+ my $Numer = &Read4;
+ my $Denom = &Read4;
+ my $Magni = &Read4;
+ my $Comment = &Read_text;
+
+ # Then, read information at the end of the DVI file:
+
+ seek(F, -1, 2);
+ while (($c = getc(F)) eq $DVI_Filler) { seek(F, -2, 1); };
+ my $VersionID = ord($c);
+ # Previously we required equality ($VersionID == $Format). However,
+ # it seems ok even when format id (pre) and version id (post_post)
+ # are different. TeX4ht allows $VersionID <= 10, so we follow it
+ if (($VersionID != $Format) && ($VersionID > 10)) {
+ print STDERR "DVI format error (format: $Format vs id: $VersionID)!\n\n";
+ close F; exit 1;
+ };
+ $IS_XDV = 1 if ($Format > 2);
+
+ seek(F, -6, 1);
+ if (($c = getc(F)) ne $DVI_Post_post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST_POST command, not 0x%02x!\n\n", $cn);
+ close F; exit 1;
+ };
+
+ my $Last_post = &Read4;
+ seek(F, $Last_post, 0) || do {
+ print STDERR "Could not locate position $Last_post!\n\n";
+ close F; exit 1;
+ };
+ if (($c = getc(F)) ne $DVI_Post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST command, not 0x%02x!\n\n", $cn);
+ close F; exit 1;
+ };
+
+ my $Final_page = &Read4;
+ my $Numer2 = &Read4;
+ my $Denom2 = &Read4;
+ my $Magni2 = &Read4;
+ my $Height = &Read4;
+ my $Width = &Read4;
+ my $Stack = &Read2_u;
+ my $Pages = &Read2_u;
+
+ if ($List_all) {
+ print "DVI format $Format";
+ print "; id $VersionID" if ($VersionID != $Format);
+ print " (pTeX DVI)" if (($Format == 2) && ($VersionID == 3));
+ print " (XeTeX XDV)" if ($Format > 2);
+ print "; ";
+ }
+ if ($List_all || $List_pages) {
+ print "$Pages page";
+ print "s" if ($Pages > 1);
+ };
+
+ $Unit = $Magni*$Numer/(1000*$Denom);
+ if ($List_all) {
+ print "\n Magnification: $Magni/1000";
+ printf("\n Size unit: %dx$Numer/(1000x$Denom)dum = %5.3fdum = %5.3fsp",
+ $Magni, $Unit, &Scale_to_sp(1));
+ printf("\n Page size: %dptx%dpt = %5.3fcmx%5.3fcm",
+ &Scale_to_pt($Width), &Scale_to_pt($Height),
+ &Scale_to_cm($Width), &Scale_to_cm($Height));
+ print "\n Stack size: $Stack";
+ print "\n Comment: \"$Comment\"";
+ }
+ print "\n";
+
+ if ($List_all || $List_fonts) {
+ my ($F_count, $F_check, $F_scale, $F_design, $F_name);
+ my ($F_flag, $F_index, $F_colored, $F_extend, $F_slant, $F_embolden);
+ my $F_tempswa;
+ while (($c = getc(F)) eq $DVI_Font || $c eq $XDV_Font) {
+ # initialize
+ $F_count = 0;
+ $F_check = 0;
+ $F_scale = 0;
+ $F_design = 0;
+ $F_name = '';
+ $F_flag = 0;
+ $F_index = 0;
+ $F_colored = 0;
+ $F_extend = 0;
+ $F_slant = 0;
+ $F_embolden = 0;
+ if ($c eq $DVI_Font) {
+ # standard DVI: TFM font definition command
+ $F_count = ord(getc(F));
+ $F_check = &Read4_u;
+ $F_scale = &Read4;
+ $F_design = &Read4;
+ $F_name = &Read_text2;
+ printf(" Font %3d: %9s at %6.3f",
+ $F_count, $F_name, &Scale_to_pt($F_scale));
+ printf(" (design size %6.3f, ", &Scale_to_pt($F_design));
+ print "checksum=$F_check)\n";
+ } else { # $c eq $XDV_Font
+ # extended XDV for XeTeX: Native font definition command
+ if (!$IS_XDV) {
+ printf STDERR ("Erorr: Command %d used in non-XDV file!\n", ord($XDV_Font));
+ close F; exit 1;
+ }
+ $F_count = &Read4_u;
+ $F_scale = &Read4;
+ $F_flag = &Read2_u;
+ $F_name = &Read_text;
+ $F_index = &Read4_u;
+ $F_colored = &Read4_u if ($F_flag & 512);
+ $F_extend = &Read4_u if ($F_flag & 4096);
+ $F_slant = &Read4_u if ($F_flag & 8192);
+ $F_embolden = &Read4_u if ($F_flag & 16384);
+ printf(" Native Font %3d: %s at %6.3f",
+ $F_count, $F_name, &Scale_to_pt($F_scale));
+ printf(" (flags 0x%04x, face index %d)\n", $F_flag, $F_index);
+ if ($F_flag) {
+ print(" +features: ");
+ $F_tempswa = 0;
+ if ($F_colored) {
+ printf("Colored=0x%x", $F_colored);
+ $F_tempswa = 1;
+ }
+ if ($F_extend) {
+ print(", ") if ($F_tempswa);
+ printf("Extend=0x%x", $F_extend);
+ $F_tempswa = 1;
+ }
+ if ($F_slant) {
+ print(", ") if ($F_tempswa);
+ printf("Slant=0x%x", $F_slant);
+ $F_tempswa = 1;
+ }
+ if ($F_embolden) {
+ print(", ") if ($F_tempswa);
+ printf("Embolden=0x%x", $F_embolden);
+ $F_tempswa = 1;
+ }
+ print("\n");
+ }
+ }
+ };
+
+ if ($c ne $DVI_Post_post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST_POST command, not 0x%02x!\n", $cn);
+ close F; exit 1;
+ };
+
+ print "\n";
+ };
+
+ close F;
+}
+
+
+# Scale_to_pt (Size)
+# -----
+# Give the Size (which is in dum, the standard DVI size) in pt.
+sub Scale_to_pt {
+ return $Unit*$_[0]*72.27/254000;
+}
+
+
+# Scale_to_cm (Size)
+# -----------
+# Give the Size (which is in dum, the standard DVI size) in cm.
+sub Scale_to_cm {
+ return &Scale_to_pt($_[0])*2.54/72.27;
+}
+
+
+# Scale_to_sp (Size)
+# -----------
+# Give the Size (which is in dum, the standard DVI size) in sp.
+sub Scale_to_sp {
+ return &Scale_to_pt($_[0])*65536;
+}
+
+
+# Read2_u
+# -------
+# Read an unsigned two-byte value.
+sub Read2_u {
+ return ord(getc(F))*256 + ord(getc(F));
+}
+
+
+# Read4
+# -----
+# Read a four-byte value.
+# (I assume the value is positive and less than 2^31, so the sign bit
+# won't matter.)
+sub Read4 {
+ return ((ord(getc(F))*256+ord(getc(F)))*256+ord(getc(F)))*256+ord(getc(F));
+}
+
+
+# Read4_u
+# -----
+# Read an unsigned four-byte value.
+# (I don't know why this works for values >=2^31, and Read4 does not,
+# but as long as it works...)
+sub Read4_u {
+ my (@bytes, @sum);
+
+ $bytes[0] = ord(getc(F)); $bytes[1] = ord(getc(F));
+ $bytes[2] = ord(getc(F)); $bytes[3] = ord(getc(F));
+
+ $sum[0] = $bytes[0]*256 + $bytes[1];
+ $sum[1] = $bytes[2]*256 + $bytes[3];
+
+ return $sum[0]*65536 + $sum[1];
+}
+
+
+# Read_text
+# ---------
+# Read a text (a one-byte length and the the text byte).
+sub Read_text {
+ local($_);
+ my ($Leng, $Res);
+
+ $Leng = ord(getc(F)); read(F, $Res, $Leng);
+ return $Res;
+}
+
+
+# Read_text2
+# ----------
+# Like 'Read_text', but the length is the sum of two bytes.
+sub Read_text2 {
+ local($_);
+ my ($Leng, $Res);
+
+ $Leng = ord(getc(F)) + ord(getc(F)); read(F, $Res, $Leng);
+ return $Res;
+}
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 5ba124a3981..f8cd4218449 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -53,6 +53,7 @@ de-macro/de-macro
diadia/diadia.lua
dosepsbin/dosepsbin.pl
dviasm/dviasm.py
+dviinfox/dviinfox.pl
ebong/ebong.py
epspdf/epspdf.tlu
epspdf/epspdftk.tcl
diff --git a/Master/bin/amd64-freebsd/dviinfox b/Master/bin/amd64-freebsd/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/amd64-freebsd/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/dviinfox b/Master/bin/amd64-netbsd/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/amd64-netbsd/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/armel-linux/dviinfox b/Master/bin/armel-linux/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/armel-linux/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/armhf-linux/dviinfox b/Master/bin/armhf-linux/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/armhf-linux/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/dviinfox b/Master/bin/i386-cygwin/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-cygwin/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-darwin/dviinfox b/Master/bin/i386-darwin/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-darwin/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/dviinfox b/Master/bin/i386-freebsd/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-freebsd/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-linux/dviinfox b/Master/bin/i386-linux/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-linux/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/dviinfox b/Master/bin/i386-netbsd/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-netbsd/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/i386-solaris/dviinfox b/Master/bin/i386-solaris/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/i386-solaris/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/powerpc-darwin/dviinfox b/Master/bin/powerpc-darwin/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/powerpc-darwin/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/dviinfox b/Master/bin/powerpc-linux/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/powerpc-linux/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/dviinfox b/Master/bin/sparc-solaris/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/sparc-solaris/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/win32/dviinfox.exe b/Master/bin/win32/dviinfox.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/dviinfox.exe
Binary files differ
diff --git a/Master/bin/x86_64-cygwin/dviinfox b/Master/bin/x86_64-cygwin/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/x86_64-cygwin/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/dviinfox b/Master/bin/x86_64-darwin/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/x86_64-darwin/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/dviinfox b/Master/bin/x86_64-darwinlegacy/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/x86_64-darwinlegacy/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/dviinfox b/Master/bin/x86_64-linux/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/x86_64-linux/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/dviinfox b/Master/bin/x86_64-solaris/dviinfox
new file mode 120000
index 00000000000..608924dd178
--- /dev/null
+++ b/Master/bin/x86_64-solaris/dviinfox
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviinfox/dviinfox.pl \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/dviinfox/LICENSE b/Master/texmf-dist/doc/latex/dviinfox/LICENSE
new file mode 100644
index 00000000000..75d6eed9e76
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dviinfox/LICENSE
@@ -0,0 +1,24 @@
+The script "dviinfox.pl" is distributed under the MIT License.
+
+The MIT License
+
+Copyright (c) 2013-2017 Dag Langmyhr
+Copyright (c) 2017- Hironobu Yamashita
+
+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 THE
+AUTHORS OR COPYRIGHT HOLDERS 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.
diff --git a/Master/texmf-dist/doc/latex/dviinfox/README.md b/Master/texmf-dist/doc/latex/dviinfox/README.md
new file mode 100644
index 00000000000..e0e8870ceef
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dviinfox/README.md
@@ -0,0 +1,81 @@
+# dviinfox.pl
+
+Perl script which prints information about a DVI file.
+It supports not only the standard DVI format of TeX, but also
+the extended DVI format of pTeX containing vertical direction.
+It also accepts XDV format of XeTeX containing native font
+definitions.
+
+This is a joint effort of
+Dag Langmyhr (Department of Informatics, University of Oslo)
+and Hironobu Yamashita (Japanese TeX Development Community).
+
+## Sample Output
+
+Standard DVI (e.g. tests/font.dvi)
+
+ font.dvi: DVI format 2; 4 pages
+ Magnification: 1000/1000
+ Size unit: 1000x25400000/(1000x473628672)dum = 0.054dum = 1.000sp
+ Page size: 433ptx627pt = 15.253cmx22.049cm
+ Stack size: 11
+ Comment: " TeX output 2017.06.03:0419"
+ Font 20: cmsl10 at 10.000 (design size 10.000, checksum=1890463818)
+ Font 19: cmtt10 at 10.000 (design size 10.000, checksum=3756670072)
+ Font 18: cmbx12 at 14.400 (design size 12.000, checksum=3268824736)
+ Font 16: cmbx12 at 24.880 (design size 12.000, checksum=3268824736)
+ (snip)
+ Font 6: cmr7 at 7.000 (design size 7.000, checksum=3650330706)
+ Font 0: cmex10 at 10.000 (design size 10.000, checksum=4205933842)
+
+pTeX DVI (e.g. tests/playtate.dvi)
+
+ playtate.dvi: DVI format 2; id 3 (pTeX DVI); 20 pages
+ Magnification: 1000/1000
+ Size unit: 1000x25400000/(1000x473628672)dum = 0.054dum = 1.000sp
+ Page size: 450ptx697pt = 15.842cmx24.509cm
+ Stack size: 2
+ Comment: " TeX output 2017.06.03:0357"
+ Font 75: tmin10 at 48.000 (design size 10.000, checksum=3919565046)
+ Font 74: cmr10 at 48.000 (design size 10.000, checksum=1274110073)
+
+XeTeX XDV (e.g. tests/native.xdv)
+
+ native.xdv: DVI format 7 (XeTeX XDV); 1 page
+ Magnification: 1000/1000
+ Size unit: 1000x25400000/(1000x473628672)dum = 0.054dum = 1.000sp
+ Page size: 406ptx633pt = 14.304cmx22.247cm
+ Stack size: 3
+ Comment: " XeTeX output 2017.06.03:0407"
+ Native Font 36: c:/w32tex/share/texmf-dist/fonts/opentype/public/tex-gyre/texgyretermes-regular.otf at 10.000 (flags 0x6200, face index 0)
+ +features: Colored=0x115511ff, Slant=0x10000, Embolden=0x7ae
+ Native Font 35: c:/w32tex/share/texmf-dist/fonts/opentype/public/tex-gyre/texgyretermes-regular.otf at 10.000 (flags 0x6200, face index 0)
+ +features: Colored=0x220022ff, Slant=0x10000, Embolden=0x7ae
+ (snip)
+ Native Font 21: c:/w32tex/share/texmf-dist/fonts/opentype/public/tex-gyre/texgyretermes-regular.otf at 10.000 (flags 0x0200, face index 0)
+ +features: Colored=0x220022ff
+ Native Font 14: c:/w32tex/share/texmf-dist/fonts/opentype/public/lm/lmroman10-regular.otf at 10.000 (flags 0x0000, face index 0)
+
+## License
+
+The script is licensed under MIT License.
+
+## References
+
+- Current development place by Hironobu Yamashita
+ - https://github.com/aminophen/tex-assort
+- Previous version 1.03 (2013/11/03 11:17) by Dag Langmyhr
+ - http://dag.at.ifi.uio.no/public/bin/dviinfo
+
+## Additional Notes
+
+The perl script was originally named "dviinfo" by Dag Langmyhr,
+and renamed "dviinfox" in 2017, to be easily distinguished from
+another program written in C by Valentino Kyriakides
+(Dviinfo revision 1.3 1993/11/23 22:49:30).
+The C program seems to be derived from NeXTSTEP app in 1990s,
+and it has nothing to do with our perl script.
+
+## Release Date
+
+2017-06-04
diff --git a/Master/texmf-dist/scripts/dviinfox/dviinfox.pl b/Master/texmf-dist/scripts/dviinfox/dviinfox.pl
new file mode 100755
index 00000000000..39330951047
--- /dev/null
+++ b/Master/texmf-dist/scripts/dviinfox/dviinfox.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/env perl
+
+# dviinfox
+# ========
+#
+# This script is a joint effort of
+# Dag Langmyhr, Department of Informatics, University of Oslo
+# (dag at ifi.uio.no)
+# and
+# Hironobu Yamashita, Japanese TeX Development Community
+# (h.y.acetaminophen at gmail.com)
+#
+# A program to print information about a DVI file.
+#
+# Usage: dviinfox [options] file1 file2 ...
+# where the flags indicate which information is desired.
+# -f Give information about the fonts used.
+# -p Give information about the number of pages.
+# -v List the program version number.
+# -h Show help message.
+# No options will provide all information available.
+#
+# Example:
+# % dviinfox alltt.dvi
+# alltt.dvi: DVI format 2; 3 pages
+# Magnification: 1000/1000
+# Size unit: 1000x25400000/(1000x473628672)dum = 0.054dum = 1.000sp
+# Page size: 407ptx682pt = 14.340cmx23.970cm
+# Stack size: 8
+# Comment: " TeX output 1995.07.07:1513"
+# Font 27: cmr9 at 9.000 (design size 9.000, checksum=1874103239)
+# Font 26: cmsy6 at 6.000 (design size 6.000, checksum=1906386187)
+# Font 21: cmr8 at 8.000 (design size 8.000, checksum=2088458503)
+# Font 20: cmsy10 at 12.000 (design size 10.000, checksum=555887770)
+# Font 16: cmr12 at 12.000 (design size 12.000, checksum=1487622411)
+# Font 15: cmtt12 at 17.280 (design size 12.000, checksum=3750147412)
+# Font 14: cmr17 at 17.280 (design size 17.280, checksum=1154739572)
+# Font 13: cmsy10 at 10.000 (design size 10.000, checksum=555887770)
+# Font 7: cmr10 at 10.000 (design size 10.000, checksum=1274110073)
+# Font 6: cmr7 at 7.000 (design size 7.000, checksum=3650330706)
+
+use strict;
+
+my $Prog = "dviinfox";
+my $Version = "1.04";
+my $Author = "Dag Langmyhr and Hironobu Yamashita";
+
+my $True = 1;
+my $False = 0;
+
+my $List_all = $True;
+my $List_fonts = $False;
+my $List_pages = $False;
+
+# DVI commands:
+my $DVI_Filler = "\337"; # 223 = 0xdf
+my $DVI_Font = "\363"; # 243 = 0xf3
+my $DVI_Post = "\370"; # 248 = 0xf8
+my $DVI_Post_post = "\371"; # 249 = 0xf9
+my $DVI_Pre = "\367"; # 247 = 0xf7
+my $XDV_Font = "\374"; # 252 = 0xfc
+
+my $Unit;
+
+if (!@ARGV) {
+ show_usage();
+ print "Try \"$Prog -h\" for more information.\n";
+}
+
+Param:
+foreach (@ARGV) {
+ /^-f$/ && do {
+ $List_fonts = $True; $List_all = $False; next Param; };
+ /^-p$/ && do {
+ $List_pages = $True; $List_all = $False; next Param; };
+ /^-v$/ && do {
+ show_version(); next Param; };
+ /^-h$/ && do {
+ show_help(); next Param; };
+ /^-/ && do {
+ print STDERR "$Prog: Unknown option '$_' ignored.\n"; next Param; };
+
+ &Read_DVI_file($_);
+}
+
+exit 0;
+
+# Only sub definitions from here on
+
+sub show_version {
+ print "This is $Prog $Version, by $Author\n";
+}
+
+sub show_usage {
+ show_version();
+ print "Usage: $Prog [-f][-p][-v] file...\n";
+}
+
+sub show_help {
+ show_usage();
+ print "A program to print information about a DVI file.\n";
+ print "Options:\n";
+ print " -f Give information about the fonts used.\n";
+ print " -p Give information about the number of pages.\n";
+ print " -v List the program version number.\n";
+ print " -h Show help message.\n";
+ exit 0;
+}
+
+sub Read_DVI_file {
+ local($_) = @_;
+ my ($c, $cn);
+ my $IS_XDV = 0;
+
+ print "$_: ";
+
+ open(F, $_) || do { print STDERR "Could not open!\n\n"; exit 1; };
+
+ # First, read info at start of DVI file:
+
+ if (($c = getc(F)) ne $DVI_Pre) {
+ printf STDERR ("Not a DVI file (first byte is 0x%02x, not 0x%02x)!\n\n",
+ ord($c), ord($DVI_Pre));
+ close F; exit 1;
+ };
+
+ my $Format = ord(getc(F));
+ my $Numer = &Read4;
+ my $Denom = &Read4;
+ my $Magni = &Read4;
+ my $Comment = &Read_text;
+
+ # Then, read information at the end of the DVI file:
+
+ seek(F, -1, 2);
+ while (($c = getc(F)) eq $DVI_Filler) { seek(F, -2, 1); };
+ my $VersionID = ord($c);
+ # Previously we required equality ($VersionID == $Format). However,
+ # it seems ok even when format id (pre) and version id (post_post)
+ # are different. TeX4ht allows $VersionID <= 10, so we follow it
+ if (($VersionID != $Format) && ($VersionID > 10)) {
+ print STDERR "DVI format error (format: $Format vs id: $VersionID)!\n\n";
+ close F; exit 1;
+ };
+ $IS_XDV = 1 if ($Format > 2);
+
+ seek(F, -6, 1);
+ if (($c = getc(F)) ne $DVI_Post_post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST_POST command, not 0x%02x!\n\n", $cn);
+ close F; exit 1;
+ };
+
+ my $Last_post = &Read4;
+ seek(F, $Last_post, 0) || do {
+ print STDERR "Could not locate position $Last_post!\n\n";
+ close F; exit 1;
+ };
+ if (($c = getc(F)) ne $DVI_Post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST command, not 0x%02x!\n\n", $cn);
+ close F; exit 1;
+ };
+
+ my $Final_page = &Read4;
+ my $Numer2 = &Read4;
+ my $Denom2 = &Read4;
+ my $Magni2 = &Read4;
+ my $Height = &Read4;
+ my $Width = &Read4;
+ my $Stack = &Read2_u;
+ my $Pages = &Read2_u;
+
+ if ($List_all) {
+ print "DVI format $Format";
+ print "; id $VersionID" if ($VersionID != $Format);
+ print " (pTeX DVI)" if (($Format == 2) && ($VersionID == 3));
+ print " (XeTeX XDV)" if ($Format > 2);
+ print "; ";
+ }
+ if ($List_all || $List_pages) {
+ print "$Pages page";
+ print "s" if ($Pages > 1);
+ };
+
+ $Unit = $Magni*$Numer/(1000*$Denom);
+ if ($List_all) {
+ print "\n Magnification: $Magni/1000";
+ printf("\n Size unit: %dx$Numer/(1000x$Denom)dum = %5.3fdum = %5.3fsp",
+ $Magni, $Unit, &Scale_to_sp(1));
+ printf("\n Page size: %dptx%dpt = %5.3fcmx%5.3fcm",
+ &Scale_to_pt($Width), &Scale_to_pt($Height),
+ &Scale_to_cm($Width), &Scale_to_cm($Height));
+ print "\n Stack size: $Stack";
+ print "\n Comment: \"$Comment\"";
+ }
+ print "\n";
+
+ if ($List_all || $List_fonts) {
+ my ($F_count, $F_check, $F_scale, $F_design, $F_name);
+ my ($F_flag, $F_index, $F_colored, $F_extend, $F_slant, $F_embolden);
+ my $F_tempswa;
+ while (($c = getc(F)) eq $DVI_Font || $c eq $XDV_Font) {
+ # initialize
+ $F_count = 0;
+ $F_check = 0;
+ $F_scale = 0;
+ $F_design = 0;
+ $F_name = '';
+ $F_flag = 0;
+ $F_index = 0;
+ $F_colored = 0;
+ $F_extend = 0;
+ $F_slant = 0;
+ $F_embolden = 0;
+ if ($c eq $DVI_Font) {
+ # standard DVI: TFM font definition command
+ $F_count = ord(getc(F));
+ $F_check = &Read4_u;
+ $F_scale = &Read4;
+ $F_design = &Read4;
+ $F_name = &Read_text2;
+ printf(" Font %3d: %9s at %6.3f",
+ $F_count, $F_name, &Scale_to_pt($F_scale));
+ printf(" (design size %6.3f, ", &Scale_to_pt($F_design));
+ print "checksum=$F_check)\n";
+ } else { # $c eq $XDV_Font
+ # extended XDV for XeTeX: Native font definition command
+ if (!$IS_XDV) {
+ printf STDERR ("Erorr: Command %d used in non-XDV file!\n", ord($XDV_Font));
+ close F; exit 1;
+ }
+ $F_count = &Read4_u;
+ $F_scale = &Read4;
+ $F_flag = &Read2_u;
+ $F_name = &Read_text;
+ $F_index = &Read4_u;
+ $F_colored = &Read4_u if ($F_flag & 512);
+ $F_extend = &Read4_u if ($F_flag & 4096);
+ $F_slant = &Read4_u if ($F_flag & 8192);
+ $F_embolden = &Read4_u if ($F_flag & 16384);
+ printf(" Native Font %3d: %s at %6.3f",
+ $F_count, $F_name, &Scale_to_pt($F_scale));
+ printf(" (flags 0x%04x, face index %d)\n", $F_flag, $F_index);
+ if ($F_flag) {
+ print(" +features: ");
+ $F_tempswa = 0;
+ if ($F_colored) {
+ printf("Colored=0x%x", $F_colored);
+ $F_tempswa = 1;
+ }
+ if ($F_extend) {
+ print(", ") if ($F_tempswa);
+ printf("Extend=0x%x", $F_extend);
+ $F_tempswa = 1;
+ }
+ if ($F_slant) {
+ print(", ") if ($F_tempswa);
+ printf("Slant=0x%x", $F_slant);
+ $F_tempswa = 1;
+ }
+ if ($F_embolden) {
+ print(", ") if ($F_tempswa);
+ printf("Embolden=0x%x", $F_embolden);
+ $F_tempswa = 1;
+ }
+ print("\n");
+ }
+ }
+ };
+
+ if ($c ne $DVI_Post_post) {
+ $cn = ord($c);
+ printf STDERR ("DVI error: Expected POST_POST command, not 0x%02x!\n", $cn);
+ close F; exit 1;
+ };
+
+ print "\n";
+ };
+
+ close F;
+}
+
+
+# Scale_to_pt (Size)
+# -----
+# Give the Size (which is in dum, the standard DVI size) in pt.
+sub Scale_to_pt {
+ return $Unit*$_[0]*72.27/254000;
+}
+
+
+# Scale_to_cm (Size)
+# -----------
+# Give the Size (which is in dum, the standard DVI size) in cm.
+sub Scale_to_cm {
+ return &Scale_to_pt($_[0])*2.54/72.27;
+}
+
+
+# Scale_to_sp (Size)
+# -----------
+# Give the Size (which is in dum, the standard DVI size) in sp.
+sub Scale_to_sp {
+ return &Scale_to_pt($_[0])*65536;
+}
+
+
+# Read2_u
+# -------
+# Read an unsigned two-byte value.
+sub Read2_u {
+ return ord(getc(F))*256 + ord(getc(F));
+}
+
+
+# Read4
+# -----
+# Read a four-byte value.
+# (I assume the value is positive and less than 2^31, so the sign bit
+# won't matter.)
+sub Read4 {
+ return ((ord(getc(F))*256+ord(getc(F)))*256+ord(getc(F)))*256+ord(getc(F));
+}
+
+
+# Read4_u
+# -----
+# Read an unsigned four-byte value.
+# (I don't know why this works for values >=2^31, and Read4 does not,
+# but as long as it works...)
+sub Read4_u {
+ my (@bytes, @sum);
+
+ $bytes[0] = ord(getc(F)); $bytes[1] = ord(getc(F));
+ $bytes[2] = ord(getc(F)); $bytes[3] = ord(getc(F));
+
+ $sum[0] = $bytes[0]*256 + $bytes[1];
+ $sum[1] = $bytes[2]*256 + $bytes[3];
+
+ return $sum[0]*65536 + $sum[1];
+}
+
+
+# Read_text
+# ---------
+# Read a text (a one-byte length and the the text byte).
+sub Read_text {
+ local($_);
+ my ($Leng, $Res);
+
+ $Leng = ord(getc(F)); read(F, $Res, $Leng);
+ return $Res;
+}
+
+
+# Read_text2
+# ----------
+# Like 'Read_text', but the length is the sum of two bytes.
+sub Read_text2 {
+ local($_);
+ my ($Leng, $Res);
+
+ $Leng = ord(getc(F)) + ord(getc(F)); read(F, $Res, $Leng);
+ return $Res;
+}
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 62bbde15b1c..d5394b63b56 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -222,7 +222,7 @@ my @TLP_working = qw(
drm droid droit-fr drs drv dsptricks
dtk dtxdescribe dtxgallery dtxgen
dtxtut duerer duerer-latex duotenzor dutchcal
- dvdcoll dvgloss dviasm dviincl
+ dvdcoll dvgloss dviasm dviincl dviinfox
dvipsconfig dynamicnumber dynblocks dyntree
e-french ean ean13isbn easy easy-todo easyfig easyformat easylist easyreview
ebezier ebgaramond ebgaramond-maths ebong ebook ebproof ebsthesis
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0654343f00d..001df07151a 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2792,6 +2792,7 @@ $standardttf = '\.ttf|\.TTC';
'dosepsbin' => 'dosepsbin\.pl$',
'dtxgen' => 'dtxgen$',
'dviasm' => '\.py$',
+ 'dviinfox' => '\.pl$',
'ebong' => '\.py$',
'epstopdf' => 'epstopdf\.pl', # doscripts() does r*
'exceltex' => 'exceltex$',
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index f4d2d4bcb3b..66c8b0a292b 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -28,6 +28,7 @@ depend dvi2tty
depend dviasm
depend dvicopy
depend dvidvi
+depend dviinfox
depend dviljk
depend dvipng
depend dvipos
diff --git a/Master/tlpkg/tlpsrc/dviinfox.tlpsrc b/Master/tlpkg/tlpsrc/dviinfox.tlpsrc
new file mode 100644
index 00000000000..dca338c719c
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/dviinfox.tlpsrc
@@ -0,0 +1 @@
+binpattern f bin/${ARCH}/${PKGNAME}