mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
Fri Jul 6 03:15:37 UTC 2018
t/texlive-2018.180630-x86_64-1.txz: Upgraded. Thanks to Johannes Schoepfer. x/libXScrnSaver-1.2.3-x86_64-1.txz: Upgraded. x/libXinerama-1.1.4-x86_64-1.txz: Upgraded. x/libXxf86misc-1.0.4-x86_64-1.txz: Upgraded.
This commit is contained in:
Patrick J Volkerding
Eric Hameleers
parent
4295accb5f
commit
d880dd2b82
14 changed files with 1383 additions and 2000 deletions
|
|
@ -11,9 +11,24 @@
|
|||
<description>Tracking Slackware development in git.</description>
|
||||
<language>en-us</language>
|
||||
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
||||
<pubDate>Thu, 5 Jul 2018 18:32:28 GMT</pubDate>
|
||||
<lastBuildDate>Fri, 6 Jul 2018 07:00:31 GMT</lastBuildDate>
|
||||
<pubDate>Fri, 6 Jul 2018 03:15:37 GMT</pubDate>
|
||||
<lastBuildDate>Fri, 6 Jul 2018 19:00:32 GMT</lastBuildDate>
|
||||
<generator>maintain_current_git.sh v 1.10</generator>
|
||||
<item>
|
||||
<title>Fri, 6 Jul 2018 03:15:37 GMT</title>
|
||||
<pubDate>Fri, 6 Jul 2018 03:15:37 GMT</pubDate>
|
||||
<link>https://git.slackware.nl/current/tag/?h=20180706031537</link>
|
||||
<guid isPermaLink="false">20180706031537</guid>
|
||||
<description>
|
||||
<![CDATA[<pre>
|
||||
t/texlive-2018.180630-x86_64-1.txz: Upgraded.
|
||||
Thanks to Johannes Schoepfer.
|
||||
x/libXScrnSaver-1.2.3-x86_64-1.txz: Upgraded.
|
||||
x/libXinerama-1.1.4-x86_64-1.txz: Upgraded.
|
||||
x/libXxf86misc-1.0.4-x86_64-1.txz: Upgraded.
|
||||
</pre>]]>
|
||||
</description>
|
||||
</item>
|
||||
<item>
|
||||
<title>Thu, 5 Jul 2018 18:32:28 GMT</title>
|
||||
<pubDate>Thu, 5 Jul 2018 18:32:28 GMT</pubDate>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
Fri Jul 6 03:15:37 UTC 2018
|
||||
t/texlive-2018.180630-x86_64-1.txz: Upgraded.
|
||||
Thanks to Johannes Schoepfer.
|
||||
x/libXScrnSaver-1.2.3-x86_64-1.txz: Upgraded.
|
||||
x/libXinerama-1.1.4-x86_64-1.txz: Upgraded.
|
||||
x/libXxf86misc-1.0.4-x86_64-1.txz: Upgraded.
|
||||
+--------------------------+
|
||||
Thu Jul 5 18:32:28 UTC 2018
|
||||
ap/mariadb-10.3.8-x86_64-1.txz: Upgraded.
|
||||
d/mercurial-4.6.2-x86_64-1.txz: Upgraded.
|
||||
|
|
|
|||
98
FILELIST.TXT
98
FILELIST.TXT
|
|
@ -1,20 +1,20 @@
|
|||
Thu Jul 5 18:47:49 UTC 2018
|
||||
Fri Jul 6 03:26:01 UTC 2018
|
||||
|
||||
Here is the file list for this directory. If you are using a
|
||||
mirror site and find missing or extra files in the disk
|
||||
subdirectories, please have the archive administrator refresh
|
||||
the mirror.
|
||||
|
||||
drwxr-xr-x 12 root root 4096 2018-07-05 18:32 .
|
||||
drwxr-xr-x 12 root root 4096 2018-07-06 03:15 .
|
||||
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
|
||||
-rw-r--r-- 1 root root 13424 2018-06-13 05:25 ./CHANGES_AND_HINTS.TXT
|
||||
-rw-r--r-- 1 root root 896692 2018-07-03 21:46 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-03 21:46 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 896692 2018-07-05 18:48 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 18:48 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
|
||||
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
|
||||
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
|
||||
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
|
||||
-rw-r--r-- 1 root root 432396 2018-07-05 18:32 ./ChangeLog.txt
|
||||
-rw-r--r-- 1 root root 432671 2018-07-06 03:15 ./ChangeLog.txt
|
||||
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
|
||||
drwxr-xr-x 2 root root 4096 2018-06-27 04:12 ./EFI/BOOT
|
||||
-rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi
|
||||
|
|
@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-06-27 04:12 ./EFI/BOOT
|
|||
-rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh
|
||||
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
|
||||
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
|
||||
-rw-r--r-- 1 root root 1180429 2018-07-03 21:45 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1180429 2018-07-05 18:47 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
|
||||
-rw-r--r-- 1 root root 725906 2018-07-05 18:46 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 725906 2018-07-06 03:24 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
|
||||
-rw-r--r-- 1 root root 3634 2018-07-03 21:05 ./README.initrd
|
||||
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
|
||||
|
|
@ -748,11 +748,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
|
|||
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
|
||||
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
|
||||
drwxr-xr-x 18 root root 4096 2018-07-05 18:46 ./slackware64
|
||||
-rw-r--r-- 1 root root 288486 2018-07-05 18:46 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 18:46 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 359401 2018-07-05 18:43 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 3640122 2018-07-05 18:44 ./slackware64/MANIFEST.bz2
|
||||
drwxr-xr-x 18 root root 4096 2018-07-06 03:24 ./slackware64
|
||||
-rw-r--r-- 1 root root 288486 2018-07-06 03:24 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-06 03:24 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 359401 2018-07-06 03:22 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 3609421 2018-07-06 03:22 ./slackware64/MANIFEST.bz2
|
||||
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
|
||||
drwxr-xr-x 2 root root 20480 2018-07-03 21:41 ./slackware64/a
|
||||
-rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt
|
||||
|
|
@ -3796,7 +3796,7 @@ drwxr-xr-x 2 root root 32768 2018-07-03 21:41 ./slackware64/n
|
|||
-rw-r--r-- 1 root root 648 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txt
|
||||
-rw-r--r-- 1 root root 31872 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txz.asc
|
||||
drwxr-xr-x 2 root root 4096 2018-06-21 22:26 ./slackware64/t
|
||||
drwxr-xr-x 2 root root 4096 2018-07-06 03:21 ./slackware64/t
|
||||
-rw-r--r-- 1 root root 484 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 283032 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txz.asc
|
||||
|
|
@ -3805,9 +3805,9 @@ drwxr-xr-x 2 root root 4096 2018-06-21 22:26 ./slackware64/t
|
|||
-rw-r--r-- 1 root root 1102 2018-03-01 07:55 ./slackware64/t/maketag
|
||||
-rw-r--r-- 1 root root 1102 2018-03-01 07:55 ./slackware64/t/maketag.ez
|
||||
-rw-r--r-- 1 root root 33 2018-03-01 07:55 ./slackware64/t/tagfile
|
||||
-rw-r--r-- 1 root root 517 2018-06-21 19:24 ./slackware64/t/texlive-2017.171108-x86_64-7.txt
|
||||
-rw-r--r-- 1 root root 77211476 2018-06-21 19:24 ./slackware64/t/texlive-2017.171108-x86_64-7.txz
|
||||
-rw-r--r-- 1 root root 163 2018-06-21 19:24 ./slackware64/t/texlive-2017.171108-x86_64-7.txz.asc
|
||||
-rw-r--r-- 1 root root 517 2018-07-05 22:51 ./slackware64/t/texlive-2018.180630-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 75437668 2018-07-05 22:51 ./slackware64/t/texlive-2018.180630-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 22:51 ./slackware64/t/texlive-2018.180630-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 457 2018-05-09 17:57 ./slackware64/t/xfig-3.2.7a-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 3672812 2018-05-09 17:57 ./slackware64/t/xfig-3.2.7a-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-05-09 17:57 ./slackware64/t/xfig-3.2.7a-x86_64-1.txz.asc
|
||||
|
|
@ -3835,7 +3835,7 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:32 ./slackware64/tcl
|
|||
-rw-r--r-- 1 root root 198 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 1762804 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/tcl/tk-8.6.8-x86_64-2.txz.asc
|
||||
drwxr-xr-x 2 root root 65536 2018-07-03 21:41 ./slackware64/x
|
||||
drwxr-xr-x 2 root root 65536 2018-07-06 03:22 ./slackware64/x
|
||||
-rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc
|
||||
|
|
@ -4027,9 +4027,9 @@ drwxr-xr-x 2 root root 65536 2018-07-03 21:41 ./slackware64/x
|
|||
-rw-r--r-- 1 root root 305 2018-04-13 05:54 ./slackware64/x/libX11-1.6.5-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 2388580 2018-04-13 05:54 ./slackware64/x/libX11-1.6.5-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:54 ./slackware64/x/libX11-1.6.5-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 405 2018-04-13 05:55 ./slackware64/x/libXScrnSaver-1.2.2-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 23704 2018-04-13 05:55 ./slackware64/x/libXScrnSaver-1.2.2-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:55 ./slackware64/x/libXScrnSaver-1.2.2-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 405 2018-07-05 23:04 ./slackware64/x/libXScrnSaver-1.2.3-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 25988 2018-07-05 23:04 ./slackware64/x/libXScrnSaver-1.2.3-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 23:04 ./slackware64/x/libXScrnSaver-1.2.3-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 466 2018-04-13 05:55 ./slackware64/x/libXau-1.0.8-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 25448 2018-04-13 05:55 ./slackware64/x/libXau-1.0.8-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:55 ./slackware64/x/libXau-1.0.8-x86_64-3.txz.asc
|
||||
|
|
@ -4078,9 +4078,9 @@ drwxr-xr-x 2 root root 65536 2018-07-03 21:41 ./slackware64/x
|
|||
-rw-r--r-- 1 root root 293 2018-04-13 05:57 ./slackware64/x/libXi-1.7.9-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 171416 2018-04-13 05:57 ./slackware64/x/libXi-1.7.9-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:57 ./slackware64/x/libXi-1.7.9-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 384 2018-04-13 05:57 ./slackware64/x/libXinerama-1.1.3-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 19488 2018-04-13 05:57 ./slackware64/x/libXinerama-1.1.3-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:57 ./slackware64/x/libXinerama-1.1.3-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 384 2018-07-05 23:04 ./slackware64/x/libXinerama-1.1.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 21808 2018-07-05 23:04 ./slackware64/x/libXinerama-1.1.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 23:04 ./slackware64/x/libXinerama-1.1.4-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 349 2018-04-13 05:57 ./slackware64/x/libXmu-1.1.2-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 98748 2018-04-13 05:57 ./slackware64/x/libXmu-1.1.2-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:57 ./slackware64/x/libXmu-1.1.2-x86_64-3.txz.asc
|
||||
|
|
@ -4117,9 +4117,9 @@ drwxr-xr-x 2 root root 65536 2018-07-03 21:41 ./slackware64/x
|
|||
-rw-r--r-- 1 root root 382 2018-04-13 05:59 ./slackware64/x/libXxf86dga-1.1.4-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 28164 2018-04-13 05:59 ./slackware64/x/libXxf86dga-1.1.4-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:59 ./slackware64/x/libXxf86dga-1.1.4-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 401 2018-04-13 05:59 ./slackware64/x/libXxf86misc-1.0.3-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 17104 2018-04-13 05:59 ./slackware64/x/libXxf86misc-1.0.3-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:59 ./slackware64/x/libXxf86misc-1.0.3-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 401 2018-07-05 23:05 ./slackware64/x/libXxf86misc-1.0.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 19100 2018-07-05 23:05 ./slackware64/x/libXxf86misc-1.0.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 23:05 ./slackware64/x/libXxf86misc-1.0.4-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 368 2018-04-13 05:59 ./slackware64/x/libXxf86vm-1.1.4-x86_64-3.txt
|
||||
-rw-r--r-- 1 root root 27440 2018-04-13 05:59 ./slackware64/x/libXxf86vm-1.1.4-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2018-04-13 05:59 ./slackware64/x/libXxf86vm-1.1.4-x86_64-3.txz.asc
|
||||
|
|
@ -4933,11 +4933,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y
|
|||
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
|
||||
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
|
||||
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
|
||||
drwxr-xr-x 19 root root 4096 2018-07-05 18:47 ./source
|
||||
-rw-r--r-- 1 root root 453233 2018-07-05 18:47 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-05 18:47 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 641460 2018-07-05 18:47 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 14713515 2018-07-05 18:47 ./source/MANIFEST.bz2
|
||||
drwxr-xr-x 19 root root 4096 2018-07-06 03:26 ./source
|
||||
-rw-r--r-- 1 root root 453028 2018-07-06 03:26 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2018-07-06 03:26 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 641219 2018-07-06 03:25 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 14690396 2018-07-06 03:25 ./source/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
|
||||
drwxr-xr-x 110 root root 4096 2018-06-26 09:45 ./source/a
|
||||
-rw-r--r-- 1 root root 769 2018-06-26 09:45 ./source/a/FTBFSlog
|
||||
|
|
@ -10652,22 +10652,20 @@ drwxr-xr-x 2 root root 4096 2018-05-09 17:55 ./source/t/fig2dev
|
|||
-rw-r--r-- 1 root root 507288 2018-05-05 21:50 ./source/t/fig2dev/fig2dev-3.2.7a.tar.xz
|
||||
-rwxr-xr-x 1 root root 4178 2018-04-23 17:20 ./source/t/fig2dev/fig2dev.SlackBuild
|
||||
-rw-r--r-- 1 root root 940 2018-02-27 06:12 ./source/t/fig2dev/slack-desc
|
||||
drwxr-xr-x 4 root root 4096 2018-06-21 18:53 ./source/t/texlive
|
||||
drwxr-xr-x 4 root root 4096 2018-07-05 22:43 ./source/t/texlive
|
||||
-rw-r--r-- 1 root root 773 2017-05-22 17:37 ./source/t/texlive/README.tlpkg
|
||||
-rw-r--r-- 1 root root 151 2017-11-10 08:16 ./source/t/texlive/doinst.sh.gz
|
||||
-rwxr-xr-x 1 root root 732 2017-09-30 21:54 ./source/t/texlive/dump.unused.internal.libraries.from.sources.sh
|
||||
drwxr-xr-x 2 root root 4096 2017-09-27 23:34 ./source/t/texlive/patches
|
||||
-rw-r--r-- 1 root root 1344 2017-07-04 08:48 ./source/t/texlive/patches/texlive-20170524-source-gcc7-1.patch
|
||||
-rw-r--r-- 1 root root 38278 2017-07-04 08:48 ./source/t/texlive/patches/texlive-20170524-source-upstream_fixes-2.patch
|
||||
-rw-r--r-- 1 root root 42384 2017-09-27 23:34 ./source/t/texlive/patches/texlive-poppler-0.59.patch
|
||||
drwxr-xr-x 2 root root 4096 2017-09-29 05:12 ./source/t/texlive/prep
|
||||
-rwxr-xr-x 1 root root 765 2018-06-30 00:51 ./source/t/texlive/dump.unused.internal.libraries.from.sources.sh
|
||||
drwxr-xr-x 2 root root 4096 2018-06-30 00:49 ./source/t/texlive/patches
|
||||
-rw-r--r-- 1 root root 25854 2018-06-30 00:49 ./source/t/texlive/patches/20180625.diff
|
||||
drwxr-xr-x 2 root root 4096 2018-07-05 22:10 ./source/t/texlive/prep
|
||||
-rw-r--r-- 1 root root 109 2017-09-29 05:12 ./source/t/texlive/prep/README
|
||||
-rw-r--r-- 1 root root 23533 2017-11-10 08:16 ./source/t/texlive/prep/texmf_get.sh
|
||||
-rwxr-xr-x 1 root root 35314 2018-06-30 00:49 ./source/t/texlive/prep/texmf_get.sh
|
||||
-rw-r--r-- 1 root root 1004 2018-02-27 06:12 ./source/t/texlive/slack-desc
|
||||
-rw-r--r-- 1 root root 24223252 2017-05-19 23:28 ./source/t/texlive/texlive-20170520-source.tar.xz
|
||||
-rw-r--r-- 1 root root 67803816 2017-11-08 20:21 ./source/t/texlive/texlive-base-2017.171108.tar.xz
|
||||
-rwxr-xr-x 1 root root 8264 2018-06-21 19:07 ./source/t/texlive/texlive.SlackBuild
|
||||
-rw-r--r-- 1 root root 243 2017-09-29 05:13 ./source/t/texlive/texlive.url
|
||||
-rw-r--r-- 1 root root 22245572 2018-04-14 01:16 ./source/t/texlive/texlive-20180414-source.tar.xz
|
||||
-rw-r--r-- 1 root root 66527420 2018-06-30 00:43 ./source/t/texlive/texlive-base-2018.180630.tar.xz
|
||||
-rwxr-xr-x 1 root root 8428 2018-06-30 06:05 ./source/t/texlive/texlive.SlackBuild
|
||||
-rw-r--r-- 1 root root 175 2018-07-05 22:44 ./source/t/texlive/texlive.url
|
||||
drwxr-xr-x 2 root root 4096 2018-05-09 17:56 ./source/t/xfig
|
||||
-rw-r--r-- 1 root root 909 2018-02-27 06:12 ./source/t/xfig/slack-desc
|
||||
-rw-r--r-- 1 root root 5055456 2018-05-05 21:50 ./source/t/xfig/xfig-3.2.7a.tar.xz
|
||||
|
|
@ -11016,7 +11014,7 @@ drwxr-xr-x 2 root root 12288 2018-04-15 22:31 ./source/x/x11/build
|
|||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libICE
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libSM
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libX11
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXScrnSaver
|
||||
-rw-r--r-- 1 root root 2 2018-07-05 23:03 ./source/x/x11/build/libXScrnSaver
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXau
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXaw
|
||||
-rw-r--r-- 1 root root 2 2018-06-19 17:45 ./source/x/x11/build/libXaw3d
|
||||
|
|
@ -11033,7 +11031,7 @@ drwxr-xr-x 2 root root 12288 2018-04-15 22:31 ./source/x/x11/build
|
|||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXfontcache
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXft
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXi
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXinerama
|
||||
-rw-r--r-- 1 root root 2 2018-07-05 23:03 ./source/x/x11/build/libXinerama
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXmu
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXp
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXpm
|
||||
|
|
@ -11046,7 +11044,7 @@ drwxr-xr-x 2 root root 12288 2018-04-15 22:31 ./source/x/x11/build
|
|||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXv
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXvMC
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXxf86dga
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXxf86misc
|
||||
-rw-r--r-- 1 root root 2 2018-07-05 23:03 ./source/x/x11/build/libXxf86misc
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libXxf86vm
|
||||
-rw-r--r-- 1 root root 2 2018-05-14 18:22 ./source/x/x11/build/libdmx
|
||||
-rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/libdrm
|
||||
|
|
@ -11953,12 +11951,12 @@ drwxr-xr-x 2 root root 4096 2015-03-15 21:33 ./source/x/x11/src/font
|
|||
-rwxr-xr-x 1 root root 2048 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-savage.sh
|
||||
-rwxr-xr-x 1 root root 2006 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-sis.sh
|
||||
-rwxr-xr-x 1 root root 2006 2018-07-03 17:40 ./source/x/x11/src/get-xf86-video-v4l.sh
|
||||
drwxr-xr-x 2 root root 4096 2018-06-19 17:44 ./source/x/x11/src/lib
|
||||
drwxr-xr-x 2 root root 4096 2018-07-05 23:03 ./source/x/x11/src/lib
|
||||
-rw-r--r-- 1 root root 266224 2015-05-01 04:35 ./source/x/x11/src/lib/libFS-1.0.7.tar.xz
|
||||
-rw-r--r-- 1 root root 309088 2014-06-07 01:31 ./source/x/x11/src/lib/libICE-1.0.9.tar.xz
|
||||
-rw-r--r-- 1 root root 283276 2013-09-08 06:08 ./source/x/x11/src/lib/libSM-1.2.2.tar.xz
|
||||
-rw-r--r-- 1 root root 1770788 2017-02-26 05:55 ./source/x/x11/src/lib/libX11-1.6.5.tar.xz
|
||||
-rw-r--r-- 1 root root 235904 2012-03-08 05:08 ./source/x/x11/src/lib/libXScrnSaver-1.2.2.tar.xz
|
||||
-rw-r--r-- 1 root root 258564 2018-07-05 16:33 ./source/x/x11/src/lib/libXScrnSaver-1.2.3.tar.xz
|
||||
-rw-r--r-- 1 root root 247936 2013-05-24 22:18 ./source/x/x11/src/lib/libXau-1.0.8.tar.xz
|
||||
-rw-r--r-- 1 root root 565164 2015-05-01 05:18 ./source/x/x11/src/lib/libXaw-1.0.13.tar.xz
|
||||
-rw-r--r-- 1 root root 475672 2018-06-19 05:01 ./source/x/x11/src/lib/libXaw3d-1.6.3.tar.xz
|
||||
|
|
@ -11974,7 +11972,7 @@ drwxr-xr-x 2 root root 4096 2018-06-19 17:44 ./source/x/x11/src/lib
|
|||
-rw-r--r-- 1 root root 189140 2009-10-13 20:47 ./source/x/x11/src/lib/libXfontcache-1.0.5.tar.xz
|
||||
-rw-r--r-- 1 root root 275024 2014-06-06 06:06 ./source/x/x11/src/lib/libXft-2.3.2.tar.xz
|
||||
-rw-r--r-- 1 root root 396984 2017-01-23 03:59 ./source/x/x11/src/lib/libXi-1.7.9.tar.xz
|
||||
-rw-r--r-- 1 root root 236468 2013-05-31 00:36 ./source/x/x11/src/lib/libXinerama-1.1.3.tar.xz
|
||||
-rw-r--r-- 1 root root 254948 2018-07-05 15:43 ./source/x/x11/src/lib/libXinerama-1.1.4.tar.xz
|
||||
-rw-r--r-- 1 root root 322344 2013-09-08 04:30 ./source/x/x11/src/lib/libXmu-1.1.2.tar.xz
|
||||
-rw-r--r-- 1 root root 259376 2015-02-21 22:05 ./source/x/x11/src/lib/libXp-1.0.3.tar.xz
|
||||
-rw-r--r-- 1 root root 364172 2016-12-15 17:03 ./source/x/x11/src/lib/libXpm-3.5.12.tar.xz
|
||||
|
|
@ -11987,7 +11985,7 @@ drwxr-xr-x 2 root root 4096 2018-06-19 17:44 ./source/x/x11/src/lib
|
|||
-rw-r--r-- 1 root root 257292 2016-10-04 20:25 ./source/x/x11/src/lib/libXv-1.0.11.tar.xz
|
||||
-rw-r--r-- 1 root root 254256 2016-10-04 20:26 ./source/x/x11/src/lib/libXvMC-1.0.10.tar.xz
|
||||
-rw-r--r-- 1 root root 244736 2013-05-31 01:37 ./source/x/x11/src/lib/libXxf86dga-1.1.4.tar.xz
|
||||
-rw-r--r-- 1 root root 212836 2010-11-21 21:49 ./source/x/x11/src/lib/libXxf86misc-1.0.3.tar.xz
|
||||
-rw-r--r-- 1 root root 251004 2018-07-05 16:49 ./source/x/x11/src/lib/libXxf86misc-1.0.4.tar.xz
|
||||
-rw-r--r-- 1 root root 244964 2015-02-24 07:04 ./source/x/x11/src/lib/libXxf86vm-1.1.4.tar.xz
|
||||
-rw-r--r-- 1 root root 259316 2018-05-14 00:45 ./source/x/x11/src/lib/libdmx-1.1.4.tar.xz
|
||||
-rw-r--r-- 1 root root 249424 2015-05-01 04:42 ./source/x/x11/src/lib/libfontenc-1.1.3.tar.xz
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ tar xf texlive-${VERSION}-source.tar.xz || exit 1
|
|||
mv texlive-${VERSION}-source.tar.xz texlive-${VERSION}-source.tar.xz.orig
|
||||
( cd texlive-${VERSION}-source/libs && rm -rf cairo freetype2 gd gmp mpfr icu libpng pixman zlib )
|
||||
( cd texlive-${VERSION}-source/utils && rm -rf asymptote )
|
||||
( cd texlive-${VERSION}-source/texk/texlive && rm -rf w*_wrapper )
|
||||
tar cf texlive-${VERSION}-source.tar texlive-${VERSION}-source
|
||||
rm -r texlive-${VERSION}-source
|
||||
#xz -9 texlive-${VERSION}-source.tar
|
||||
xz texlive-${VERSION}-source.tar
|
||||
xz -9 texlive-${VERSION}-source.tar
|
||||
touch -r texlive-${VERSION}-source.tar.xz.orig texlive-${VERSION}-source.tar.xz
|
||||
rm texlive-${VERSION}-source.tar.xz.orig
|
||||
|
|
|
|||
688
source/t/texlive/patches/20180625.diff
Normal file
688
source/t/texlive/patches/20180625.diff
Normal file
|
|
@ -0,0 +1,688 @@
|
|||
diff -ur ./texk/dvipdfm-x/ChangeLog ../b18/texk/dvipdfm-x/ChangeLog
|
||||
--- ./texk/dvipdfm-x/ChangeLog 2018-03-03 11:27:37.000000000 +0100
|
||||
+++ ../b18/texk/dvipdfm-x/ChangeLog 2018-06-25 22:07:46.343277185 +0200
|
||||
@@ -1,3 +1,16 @@
|
||||
+2018-05-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
+
|
||||
+ * tt_cmap.c: Revert a part of changes in 2017-12-09,
|
||||
+ which breaks to give tounicode entries for ligatures.
|
||||
+ http://tug.org/pipermail/tex-live/2018-May/041608.html.
|
||||
+ * configure.ac: Version 20180506.
|
||||
+
|
||||
+ 2018-04-28 Stefan Br\"uns <stefan.bruens@rwth-aachen.de>
|
||||
+
|
||||
+ * pngimage.c: Fix a bug which causes a segfault with 1/2/4-bit
|
||||
+ transparent indexed PNGs.
|
||||
+ * configure.ac: Version 20180428.
|
||||
+
|
||||
2018-03-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
|
||||
* xbb.c: Remove unused lines.
|
||||
diff -ur ./texk/dvipdfm-x/configure ../b18/texk/dvipdfm-x/configure
|
||||
--- ./texk/dvipdfm-x/configure 2018-02-17 09:41:35.000000000 +0100
|
||||
+++ ../b18/texk/dvipdfm-x/configure 2018-06-25 22:07:47.183276612 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
-# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180217.
|
||||
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180506.
|
||||
#
|
||||
# Report bugs to <tex-k@tug.org>.
|
||||
#
|
||||
@@ -590,8 +590,8 @@
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='dvipdfm-x (TeX Live)'
|
||||
PACKAGE_TARNAME='dvipdfm-x--tex-live-'
|
||||
-PACKAGE_VERSION='20180217'
|
||||
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20180217'
|
||||
+PACKAGE_VERSION='20180506'
|
||||
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20180506'
|
||||
PACKAGE_BUGREPORT='tex-k@tug.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -1350,7 +1350,7 @@
|
||||
# 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 dvipdfm-x (TeX Live) 20180217 to adapt to many kinds of systems.
|
||||
+\`configure' configures dvipdfm-x (TeX Live) 20180506 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1421,7 +1421,7 @@
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
- short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180217:";;
|
||||
+ short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180506:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1551,7 +1551,7 @@
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
-dvipdfm-x (TeX Live) configure 20180217
|
||||
+dvipdfm-x (TeX Live) configure 20180506
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2390,7 +2390,7 @@
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
-It was created by dvipdfm-x (TeX Live) $as_me 20180217, which was
|
||||
+It was created by dvipdfm-x (TeX Live) $as_me 20180506, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -8075,7 +8075,7 @@
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='dvipdfm-x--tex-live-'
|
||||
- VERSION='20180217'
|
||||
+ VERSION='20180506'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -14744,7 +14744,7 @@
|
||||
Report bugs to <bug-libtool@gnu.org>."
|
||||
|
||||
lt_cl_version="\
|
||||
-dvipdfm-x (TeX Live) config.lt 20180217
|
||||
+dvipdfm-x (TeX Live) config.lt 20180506
|
||||
configured by $0, generated by GNU Autoconf 2.69.
|
||||
|
||||
Copyright (C) 2011 Free Software Foundation, Inc.
|
||||
@@ -16624,7 +16624,7 @@
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
-This file was extended by dvipdfm-x (TeX Live) $as_me 20180217, which was
|
||||
+This file was extended by dvipdfm-x (TeX Live) $as_me 20180506, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -16694,7 +16694,7 @@
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
-dvipdfm-x (TeX Live) config.status 20180217
|
||||
+dvipdfm-x (TeX Live) config.status 20180506
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
diff -ur ./texk/dvipdfm-x/configure.ac ../b18/texk/dvipdfm-x/configure.ac
|
||||
--- ./texk/dvipdfm-x/configure.ac 2018-02-28 00:14:55.000000000 +0100
|
||||
+++ ../b18/texk/dvipdfm-x/configure.ac 2018-06-25 22:07:47.183276612 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
dnl
|
||||
-AC_INIT([dvipdfm-x (TeX Live)], [20180217], [tex-k@tug.org])
|
||||
+AC_INIT([dvipdfm-x (TeX Live)], [20180506], [tex-k@tug.org])
|
||||
AC_PREREQ([2.65])
|
||||
AC_CONFIG_SRCDIR([agl.c])
|
||||
AC_CONFIG_AUX_DIR([../../build-aux])
|
||||
diff -ur ./texk/dvipdfm-x/pngimage.c ../b18/texk/dvipdfm-x/pngimage.c
|
||||
--- ./texk/dvipdfm-x/pngimage.c 2018-02-17 09:41:35.000000000 +0100
|
||||
+++ ../b18/texk/dvipdfm-x/pngimage.c 2018-06-25 22:07:49.306275165 +0200
|
||||
@@ -964,12 +964,16 @@
|
||||
png_bytep trans;
|
||||
int num_trans;
|
||||
png_uint_32 i;
|
||||
+ png_byte bpc, mask, shift;
|
||||
|
||||
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ||
|
||||
!png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) {
|
||||
WARN("%s: PNG does not have valid tRNS chunk but tRNS is requested.", PNG_DEBUG_STR);
|
||||
return NULL;
|
||||
}
|
||||
+ bpc = png_get_bit_depth(png_ptr, info_ptr);
|
||||
+ mask = 0xff >> (8 - bpc);
|
||||
+ shift = 8 - bpc;
|
||||
|
||||
smask = pdf_new_stream(STREAM_COMPRESS);
|
||||
dict = pdf_stream_dict(smask);
|
||||
@@ -981,7 +985,8 @@
|
||||
pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray"));
|
||||
pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8));
|
||||
for (i = 0; i < width*height; i++) {
|
||||
- png_byte idx = image_data_ptr[i];
|
||||
+ /* data is packed for 1/2/4 bpc formats, msb first */
|
||||
+ png_byte idx = (image_data_ptr[bpc * i / 8] >> (shift - bpc * i % 8)) & mask;
|
||||
smask_data_ptr[i] = (idx < num_trans) ? trans[idx] : 0xff;
|
||||
}
|
||||
pdf_add_stream(smask, (char *)smask_data_ptr, width*height);
|
||||
diff -ur ./texk/dvipdfm-x/tt_cmap.c ../b18/texk/dvipdfm-x/tt_cmap.c
|
||||
--- ./texk/dvipdfm-x/tt_cmap.c 2017-12-09 15:07:09.000000000 +0100
|
||||
+++ ../b18/texk/dvipdfm-x/tt_cmap.c 2018-06-25 22:07:49.617274953 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
|
||||
|
||||
- Copyright (C) 2007-2017 by Jin-Hwan Cho and Shunsaku Hirata,
|
||||
+ Copyright (C) 2007-2018 by Jin-Hwan Cho and Shunsaku Hirata,
|
||||
the dvipdfmx project team.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
@@ -928,19 +928,12 @@
|
||||
}
|
||||
#undef MAX_UNICODES
|
||||
if (unicode_count == -1) {
|
||||
-#if defined(LIBDPX)
|
||||
if(verbose > VERBOSE_LEVEL_MIN) {
|
||||
if (name)
|
||||
MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
|
||||
else
|
||||
MESG("No Unicode mapping available: GID=%u\n", gid);
|
||||
}
|
||||
-#else
|
||||
- if (name)
|
||||
- MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
|
||||
- else
|
||||
- MESG("No Unicode mapping available: GID=%u\n", gid);
|
||||
-#endif /* LIBDPX */
|
||||
} else {
|
||||
/* the Unicode characters go into wbuf[2] and following, in UTF16BE */
|
||||
/* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES */
|
||||
@@ -1021,13 +1014,7 @@
|
||||
{
|
||||
USHORT count = 0;
|
||||
USHORT cid = cffont ? cff_charsets_lookup_inverse(cffont, gid) : gid;
|
||||
-
|
||||
- /* Skip PUA characters and alphabetic presentation forms, allowing
|
||||
- * handle_subst_glyphs() as it might find better mapping. Fixes the
|
||||
- * mapping of ligatures encoded in PUA in fonts like Linux Libertine
|
||||
- * and old Adobe fonts.
|
||||
- */
|
||||
- if (is_used_char2(used_chars, cid) && !is_PUA_or_presentation(ch)) {
|
||||
+ if (is_used_char2(used_chars, cid)) {
|
||||
int len;
|
||||
unsigned char *p = wbuf + 2;
|
||||
|
||||
@@ -1038,11 +1025,18 @@
|
||||
len = UC_UTF16BE_encode_char((int32_t) ch, &p, wbuf + WBUF_SIZE);
|
||||
CMap_add_bfchar(cmap, wbuf, 2, wbuf + 2, len);
|
||||
|
||||
- /* Avoid duplicate entry
|
||||
- * There are problem when two Unicode code is mapped to
|
||||
- * single glyph...
|
||||
+ /* Skip PUA characters and alphabetic presentation forms, allowing
|
||||
+ * handle_subst_glyphs() as it might find better mapping. Fixes the
|
||||
+ * mapping of ligatures encoded in PUA in fonts like Linux Libertine
|
||||
+ * and old Adobe fonts.
|
||||
*/
|
||||
- used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
|
||||
+ if (!is_PUA_or_presentation(ch)) {
|
||||
+ /* Avoid duplicate entry
|
||||
+ * There are problem when two Unicode code is mapped to
|
||||
+ * single glyph...
|
||||
+ */
|
||||
+ used_chars[cid / 8] &= ~(1 << (7 - (cid % 8)));
|
||||
+ }
|
||||
}
|
||||
|
||||
return count;
|
||||
diff -ur ./texk/web2c/ptexdir/ChangeLog ../b18/texk/web2c/ptexdir/ChangeLog
|
||||
--- ./texk/web2c/ptexdir/ChangeLog 2018-02-05 13:35:05.000000000 +0100
|
||||
+++ ../b18/texk/web2c/ptexdir/ChangeLog 2018-06-25 22:08:39.566240911 +0200
|
||||
@@ -1,3 +1,16 @@
|
||||
+2018-05-06 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
|
||||
+
|
||||
+ * kanji.c: More strict check kanji token.
|
||||
+
|
||||
+2018-04-14 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
|
||||
+
|
||||
+ * ptex-base.ch: Fix issue GitHub:texjporg/tex-jp-build#57
|
||||
+ that discontinuous KINSOKU/INHIBIT table cannot be
|
||||
+ searched properly.
|
||||
+ (regression caused by a commmit of 2017-09-11)
|
||||
+ * tests/free_pena.tex, tests/free_ixsp.tex: Added.
|
||||
+ * ptex_version.h: pTeX version p3.8.1.
|
||||
+
|
||||
2018-02-05 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
|
||||
|
||||
* ptex-base.ch: Set subtype for JFM glue in math list.
|
||||
diff -ur ./texk/web2c/ptexdir/kanji.c ../b18/texk/web2c/ptexdir/kanji.c
|
||||
--- ./texk/web2c/ptexdir/kanji.c 2016-11-25 19:24:38.000000000 +0100
|
||||
+++ ../b18/texk/web2c/ptexdir/kanji.c 2018-06-25 22:08:39.675240837 +0200
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include "kanji.h"
|
||||
+#define CS_TOKEN_FLAG 0xFFFF
|
||||
|
||||
#if !defined(WIN32)
|
||||
int sjisterminal;
|
||||
@@ -12,7 +13,8 @@
|
||||
/* TOKEN */
|
||||
boolean check_kanji(integer c)
|
||||
{
|
||||
- return is_char_kanji(c);
|
||||
+ if (c >= CS_TOKEN_FLAG) return false;
|
||||
+ else return is_char_kanji(c);
|
||||
}
|
||||
|
||||
boolean is_char_ascii(integer c)
|
||||
diff -ur ./texk/web2c/ptexdir/ptex-base.ch ../b18/texk/web2c/ptexdir/ptex-base.ch
|
||||
--- ./texk/web2c/ptexdir/ptex-base.ch 2018-02-05 13:35:05.000000000 +0100
|
||||
+++ ../b18/texk/web2c/ptexdir/ptex-base.ch 2018-06-25 22:08:39.677240836 +0200
|
||||
@@ -58,6 +58,7 @@
|
||||
% pTeX p3.7.1.
|
||||
% (2017-09-07) HK pTeX p3.7.2 More restrictions on direction change commands.
|
||||
% (2018-01-21) HK Added \ptexversion primitive and co. pTeX p3.8.
|
||||
+% (2018-04-14) HK pTeX p3.8.1 Bug fix for discontinuous KINSOKU table.
|
||||
%
|
||||
|
||||
@x
|
||||
@@ -73,8 +74,8 @@
|
||||
@y
|
||||
@d pTeX_version=3
|
||||
@d pTeX_minor_version=8
|
||||
-@d pTeX_revision==".0"
|
||||
-@d pTeX_version_string=='-p3.8.0' {current \pTeX\ version}
|
||||
+@d pTeX_revision==".1"
|
||||
+@d pTeX_version_string=='-p3.8.1' {current \pTeX\ version}
|
||||
@#
|
||||
@d pTeX_banner=='This is pTeX, Version 3.14159265',pTeX_version_string
|
||||
@d pTeX_banner_k==pTeX_banner
|
||||
@@ -6397,6 +6398,8 @@
|
||||
@d inhibit_both=0 {disable to insert space before 2byte-char and after it}
|
||||
@d inhibit_previous=1 {disable to insert space before 2byte-char}
|
||||
@d inhibit_after=2 {disable to insert space after 2byte-char}
|
||||
+@d inhibit_none=3 {enable to insert space before/after 2byte-char}
|
||||
+@d inhibit_unused=4 {unused entry}
|
||||
@d no_entry=1000
|
||||
@d new_pos=0
|
||||
@d cur_pos=1
|
||||
@@ -6427,14 +6430,15 @@
|
||||
begin s:=calc_pos(c); p:=s;
|
||||
if n=new_pos then
|
||||
begin repeat
|
||||
- if (inhibit_xsp_code(p)=0)or(inhibit_xsp_code(p)=c) then goto done;
|
||||
+ if (inhibit_xsp_type(p)=inhibit_unused)or(inhibit_xsp_code(p)=0)
|
||||
+ or(inhibit_xsp_code(p)=c) then goto done;
|
||||
incr(p); if p>255 then p:=0;
|
||||
until s=p; p:=no_entry;
|
||||
end
|
||||
else
|
||||
begin repeat
|
||||
- if inhibit_xsp_code(p)=0 then goto done1;
|
||||
- if inhibit_xsp_code(p)=c then goto done;
|
||||
+ if inhibit_xsp_code(p)=0 then goto done1
|
||||
+ else if (inhibit_xsp_type(p)<>inhibit_unused)and(inhibit_xsp_code(p)=c) then goto done;
|
||||
incr(p); if p>255 then p:=0;
|
||||
until s=p;
|
||||
done1: p:=no_entry;
|
||||
@@ -6447,9 +6451,10 @@
|
||||
begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
|
||||
if is_char_kanji(n) then
|
||||
begin j:=get_inhibit_pos(tokanji(n),new_pos);
|
||||
- if (j<>no_entry)and(cur_val>inhibit_after)and(global or cur_level=level_one) then
|
||||
- begin n:=0; cur_val:=0 end
|
||||
- { remove the entry from inhibit table }
|
||||
+ if (j<>no_entry)and(cur_val>inhibit_after) then
|
||||
+ begin if global or(cur_level=level_one) then cur_val:=inhibit_unused
|
||||
+ { remove the entry from inhibit table }
|
||||
+ else cur_val:=inhibit_none; end
|
||||
else if j=no_entry then
|
||||
begin print_err("Inhibit table is full!!");
|
||||
help1("I'm skipping this control sequences.");@/
|
||||
@@ -6466,7 +6471,7 @@
|
||||
|
||||
@ @<Fetch inhibit type from some table@>=
|
||||
begin scan_int; q:=get_inhibit_pos(tokanji(cur_val),cur_pos);
|
||||
-cur_val_level:=int_val; cur_val:=3;
|
||||
+cur_val_level:=int_val; cur_val:=inhibit_none;
|
||||
if q<>no_entry then cur_val:=inhibit_xsp_type(q);
|
||||
end
|
||||
|
||||
@@ -6476,6 +6481,7 @@
|
||||
|
||||
@d pre_break_penalty_code=1
|
||||
@d post_break_penalty_code=2
|
||||
+@d kinsoku_unused_code=3
|
||||
|
||||
@<Put each...@>=
|
||||
primitive("prebreakpenalty",assign_kinsoku,pre_break_penalty_code);
|
||||
@@ -6502,15 +6508,16 @@
|
||||
gubed
|
||||
if n=new_pos then
|
||||
begin repeat
|
||||
- if (kinsoku_type(p)=0)or(kinsoku_code(p)=c) then goto done;
|
||||
+ if (kinsoku_type(p)=0)or(kinsoku_type(p)=kinsoku_unused_code)
|
||||
+ or(kinsoku_code(p)=c) then goto done;
|
||||
incr(p); if p>255 then p:=0;
|
||||
until s=p;
|
||||
p:=no_entry;
|
||||
end
|
||||
else
|
||||
begin repeat
|
||||
- if kinsoku_type(p)=0 then goto done1;
|
||||
- if kinsoku_code(p)=c then goto done;
|
||||
+ if kinsoku_type(p)=0 then goto done1
|
||||
+ else if (kinsoku_type(p)<>kinsoku_unused_code)and(kinsoku_code(p)=c) then goto done;
|
||||
incr(p); if p>255 then p:=0;
|
||||
until s=p;
|
||||
done1: p:=no_entry;
|
||||
@@ -6523,8 +6530,8 @@
|
||||
begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
|
||||
if is_char_ascii(n) or is_char_kanji(n) then
|
||||
begin j:=get_kinsoku_pos(tokanji(n),new_pos);
|
||||
- if (j<>no_entry)and(cur_val=0)and(global or cur_level=level_one) then
|
||||
- define(kinsoku_base+j,0,0) { remove the entry from KINSOKU table }
|
||||
+ if (j<>no_entry)and(cur_val=0)and(global or(cur_level=level_one)) then
|
||||
+ define(kinsoku_base+j,kinsoku_unused_code,0) { remove the entry from KINSOKU table }
|
||||
else begin
|
||||
if j=no_entry then begin
|
||||
print_err("KINSOKU table is full!!");
|
||||
diff -ur ./texk/web2c/ptexdir/ptex_version.h ../b18/texk/web2c/ptexdir/ptex_version.h
|
||||
--- ./texk/web2c/ptexdir/ptex_version.h 2018-01-21 04:48:06.000000000 +0100
|
||||
+++ ../b18/texk/web2c/ptexdir/ptex_version.h 2018-06-25 22:08:39.678240835 +0200
|
||||
@@ -1 +1 @@
|
||||
-#define PTEX_VERSION "p3.8.0"
|
||||
+#define PTEX_VERSION "p3.8.1"
|
||||
diff -ur ./texk/web2c/uptexdir/kanji.c ../b18/texk/web2c/uptexdir/kanji.c
|
||||
--- ./texk/web2c/uptexdir/kanji.c 2018-02-25 01:31:25.000000000 +0100
|
||||
+++ ../b18/texk/web2c/uptexdir/kanji.c 2018-06-25 22:08:41.864239345 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
/* TOKEN */
|
||||
boolean check_kanji (integer c)
|
||||
{
|
||||
- if (c > CS_TOKEN_FLAG) return false;
|
||||
+ if (c >= CS_TOKEN_FLAG) return false;
|
||||
else if (!(XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL)) return false;
|
||||
else return is_char_kanji(c);
|
||||
}
|
||||
diff -ur ./utils/README ../b18/utils/README
|
||||
--- ./utils/README 2018-04-08 22:08:33.000000000 +0200
|
||||
+++ ../b18/utils/README 2018-06-25 22:08:45.738236705 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-$Id: README 47384 2018-04-08 20:08:33Z karl $
|
||||
+$Id: README 47642 2018-05-08 16:06:43Z karl $
|
||||
Public domain. Originally written 2005 by Karl Berry.
|
||||
|
||||
Extra utilities we (optionally) compile for TeX Live.
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
lacheck - maintained here, by us
|
||||
|
||||
-m-tx 0.63 - checked 09jan18
|
||||
+m-tx 0.63a - checked 29apr18
|
||||
http://ctan.org/pkg/m-tx/
|
||||
|
||||
pmx 2.8.4 - checked 14feb18
|
||||
diff -ur ./utils/m-tx/ChangeLog ../b18/utils/m-tx/ChangeLog
|
||||
--- ./utils/m-tx/ChangeLog 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/ChangeLog 2018-06-25 22:08:49.771233956 +0200
|
||||
@@ -1,3 +1,7 @@
|
||||
+2018-04-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
+
|
||||
+ * Import m-tx 0.63a.
|
||||
+
|
||||
2018-01-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
|
||||
* Import m-tx 0.63.
|
||||
diff -ur ./utils/m-tx/TLpatches/ChangeLog ../b18/utils/m-tx/TLpatches/ChangeLog
|
||||
--- ./utils/m-tx/TLpatches/ChangeLog 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/TLpatches/ChangeLog 2018-06-25 22:08:49.772233956 +0200
|
||||
@@ -1,3 +1,7 @@
|
||||
+2018-04-29 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
+
|
||||
+ * patch-01-write-bin: Update for 0.63a.
|
||||
+
|
||||
2018-01-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
||||
|
||||
* patch-01-write-bin: Update for 0.63.
|
||||
diff -ur ./utils/m-tx/TLpatches/TL-Changes ../b18/utils/m-tx/TLpatches/TL-Changes
|
||||
--- ./utils/m-tx/TLpatches/TL-Changes 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/TLpatches/TL-Changes 2018-06-25 22:08:49.772233956 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-Changes applied to the mtx-0.63 tree as obtained from:
|
||||
+Changes applied to the mtx-0.63a tree as obtained from:
|
||||
http://www.ctan.org/tex-archive/support/m-tx/
|
||||
|
||||
Remove:
|
||||
diff -ur ./utils/m-tx/TLpatches/patch-01-write-bin ../b18/utils/m-tx/TLpatches/patch-01-write-bin
|
||||
--- ./utils/m-tx/TLpatches/patch-01-write-bin 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/TLpatches/patch-01-write-bin 2018-06-25 22:08:49.772233956 +0200
|
||||
@@ -1,6 +1,21 @@
|
||||
-diff -ur mtx-0.63.orig/globals.c mtx-0.63/globals.c
|
||||
---- mtx-0.63.orig/globals.c Tue Jan 09 01:39:42 2018
|
||||
-+++ mtx-0.63/globals.c Tue Jan 09 08:46:40 2018
|
||||
+diff -ur mtx-0.63a/files.c mtx-src/files.c
|
||||
+--- mtx-0.63a/files.c Tue Jan 09 01:39:42 2018
|
||||
++++ mtx-src/files.c Wed Apr 25 18:07:12 2018
|
||||
+@@ -289,9 +289,9 @@
|
||||
+ pushFile(infilename);
|
||||
+ strcpy(outfile_NAME, outfilename);
|
||||
+ if (outfile != NULL)
|
||||
+- outfile = freopen(outfile_NAME, "w", outfile);
|
||||
++ outfile = freopen(outfile_NAME, "wb", outfile);
|
||||
+ else
|
||||
+- outfile = fopen(outfile_NAME, "w");
|
||||
++ outfile = fopen(outfile_NAME, "wb");
|
||||
+ _SETIO(outfile != NULL, FileNotFound);
|
||||
+ strcpy(stylefile_NAME, stylefilename);
|
||||
+ if (stylefile != NULL)
|
||||
+diff -ur mtx-0.63a/globals.c mtx-src/globals.c
|
||||
+--- mtx-0.63a/globals.c Tue Jan 09 01:39:42 2018
|
||||
++++ mtx-src/globals.c Wed Apr 25 18:07:37 2018
|
||||
@@ -230,7 +230,7 @@
|
||||
if (outfile != NULL)
|
||||
fclose(outfile);
|
||||
diff -ur ./utils/m-tx/configure ../b18/utils/m-tx/configure
|
||||
--- ./utils/m-tx/configure 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/configure 2018-06-25 22:08:49.879233883 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
-# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.63.
|
||||
+# Generated by GNU Autoconf 2.69 for m-tx (TeX Live) 0.63a.
|
||||
#
|
||||
# Report bugs to <tex-k@tug.org>.
|
||||
#
|
||||
@@ -580,8 +580,8 @@
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='m-tx (TeX Live)'
|
||||
PACKAGE_TARNAME='m-tx--tex-live-'
|
||||
-PACKAGE_VERSION='0.63'
|
||||
-PACKAGE_STRING='m-tx (TeX Live) 0.63'
|
||||
+PACKAGE_VERSION='0.63a'
|
||||
+PACKAGE_STRING='m-tx (TeX Live) 0.63a'
|
||||
PACKAGE_BUGREPORT='tex-k@tug.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -1275,7 +1275,7 @@
|
||||
# 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 m-tx (TeX Live) 0.63 to adapt to many kinds of systems.
|
||||
+\`configure' configures m-tx (TeX Live) 0.63a to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1341,7 +1341,7 @@
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
- short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63:";;
|
||||
+ short | recursive ) echo "Configuration of m-tx (TeX Live) 0.63a:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1438,7 +1438,7 @@
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
-m-tx (TeX Live) configure 0.63
|
||||
+m-tx (TeX Live) configure 0.63a
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -1861,7 +1861,7 @@
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
-It was created by m-tx (TeX Live) $as_me 0.63, which was
|
||||
+It was created by m-tx (TeX Live) $as_me 0.63a, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3784,7 +3784,7 @@
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='m-tx--tex-live-'
|
||||
- VERSION='0.63'
|
||||
+ VERSION='0.63a'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -5868,7 +5868,7 @@
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
-This file was extended by m-tx (TeX Live) $as_me 0.63, which was
|
||||
+This file was extended by m-tx (TeX Live) $as_me 0.63a, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -5925,7 +5925,7 @@
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
-m-tx (TeX Live) config.status 0.63
|
||||
+m-tx (TeX Live) config.status 0.63a
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
diff -ur ./utils/m-tx/mtx-src/Corrections ../b18/utils/m-tx/mtx-src/Corrections
|
||||
--- ./utils/m-tx/mtx-src/Corrections 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/Corrections 2018-06-25 22:08:49.880233882 +0200
|
||||
@@ -3,6 +3,12 @@
|
||||
|
||||
Newest items at top. You might also want to look at file `MAINTENANCE`.
|
||||
|
||||
+Version 0.63a
|
||||
+-------------
|
||||
+
|
||||
+Commented out apparently spurious begin...end block in preambleDefaults
|
||||
+in preamble.pas. (RDT)
|
||||
+
|
||||
Version 0.63
|
||||
------------
|
||||
|
||||
diff -ur ./utils/m-tx/mtx-src/files.c ../b18/utils/m-tx/mtx-src/files.c
|
||||
--- ./utils/m-tx/mtx-src/files.c 2016-11-25 19:24:43.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/files.c 2018-06-25 22:08:49.882233881 +0200
|
||||
@@ -289,9 +289,9 @@
|
||||
pushFile(infilename);
|
||||
strcpy(outfile_NAME, outfilename);
|
||||
if (outfile != NULL)
|
||||
- outfile = freopen(outfile_NAME, "w", outfile);
|
||||
+ outfile = freopen(outfile_NAME, "wb", outfile);
|
||||
else
|
||||
- outfile = fopen(outfile_NAME, "w");
|
||||
+ outfile = fopen(outfile_NAME, "wb");
|
||||
_SETIO(outfile != NULL, FileNotFound);
|
||||
strcpy(stylefile_NAME, stylefilename);
|
||||
if (stylefile != NULL)
|
||||
diff -ur ./utils/m-tx/mtx-src/libp2c/p2clib.c ../b18/utils/m-tx/mtx-src/libp2c/p2clib.c
|
||||
--- ./utils/m-tx/mtx-src/libp2c/p2clib.c 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/libp2c/p2clib.c 2018-06-25 22:08:49.883233880 +0200
|
||||
@@ -73,8 +73,8 @@
|
||||
{
|
||||
register char *dd = (char *)d, *ss = (char *)s;
|
||||
if (dd < ss || dd - ss >= n) {
|
||||
-#if defined(bcopy) && defined(memcpy)
|
||||
- my_memcpy(dd, ss, n);
|
||||
+#if defined(bcopy) && defined(memcpy)
|
||||
+ Anyptr my_memcpy(Anyptr d, Const Anyptr s, size_t n);
|
||||
#else
|
||||
memcpy(dd, ss, n);
|
||||
#endif
|
||||
diff -ur ./utils/m-tx/mtx-src/preamble.c ../b18/utils/m-tx/mtx-src/preamble.c
|
||||
--- ./utils/m-tx/mtx-src/preamble.c 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/preamble.c 2018-06-25 22:08:49.953233832 +0200
|
||||
@@ -801,8 +801,8 @@
|
||||
stave_size[i] = unspec;
|
||||
for (i = 0; i <= maxstaves; i++)
|
||||
nspace[i] = unspec;
|
||||
- nspace[i] = unspec;
|
||||
- stave_size[i-1] = unspec;
|
||||
+ /* next line seems to be spurious. 0.63a RDT */
|
||||
+ /* begin nspace[i]:=unspec; stave_size[i]:=unspec; end; */
|
||||
n_pages = 1;
|
||||
n_systems = 1;
|
||||
readStyles();
|
||||
diff -ur ./utils/m-tx/mtx-src/preamble.pas ../b18/utils/m-tx/mtx-src/preamble.pas
|
||||
--- ./utils/m-tx/mtx-src/preamble.pas 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/preamble.pas 2018-06-25 22:08:49.953233832 +0200
|
||||
@@ -501,7 +501,8 @@
|
||||
for i:=1 to maxvoices do setVocal(i,false);
|
||||
for i:=1 to maxstaves do stave_size[i]:=unspec;
|
||||
for i:=0 to maxstaves do nspace[i]:=unspec;
|
||||
- begin nspace[i]:=unspec; stave_size[i]:=unspec; end;
|
||||
+ { next line seems to be spurious. 0.63a RDT }
|
||||
+ { begin nspace[i]:=unspec; stave_size[i]:=unspec; end; }
|
||||
n_pages:=1; n_systems:=1;
|
||||
readStyles; old_known_styles := known_styles;
|
||||
for i:=1 to lines_in_paragraph do omit_line[i]:=false;
|
||||
diff -ur ./utils/m-tx/mtx-src/prepmx.c ../b18/utils/m-tx/mtx-src/prepmx.c
|
||||
--- ./utils/m-tx/mtx-src/prepmx.c 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/prepmx.c 2018-06-25 22:08:49.954233832 +0200
|
||||
@@ -66,8 +66,8 @@
|
||||
|
||||
/** M-Tx preprocessor to PMX Dirk Laurie */
|
||||
|
||||
-#define version "0.63"
|
||||
-#define version_date "<7 January 2018>"
|
||||
+#define version "0.63a"
|
||||
+#define version_date "<8 April 2018>"
|
||||
|
||||
/** See file "Corrections" for updates */
|
||||
|
||||
@@ -758,7 +758,7 @@
|
||||
Static void topOfPMXfile(void)
|
||||
{
|
||||
Char STR2[24];
|
||||
- Char STR3[32];
|
||||
+ Char STR3[30];
|
||||
|
||||
putLine("---");
|
||||
sprintf(STR2, "\\def\\mtxversion{%s}", version);
|
||||
diff -ur ./utils/m-tx/mtx-src/prepmx.pas ../b18/utils/m-tx/mtx-src/prepmx.pas
|
||||
--- ./utils/m-tx/mtx-src/prepmx.pas 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/mtx-src/prepmx.pas 2018-06-25 22:08:49.954233832 +0200
|
||||
@@ -5,8 +5,8 @@
|
||||
{ CMO: addition/change by Christian Mondrup }
|
||||
|
||||
{* M-Tx preprocessor to PMX Dirk Laurie }
|
||||
-const version = '0.63';
|
||||
- version_date = '<7 January 2018>';
|
||||
+const version = '0.63a';
|
||||
+ version_date = '<8 April 2018>';
|
||||
|
||||
{* See file "Corrections" for updates }
|
||||
|
||||
diff -ur ./utils/m-tx/tests/mozart.pmx ../b18/utils/m-tx/tests/mozart.pmx
|
||||
--- ./utils/m-tx/tests/mozart.pmx 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/tests/mozart.pmx 2018-06-25 22:08:50.059233760 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
-\def\mtxversion{0.63}
|
||||
-\def\mtxdate{<7 January 2018>}
|
||||
+\def\mtxversion{0.63a}
|
||||
+\def\mtxdate{<8 April 2018>}
|
||||
\input mtx
|
||||
\mtxComposerLine{}{W. A. Mozart (1756--1791)}
|
||||
\mtxTitleLine{Riff in C}
|
||||
diff -ur ./utils/m-tx/version.ac ../b18/utils/m-tx/version.ac
|
||||
--- ./utils/m-tx/version.ac 2018-01-09 04:41:12.000000000 +0100
|
||||
+++ ../b18/utils/m-tx/version.ac 2018-06-25 22:08:50.059233760 +0200
|
||||
@@ -8,4 +8,4 @@
|
||||
dnl --------------------------------------------------------
|
||||
dnl
|
||||
dnl m4-include this file to define the current mtx version
|
||||
-m4_define([mtx_version], [0.63])
|
||||
+m4_define([mtx_version], [0.63a])
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
|
||||
Date: 2017-06-05
|
||||
Initial Package Version: 20170524
|
||||
Upstream Status: Unknown
|
||||
Origin: http://tug.org/pipermail/tex-live/2017-June/040192.html
|
||||
Description: From Dr. Werner Fink of SuSe, fixes compilation with gcc-7.1
|
||||
|
||||
diff -Naur texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ctype.c texlive-20170524-source/texk/web2c/luatexdir/luaffi/ctype.c
|
||||
--- texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ctype.c 2017-02-10 01:03:59.000000000 +0000
|
||||
+++ texlive-20170524-source/texk/web2c/luatexdir/luaffi/ctype.c 2017-06-05 02:32:34.548531839 +0100
|
||||
@@ -245,6 +245,10 @@
|
||||
|
||||
lua_pop(L, 1); /* mt */
|
||||
cd = (struct cdata*) lua_touserdata(L, idx);
|
||||
+ if (!cd) {
|
||||
+ lua_pushnil(L);
|
||||
+ return NULL;
|
||||
+ }
|
||||
*ct = cd->type;
|
||||
lua_getuservalue(L, idx);
|
||||
|
||||
diff -Naur texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ffi.h texlive-20170524-source/texk/web2c/luatexdir/luaffi/ffi.h
|
||||
--- texlive-20170524-source.orig/texk/web2c/luatexdir/luaffi/ffi.h 2017-03-11 01:04:06.000000000 +0000
|
||||
+++ texlive-20170524-source/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-05 02:32:34.548531839 +0100
|
||||
@@ -370,7 +370,7 @@
|
||||
#endif
|
||||
struct cdata {
|
||||
const struct ctype type
|
||||
-#ifdef __GNUC__
|
||||
+#if 0 /* def __GNUC__ */
|
||||
__attribute__ ((aligned(16)))
|
||||
#endif
|
||||
;
|
||||
|
|
@ -1,451 +0,0 @@
|
|||
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
|
||||
Date: 2017-06-13
|
||||
Initial Package Version: 2017-05-25
|
||||
Upstream Status: Applied
|
||||
Origin: Upstream
|
||||
Description: Consolidated fixes for luatex.
|
||||
|
||||
1. Removes debugging code which was accidentally left in
|
||||
luatex, which made the (infrequently needed) io.popen useless. Also
|
||||
disables io.saved_popen and changes the reported date of the luatex
|
||||
version.
|
||||
|
||||
2. Fix for io.lines (fixed in r44572).
|
||||
|
||||
diff -Naur a/texk/web2c/luatexdir/lua/liolibext.c b/texk/web2c/luatexdir/lua/liolibext.c
|
||||
--- a/texk/web2c/luatexdir/lua/liolibext.c 2017-03-11 01:04:06.000000000 +0000
|
||||
+++ b/texk/web2c/luatexdir/lua/liolibext.c 2017-06-11 01:49:11.813308882 +0100
|
||||
@@ -365,7 +365,7 @@
|
||||
lua_pushliteral(L,"all command execution is disabled");
|
||||
} else if (restrictedshell == 0) {
|
||||
lua_pushboolean(L,1);
|
||||
- lua_pushliteral(L,"all commands are permitted");
|
||||
+ lua_pushstring(L,filename);
|
||||
} else {
|
||||
char *safecmd = NULL;
|
||||
char *cmdname = NULL;
|
||||
@@ -374,10 +374,6 @@
|
||||
lua_pushboolean(L,0);
|
||||
lua_pushliteral(L, "specific command execution disabled");
|
||||
break;
|
||||
- case 1:
|
||||
- lua_pushboolean(L,1);
|
||||
- lua_pushstring(L,filename);
|
||||
- break;
|
||||
case 2:
|
||||
lua_pushboolean(L,1);
|
||||
lua_pushstring(L,safecmd);
|
||||
diff -Naur a/texk/web2c/luatexdir/lua/luatex-core.c b/texk/web2c/luatexdir/lua/luatex-core.c
|
||||
--- a/texk/web2c/luatexdir/lua/luatex-core.c 2017-04-19 11:07:10.000000000 +0100
|
||||
+++ b/texk/web2c/luatexdir/lua/luatex-core.c 2017-06-12 19:34:37.320003411 +0100
|
||||
@@ -52,7 +52,7 @@
|
||||
0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x69, 0x6f, 0x5f,
|
||||
0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
0x20, 0x3d, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
|
||||
- 0x6c, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x6c, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73,
|
||||
0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64,
|
||||
0x6c, 0x69, 0x6e, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x66, 0x69,
|
||||
@@ -84,169 +84,175 @@
|
||||
0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x2d, 0x2d, 0x20,
|
||||
0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64,
|
||||
- 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f,
|
||||
- 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20,
|
||||
- 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76,
|
||||
- 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d,
|
||||
- 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c,
|
||||
- 0x79, 0x0a, 0x6d, 0x74, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x74,
|
||||
- 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73,
|
||||
- 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
|
||||
- 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
|
||||
- 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f,
|
||||
- 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x6f,
|
||||
- 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
|
||||
- 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64,
|
||||
- 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69,
|
||||
+ 0x0a, 0x2d, 0x2d, 0x20, 0x28, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72,
|
||||
+ 0x20, 0x74, 0x6c, 0x31, 0x37, 0x20, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x29, 0x20, 0x69,
|
||||
+ 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x70, 0x6f,
|
||||
+ 0x70, 0x65, 0x6e, 0x20, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72,
|
||||
+ 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x0a, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64,
|
||||
+ 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20,
|
||||
+ 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a,
|
||||
+ 0x6d, 0x74, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x74, 0x5f, 0x6c,
|
||||
+ 0x69, 0x6e, 0x65, 0x73, 0x20, 0x2d, 0x2d, 0x20, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x20, 0x72,
|
||||
+ 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66,
|
||||
+ 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69,
|
||||
0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29,
|
||||
- 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x68,
|
||||
- 0x6f, 0x77, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27, 0x20,
|
||||
- 0x61, 0x6e, 0x64, 0x20, 0x66, 0x69, 0x6e, 0x64, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x77, 0x27,
|
||||
- 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c,
|
||||
- 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x0a,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63,
|
||||
- 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65,
|
||||
- 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e,
|
||||
- 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
|
||||
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
|
||||
- 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
|
||||
- 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e,
|
||||
- 0x6c, 0x79, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x67, 0x73, 0x75, 0x62, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27,
|
||||
- 0x5b, 0x5e, 0x72, 0x62, 0x5d, 0x27, 0x2c, 0x27, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x27, 0x20,
|
||||
- 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x6f, 0x77, 0x20,
|
||||
+ 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77,
|
||||
+ 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20,
|
||||
0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f,
|
||||
0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20,
|
||||
0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66,
|
||||
- 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x72, 0x27,
|
||||
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
|
||||
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61,
|
||||
- 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
|
||||
- 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c,
|
||||
- 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f,
|
||||
- 0x6b, 0x61, 0x79, 0x2c, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x69, 0x6f,
|
||||
- 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e,
|
||||
- 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x6b,
|
||||
- 0x61, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65,
|
||||
- 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
|
||||
- 0x20, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x2c,
|
||||
- 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64,
|
||||
- 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
|
||||
- 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73,
|
||||
- 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
|
||||
- 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d,
|
||||
- 0x65, 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x66, 0x20,
|
||||
- 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
|
||||
- 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x74, 0x79, 0x70, 0x65, 0x28, 0x68, 0x6f, 0x77,
|
||||
+ 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27, 0x20, 0x61, 0x6e,
|
||||
+ 0x64, 0x20, 0x66, 0x69, 0x6e, 0x64, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x20,
|
||||
+ 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e,
|
||||
+ 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x77, 0x27, 0x29, 0x0a, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72,
|
||||
+ 0x64, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27,
|
||||
+ 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
|
||||
+ 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20,
|
||||
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f,
|
||||
+ 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79,
|
||||
+ 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
|
||||
+ 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x65, 0x6c, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x6f,
|
||||
+ 0x77, 0x20, 0x3d, 0x20, 0x67, 0x73, 0x75, 0x62, 0x28, 0x68, 0x6f, 0x77, 0x2c, 0x27, 0x5b, 0x5e,
|
||||
+ 0x72, 0x62, 0x5d, 0x27, 0x2c, 0x27, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x69, 0x66, 0x20, 0x68, 0x6f, 0x77, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x27, 0x20, 0x74, 0x68,
|
||||
+ 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68,
|
||||
+ 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x27, 0x72, 0x27, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f, 0x70,
|
||||
+ 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x69, 0x66, 0x20, 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x66, 0x69, 0x6c,
|
||||
+ 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x27, 0x72, 0x27, 0x29, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
|
||||
+ 0x72, 0x6e, 0x20, 0x66, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20,
|
||||
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f,
|
||||
+ 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x2e, 0x2e,
|
||||
+ 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x6b, 0x61,
|
||||
+ 0x79, 0x2c, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x63,
|
||||
+ 0x68, 0x65, 0x63, 0x6b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x28, 0x6e,
|
||||
+ 0x61, 0x6d, 0x65, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6f, 0x6b, 0x61, 0x79,
|
||||
+ 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69,
|
||||
+ 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x28, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x2c, 0x2e, 0x2e,
|
||||
+ 0x2e, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a,
|
||||
+ 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c,
|
||||
+ 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x28, 0x6e,
|
||||
+ 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
|
||||
+ 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x20, 0x3d, 0x20, 0x69, 0x6f, 0x5f, 0x6f,
|
||||
+ 0x70, 0x65, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x2c, 0x68, 0x6f, 0x77, 0x20, 0x6f, 0x72, 0x20,
|
||||
+ 0x27, 0x72, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
|
||||
+ 0x66, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
|
||||
+ 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f,
|
||||
+ 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6c, 0x73, 0x65,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
|
||||
+ 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
|
||||
+ 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75,
|
||||
+ 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f,
|
||||
+ 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
|
||||
+ 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
|
||||
0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66,
|
||||
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
|
||||
- 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
|
||||
- 0x5f, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x28, 0x66, 0x29, 0x0a,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
|
||||
- 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
|
||||
- 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x69, 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e,
|
||||
- 0x65, 0x28, 0x66, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64,
|
||||
- 0x0a, 0x0a, 0x69, 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61,
|
||||
- 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x0a, 0x6d, 0x74, 0x2e,
|
||||
- 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69,
|
||||
- 0x6f, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x57,
|
||||
- 0x65, 0x20, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d,
|
||||
- 0x65, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
|
||||
- 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63,
|
||||
- 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x2e, 0x20, 0x54,
|
||||
- 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x2d, 0x2d, 0x20, 0x63, 0x61,
|
||||
- 0x73, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x43, 0x6f, 0x6e, 0x54, 0x65, 0x58, 0x74, 0x2e, 0x0a, 0x0a,
|
||||
- 0x69, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x31,
|
||||
- 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70,
|
||||
- 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f,
|
||||
- 0x6f, 0x70, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65,
|
||||
- 0x6e, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f,
|
||||
- 0x70, 0x65, 0x6e, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66,
|
||||
- 0x65, 0x72, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68,
|
||||
- 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75,
|
||||
- 0x74, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e,
|
||||
- 0x73, 0x70, 0x61, 0x77, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e,
|
||||
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x65, 0x6e, 0x76,
|
||||
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x74,
|
||||
- 0x65, 0x6d, 0x70, 0x64, 0x69, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e,
|
||||
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e,
|
||||
- 0x72, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e,
|
||||
- 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x74, 0x6d, 0x70, 0x66, 0x69,
|
||||
- 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e,
|
||||
- 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x63, 0x68, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20,
|
||||
- 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b,
|
||||
- 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73,
|
||||
- 0x2e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x72, 0x6d, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e,
|
||||
- 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6d, 0x6b, 0x64, 0x69, 0x72,
|
||||
- 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e,
|
||||
- 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x6e, 0x69,
|
||||
- 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76, 0x65, 0x64, 0x5f, 0x6f,
|
||||
- 0x70, 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f,
|
||||
- 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e, 0x6c, 0x79, 0x0a, 0x0a,
|
||||
- 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65, 0x72, 0x6f, 0x70, 0x74,
|
||||
- 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x6f, 0x72, 0x20, 0x73, 0x68, 0x65, 0x6c,
|
||||
- 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x7e, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68, 0x65,
|
||||
- 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x72, 0x65, 0x71,
|
||||
- 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x66, 0x66, 0x69, 0x27, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x66, 0x6f, 0x72, 0x20, 0x6b, 0x2c, 0x20, 0x76, 0x20, 0x69, 0x6e, 0x20, 0x6e, 0x65, 0x78, 0x74,
|
||||
- 0x2c, 0x20, 0x66, 0x66, 0x69, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x69, 0x66, 0x20, 0x6b, 0x20, 0x7e, 0x3d, 0x20, 0x27, 0x67, 0x63, 0x27, 0x20, 0x74, 0x68,
|
||||
- 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
|
||||
- 0x66, 0x69, 0x5b, 0x6b, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x65,
|
||||
- 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6f, 0x73, 0x2e, 0x5b, 0x65, 0x78, 0x65, 0x63, 0x75,
|
||||
- 0x74, 0x65, 0x7c, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x7c, 0x6f, 0x73, 0x2e, 0x65,
|
||||
- 0x78, 0x65, 0x63, 0x5d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x61, 0x72, 0x65,
|
||||
- 0x20, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x61, 0x77, 0x61,
|
||||
- 0x72, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x6d, 0x64, 0x35, 0x20, 0x74, 0x68, 0x65,
|
||||
- 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x73, 0x75, 0x6d,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x67, 0x73, 0x75, 0x62, 0x20, 0x20, 0x20, 0x3d,
|
||||
- 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x67, 0x73, 0x75, 0x62, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x3d, 0x20,
|
||||
- 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x79, 0x74, 0x65, 0x20, 0x20, 0x20, 0x3d,
|
||||
- 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65, 0x0a, 0x0a, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73,
|
||||
- 0x75, 0x6d, 0x68, 0x65, 0x78, 0x61, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73,
|
||||
- 0x75, 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63,
|
||||
- 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
||||
- 0x74, 0x28, 0x22, 0x25, 0x30, 0x32, 0x78, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29,
|
||||
- 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e,
|
||||
- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x48, 0x45, 0x58,
|
||||
- 0x41, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
|
||||
- 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73, 0x75, 0x6d, 0x28, 0x6b, 0x29,
|
||||
- 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
|
||||
- 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
|
||||
- 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x30,
|
||||
- 0x32, 0x58, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20,
|
||||
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
|
||||
- 0x6e, 0x64, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x00
|
||||
+ 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69,
|
||||
+ 0x6f, 0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78,
|
||||
+ 0x5f, 0x69, 0x6f, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x0a, 0x6d, 0x74, 0x2e, 0x6c, 0x69, 0x6e,
|
||||
+ 0x65, 0x73, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x72,
|
||||
+ 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x57, 0x65, 0x20, 0x61,
|
||||
+ 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74,
|
||||
+ 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20,
|
||||
+ 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x6d, 0x65,
|
||||
+ 0x6e, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x6b, 0x70, 0x73, 0x65, 0x2e, 0x20, 0x54, 0x68, 0x69, 0x73,
|
||||
+ 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x2d, 0x2d, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
|
||||
+ 0x69, 0x6e, 0x20, 0x43, 0x6f, 0x6e, 0x54, 0x65, 0x58, 0x74, 0x2e, 0x0a, 0x0a, 0x69, 0x66, 0x20,
|
||||
+ 0x6b, 0x70, 0x73, 0x65, 0x75, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68,
|
||||
+ 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20,
|
||||
+ 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65,
|
||||
+ 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x3d,
|
||||
+ 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x70, 0x6f, 0x70, 0x65, 0x6e,
|
||||
+ 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65, 0x72, 0x6f,
|
||||
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x20,
|
||||
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61,
|
||||
+ 0x77, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f,
|
||||
+ 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x73, 0x65, 0x74, 0x65, 0x6e, 0x76, 0x20, 0x20, 0x3d,
|
||||
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x74, 0x65, 0x6d, 0x70,
|
||||
+ 0x64, 0x69, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
|
||||
+ 0x6f, 0x2e, 0x70, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x20, 0x20, 0x3d,
|
||||
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6e,
|
||||
+ 0x61, 0x6d, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6f,
|
||||
+ 0x73, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x74, 0x6d, 0x70, 0x66, 0x69, 0x6c, 0x65, 0x20,
|
||||
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x6f, 0x75, 0x74,
|
||||
+ 0x70, 0x75, 0x74, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x6c, 0x66, 0x73, 0x2e, 0x63, 0x68, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x20, 0x20,
|
||||
+ 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x74, 0x6f,
|
||||
+ 0x75, 0x63, 0x68, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c,
|
||||
+ 0x66, 0x73, 0x2e, 0x72, 0x6d, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x6c, 0x66, 0x73, 0x2e, 0x6d, 0x6b, 0x64, 0x69, 0x72, 0x20, 0x20, 0x3d,
|
||||
+ 0x20, 0x6e, 0x69, 0x6c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6f, 0x2e, 0x73, 0x61, 0x76,
|
||||
+ 0x65, 0x64, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x20, 0x3d, 0x20, 0x6c, 0x75, 0x61, 0x74, 0x65,
|
||||
+ 0x78, 0x5f, 0x69, 0x6f, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x6f, 0x6e,
|
||||
+ 0x6c, 0x79, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x73, 0x61, 0x66, 0x65,
|
||||
+ 0x72, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20, 0x6f, 0x72, 0x20,
|
||||
+ 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x7e, 0x3d, 0x20, 0x31,
|
||||
+ 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d,
|
||||
+ 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x66, 0x66, 0x69, 0x27, 0x29, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6b, 0x2c, 0x20, 0x76, 0x20, 0x69, 0x6e, 0x20,
|
||||
+ 0x6e, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x66, 0x66, 0x69, 0x20, 0x64, 0x6f, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x6b, 0x20, 0x7e, 0x3d, 0x20, 0x27, 0x67, 0x63,
|
||||
+ 0x27, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x5b, 0x6b, 0x5d, 0x20, 0x3d, 0x20, 0x6e, 0x69, 0x6c, 0x0a,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x65, 0x6e, 0x64, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x66, 0x69, 0x20, 0x3d, 0x20, 0x6e, 0x69,
|
||||
+ 0x6c, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x2d, 0x2d, 0x20, 0x6f, 0x73, 0x2e, 0x5b, 0x65,
|
||||
+ 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x7c, 0x6f, 0x73, 0x2e, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x7c,
|
||||
+ 0x6f, 0x73, 0x2e, 0x65, 0x78, 0x65, 0x63, 0x5d, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
|
||||
+ 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x68, 0x65, 0x6c, 0x6c, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65,
|
||||
+ 0x20, 0x61, 0x77, 0x61, 0x72, 0x65, 0x29, 0x0a, 0x0a, 0x0a, 0x69, 0x66, 0x20, 0x6d, 0x64, 0x35,
|
||||
+ 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
|
||||
+ 0x20, 0x73, 0x75, 0x6d, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75,
|
||||
+ 0x6d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x67, 0x73, 0x75, 0x62,
|
||||
+ 0x20, 0x20, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x67, 0x73, 0x75, 0x62,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
||||
+ 0x74, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
||||
+ 0x74, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x62, 0x79, 0x74, 0x65,
|
||||
+ 0x20, 0x20, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x62, 0x79, 0x74, 0x65,
|
||||
+ 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d,
|
||||
+ 0x64, 0x35, 0x2e, 0x73, 0x75, 0x6d, 0x68, 0x65, 0x78, 0x61, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73,
|
||||
+ 0x75, 0x62, 0x28, 0x73, 0x75, 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20,
|
||||
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66,
|
||||
+ 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x28, 0x22, 0x25, 0x30, 0x32, 0x78, 0x22, 0x2c, 0x62, 0x79, 0x74,
|
||||
+ 0x65, 0x28, 0x63, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e,
|
||||
+ 0x64, 0x29, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6d, 0x64, 0x35, 0x2e, 0x73, 0x75,
|
||||
+ 0x6d, 0x48, 0x45, 0x58, 0x41, 0x28, 0x6b, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x67, 0x73, 0x75, 0x62, 0x28, 0x73, 0x75,
|
||||
+ 0x6d, 0x28, 0x6b, 0x29, 0x2c, 0x20, 0x22, 0x2e, 0x22, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
|
||||
+ 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||
+ 0x28, 0x22, 0x25, 0x30, 0x32, 0x58, 0x22, 0x2c, 0x62, 0x79, 0x74, 0x65, 0x28, 0x63, 0x29, 0x29,
|
||||
+ 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x29, 0x29, 0x0a, 0x20,
|
||||
+ 0x20, 0x20, 0x20, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x65, 0x6e, 0x64, 0x0a, 0x0a, 0x00
|
||||
};
|
||||
return luaL_dostring(L, (const char*) luatex_core_lua);
|
||||
}
|
||||
\ No newline at end of file
|
||||
diff -Naur a/texk/web2c/luatexdir/lua/luatex-core.lua b/texk/web2c/luatexdir/lua/luatex-core.lua
|
||||
--- a/texk/web2c/luatexdir/lua/luatex-core.lua 2017-04-19 11:07:10.000000000 +0100
|
||||
+++ b/texk/web2c/luatexdir/lua/luatex-core.lua 2017-06-12 19:34:37.320003411 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
local io_open = io.open
|
||||
local io_popen = io.popen
|
||||
-local io_line = io.lines
|
||||
+local io_lines = io.lines
|
||||
|
||||
local fio_readline = fio.readline
|
||||
local fio_checkpermission = fio.checkpermission
|
||||
@@ -29,7 +29,7 @@
|
||||
local kpseused = status.kpse_used -- 0 1
|
||||
|
||||
io.saved_open = io_open -- can be protected
|
||||
-io.saved_popen = io_popen -- can be protected
|
||||
+-- (deleted for tl17 rebuild) io.saved_popen = io_popen -- can be protected
|
||||
io.saved_lines = io_lines -- always readonly
|
||||
mt.saved_lines = mt_lines -- always readonly
|
||||
|
||||
@@ -71,12 +71,16 @@
|
||||
end
|
||||
end
|
||||
|
||||
-local function luatex_io_lines(name)
|
||||
- local f = io_open(name,'r')
|
||||
- if f then
|
||||
- return function()
|
||||
- return fio_readline(f)
|
||||
+local function luatex_io_lines(name,how)
|
||||
+ if name then
|
||||
+ local f = io_open(name,how or 'r')
|
||||
+ if f then
|
||||
+ return function()
|
||||
+ return fio_readline(f)
|
||||
+ end
|
||||
end
|
||||
+ else
|
||||
+ return io_lines()
|
||||
end
|
||||
end
|
||||
|
||||
@@ -122,7 +126,6 @@
|
||||
lfs.rmdir = nil
|
||||
lfs.mkdir = nil
|
||||
|
||||
- io.saved_popen = nil
|
||||
io.saved_open = luatex_io_open_readonly
|
||||
|
||||
end
|
||||
diff -Naur a/texk/web2c/luatexdir/luatex.c b/texk/web2c/luatexdir/luatex.c
|
||||
--- a/texk/web2c/luatexdir/luatex.c 2017-03-31 14:27:09.000000000 +0100
|
||||
+++ b/texk/web2c/luatexdir/luatex.c 2017-06-11 01:49:11.813308882 +0100
|
||||
@@ -28,9 +28,11 @@
|
||||
|
||||
#define TeX
|
||||
|
||||
+/* for tl17 update, change luatex_date_info but nothing else,
|
||||
+ as context depends on the numeric version number. */
|
||||
int luatex_version = 100; /* \.{\\luatexversion} */
|
||||
int luatex_revision = '4'; /* \.{\\luatexrevision} */
|
||||
-int luatex_date_info = 2017033109; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/
|
||||
+int luatex_date_info = 2017060901; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/
|
||||
const char *luatex_version_string = "1.0.4";
|
||||
const char *engine_name = my_name; /* the name of this engine */
|
||||
|
||||
File diff suppressed because it is too large
Load diff
824
source/t/texlive/prep/texmf_get.sh
Normal file → Executable file
824
source/t/texlive/prep/texmf_get.sh
Normal file → Executable file
File diff suppressed because it is too large
Load diff
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# TeXLive build script for Slackware
|
||||
|
||||
# Copyright 2009, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# Copyright 2009, 2017 - 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
||||
# Copyright 2009-2014 Robby Workman, Northport, AL, USA
|
||||
# Copyright 2016-2017 Johannes Schoepfer, Germany
|
||||
# All rights reserved.
|
||||
|
|
@ -26,13 +26,14 @@
|
|||
|
||||
# URL: ftp://tug.org/historic/systems/texlive/
|
||||
# Testrelease: ftp://tug.org/texlive/Images/test/
|
||||
# Upstream stable fixes: svn://tug.org/texlive/branches/branch2018/Build/source
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=texlive
|
||||
SOURCEVERSION=${SOURCEVERSION:-20170520}
|
||||
VERSION=${VERSION:-2017.171108}
|
||||
BUILD=${BUILD:-7}
|
||||
SOURCEVERSION=${SOURCEVERSION:-20180414}
|
||||
VERSION=${VERSION:-2018.180630}
|
||||
BUILD=${BUILD:-1}
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-texlive
|
||||
|
|
@ -99,13 +100,15 @@ sed -i \
|
|||
# prevent compiling Xdvi with libXp
|
||||
sed -i 's|-lXp ||' texk/xdvik/configure
|
||||
|
||||
# Thanks to the lfs-folks ...
|
||||
patch -Np1 -i $CWD/patches/texlive-20170524-source-gcc7-1.patch || exit 1
|
||||
patch -Np1 -i $CWD/patches/texlive-20170524-source-upstream_fixes-2.patch || exit 1
|
||||
# Upstream stable fixes
|
||||
patch -Np0 -i $CWD/patches/20180625.diff || exit 1
|
||||
|
||||
# Thanks to archlinux for the poppler-0.59 API fixup patch:
|
||||
# The 2018 version of texlive ships with support for poppler-0.57.0 and older,
|
||||
# but it includes alternative newpoppler files which enable building with
|
||||
# poppler-0.62.0 or newer.
|
||||
if [ ! "$SYSTEMPOPPLER" = "NO" ]; then
|
||||
patch -Np1 -i $CWD/patches/texlive-poppler-0.59.patch || exit 1
|
||||
mv -v texk/web2c/pdftexdir/pdftoepdf{-newpoppler,}.cc || exit 1
|
||||
mv -v texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc || exit 1
|
||||
fi
|
||||
|
||||
# --with-system-harfbuzz requires graphite2 (and harfbuzz linked to it)
|
||||
|
|
@ -148,6 +151,7 @@ cd build
|
|||
--without-system-harfbuzz \
|
||||
--disable-aleph \
|
||||
--disable-dump-share \
|
||||
--disable-linked-scripts \
|
||||
$POPPLER \
|
||||
--build=$ARCH-slackware-linux || exit 1
|
||||
|
||||
|
|
@ -155,29 +159,29 @@ cd build
|
|||
# make check || exit 1
|
||||
make install-strip DESTDIR=$PKG || exit 1
|
||||
|
||||
# Don't ship .la files:
|
||||
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
|
||||
|
||||
# Remove all files which are covered by tlnet
|
||||
rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info
|
||||
|
||||
# install the tlnet stuff
|
||||
mkdir -p $PKG/usr/share
|
||||
tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1
|
||||
chown -R root:root $PKG
|
||||
chmod -R u+w,go-w,a+rX-st $PKG
|
||||
|
||||
# Create symlinks
|
||||
make texlinks DESTDIR=$PKG || exit 1
|
||||
|
||||
cd ..
|
||||
|
||||
# Don't ship .la files:
|
||||
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
|
||||
|
||||
# Remove all files which are covered by tlnet
|
||||
rm -rf $PKG/usr/share $PKG/usr/man $PKG/usr/info
|
||||
|
||||
# install the tlnet stuff
|
||||
mkdir -p $PKG/usr/share
|
||||
tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG/usr/share || exit 1
|
||||
chown -R root:root $PKG
|
||||
chmod -R u+w,go-w,a+rX-st $PKG
|
||||
|
||||
# use symlinks/scripts from tlnet
|
||||
mv $PKG/usr/share/texmf-dist/linked_scripts/* $PKG/usr/bin
|
||||
rmdir $PKG/usr/share/texmf-dist/linked_scripts
|
||||
|
||||
# set some paths
|
||||
sed -i \
|
||||
-e 's|^TEXMFROOT.*|TEXMFROOT = $SELFAUTODIR/share|' \
|
||||
-e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local|' \
|
||||
-e 's|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|' \
|
||||
-e 's|texlive20[0-9][0-9]|texlive|g' \
|
||||
$PKG/usr/share/texmf-dist/web2c/texmf.cnf
|
||||
|
||||
# disable obsolete aleph/lamed/cslatex/pdfcslatex
|
||||
|
|
@ -192,7 +196,6 @@ sed -i \
|
|||
sed -i \
|
||||
-e 's|selfautoparent:|/usr/share/|g' \
|
||||
-e 's|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1"/usr/share/texmf-local"|' \
|
||||
-e 's|texlive20[0-9][0-9]|texlive|g' \
|
||||
-e '/selfautodir/d' \
|
||||
-e '/texmflocal/d' \
|
||||
$PKG/usr/share/texmf-dist/web2c/texmfcnf.lua
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
http://mirrors.ctan.org/systems/texlive/Source/texlive-20170520-source.tar.xz
|
||||
5456dfd7858fe53cdd0fda5f0eb4fd35
|
||||
|
||||
http://slackware.schoepfer.info/slackbuilds/texlive/2017/texlive/texlive-base-2017.170622.tar.xz
|
||||
29bee4e0671431334fc1dcae3e0087c0
|
||||
|
||||
http://mirrors.ctan.org/systems/texlive/Source/texlive-20180414-source.tar.xz
|
||||
http://slackware.schoepfer.info/slackbuilds/texlive/2018/texlive/texlive-base-2018.180630.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3
|
||||
1
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3
|
||||
1
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3
|
||||
1
|
||||
|
|
|
|||
Loading…
Reference in a new issue