1
0
mirror of synced 2026-01-13 15:37:38 +00:00

Merge pull request #1668 from Interlisp/rmk10--Fix-Tedit-imageobj-hardcopy

TEDIT-HCPY set X position after image object hardcopy display
This commit is contained in:
Matt Heffron 2024-04-19 11:50:19 -07:00 committed by GitHub
commit 88d10ee75c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 18 deletions

View File

@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "20-Mar-2024 11:05:37" {WMEDLEY}<library>tedit>TEDIT-HCPY.;152 33826
(FILECREATED "19-Apr-2024 09:12:32" {WMEDLEY}<library>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}<library>TEDIT>TEDIT-HCPY.;149)
:PREVIOUS-DATE "20-Mar-2024 11:05:37" {WMEDLEY}<library>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

Binary file not shown.