Changeset 3318

Timestamp:

Dec 11, 2018, 2:58:35 AM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Added an improved version of pcenter_mark. It preserves attributes, allows for all mark types, reduces EndCol from 1599 to 78 and changes char mark to useful values, if required.

File:

• trunk/src/netlabs/macros/stdprocs.e (modified) (6 diffs)

trunk/src/netlabs/macros/stdprocs.e ¶

@@ -419 +419 @@
     endif
 
-; PCENTER_MARK: center the strings between the block marks
+; ---------------------------------------------------------------------------
+; Center the text within the mark, linewise. Reduces 1599 as EndCol to 78
+; to place the text at a useful place. Replaces trailing and leading
+; whitespace with spaces. Handle cases when one or both sides don't have
+; whitespace. Allows for all mark types.
 defproc pcenter_mark
-   if  marktype() = 'BLOCK' then
-      getmark firstline, lastline, firstcol, lastcol, fileid
-   elseif marktype() = 'LINE' then
-      getmark firstline,lastline, firstcol, lastcol, fileid
-      parse value pmargins() with firstcol lastcol .
-   elseif marktype() = '' then
-      getfileid fileid
-      parse value pmargins() with firstcol lastcol .
-      firstline = .line
-      lastline = .line
-   else
-      sayerror CHAR_INVALID__MSG
-      stop
-   endif
-   sz = lastcol + 1 - firstcol
-   for i=firstline to lastline
-      getline line, i, fileid
-      inblock = strip( substr( line, firstcol, sz))
-      if inblock = '' then iterate endif
-      replaceline strip( overlay( center( inblock, sz), line, firstcol), 'T'), i, fileid
-   endfor
+   getmark markfirstline, marklastline, markfirstcol, marklastcol, markfid
+   getfileid fid
+   if fid <> markfid then
+      sayerror OTHER_FILE_MARKED__MSG
+      return
+   endif
+
+   StartCol = markfirstcol
+   EndCol   = marklastcol
+   mt = marktype()
+   if mt = 'CHAR' then
+      if markfirstline = marklastline then
+         -- OK
+         EndCol = marklastcol
+      else
+         if marklastcol < markfirstcol then
+            marklastline = marklastline - 1
+            marklastcol  = 1599
+         endif
+         -- Change to block mark
+         call pset_mark( markfirstline, marklastline, markfirstcol, 1599, 'BLOCK', markfid)
+         EndCol = marklastcol
+      endif
+   elseif mt = 'LINE' then
+      parse value pmargins() with StartCol EndCol .
+   endif
+
+   if EndCol = 1599 then
+      EndCol = 78
+   endif
+
+   do Line = markfirstline to marklastline
+      getline LineStr, Line
+
+      -- Calculate length of whitespace before and after the text part
+      TmpLineStr = translate( LineStr, ' ', \t)
+      StartTextCol = Max( 1, verify( TmpLineStr, ' '))
+      EndTextCol   = length( strip( TmpLineStr, 'T'))
+      LSpaceLen = Max( 0, StartTextCol - StartCol)
+      RSpaceLen = Max( 0, EndCol - EndTextCol)
+      -- Calculate NewLSpaceLen for centering text
+      NewLSpaceLen = (LSpaceLen + RSpaceLen) % 2
+      NewRSpaceLen = (LSpaceLen + RSpaceLen) - NewLSpaceLen
+      if NewLSpaceLen > 0 then
+
+         -- Replace trailing blanks with NewRSpaceLen
+         SearchStr = substr( LineStr, EndTextCol + 1, RSpaceLen)
+         ReplaceStr = copies( ' ', NewRSpaceLen)
+         if RSpaceLen > 0 then
+            rcx = SearchReplaceLine( SearchStr, ReplaceStr, 1, '', Line, EndTextCol + 1, EndCol)
+         else
+            call psave_pos( SavedPos)
+            .lineg = Line
+            .col = EndTextCol + 1
+            keyin ReplaceStr
+            call prestore_pos( SavedPos)
+         endif
+
+         -- Replace leading blanks with NewLSpaceLen
+         SearchStr = substr( LineStr, StartCol, LSpaceLen)
+         ReplaceStr = copies( ' ', NewLSpaceLen)
+         if LSpaceLen > 0 then
+            rcx = SearchReplaceLine( SearchStr, ReplaceStr, 1, '', Line, StartCol, StartTextCol - 1)
+         else
+            call psave_pos( SavedPos)
+            .lineg = Line
+            .col = StartCol
+            keyin ReplaceStr
+            call prestore_pos( SavedPos)
+         endif
+      endif
+   enddo
+
+   return
 
 compile if 0    -- The following two routines are unused; why waste space??  LAM
+; ---------------------------------------------------------------------------
 ; PDISPLAY_MARGINS: put the margins mark on the current line
 defproc pdisplay_margins()
@@ -457 +515 @@
    return 0
 
+; ---------------------------------------------------------------------------
 ; PDISPLAY_TABS: put the tab stops on the current line
 defproc pdisplay_tabs()
@@ -480 +539 @@
 compile endif
 
+; ---------------------------------------------------------------------------
 ; Check if file already exists in ring
 defproc pfile_exists
@@ -490 +550 @@
    return zzfileid <> ''
 
+; ---------------------------------------------------------------------------
 ; Find first blank line after the current one.  Make that the new current
 ; line.  If no such line is found before the end of file, don't change the
@@ -505 +566 @@
    endfor
 
+; ---------------------------------------------------------------------------
 ; different from PE
 defproc pfirst_nonblank
@@ -513 +575 @@
    endif
 
+; ---------------------------------------------------------------------------
 ; Move cursor to end of line like end_line, but ignore trailing blanks
 defproc pEnd_Line