From e276460836a8d374c0a2abf3b027c9aec995b41a Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Sun, 14 Jan 2024 17:46:24 -0800 Subject: [PATCH] HRULE: More informative error messages (#1501) --- library/HRULE | 71 +++++++++++++++++++++------------------------ library/HRULE.LCOM | Bin 9452 -> 9328 bytes 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/library/HRULE b/library/HRULE index 47a768c5..e112450d 100644 --- a/library/HRULE +++ b/library/HRULE @@ -1,16 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "25-Jul-2022 15:09:26" {DSK}kaplan>Local>medley3.5>working-medley>library>HRULE.;4 23801 +(FILECREATED "26-Nov-2023 09:46:44" {WMEDLEY}HRULE.;5 23918 - :CHANGES-TO (VARS HRULECOMS) + :EDIT-BY rmk - :PREVIOUS-DATE "25-Jul-2022 15:07:00" -{DSK}kaplan>Local>medley3.5>working-medley>library>HRULE.;3) + :CHANGES-TO (FNS HRULE.CREATE VRULE.CREATE CROPMARK.CREATE) + :PREVIOUS-DATE "25-Jul-2022 15:09:26" {WMEDLEY}HRULE.;4) -(* ; " -Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. -") (PRETTYCOMPRINT HRULECOMS) @@ -90,30 +87,27 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (DEFINEQ (HRULE.CREATE - [LAMBDA (WIDTH) (* jds "11-Sep-85 16:36") + [LAMBDA (WIDTH) (* ; "Edited 26-Nov-2023 09:45 by rmk") + (* jds "11-Sep-85 16:36") - (* * Create a Horizontal-Rule image object. - WIDTH may be NIL to default, a number, for a single rule with its width in - points (and fractions thereof)%, or a list of alternating black and white - widths. E.g., to get a hairline over 1pt white over 3pt rule, specify - (0.5 1 3)) +(* ;;; "Create a Horizontal-Rule image object. WIDTH may be NIL to default, a number, for a single rule with its width in points (and fractions thereof), or a list of alternating black and white widths. E.g., to get a hairline over 1pt white over 3pt rule, specify (0.5 1 3)") (PROG ((HRULE (IMAGEOBJCREATE NIL HRULE.IMAGEFNS))) (COND - ((NOT WIDTH) (* USe the default width) + ((NOT WIDTH) (* ; "USe the default width") (IMAGEOBJPROP HRULE 'RULE.WIDTH HRULE.DEFAULT.WIDTH) (RETURN HRULE)) ((NUMBERP WIDTH) (IMAGEOBJPROP HRULE 'RULE.WIDTH WIDTH) (RETURN HRULE)) ((AND (LISTP WIDTH) - (EVERY WIDTH (FUNCTION NUMBERP))) (* It's a list of numbers. - Add (QUOTE em) up) + (EVERY WIDTH (FUNCTION NUMBERP))) (* ; + "It's a list of numbers. Add (QUOTE em) up") (IMAGEOBJPROP HRULE 'RULE.WIDTH WIDTH) (RETURN HRULE)) - (T (* Something was specified, and - there was a non-number in it...) - (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " WIDTH) + (T (* ; + "Something was specified, and there was a non-number in it...") + (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "HRULE with non-numeric width: " WIDTH) T]) (HRULE.DISPLAYFN @@ -233,8 +227,9 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (DEFINEQ (VRULE.CREATE - [LAMBDA (WIDTH HEIGHT DASHING) (* ; - "Edited 8-Oct-92 16:46 by sybalsky:mv:envos") + [LAMBDA (WIDTH HEIGHT DASHING) (* ; "Edited 26-Nov-2023 09:45 by rmk") + (* ; + "Edited 8-Oct-92 16:46 by sybalsky:mv:envos") (* ;; "Create a Vertical-Rule image object. HEIGHT may be NIL to default, a number, for a single rule with its width in points (and fractions thereof), or a list of alternating black and white widths. E.g., to get a hairline over 1pt white over 3pt rule, specify (0.5 1 3)") @@ -246,7 +241,7 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (IMAGEOBJPROP VRULE 'RULE.WIDTH WIDTH)) ((AND (LISTP WIDTH) (EVERY WIDTH (FUNCTION NUMBERP))) (* ; - "It's a list of numbers. Add 'em up") + "It's a list of numbers. Add 'em up") (IMAGEOBJPROP VRULE 'RULE.WIDTH WIDTH))) (COND ((NOT HEIGHT) (* ; "Use the default width") @@ -257,12 +252,12 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (RETURN VRULE)) ((AND (LISTP HEIGHT) (EVERY HEIGHT (FUNCTION NUMBERP))) (* ; - "It's a list of numbers. Add 'em up") + "It's a list of numbers. Add 'em up") (IMAGEOBJPROP VRULE 'RULE.HEIGHT HEIGHT) (RETURN VRULE)) (T (* ; - "Something was specified, and there was a non-number in it...") - (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " HEIGHT) + "Something was specified, and there was a non-number in it...") + (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "VRULE with non-numeric height: " HEIGHT) T))) (IMAGEOBJPROP VRULE 'RULE.DASHING DASHING]) @@ -392,7 +387,8 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (DEFINEQ (CROPMARK.CREATE - [LAMBDA (WIDTH HEIGHT) (* ; "Edited 5-Jun-91 14:56 by jds") + [LAMBDA (WIDTH HEIGHT) (* ; "Edited 26-Nov-2023 09:46 by rmk") + (* ; "Edited 5-Jun-91 14:56 by jds") (* ;; "Create a CROPMARK, that prints crop-marks for a page that is WIDTH points wide and HEIGHT points high.") @@ -406,12 +402,12 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (RETURN CROPMARK)) ((AND (LISTP HEIGHT) (EVERY HEIGHT (FUNCTION NUMBERP))) (* ; - "It's a list of numbers. Add 'em up") + "It's a list of numbers. Add 'em up") (IMAGEOBJPROP CROPMARK 'PAGE.SIZE (LIST WIDTH HEIGHT)) (RETURN CROPMARK)) (T (* ; - "Something was specified, and there was a non-number in it...") - (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " HEIGHT) + "Something was specified, and there was a non-number in it...") + (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "CROPMARK with non-numeric height: " HEIGHT) T]) (CROPMARK.DISPLAYFN @@ -508,14 +504,13 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation. (FUNCTION NILL) (FUNCTION CROPMARK.WHENOPERATEDONFN) (FUNCTION NILL))) -(PUTPROPS HRULE COPYRIGHT ("Venue & Xerox Corporation" 1985 1990 1991 1992)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4512 10691 (HRULE.CREATE 4522 . 5944) (HRULE.DISPLAYFN 5946 . 8515) (HRULE.GETFN 8517 - . 8837) (HRULE.IMAGEBOXFN 8839 . 9641) (HRULE.PUTFN 9643 . 10021) (HRULE.COPYFN 10023 . 10487) ( -HRULE.WHENOPERATEDONFN 10489 . 10689)) (11583 17788 (VRULE.CREATE 11593 . 13592) (VRULE.DISPLAYFN -13594 . 15788) (VRULE.GETFN 15790 . 16011) (VRULE.GETFN2 16013 . 16349) (VRULE.IMAGEBOXFN 16351 . -16779) (VRULE.PUTFN 16781 . 17179) (VRULE.COPYFN 17181 . 17584) (VRULE.WHENOPERATEDONFN 17586 . 17786) -) (18427 23077 (CROPMARK.CREATE 18437 . 19704) (CROPMARK.DISPLAYFN 19706 . 21206) (CROPMARK.GETFN -21208 . 21502) (CROPMARK.IMAGEBOXFN 21504 . 22205) (CROPMARK.PUTFN 22207 . 22485) (CROPMARK.COPYFN -22487 . 22870) (CROPMARK.WHENOPERATEDONFN 22872 . 23075))))) + (FILEMAP (NIL (4411 10637 (HRULE.CREATE 4421 . 5890) (HRULE.DISPLAYFN 5892 . 8461) (HRULE.GETFN 8463 + . 8783) (HRULE.IMAGEBOXFN 8785 . 9587) (HRULE.PUTFN 9589 . 9967) (HRULE.COPYFN 9969 . 10433) ( +HRULE.WHENOPERATEDONFN 10435 . 10635)) (11529 17865 (VRULE.CREATE 11539 . 13669) (VRULE.DISPLAYFN +13671 . 15865) (VRULE.GETFN 15867 . 16088) (VRULE.GETFN2 16090 . 16426) (VRULE.IMAGEBOXFN 16428 . +16856) (VRULE.PUTFN 16858 . 17256) (VRULE.COPYFN 17258 . 17661) (VRULE.WHENOPERATEDONFN 17663 . 17863) +) (18504 23271 (CROPMARK.CREATE 18514 . 19898) (CROPMARK.DISPLAYFN 19900 . 21400) (CROPMARK.GETFN +21402 . 21696) (CROPMARK.IMAGEBOXFN 21698 . 22399) (CROPMARK.PUTFN 22401 . 22679) (CROPMARK.COPYFN +22681 . 23064) (CROPMARK.WHENOPERATEDONFN 23066 . 23269))))) STOP diff --git a/library/HRULE.LCOM b/library/HRULE.LCOM index 191f546bb25408db8e472c1a4c16dd027f605627..c89d976b90e9ac3a030b23d00568e99a2631a1c2 100644 GIT binary patch delta 576 zcmaKoQA@&56vr{c;08gyMsT_iOlV`9+iJH6Os_ebGp1HPP91KfTdY-7gkK?$K8X+Y z))(rbkI*e!MOu&N!0-P*zw=_eR_;%R8gGS{ye!Ij5OtzxL{TtsxDyV}{Jz_TFaQj< z$5mP~Y3pvM@3$i-y56nWO_K`SY7Vfhen&_$QDh>j7(qL7zd|~m6ZG8kbpjKvXwyQ2 z!jat^vXsxMXx9#_1^XbGeb!uVnkM`#5Cj23*NNF>XjZe1bBHS&CY^+q*m*Mz6C-C@ z3FN#kZ2_SrqrvaBAR3$kDOL*BKCSbO8gON+4(PYYpB|&f6kgMbtYJV&>r|;S#&b)l z6dFnCRSt2mDFOayfGa=tAP56KxEQ#R-(ibx>=9s|`e*c@|IV&s2M?Y+ndmlT>>#+yb9i~5=XpO5?~VP_Ssa~f(wAv0VFhDQHC?Ic zcoTtu26QxzViE#P00H-Px4r*ur<)R%8pB{52Z`a*K@b}w62|1LDr?4!vSE~*NRKB* z9Q9ei&J5e{x|aNTLj;7McB#6Gb+vkqpwGzfHV(*q%+fU-5;{4}(;&+0_qwhNPtCF{ zBM5^@{=9#LVg-quu;;jz>09-VwfonlKa>Sj@G>e6aCKWzK{xGsvthNRjt4@o?ziEA z+w>0F*;NTSTe_nBj~T1WyVBcIiO=4YKd$ovY^i{nG?9|&h_Gk?vnZULrp0;?k~CsL zKPEaLkzY2;*ROKlYwlnp_tms#`Eoi?WKHCInOA$;_I`*B0-N}Dkk0et9pWuivItP=oF=fFdq6q@Ewyot-QwmWF L!J^1D9hbWYT{qS#