* Makefile.pamphlet (${DEPSYS}): Depend on g-util.$(FASLEXT).

	Load explicitly.
	(<<profile.clisp>>): Remove.
	(<<g-cndata.clisp>>): Likewise.
	(<<g-opt.clisp>>): Likewise.
	(<<g-timer.clisp>>): Likewise.
	(<<hypertex.clisp>>): Likewise.
	(<<rulesets.clisp>>): Likewise.
	(<<ht-util.clisp>>): Likewise.
	(<<htsetvar.clisp>>): Likewise.
	(<<ht-root.clisp>>): Likewise.
	(<<htcheck.clisp>>): Likewise.
	(ht-root.$(FASLEXT)): New rule.
	(htcheck.$(FASLEXT)): Likewise.
	(ht-util.$(FASLEXT)): Likewise.
	(htsetvar.$(FASLEXT)): Likewise.
	(hypertex.$(FASLEXT)): Likewise.
	(profile.$(FASLEXT)): Likewise.
	(rulesets.$(FASLEXT)): Likewise.
	(g-opt.$(FASLEXT)): Likewise.
	(g-timer.$(FASLEXT)): Likewise.
	(g-util.$(FASLEXT)): Likewise.
	(g-cndata.$(FASLEXT)): Likewise.
	* daase.lisp.pamphlet (*attributes*): Move definition to
	sys-constants.boot.
	* g-cndata.boot.pamphlet: Push into package "BOOT".  Fix syntax.
	* g-opt.boot.pamphlet: Likewise.
	(EqualBarGensym): Fix thinko.
	* g-timer.boot.pamphlet: Push into package "BOOT".
	* g-util.boot.pamphlet: Likewise.
	* ht-root.boot.pamphlet: Likewise.  Fix syntax.
	* ht-util.boot.pamphlet: Push into package "BOOT".
	* htcheck.boot.pamphlet: Likewise.
	* htsetvar.boot.pamphlet: Likewise.
	* hypertex.boot.pamphlet: Likewise. Fix syntax.
	* profile.boot.pamphlet: Likewise.
	* rulesets.boot.pamphlet: Likewise.
	* setq.lisp.pamphlet (/VERSION): Move definition to sys-globals.boot.
	* spad.lisp.pamphlet (/WSNAME): Likewise.
	(|rplac|): Move to sys-macros.boot.

1 files changed, 34 insertions, 30 deletions

diff --git a/src/interp/ht-root.boot.pamphlet b/src/interp/ht-root.boot.pamphlet
index e8c27ee0..9ec1bbf3 100644
--- a/src/interp/ht-root.boot.pamphlet
+++ b/src/interp/ht-root.boot.pamphlet
@@ -46,6 +46,9 @@
 <<*>>=
 <<license>>
 
+import '"ht-util"
+)package "BOOT"
+
 $historyDisplayWidth := 120
 $newline := char 10
 
@@ -72,7 +75,7 @@ dbNonEmptyPattern pattern ==
   '"*"
 
 htSystemVariables() == main where
-  main ==
+  main() ==
     not $fullScreenSysVars => htSetVars()
     classlevel := $UserLevel
     $levels : local := '(compiler development interpreter)
@@ -102,35 +105,36 @@ htSystemVariables() == main where
       displayOptions(name,key,variable,val,options)
     htSay '"\endmenu"
     htShowPage()
-  functionTail(name,class,var,valuesOrFunction) ==
-    val := eval var
-    atom valuesOrFunction =>
-      htMakePage '((domainConditions (isDomain STR (String))))
-      htMakePage [['bcLinks,['"reset",'"",'htSetSystemVariableKind,[var,name,nil]]]]
-      htMakePage [['bcStrings,[30,STRINGIMAGE val,name,valuesOrFunction]]]
-    displayOptions(name,class,var,val,valuesOrFunction)
-  displayOptions(name,class,variable,val,options) ==
-    class = 'INTEGER =>
-      htMakePage [['bcLispLinks,[[['text,options.0,'"-",options.1 or '""]],'"",'htSetSystemVariableKind,[variable,name,'PARSE_-INTEGER]]]]
-      htMakePage '((domainConditions (isDomain INT (Integer))))
-      htMakePage  [['bcStrings,[5,STRINGIMAGE val,name,'INT]]]
-    class = 'STRING =>
-      htSay('"{\em ",val,'"}\space{1}")
-    for x in options repeat
-      val = x or val = true and x = 'on or null val and x = 'off =>
-        htSay('"{\em ",x,'"}\space{1}")
-      htMakePage [['bcLispLinks,[x,'" ",'htSetSystemVariable,[variable,x]]]]
-  fn(t,al,firstTime) ==
-    atom t => al
-    if firstTime then $heading := opOf first t
-    fn(rest t,gn(first t,al),firstTime)
-  gn(t,al) ==
-    [.,.,class,key,.,options,:.] := t
-    not MEMQ(class,$levels) => al
-    key = 'LITERALS or key = 'INTEGER or key = 'STRING => [[$heading,:t],:al]
-    key = 'TREE => fn(options,al,false)
-    key = 'FUNCTION => [[$heading,:t],:al]
-    systemError key
+   where
+    functionTail(name,class,var,valuesOrFunction) ==
+      val := eval var
+      atom valuesOrFunction =>
+	htMakePage '((domainConditions (isDomain STR (String))))
+	htMakePage [['bcLinks,['"reset",'"",'htSetSystemVariableKind,[var,name,nil]]]]
+	htMakePage [['bcStrings,[30,STRINGIMAGE val,name,valuesOrFunction]]]
+      displayOptions(name,class,var,val,valuesOrFunction)
+    displayOptions(name,class,variable,val,options) ==
+      class = 'INTEGER =>
+	htMakePage [['bcLispLinks,[[['text,options.0,'"-",options.1 or '""]],'"",'htSetSystemVariableKind,[variable,name,'PARSE_-INTEGER]]]]
+	htMakePage '((domainConditions (isDomain INT (Integer))))
+	htMakePage  [['bcStrings,[5,STRINGIMAGE val,name,'INT]]]
+      class = 'STRING =>
+	htSay('"{\em ",val,'"}\space{1}")
+      for x in options repeat
+	val = x or val = true and x = 'on or null val and x = 'off =>
+	  htSay('"{\em ",x,'"}\space{1}")
+	htMakePage [['bcLispLinks,[x,'" ",'htSetSystemVariable,[variable,x]]]]
+    fn(t,al,firstTime) ==
+      atom t => al
+      if firstTime then $heading := opOf first t
+      fn(rest t,gn(first t,al),firstTime)
+    gn(t,al) ==
+      [.,.,class,key,.,options,:.] := t
+      not MEMQ(class,$levels) => al
+      key = 'LITERALS or key = 'INTEGER or key = 'STRING => [[$heading,:t],:al]
+      key = 'TREE => fn(options,al,false)
+      key = 'FUNCTION => [[$heading,:t],:al]
+      systemError key
 
 htSetSystemVariableKind(htPage,[variable,name,fun]) ==
   value := htpLabelInputString(htPage,name)