Rename Buttress to Halibut. I _think_ I've caught everything in this pass.

[originally from svn r1800]

22 files changed, 59 insertions, 59 deletions

diff --git a/LICENCE b/LICENCE
index 98ee16a..b1bfa8b 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Buttress is copyright (c) 1999-2001 Simon Tatham and James Aylett.
+Halibut is copyright (c) 1999-2001 Simon Tatham and James Aylett.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
diff --git a/MODULE b/MODULE
index ffc0f34..260f8ab 100644
--- a/MODULE
+++ b/MODULE
@@ -1,5 +1,5 @@
-Module: buttress
+Module: halibut
 Author: Simon Tatham <anakin@pobox.com>
-Description: Buttress is yet another text formatting system, intended primarily for writing software documentation. It accepts a single source format and outputs a variety of formats, planned to include text, HTML, Texinfo, Windows Help, Windows HTMLHelp, PostScript and PDF. It has comprehensive indexing and cross-referencing support, and generates hyperlinks within output documents wherever possible.
-Homepage: http://www.chiark.greenend.org.uk/~sgtatham/buttress.html
-Release: http://www.chiark.greenend.org.uk/~sgtatham/buttress.html
+Description: Halibut is yet another text formatting system, intended primarily for writing software documentation. It accepts a single source format and outputs a variety of formats, planned to include text, HTML, Texinfo, Windows Help, Windows HTMLHelp, PostScript and PDF. It has comprehensive indexing and cross-referencing support, and generates hyperlinks within output documents wherever possible.
+Homepage: http://www.chiark.greenend.org.uk/~sgtatham/halibut.html
+Release: http://www.chiark.greenend.org.uk/~sgtatham/halibut.html
diff --git a/Makefile b/Makefile
index 17cec01..b82ba23 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Buttress master makefile
+# Halibut master makefile
 
 # Requires a compiler with -MD support, currently
 
@@ -59,8 +59,8 @@ MODULES += winhelp
 OBJECTS := $(addsuffix .o,$(MODULES))
 DEPS := $(addsuffix .d,$(MODULES))
 
-buttress: $(OBJECTS)
-	$(CC) $(LFLAGS) -o buttress $(OBJECTS) $(LIBS)
+halibut: $(OBJECTS)
+	$(CC) $(LFLAGS) -o halibut $(OBJECTS) $(LIBS)
 
 %.o: $(SRC)%.c
 	$(CC) $(CFLAGS) -MD -c $<
@@ -72,7 +72,7 @@ spotless:: clean
 	rm -f *.d
 
 clean::
-	rm -f *.o buttress core
+	rm -f *.o halibut core
 
 FORCE: # phony target to force version.o to be rebuilt every time
 
diff --git a/biblio.c b/biblio.c
index 57f1963..de0b925 100644
--- a/biblio.c
+++ b/biblio.c
@@ -3,7 +3,7 @@
  */
 
 #include <assert.h>
