summaryrefslogtreecommitdiff
path: root/dviware
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-10-01 03:01:44 +0000
committerNorbert Preining <norbert@preining.info>2022-10-01 03:01:44 +0000
commit4043e29dc8ac56047ac45f872a2ea1f3031b6b05 (patch)
tree67861530dae5db1d12363ecb312f40b59c413d8a /dviware
parentd3a49f9b97d78b3719e84b2e704c59f0491190d5 (diff)
CTAN sync 202210010301
Diffstat (limited to 'dviware')
-rw-r--r--dviware/dvisirule/Makefile2
-rw-r--r--dviware/dvisirule/README.md20
-rw-r--r--dviware/dvisirule/cmd.mk16
-rw-r--r--dviware/dvisirule/dvisirule-expg.mk2
-rw-r--r--dviware/dvisirule/dvisirule-marker.awk3
-rw-r--r--dviware/dvisirule/dvisirule.dtx2
-rw-r--r--dviware/dvisirule/dvisirule.pdfbin60243 -> 60244 bytes
-rw-r--r--dviware/dvisirule/src/Makefile6
-rw-r--r--dviware/dvisirule/src/config.h6
-rwxr-xr-xdviware/dvisirule/src/configure20
-rw-r--r--dviware/dvisirule/src/configure.ac2
-rw-r--r--dviware/dvisirule/src/dvisirule-bin.c31
12 files changed, 72 insertions, 38 deletions
diff --git a/dviware/dvisirule/Makefile b/dviware/dvisirule/Makefile
index 484b2c412e..e8dd553eb5 100644
--- a/dviware/dvisirule/Makefile
+++ b/dviware/dvisirule/Makefile
@@ -77,7 +77,7 @@ ${FigPdf}: ${Dir}/%.pdf: ${CURDIR}/%.tex ${Runtime}
${Dir}/${Name} ${bname}.dvi ${bname}-si.dvi && \
${DVIPDFMX} ${bname}-si.dvi && \
${PDFCROP} ${bname}-si.pdf $@
- ebb $@
+ ebb -O $@ > ${Dir}/${bname}.bb
${FigTex}: demo.tex
sed -n -e '/definecolor/,/hskip0pt/p' $< |\
diff --git a/dviware/dvisirule/README.md b/dviware/dvisirule/README.md
index de818479e3..0198e97d08 100644
--- a/dviware/dvisirule/README.md
+++ b/dviware/dvisirule/README.md
@@ -108,3 +108,23 @@ $ mv a-si.dvi a.dvi
```
For more details, refer to `dvisirule.pdf` and other source files.
+
+
+## Supported TeX Distribution
+
+Basically I am a Linux / TeXLive user, and `dvisirule` is developed
+and tested on TeXLive 2019 (Don't blame me for my laziness. I know the
+version is old), and on Debian.
+So I guess `dvisirule` will work well on Linux / TeXLive.
+
+I have tried Linux / MiKTeX 22.8.28 too and `dvisirule` succeded with
+a simple installation test.
+I used `make -s DVISELECT=/brabra/dviselect DVICONCAT=/.../dviconcat`.
+But I am not sure MS-Windows users would success, particularly some
+executables including some scripts and a binary.
+Someone said that Perl script is the best solution to run on both of
+linux and windows. But I am not a Perl user (Ok, you can blame me for
+my laziness).
+
+If anyone contributes some scripts which are Windows-capable, I would
+gladly review and merge into this pkg.
diff --git a/dviware/dvisirule/cmd.mk b/dviware/dvisirule/cmd.mk
index 6624f661cb..eba7025525 100644
--- a/dviware/dvisirule/cmd.mk
+++ b/dviware/dvisirule/cmd.mk
@@ -1,13 +1,27 @@
Lo =
LATEX ?= latex
+
+texver = $(shell ${LATEX} --version | head -1)
+tl = $(findstring TeX Live, ${texver})
+mik = $(findstring MiKTeX, ${texver})
+ifeq (${tl},TeX Live)
+#$(info texlive)
+LATEX += -no-mktex tfm
+else ifeq (${mik},MiKTeX)
+#$(info miktex)
+LATEX += -quiet
+else
+$(error Unknown latex system)
+endif
+
define Latex # texsrc
tmp=/tmp/$${$$}; \
rc=0; \
{ \
${LATEX} \
-halt-on-error -interaction=nonstopmode \
- -no-mktex tfm -file-line-error \
+ -file-line-error \
-output-directory ${Dir} \
${Lo}'\input' ${1} > $${tmp} ||\
{ rc=$${?}; tail -20 $${tmp}; }; \
diff --git a/dviware/dvisirule/dvisirule-expg.mk b/dviware/dvisirule/dvisirule-expg.mk
index e46d2c578f..5df8daf66a 100644
--- a/dviware/dvisirule/dvisirule-expg.mk
+++ b/dviware/dvisirule/dvisirule-expg.mk
@@ -20,7 +20,7 @@
# Those filenames have the absolute page-numbers.
%.sidvi: %.dvi
- "${DVITYPE}" -show-opcodes $< |\
+ "${DVITYPE}" $< |\
awk -f "${Marker}" |\
"${SIRULE}" $< $@
diff --git a/dviware/dvisirule/dvisirule-marker.awk b/dviware/dvisirule/dvisirule-marker.awk
index a759fd3b4e..c6db75dc75 100644
--- a/dviware/dvisirule/dvisirule-marker.awk
+++ b/dviware/dvisirule/dvisirule-marker.awk
@@ -64,9 +64,8 @@ in_superimpose && /sirule EOL/ {
in_superimpose--;
}
in_superimpose && /(put|set)rule/ {
- # {239} means "special xxx1" instruction
if (color[cur - 1] == "")
- color[cur - 1] = "0:{239}color push " FGdef;
+ color[cur - 1] = "0:color push " FGdef;
# there are several variants of the color model, but we don't care.
# handle any color model as a single string.
gsub(/ /, "_", color[cur - 1]);
diff --git a/dviware/dvisirule/dvisirule.dtx b/dviware/dvisirule/dvisirule.dtx
index e1bf1f155b..1747cb2cca 100644
--- a/dviware/dvisirule/dvisirule.dtx
+++ b/dviware/dvisirule/dvisirule.dtx
@@ -16,7 +16,7 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{dvisirule}%
-%<package>[2022/06/27 v1.1 dvisirule]
+%<package>[2022/09/12 v2.1 dvisirule]
%
%<*driver>
\documentclass[draft]{ltxdoc}
diff --git a/dviware/dvisirule/dvisirule.pdf b/dviware/dvisirule/dvisirule.pdf
index 93103e28f9..53714ab359 100644
--- a/dviware/dvisirule/dvisirule.pdf
+++ b/dviware/dvisirule/dvisirule.pdf
Binary files differ
diff --git a/dviware/dvisirule/src/Makefile b/dviware/dvisirule/src/Makefile
index 4ea6cd6283..97f5249a99 100644
--- a/dviware/dvisirule/src/Makefile
+++ b/dviware/dvisirule/src/Makefile
@@ -220,15 +220,15 @@ OBJEXT = o
PACKAGE = dvisirule
PACKAGE_BUGREPORT = jiro1010senju@gmail.com
PACKAGE_NAME = dvisirule
-PACKAGE_STRING = dvisirule v1.1
+PACKAGE_STRING = dvisirule v2.1
PACKAGE_TARNAME = dvisirule
PACKAGE_URL =
-PACKAGE_VERSION = v1.1
+PACKAGE_VERSION = v2.1
PATH_SEPARATOR = :
SET_MAKE =
SHELL = /bin/bash
STRIP =
-VERSION = v1.1
+VERSION = v2.1
abs_builddir = /proj/book/dvisirule.git/src
abs_srcdir = /proj/book/dvisirule.git/src
abs_top_builddir = /proj/book/dvisirule.git/src
diff --git a/dviware/dvisirule/src/config.h b/dviware/dvisirule/src/config.h
index 8d1527108b..fcd0c04761 100644
--- a/dviware/dvisirule/src/config.h
+++ b/dviware/dvisirule/src/config.h
@@ -76,7 +76,7 @@
#define PACKAGE_NAME "dvisirule"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dvisirule v1.1"
+#define PACKAGE_STRING "dvisirule v2.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "dvisirule"
@@ -85,13 +85,13 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "v1.1"
+#define PACKAGE_VERSION "v2.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "v1.1"
+#define VERSION "v2.1"
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
diff --git a/dviware/dvisirule/src/configure b/dviware/dvisirule/src/configure
index f0c2e8452d..b129bc8743 100755
--- a/dviware/dvisirule/src/configure
+++ b/dviware/dvisirule/src/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisirule v1.1.
+# Generated by GNU Autoconf 2.69 for dvisirule v2.1.
#
# Report bugs to <jiro1010senju@gmail.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisirule'
PACKAGE_TARNAME='dvisirule'
-PACKAGE_VERSION='v1.1'
-PACKAGE_STRING='dvisirule v1.1'
+PACKAGE_VERSION='v2.1'
+PACKAGE_STRING='dvisirule v2.1'
PACKAGE_BUGREPORT='jiro1010senju@gmail.com'
PACKAGE_URL=''
@@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dvisirule v1.1 to adapt to many kinds of systems.
+\`configure' configures dvisirule v2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvisirule v1.1:";;
+ short | recursive ) echo "Configuration of dvisirule v2.1:";;
esac
cat <<\_ACEOF
@@ -1436,7 +1436,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvisirule configure v1.1
+dvisirule configure v2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1913,7 +1913,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dvisirule $as_me v1.1, which was
+It was created by dvisirule $as_me v2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2782,7 +2782,7 @@ fi
# Define the identity of the package.
PACKAGE='dvisirule'
- VERSION='v1.1'
+ VERSION='v2.1'
cat >>confdefs.h <<_ACEOF
@@ -5320,7 +5320,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dvisirule $as_me v1.1, which was
+This file was extended by dvisirule $as_me v2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5386,7 +5386,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dvisirule config.status v1.1
+dvisirule config.status v2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/dviware/dvisirule/src/configure.ac b/dviware/dvisirule/src/configure.ac
index 8e61229304..399a941c57 100644
--- a/dviware/dvisirule/src/configure.ac
+++ b/dviware/dvisirule/src/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT(dvisirule, v1.1, jiro1010senju@gmail.com)
+AC_INIT(dvisirule, v2.1, jiro1010senju@gmail.com)
AC_CONFIG_SRCDIR([dvisirule-bin.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(config)
diff --git a/dviware/dvisirule/src/dvisirule-bin.c b/dviware/dvisirule/src/dvisirule-bin.c
index d5c06d419d..8c76cc907b 100644
--- a/dviware/dvisirule/src/dvisirule-bin.c
+++ b/dviware/dvisirule/src/dvisirule-bin.c
@@ -366,7 +366,7 @@ static void postamble(unsigned int last, unsigned int ofbop, unsigned int srcsz)
int main(int argc, char *argv[])
{
int e, n, h, v;
- unsigned int height, width, hpx, wpx, rule_op, last;
+ unsigned int height, width, hpx, wpx, last;
/* offsets */
unsigned int ofbop, ofcolor, ofrule, ofeop, ofline;
float gray;
@@ -399,30 +399,31 @@ int main(int argc, char *argv[])
if (*cmdp == 'h') {
/*
* depends on the TeX version or variant?
- * h=-31 v=176 <offset>:{239}color_push_gray_0
- * <offset>: putrule {137} height 26214, width 2290850
+ * h=-31 v=176 <offset>:color_push_gray_0
+ * <offset>: putrule height 26214, width 2290850
* (2x146 pixels)
*/
n = sscanf(cmdp, "h=%d v=%d "
- "%u:{239}color_push_%s "
- "%u: %s {%u} height %u, width %u "
+ "%u:color_push_%s "
+ "%u: %s height %u, width %u "
"(%ux%u pixels)",
&h, &v,
&ofcolor, colorpush,
- &ofrule, op, &rule_op,
+ &ofrule, op,
&height, &width,
&hpx, &wpx);
- if (n != 11)
+ if (n != 10) {
n = sscanf(cmdp, "h=%d v=%d "
- "%u:{239}pdf:bcolor [%f] "
- "%u: %s {%u} height %u, width %u "
+ "%u:pdf:bcolor [%f] "
+ "%u: %s height %u, width %u "
"(%ux%u pixels)",
&h, &v,
&ofcolor, &gray,
- &ofrule, op, &rule_op,
+ &ofrule, op,
&height, &width,
&hpx, &wpx);
- Errx(n != 11, "n %d, %s", n, cmdp);
+ Errx(n != 10, "n %d, %s", n, cmdp);
+ }
path = malloc(sizeof(*path));
Err(!path, "malloc");
@@ -442,15 +443,15 @@ int main(int argc, char *argv[])
Errx(n != 2, "n %d, %s", n, cmdp);
} else if (!strncmp(cmdp, "bol", 3)
|| !strncmp(cmdp, "eol", 3)) {
- /* bol <offset>: xxx ' {239}sirule BOL' */
- /* eol <offset>: xxx ' {239}sirule EOL' */
+ /* bol <offset>: xxx ' sirule BOL' */
+ /* eol <offset>: xxx ' sirule EOL' */
n = sscanf(cmdp, "%col %u: %s",
&c, &ofline, op);
Errx(n != 3, "n %d, %s", n, cmdp);
memset(src.p + ofline, NOP, src.p[ofline + 1] + 2);
} else {
- /* <offset>: eop {140} h=0 v=2206 */
- n = sscanf(cmdp, "%u: eop {140} h=%d v=%d",
+ /* <offset>: eop h=0 v=2206 */
+ n = sscanf(cmdp, "%u: eop h=%d v=%d",
&ofeop, &page.h, &page.v);
Errx(n != 3, "n %d, %s", n, cmdp);