From 23cef354eb942e14407eeb09c77d77edba27c9a7 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 25 Jan 2026 09:01:32 -0800 Subject: [PATCH] index.html's exsternal-format is UTF-8 (#2454) * set :external-format of index-html to be UTF-8 * remove duplicate MAKE-INDEX-HTMLS and unneccessary READVISE --- internal/MEDLEY-UTILS | 115 +++++------------------------------- internal/MEDLEY-UTILS.DFASL | Bin 20056 -> 17054 bytes 2 files changed, 16 insertions(+), 99 deletions(-) diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index 14fce7b9..f817801d 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,23 +1,25 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "16-May-2025 15:37:36" {DSK}frank>il>qmedley>internal>MEDLEY-UTILS.;8 31221 +(FILECREATED "24-Jan-2026 16:01:54" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;3 26389 - :CHANGES-TO (FNS MAKE-INDEX-HTMLS) + :EDIT-BY "lmm" - :PREVIOUS-DATE "16-May-2025 13:51:08" {DSK}frank>il>qmedley>internal>MEDLEY-UTILS.;7) + :CHANGES-TO (VARS MEDLEY-UTILSCOMS) + (FNS MAKE-INDEX-HTMLS) + + :PREVIOUS-DATE "16-May-2025 15:37:36" {DSK}larry>il>MEDLEY>INTERNAL>MEDLEY-UTILS.;1) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) (RPAQQ MEDLEY-UTILSCOMS - [(FNS GATHER-INFO MAKE-FULLER-DB MAKE-INDEX-HTMLS MEDLEY-FIX-LINKS MEDLEY-FIX-DATES) + [(FNS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES) (VARS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL) (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS) (FNS HCFILES MAKE-INDEX-HTMLS) (PROP FILETYPE MEDLEY-UTILS) (ADVISE TEDIT.PROMPTPRINT) (FNS RECOMPILE-ONE RECMPL COMPILE-SETUP REMAKEFILES) - (P (READVISE TEDIT.PROMPTPRINT)) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA) (NLAML) (LAMA]) @@ -125,91 +127,6 @@ (MAKESYS (OR SYSOUTFILE "fuller.sysout") "Welcome to Fuller sysout"]) -(MAKE-INDEX-HTMLS - [LAMBDA (BASE TOP LEVEL ROOT.NAME) (* ; "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") - (* ; " Edited 16-May-2025 13:17 by fgh") - [OR BASE (SETQ BASE (TRUEFILENAME (MEDLEYDIR] - (OR (DIRECTORYNAMEP BASE) - (ERROR BASE "not a directory name")) - (OR (AND (NUMBERP LEVEL) - (IGREATERP LEVEL 0)) - (SETQ LEVEL 1)) - (OR ROOT.NAME (SETQ ROOT.NAME 'MEDLEY)) - (RESETLST - (if (EQ LEVEL 1) - then (RESETSAVE (PSEUDOHOSTS T)) - (PSEUDOHOST ROOT.NAME BASE)) - (SETQ BASE (PSEUDOFILENAME BASE)) - [LET* - ((SUBDIRS NIL) - (DEST (PACKFILENAME 'NAME "index" 'EXTENSION "html" 'VERSION NIL 'BODY BASE)) - (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 "~%%~%%") - (CL:FORMAT S "Index page for ~a~%%" (SETQ SLASHED (SLASHIT BASE))) - (CL:FORMAT S "~%%") - (CL:FORMAT S "~%%") - (CL:FORMAT S "

Index page for ~a

~%%" SLASHED) - (CL:UNLESS (EQ LEVEL 1) - (CL:FORMAT S - "
~%%~%%
~%%" - )) - (CL:FORMAT S "

This is an index of the files just to link them in.~%%

    ~%%") - (for FULLNAME in (DIRECTORY (CONCAT BASE "*.*;")) - do (if (EQ (NTHCHAR FULLNAME -1) - '>) - then - (* ;; "A directory") - - (if (NOT (DIRECTORYNAMEP FULLNAME)) - then (HELP (CONCAT "NOT DIRNAME " FULLNAME))) - (SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME - (+ (NCHARS BASE) - (if PSEUDOHOST - then 2 - else 1)) - -2))) - (CL:UNLESS (OR (MEMB SHORTNAME '(.git)) - (MEMB SHORTNAME '(.GIT)) - [AND (STRPOS ".git" (L-CASE FULLNAME)) - (NOT (STRPOS ".github" (L-CASE FULLNAME] - (INFILEP (CONCAT FULLNAME ".skip"))) - - (* ;; ".skip in the directory itself -- don't index any of it") - - (SETQ SUBDIRS (NCONC1 SUBDIRS FULLNAME)) - (CL:FORMAT S "
  • ~a/
    • ~%%" SHORTNAME SHORTNAME)) - elseif (MEMB [SETQ SHORTNAME (MKATOM (SUBSTRING FULLNAME (ADD1 (NCHARS BASE)) - (SUB1 (OR (STRPOS ".;" FULLNAME) - (STRPOS ";" FULLNAME) - (HELP (CONCAT - "No ; in non-directory " - FULLNAME] - '(index.html .skip)) - then - (* ;; "dont index the index") - - elseif (MEMB (FILENAMEFIELD SHORTNAME 'EXTENSION) - '(IMPTR SKIP skip imptr)) - then - (* ;; " don't enuerate ANY.SKIP ANY.IMPTR etc") - - else (CL:FORMAT S "
  • ~a
    • ~%%" SHORTNAME SHORTNAME))) - (CL:FORMAT S "
~%%")) - (NCONC SUBDIRS (for D in SUBDIRS join (MAKE-INDEX-HTMLS D (OR TOP BASE) - (ADD1 LEVEL])]) - (MEDLEY-FIX-LINKS [LAMBDA (UNIXPATH) (* ; "Edited 18-Jan-2021 12:01 by larry") (OR UNIXPATH (SETQ UNIXPATH (UNIX-GETENV "MEDLEYDIR")) @@ -361,7 +278,8 @@ (PRINTOUT T "DONE" T))]) (MAKE-INDEX-HTMLS - [LAMBDA (BASE TOP LEVEL ROOT.NAME) (* ; "Edited 29-Apr-2024 14:18 by lmm") + [LAMBDA (BASE TOP LEVEL ROOT.NAME) (* ; "Edited 23-Jan-2026 11:59 by lmm") + (* ; "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") @@ -385,7 +303,8 @@ '})) SLASHED SHORTNAME) (CL:WITH-OPEN-FILE - (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE) + (S DEST :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :IF-DOES-NOT-EXIST :CREATE + :EXTERNAL-FORMAT :UTF-8) (CL:FORMAT S "~%%~%%") (CL:FORMAT S "Index page for ~a~%%" (SETQ SLASHED (SLASHIT BASE))) (CL:FORMAT S "