CTAN sync 202308250300

5 files changed, 13 insertions, 9 deletions

diff --git a/dviware/dviasm/README b/dviware/dviasm/README
index 94440ada62..c9f2482d4d 100644
--- a/dviware/dviasm/README
+++ b/dviware/dviasm/README
@@ -12,7 +12,7 @@ https://github.com/aminophen/dviasm
 
 It is fully documented at
 
-http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf (TUGboat)
+https://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf (TUGboat)
 http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf (Asian Journal of TeX)
 
 Previous maintainer of DVIasm: Khaled Hosny
diff --git a/dviware/dviasm/dviasm.1 b/dviware/dviasm/dviasm.1
index e5f67116cc..3e2f2af301 100644
--- a/dviware/dviasm/dviasm.1
+++ b/dviware/dviasm/dviasm.1
@@ -105,7 +105,7 @@ This option would be useful for example when using CJK package.
 Documentation of
 .B DVIasm
 by the original author Jin-Hwan Cho is published as:
-     http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf (TUGboat)
+     https://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf (TUGboat)
      http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf (Asian Journal of TeX)
 .SH AUTHORS
 The first version was written in Python 2 by Jin-Hwan Cho in 2007.
diff --git a/dviware/dviasm/dviasm.py b/dviware/dviasm/dviasm.py
index 4a60f874d5..046306035a 100755
--- a/dviware/dviasm/dviasm.py
+++ b/dviware/dviasm/dviasm.py
@@ -6,7 +6,7 @@
 # Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr>
 # Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org>
 # Copyright (C) 2019      by Arthur Reutenauer <arthur@reutenauer.eu>
-# Copyright (C) 2019-2022 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# Copyright (C) 2019-2023 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys, os.path
 from optparse import OptionParser
@@ -315,8 +315,7 @@ class DVI(object):
     id = GetByte(fp)
     if not ValidID(id):
       warning("ID byte is %d; use the default %d!" % (id, DVI_ID))
-    else:
-      self.id = id
+    self.id = id
     numerator = SignedQuad(fp)
     if numerator <= 0:
       warning('numerator is %d; use the default 25400000!' % numerator)
@@ -1169,13 +1168,13 @@ def ProcessOptions():
 DVIasm is a Python script to support changing or creating DVI files
 via disassembling into text, editing, and then reassembling into
 binary format. It is fully documented at
-  http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf
+  https://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf
   http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf
 
 Please report bugs to
   https://github.com/aminophen/dviasm"""
 
-  version = """This is %prog-20220918
+  version = """This is %prog-20230823
 
 Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr>
 Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org>
diff --git a/dviware/dvidvi/ChangeLog b/dviware/dvidvi/ChangeLog
index 2945e0bbe5..9220e76d58 100644
--- a/dviware/dvidvi/ChangeLog
+++ b/dviware/dvidvi/ChangeLog
@@ -1,3 +1,7 @@
+2023-08-23  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* dvidvi.test: Tweak.
+
 2023-08-11  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* dvidvi.c:
diff --git a/dviware/dvidvi/dvidvi.test b/dviware/dvidvi/dvidvi.test
index 9719ef72d4..cc5f86edb0 100755
--- a/dviware/dvidvi/dvidvi.test
+++ b/dviware/dvidvi/dvidvi.test
@@ -1,5 +1,5 @@
 #! /bin/sh -vx
-# $Id: dvidvi.test 67877 2023-08-11 11:46:10Z takuji $
+# $Id: dvidvi.test 68031 2023-08-23 14:53:12Z takuji $
 # Copyright 2017-2021 Karl Berry <tex-live@tug.org>
 # Copyright 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
@@ -16,6 +16,7 @@ DIFF="diff"
 $DIFF --strip-trailing-cr $0 $0 \
   && DIFF="diff --strip-trailing-cr" || echo
 
+TEXMFCNF=$srcdir/../kpathsea; export TEXMFCNF
 
 rm -rf play*
 cp $srcdir/tests/play.dvi .