-#include "buttress.h"
+#include "halibut.h"
 
 static wchar_t *gentext(int num) {
     wchar_t text[22];
diff --git a/bk_text.c b/bk_text.c
index 18a6af7..1583cbd 100644
--- a/bk_text.c
+++ b/bk_text.c
@@ -1,11 +1,11 @@
 /*
- * text backend for Buttress
+ * text backend for Halibut
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "buttress.h"
+#include "halibut.h"
 
 typedef enum { LEFT, LEFTPLUS, CENTRE } alignment;
 typedef struct {
diff --git a/bk_whlp.c b/bk_whlp.c
index 757f4e5..a8cb99e 100644
--- a/bk_whlp.c
+++ b/bk_whlp.c
@@ -1,5 +1,5 @@
 /*
- * Windows Help backend for Buttress
+ * Windows Help backend for Halibut
  * 
  * TODO:
  *  - allow user to specify section contexts.
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "buttress.h"
+#include "halibut.h"
 #include "winhelp.h"
 
 struct bk_whlp_state {
diff --git a/bk_xhtml.c b/bk_xhtml.c
index 0005f6b..2016e10 100644
--- a/bk_xhtml.c
+++ b/bk_xhtml.c
@@ -1,5 +1,5 @@
 /*
- * xhtml backend for Buttress
+ * xhtml backend for Halibut
  * (initial implementation by James Aylett)
  *
  * Still to do:
@@ -23,13 +23,13 @@
  *   top-level file not being normal, probably not even having a valid
  *   section level, and stuff like that. I question whether this is an
  *   issue, frankly; small manuals that fit on one page should probably
- *   not be written in buttress at all.
+ *   not be written in halibut at all.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "buttress.h"
+#include "halibut.h"
 
 struct xhtmlsection_Struct {
     struct xhtmlsection_Struct *next; /* next sibling (NULL if split across files) */
@@ -328,7 +328,7 @@ void xhtml_fixup_layout(xhtmlfile* file)
  * Note that you _can_ have 1.1.1.1 followed by 1.2 - you can change
  * more than one level at a time. Lots of asserts, and probably part of
  * the algorithm here, rely on this being true. (It currently isn't
- * enforced by buttress, however.)
+ * enforced by halibut, however.)
  *
  * File splitting makes this harder. For instance, say we added at (3)
  * above and now need to add another section. We are splitting at level
@@ -1098,7 +1098,7 @@ static void xhtml_doheader(FILE *fp, word *title)
   else
     xhtml_para(fp, title);
   fprintf(fp, "</title>\n");
-  fprintf(fp, "<meta name=\"generator\" content=\"Buttress %s xhtml-backend\" />\n", version);
+  fprintf(fp, "<meta name=\"generator\" content=\"Halibut %s xhtml-backend\" />\n", version);
   if (conf.author)
     fprintf(fp, "<meta name=\"author\" content=\"%ls\" />\n", conf.author);
   if (conf.description)
