add a slashit to avoid angle brackets

Interlisp · Apr 29, 2024 · c93d022 · c93d022
1 parent 27b24bd
commit c93d022
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
@@ -1,16 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "26-Apr-2024 18:54:24" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;7 28989  
+(FILECREATED "29-Apr-2024 16:25:20" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;9 28903  
 
       :EDIT-BY "lmm"
 
-      :CHANGES-TO (ADVICE TEDIT.PROMPTPRINT)
-                  (VARS MEDLEY-UTILSCOMS)
-                  (FNS GATHER-INFO MAKE-FULLER-DB MAKE-INDEX-HTMLS MEDLEY-FIX-LINKS MEDLEY-FIX-DATES
-                       MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS BADFILE HCFILES 
-                       RECOMPILE-ONE RECMPL COMPILE-SETUP REMAKEFILES)
-
-      :PREVIOUS-DATE "26-Apr-2024 16:34:08" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;4)
+      :PREVIOUS-DATE "26-Apr-2024 16:34:08" {DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;8)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -130,21 +124,22 @@
            "Welcome to Fuller sysout"])
 
 (MAKE-INDEX-HTMLS
-  [LAMBDA (BASE TOP)                                         (* ; "Edited 26-Apr-2024 17:40 by lmm")
+  [LAMBDA (BASE TOP)                                         (* ; "Edited 29-Apr-2024 14:18 by lmm")
+                                                             (* ; "Edited 26-Apr-2024 16:15 by lmm")
                                                              (* ; "Edited 20-Apr-2024 12:34 by lmm")
                                                              (* ; "Edited 13-Apr-2024 21:18 by lmm")
     [OR BASE (SETQ BASE (PSEUDOFILENAME (MEDLEYDIR]
     (OR (DIRECTORYNAMEP BASE)
         (ERROR BASE "not a directory name"))
     (LET* ((SUBDIRS NIL)
            (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
-           [PSEUDOHOST (MEMB (NTHCHAR BASE (CL:1- 0))
-                             '(}]
-           (SLASHED (SLASHIT BASE))
-           SHORTNAME)
+           (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
+                           '}))
+           SLASHED SHORTNAME)
           (CL:WITH-OPEN-FILE
            (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
-           (CL:FORMAT S "<HTML><HEAD><TITLE>Index page for ~a</TITLE></HEAD>~%%" SLASHED)
+           (CL:FORMAT S "<HTML><HEAD><TITLE>Index page for ~a</TITLE></HEAD>~%%" (SETQ SLASHED
+                                                                                  (SLASHIT BASE)))
            (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
            (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
            (FOR FULLNAME IN (DIRECTORY (CONCAT BASE "*.*;"))
@@ -168,8 +163,7 @@
                               (* ;; ".skip in the directory itself -- don't index any of it")
 
                               (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
-                              (CL:FORMAT S "<LI><A HREF=%"~a/index.html%">~a/</A></LI>~%%" SHORTNAME
-                                     SHORTNAME))
+                              (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
                    ELSEIF (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
                                                                (SUB1 (OR (STRPOS ".;" FULLNAME)
                                                                          (STRPOS ";" FULLNAME)
@@ -344,21 +338,22 @@
                          (PRINTOUT T "DONE" T))])
 
 (MAKE-INDEX-HTMLS
-  [LAMBDA (BASE TOP)                                         (* ; "Edited 26-Apr-2024 17:40 by lmm")
+  [LAMBDA (BASE TOP)                                         (* ; "Edited 29-Apr-2024 14:18 by lmm")
+                                                             (* ; "Edited 26-Apr-2024 16:15 by lmm")
                                                              (* ; "Edited 20-Apr-2024 12:34 by lmm")
                                                              (* ; "Edited 13-Apr-2024 21:18 by lmm")
     [OR BASE (SETQ BASE (PSEUDOFILENAME (MEDLEYDIR]
     (OR (DIRECTORYNAMEP BASE)
         (ERROR BASE "not a directory name"))
     (LET* ((SUBDIRS NIL)
            (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE))
-           [PSEUDOHOST (MEMB (NTHCHAR BASE (CL:1- 0))
-                             '(}]
-           (SLASHED (SLASHIT BASE))
-           SHORTNAME)
+           (PSEUDOHOST (EQ (NTHCHAR BASE (CL:1- 0))
+                           '}))
+           SLASHED SHORTNAME)
           (CL:WITH-OPEN-FILE
            (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE)
-           (CL:FORMAT S "<HTML><HEAD><TITLE>Index page for ~a</TITLE></HEAD>~%%" SLASHED)
+           (CL:FORMAT S "<HTML><HEAD><TITLE>Index page for ~a</TITLE></HEAD>~%%" (SETQ SLASHED
+                                                                                  (SLASHIT BASE)))
            (CL:FORMAT S "<BODY><H1>Index page for ~a</H1>~%%" SLASHED)
            (CL:FORMAT S "<P>This is an index of the files just to link them in.~%%<UL>~%%")
            (FOR FULLNAME IN (DIRECTORY (CONCAT BASE "*.*;"))
@@ -382,8 +377,7 @@
                               (* ;; ".skip in the directory itself -- don't index any of it")
 
                               (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME))
-                              (CL:FORMAT S "<LI><A HREF=%"~a/index.html%">~a/</A></LI>~%%" SHORTNAME
-                                     SHORTNAME))
+                              (CL:FORMAT S "<LI><A HREF=%"~a/%">~a/</A></LI>~%%" SHORTNAME SHORTNAME))
                    ELSEIF (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE))
                                                                (SUB1 (OR (STRPOS ".;" FULLNAME)
                                                                          (STRPOS ";" FULLNAME)
@@ -508,9 +502,9 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1418 11850 (GATHER-INFO 1428 . 6810) (MAKE-FULLER-DB 6812 . 7589) (MAKE-INDEX-HTMLS 
-7591 . 11219) (MEDLEY-FIX-LINKS 11221 . 11614) (MEDLEY-FIX-DATES 11616 . 11848)) (13029 15817 (
-MAKE-EXPORTS-ALL 13039 . 14098) (MAKE-WHEREIS-HASH 14100 . 15289) (MAKE-WHEREIS-LOOPS 15291 . 15815)) 
-(15818 23941 (HCFILES 15828 . 20309) (MAKE-INDEX-HTMLS 20311 . 23939)) (24191 28803 (RECOMPILE-ONE 
-24201 . 26098) (RECMPL 26100 . 26703) (COMPILE-SETUP 26705 . 27329) (REMAKEFILES 27331 . 28801)))))
+  (FILEMAP (NIL (1064 11630 (GATHER-INFO 1074 . 6456) (MAKE-FULLER-DB 6458 . 7235) (MAKE-INDEX-HTMLS 
+7237 . 10999) (MEDLEY-FIX-LINKS 11001 . 11394) (MEDLEY-FIX-DATES 11396 . 11628)) (12809 15597 (
+MAKE-EXPORTS-ALL 12819 . 13878) (MAKE-WHEREIS-HASH 13880 . 15069) (MAKE-WHEREIS-LOOPS 15071 . 15595)) 
+(15598 23855 (HCFILES 15608 . 20089) (MAKE-INDEX-HTMLS 20091 . 23853)) (24105 28717 (RECOMPILE-ONE 
+24115 . 26012) (RECMPL 26014 . 26617) (COMPILE-SETUP 26619 . 27243) (REMAKEFILES 27245 . 28715)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.DFASL b/internal/MEDLEY-UTILS.DFASL