From 0f8652e15bdbdfc6c8ea9b9297f37e36b60fb2fe Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Fri, 19 Apr 2024 09:50:39 -0700 Subject: [PATCH] TEDIT-HCPY set X position after image object Addresses issue #1667 --- library/tedit/TEDIT-HCPY | 35 +++++++++++++++++----------------- library/tedit/TEDIT-HCPY.LCOM | Bin 13219 -> 13145 bytes 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/library/tedit/TEDIT-HCPY b/library/tedit/TEDIT-HCPY index 9603b203..dd0c7172 100644 --- a/library/tedit/TEDIT-HCPY +++ b/library/tedit/TEDIT-HCPY @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "20-Mar-2024 11:05:37" {WMEDLEY}tedit>TEDIT-HCPY.;152 33826 +(FILECREATED "19-Apr-2024 09:12:32" {WMEDLEY}TEDIT>TEDIT-HCPY.;153 33754 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.HARDCOPY.DISPLAYLINE TEDIT.HARDCOPYFN) + :CHANGES-TO (FNS \TEDIT.HARDCOPY.DISPLAYLINE) - :PREVIOUS-DATE "17-Mar-2024 17:24:56" {WMEDLEY}TEDIT>TEDIT-HCPY.;149) + :PREVIOUS-DATE "20-Mar-2024 11:05:37" {WMEDLEY}TEDIT>TEDIT-HCPY.;152) (PRETTYCOMPRINT TEDIT-HCPYCOMS) @@ -128,7 +128,8 @@ (TEDIT.FORMAT.HARDCOPY TSTREAM FILENM T BREAKPAGETITLE NIL NIL IMAGETYPE]) (\TEDIT.HARDCOPY.DISPLAYLINE - [LAMBDA (TEXTOBJ LINE REGION PRSTREAM FORMATTINGSTATE) (* ; "Edited 20-Mar-2024 11:04 by rmk") + [LAMBDA (TEXTOBJ LINE REGION PRSTREAM FORMATTINGSTATE) (* ; "Edited 19-Apr-2024 09:09 by rmk") + (* ; "Edited 20-Mar-2024 11:04 by rmk") (* ; "Edited 15-Mar-2024 19:23 by rmk") (* ; "Edited 24-Dec-2023 22:07 by rmk") (* ; "Edited 2-Dec-2023 11:17 by rmk") @@ -232,9 +233,7 @@ (* ;; "LOOKSTARTX: Starting X position for this CLOOKS.") - (SETQ LOOKSTARTX TX) - elseif (SMALLP CHARW) - else (HELP "UNRECOGNIZED CHARW" CHARW))) + (SETQ LOOKSTARTX TX))) (PROGN (if (IMAGEOBJP CHAR) then (* ;; "Go to the base line, left edge of the image region.") @@ -244,10 +243,10 @@ CHAR PRSTREAM (IMAGESTREAMTYPE PRSTREAM) (ffetch (TEXTOBJ STREAMHINT) of TEXTOBJ)) (DSPFONT (fetch CLFONT of CLOOKS) - PRSTREAM) (* ; "Restore the font") - (DSPYPOSITION CURY PRSTREAM) - (* ; - "Restore the Y position, assume X is OK") + PRSTREAM) (* ; + "Restore the font, move to after the object's image") + (MOVETO (IPLUS TX CHARW) + CURY PRSTREAM) elseif (DIACRITICP CHAR) then (* ;; "Special placement for diacritics") @@ -567,11 +566,11 @@ (CLOSEF DOC]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3492 26880 (TEDIT.HARDCOPY 3502 . 4635) (\TEDIT.PRINT.MENU 4637 . 5491) (TEDIT.HCPYFILE - 5493 . 7433) (\TEDIT.HARDCOPY.DISPLAYLINE 7435 . 17428) (\TEDIT.HARDCOPY.FORMATLINE.HEADINGS 17430 . -18837) (\TEDIT.HARDCOPY.MODIFYLOOKS 18839 . 21073) (\TEDIT.HCPYFMTSPEC 21075 . 25209) ( -\TEDIT.INTEGER.IMAGEBOX 25211 . 25882) (\TEDIT.DISPLAY.DIACRITIC 25884 . 26878)) (26955 27785 ( -\TEDIT.SCALEREGION 26965 . 27783)) (28044 31739 (TEDIT.HARDCOPYFN 28054 . 29514) ( -\TEDIT.HARDCOPYFILEFN 29516 . 30077) (\TEDIT.POSTSCRIPT.HARDCOPY 30079 . 31010) (\TEDIT.PRESS.HARDCOPY - 31012 . 31737)) (33002 33803 (TEDIT-BOOK 33012 . 33801))))) + (FILEMAP (NIL (3475 26808 (TEDIT.HARDCOPY 3485 . 4618) (\TEDIT.PRINT.MENU 4620 . 5474) (TEDIT.HCPYFILE + 5476 . 7416) (\TEDIT.HARDCOPY.DISPLAYLINE 7418 . 17356) (\TEDIT.HARDCOPY.FORMATLINE.HEADINGS 17358 . +18765) (\TEDIT.HARDCOPY.MODIFYLOOKS 18767 . 21001) (\TEDIT.HCPYFMTSPEC 21003 . 25137) ( +\TEDIT.INTEGER.IMAGEBOX 25139 . 25810) (\TEDIT.DISPLAY.DIACRITIC 25812 . 26806)) (26883 27713 ( +\TEDIT.SCALEREGION 26893 . 27711)) (27972 31667 (TEDIT.HARDCOPYFN 27982 . 29442) ( +\TEDIT.HARDCOPYFILEFN 29444 . 30005) (\TEDIT.POSTSCRIPT.HARDCOPY 30007 . 30938) (\TEDIT.PRESS.HARDCOPY + 30940 . 31665)) (32930 33731 (TEDIT-BOOK 32940 . 33729))))) STOP diff --git a/library/tedit/TEDIT-HCPY.LCOM b/library/tedit/TEDIT-HCPY.LCOM index 9f84477bd318f65ace679ea62bf3d2c5fc36eacb..629023942d78d567f99bce87e0bcb39b19fe8857 100644 GIT binary patch delta 559 zcmZ3Selu-CxQL;pu46%wu91O}iGqQpm7$T9vC+hAmC64Zg(XdmH5Is&3=L6K7?@ZY zPTXx1f-J13r>CTll30?O!li&sy@`@0mxi0CkE?T#t7C|(3s4ajYn2oxzhzYAFf~>% zHa0gknOwnWt){796%gba=II|Atm^{Qs-R?KpzE6mb+DnKm4T_1vH9dzj2cX)Mw>;L z_}OKumT zMkce#hFo)W=H&2xn6!~`n!j8Q7l_g8FP8!lYTC-&w2|STzrtaV`b8TVizff%TElo` z@-l8`cCZP* zJ^lR@EX<51U*M7BH!@O)@ed7g_HYbRurM^7{Fg^M!opC&*FVfP#9zVO%v`}GIKa){ zFGRuI#8|=8*U{ZII0P7)z9EqTt_tSHP%(ceuYe%`00nbH3y_A$0RLdm5Rg6Q29^+A zKoy(odDR(Z%ncRXd_#f*T%8rnO)V8bHv9Pddj~6+8(C~V#K*}vSy@nM@_bE^&0GRA Fl>whAl|BFf delta 682 zcmZuvzi-n(6pj-W6gQy^RisEEJPZhm63aj0ob6Vn!MP-+vCpy{qM$B8;YURzq$mTZ zst}BHAvwW-5CaTMpqhw@fdMh}4`4tHh?NP%j&FG0{{MVCe&mhSI| zd7kH>*9|3DIE-K77TEJOvxyBCSHcnpNP8|g*l1h0+QgmBrT+T0L3eO(`A}CN%W7OI z)4R-~4!e%|M#Zff#Oc)R1<)NAUolC`D^|l|z=>#I$4Hk-x>DwV9c`YCm$XSDK6f;? zbut#4Sve95S7o~IWL9?KzsEshNcrRg<}=++USJ;4Z%H-nH3|GoM%*A?r@%fhyy>TZ zjRWR2$@kePctP^LDMa5V9tO-jflm?tWf1#AyQvKQ%RXhk&?mFT2?8_BIEZcCiS7xo z(XqX;tNsqt@3VR$W3cp8>LODJGsT=H$gno;*{Zm!eAKFE5*t*c(YLAmaan^k((;Y) zML?BQpg*$NTS!x(>Ny>Uc%~n*k*Y;Njo3b*vI3@6sbkL%zsK@B4hE#`VdT2pj@RiS42o`a3BjtG&JCLya{s47fG$C6AIkcfb5*)BFn T-8Qd=BN4IM+~nEZ$J74+-L$os