diff --git a/contents.c b/contents.c
index 85d230b..de45433 100644
--- a/contents.c
+++ b/contents.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <limits.h>
-#include "buttress.h"
+#include "halibut.h"
 
 struct numberstate_Tag {
     int chapternum;
diff --git a/error.c b/error.c
index 4f7524c..6d8dd13 100644
--- a/error.c
+++ b/error.c
@@ -1,16 +1,16 @@
 /*
- * error.c: buttress error handling
+ * error.c: Halibut error handling
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include "buttress.h"
+#include "halibut.h"
 
 /*
  * Error flags
  */
-#define PREFIX 0x0001		       /* give `buttress:' prefix */
+#define PREFIX 0x0001		       /* give `halibut:' prefix */
 #define FILEPOS 0x0002		       /* give file position prefix */
 
 static void do_error(int code, va_list ap) {
@@ -192,7 +192,7 @@ static void do_error(int code, va_list ap) {
     }
 
     if (flags & PREFIX)
-	fputs("buttress: ", stderr);
+	fputs("halibut: ", stderr);
     if (flags & FILEPOS) {
 	fprintf(stderr, "%s:%d:", fpos.filename, fpos.line);
 	if (fpos.col > 0)
diff --git a/buttress.h b/halibut.h
index 6646a81..c948624 100644
--- a/buttress.h
+++ b/halibut.h
@@ -1,5 +1,5 @@
-#ifndef BUTTRESS_BUTTRESS_H
-#define BUTTRESS_BUTTRESS_H
+#ifndef HALIBUT_HALIBUT_H
+#define HALIBUT_HALIBUT_H
 
 #include <stdio.h>
 #include <wchar.h>
diff --git a/help.c b/help.c
index c1e2e42..3fd957f 100644
--- a/help.c
+++ b/help.c
@@ -3,7 +3,7 @@
  */
 
 #include <stdio.h>
-#include "buttress.h"
+#include "halibut.h"
 
 static char *helptext[] = {
     "FIXME: help text goes here",
@@ -28,5 +28,5 @@ void usage(void) {
 }
 
 void showversion(void) {
-    printf("Buttress, %s\n", version);
+    printf("Halibut, %s\n", version);
 }
diff --git a/index.c b/index.c
index b5005ac..3b1df51 100644
--- a/index.c
+++ b/index.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "buttress.h"
+#include "halibut.h"
 
 static int compare_tags(void *av, void *bv);
 static int compare_entries(void *av, void *bv);
diff --git a/input.c b/input.c
index a8f076b..15e0a97 100644
--- a/input.c
+++ b/input.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <time.h>
-#include "buttress.h"
+#include "halibut.h"
 
 #define TAB_STOP 8		       /* for column number tracking */
 
@@ -157,7 +157,7 @@ enum {
     tok_rbrace			       /* } */
 };
 
-/* Buttress command keywords. */
+/* Halibut command keywords. */
 enum {
     c__invalid,			       /* invalid command */
     c__comment,			       /* comment command (\#) */
diff --git a/inputs/test.but b/inputs/test.but
index f13fba8..5849e52 100644
--- a/inputs/test.but
+++ b/inputs/test.but
@@ -1,4 +1,4 @@
-\title Buttress: A Test Document With A Stupidly Long Title Just To
+\title Halibut: A Test Document With A Stupidly Long Title Just To
 See If Wrapping Titles Works OK. In Fact This Title Will Span Three
 Lines, Not Just Two. How's That For Ludicrous?
 
@@ -7,7 +7,7 @@ Lines, Not Just Two. How's That For Ludicrous?
 \cfg{xhtml-leaf-contains-contents}{true}
 
 \preamble This manual is a small joke effort, designed to use every
-feature \#{ comment } that Buttress's input format supports. Creation
+feature \#{ comment } that Halibut's input format supports. Creation
 date \date{%Y.%m.%d} (default format is \date).
 
 \copyright Copyright 1999 Simon \#{second comment}Tatham. All rights
@@ -19,7 +19,7 @@ a bit]
 
 \define{coopt} co\u00F6{-o}pt
 
-\versionid $Id: test.but,v 1.17 2001/12/14 12:44:40 simon Exp $
+\versionid $Id: test.but,v 1.18 2002/08/05 10:31:33 simon Exp $
 
 \C{ch\\ap} First chapter title; for similar wrapping reasons this
 chapter title will be ludicrously long. I wonder how much more
diff --git a/keywords.c b/keywords.c
index 1fc6f5e..6e8a230 100644
--- a/keywords.c
+++ b/keywords.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "buttress.h"
+#include "halibut.h"
 
 static int kwcmp(void *av, void *bv)
 {
diff --git a/main.c b/main.c
index a86399a..64f1869 100644
--- a/main.c
+++ b/main.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "buttress.h"
+#include "halibut.h"
 
 static void dbg_prtsource(paragraph *sourceform);
 static void dbg_prtwordlist(int level, word *w);
diff --git a/malloc.c b/malloc.c
index e9f54d6..1635b47 100644
--- a/malloc.c
+++ b/malloc.c
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
-#include "buttress.h"
+#include "halibut.h"
 
 #ifdef LOGALLOC
 #define LOGPARAMS char *file, int line,
@@ -37,8 +37,8 @@ static void logprintf(char *fmt, ...) {
 #endif
 
 /*
- * smalloc should guarantee to return a useful pointer - buttress
- * can do nothing except die when it's out of memory anyway
+ * smalloc should guarantee to return a useful pointer - Halibut
+ * can do nothing except die when it's out of memory anyway.
  */
 void *(smalloc)(LOGPARAMS int size) {
     void *p;
diff --git a/misc.c b/misc.c
index 4243954..c4ac72f 100644
--- a/misc.c
+++ b/misc.c
@@ -2,7 +2,7 @@
  * misc.c: miscellaneous useful items
  */
 
-#include "buttress.h"
+#include "halibut.h"
 
 struct stackTag {
     void **data;
diff --git a/misc/buttress.sl b/misc/halibut.sl
index b7b30bd..e88b1ed 100644
--- a/misc/buttress.sl
+++ b/misc/halibut.sl
@@ -1,6 +1,6 @@
-% Buttress mode for Jed.
+% Halibut mode for Jed.
 
-$1 = "Buttress";
+$1 = "Halibut";
 create_syntax_table ($1);
 
 define_syntax ("\#", "", '%', $1);       % Comment Syntax
@@ -10,9 +10,9 @@ define_syntax ("a-zA-Z0-9", 'w', $1);
 set_syntax_flags ($1, 8);
 
 #ifdef HAS_DFA_SYNTAX
-%enable_highlight_cache ("buttress.dfa", $1);
+%enable_highlight_cache ("halibut.dfa", $1);
 
-% A braced comment in Buttress is \#{ ... }, where ... may contain
+% A braced comment in Halibut is \#{ ... }, where ... may contain
 % any correctly nested sequence of braces. Of course we can't match
 % that in a DFA rule, so we'll go down to a reasonable depth of 3
 % instead.
@@ -50,16 +50,16 @@ build_highlight_table ($1);
 #endif
 
 %  This hook identifies lines containing comments as paragraph separator
-define buttress_is_comment() {
+define halibut_is_comment() {
     bol ();
     while (ffind ("\\\\#")) go_right (3);
     ffind ("\\#"); % return value on stack
 }
 
-variable Buttress_Ignore_Comment = 0;  % if true, line containing a comment
+variable Halibut_Ignore_Comment = 0;  % if true, line containing a comment
                                        % does not delimit a paragraph
 
-define buttress_paragraph_separator() {
+define halibut_paragraph_separator() {
     bol();
     skip_white();
     if (eolp())
@@ -67,13 +67,13 @@ define buttress_paragraph_separator() {
     if (looking_at("\\c ") or looking_at("\\c\t") or
 	looking_at("\\c\n"))
 	return 1;
-    return not (Buttress_Ignore_Comment) and buttress_is_comment();
+    return not (Halibut_Ignore_Comment) and halibut_is_comment();
 } 
 
-define buttress_wrap_hook() {
+define halibut_wrap_hook() {
     variable yep;
     push_spot ();
-    yep = up_1 () and buttress_is_comment ();
+    yep = up_1 () and halibut_is_comment ();
     pop_spot ();
     if (yep) {
 	push_spot ();
@@ -84,15 +84,15 @@ define buttress_wrap_hook() {
 }
 
 #ifexists mode_set_mode_info
-mode_set_mode_info("Buttress", "fold_info", "\\# {{{\r\\# }}}\r\r");
+mode_set_mode_info("Halibut", "fold_info", "\\# {{{\r\\# }}}\r\r");
 #endif
 
-define buttress_mode() {
-    variable mode = "Buttress";
+define halibut_mode() {
+    variable mode = "Halibut";
     % use_keymap (mode);
     set_mode (mode, 0x1 | 0x20);
-    set_buffer_hook ("par_sep", "buttress_paragraph_separator");
-    set_buffer_hook ("wrap_hook", "buttress_wrap_hook");
+    set_buffer_hook ("par_sep", "halibut_paragraph_separator");
+    set_buffer_hook ("wrap_hook", "halibut_wrap_hook");
     use_syntax_table (mode);
-    runhooks ("buttress_mode_hook");
+    runhooks ("halibut_mode_hook");
 }
diff --git a/style.c b/style.c
index bc16b2f..562c594 100644
--- a/style.c
+++ b/style.c
@@ -4,5 +4,5 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "buttress.h"
+#include "halibut.h"
 
diff --git a/ustring.c b/ustring.c
index a6690c1..1573a19 100644
--- a/ustring.c
+++ b/ustring.c
@@ -4,7 +4,7 @@
 
 #include <wchar.h>
 #include <time.h>
-#include "buttress.h"
+#include "halibut.h"
 
 wchar_t *ustrdup(wchar_t *s) {
     wchar_t *r;
diff --git a/winhelp.c b/winhelp.c
index 990c49e..005409e 100644
--- a/winhelp.c
+++ b/winhelp.c
@@ -71,7 +71,7 @@
 #include <time.h>
 #include <stdarg.h>
 
-#include "buttress.h"
+#include "halibut.h"
 #include "winhelp.h"
 #include "tree234.h"