FONTSAMPLER - Enable option to use HEX vs OCTAL on page info (#2018)

* Enable optional to use HEX vs OCTAL for charset number (in page title) and grid row/column titles.

* Fix typos in documentation.

lispusers/FONTSAMPLER

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 3-Feb-2025 20:08:40" {DSK}<home>matt>Interlisp>medley>lispusers>FONTSAMPLER.;10
 8777   
+
(FILECREATED " 5-Feb-2025 17:03:38" {DSK}<home>matt>Interlisp>medley>lispusers>FONTSAMPLER.;11
 9743   
 
       :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS FontTable)
+      :CHANGES-TO (FNS FontSample FontTable)
 
-      :PREVIOUS-DATE " 3-Feb-2025 13:06:38" {DSK}<home>matt>Interlisp>medley>lispusers>FONTSAMPLER.;7
+      :PREVIOUS-DATE " 3-Feb-2025 20:08:40" {DSK}<home>matt>Interlisp>medley>lispusers>FONTSAMPLER.;10
 )
 
 
@@ -20,7 +20,9 @@
 (DEFINEQ
 
 (FontSample

-  [LAMBDA (Fonts CharacterSets Printer StreamType)           (* edited%: "29-Apr-87 22:03")

+  [LAMBDA (Fonts CharacterSets Printer StreamType Hexadecimal)

+                                                             (* ; "Edited  5-Feb-2025 17:02 by mth")

+                                                             (* edited%: "29-Apr-87 22:03")

     (LET* [[TitleFont (FONTCREATE NIL 12 'MRR 0 (OR StreamType (PRINTERTYPE Printer]
            (FontList (if
 (LISTP Fonts)
                        else
 (CONS Fonts)))
@@ -38,7 +40,7 @@
                                                                                  (NEQ CharacterSet 
                                                                                      LastCharacterSet
                                                                                       ))
-                                                TitleFont InchesToPrinterUnits))
+                                                TitleFont InchesToPrinterUnits Hexadecimal))
              finally
 (CLOSEF Stream])
 
 (FontSampleFaked

@@ -55,7 +57,8 @@
           (CLOSEF Stream])
 
 (FontTable

-  [LAMBDA (Font CharacterSet Stream FormFeed TitleFont InchesToPrinterUnits)

+  [LAMBDA (Font CharacterSet Stream FormFeed TitleFont InchesToPrinterUnits Hexadecimal)

+                                                             (* ; "Edited  5-Feb-2025 17:03 by mth")


                                                              (* ; "Edited  3-Feb-2025 20:07 by mth")

                                                              (* edited%: "29-Apr-87 22:36")

     (LET*
@@ -76,16 +79,22 @@
       (YCellSpacing (TIMES 0.5 InchesToPrinterUnits)))
      (printout T Title .I0.8 CharacterSet "Q" T)
      (RESETLST
-         (RESETSAVE (RADIX 8))
+         (RESETSAVE (RADIX (if
 Hexadecimal
+                               then
 16
+                             else
 8)))
          (MOVETO (FTIMES 0.75 InchesToPrinterUnits)
                 (FTIMES 10 InchesToPrinterUnits)
                 Stream)
          (DSPFONT TitleFont Stream)
-         (printout Stream Title .I0.8 CharacterSet)
+         (if
 Hexadecimal
+             then
 (printout Stream Title .I0.16 CharacterSet)
+           else
 (printout Stream Title .I0.8 CharacterSet))
          (DSPYPOSITION (PLUS (DSPYPOSITION NIL Stream)
                              (TIMES -0.4 (FONTHEIGHT TitleFont)))
                 Stream)
-         (printout Stream "8")
+         (printout Stream (if
 Hexadecimal
+                              then
 "16"
+                            else
 "8"))
          (for
 XPosition from
 (TIMES 0.75 InchesToPrinterUnits) by
 XCellSpacing as
 Counter
             from
 0 to
 15 bind
 (YPosition _ (TIMES 9.5 InchesToPrinterUnits))
             do
 (MOVETO XPosition YPosition Stream)
@@ -93,7 +102,10 @@
          (for
 YPosition from
 (TIMES 9 InchesToPrinterUnits) by
 (MINUS YCellSpacing) as
 Counter
             from
 0 to
 240 by
 16 bind
 (XPosition _ (TIMES 0.25 InchesToPrinterUnits))
             do
 (MOVETO XPosition YPosition Stream)
-               (PRIN1 Counter Stream)))
+               (PRINTNUM (if
 Hexadecimal
+                             then
 '(FIX 2 16 T)
+                           else
 '(FIX 3 8))
+                      Counter Stream)))
      (DRAWLINE (TIMES 0.25 InchesToPrinterUnits)
             (TIMES 9.3 InchesToPrinterUnits)
             (TIMES 8.0 InchesToPrinterUnits)
@@ -139,11 +151,15 @@
             (FTIMES 0.75 InchesToPrinterUnits)
             Stream)
      (DSPFONT TitleFont Stream)
-     (printout Stream Title .I0.8 CharacterSet)
+     (if
 Hexadecimal
+         then
 (printout Stream Title .I0.16 CharacterSet)
+       else
 (printout Stream Title .I0.8 CharacterSet))
      (DSPYPOSITION (PLUS (DSPYPOSITION NIL Stream)
                          (TIMES -0.4 (FONTHEIGHT TitleFont)))
             Stream)
-     (printout Stream "8")
+     (printout Stream (if
 Hexadecimal
+                          then
 "16"
+                        else
 "8"))
      [if
 (EQ (FILENAMEFIELD (FULLNAME Stream)
                     'HOST)
              'LPT)
@@ -169,6 +185,6 @@
        FONT)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (645 8614 (FontSample 655 . 2106) (FontSampleFaked 2108 . 2917) (FontTable 2919 . 8612))
+  (FILEMAP (NIL (657 9580 (FontSample 667 . 2302) (FontSampleFaked 2304 . 3113) (FontTable 3115 . 9578))
 )))
 STOP