From 1d6e43e1ea1dedaeb68ae64759813e75b5d321c6 Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:31:28 -0800
Subject: [PATCH] Minor fixups (typos, formatting) to a few existing
 documentation files (#1470)

* Mostly minor fixups (typos, formatting) to a few existing documentation files

Plus converting the Unicode documentation from TXT to formatted

* Update UNICODE.TEDIT

Previous version did not have page-looks (heading location etc.)

* UNICODE.TEDIT:  write unbreakable charlook property

* Delete UNICODE.TEDIT

Master has a newer version, trying to eliminate conflict
---
 library/UNICODE.TXT                |  98 -----------------------------
 lispusers/COMPAREDIRECTORIES.TEDIT |  29 ++++-----
 lispusers/EXAMINEDEFS.TEDIT        | Bin 5046 -> 5030 bytes
 lispusers/FM-CREATOR.TEDIT         | Bin 88255 -> 88120 bytes
 lispusers/GITFNS.TEDIT             |  59 ++++++++++-------
 lispusers/tmax/TMAX.TEDIT          | Bin 68521 -> 64953 bytes
 6 files changed, 49 insertions(+), 137 deletions(-)
 delete mode 100644 library/UNICODE.TXT

diff --git a/library/UNICODE.TXT b/library/UNICODE.TXT
deleted file mode 100644
index 666872ad..00000000
--- a/library/UNICODE.TXT
+++ /dev/null
@@ -1,98 +0,0 @@
-This file describes the UNICODE Lisp Library package.
-
-Contributed by Ron Kaplan, August 2020.
-
-The UNICODE library package defines external file formats that enable Medley to read and write files where 16 bit character codes are represented as UTF8 byte sequences or big-endian UTF16 byte-pairs.  It also provides for character codes to be converted (on reading) from Unicode codes to equivalent codes in the Medley-internal Xerox Character Code Standard (XCCS) and (on writing) from XCCS codes to equivalent Unicode codes.
-
-Four external formats are defined when the package is loaded:
-
-  :UTF8	        codes are represented as UTF8 byte sequences and XCCS/Unicode character
-  				conversion takes place.
-
-  :UTF16BE      codes are represented as 2-byte pairs, with the high order by appearing
-			    first in the file, and characters are converted.
-			    
-The two other external formats translate byte sequences into codes, but do not translate the codes.  These allow Medley to see and process characters in their native encoding.
-
-  :UTF8-RAW     codes are represented as UTF8 byte sequences, but character conversion
-			    does not take place.
-
-  :UTF16BE-RAW  codes are represented as big-ending 2-byte pairs but there is no
-                conversion.
-
-These formats all define the end-of-line convention (mostly for writing) for the external files according to the variable EXTERNALEOL (LF, CR, CRLF), with LF the default.
-
-The external format can be specified as a parameter when a stream is opened:
-
-    (OPENSTREAM 'foo.txt 'INPUT 'OLD '((EXTERNALFORMAT :UTF8)))
-
-    (CL:OPEN 'foo.txt :DIRECTION :INPUT :EXTERNAL-FORMAT :UTF8)
-  
-The function STREAMPROP obtains or changes the external format of an open stream:
-
-	(STREAMPROP stream 'EXTERNALFORMAT)  -> :XCCS
-	
-	(STREAMPROP stream 'EXTERNALFORMAT :UTF8) -> :XCCS
-	
-In the latter case, the stream's format is changed to :UTF8 and the previous value is returned, in this example it is Medley's historical default format :XCCS.
-
-Entries can be placed on the variable *DEFAULT-EXTERNALFORMATS* to change the external format that is set by default when a file is opened on a particular device.  Loading UNICODE executes
-
-	(PUSH *DEFAULT-EXTERNALFORMATS* '(UNIX :UTF8))
-
-so that all files opened (by OPENSTREAM, CL:OPEN, etc.) on the UNIX file device will be initialized with :UTF8.  Note that the UNIX and DSK file devices reference the same files (although some caution is needed because {UNIX} does not simulate Medley versioning), but the device name in a file name ({UNIX}/Users/... vs. {DSK}/Users/...) selects one or the other. The default setting above applies only to files specified with {UNIX}; a separate default entry for DSK must be established to change its default from :XCCS. 
-
-The user can also specify the external format on a per-stream basis by putting a function on the list STREAM-AFTER-OPEN-FNS. After OPENSTREAM opens a stream and just before it is returned to the calling function, the functions on that list are applied in order to arguments STREAM, ACCESS, PARAMETERS. They can examine and/or change the properties of the stream, in particular, by calling STREAMPROP to change the external format from its device default.
-
-The XCCS/Unicode mapping tables are defined by the code-mapping files for particular XCCS character sets.  These are typically located in the Library sister directory
-
-	../Unicode/Xerox/
-	
-and the variable UNICODEDIRECTORIES is initialized with a globally valid reference to that path.  The global reference is constructed by prepending the value of the Unix environment-variable "MEDLEYDIR" to the suffix /Unicode/Xerox/.  MEDLEYDIR should be set by the Medley start-up shell script (e.g. /Users/kaplan/local/medley3.5/lispcore/)
-
-The mapping files have conventional names of the form XCCS-<charsetnum>=<charsetname>.TXT, for example, XCCS-0=LATIN.TXT, XCCS-357=SYMBOLS4.TXT.  The translations used by the external formats are read from these files by the function
-
-	(READ-UNICODE-MAPPING FILESPEC NOPRINT NOERROR) 
-	
-where FILESPEC can be a list of files, charset octal strings ("0" "357"), or XCCS charset names (LATIN EXTENDED-LATIN). Reading will be silent if NOPRINT, and the process will not abort if an error occurs and NOERROR.  The value is a flat list of the mappings for all the character sets, with elements of the form (XCCC-code Unicode-code). 
-
-When UNICODE is loaded the mappings for the character sets specified in the variable DEFAULT-XCCS-CHARSETS are installed.  This is initialized to
-
-    (LATIN SYMBOLS1 SYMBOLS2 EXTENDED-LATIN FORMS SYMBOLS3 SYMBOLS4 ACCENTED-LATIN GREEK)
-    
-but DEFAULT-XCCS-CHARSETS can be set to a different collection before UNICODE is loaded.
-
-The internal translation tables used by the external formats are constructed from a list of correspondence pairs by the function
-
-	(MAKE-UNICODE-TRANSLATION-TABLES MAPPING [FROM-XCCS-VAR][TO-XCCS-VAR])
-	
-This returns a list of two arrays (XCCS-to-Unicode Unicode-to-XCCS)containing the relevant translation information organized for rapid access.  If the optional from/to-variables arguments are provide, they are the names of variables whose top-level values will be set to these arrays, for convenience. For the external formats defined above, these variables are *XCCSTOUNICODE* and *UNICODETOXCCS*.
-
-The macro
-
-	(UNICODE.TRANSLATE CODE TRANSLATION-TABLE)
-	
-is used by the external formats to perform the mappings described by the translation-tables.
-
-The following utilities are provided for lower-level manipulation of codes and strings 
-
-	(XTOUCODE XCCSCODE) -> corresponding Unicode
-	(UTOXCODE UNICODE) -> corresponding XCCS code
-	(NUTF8CODEBYTES N) -> number of bytes in the UTF8 representation of N
-	(NUTF8STRINGBYTES STRING RAWFLG) -> number of UTF8 bytes in the UTF8
-	      representation of STRING, translating XCCS to Unicode unless RAWFLG.
-	(XTOUSTRING XCCSSTRING RAWFLG) -> The string of bytes in the UTF8 representation
-	      of the characters in XCCSSTRING (= the bytes in its UTF8 file encoding)
-	(HEXSTRING N WIDTH) -> the hex string for N, padded to WIDTH
-	
-
-The UNICODE file also contains a function for writing a mapping file given a list of mapping pairs. The function
-
-     (WRITE-TRANSLATION-TABLE MAPPING [INCLUDEDCHARSETS] [FILE])
-     
-produces one or more mapping files for the mapping-pairs in mapping.  If the optional FILE argument is provided, then a single file with that name will be produced and contain all the mappings for all the character sets in MAPPING.  If FILE and INCLUDEDCHARSETS are not provided, then all of the mappings will again go to a single file with a composite name XCCS-csn1,csn2,csn3.TXT.  Each cs may be a single charset number, or a range of adjacent charset numbers.  For example, if the mappings contain entries for characters in charset LATIN, SYMBOLS1, SYMBOLS2, and SYMBOLS3, the file name will be XCCS-0,41-43.TXT.
- 
-If INCLUDEDCHARSETS is provided, it specifies possibly a subset of the mappings in MAPPING for which files should be produced.  This provides an implicit subsetting capability.
-
-Finally, if FILE is not provided and INCLUDEDCHARSETS is T, then a separate file will be produced for each of the character sets, essentially a way of splitting a collection of character-set mappings into separate canonically named files (e.g. XCCS-357=SYMBOLS4.TXT). 
-
diff --git a/lispusers/COMPAREDIRECTORIES.TEDIT b/lispusers/COMPAREDIRECTORIES.TEDIT
index 9bc20226..b82834f2 100644
--- a/lispusers/COMPAREDIRECTORIES.TEDIT
+++ b/lispusers/COMPAREDIRECTORIES.TEDIT
@@ -3,21 +3,14 @@ XEROX	COMPAREDIRECTORIES
2
 
1
 
COMPAREDIRECTORIES
1
 
4
-
By:  Larry Masinter and Ron Kaplan
This document edited on
  December 2, 1987
  December 28, 1998 (Ron Kaplan)
  April 7, 2018 (Ron Kaplan)
  Rewritten August 25, 2020 (Ron Kaplan)

COMPAREDIRECTORIES compares the contents of two directories, identifying files according to their creation dates and lengths. It is called using the function
(COMPAREDIRECTORIES DIR1 DIR2 SELECT  FILEPATTERNS  EXTENSIONSTOAVOID  USEDIRECTORYDATES OUTPUTFILE  ALLVERSIONS)	[Function]
Compares the creation dates of files with matching names in the lists that CDFILES returns for DIR1 and DIR2.  Collects or prints CDENTRIES for those files that meet the SELECT criteria.  May also collect or print entries for relevant files that exist in DIR1 or DIR2 but not both.
SELECT specifies which the match/mismatch criteria for filtering the output. If SELECT is or contains
     AFTER or >:  select entries where file1 has a later date than  file2
     BEFORE or <: select entries where file1 has an earlier date than file2
     SAMEDATE or =: select entries where file1 and file2 have the same date
     -*: exclude entries where file1 does not exist
     *-: exclude entries where file2 does not exist
     ~=: exclude entries where file1 and file2 are byte-equivalent
SELECT = NIL is equivalent to (< >  -* *-). Excludes files with matching dates, a useful default for identifying files that may require further attention.
SELECT = T is equivalent to (= < >  -* *-).  Includes all files for processing by other functions or later filtering by CDSUBSET (below).
SELECT may also contain the token AUTHOR to indicate that authors should be provided in the printed output (see CDPRINT below).
Unless USEDIRECTORYDATES, the FILECREATED date is used for the date comparison of Lisp source and compiled files, otherwise the file-system CREATIONDATE is used. 
If OUTPUTFILE=NIL, then a list of the form (Parameters . entries) is returned.  Parameters is a list (DIR1 DIR2 SELECT DATE) that records the parameters of the comparison.   Entries contains one entry for each of the file-comparisons that meets the SELECT criteria.  Each entry is a CDENTRY record with fields
   (matchname info1 daterel info2 equiv)
where matchname is the name.extension shared by the two files, and each file info is either NIL (for nonexistent files)  or a CDINFO record with fields
   (FULLNAME DATE LENGTH AUTHOR TYPE EOL)
TYPE is SOURCE for Lisp source (filecreated) files, COMPILED for Lisp compiled files, otherwise the PRINTFILETYPE (TEXT, TEDIT...) or NIL.  EOL is CR, LF, CRLF, or NIL.
When both files exist, the date relation is one of <, =, or >.  Otherwise, the date relation is * if only one file exists.  EQUIV is EQUIVALENT for files with different dates but exactly the same bytes, otherwise NIL.
If OUTPUTFILE is not NIL, then it is a filename or open stream on which selected entries will be printed (T for the terminal) by CDPRINT.  
COMPAREDIRECTORIES sets the variable LASTCDENTRIES is set to the selected entries.  This is used by the functions below if their CDENTRIES is NIL. 

(CDFILES DIR FILEPATTERNS EXTENSIONSTOAVOID ALLVERSIONS DEPTH)  [Function]
Returns a list of full filenames for files in directory DIR (NIL=T=the connected directory) that match the other file-name filtering criteria. Files are excluded if:
Their name does not match a pattern in FILEPATTERNS (NIL = *). Dotted files are excluded unless FILEPATTERNS includes .* and files in subdirectories are excluded if the number of subdirectories exceeds DEPTH (below).
Their extension is in the list EXTENSIONSTOAVOID (* excludes all extensions).
They are not the highest version unless ALLVERSIONS=T.
DEPTH controls the depth of subdirectory exploration.  T means all levels, NIL means no subdirectories.  Otherwise the maximum number of ">" characters below the starting DIR in the fullname of files.
(CDFILES) produces all the newest, undotted files in the immediate connected directory.

(CDPRINT CDENTRIES FILE PRINTAUTHOR)  [Function]
Prints CDENTRIES on FILE, with one line for each entry. The line for each entry is of the form
     FILE1 (AUTHOR) SIZE DATE relation DATE  FILE2 (AUTHOR) SIZE
For example
  ACE.;1 (Joe) 4035 2-May-1985 18:03:54 < 30-Sep-1985 11:14:48 ACE.;3 (Sam) 5096.
The line for byte-equivalent files is prefixed with ==.  If the files are equivalent except for a difference in end-of-line conventions, the equivalence prefix will indicate the convention for each file (C for CR, L, for LF, 2 for CRLF). Thus C2 indicates that the files are equivalent except that file1 marks line ends with CR and file2 with CRLF.
Note that because of the setting of LASTCDENTRIES, evaluating (CDPRINT) after COMPAREDIRECTORIES prints the results of the last comparision. 
For conciseness, authors are included only if PRINTAUTHOR or if AUTHOR is included in the SELECT parameter of CDENTRIES. Also, the redundant file-name hosts/directories are not printed. 

(CDMAP CDENTRIES FN)	[Function]
(CDSUBSET CDENTRIES FN)	[Function]
CDMAP applies FN to each CDENTRY in CDENTRIES. CDSUBSET applies FN and also returns the subset of CDENTRIES for which FN is non-NIL and preserves in the value the parameters of CDENTRIES. For convenience, at each invocation the variables MATCHNAME INFO1 DATEREL INFO2 and EQUIV are bound to the corresponding fields and can be used freely by FN.

USEFUL UTILITIES
(FIX-DIRECTORY-DATES FILES)        	[Function]
For every file included in or specified by FILES, if it is a Lisp source or compiled whose directory creation date is more than 30 seconds later than its internal filecreated date (presumably because of copying), then its directory date is reset to match the internal date.  FILES can be a list of file names or a pattern interpretable by FILDIR.  Returns a list of files whose dates have been changed.

(FIX-EQUIV-DATES CDENTRIES)	[Function]
If there is an entry in CDENTRIES whose files are EQUIVALENT but with different directory creation dates, the directory date of the file with the later date (presumably a copy) is reset to match the date of the earlier file.  In the end all equivalent files will have the same (earliest) date. Returns a list of files whose dates have been changed.

(COPY-MISSING-FILES CDENTRIES TARGET MATCHNAMES)	[Function]
Target is 1 or 2, indicating the direction of potential copies.  If an entry with a source file but no target file has a matchname in MATCHNAMES, the source file is copied to the target directory.  All target-absent files are copied if MATCNAMES is NIL.  Source properties (including version number) are preserved in the target.

(COPY-COMPARED-FILES CDENTRIES TARGET MATCHNAMES)	[Function]
Target is 1 or 2, indicating the direction of potential copies.  If an entry with both source and target files has a matchname in MATCHNAMES, the source file is copied to a new version of the target file.  All files are copied if MATCHNAMES is NIL.  

(COMPARE-ENTRY-SOURCE-FILES CDENTRY LISTSTREAM EXAMINE DW?)
  	[Function]
This is a simple wrapper for calling COMPARESOURCES if the CDENTRY files are Lisp source files.  The function (CDENTRY MATCHNAME CDENTRIES is useful for extracting a particular entry, with CDENTRIES defaulting to LASTCDENTRIES.

(COMPILED-ON-SAME-SOURCE CDENTRIES)	[Function]
Returns the subset of entries with Lisp compiled files (dfasl or lcom) that are compiled on the same source, according to SOURCE-FOR-COMPILED-P below. Presumably one should be removed to avoid confusion.

(FIND-SOURCE-FILES CFILES SDIRS DFASLMARGIN)	[Function]
Returns (CFILE . SFILES) pairs where CFILE is a Lisp compiled file in CFILES and SFILES is list of files in SDIRS that CFILE was compiled on according to SOURCE-FOR-COMPILED-P. This suggests that at least one of SFILES should be copied to CFILE's location (or vice versa).

(FIND-COMPILED-FILES SFILES CDIRS DFASLMARGIN)	[Function]
Returns (SFILE . CFILES) pairs where SFILE is a Lisp source file in SFILES and CFILES are files in CDIRS that are compiled on SFILE according to SOURCE-FOR-COMPILED-P.  This suggests that at least one of CFILES should be copied to SFILE's location.  

(FIND-UNCOMPILED-FILES FILES DFASLMARGIN COMPILEXTS)	[Function]
Returns a list of elements each of which corresponds to a source file in FILES for which no appropriate compiled file can be found.   An appropriate compiled file is a file in the same location with extension in COMPILEEXTS (defaulting to *COMPILED-EXTENSIONS*) that satisfies SOURCE-FOR-COMPILED-P. Each element is a list of the form
    (sourcefile . cfiles)
cfiles contains compiled files that were compiled on a different version of sourcefile, NIL if no such files exist. Each cfile item is a pair (cfile  timediff) where timediff is the time difference (in minutes) between the creation date of the compiled-file's source and the creation date of sourcefile (positive if the cfile was compiled later, as should be the case). FILES can be an explicit list of files, or a file specification interpretable by FILDIR; in that case only the newest source-file versions are processed.  

(FIND-UNSOURCED-FILES CFILES DFASLMARGIN COMPILEXTS)	[Function]
Returns the subset of the compiled files specified by CFILES for which a corresponding source file according to SOURCE-FOR-COMPILED-P cannot be found in the same directory.  CFILES can be a list of files or a pattern that FILDIR can interpret.  COMPILEEXTS can be one or more explicit compile-file extensions, defaulting to *COMPILED-EXTENSIONS*.

(SOURCE-FOR-COMPILED-P SOURCE COMPILED DFASLMARGIN)	[Function]
Returns T if it can confirm that Lisp COMPILED file was compiled on Lisp SOURCE file.  SOURCE and COMPILED can be provided as CREATED-AS values, to avoid repetitive computation.  This compares the information in the filecreated expressions, original file names and original dates, and not the current directory names and dates.
It appears that the times in DFASL files may differ from the filecreated source dates by a few minutes.  The DFASLMARGIN can be provided to loosen up the date matching criterion.  DFASLMARGIN is a pair (max min) and a DFASL COMPILED is deemed to be compiled on SOURCE if the compiled's source date is no more than max and no less than min minutes after the source date.  A negative min allows for the possibility that the compiled-source date is earlier than the candidate source date.  DFASLMARGIN defaults to (20 0).  A single positive number x is coerced to (x 0).  A single negative number is coerced to (-x x) (compiled file is no more than x minutes later or earlier). T is infinity in either direction.  Examples:
    (T 0):  COMPILED compiled on source later than SOURCE
    (0 T):  COMPILED compiled on source earlier than SOURCE (odd)
    12:  COMPILED compiled on source later than SOURCE by no more than 12 minutes
     -12:   COMPILED compiled on source 12 minutes before or after SOURCE

(FIND-MULTICOMPILED-FILES FILES SHOWINFO)	[Function]
Returns a list of files in FILES that have more than one type of compiled file (e.g. LCOM and DFASL).  FILES is interpretable by FILDIR.  If SHOWINFO, then the value contains a list for each file of the form
   ï!(rootname loaded-version . CREATED-AS information for each compile-type)
 Otherwise just the rootname of the source is returns.

(CREATED-AS FILE)	[Function]
If FILE is a Lisp source or compiled file, returns a record of its original filename and filecreated dates, and for compiled files, also the original compiled-on name and date.  The return for a source file is a pair
     (sfullname sfilecreateddate)
The return for a compiled file is a quadruple
     (cfullname cfilecreated sfullname sfilecreateddate)
where sfullname and sourcefilecreated are extracted from the file's compiled-on information.  The return is (fullname NIL) for a non-Lisp file.

(EOLTYPE FILE SHOWCONTEXT)	[Function]
Returns the EOLTYPE of FILE (CR, LF, CRLF) if the type is unmistakable: contains at least one instance of one type and no instances of any others.  Returns NIL if there is evidence of inconsistent types.  If SHOWCONTEXT is an integer, it is the number of bytes for EOLTYPE to display before and after an instance of an inconsistent type.  At each instance, the user is asked whether to continue scanning for other instances.  SHOWCONTEXT = T is interpreted as 100.

(BINCOMP FILE1 FILE2 EOLDIFFOK)	[Function]
Returns T if FILE1 and FILE2 are byte-identical.  If EOLDIFFOK and FILE1 and FILE2 differ only in their eol conventions, the value is a list of the form (EOL1 EOL2), e.g. (CR CRLF).  Otherwise the value is NIL.  



	



(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))4
È
$

È
40
È
$

È
4
È
$

È
1
$4@
$

È
4
È
$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD1
$
-GACHA
-TERMINALMODERN
-MODERN
-
TERMINAL
-MODERNMODERN
-MODERNLOGOMODERN
-
-	

-
HRULE.GETFN
MODERN
-
	
HRULE.GETFN
MODERN
-
	
HRULE.GETFN
MODERN
-

HRULE.GETFN
MODERN
	
HRULE.GETFN
MODERN
#!(

ž
-
-[

-
-
fJLL44C›Š€£
6)˜*©Ú‹
”
K¦ÙN7ÉX
1_AP
]Ž»



Z
#

“


]
0

I
1
û
;






ä
#
Ì
,


.
û
4

O
4

[
3

HÑ:
BR
J
)
ÐI7

Ù".9�


Ñ

Õ






-
1.
-zº
\ No newline at end of file
+
By:  Larry Masinter and Ron Kaplan
This document edited on
  December 2, 1987
  December 28, 1998 (Ron Kaplan)
  April 7, 2018 (Ron Kaplan)
  Rewritten August 25, 2020 (Ron Kaplan)

COMPAREDIRECTORIES compares the contents of two directories, identifying files according to their creation dates and lengths. It is called using the function
(COMPAREDIRECTORIES DIR1 DIR2 SELECT  FILEPATTERNS  EXTENSIONSTOAVOID  USEDIRECTORYDATES OUTPUTFILE  ALLVERSIONS)	[Function]
Compares the creation dates of files with matching names in the lists that CDFILES returns for DIR1 and DIR2.  Collects or prints CDENTRIES for those files that meet the SELECT criteria.  May also collect or print entries for relevant files that exist in DIR1 or DIR2 but not both.
SELECT specifies which the match/mismatch criteria for filtering the output. If SELECT is or contains
     AFTER or >:  select entries where file1 has a later date than  file2
     BEFORE or <: select entries where file1 has an earlier date than file2
     SAMEDATE or =: select entries where file1 and file2 have the same date
     -*: exclude entries where file1 does not exist
     *-: exclude entries where file2 does not exist
     ~=: exclude entries where file1 and file2 are byte-equivalent
SELECT = NIL is equivalent to (< >  -* *-). Excludes files with matching dates, a useful default for identifying files that may require further attention.
SELECT = T is equivalent to (= < >  -* *-).  Includes all files for processing by other functions or later filtering by CDSUBSET (below).
SELECT may also contain the token AUTHOR to indicate that authors should be provided in the printed output (see CDPRINT below).
Unless USEDIRECTORYDATES, the FILECREATED date is used for the date comparison of Lisp source and compiled files, otherwise the file-system CREATIONDATE is used. 
If OUTPUTFILE=NIL, then a list of the form (Parameters . entries) is returned.  Parameters is a list (DIR1 DIR2 SELECT DATE) that records the parameters of the comparison.   Entries contains one entry for each of the file-comparisons that meets the SELECT criteria.  Each entry is a CDENTRY record with fields
   (matchname info1 daterel info2 equiv)
where matchname is the name.extension shared by the two files, and each file info is either NIL (for nonexistent files)  or a CDINFO record with fields
   (FULLNAME DATE LENGTH AUTHOR TYPE EOL)
TYPE is SOURCE for Lisp source (filecreated) files, COMPILED for Lisp compiled files, otherwise the PRINTFILETYPE (TEXT, TEDIT...) or NIL.  EOL is CR, LF, CRLF, or NIL.
When both files exist, the date relation is one of <, =, or >.  Otherwise, the date relation is * if only one file exists.  EQUIV is EQUIVALENT for files with different dates but exactly the same bytes, otherwise NIL.
If OUTPUTFILE is not NIL, then it is a filename or open stream on which selected entries will be printed (T for the terminal) by CDPRINT.  
COMPAREDIRECTORIES sets the variable LASTCDENTRIES is set to the selected entries.  This is used by the functions below if their CDENTRIES is NIL. 

(CDFILES DIR FILEPATTERNS EXTENSIONSTOAVOID ALLVERSIONS DEPTH)  [Function]
Returns a list of full filenames for files in directory DIR (NIL=T=the connected directory) that match the other file-name filtering criteria. Files are excluded if:
Their name does not match a pattern in FILEPATTERNS (NIL = *). Dotted files are excluded unless FILEPATTERNS includes .* and files in subdirectories are excluded if the number of subdirectories exceeds DEPTH (below).
Their extension is in the list EXTENSIONSTOAVOID (* excludes all extensions).
They are not the highest version unless ALLVERSIONS=T.
DEPTH controls the depth of subdirectory exploration.  T means all levels, NIL means no subdirectories.  Otherwise the maximum number of ">" characters below the starting DIR in the fullname of files.
(CDFILES) produces all the newest, undotted files in the immediate connected directory.

(CDPRINT CDENTRIES FILE PRINTAUTHOR)  [Function]
Prints CDENTRIES on FILE, with one line for each entry. The line for each entry is of the form
     FILE1 (AUTHOR) SIZE DATE relation DATE  FILE2 (AUTHOR) SIZE
For example
  ACE.;1 (Joe) 4035 2-May-1985 18:03:54 < 30-Sep-1985 11:14:48 ACE.;3 (Sam) 5096.
The line for byte-equivalent files is prefixed with ==.  If the files are equivalent except for a difference in end-of-line conventions, the equivalence prefix will indicate the convention for each file (C for CR, L, for LF, 2 for CRLF). Thus C2 indicates that the files are equivalent except that file1 marks line ends with CR and file2 with CRLF.
Note that because of the setting of LASTCDENTRIES, evaluating (CDPRINT) after COMPAREDIRECTORIES prints the results of the last comparision. 
For conciseness, authors are included only if PRINTAUTHOR or if AUTHOR is included in the SELECT parameter of CDENTRIES. Also, the redundant file-name hosts/directories are not printed. 

(CDMAP CDENTRIES FN)	[Function]
(CDSUBSET CDENTRIES FN)	[Function]
CDMAP applies FN to each CDENTRY in CDENTRIES. CDSUBSET applies FN and also returns the subset of CDENTRIES for which FN is non-NIL and preserves in the value the parameters of CDENTRIES. For convenience, at each invocation the variables MATCHNAME INFO1 DATEREL INFO2 and EQUIV are bound to the corresponding fields and can be used freely by FN.

USEFUL UTILITIES
(FIX-DIRECTORY-DATES FILES)        	[Function]
For every file included in or specified by FILES, if it is a Lisp source or compiled whose directory creation date is more than 30 seconds later than its internal filecreated date (presumably because of copying), then its directory date is reset to match the internal date.  FILES can be a list of file names or a pattern interpretable by FILDIR.  Returns a list of files whose dates have been changed.

(FIX-EQUIV-DATES CDENTRIES)	[Function]
If there is an entry in CDENTRIES whose files are EQUIVALENT but with different directory creation dates, the directory date of the file with the later date (presumably a copy) is reset to match the date of the earlier file.  In the end all equivalent files will have the same (earliest) date. Returns a list of files whose dates have been changed.

(COPY-MISSING-FILES CDENTRIES TARGET MATCHNAMES)	[Function]
Target is 1 or 2, indicating the direction of potential copies.  If an entry with a source file but no target file has a matchname in MATCHNAMES, the source file is copied to the target directory.  All target-absent files are copied if MATCNAMES is NIL.  Source properties (including version number) are preserved in the target.

(COPY-COMPARED-FILES CDENTRIES TARGET MATCHNAMES)	[Function]
Target is 1 or 2, indicating the direction of potential copies.  If an entry with both source and target files has a matchname in MATCHNAMES, the source file is copied to a new version of the target file.  All files are copied if MATCHNAMES is NIL.  

(COMPARE-ENTRY-SOURCE-FILES CDENTRY LISTSTREAM EXAMINE DW?)
  	[Function]
This is a simple wrapper for calling COMPARESOURCES if the CDENTRY files are Lisp source files.  The function (CDENTRY MATCHNAME CDENTRIES is useful for extracting a particular entry, with CDENTRIES defaulting to LASTCDENTRIES.

(COMPILED-ON-SAME-SOURCE CDENTRIES)	[Function]
Returns the subset of entries with Lisp compiled files (dfasl or lcom) that are compiled on the same source, according to SOURCE-FOR-COMPILED-P below. Presumably one should be removed to avoid confusion.

(FIND-SOURCE-FILES CFILES SDIRS DFASLMARGIN)	[Function]
Returns (CFILE . SFILES) pairs where CFILE is a Lisp compiled file in CFILES and SFILES is list of files in SDIRS that CFILE was compiled on according to SOURCE-FOR-COMPILED-P. This suggests that at least one of SFILES should be copied to CFILE's location (or vice versa).

(FIND-COMPILED-FILES SFILES CDIRS DFASLMARGIN)	[Function]
Returns (SFILE . CFILES) pairs where SFILE is a Lisp source file in SFILES and CFILES are files in CDIRS that are compiled on SFILE according to SOURCE-FOR-COMPILED-P.  This suggests that at least one of CFILES should be copied to SFILE's location.  

(FIND-UNCOMPILED-FILES FILES DFASLMARGIN COMPILEXTS)	[Function]
Returns a list of elements each of which corresponds to a source file in FILES for which no appropriate compiled file can be found.   An appropriate compiled file is a file in the same location with extension in COMPILEEXTS (defaulting to *COMPILED-EXTENSIONS*) that satisfies SOURCE-FOR-COMPILED-P. Each element is a list of the form
    (sourcefile . cfiles)
cfiles contains compiled files that were compiled on a different version of sourcefile, NIL if no such files exist. Each cfile item is a pair (cfile  timediff) where timediff is the time difference (in minutes) between the creation date of the compiled-file's source and the creation date of sourcefile (positive if the cfile was compiled later, as should be the case). FILES can be an explicit list of files, or a file specification interpretable by FILDIR; in that case only the newest source-file versions are processed.  

(FIND-UNSOURCED-FILES CFILES DFASLMARGIN COMPILEXTS)	[Function]
Returns the subset of the compiled files specified by CFILES for which a corresponding source file according to SOURCE-FOR-COMPILED-P cannot be found in the same directory.  CFILES can be a list of files or a pattern that FILDIR can interpret.  COMPILEEXTS can be one or more explicit compile-file extensions, defaulting to *COMPILED-EXTENSIONS*.

(SOURCE-FOR-COMPILED-P SOURCE COMPILED DFASLMARGIN)	[Function]
Returns T if it can confirm that Lisp COMPILED file was compiled on Lisp SOURCE file.  SOURCE and COMPILED can be provided as CREATED-AS values, to avoid repetitive computation.  This compares the information in the filecreated expressions, original file names and original dates, and not the current directory names and dates.
It appears that the times in DFASL files may differ from the filecreated source dates by a few minutes.  The DFASLMARGIN can be provided to loosen up the date matching criterion.  DFASLMARGIN is a pair (max min) and a DFASL COMPILED is deemed to be compiled on SOURCE if the compiled's source date is no more than max and no less than min minutes after the source date.  A negative min allows for the possibility that the compiled-source date is earlier than the candidate source date.  DFASLMARGIN defaults to (20 0).  A single positive number x is coerced to (x 0).  A single negative number is coerced to (-x x) (compiled file is no more than x minutes later or earlier). T is infinity in either direction.  Examples:
    (T 0):  COMPILED compiled on source later than SOURCE
    (0 T):  COMPILED compiled on source earlier than SOURCE (odd)
    12:  COMPILED compiled on source later than SOURCE by no more than 12 minutes
     -12:   COMPILED compiled on source 12 minutes before or after SOURCE

(FIND-MULTICOMPILED-FILES FILES SHOWINFO)	[Function]
Returns a list of files in FILES that have more than one type of compiled file (e.g. LCOM and DFASL).  FILES is interpretable by FILDIR.  If SHOWINFO, then the value contains a list for each file of the form
+     (rootname loaded-version . CREATED-AS information for each compile-type)
 Otherwise just the rootname of the source is returns.

(CREATED-AS FILE)	[Function]
If FILE is a Lisp source or compiled file, returns a record of its original filename and filecreated dates, and for compiled files, also the original compiled-on name and date.  The return for a source file is a pair
     (sfullname sfilecreateddate)
The return for a compiled file is a quadruple
     (cfullname cfilecreated sfullname sfilecreateddate)
where sfullname and sourcefilecreated are extracted from the file's compiled-on information.  The return is (fullname NIL) for a non-Lisp file.

(EOLTYPE FILE SHOWCONTEXT)	[Function]
Returns the EOLTYPE of FILE (CR, LF, CRLF) if the type is unmistakable: contains at least one instance of one type and no instances of any others.  Returns NIL if there is evidence of inconsistent types.  If SHOWCONTEXT is an integer, it is the number of bytes for EOLTYPE to display before and after an instance of an inconsistent type.  At each instance, the user is asked whether to continue scanning for other instances.  SHOWCONTEXT = T is interpreted as 100.

(BINCOMP FILE1 FILE2 EOLDIFFOK)	[Function]
Returns T if FILE1 and FILE2 are byte-identical.  If EOLDIFFOK and FILE1 and FILE2 differ only in their eol conventions, the value is a list of the form (EOL1 EOL2), e.g. (CR CRLF).  Otherwise the value is NIL.  



	



(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))1
$4@
$

È
4
È
$

È
4
È
$

È
40
È
$

È
1
$4
È
$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD
+MODERN
+rd(DEFAULTFONT 1 (TERMINAL 12) (TERMINAL 8) (TERMINAL 8) (PDF (TERMINAL 8)) (POSTSCRIPT (TERMINAL 8)))TERMINAL
+GACHA
+MODERN
+TERMINALMODERN
+
MODERNMODERNLOGO
+
	

HRULE.GETFN

	
HRULE.GETFN

	
HRULE.GETFN


+
+
HRULE.GETFN
	
HRULE.GETFN
#


!

(


ž

[


f
J
L
L
4
4
C
›
Š
€
£

6
)
˜
*
©
Ú
‹

”


K
¦
Ù
N
7
É
X


1
_
A

P

]
Ž
»


 
#

Z


/

“


'

]


<

I


=
û


<
ä


/
Ì


8




:
û


@

O




@

[


?

H
Ñ
:
B
R
J


5
Ð
N
7



Ù
"
.
9
�


&

Ñ


+
Õ










DATE:g9^^1.
zº
\ No newline at end of file
diff --git a/lispusers/EXAMINEDEFS.TEDIT b/lispusers/EXAMINEDEFS.TEDIT
index 50aa5cefc063f249b5004bbce6b8a491f196b455..7b7b27423c96b99ce55bc65812202d70259e4206 100644
GIT binary patch
delta 1009
zcmZWnJxjw-6n$;AsjW#0tsr!0gi0HnB8W~xv?&&vHnb7J(T~+ZoC=!RQQjc<100-m
z(7`|9Pttdu-fPkX67D<qeBAf)KDy7{*C(@K2v4M*QbBa&o7t9MrY&DgDX%P7?pU6D
zw4%fi>!KPD!(cX@g#K7`euYILuEj;K9}N8CQ9PK8W5;uPaWD;sV}Im$+iq&Lx44M<
zgG^iXqsc6u9ZrW)oaxkDSFHZcD!<iSk=>L%dusz&Q5fo5Mp;m=iDC&KbmW8GkT>;B
zye(j$a2q1+TbB2BtBRKHm*ri(mHaPJDL1%UD9OI0YIhOP4$DB51dJL=6aflowH}Br
zG6?${Iv*tM1rqkDjaY^V^%KO1I+S?;05lF~7e?4cw~(|;Dj<oDx=ceF=@6oiJSPLE
z!0|K>XxVu<o##0vP6b5?`)?A&BpsUBm`|KsR{p#gStAi|;*1coNqA=F+!BY!Y3Gp4
t{euOo`42GiPHM_b-_9d_+Wbpaz=dB(BDOgp1U9%1`v4TT;)wJ4=MQO8K$rjk

delta 1068
zcmah|%Syvg5S>IDYipAV6$*k17D^C=uH3d_e4t6CRs<I=1YPM52-1(ZJ2yfXuHERu
zFK{9Lg7_!iGq*FfMl>+V$+>6FJeoc<pPP?&6)!Mvm7%#0V{;j{%xid952#M1{$83K
z^}1;%qXzNin_(22k7&)jNAqWnBcB3`5aijI11OAM7|=-K+w<~n@Ax2D-%0x0nMXAW
z((YE$%cz8`(FGSOnCt4|(*KhEza?zx)3kkZV*uy}&s;y|Gg>h1>Z<1f4ct5|g?Nfn
z><z=|lsNG%5!=vdLGTpF5k=WSq67f@;%1;_09$23B3mESj18`Umq|v`AV9q~Bw8GR
z_d3ByJDbqLQ~S~aj<NN}jqw?LHf(U3G8Z|fAq;;Mzh-$_Ui#rx!BqMgjH?Spr{Y`$
zfOAb4)o{`8M${2au9hxWSE&qse>bU4aV|{GM<ur+(RP+|Ohp*6(QMu+ZeRvH-_uXA
s`*(n~=M%e~bsSL&AU3Qy5e7+cXn{aB+X3(w4ImQRCToi;banIc1+mUDJOBUy

diff --git a/lispusers/FM-CREATOR.TEDIT b/lispusers/FM-CREATOR.TEDIT
index 118a68e08930653659d76daa4d0deb449d6696c7..5a38f996c7263425017e03b5e06812b9e767ff07 100644
GIT binary patch
delta 5294
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
Mu(loI`{zIYAL68voB#j-

delta 5518
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
Rn*_)P5714k^x5YR{RiqokcI#N

diff --git a/lispusers/GITFNS.TEDIT b/lispusers/GITFNS.TEDIT
index 42526590..be64fa84 100644
--- a/lispusers/GITFNS.TEDIT
+++ b/lispusers/GITFNS.TEDIT
@@ -1,9 +1,19 @@
-Medley	GITFNS
2
-
4
-
1
-
GITFNS
1
-
4
-
By Ron Kaplan
This document was last edited in February  2023.

GITFNS provides a Medley-oriented interface for comparing the files in two different branches of a git repository.  This makes it easier to understand what functions or other definitions have changed in a Lisp source file, or what text has changed in a Tedit file.  This may be particularly helpful in evaluating the changes in a pull request.
+Medley	GITFNS
+2
+
+4
+
+1
+
+GITFNS
+1
+
+4
+
+By Ron Kaplan
+This document was last edited in February  2023.
+
+GITFNS provides a Medley-oriented interface for comparing the files in two different branches of a git repository.  This makes it easier to understand what functions or other definitions have changed in a Lisp source file, or what text has changed in a Tedit file.  This may be particularly helpful in evaluating the changes in a pull request.
 Separately, GITFNS also provides tools and conventions for bridging between git's file-oriented style of development and version control and Medley's residential development style with its own version control conventions.  GITFNS allows for intelligent comparisons between Lisp source files, Tedit files, and text files in a local git clone and a local Medley-style working directory, and for migrating files to and from the git clone and the working directory.
 
 Git projects:  Connecting git clones to GITFNS capabilities 
@@ -41,29 +51,37 @@ GIT-MAKE-PROJECT will also create a pseudohost {Wprojectname} for the user's wor
 GIT-INIT creates the default set of projects when GITFNS is loaded, as specified in the variable GIT-DEFAULT-PROJECTS, initially containing MEDLEY NOTECARDS LOOPS TEST. GIT-INIT is added to AROUNDEXITFNS so that new pseudohost bindings for the default projects will be created if the sysout or makesys is started on a new machine.
 
 GIT-DEFAULT-PROJECTS     	[Variable]
-Determines the projects that are created (or recreated) by GIT-INIT. This is initialized for the MEDLEY NOTECARDS LOOPS TEST projects, with CLONEPATH=NIL
GITFNS also defines two directory-connecting commands for conveniently connecting to the git and working pseudohosts of a project:
+Determines the projects that are created (or recreated) by GIT-INIT. This is initialized for the MEDLEY NOTECARDS LOOPS TEST projects, with CLONEPATH=NIL
+GITFNS also defines two directory-connecting commands for conveniently connecting to the git and working pseudohosts of a project:
 cdg (projectname) (subdir)    	[Command]
 cdw (projectname) (subdir)    	[Command]
 For example, cdg notecards library  connects to {NOTECARDS}/library/.
 
 Comparing directories and files in different git branches
 In its simplest application, GITFNS is just an off-to-the-side add-on to whatever work practices the user has developed with respect to a locally installed git project.  Its only advantage is to allow for more interpretable git-branch comparisons, especially for pull-request approval. These comparisons are provided by the prc ("pull request compare") Medley executive command:
-prc  (branch)   (DRAFT)  (projectname)	[Command]
This compares the files in branch against the files in the main branch of the project (origin/master or origin/main).  Thus, suppose that a pull request has been issued on github for a particular branch, say branch rmk15 of the default project.  Then
   prc rmk15 
+prc  (branch)   (DRAFT)  (projectname)	[Command]
+This compares the files in branch against the files in the main branch of the project (origin/master or origin/main).  Thus, suppose that a pull request has been issued on github for a particular branch, say branch rmk15 of the default project.  Then
+   prc rmk15 
 brings up a lispusers/COMPAREDIRECTORIES browser for the files that currently differ between origin/rmk15 and origin/master. If the selected files are Lisp source files, the Compare item on the file browser menu will show the differences in a lispusers/COMPARESOURCES browser. The differences for other file types will be shown in a lispusers/COMPARETEXT browser.
 If branch is not specified and the shell command gh is available, then a menu of open pull-request branches will be provided.  If gh is not available, the menu will offer all known branches.  If the optional DRAFT is provided, then the menu will include draft PR's as well as open ones.
 If one PR, say rmk15, contains all the commits of another (rmk14), then the menu will indicate this by
      rmk15 > rmk14
-Note that the prc comparison is  read-only: any comments, approvals, or merges of the branch must be specified using the normal Medley-external git interfaces and commands.
prc is the special case of the more general bbc command ("branch-branch compare") for comparing the files in any two branches:
-bbc  branch1   branch2  (project)	[Command]
This compares the files in branch1 and branch2, for example
+Note that the prc comparison is  read-only: any comments, approvals, or merges of the branch must be specified using the normal Medley-external git interfaces and commands.
+prc is the special case of the more general bbc command ("branch-branch compare") for comparing the files in any two branches:
+bbc  branch1   branch2  (project)	[Command]
+This compares the files in branch1 and branch2, for example
      bbc rmk15 lmm12   (local)
 This will compare the files in origin/rmk15 and origin/lmm12 in the GIT-DEFAULT project.  branch1 defaults to the origin files of the currently checked out branch, the second defaults to origin/master.  If local is non-NIL, then a branch that has neither local/ or origin/ prepended will default to local (e.g. local/rmk15) instead of origin/.  Local refers to the files that are currently in the clone directory, which may not be the same as the origin files, depending on the push/pull status.  
 Either of the branches can be specified with an atom LOCAL, REMOTE, or ORIGIN, in which case bbc will offer menus listing the currently existing branches of that type.
-NOTE: Branch comparison makes use of a git command that has a limit (diff.renameLimit) on the number of files that it can successfully compare.  A message will be printed if that limit is exceeded, asking whether a larger value for that limit should be applied globally.
The command cob ("check out branch") checks out a specified branch:
+NOTE: Branch comparison makes use of a git command that has a limit (diff.renameLimit) on the number of files that it can successfully compare.  A message will be printed if that limit is exceeded, asking whether a larger value for that limit should be applied globally.
+The command cob ("check out branch") checks out a specified branch:
 cob  branch  (next-title-string) (project)	[Command]
 This checks out branch of project and then executes git pull.  The branch parameter may also be a local branch, T (= the current working branch), or NEW/NEXT (= the next working branch).  The current working branch is the branch named <initials>nnn, e.g. rmk15.  The initials are the value of INITIALS as used for SEDIT time stamps, and nnn is the largest of the integers of all of the branches beginning with those initials.
 If branch is NEW or NEXT, then a new initialed branch is created and becomes the user's current branch.  Its number  is one greater than the largest number of previous initialed branches. If next-title-string is provided, then that string will be appended to the name of the branch, after the initials and next number, and two hyphens.  Spaces in next-title-string will also be replaced by hyphens, according to git conventions.
-If branch is not provided, a menu of locally available branches pops up.
The currently checked out branch is obtained by the b? command:
-b?  (project)	[Command]
+If branch is not provided, a menu of locally available branches pops up.
+The currently checked out branch is obtained by the b? command:
+b?  (project)	[Command]
+
 Correlating git source control with separate Medley development
 It is generally unsafe to do Medley development by operating with files in a local clone repository.  Medley provides a residential development environment that integrates tightly with the local file system.  It is important to have consistent access to the source files of the currently running system, especially for files whose contents have been only partially loaded. A git pull or a branch switch that introduces new versions of some files or removes old files altogether can lead to unpredictable disconnects that are hard to recover from.  This is true also because development can go on in the same Medley memory image for days if not weeks, so it is important to have explicit control of any file version changes.
 GITFNS mitigates the danger by conventions that separate the files in the git clone from the files in the working Medley development directory.  The location of the Medley development source tree for a project is given by the WORKINGPATH argument to GIT-MAKE-PROJECT.  If WORKINGPATH is T or NIL and there exists a directory >working-projectname> as a sister to the clone, then that is taken to be the WORKINGPATH and thus the prefix for a pseudohost {Wprojectname}.
@@ -76,13 +94,12 @@ In addition to the commands for comparing and viewing files, the menu for this b
 If the master/main branch is the current branch then the menu has no commands to change the clone directory. The browser will show those files that have been updated from a recent merge, and they can individually be copied from the git branch to realign the two source trees with incremented Medley version numbers.  If the comparison is with a different branch, say the user's current staging branch, copying files from the working Medley to the git clone or deleting git files will set git up for future commits.  
 Note that the menu item for deleting Medley files will cause all versions to be removed, not just the latest one, to avoid the possibility that an earlier one is revealed. Deletion for Medley files is also accomplished by renaming to a {Wprojectname}<deleted> subdirectory so that they can be recovered if a deletion is in error. Files in the git-clone are removed from the file system immediately, since git provides its own recovery mechanism for those files.
 GITFNS does not (yet?) include functions for commits, pushes, or merge for updating the remote repository. Those have to be done outside of Medley through the usual github interfaces, as guided by the information provided by the comparisons.
-(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))1
$4
È
$

È
4
È
$

È
1
È
$4
È

$

È
4
È
$

È
4
È

$

È
4
È

$

È
4
È

$

È
4
È


$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD1
È
$	TERMINAL_Q(DEFAULTFONT 1 (TERMINAL 12) (TERMINAL 8) (TERMINAL 8) (POSTSCRIPT (TERMINAL 8)))MODERN
+(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))1
$4
È
$

È
4
È
$

È
1
È
$4
È

$

È
4
È
$

È
4
È

$

È
4
È

$

È
4
È


$

È
4
È

$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD
+TIMESROMAN$rd(DEFAULTFONT 1 (TERMINAL 12) (TERMINAL 8) (TERMINAL 8) (PDF (TERMINAL 8)) (POSTSCRIPT (TERMINAL 8)))MODERN
 TERMINAL
-MODERNMODERN
-MODERN
-TIMESROMAN$MODERN
-
HRULE.GETFN

HRULE.GETFN

HRULE.GETFN



HRULE.GETFN

HRULE.GETFN
1

RÍé
;¹@
-,




"
	


	&

	



\







+TERMINALMODERNMODERN
+MODERN

HRULE.GETFN

HRULE.GETFN

HRULE.GETFN



HRULE.GETFN

HRULE.GETFN
1

RÍé
;¹
+@	,

"		&

\




 X
-


p

	
6,



	


)

	
)
	

+

	



	

5	

			

@&	

I7
o
E	.8>I
 
Y

€
$
;



}(
)



9


!
0

4



c

	

5

vB	

1OLJ''œ)
2+






Z
!
œ5H
55>

$N
!

M
§‹A@4
-
@Ôâ


k6.	R		<9

	

'Y"(?“

F
�ìËò1R
þzº
\ No newline at end of file
+
p
	
6,

	
)	)	
+
	


	
5	
			
@&	

I7
o
E	.8>I
 
Y

€
$
;



}(
)


9

!0
4

c
	
5
vB	
1OLJ''œ)2+



Z
!
œ5H
55>
$N
!
M
§‹A@4
+
@Ôâ

k6.	R		<9
	
'Y"(?“
F�ìËòDATE:gK(1R
þzº
\ No newline at end of file
diff --git a/lispusers/tmax/TMAX.TEDIT b/lispusers/tmax/TMAX.TEDIT
index a6a43f53b9a2a62824e4f8e02758a53645a6f405..c7b39a6ceccc8864efaafd3d077d4ddebac222d7 100644
GIT binary patch
delta 11730
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
Nr1jEXukETm{{yLuCD{M~

delta 12970
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
ZKuunpKzOjmY$h|@oA=0!^vNv;{|j07{UQJW