diff options
| author | wiz <wiz@pkgsrc.org> | 2005-12-01 18:13:24 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-12-01 18:13:24 +0000 |
| commit | f09aca06578240189d7201185eeed813a7c34a3d (patch) | |
| tree | 2d1b8c3a6a8f1ae4947bc4b4edba1de95928ddda | |
| parent | 52f9b84fd7a71986298761f27264676d3f643826 (diff) | |
| download | pkgsrc-f09aca06578240189d7201185eeed813a7c34a3d.tar.gz | |
Regen patches in diff -u format.
Replace files/info.patch with usual patch files and a post-install fix.
50 files changed, 820 insertions, 827 deletions
diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 8c4e47b952c..d7df9052229 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/12/01 17:34:41 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/01 18:13:24 wiz Exp $ DISTNAME= mule-2.3 PKGREVISION= 2 @@ -40,11 +40,6 @@ MAN1= coco.1 ctags.1 etags.1 m2ps.1 mule.1 .include "../../mk/x11.buildlink3.mk" -post-patch: - @${ECHO_MSG} "===> Applying jumbo patches in info directory" - @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/info.patch - @${RM} -f ${WRKSRC}/info/*.orig - # Fix character mapping for pkgsrc/fonts/intlfonts post-install: ${SED} \ @@ -53,5 +48,13 @@ post-install: -e 's/jiskan24/j83-48/' \ < ${WRKSRC}/etc/CHARSETS > ${PREFIX}/lib/mule/19.28/etc/CHARSETS #diff -u ${WRKSRC}/etc/CHARSETS ${PREFIX}/lib/mule/19.28/etc/CHARSETS +.for f in info/CCL.orig info/ISO2022.orig info/R2L.orig info/XFONT.orig \ +info/antenews-jp.orig info/canna-jp.orig info/egg-jp-1.orig \ +info/egg-jp-2.orig info/egg-jp.orig info/egg.orig info/kbd-trans.orig \ +info/languages.orig info/m2ps.orig info/mule-jp-1.orig info/mule-jp-2.orig \ +info/mule-jp-3.orig info/mule-jp.orig info/mule.orig info/quail.orig \ +info/terminology.orig + ${RM} ${PREFIX}/${f} +.endfor .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule/distinfo b/editors/mule/distinfo index 6ab02ef7683..83f9a4bf05a 100644 --- a/editors/mule/distinfo +++ b/editors/mule/distinfo @@ -1,32 +1,52 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 17:15:11 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/12/01 18:13:24 wiz Exp $ SHA1 (mule-2.3.tar.gz) = 52737767955caf2fde34b994f367a89c5d8a045f RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf Size (mule-2.3.tar.gz) = 10240256 bytes -SHA1 (patch-aa) = 1ef62f91bb274681045fb4ce8a1c220544a0fbf6 -SHA1 (patch-ab) = f7df46aab05a2a7c7c3d9dbc26f29091e0320734 -SHA1 (patch-ac) = e8e2c9ec75b2068504bcb972e21e71d9c30aa199 -SHA1 (patch-ad) = 4e308d622f57f6a959ee69e65db95f004193e6d4 -SHA1 (patch-ae) = 37eab48ec58662aae825b48960fbcf3997a89fdf -SHA1 (patch-af) = 8337bad716064a0b13d0124c48fe8b7489e1896f -SHA1 (patch-ag) = 01a77ea82bef89b1c2b167be88cf310119582a1f -SHA1 (patch-ah) = a7462f106348a6ac8ca86b7b6d226f0762ce6a34 -SHA1 (patch-ai) = 3a949402e0f7ea5712cecf9702bf077a329fc106 -SHA1 (patch-aj) = fa1d1fd367a4fe546a2a14dc8dd11d283b3f23a9 -SHA1 (patch-ak) = f27b7c10276ff612256935731f8b30fd3a84d5a1 -SHA1 (patch-al) = f1c3300af7d7dda02c1c7b3ac465ecb1f28c3b1d -SHA1 (patch-am) = db0cb7e7735f115846c4590c5d5ca0b5154b82be -SHA1 (patch-an) = 205f9a5a857454a6daaf3ca8c737043be9782352 -SHA1 (patch-ao) = 4665ee4d0f22f832752a356ebeaae88582bb6054 -SHA1 (patch-ar) = a79be484016d32422e8d7de001f829ebf63a06e4 -SHA1 (patch-as) = 1b978df26a2bc302ee9b5f20c5390b13647ee448 -SHA1 (patch-au) = a7a9759961fa6a7f845de5b44a00575795ce40ed -SHA1 (patch-av) = 197a6b921bb6ce962bda131383c3d153fa712d6f -SHA1 (patch-aw) = 7a21c26b2a6621216f972d5bc7125b6df1c628ca -SHA1 (patch-az) = 5f2658fd2bac0f19ad5e179d5c52728e2bbfb510 -SHA1 (patch-ba) = 9652fcb9e59787399ebc477e4d3825cce2c3ac88 -SHA1 (patch-bb) = 70dbf921cd7d9f876189571779bcb3f894325a05 -SHA1 (patch-bc) = 1f131a612cd31c42910f71d96728416236081d85 -SHA1 (patch-bd) = 8fcaac760834208f06a44bd5c0776463864818ad -SHA1 (patch-be) = c406e32f5fdfa3ec7c78ea39594332252682f156 -SHA1 (patch-bf) = e8ae7e85bfdbef077fc5b685ca69583d1f8d4ddf +SHA1 (patch-aa) = 927ec514204ef97101fb3f4ab77eec1c71af23f1 +SHA1 (patch-ab) = ffb7afcac57932cfe477b87daa5579b54aea3672 +SHA1 (patch-ac) = 170fa4f6c17c805dd32a90e8bfb3e38c48a9fc20 +SHA1 (patch-ad) = cd36f675094eaa704e6143e4d1881deae55a9dbf +SHA1 (patch-ae) = 1f020aaeb75cd7dd2b827ab34382e472add09719 +SHA1 (patch-af) = 2672b9c724cfed135218a76e857fd26ebe3676ac +SHA1 (patch-ag) = 590fe919b44722f7ba1e390cf7fecbc20eeeba06 +SHA1 (patch-ah) = 9d8d65d8f18057038618466a969f93c074b5937f +SHA1 (patch-ai) = 584a0b5bdcd15a096761637755173ecf6d360d73 +SHA1 (patch-aj) = c240cbff3da3ca33663fc2e1d04a3c60c84b4d70 +SHA1 (patch-ak) = e032f40e0c0c1456b5db9cb2631a4dbc25b1568d +SHA1 (patch-al) = d285889a4ba7989c0c0d30a5bc4e259c27914823 +SHA1 (patch-am) = 4ce76f12b3f8e2744bfd4cf683c4abc82ad60af0 +SHA1 (patch-an) = 9221c9747c7cf600e9915f8428178d33a55d180b +SHA1 (patch-ao) = d878149708394d86bd8e98b771282e17cf95607b +SHA1 (patch-ap) = 7de7d9c78d71a6c7df5329880f7de8bfb63f0936 +SHA1 (patch-aq) = 9d8722668d68255e75e763a59e9de491d24dd035 +SHA1 (patch-ar) = ec12f012baa8eafe9c5fad8701a168598a0ffb08 +SHA1 (patch-as) = 215abc3071fa40a4e0748c2321f52b63466c8fdf +SHA1 (patch-at) = ff3f2381922ded2f2841339a9a1274f3f833f302 +SHA1 (patch-au) = 97e419ccba2e621a024da72a4be6f3c95151e43b +SHA1 (patch-av) = 67e68c2a83a1d881e7005ff87f02ab577d061041 +SHA1 (patch-aw) = f3813ff7b3f548ea67cf2b6dfce09bac4c5a3815 +SHA1 (patch-ax) = 561588aaa07ec130df06f2fac667f7c202891812 +SHA1 (patch-ay) = 83c072b716d1457fd66fbf87b01fca0aef08c447 +SHA1 (patch-az) = 16d78ec1f126c8edec2ce370704f77cd87b47da6 +SHA1 (patch-ba) = b65fa5abdb80d31573f2856fd7317c92f5741a0a +SHA1 (patch-bb) = 09c53a3ab6169ee33c4afdbd3e108874627117e2 +SHA1 (patch-bc) = 50439819ced9e116e558ac61451442911dff9fd3 +SHA1 (patch-bd) = 413995887f8898faac75e93d0bfc6c2fb87a1b43 +SHA1 (patch-be) = 85658caaf28202b2dc07172c671d18441ce1e494 +SHA1 (patch-bf) = 589fc4ab741448626467a62f0624b8c6ce406ecd +SHA1 (patch-bg) = 4fb1d27e69961bbe5a90efe8e73bf0de6f5c491d +SHA1 (patch-bh) = 31963f9b430e56e7b0ee30f3d5479c22df4cf18c +SHA1 (patch-bi) = 899f8d66add66c54ebc59f3127524d7fae0c7724 +SHA1 (patch-bj) = 034a3dc3942b6faa552a92b3ab44a2a3d133e451 +SHA1 (patch-bk) = 05a2942743efb042f488da7f9ae2e6463fdaa785 +SHA1 (patch-bl) = d6477f0e68e198489f93302ea00cd948bbfde5a1 +SHA1 (patch-bm) = adaed4a1bafb3d524e56f713e8562e5f4ff7d02a +SHA1 (patch-bn) = e4e082342273b1a6ff7bf1d421930cfe8ae5cd9f +SHA1 (patch-bo) = a9941b9a2937a916d8314f0db6331775d0eb0551 +SHA1 (patch-bp) = c082155786c2ec508ba4f0de850d84a1cd56527a +SHA1 (patch-bq) = 51ac117ab0e1d30a88fbfc0bb8dca6abf07b273b +SHA1 (patch-br) = 52fa52b4e475fe2083a72d8f0264ff99cdfa60e5 +SHA1 (patch-bs) = 1fd5b02129bb356ab422e83812b83c7ff656af8c +SHA1 (patch-bt) = b0f3c38e61ae211f35695d2522f1f7440a944302 +SHA1 (patch-bu) = a8ccd87510615e5353bb9525cd0fcfafdf56ea07 diff --git a/editors/mule/files/info.patch b/editors/mule/files/info.patch deleted file mode 100644 index 78e16e1a7a5..00000000000 --- a/editors/mule/files/info.patch +++ /dev/null @@ -1,290 +0,0 @@ -$NetBSD: info.patch,v 1.1.1.1 2000/11/21 05:21:08 kei Exp $ - ---- info/CCL.orig Thu Nov 16 23:13:27 2000 -+++ info/CCL Thu Nov 16 23:16:47 2000 -@@ -3,7 +3,10 @@ - from file `CCL.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* CCL: (CCL). Code Conversion Language. -+END-INFO-DIR-ENTRY - - - File: CCL, Node: Top, Up: (mule) ---- info/ISO2022.orig Thu Nov 16 23:14:20 2000 -+++ info/ISO2022 Thu Nov 16 23:16:52 2000 -@@ -3,7 +3,10 @@ - from file `ISO2022.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* ISO2022: (ISO2022). ISO2022 encoding system. -+END-INFO-DIR-ENTRY - - - File: ISO2022, Node: Top, Up: (mule) ---- info/R2L.orig Thu Nov 16 23:16:04 2000 -+++ info/R2L Thu Nov 16 23:16:32 2000 -@@ -3,7 +3,10 @@ - from file `R2L.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* R2L: (R2L). Right-to-left writing on Mule. -+END-INFO-DIR-ENTRY - - - File: R2L, Node: Top, Up: (mule) ---- info/XFONT.orig Thu Nov 16 23:35:33 2000 -+++ info/XFONT Thu Nov 16 23:37:17 2000 -@@ -2,7 +2,9 @@ - produced by texinfo-format-buffer - from file: XFONT.texi - -- -+START-INFO-DIR-ENTRY -+* XFONT: (XFONT). X's FONT usage. -+END-INFO-DIR-ENTRY - - - File: XFONT Node: Top, Up: (mule) ---- info/antenews-jp.orig Thu Nov 16 23:57:34 2000 -+++ info/antenews-jp Thu Nov 16 23:59:26 2000 -@@ -3,6 +3,10 @@ - from file `antenews-jp.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Antenews-jp: (antenews-jp). Antenews of Emacs 19. (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: antenews-jp, Node: Top, Next: Basic Changes, Up: (dir) ---- info/canna-jp.orig Thu Nov 16 23:17:23 2000 -+++ info/canna-jp Thu Nov 16 23:27:01 2000 -@@ -2,7 +2,11 @@ - produced by texinfo-format-buffer - from file: canna-jp.texinfo - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Canna-jp: (canna-jp). Japanese Inputting method Canna. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: canna-jp Node: Top, Prev: (dir), Up: (dir), Next: 概説 ---- info/egg-jp-1.orig Thu Nov 16 23:24:54 2000 -+++ info/egg-jp-1 Thu Nov 16 23:26:29 2000 -@@ -2,8 +2,11 @@ - produced by texinfo-format-buffer - from file: egg-jp.texi - -- -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: egg-jp Node: Top, Up: (dir), Next: Overview ---- info/egg-jp-2.orig Thu Nov 16 23:25:00 2000 -+++ info/egg-jp-2 Thu Nov 16 23:26:40 2000 -@@ -2,8 +2,11 @@ - produced by texinfo-format-buffer - from file: egg-jp.texi - -- -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: egg-jp Node: Editing, Prev: Registration, Up: Dictionary Management, Next: Customization ---- info/egg-jp.orig Thu Nov 16 23:24:46 2000 -+++ info/egg-jp Thu Nov 16 23:26:20 2000 -@@ -2,8 +2,11 @@ - produced by texinfo-format-buffer - from file: egg-jp.texi - -- -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - Indirect: ---- info/egg.orig Thu Nov 16 23:22:57 2000 -+++ info/egg Thu Nov 16 23:28:48 2000 -@@ -3,7 +3,10 @@ - from file `egg.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* egg: (egg). Built-in Chinese/Japanese Inputting method for Mule. -+END-INFO-DIR-ENTRY - - - File: egg, Node: Top, Up: (mule) ---- info/kbd-trans.orig Thu Nov 16 23:37:34 2000 -+++ info/kbd-trans Thu Nov 16 23:38:39 2000 -@@ -3,7 +3,10 @@ - from file `kbd-trans.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* kbd-trans: (kbd-trans). keyboard translation on Mule. -+END-INFO-DIR-ENTRY - - - File: kbd-trans, Node: Top, Up: (mule) ---- info/languages.orig Thu Nov 16 23:39:23 2000 -+++ info/languages Thu Nov 16 23:41:03 2000 -@@ -3,7 +3,10 @@ - from file `languages.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* languages: (languages). various Asian and European languages in Mule. -+END-INFO-DIR-ENTRY - - - File: languages, Node: Top, Up: (mule) ---- info/m2ps.orig Thu Nov 16 23:41:11 2000 -+++ info/m2ps Thu Nov 16 23:41:46 2000 -@@ -3,7 +3,10 @@ - from file `m2ps.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* m2ps: (m2ps). Converter from Mule code to PostScript. -+END-INFO-DIR-ENTRY - - - File: m2ps, Node: Top, Up: (mule) ---- info/mule-jp-1.orig Thu Nov 16 23:53:22 2000 -+++ info/mule-jp-1 Thu Nov 16 23:54:40 2000 -@@ -3,7 +3,11 @@ - from file `mule-jp.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: mule-jp, Node: Top, Next: Overview, Up: (dir) ---- info/mule-jp-2.orig Thu Nov 16 23:53:22 2000 -+++ info/mule-jp-2 Thu Nov 16 23:54:42 2000 -@@ -3,7 +3,11 @@ - from file `mule-jp.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: mule-jp, Node: Set Coding System, Next: Key Input, Prev: Buffers, Up: Multilingual Char ---- info/mule-jp-3.orig Thu Nov 16 23:53:22 2000 -+++ info/mule-jp-3 Thu Nov 16 23:54:45 2000 -@@ -3,7 +3,11 @@ - from file `mule-jp.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - File: mule-jp, Node: Justifying, Next: Enhancement, Prev: Filling, Up: Filling&Justifying ---- info/mule-jp.orig Thu Nov 16 23:53:22 2000 -+++ info/mule-jp Thu Nov 16 23:54:36 2000 -@@ -3,7 +3,11 @@ - from file `mule-jp.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. -+ (written in Japanese) -+END-INFO-DIR-ENTRY - - - Indirect: ---- info/mule.orig Thu Nov 16 23:46:33 2000 -+++ info/mule Thu Nov 16 23:51:31 2000 -@@ -3,6 +3,10 @@ - from file `mule.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Mule: (mule). MULtilingual Enhancement to GNU Emacs. -+END-INFO-DIR-ENTRY - - This file documents the internal structure of Mule (MULtilingual - Enhancement to GNU Emacs). ---- info/quail.orig Thu Nov 16 23:53:27 2000 -+++ info/quail Thu Nov 16 23:55:28 2000 -@@ -3,7 +3,10 @@ - from file `quail.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* quail: (quail). Imputting methods of multilingual text on Mule. -+END-INFO-DIR-ENTRY - - - File: quail, Node: Top, Up: (mule) ---- info/terminology.orig Thu Nov 16 23:59:54 2000 -+++ info/terminology Fri Nov 17 00:01:42 2000 -@@ -3,7 +3,10 @@ - from file `terminology.texi' - using `texinfmt.el' version 2.32 of 19 November 1993. - -- -+INFO-DIR-SECTION Editors -+START-INFO-DIR-ENTRY -+* Terminology: (terminology). Terminology used by Mule. -+END-INFO-DIR-ENTRY - - - File: terminology, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-aa b/editors/mule/patches/patch-aa index 57d1b1480c7..18b8fe7f492 100644 --- a/editors/mule/patches/patch-aa +++ b/editors/mule/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-aa,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/s/netbsd.h.orig Thu Oct 12 19:53:15 1995 -+++ src/s/netbsd.h Sun Sep 19 12:36:05 1999 +--- src/s/netbsd.h.orig 1995-10-12 11:53:15.000000000 +0100 ++++ src/s/netbsd.h @@ -3,6 +3,10 @@ /* Get most of the stuff from bsd4.3 */ #include "bsd4-3.h" diff --git a/editors/mule/patches/patch-ab b/editors/mule/patches/patch-ab index ec4ee710b21..c89b71250b9 100644 --- a/editors/mule/patches/patch-ab +++ b/editors/mule/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/unexelf.c.orig Fri Oct 21 13:21:00 1994 -+++ src/unexelf.c Sat May 13 14:04:55 2000 +--- src/unexelf.c.orig 1994-10-21 05:21:00.000000000 +0100 ++++ src/unexelf.c @@ -1,19 +1,22 @@ /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992 Free Software Foundation, Inc. @@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve -@@ -30,14 +33,14 @@ +@@ -30,14 +33,14 @@ what you give them. Help stamp out sof * Modified heavily since then. * * Synopsis: @@ -57,7 +57,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ * * The boundaries within the a.out file may be adjusted with the data_start * and bss_start arguments. Either or both may be given as 0 for defaults. -@@ -98,64 +101,64 @@ +@@ -98,64 +101,64 @@ temacs: Link Info Adralgn Entsize [1] 1 2 0x80480d4 0xd4 0x13 .interp @@ -142,7 +142,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs -@@ -166,67 +169,67 @@ +@@ -166,67 +169,67 @@ xemacs: Link Info Adralgn Entsize [1] 1 2 0x80480d4 0xd4 0x13 .interp @@ -231,7 +231,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ * This is an example of how the file header is changed. "Shoff" is * the section header offset within the file. Since that table is -@@ -276,20 +279,20 @@ +@@ -276,20 +279,20 @@ temacs: Type Offset Vaddr Paddr Filesz Memsz Flags Align @@ -262,7 +262,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs -@@ -298,42 +301,42 @@ +@@ -298,42 +301,42 @@ xemacs: Type Offset Vaddr Paddr Filesz Memsz Flags Align @@ -325,7 +325,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ * 1. ELF header e_shstrndx field. * 2. section header sh_link and sh_info field. * 3. symbol table entry st_shndx field. -@@ -345,67 +348,67 @@ +@@ -345,67 +348,67 @@ Filesz Memsz Flags Alig Link Info Adralgn Entsize [1] 1 2 0x80480d4 0xd4 0x13 .interp @@ -414,7 +414,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ */ -@@ -417,15 +420,130 @@ +@@ -417,15 +420,130 @@ Filesz Memsz Flags Alig #include <errno.h> #include <unistd.h> #include <fcntl.h> @@ -545,7 +545,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ #ifndef ELF_BSS_SECTION_NAME #define ELF_BSS_SECTION_NAME ".bss" #endif -@@ -433,15 +551,38 @@ +@@ -433,15 +551,38 @@ extern void fatal (char *, ...); /* Get the address of a particular section or program header entry, * accounting for the size of the entries. */ @@ -588,7 +588,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ #define PATCH_INDEX(n) \ do { \ -@@ -451,9 +592,9 @@ +@@ -451,9 +592,9 @@ typedef unsigned char byte; /* Round X up to a multiple of Y. */ @@ -600,7 +600,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ { int rem = x % y; if (rem == 0) -@@ -461,6 +602,47 @@ +@@ -461,6 +602,47 @@ round_up (x, y) return x - rem + y; } @@ -648,7 +648,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ /* **************************************************************** * unexec * -@@ -483,19 +665,23 @@ +@@ -483,19 +665,23 @@ unexec (new_name, old_name, data_start, /* Pointers to the file, program and section headers for the old and new * files. */ @@ -679,7 +679,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ struct stat stat_buf; /* Open the old file & map it into the address space. */ -@@ -508,7 +694,8 @@ +@@ -508,7 +694,8 @@ unexec (new_name, old_name, data_start, if (fstat (old_file, &stat_buf) == -1) fatal ("Can't fstat (%s): errno %d\n", old_name, errno); @@ -689,7 +689,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ if (old_base == (caddr_t) -1) fatal ("Can't mmap (%s): errno %d\n", old_name, errno); -@@ -520,9 +707,9 @@ +@@ -520,9 +707,9 @@ unexec (new_name, old_name, data_start, /* Get pointers to headers & section names */ @@ -702,7 +702,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ old_section_names = (char *) old_base + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset; -@@ -544,16 +731,61 @@ +@@ -544,16 +731,61 @@ unexec (new_name, old_name, data_start, if (old_bss_index == old_file_h->e_shnum) fatal ("Can't find .bss in %s.\n", old_name, 0); @@ -766,7 +766,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ #ifdef DEBUG fprintf (stderr, "old_bss_index %d\n", old_bss_index); -@@ -582,15 +814,20 @@ +@@ -582,15 +814,20 @@ unexec (new_name, old_name, data_start, if (ftruncate (new_file, new_file_size)) fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno); @@ -792,7 +792,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ ((byte *) new_base + old_file_h->e_shoff + new_data2_size); /* Make our new file, program and section headers as copies of the -@@ -633,8 +870,14 @@ +@@ -633,8 +870,14 @@ unexec (new_name, old_name, data_start, if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment) alignment = OLD_SECTION_H (old_bss_index).sh_addralign; @@ -807,7 +807,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ if (NEW_PROGRAM_H (n).p_type == PT_LOAD && (round_up ((NEW_PROGRAM_H (n)).p_vaddr -@@ -646,9 +889,16 @@ +@@ -646,9 +889,16 @@ unexec (new_name, old_name, data_start, if (n < 0) fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0); @@ -825,7 +825,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ #if 0 /* Maybe allow section after data2 - does this ever happen? */ for (n = new_file_h->e_phnum - 1; n >= 0; n--) { -@@ -675,18 +925,27 @@ +@@ -675,18 +925,27 @@ unexec (new_name, old_name, data_start, if (old_data_index == old_file_h->e_shnum) fatal ("Can't find .data in %s.\n", old_name, 0); @@ -857,7 +857,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ NEW_SECTION_H (nn).sh_addr = new_data2_addr; NEW_SECTION_H (nn).sh_offset = new_data2_offset; NEW_SECTION_H (nn).sh_size = new_data2_size; -@@ -696,37 +955,87 @@ +@@ -696,37 +955,87 @@ unexec (new_name, old_name, data_start, NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (n).sh_addralign; /* Now copy over what we have in the memory now. */ @@ -960,7 +960,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ PATCH_INDEX (NEW_SECTION_H (nn).sh_link); /* For symbol tables, info is a symbol table index, so don't change it. */ -@@ -738,7 +1047,7 @@ +@@ -738,7 +1047,7 @@ unexec (new_name, old_name, data_start, if (NEW_SECTION_H (nn).sh_type == SHT_NULL || NEW_SECTION_H (nn).sh_type == SHT_NOBITS) continue; @@ -969,7 +969,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ /* Write out the sections. .data and .data1 (and data2, called ".data" in the strings table) get copied from the current process instead of the old file. */ -@@ -747,22 +1056,54 @@ +@@ -747,22 +1056,54 @@ unexec (new_name, old_name, data_start, || !strcmp ((old_section_names + NEW_SECTION_H(n).sh_name), ".sdata") #endif @@ -1027,7 +1027,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ new_base); for (; num--; sym++) { -@@ -770,7 +1111,7 @@ +@@ -770,7 +1111,7 @@ unexec (new_name, old_name, data_start, || (sym->st_shndx == SHN_ABS) || (sym->st_shndx == SHN_COMMON)) continue; @@ -1036,7 +1036,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ PATCH_INDEX (sym->st_shndx); } } -@@ -780,21 +1121,71 @@ +@@ -780,22 +1121,72 @@ unexec (new_name, old_name, data_start, for (n = new_file_h->e_shnum - 1; n; n--) { byte *symnames; @@ -1063,7 +1063,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ + || strcmp ((char *) (symnames + symp->st_name), "edata") == 0) memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr)); } -+ + + /* This loop seeks out relocation sections for the data section, so + that it can undo relocations performed by the runtime linker. */ + for (n = new_file_h->e_shnum - 1; n; n--) @@ -1110,6 +1110,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ + if (write (new_file, new_base, new_file_size) != new_file_size) + fatal ("Can't write (%s): errno %d\n", new_name, errno); +#endif - ++ /* Close the files and make the new file executable. */ + if (close (old_file)) diff --git a/editors/mule/patches/patch-ac b/editors/mule/patches/patch-ac index 002845572a8..390d2ea4d6a 100644 --- a/editors/mule/patches/patch-ac +++ b/editors/mule/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ac,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- lib-src/Makefile.in.in.orig Mon Dec 19 13:13:45 1994 -+++ lib-src/Makefile.in.in Sun Sep 27 19:22:21 1998 -@@ -206,7 +206,7 @@ +--- lib-src/Makefile.in.in.orig 1994-12-19 05:13:45.000000000 +0100 ++++ lib-src/Makefile.in.in +@@ -206,7 +206,7 @@ ${archlibdir}: all if [ `(cd ${archlibdir} && /bin/pwd)` \ != `(cd ${srcdir} && /bin/pwd)` ]; then \ for file in ${SCRIPTS}; do \ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ done ; \ fi -@@ -219,7 +219,7 @@ +@@ -219,7 +219,7 @@ install: ${archlibdir} (cd ..; $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ done for file in ${INSTALLABLE_SCRIPTS} ; do \ diff --git a/editors/mule/patches/patch-ad b/editors/mule/patches/patch-ad index 596f2f7632f..751f4c7b935 100644 --- a/editors/mule/patches/patch-ad +++ b/editors/mule/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2001/03/18 14:14:24 kei Exp $ +$NetBSD: patch-ad,v 1.3 2005/12/01 18:13:24 wiz Exp $ ---- configure.orig Mon Jun 5 10:11:38 1995 -+++ configure Wed Jan 24 22:00:48 2001 -@@ -581,12 +581,14 @@ +--- configure.orig 1995-06-05 03:11:38.000000000 +0200 ++++ configure +@@ -581,12 +581,14 @@ case "${canonical}" in *-*-netbsd* ) opsys=netbsd case "${canonical}" in diff --git a/editors/mule/patches/patch-ae b/editors/mule/patches/patch-ae index cb5215fd4da..306b5fceb50 100644 --- a/editors/mule/patches/patch-ae +++ b/editors/mule/patches/patch-ae @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ae,v 1.2 2005/12/01 18:13:24 wiz Exp $ NetBSD patch-bd,v 1.2 1999/06/04 04:15:44 mycroft Exp original patch from editors/emacs pkg. ---- /dev/null Mon Sep 20 13:51:57 1999 -+++ src/m/powerpc.h Mon Sep 20 23:21:37 1999 +--- src/m/powerpc.h.orig 2005-12-01 18:47:01.000000000 +0100 ++++ src/m/powerpc.h @@ -0,0 +1,165 @@ +/* machine description file For the PowerPC chip. + Copyright (C) 1994, 1997 Free Software Foundation, Inc. diff --git a/editors/mule/patches/patch-af b/editors/mule/patches/patch-af index a4cc8b29f35..88dc93e9981 100644 --- a/editors/mule/patches/patch-af +++ b/editors/mule/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-af,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/lisp.h.orig Mon Sep 20 13:42:34 1999 -+++ src/lisp.h Mon Sep 20 13:43:50 1999 -@@ -30,6 +30,10 @@ +--- src/lisp.h.orig 1994-10-21 05:20:28.000000000 +0100 ++++ src/lisp.h +@@ -30,6 +30,10 @@ the Free Software Foundation, 675 Mass A /* 93.1.15 modified for Mule Ver.0.9.7.1 by Y.Akiba <akiba@cbs.canon.co.jp> Patch for NeXT is updated. */ diff --git a/editors/mule/patches/patch-ag b/editors/mule/patches/patch-ag index 7dc741a734f..12a19c067f2 100644 --- a/editors/mule/patches/patch-ag +++ b/editors/mule/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ag,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/coding.c.orig Mon Sep 20 23:39:02 1999 -+++ src/coding.c Mon Sep 20 23:39:41 1999 -@@ -154,7 +154,7 @@ +--- src/coding.c.orig 1996-09-28 02:41:51.000000000 +0200 ++++ src/coding.c +@@ -154,7 +154,7 @@ char code_priority_category[IDX_BIN + 1] /* 92.4.3, 92.12.18 by K.Handa */ Lisp_Object Qcoding_system, Qcoding_system_p, Qnon_nil_coding_system_p; Lisp_Object Qeol_type; diff --git a/editors/mule/patches/patch-ah b/editors/mule/patches/patch-ah index 407b467b33d..bb723ec6098 100644 --- a/editors/mule/patches/patch-ah +++ b/editors/mule/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ah,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/fileio.c.orig Mon Sep 20 23:29:04 1999 -+++ src/fileio.c Mon Sep 20 23:30:03 1999 -@@ -2604,8 +2604,6 @@ +--- src/fileio.c.orig 1995-06-23 12:25:18.000000000 +0200 ++++ src/fileio.c +@@ -2604,8 +2604,6 @@ The value is an integer.") return value; } @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", "Tell Unix to finish all pending disk updates.") () -@@ -2614,8 +2612,6 @@ +@@ -2614,8 +2612,6 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sy return Qnil; } @@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0, "Return t if file FILE1 is newer than file FILE2.\n\ If FILE1 does not exist, the answer is nil;\n\ -@@ -4507,7 +4503,5 @@ +@@ -4507,7 +4503,5 @@ This applies only to the operation `inhi defsubr (&Sread_file_name_internal); defsubr (&Sread_file_name); diff --git a/editors/mule/patches/patch-ai b/editors/mule/patches/patch-ai index d327e9285d3..2b26cd85e83 100644 --- a/editors/mule/patches/patch-ai +++ b/editors/mule/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ai,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/floatfns.c.orig Mon Sep 20 23:43:32 1999 -+++ src/floatfns.c Mon Sep 20 23:43:41 1999 -@@ -49,7 +49,7 @@ +--- src/floatfns.c.orig 1995-02-17 08:47:39.000000000 +0100 ++++ src/floatfns.c +@@ -49,7 +49,7 @@ the Free Software Foundation, 675 Mass A #include "lisp.h" #include "syssignal.h" diff --git a/editors/mule/patches/patch-aj b/editors/mule/patches/patch-aj index 470f93a4dbe..3e9d0300542 100644 --- a/editors/mule/patches/patch-aj +++ b/editors/mule/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-aj,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/getloadavg.c.orig Mon Sep 20 23:29:10 1999 -+++ src/getloadavg.c Mon Sep 20 23:30:54 1999 +--- src/getloadavg.c.orig 1994-10-21 05:20:18.000000000 +0100 ++++ src/getloadavg.c @@ -64,10 +64,7 @@ /* Both the Emacs and non-Emacs sections want this. Some configuration files' definitions for the LOAD_AVE_CVT macro (like diff --git a/editors/mule/patches/patch-ak b/editors/mule/patches/patch-ak index ec169fd83ea..5fd4cd535f9 100644 --- a/editors/mule/patches/patch-ak +++ b/editors/mule/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ak,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/keyboard.c.orig Mon Sep 20 23:36:21 1999 -+++ src/keyboard.c Mon Sep 20 23:37:10 1999 -@@ -301,7 +301,7 @@ +--- src/keyboard.c.orig 1995-02-03 02:21:28.000000000 +0100 ++++ src/keyboard.c +@@ -301,7 +301,7 @@ Lisp_Object Vlast_event_frame; /* The timestamp of the last input event we received from the X server. X Windows wants this for selection ownership. */ diff --git a/editors/mule/patches/patch-al b/editors/mule/patches/patch-al index 5df6659b576..aca7192eeca 100644 --- a/editors/mule/patches/patch-al +++ b/editors/mule/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-al,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/lread.c.orig Mon Sep 20 23:44:46 1999 -+++ src/lread.c Mon Sep 20 23:45:25 1999 -@@ -86,9 +86,9 @@ +--- src/lread.c.orig 1995-02-17 08:57:05.000000000 +0100 ++++ src/lread.c +@@ -86,9 +86,9 @@ extern int errno; Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist; diff --git a/editors/mule/patches/patch-am b/editors/mule/patches/patch-am index 249b95150cc..e6d5febf6d2 100644 --- a/editors/mule/patches/patch-am +++ b/editors/mule/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1.1.1 2000/11/21 05:21:09 kei Exp $ +$NetBSD: patch-am,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/xfns.c.orig Tue Sep 21 00:13:59 1999 -+++ src/xfns.c Tue Sep 21 00:14:42 1999 -@@ -226,7 +226,7 @@ +--- src/xfns.c.orig 1994-11-04 12:11:24.000000000 +0100 ++++ src/xfns.c +@@ -226,7 +226,7 @@ Lisp_Object Qborder_width; Lisp_Object Qbox; Lisp_Object Qcursor_color; Lisp_Object Qcursor_type; diff --git a/editors/mule/patches/patch-an b/editors/mule/patches/patch-an index d0a2ee24fa1..0b4825b5392 100644 --- a/editors/mule/patches/patch-an +++ b/editors/mule/patches/patch-an @@ -1,38 +1,22 @@ -$NetBSD: patch-an,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-an,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** Makefile.in.orig Tue Dec 20 11:01:54 1994 ---- Makefile.in Fri Nov 17 15:29:34 2000 -*************** -*** 186,192 **** - # Subdirectories to make recursively. `lisp' is not included - # because the compiled lisp files are part of the distribution - # and you cannot remake them without installing Emacs first. -! SUBDIR = lib-src src - - # The makefiles of the directories in $SUBDIR. - SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile ---- 186,192 ---- - # Subdirectories to make recursively. `lisp' is not included - # because the compiled lisp files are part of the distribution - # and you cannot remake them without installing Emacs first. -! SUBDIR = lib-src src man - - # The makefiles of the directories in $SUBDIR. - SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile -*************** -*** 341,347 **** - if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ - fi ; \ -! for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* \ - antenews* canna* egg* languages* m2ps* mule* kbd-trans* \ - quail* terminology* CCL* ISO2022* R2L* XFONT*; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ ---- 341,347 ---- - if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ - fi ; \ -! for f in cl* dired-x* emacs* forms* gnus* sc* vip* \ - antenews* canna* egg* languages* m2ps* mule* kbd-trans* \ - quail* terminology* CCL* ISO2022* R2L* XFONT*; do \ - (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ +--- Makefile.in.orig 1994-12-20 03:01:54.000000000 +0100 ++++ Makefile.in +@@ -186,7 +186,7 @@ INSTALL_DATA = @INSTALL_DATA@ + # Subdirectories to make recursively. `lisp' is not included + # because the compiled lisp files are part of the distribution + # and you cannot remake them without installing Emacs first. +-SUBDIR = lib-src src ++SUBDIR = lib-src src man + + # The makefiles of the directories in $SUBDIR. + SUBDIR_MAKEFILES = lib-src/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile +@@ -341,7 +341,7 @@ install-arch-indep: mkdir + if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ + (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \ + fi ; \ +- for f in cl* dired-x* emacs* forms* gnus* info* sc* vip* \ ++ for f in cl* dired-x* emacs* forms* gnus* sc* vip* \ + antenews* canna* egg* languages* m2ps* mule* kbd-trans* \ + quail* terminology* CCL* ISO2022* R2L* XFONT*; do \ + (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \ diff --git a/editors/mule/patches/patch-ao b/editors/mule/patches/patch-ao index 98c613162f2..02e8fc667ac 100644 --- a/editors/mule/patches/patch-ao +++ b/editors/mule/patches/patch-ao @@ -1,46 +1,34 @@ -$NetBSD: patch-ao,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ao,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/Makefile.orig Sun Jul 3 06:35:17 1994 ---- man/Makefile Fri Nov 17 20:49:09 2000 -*************** -*** 4,10 **** - MAKEINFO = makeinfo - TEXINDEX_OBJS = texindex.o getopt.o - INFO_TARGETS = ../info/emacs ../info/cl ../info/forms ../info/vip \ -! ../info/gnus ../info/sc ../info/info ../info/dired-x - DVI_TARGETS = emacs.dvi cl.dvi forms.dvi vip.dvi gnus.dvi sc.dvi dired-x.dvi - INFOSOURCES = info.texi info-stnd.texi - ---- 4,10 ---- - MAKEINFO = makeinfo - TEXINDEX_OBJS = texindex.o getopt.o - INFO_TARGETS = ../info/emacs ../info/cl ../info/forms ../info/vip \ -! ../info/gnus ../info/sc ../info/dired-x - DVI_TARGETS = emacs.dvi cl.dvi forms.dvi vip.dvi gnus.dvi sc.dvi dired-x.dvi - INFOSOURCES = info.texi info-stnd.texi - -*************** -*** 54,59 **** ---- 54,60 ---- - gnu1.texi \ - glossary.texi - -+ all: info - info: $(INFO_TARGETS) - - dvi: $(DVI_TARGETS) -*************** -*** 66,77 **** - - getopt.o: getopt.c - $(CC) -Demacs -I../src -I../lib-src -c getopt.c -- -- ../info/info: ${INFOSOURCES} -- $(MAKEINFO) --no-split info.texi -- -- info.dvi: texindex ${INFOSOURCES} -- $(TEXI2DVI) info.texi - - ../info/emacs: ${EMACSSOURCES} - $(MAKEINFO) emacs.texi ---- 67,72 ---- +--- man/Makefile.orig 1994-07-02 23:35:17.000000000 +0200 ++++ man/Makefile +@@ -4,7 +4,7 @@ + MAKEINFO = makeinfo + TEXINDEX_OBJS = texindex.o getopt.o + INFO_TARGETS = ../info/emacs ../info/cl ../info/forms ../info/vip \ +- ../info/gnus ../info/sc ../info/info ../info/dired-x ++ ../info/gnus ../info/sc ../info/dired-x + DVI_TARGETS = emacs.dvi cl.dvi forms.dvi vip.dvi gnus.dvi sc.dvi dired-x.dvi + INFOSOURCES = info.texi info-stnd.texi + +@@ -54,6 +54,7 @@ EMACSSOURCES= \ + gnu1.texi \ + glossary.texi + ++all: info + info: $(INFO_TARGETS) + + dvi: $(DVI_TARGETS) +@@ -67,12 +68,6 @@ texindex.o: texindex.c + getopt.o: getopt.c + $(CC) -Demacs -I../src -I../lib-src -c getopt.c + +-../info/info: ${INFOSOURCES} +- $(MAKEINFO) --no-split info.texi +- +-info.dvi: texindex ${INFOSOURCES} +- $(TEXI2DVI) info.texi +- + ../info/emacs: ${EMACSSOURCES} + $(MAKEINFO) emacs.texi + diff --git a/editors/mule/patches/patch-ap b/editors/mule/patches/patch-ap new file mode 100644 index 00000000000..ce52fd3a725 --- /dev/null +++ b/editors/mule/patches/patch-ap @@ -0,0 +1,16 @@ +$NetBSD: patch-ap,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/CCL.orig 1994-10-21 05:17:57.000000000 +0100 ++++ info/CCL +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `CCL.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* CCL: (CCL). Code Conversion Language. ++END-INFO-DIR-ENTRY + + + File: CCL, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-aq b/editors/mule/patches/patch-aq new file mode 100644 index 00000000000..4176a5aeb12 --- /dev/null +++ b/editors/mule/patches/patch-aq @@ -0,0 +1,16 @@ +$NetBSD: patch-aq,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/ISO2022.orig 1994-10-21 05:17:57.000000000 +0100 ++++ info/ISO2022 +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `ISO2022.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* ISO2022: (ISO2022). ISO2022 encoding system. ++END-INFO-DIR-ENTRY + + + File: ISO2022, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-ar b/editors/mule/patches/patch-ar index 6715838ad8a..88d435b58d5 100644 --- a/editors/mule/patches/patch-ar +++ b/editors/mule/patches/patch-ar @@ -1,18 +1,16 @@ -$NetBSD: patch-ar,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ar,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/cl.texi.orig Fri Nov 17 13:56:11 2000 ---- man/cl.texi Fri Nov 17 14:09:59 2000 -*************** -*** 2,7 **** ---- 2,12 ---- - @setfilename ../info/cl - @settitle Common Lisp Extensions - -+ @dircategory Editors -+ @direntry -+ * CL: (cl). Partial Common Lisp support for Emacs Lisp. -+ @end direntry -+ - @iftex - @finalout - @end iftex +--- man/cl.texi.orig 1994-01-08 09:42:47.000000000 +0100 ++++ man/cl.texi +@@ -2,6 +2,11 @@ + @setfilename ../info/cl + @settitle Common Lisp Extensions + ++@dircategory Editors ++@direntry ++* CL: (cl). Partial Common Lisp support for Emacs Lisp. ++@end direntry ++ + @iftex + @finalout + @end iftex diff --git a/editors/mule/patches/patch-as b/editors/mule/patches/patch-as index 27a8e0e95e2..6683c6c546e 100644 --- a/editors/mule/patches/patch-as +++ b/editors/mule/patches/patch-as @@ -1,86 +1,56 @@ -$NetBSD: patch-as,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-as,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/dired-x.texi.orig Sun Aug 14 01:58:50 1994 ---- man/dired-x.texi Fri Nov 17 21:38:37 2000 -*************** -*** 18,23 **** ---- 18,29 ---- - @setfilename ../info/dired-x - @c dired-x.el REVISION NUMBER - @settitle Dired Extra Version 2 User's Manual -+ -+ @dircategory Editors -+ @direntry -+ * Dired-X: (dired-x). Dired Extra Features. -+ @end direntry -+ - @iftex - @finalout - @end iftex -*************** -*** 196,227 **** - @enumerate - @item - Omitting of uninteresting files from dired listing. -! @itemize - @xref{Omitting Files in Dired} - @end itemize - @item - Local variables for dired directories. -! @itemize - @xref{Local Variables} - @end itemize - @item - Guessing shell commands in dired buffers. -! @itemize - @xref{Shell Command Guessing} - @end itemize - @item - Running dired command in non-dired buffers. -! @itemize - @xref{Virtual Dired} - @end itemize - @item - Finding a file mentioned in a buffer -! @itemize - @xref{Find File At Point} - @end itemize - @item - Commands using file marking. -! @itemize - @xref{Advanced Mark Commands} - @end itemize - @end enumerate ---- 202,233 ---- - @enumerate - @item - Omitting of uninteresting files from dired listing. -! @itemize @bullet - @xref{Omitting Files in Dired} - @end itemize - @item - Local variables for dired directories. -! @itemize @bullet - @xref{Local Variables} - @end itemize - @item - Guessing shell commands in dired buffers. -! @itemize @bullet - @xref{Shell Command Guessing} - @end itemize - @item - Running dired command in non-dired buffers. -! @itemize @bullet - @xref{Virtual Dired} - @end itemize - @item - Finding a file mentioned in a buffer -! @itemize @bullet - @xref{Find File At Point} - @end itemize - @item - Commands using file marking. -! @itemize @bullet - @xref{Advanced Mark Commands} - @end itemize - @end enumerate +--- man/dired-x.texi.orig 1994-08-13 18:58:50.000000000 +0200 ++++ man/dired-x.texi +@@ -18,6 +18,12 @@ + @setfilename ../info/dired-x + @c dired-x.el REVISION NUMBER + @settitle Dired Extra Version 2 User's Manual ++ ++@dircategory Editors ++@direntry ++* Dired-X: (dired-x). Dired Extra Features. ++@end direntry ++ + @iftex + @finalout + @end iftex +@@ -196,32 +202,32 @@ Some features provided by Dired Extra + @enumerate + @item + Omitting of uninteresting files from dired listing. +-@itemize ++@itemize @bullet + @xref{Omitting Files in Dired} + @end itemize + @item + Local variables for dired directories. +-@itemize ++@itemize @bullet + @xref{Local Variables} + @end itemize + @item + Guessing shell commands in dired buffers. +-@itemize ++@itemize @bullet + @xref{Shell Command Guessing} + @end itemize + @item + Running dired command in non-dired buffers. +-@itemize ++@itemize @bullet + @xref{Virtual Dired} + @end itemize + @item + Finding a file mentioned in a buffer +-@itemize ++@itemize @bullet + @xref{Find File At Point} + @end itemize + @item + Commands using file marking. +-@itemize ++@itemize @bullet + @xref{Advanced Mark Commands} + @end itemize + @end enumerate diff --git a/editors/mule/patches/patch-at b/editors/mule/patches/patch-at new file mode 100644 index 00000000000..1b9460bfd27 --- /dev/null +++ b/editors/mule/patches/patch-at @@ -0,0 +1,16 @@ +$NetBSD: patch-at,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/R2L.orig 1994-10-27 12:34:29.000000000 +0100 ++++ info/R2L +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `R2L.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* R2L: (R2L). Right-to-left writing on Mule. ++END-INFO-DIR-ENTRY + + + File: R2L, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-au b/editors/mule/patches/patch-au index 026c11a4c0f..4e792a49ce8 100644 --- a/editors/mule/patches/patch-au +++ b/editors/mule/patches/patch-au @@ -1,24 +1,23 @@ -$NetBSD: patch-au,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-au,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/emacs.texi.orig Fri Nov 4 20:08:52 1994 ---- man/emacs.texi Fri Nov 17 20:35:02 2000 -*************** -*** 1,10 **** ---- 1,17 ---- - \input texinfo - -+ @setfilename ../info/emacs -+ - @ifinfo - @c The edition number appears in several places in this file - This corresponds to the tenth edition of the @cite{GNU Emacs Manual}, - for Emacs version 19.28. - @c Please REMEMBER to update edition number in *three* places in this file. -+ -+ @dircategory Editors -+ @direntry -+ * Emacs: (emacs). The extensible self-documenting text editor. -+ @end direntry - - Published by the Free Software Foundation - 675 Massachusetts Avenue +--- man/emacs.texi.orig 1994-11-04 12:08:52.000000000 +0100 ++++ man/emacs.texi +@@ -1,11 +1,18 @@ + \input texinfo + ++@setfilename ../info/emacs ++ + @ifinfo + @c The edition number appears in several places in this file + This corresponds to the tenth edition of the @cite{GNU Emacs Manual}, + for Emacs version 19.28. + @c Please REMEMBER to update edition number in *three* places in this file. + ++@dircategory Editors ++@direntry ++* Emacs: (emacs). The extensible self-documenting text editor. ++@end direntry ++ + Published by the Free Software Foundation + 675 Massachusetts Avenue + Cambridge, MA 02139 USA diff --git a/editors/mule/patches/patch-av b/editors/mule/patches/patch-av index 88908272402..ef4551306c9 100644 --- a/editors/mule/patches/patch-av +++ b/editors/mule/patches/patch-av @@ -1,19 +1,17 @@ -$NetBSD: patch-av,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-av,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/forms.texi.orig Fri Nov 17 13:56:59 2000 ---- man/forms.texi Fri Nov 17 14:15:09 2000 -*************** -*** 16,21 **** ---- 16,27 ---- - @c @smallbook - @comment %**end of header (This is for running Texinfo on a region.) - -+ @dircategory Editors -+ @direntry -+ * Forms: (forms). Emacs package for editing data bases -+ by filling in forms. -+ @end direntry -+ - @ifinfo - This file documents Forms mode, a form-editing major mode for GNU Emacs. - +--- man/forms.texi.orig 1994-07-28 22:46:45.000000000 +0200 ++++ man/forms.texi +@@ -16,6 +16,12 @@ + @c @smallbook + @comment %**end of header (This is for running Texinfo on a region.) + ++@dircategory Editors ++@direntry ++* Forms: (forms). Emacs package for editing data bases ++ by filling in forms. ++@end direntry ++ + @ifinfo + This file documents Forms mode, a form-editing major mode for GNU Emacs. + diff --git a/editors/mule/patches/patch-aw b/editors/mule/patches/patch-aw index bf40370b7ef..774818f9111 100644 --- a/editors/mule/patches/patch-aw +++ b/editors/mule/patches/patch-aw @@ -1,19 +1,17 @@ -$NetBSD: patch-aw,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-aw,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/gnus.texi.orig Fri Nov 17 13:57:09 2000 ---- man/gnus.texi Fri Nov 17 15:09:32 2000 -*************** -*** 3,8 **** ---- 3,14 ---- - @comment %**start of header (This is for running Texinfo on a region.) - @setfilename ../info/gnus - @settitle GNUS 3.15 Manual -+ -+ @dircategory Editors -+ @direntry -+ * GNUS: (gnus). The newsreader GNUS. -+ @end direntry -+ - @iftex - @finalout - @end iftex +--- man/gnus.texi.orig 1994-09-11 20:52:45.000000000 +0200 ++++ man/gnus.texi +@@ -3,6 +3,12 @@ + @comment %**start of header (This is for running Texinfo on a region.) + @setfilename ../info/gnus + @settitle GNUS 3.15 Manual ++ ++@dircategory Editors ++@direntry ++* GNUS: (gnus). The newsreader GNUS. ++@end direntry ++ + @iftex + @finalout + @end iftex diff --git a/editors/mule/patches/patch-ax b/editors/mule/patches/patch-ax new file mode 100644 index 00000000000..d3aa07f1160 --- /dev/null +++ b/editors/mule/patches/patch-ax @@ -0,0 +1,15 @@ +$NetBSD: patch-ax,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/XFONT.orig 1994-10-21 05:17:58.000000000 +0100 ++++ info/XFONT +@@ -2,7 +2,9 @@ Info file: XFONT, -*-Text-*- + produced by texinfo-format-buffer + from file: XFONT.texi + +- ++START-INFO-DIR-ENTRY ++* XFONT: (XFONT). X's FONT usage. ++END-INFO-DIR-ENTRY + + + File: XFONT Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-ay b/editors/mule/patches/patch-ay new file mode 100644 index 00000000000..fcab758f686 --- /dev/null +++ b/editors/mule/patches/patch-ay @@ -0,0 +1,15 @@ +$NetBSD: patch-ay,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/antenews-jp.orig 1994-10-27 09:04:34.000000000 +0100 ++++ info/antenews-jp +@@ -3,6 +3,10 @@ produced by `texinfo-format-buffer' + from file `antenews-jp.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Antenews-jp: (antenews-jp). Antenews of Emacs 19. (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: antenews-jp, Node: Top, Next: Basic Changes, Up: (dir) diff --git a/editors/mule/patches/patch-az b/editors/mule/patches/patch-az index ef4e1022e21..0e48718c1f7 100644 --- a/editors/mule/patches/patch-az +++ b/editors/mule/patches/patch-az @@ -1,20 +1,18 @@ -$NetBSD: patch-az,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-az,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/sc.texi.orig Fri Nov 17 13:58:18 2000 ---- man/sc.texi Fri Nov 17 14:57:08 2000 -*************** -*** 6,11 **** ---- 6,18 ---- - @iftex - @finalout - @end iftex -+ -+ @dircategory Editors -+ @direntry -+ * SC: (sc). Supercite lets you cite parts of messages you're -+ replying to, in flexible ways. -+ @end direntry -+ - @c @setchapternewpage odd % For book style double sided manual. - @comment %**end of header (This is for running Texinfo on a region.) - @c @smallbook +--- man/sc.texi.orig 1994-01-08 09:41:40.000000000 +0100 ++++ man/sc.texi +@@ -6,6 +6,13 @@ + @iftex + @finalout + @end iftex ++ ++@dircategory Editors ++@direntry ++* SC: (sc). Supercite lets you cite parts of messages you're ++ replying to, in flexible ways. ++@end direntry ++ + @c @setchapternewpage odd % For book style double sided manual. + @comment %**end of header (This is for running Texinfo on a region.) + @c @smallbook diff --git a/editors/mule/patches/patch-ba b/editors/mule/patches/patch-ba index a4ae126716e..40ab4bc5a8d 100644 --- a/editors/mule/patches/patch-ba +++ b/editors/mule/patches/patch-ba @@ -1,18 +1,16 @@ -$NetBSD: patch-ba,v 1.1.1.1 2000/11/21 05:21:10 kei Exp $ +$NetBSD: patch-ba,v 1.2 2005/12/01 18:13:24 wiz Exp $ -*** man/vip.texi.orig Fri Nov 17 13:58:36 2000 ---- man/vip.texi Fri Nov 17 14:58:20 2000 -*************** -*** 25,30 **** ---- 25,35 ---- - @setfilename ../info/vip - @settitle VIP - -+ @dircategory Editors -+ @direntry -+ * VIP: (vip). An VI-emulation for Emacs. -+ @end direntry -+ - @iftex - @finalout - @end iftex +--- man/vip.texi.orig 1994-07-17 20:32:29.000000000 +0200 ++++ man/vip.texi +@@ -25,6 +25,11 @@ + @setfilename ../info/vip + @settitle VIP + ++@dircategory Editors ++@direntry ++* VIP: (vip). An VI-emulation for Emacs. ++@end direntry ++ + @iftex + @finalout + @end iftex diff --git a/editors/mule/patches/patch-bb b/editors/mule/patches/patch-bb index 2aecb2b6d9e..e2964ab9a6a 100644 --- a/editors/mule/patches/patch-bb +++ b/editors/mule/patches/patch-bb @@ -1,6 +1,6 @@ -$NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +$NetBSD: patch-bb,v 1.4 2005/12/01 18:13:24 wiz Exp $ ---- man/texinfo.tex.orig Fri Oct 21 05:19:39 1994 +--- man/texinfo.tex.orig 1994-10-21 05:19:39.000000000 +0100 +++ man/texinfo.tex @@ -1,5 +1,7 @@ -%% TeX macros to handle texinfo files @@ -317,7 +317,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % @w prevents a word break. Without the \leavevmode, @w at the % beginning of a paragraph, when TeX is still in vertical mode, would -@@ -507,15 +591,32 @@ +@@ -507,15 +591,32 @@ where each line of input produces a line \leftline{\hskip\leftskip{\rm#1}}}} +% @inmargin{TEXT} puts TEXT in the margin next to the current paragraph. @@ -358,14 +358,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \input\thisfile \endgroup} -@@ -532,5 +633,5 @@ +@@ -532,5 +633,5 @@ where each line of input produces a line \def\sp{\parsearg\spxxx} -\def\spxxx #1{\par \vskip #1\baselineskip} +\def\spxxx #1{\vskip #1\baselineskip} % @comment ...line which is ignored... -@@ -545,4 +646,7 @@ +@@ -545,4 +646,7 @@ where each line of input produces a line \let\c=\comment +% @paragraphindent is defined for the Info formatting commands only. @@ -373,13 +373,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % Prevent errors for section commands. % Used in @ignore and in failing conditionals. -@@ -579,4 +683,5 @@ +@@ -579,4 +683,5 @@ where each line of input produces a line % \def\ignoremorecommands{% + \let\defcodeindex = \relax \let\defcv = \relax \let\deffn = \relax -@@ -602,4 +707,13 @@ +@@ -602,4 +707,13 @@ where each line of input produces a line \let\pxref = \relax \let\settitle = \relax + \let\setchapternewpage = \relax @@ -393,13 +393,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \let\headings = \relax \let\include = \relax \let\lowersections = \relax -@@ -610,5 +724,4 @@ +@@ -610,5 +724,4 @@ where each line of input produces a line \let\clear = \relax \let\item = \relax - \let\message = \relax } -@@ -617,10 +730,22 @@ +@@ -617,10 +730,22 @@ where each line of input produces a line \def\ignore{\doignore{ignore}} -% Also ignore @ifinfo, @menu, and @direntry text. @@ -423,7 +423,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % Ignore text until a line `@end #1'. % -@@ -654,9 +779,10 @@ +@@ -654,9 +779,10 @@ where each line of input produces a line \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} \immediate\write16{ Then upgrade your TeX installation if you can.} + \immediate\write16{ (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)} @@ -435,7 +435,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \global\warnedobstrue \fi } -@@ -734,7 +860,10 @@ +@@ -734,7 +860,10 @@ where each line of input produces a line % empty), we can't just use \parsearg; we have to insert a space of our % own to delimit the rest of the line, and then take it out again if we -% didn't need it. @@ -448,7 +448,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \parsearg\setxxx} \def\setxxx#1{\setyyy#1 \endsetyyy} \def\setyyy#1 #2\endsetyyy{% -@@ -743,6 +872,10 @@ +@@ -743,6 +872,10 @@ where each line of input produces a line \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. \fi + \endgroup @@ -460,7 +460,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} % @clear VAR clears (i.e., unsets) the variable VAR. -@@ -753,8 +886,14 @@ +@@ -753,8 +886,14 @@ where each line of input produces a line % @value{foo} gets the text saved in variable foo. % -\def\value#1{\expandafter @@ -479,13 +479,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\endgroup} % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -@@ -856,4 +995,5 @@ +@@ -856,4 +995,5 @@ where each line of input produces a line \global\let\lastnode=\relax} +% @refill is a no-op. \let\refill=\relax -@@ -870,9 +1010,22 @@ +@@ -870,9 +1010,22 @@ where each line of input produces a line } +% @bye. @@ -511,7 +511,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \message{fonts,} -@@ -886,89 +1039,127 @@ +@@ -886,89 +1039,127 @@ where each line of input produces a line \let\li = \sf % Sometimes we call it \li, not \sf. +% We don't need math for this one. @@ -687,14 +687,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\setfont\ssecsc\scbshape{10}{\magstep1} \font\sseci=cmmi12 scaled \magstephalf \font\ssecsy=cmsy10 scaled \magstep1 -@@ -977,5 +1168,5 @@ +@@ -977,5 +1168,5 @@ where each line of input produces a line % Fonts for title page: -\font\titlerm = cmbx12 scaled \magstep3 +\setfont\titlerm\rmbshape{12}{\magstep3} \let\authorrm = \secrm -@@ -996,32 +1187,33 @@ +@@ -996,32 +1187,33 @@ where each line of input produces a line % of just \STYLE. We do this so that font changes will continue to work % in math mode, where it is the current \fam that is relevant in most -% cases, not the current. Plain TeX does, for example, @@ -740,7 +740,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \resetmathfonts \setleading{12pt}} % Set up the default fonts, so we can use them for creating boxes. -@@ -1033,7 +1225,7 @@ +@@ -1033,7 +1225,7 @@ where each line of input produces a line % Fonts for short table of contents. -\font\shortcontrm=cmr12 @@ -751,7 +751,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\setfont\shortcontsl\slshape{12}{1000} %% Add scribe-like font environments, plus @l for inline lisp (usually sans -@@ -1062,11 +1254,19 @@ +@@ -1062,11 +1254,19 @@ where each line of input produces a line \def\t#1{% - {\tt \nohyphenation \rawbackslash \frenchspacing #1}% @@ -775,14 +775,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} \def\ctrl #1{{\tt \rawbackslash \hat}#1} -@@ -1097,5 +1297,5 @@ +@@ -1097,5 +1297,5 @@ where each line of input produces a line % We *must* turn on hyphenation at `-' and `_' in \code. -% Otherwise, it is too hard to avoid overful hboxes +% Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. -@@ -1103,9 +1303,10 @@ +@@ -1103,9 +1303,10 @@ where each line of input produces a line % both hyphenation at - and hyphenation within words. % We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate an a dash. @@ -794,7 +794,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\catcode`\|=\active \global\def\code{\begingroup \catcode`\-=\active \let-\codedash \catcode`\_=\active \let_\codeunder \codex} % The following is used by \doprintindex to insure that long function names -@@ -1113,10 +1314,15 @@ +@@ -1113,10 +1314,15 @@ where each line of input produces a line % read from the file, as \entry parses the arguments long before \code is % ever called. -- mycroft -\global\def\indexbreaks{\catcode`\-=\active \let-\realdash \catcode`\_=\active \let_\realunder} @@ -813,7 +813,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}} \def\codex #1{\tclose{#1}\endgroup} -@@ -1125,10 +1331,23 @@ +@@ -1125,10 +1331,23 @@ where each line of input produces a line % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. - @@ -840,7 +840,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } % Typeset a dimension, e.g., `in' or `pt'. The only reason for the -@@ -1140,10 +1359,17 @@ +@@ -1140,10 +1359,17 @@ where each line of input produces a line \def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} -\def\l#1{{\li #1}\null} % @@ -862,14 +862,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \message{page headings,} -@@ -1160,5 +1386,5 @@ +@@ -1160,5 +1386,5 @@ where each line of input produces a line \def\shorttitlepage{\parsearg\shorttitlepagezzz} \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} + \endgroup\page\hbox{}\page} \def\titlepage{\begingroup \parindent=0pt \textfonts -@@ -1177,7 +1403,7 @@ +@@ -1177,7 +1403,7 @@ where each line of input produces a line \def\title{\parsearg\titlezzz}% \def\titlezzz##1{\leftline{\titlefont{##1}} - % print a rule at the page bottom also. @@ -880,14 +880,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \vskip4pt \hrule height 4pt width \hsize \vskip4pt}% % No rule at page bottom unless we print one at the top with @title. \finishedtitlepagetrue -@@ -1197,5 +1423,5 @@ +@@ -1197,5 +1423,5 @@ where each line of input produces a line \def\page{% \iffinishedtitlepage\else - \finishtitlepage + \finishtitlepage \fi \oldpage -@@ -1285,12 +1511,13 @@ +@@ -1285,12 +1511,13 @@ where each line of input produces a line }% unbind the catcode of @. -% @headings double turns headings on for double-sided printing. @@ -908,13 +908,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +% and turned `on' after @end titlepage. \def\headings #1 {\csname HEADINGS#1\endcsname} -@@ -1306,5 +1533,4 @@ +@@ -1306,5 +1533,4 @@ where each line of input produces a line % edge of all pages. \def\HEADINGSdouble{ -%\pagealignmacro \global\pageno=1 \global\evenfootline={\hfil} -@@ -1312,9 +1538,11 @@ +@@ -1312,9 +1538,11 @@ where each line of input produces a line \global\evenheadline={\line{\folio\hfil\thistitle}} \global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chapoddpage @@ -927,52 +927,52 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ -%\pagealignmacro \global\pageno=1 \global\evenfootline={\hfil} -@@ -1322,4 +1550,5 @@ +@@ -1322,4 +1550,5 @@ where each line of input produces a line \global\evenheadline={\line{\thischapter\hfil\folio}} \global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chappager } \def\HEADINGSon{\HEADINGSdouble} -@@ -1332,4 +1561,5 @@ +@@ -1332,4 +1561,5 @@ where each line of input produces a line \global\evenheadline={\line{\folio\hfil\thistitle}} \global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chapoddpage } -@@ -1340,4 +1570,5 @@ +@@ -1340,4 +1570,5 @@ where each line of input produces a line \global\evenheadline={\line{\thischapter\hfil\folio}} \global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chappager } -@@ -1363,4 +1594,5 @@ +@@ -1363,4 +1594,5 @@ July\or August\or September\or October\o \def\settitlezzz #1{\gdef\thistitle{#1}} + \message{tables,} -@@ -1395,5 +1627,5 @@ +@@ -1395,5 +1627,5 @@ July\or August\or September\or October\o \newif\ifitemxneedsnegativevskip -\def\itemxpar{\par\ifitemxneedsnegativevskip\vskip-\parskip\nobreak\fi} +\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} \def\internalBitem{\smallbreak \parsearg\itemzzz} -@@ -1502,5 +1734,5 @@ +@@ -1502,5 +1734,5 @@ July\or August\or September\or October\o \aboveenvbreak % \begingroup % -\def\Edescription{\Etable}% Neccessary kludge. +\def\Edescription{\Etable}% Necessary kludge. \let\itemindex=#1% \ifnum 0#3>0 \advance \leftskip by #3\mil \fi % -@@ -1659,5 +1891,5 @@ +@@ -1659,5 +1891,5 @@ July\or August\or September\or October\o \advance\itemno by 1 {\let\par=\endgraf \smallbreak}% -\ifhmode \errmessage{\in hmode at itemizeitem}\fi +\ifhmode \errmessage{In hmode at itemizeitem}\fi {\parskip=0in \hskip 0pt \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}% -@@ -1666,8 +1898,8 @@ +@@ -1666,8 +1898,8 @@ July\or August\or September\or October\o % @multitable macros -% Amy Hendrickson, 8/18/94 @@ -984,7 +984,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +% Contents of each column will wrap at width given in preamble. Width % can be specified either with sample text given in a template line, % or in percent of \hsize, the current width of text on page. -@@ -1677,24 +1909,34 @@ +@@ -1677,24 +1909,34 @@ July\or August\or September\or October\o % To make preamble: % -% Either define widths of columns in terms of percent of \hsize: @@ -1025,7 +1025,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +% @item, @tab, @multitable or @end multitable do not need to be on their % own lines, but it will not hurt if they are. -@@ -1703,34 +1945,36 @@ +@@ -1703,34 +1945,36 @@ July\or August\or September\or October\o % @multitable {Column 1 template} {Column 2 template} {Column 3 template} % @item first col stuff @tab second col stuff @tab third col -% @item @@ -1084,7 +1084,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\multitablelinespace=0pt %%%% -@@ -1738,58 +1982,71 @@ +@@ -1738,58 +1982,71 @@ July\or August\or September\or October\o \let\endsetuptable\relax \def\xendsetuptable{\endsetuptable} -\let\percentofhsize\relax @@ -1176,7 +1176,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % If a template has been used, we will add \multitablecolspace % to the width of each template entry. % If user has set preamble in terms of percent of \hsize -@@ -1803,18 +2060,56 @@ +@@ -1803,18 +2060,56 @@ July\or August\or September\or October\o \else % If user has <not> set preamble in terms of percent of \hsize - % we will advance \hsize by \spacebetweencols @@ -1242,14 +1242,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \message{indexing,} -@@ -1830,5 +2125,5 @@ +@@ -1830,5 +2125,5 @@ July\or August\or September\or October\o % \fooindex ...rest of line... puts an entry in the index foo. % It also defines \fooindfile to be the number of the output channel for -% the file that accumulates this index. The file's extension is foo. +% the file that accumulates this index. The file's extension is foo. % The name of an index should be no more than 2 characters long % for the sake of vms. -@@ -1836,6 +2131,6 @@ +@@ -1836,6 +2131,6 @@ July\or August\or September\or October\o \def\newindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file -\openout \csname#1indfile\endcsname \jobname.#1 % Open the file @@ -1258,7 +1258,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#1}} } -@@ -1849,6 +2144,6 @@ +@@ -1849,6 +2144,6 @@ July\or August\or September\or October\o \def\newcodeindex #1{ \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file -\openout \csname#1indfile\endcsname \jobname.#1 % Open the file @@ -1267,21 +1267,21 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#1}} } -@@ -1861,5 +2156,5 @@ +@@ -1861,5 +2156,5 @@ July\or August\or September\or October\o \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo -\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex +\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\doindex {#2}}% } -@@ -1870,5 +2165,5 @@ +@@ -1870,5 +2165,5 @@ July\or August\or September\or October\o \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname \expandafter\let\csname#1indfile\endcsname=\synindexfoo -\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex +\expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex \noexpand\docodeindex {#2}}% } -@@ -1918,8 +2213,13 @@ +@@ -1918,8 +2213,13 @@ July\or August\or September\or October\o \def\ss{\realbackslash ss}% % Take care of texinfo commands likely to appear in an index entry. +% (Must be a way to avoid doing expansion at all, and thus not have to @@ -1296,14 +1296,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +%\def\rm{\realbackslash rm }% \def\sl{\realbackslash sl }% \def\sf{\realbackslash sf}% -@@ -1928,5 +2228,5 @@ +@@ -1928,5 +2228,5 @@ July\or August\or September\or October\o \def\less{\realbackslash less}% \def\hat{\realbackslash hat}% -\def\char{\realbackslash char}% +%\def\char{\realbackslash char}% \def\TeX{\realbackslash TeX}% \def\dots{\realbackslash dots }% -@@ -1934,9 +2234,12 @@ +@@ -1934,9 +2234,12 @@ July\or August\or September\or October\o \def\tclose##1{\realbackslash tclose {##1}}% \def\code##1{\realbackslash code {##1}}% +\def\dotless##1{\realbackslash dotless {##1}}% @@ -1317,7 +1317,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\sc##1{\realbackslash sc {##1}}% \def\cite##1{\realbackslash cite {##1}}% \def\key##1{\realbackslash key {##1}}% -@@ -1946,6 +2249,13 @@ +@@ -1946,6 +2249,13 @@ July\or August\or September\or October\o \def\dfn##1{\realbackslash dfn {##1}}% \def\emph##1{\realbackslash emph {##1}}% +\unsepspaces @@ -1331,25 +1331,25 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % \indexnofonts no-ops all font-change commands. % This is used when outputting the strings to sort the index by. -@@ -1956,4 +2266,5 @@ +@@ -1956,4 +2266,5 @@ July\or August\or September\or October\o \def\indexnofonts{% % Just ignore accents. +\let\,=\indexdummyfont \let\"=\indexdummyfont \let\`=\indexdummyfont -@@ -1968,4 +2279,5 @@ +@@ -1968,4 +2279,5 @@ July\or August\or September\or October\o \let\v=\indexdummyfont \let\H=\indexdummyfont +\let\dotless=\indexdummyfont % Take care of the plain tex special European modified letters. \def\oe{oe}% -@@ -2001,4 +2313,5 @@ +@@ -2001,4 +2313,5 @@ July\or August\or September\or October\o \let\TeX=\indexdummytex \let\dots=\indexdummydots +\def\@{@}% } -@@ -2012,24 +2325,39 @@ +@@ -2012,24 +2325,39 @@ July\or August\or September\or October\o \let\indexbackslash=0 %overridden during \printindex. +\let\SETmarginindex=\relax %initialize! @@ -1408,7 +1408,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +} \def\dosubind #1#2#3{% -@@ -2085,32 +2413,14 @@ +@@ -2085,32 +2413,14 @@ July\or August\or September\or October\o % Define the macros used in formatting output of the sorted index material. -% This is what you call to cause a particular index to get printed. @@ -1449,14 +1449,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \indexbreaks % % See if the index file exists and is nonempty. -@@ -2122,5 +2432,5 @@ +@@ -2122,5 +2432,5 @@ July\or August\or September\or October\o % there is some text. (Index is nonexistent) - \else + \else % % If the index file exists but is empty, then \openin leaves \ifeof -@@ -2131,11 +2441,18 @@ +@@ -2131,11 +2441,18 @@ July\or August\or September\or October\o (Index is empty) \else + % Index files are almost Texinfo source, but we use \ as the escape @@ -1478,14 +1478,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\endgroup} % These macros are used by the sorted index file itself. -@@ -2191,5 +2508,5 @@ +@@ -2191,5 +2508,5 @@ July\or August\or September\or October\o % Insert the text of the index entry. TeX will do line-breaking on it. #1% - % The following is kluged to not output a line of dots in the index if + % The following is kludged to not output a line of dots in the index if % there are no page numbers. The next person who breaks this will be % cursed by a Unix daemon. -@@ -2228,20 +2545,35 @@ +@@ -2228,20 +2545,35 @@ July\or August\or September\or October\o }} -%% Define two-column mode, which is used in indexes. @@ -1530,7 +1530,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \output = {\doublecolumnout}% % % Change the page size parameters. We could do this once outside this -@@ -2249,11 +2581,11 @@ +@@ -2249,11 +2581,11 @@ July\or August\or September\or October\o % format, but then we repeat the same computation. Repeating a couple % of assignments once per index is clearly meaningless for the - % execution time, so we may as well do it once. @@ -1545,7 +1545,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % as it did when we hard-coded it. % % We put the result in a separate register, \doublecolumhsize, so we -@@ -2269,64 +2601,68 @@ +@@ -2269,64 +2601,68 @@ July\or August\or September\or October\o % since nobody clobbers \vsize.) \vsize = 2\vsize - \doublecolumnpagegoal @@ -1662,7 +1662,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\opencontents{\openout\contentsfile = \jobname.toc } % Each @chapter defines this as the name of the chapter. -@@ -2334,40 +2670,39 @@ +@@ -2334,40 +2670,39 @@ July\or August\or September\or October\o \def\thischapter{} \def\thissection{} -\def\seccheck#1{\if \pageno<0 % @@ -1736,14 +1736,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \def\dfn##1{\realbackslash dfn{##1}}% } -@@ -2448,5 +2783,5 @@ +@@ -2448,5 +2783,5 @@ July\or August\or September\or October\o \def\chapterzzz #1{\seccheck{chapter}% \secno=0 \subsecno=0 \subsubsecno=0 -\global\advance \chapno by 1 \message{Chapter \the\chapno}% +\global\advance \chapno by 1 \message{\putwordChapter \the\chapno}% \chapmacro {#1}{\the\chapno}% \gdef\thissection{#1}% -@@ -2456,5 +2791,6 @@ +@@ -2456,5 +2791,6 @@ July\or August\or September\or October\o \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% {\chapternofonts% -\edef\temp{{\realbackslash chapentry {#1}{\the\chapno}{\noexpand\folio}}}% @@ -1751,7 +1751,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash chapentry{\the\toks0}{\the\chapno}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2475,6 +2811,7 @@ +@@ -2475,6 +2811,7 @@ July\or August\or September\or October\o \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% {\chapternofonts% -\edef\temp{{\realbackslash chapentry @@ -1761,7 +1761,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + {\putwordAppendix{} \appendixletter}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2485,4 +2822,8 @@ +@@ -2485,4 +2822,8 @@ July\or August\or September\or October\o }} +% @centerchap is like @unnumbered, but the heading is centered. @@ -1770,7 +1770,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \outer\def\top{\parsearg\unnumberedyyy} \outer\def\unnumbered{\parsearg\unnumberedyyy} -@@ -2506,5 +2847,6 @@ +@@ -2506,5 +2847,6 @@ July\or August\or September\or October\o \gdef\thischapter{#1}\gdef\thissection{#1}% {\chapternofonts% -\edef\temp{{\realbackslash unnumbchapentry {#1}{\noexpand\folio}}}% @@ -1778,7 +1778,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash unnumbchapentry{\the\toks0}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2521,6 +2863,7 @@ +@@ -2521,6 +2863,7 @@ July\or August\or September\or October\o \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}% {\chapternofonts% +\toks0 = {#1}% @@ -1787,14 +1787,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +{\the\toks0}{\the\chapno}{\the\secno}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2529,5 +2872,5 @@ +@@ -2529,5 +2872,5 @@ July\or August\or September\or October\o }} -\outer\def\appenixsection{\parsearg\appendixsecyyy} +\outer\def\appendixsection{\parsearg\appendixsecyyy} \outer\def\appendixsec{\parsearg\appendixsecyyy} \def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz -@@ -2536,6 +2879,7 @@ +@@ -2536,6 +2879,7 @@ July\or August\or September\or October\o \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}% {\chapternofonts% +\toks0 = {#1}% @@ -1803,7 +1803,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +{\the\toks0}{\appendixletter}{\the\secno}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2549,5 +2893,6 @@ +@@ -2549,5 +2893,6 @@ July\or August\or September\or October\o \plainsecheading {#1}\gdef\thissection{#1}% {\chapternofonts% -\edef\temp{{\realbackslash unnumbsecentry{#1}{\noexpand\folio}}}% @@ -1811,7 +1811,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash unnumbsecentry{\the\toks0}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2562,6 +2907,7 @@ +@@ -2562,6 +2907,7 @@ July\or August\or September\or October\o \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}% {\chapternofonts% +\toks0 = {#1}% @@ -1820,7 +1820,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +{\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2576,6 +2922,7 @@ +@@ -2576,6 +2922,7 @@ July\or August\or September\or October\o \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}% {\chapternofonts% +\toks0 = {#1}% @@ -1829,7 +1829,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +{\the\toks0}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2587,7 +2934,8 @@ +@@ -2587,7 +2934,8 @@ July\or August\or September\or October\o \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz \def\unnumberedsubseczzz #1{\seccheck{unnumberedsubsec}% -\plainsecheading {#1}\gdef\thissection{#1}% @@ -1840,7 +1840,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash unnumbsubsecentry{\the\toks0}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2603,6 +2951,6 @@ +@@ -2603,6 +2951,6 @@ July\or August\or September\or October\o {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}% {\chapternofonts% -\edef\temp{{\realbackslash subsubsecentry % @@ -1849,7 +1849,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash subsubsecentry{\the\toks0} {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno} {\noexpand\folio}}}% -@@ -2620,5 +2968,6 @@ +@@ -2620,5 +2968,6 @@ July\or August\or September\or October\o {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}% {\chapternofonts% -\edef\temp{{\realbackslash subsubsecentry{#1}% @@ -1857,7 +1857,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash subsubsecentry{\the\toks0}% {\appendixletter} {\the\secno}{\the\subsecno}{\the\subsubsecno}{\noexpand\folio}}}% -@@ -2632,7 +2981,8 @@ +@@ -2632,7 +2981,8 @@ July\or August\or September\or October\o \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz \def\unnumberedsubsubseczzz #1{\seccheck{unnumberedsubsubsec}% -\plainsecheading {#1}\gdef\thissection{#1}% @@ -1868,7 +1868,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\edef\temp{{\realbackslash unnumbsubsubsecentry{\the\toks0}{\noexpand\folio}}}% \escapechar=`\\% \write \contentsfile \temp % -@@ -2670,8 +3020,8 @@ +@@ -2670,8 +3020,8 @@ July\or August\or September\or October\o % NOTE on use of \vbox for chapter headings, section headings, and % such: -% 1) We use \vbox rather than the earlier \line to permit @@ -1881,7 +1881,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +% heading is obnoxious; this forbids it. % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. -@@ -2691,9 +3041,8 @@ +@@ -2691,9 +3041,8 @@ July\or August\or September\or October\o \rm #1\hfill}}\bigskip \par\penalty 200} -\def\heading{\parsearg\secheadingi} @@ -1895,14 +1895,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\subsubheading{\parsearg\plainsubsubsecheading} % These macros generate a chapter, section, etc. heading only -@@ -2709,5 +3058,5 @@ +@@ -2709,5 +3058,5 @@ July\or August\or September\or October\o % Parameter controlling skip before chapter headings (if needed) -\newskip \chapheadingskip \chapheadingskip = 30pt plus 8pt minus 4pt +\newskip\chapheadingskip \def\chapbreak{\dobreak \chapheadingskip {-4000}} -@@ -2718,8 +3067,10 @@ +@@ -2718,8 +3067,10 @@ July\or August\or September\or October\o \def\CHAPPAGoff{ +\global\let\contentsalignmacro = \chappager @@ -1913,13 +1913,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chappager \global\let\pagealignmacro=\chappager -@@ -2727,4 +3078,5 @@ +@@ -2727,4 +3078,5 @@ July\or August\or September\or October\o \def\CHAPPAGodd{ +\global\let\contentsalignmacro = \chapoddpage \global\let\pchapsepmacro=\chapoddpage \global\let\pagealignmacro=\chapoddpage -@@ -2735,23 +3087,37 @@ +@@ -2735,23 +3087,37 @@ July\or August\or September\or October\o \def\CHAPFplain{ \global\let\chapmacro=\chfplain -\global\let\unnumbchapmacro=\unnchfplain} @@ -1970,7 +1970,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \CHAPFplain % The default -@@ -2767,57 +3133,61 @@ +@@ -2767,57 +3133,61 @@ July\or August\or September\or October\o } +\def\centerchfopen #1{% @@ -2074,7 +2074,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\message{toc printing,} % Finish up the main text and prepare to read what we've written % to \contentsfile. -@@ -2825,14 +3195,19 @@ +@@ -2825,14 +3195,19 @@ July\or August\or September\or October\o \newskip\contentsrightmargin \contentsrightmargin=1in \def\startcontents#1{% - \pagealignmacro @@ -2097,26 +2097,26 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi \raggedbottom % Worry more about breakpoints than the bottom. \advance\hsize by -\contentsrightmargin % Don't use the full line length. -@@ -2858,4 +3233,5 @@ +@@ -2858,4 +3233,5 @@ July\or August\or September\or October\o \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl \rm + \hyphenpenalty = 10000 \advance\baselineskip by 1pt % Open it up a little. \def\secentry ##1##2##3##4{} -@@ -2901,5 +3277,5 @@ +@@ -2901,5 +3277,5 @@ July\or August\or September\or October\o % widest letter (M) is 1em, at least in the Computer Modern fonts. % (This space doesn't include the extra space that gets added after - % the label; that gets put in in \shortchapentry above.) + % the label; that gets put in by \shortchapentry above.) \advance\dimen0 by 1.1em \hbox to \dimen0{#1\hfil}% -@@ -2922,5 +3298,4 @@ +@@ -2922,5 +3298,4 @@ July\or August\or September\or October\o \def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}} - % This parameter controls the indentation of the various levels. \newdimen\tocindent \tocindent = 3pc -@@ -2929,13 +3304,13 @@ +@@ -2929,13 +3304,13 @@ July\or August\or September\or October\o % page number. % -% If the toc has to be broken over pages, we would want to be at chapters @@ -2133,7 +2133,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \nobreak\vskip .25\baselineskip plus.1\baselineskip } -@@ -2960,7 +3335,8 @@ +@@ -2960,7 +3335,8 @@ July\or August\or September\or October\o % of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.) % +% \turnoffactive is for the sake of @" used for umlauts. @@ -2144,14 +2144,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \entry{\turnoffactive #1}{\turnoffactive #2}% \endgroup} -@@ -2986,6 +3362,4 @@ +@@ -2986,6 +3362,4 @@ July\or August\or September\or October\o \newbox\equivbox \newbox\errorbox -\let\ptexequiv = \equiv - %{\tentt %\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil} -@@ -2998,10 +3372,9 @@ +@@ -2998,10 +3372,9 @@ July\or August\or September\or October\o %} +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. @@ -2163,21 +2163,21 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ - \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}} -@@ -3035,5 +3408,5 @@ +@@ -3035,5 +3408,5 @@ July\or August\or September\or October\o \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie \catcode `\%=14 -\catcode 43=12 +\catcode 43=12 % plus \catcode`\"=12 \catcode`\==12 -@@ -3043,5 +3416,5 @@ +@@ -3043,5 +3416,5 @@ July\or August\or September\or October\o \escapechar=`\\ % -\let\~=\ptextilde +\let\,=\ptexcomma \let\{=\ptexlbrace \let\}=\ptexrbrace -@@ -3049,8 +3422,9 @@ +@@ -3049,8 +3422,9 @@ July\or August\or September\or October\o \let\*=\ptexstar \let\dots=\ptexdots +\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% @@ -2189,7 +2189,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\let\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext % \let\Etex=\endgroup} -@@ -3111,9 +3485,9 @@ +@@ -3111,9 +3485,9 @@ July\or August\or September\or October\o \def\cbr{{\hskip 6pt\circle\char'011}} \def\carttop{\hbox to \cartouter{\hskip\lskip - \ctl\leaders\hrule height\circthick\hfil\ctr @@ -2203,7 +2203,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \hskip\rskip}} % \newskip\lskip\newskip\rskip -@@ -3121,38 +3495,38 @@ +@@ -3121,38 +3495,38 @@ July\or August\or September\or October\o \long\def\cartouche{% \begingroup - \lskip=\leftskip \rskip=\rightskip @@ -2275,7 +2275,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \egroup \endgroup }} -@@ -3217,6 +3591,5 @@ +@@ -3217,6 +3591,5 @@ July\or August\or September\or October\o \let\Esmallexample = \nonfillfinish % - % Smaller interline space and fonts for small examples. @@ -2283,7 +2283,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % Smaller fonts for small examples. \indexfonts \tt \rawbackslash % make \ output the \ character from the current font (tt) -@@ -3307,9 +3680,13 @@ +@@ -3307,9 +3680,13 @@ July\or August\or September\or October\o \gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 } \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} +% This is used to turn on special parens @@ -2299,7 +2299,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +} % % This is the definition of ( when already inside a level of parens. -@@ -3317,7 +3694,7 @@ +@@ -3317,7 +3694,7 @@ July\or August\or September\or October\o % \gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0. -% also in that case restore the outer-level definition of (. @@ -2310,7 +2310,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \global\advance \parencount by -1 } % If we encounter &foo, then turn on ()-hacking afterwards \gdef\amprm#1 {{\rm\}\let(=\oprm \let)=\clrm\ } -@@ -3327,6 +3704,9 @@ +@@ -3327,6 +3704,9 @@ July\or August\or September\or October\o %% These parens (in \boldbrax) actually are a little bolder than the %% contained text. This is especially needed for [ and ] -\def\opnr{{\sf\char`\(}} \def\clnr{{\sf\char`\)}} \def\ampnr{\&} @@ -2322,14 +2322,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\rbrb{{\bf\char`\]}} % First, defname, which formats the header line itself. -@@ -3421,5 +3801,5 @@ +@@ -3421,5 +3801,5 @@ July\or August\or September\or October\o % This is used for \def{tp,vr}parsebody. It could probably be used for % some of the others, too, with some judicious conditionals. -% +% \def\parsebodycommon#1#2#3{% \begingroup\inENV % -@@ -3455,15 +3835,14 @@ +@@ -3455,15 +3835,14 @@ July\or August\or September\or October\o % Fine, but then we have to eventually remove the \empty *and* the -% braces (if any). That's what this does, putting the result in \tptemp. @@ -2350,14 +2350,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + #1{\removeemptybraces#2\relax}{#3}% }% -@@ -3506,5 +3885,5 @@ +@@ -3506,5 +3885,5 @@ July\or August\or September\or October\o #1% \hyphenchar\tensl=45 -\ifnum\parencount=0 \else \errmessage{unbalanced parens in @def arguments}\fi% +\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi% \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil -@@ -3515,5 +3894,6 @@ +@@ -3515,5 +3894,6 @@ July\or August\or September\or October\o % Expand, preventing hyphenation at `-' chars. % Note that groups don't affect changes in \hyphenchar. -\functionparens @@ -2365,14 +2365,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\boldbraxnoamp \tclose{#1}% avoid \code because of side effects on active chars \interlinepenalty=10000 -@@ -3552,5 +3932,5 @@ +@@ -3552,5 +3932,5 @@ July\or August\or September\or October\o \def\deftypefunheaderx #1#2 #3\relax{% \doind {fn}{\code{#2}}% Make entry in function index -\begingroup\defname {\code{#1} #2}{Function}% +\begingroup\defname {\defheaderxcond#1\relax$$$#2}{Function}% \deftypefunargs {#3}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody -@@ -3561,4 +3941,8 @@ +@@ -3561,4 +3941,8 @@ July\or August\or September\or October\o \def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader} +% \defheaderxcond#1\relax$$$ @@ -2381,20 +2381,20 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % #1 is the classification. #2 is the data type. #3 is the name and args. \def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax} -@@ -3569,5 +3953,5 @@ +@@ -3569,5 +3953,5 @@ July\or August\or September\or October\o \normalparens % notably, turn off `&' magic, which prevents % at least some C++ text from working -\defname {\code{#2} #3}{#1}% +\defname {\defheaderxcond#2\relax$$$#3}{#1}% \deftypefunargs {#4}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody -@@ -3602,4 +3986,5 @@ +@@ -3602,4 +3986,5 @@ July\or August\or September\or October\o \def\defspecx #1 {\errmessage{@defspecx in invalid context}} \def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}} +\def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}} \def\deftypeunx #1 {\errmessage{@deftypeunx in invalid context}} -@@ -3617,4 +4002,14 @@ +@@ -3617,4 +4002,14 @@ July\or August\or September\or October\o } +% @deftypemethod foo-class return-type foo-method args @@ -2409,7 +2409,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % @defmethod == @defop Method -@@ -3694,11 +4089,13 @@ +@@ -3694,11 +4089,13 @@ July\or August\or September\or October\o \def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader} -% #1 is the data type. #2 is the name. @@ -2426,7 +2426,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}} % @deftypevr {Global Flag} int enable -@@ -3706,6 +4103,6 @@ +@@ -3706,6 +4103,6 @@ July\or August\or September\or October\o \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader} -\def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}% @@ -2435,13 +2435,13 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1} \interlinepenalty=10000 \endgraf\penalty 10000\vskip -\parskip\penalty 10000 -@@ -3738,4 +4135,5 @@ +@@ -3738,4 +4135,5 @@ July\or August\or September\or October\o \def\deftpx #1 {\errmessage{@deftpx in invalid context}} + \message{cross reference,} % Define cross-reference macros -@@ -3745,4 +4143,9 @@ +@@ -3745,4 +4143,9 @@ July\or August\or September\or October\o \newif\ifwarnedxrefs % True if we warned once that they aren't known. +% @inforef is simple. @@ -2451,7 +2451,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % \setref{foo} defines a cross-reference point named foo. -@@ -3778,5 +4181,8 @@ +@@ -3778,5 +4181,8 @@ July\or August\or September\or October\o \ifdim \wd0 = 0pt % No printed node name was explicitly given. - \ifx\SETxref-automatic-section-title\relax % @@ -2461,14 +2461,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \else % Use the actual chapter/section title appear inside % the square brackets. Use the real section title if we have it. -@@ -3787,5 +4193,5 @@ +@@ -3787,5 +4193,5 @@ July\or August\or September\or October\o \ifhavexrefs % We know the real title if we have the xref values. - \def\printednodename{\refx{#1-title}}% + \def\printednodename{\refx{#1-title}{}}% \else % Otherwise just copy the Info node name. -@@ -3793,8 +4199,4 @@ +@@ -3793,8 +4199,4 @@ July\or August\or September\or October\o \fi% \fi - \def\printednodename{#1-title}% @@ -2477,14 +2477,14 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ - \def\printednodename{\ignorespaces #1}% \fi \fi -@@ -3824,5 +4226,5 @@ +@@ -3824,5 +4226,5 @@ July\or August\or September\or October\o % Use \turnoffactive so that punctuation chars such as underscore % work in node names. -\def\dosetq #1#2{{\let\folio=0 \turnoffactive% +\def\dosetq #1#2{{\let\folio=0 \turnoffactive \edef\next{\write\auxfile{\internalsetq {#1}{#2}}}% \next}} -@@ -3893,81 +4295,99 @@ +@@ -3893,81 +4295,99 @@ July\or August\or September\or October\o } -% Read the last existing aux file, if any. No error if none exists. @@ -2658,7 +2658,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \openout\auxfile=\jobname.aux \endgroup} -@@ -3980,5 +4400,6 @@ +@@ -3980,5 +4400,6 @@ July\or August\or September\or October\o % vital for proper filling; pages come out unaligned when you do a % pagealignmacro call if that space before the closing brace is -% removed. @@ -2666,7 +2666,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +% space to prevent strange expansion errors.) \def\supereject{\par\penalty -20000\footnoteno =0 } -@@ -4009,5 +4430,9 @@ +@@ -4009,5 +4430,9 @@ July\or August\or September\or October\o % footnote text as a parameter. Our footnotes don't need to be so general. % -\long\gdef\footnotezzz#1{\insert\footins{% @@ -2677,7 +2677,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\long\gdef\footnotezzz{\insert\footins\bgroup % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. -@@ -4031,6 +4456,11 @@ +@@ -4031,6 +4456,11 @@ July\or August\or September\or October\o % provide a place where TeX can split the footnote. \footstrut - #1\strut}% @@ -2690,7 +2690,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\@foot{\strut\egroup} }%end \catcode `\@=11 -@@ -4105,11 +4535,16 @@ +@@ -4105,11 +4535,16 @@ July\or August\or September\or October\o % Set some numeric style parameters, for 8.5 x 11 format. -%\hsize = 6.5in @@ -2710,7 +2710,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % Prevent underfull vbox error messages. \vbadness=10000 -@@ -4134,28 +4569,26 @@ +@@ -4134,28 +4569,26 @@ July\or August\or September\or October\o % Use @smallbook to reset parameters for 7x9.5 format (or else 7x9.25) \def\smallbook{ - @@ -2761,7 +2761,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \global\def\Esmallexample{\Esmalllisp} } -@@ -4180,10 +4613,17 @@ +@@ -4180,10 +4613,17 @@ July\or August\or September\or October\o } +\bindingoffset=0pt @@ -2782,7 +2782,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \global\topskip= #6 \advance\vsize by \topskip \global\voffset= #3 -@@ -4198,7 +4638,18 @@ +@@ -4198,7 +4638,18 @@ July\or August\or September\or October\o \global\bindingoffset= #5} -% This layout is compatible with Latex on A4 paper. @@ -2804,7 +2804,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}} % Define macros to output various characters with catcode for normal text. -@@ -4248,12 +4699,5 @@ +@@ -4248,12 +4699,5 @@ July\or August\or September\or October\o \def_{\ifusingtt\normalunderscore\_} % Subroutine for the previous macro. -\def\_{\lvvmode \kern.06em \vbox{\hrule width.3em height.1ex}} @@ -2818,7 +2818,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ +\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}} \catcode`\|=\active -@@ -4274,4 +4718,13 @@ +@@ -4274,4 +4718,13 @@ July\or August\or September\or October\o \global\def={{\tt \char 61}}} +\catcode`+=\active @@ -2832,7 +2832,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + \catcode`\@=0 -@@ -4316,4 +4769,8 @@ +@@ -4316,4 +4769,8 @@ July\or August\or September\or October\o @let+=@normalplus} +% Make _ and + \other characters, temporarily. @@ -2841,7 +2841,7 @@ $NetBSD: patch-bb,v 1.3 2000/12/16 13:54:50 wiz Exp $ + % If a .fmt file is being used, we don't want the `\input texinfo' to show up. % That is what \eatinput is for; after that, the `\' should revert to printing -@@ -4326,6 +4783,9 @@ +@@ -4326,6 +4783,9 @@ July\or August\or September\or October\o % the first `\{ in the file would cause an error. This macro tries to fix % that, assuming it is called before the first `\' could plausibly occur. +% Also back turn on active characters that might appear in the input diff --git a/editors/mule/patches/patch-bc b/editors/mule/patches/patch-bc index c32868b4c5e..388e14598f3 100644 --- a/editors/mule/patches/patch-bc +++ b/editors/mule/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.1 2001/03/18 14:14:24 kei Exp $ +$NetBSD: patch-bc,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/m/alpha.h.orig Fri Feb 17 16:47:36 1995 -+++ src/m/alpha.h Sat Mar 17 14:37:23 2001 -@@ -108,7 +108,9 @@ +--- src/m/alpha.h.orig 1995-02-17 08:47:36.000000000 +0100 ++++ src/m/alpha.h +@@ -108,7 +108,9 @@ NOTE-START in the file alloca.s should be used. */ #define HAVE_ALLOCA @@ -12,7 +12,7 @@ $NetBSD: patch-bc,v 1.1 2001/03/18 14:14:24 kei Exp $ /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section -@@ -134,7 +136,9 @@ +@@ -134,7 +136,9 @@ NOTE-START #define START_FILES pre-crt0.o @@ -22,7 +22,7 @@ $NetBSD: patch-bc,v 1.1 2001/03/18 14:14:24 kei Exp $ #define PNTR_COMPARISON_TYPE unsigned long -@@ -149,7 +153,9 @@ +@@ -149,7 +153,9 @@ extern unsigned long _edata; #define DATA_END &_edata #define ORDINARY_LINK diff --git a/editors/mule/patches/patch-bd b/editors/mule/patches/patch-bd index a2fd6da52ce..7c11b9b264b 100644 --- a/editors/mule/patches/patch-bd +++ b/editors/mule/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.1 2001/03/18 14:14:24 kei Exp $ +$NetBSD: patch-bd,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/fns.c.orig Fri Oct 21 13:20:15 1994 -+++ src/fns.c Sat Mar 17 15:31:28 2001 -@@ -64,7 +64,9 @@ +--- src/fns.c.orig 1994-10-21 05:20:15.000000000 +0100 ++++ src/fns.c +@@ -64,7 +64,9 @@ With argument t, set the random number s unsigned long denominator; extern long random (); extern srandom (); diff --git a/editors/mule/patches/patch-be b/editors/mule/patches/patch-be index 0be8b03b941..57cf123da61 100644 --- a/editors/mule/patches/patch-be +++ b/editors/mule/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.1 2002/11/29 00:24:48 kei Exp $ +$NetBSD: patch-be,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/config.h.in.orig Fri Nov 29 01:35:25 2002 -+++ src/config.h.in Fri Nov 29 01:35:48 2002 -@@ -177,7 +177,7 @@ +--- src/config.h.in.orig 1995-07-17 03:37:51.000000000 +0200 ++++ src/config.h.in +@@ -177,7 +177,7 @@ and this notice must be preserved on all /* Define if you have the ANSI `strerror' function. Otherwise you must have the variable `char *sys_errlist[]'. */ diff --git a/editors/mule/patches/patch-bf b/editors/mule/patches/patch-bf index 1d27527aff6..7b7bfc46389 100644 --- a/editors/mule/patches/patch-bf +++ b/editors/mule/patches/patch-bf @@ -1,6 +1,6 @@ -$NetBSD: patch-bf,v 1.1 2004/02/16 23:41:26 seb Exp $ +$NetBSD: patch-bf,v 1.2 2005/12/01 18:13:24 wiz Exp $ ---- src/emacs.c.orig 1995-06-08 05:58:13.000000000 +0000 +--- src/emacs.c.orig 1995-06-08 07:58:13.000000000 +0200 +++ src/emacs.c @@ -410,6 +410,8 @@ __main () NXZone *emacszone; diff --git a/editors/mule/patches/patch-bg b/editors/mule/patches/patch-bg new file mode 100644 index 00000000000..3c05cf76ff3 --- /dev/null +++ b/editors/mule/patches/patch-bg @@ -0,0 +1,17 @@ +$NetBSD: patch-bg,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/canna-jp.orig 1995-02-27 07:02:45.000000000 +0100 ++++ info/canna-jp +@@ -2,7 +2,11 @@ Info file: canna-jp, -*-Text-*- + produced by texinfo-format-buffer + from file: canna-jp.texinfo + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Canna-jp: (canna-jp). Japanese Inputting method Canna. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: canna-jp Node: Top, Prev: (dir), Up: (dir), Next: 概説 diff --git a/editors/mule/patches/patch-bh b/editors/mule/patches/patch-bh new file mode 100644 index 00000000000..84c8bbc7edf --- /dev/null +++ b/editors/mule/patches/patch-bh @@ -0,0 +1,18 @@ +$NetBSD: patch-bh,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/egg-jp-1.orig 1994-10-21 05:18:00.000000000 +0100 ++++ info/egg-jp-1 +@@ -2,8 +2,11 @@ Info file: egg-jp, -*-Text-*- + produced by texinfo-format-buffer + from file: egg-jp.texi + +- +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: egg-jp Node: Top, Up: (dir), Next: Overview diff --git a/editors/mule/patches/patch-bi b/editors/mule/patches/patch-bi new file mode 100644 index 00000000000..0a94e255ddc --- /dev/null +++ b/editors/mule/patches/patch-bi @@ -0,0 +1,18 @@ +$NetBSD: patch-bi,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/egg-jp-2.orig 1994-10-21 05:18:01.000000000 +0100 ++++ info/egg-jp-2 +@@ -2,8 +2,11 @@ Info file: egg-jp, -*-Text-*- + produced by texinfo-format-buffer + from file: egg-jp.texi + +- +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: egg-jp Node: Editing, Prev: Registration, Up: Dictionary Management, Next: Customization diff --git a/editors/mule/patches/patch-bj b/editors/mule/patches/patch-bj new file mode 100644 index 00000000000..fce26860835 --- /dev/null +++ b/editors/mule/patches/patch-bj @@ -0,0 +1,18 @@ +$NetBSD: patch-bj,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/egg-jp.orig 1994-10-21 05:17:59.000000000 +0100 ++++ info/egg-jp +@@ -2,8 +2,11 @@ Info file: egg-jp, -*-Text-*- + produced by texinfo-format-buffer + from file: egg-jp.texi + +- +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Egg-jp: (egg-jp). Built-in Chinese/Japanese Inputting Method for Mule. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + Indirect: diff --git a/editors/mule/patches/patch-bk b/editors/mule/patches/patch-bk new file mode 100644 index 00000000000..7b731dd1fe2 --- /dev/null +++ b/editors/mule/patches/patch-bk @@ -0,0 +1,16 @@ +$NetBSD: patch-bk,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/egg.orig 1994-10-21 05:17:59.000000000 +0100 ++++ info/egg +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `egg.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* egg: (egg). Built-in Chinese/Japanese Inputting method for Mule. ++END-INFO-DIR-ENTRY + + + File: egg, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-bl b/editors/mule/patches/patch-bl new file mode 100644 index 00000000000..b81c94fb257 --- /dev/null +++ b/editors/mule/patches/patch-bl @@ -0,0 +1,16 @@ +$NetBSD: patch-bl,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/kbd-trans.orig 1994-10-21 05:18:01.000000000 +0100 ++++ info/kbd-trans +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `kbd-trans.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* kbd-trans: (kbd-trans). keyboard translation on Mule. ++END-INFO-DIR-ENTRY + + + File: kbd-trans, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-bm b/editors/mule/patches/patch-bm new file mode 100644 index 00000000000..54202cd6de1 --- /dev/null +++ b/editors/mule/patches/patch-bm @@ -0,0 +1,16 @@ +$NetBSD: patch-bm,v 1.1 2005/12/01 18:13:24 wiz Exp $ + +--- info/languages.orig 1994-12-20 07:39:16.000000000 +0100 ++++ info/languages +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `languages.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* languages: (languages). various Asian and European languages in Mule. ++END-INFO-DIR-ENTRY + + + File: languages, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-bn b/editors/mule/patches/patch-bn new file mode 100644 index 00000000000..13cc5985517 --- /dev/null +++ b/editors/mule/patches/patch-bn @@ -0,0 +1,16 @@ +$NetBSD: patch-bn,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/m2ps.orig 1994-10-27 09:24:45.000000000 +0100 ++++ info/m2ps +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `m2ps.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* m2ps: (m2ps). Converter from Mule code to PostScript. ++END-INFO-DIR-ENTRY + + + File: m2ps, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-bo b/editors/mule/patches/patch-bo new file mode 100644 index 00000000000..3e399e683cf --- /dev/null +++ b/editors/mule/patches/patch-bo @@ -0,0 +1,17 @@ +$NetBSD: patch-bo,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/mule-jp-1.orig 1994-10-27 12:30:05.000000000 +0100 ++++ info/mule-jp-1 +@@ -3,7 +3,11 @@ produced by `texinfo-format-buffer' + from file `mule-jp.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: mule-jp, Node: Top, Next: Overview, Up: (dir) diff --git a/editors/mule/patches/patch-bp b/editors/mule/patches/patch-bp new file mode 100644 index 00000000000..305b23a1ebc --- /dev/null +++ b/editors/mule/patches/patch-bp @@ -0,0 +1,17 @@ +$NetBSD: patch-bp,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/mule-jp-2.orig 1994-10-27 12:30:06.000000000 +0100 ++++ info/mule-jp-2 +@@ -3,7 +3,11 @@ produced by `texinfo-format-buffer' + from file `mule-jp.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: mule-jp, Node: Set Coding System, Next: Key Input, Prev: Buffers, Up: Multilingual Char diff --git a/editors/mule/patches/patch-bq b/editors/mule/patches/patch-bq new file mode 100644 index 00000000000..50209af9ec8 --- /dev/null +++ b/editors/mule/patches/patch-bq @@ -0,0 +1,17 @@ +$NetBSD: patch-bq,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/mule-jp-3.orig 1994-10-27 12:30:07.000000000 +0100 ++++ info/mule-jp-3 +@@ -3,7 +3,11 @@ produced by `texinfo-format-buffer' + from file `mule-jp.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + File: mule-jp, Node: Justifying, Next: Enhancement, Prev: Filling, Up: Filling&Justifying diff --git a/editors/mule/patches/patch-br b/editors/mule/patches/patch-br new file mode 100644 index 00000000000..1b2cc84dee6 --- /dev/null +++ b/editors/mule/patches/patch-br @@ -0,0 +1,17 @@ +$NetBSD: patch-br,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/mule-jp.orig 1994-10-27 12:30:10.000000000 +0100 ++++ info/mule-jp +@@ -3,7 +3,11 @@ produced by `texinfo-format-buffer' + from file `mule-jp.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Mule-jp: (mule-jp). MULtilingual Enhancement to GNU Emacs. ++ (written in Japanese) ++END-INFO-DIR-ENTRY + + + Indirect: diff --git a/editors/mule/patches/patch-bs b/editors/mule/patches/patch-bs new file mode 100644 index 00000000000..6e5413bde76 --- /dev/null +++ b/editors/mule/patches/patch-bs @@ -0,0 +1,15 @@ +$NetBSD: patch-bs,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/mule.orig 1994-10-27 09:27:12.000000000 +0100 ++++ info/mule +@@ -3,6 +3,10 @@ produced by `texinfo-format-buffer' + from file `mule.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Mule: (mule). MULtilingual Enhancement to GNU Emacs. ++END-INFO-DIR-ENTRY + + This file documents the internal structure of Mule (MULtilingual + Enhancement to GNU Emacs). diff --git a/editors/mule/patches/patch-bt b/editors/mule/patches/patch-bt new file mode 100644 index 00000000000..62a14a8a35e --- /dev/null +++ b/editors/mule/patches/patch-bt @@ -0,0 +1,16 @@ +$NetBSD: patch-bt,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/quail.orig 1994-10-27 12:22:16.000000000 +0100 ++++ info/quail +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `quail.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* quail: (quail). Imputting methods of multilingual text on Mule. ++END-INFO-DIR-ENTRY + + + File: quail, Node: Top, Up: (mule) diff --git a/editors/mule/patches/patch-bu b/editors/mule/patches/patch-bu new file mode 100644 index 00000000000..f6f89c026b9 --- /dev/null +++ b/editors/mule/patches/patch-bu @@ -0,0 +1,16 @@ +$NetBSD: patch-bu,v 1.1 2005/12/01 18:13:25 wiz Exp $ + +--- info/terminology.orig 1994-10-27 12:21:48.000000000 +0100 ++++ info/terminology +@@ -3,7 +3,10 @@ produced by `texinfo-format-buffer' + from file `terminology.texi' + using `texinfmt.el' version 2.32 of 19 November 1993. + +- ++INFO-DIR-SECTION Editors ++START-INFO-DIR-ENTRY ++* Terminology: (terminology). Terminology used by Mule. ++END-INFO-DIR-ENTRY + + + File: terminology, Node: Top, Up: (mule) |