Changeset 4636 for trunk/src/netlabs/macros/reflowmail.e

Timestamp:

Aug 17, 2021, 9:28:59 AM (4 years ago)

Author:

Andreas Schnellbacher

Message:

• This is again a large extension. The Wrap and Reflow submenus complete now the new Format submenu. It also implements mode-dependant menu parts.
• Reworked 'Wrap lines' submenu.
• Extended Wrap cmd with more options.
• Renamed Menu* cmds to *MenuCmd.
• Reworked 'Reflow' submenu.
• Added RefreshSubMenu and AddSubMenu.
• Refresh Format submenu on selection of a different reflow mode.
• Prepared 'Reflow' for beautify.
• Selectable mode is currently: TEXT.
• Changed Reflow cmd.
• Moved 'Word processor' menu item to 'Reflow', mode 'TEXT'.
• Changed Reflow config keys.

File:

• trunk/src/netlabs/macros/reflowmail.e (modified) (7 diffs)

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

@@ -150 +150 @@
 ; Reflow previous paragraph.
 defproc Mail_ReflowMarkedLines( PrevParQuoteLevel, PrevPrevParQuoteLevel, PrevListIndent, PrevBullet, fEnableReflow, fIndentLists)
+   KeyPath = '\NEPMD\User\Format\Reflow'
+   NewListIndent   = QueryConfigKey( KeyPath'\ListIndent')
+
    QuoteChar = '>'
    SpaceAmount = 1  -- Spaces after QuoteChar
@@ -173 +176 @@
    endif
 
+--   if not NewListIndent then
+      NewListIndent = PrevListIndent
+--   endif
    if fIndentLists then
-      lma = PrevListIndent + 1
-      rma = RightMargin - PrevIndent - PrevListIndent
+      lma = NewListIndent + 1
+      rma = RightMargin - PrevIndent - NewListIndent
       pma = lma
    else
@@ -182 +188 @@
       -- Indent the bullet line to the length of the bullet chars plus
       -- following spaces. Also the original indent is kept.
-      pma = PrevListIndent + 1
+      pma = NewListIndent + 1
    endif
 
@@ -367 +373 @@
    PrevListIndent = 0
 
-   KeyPath = '\NEPMD\User\Reflow\Mail\IndentedLines'
+   KeyPath = '\NEPMD\User\Format\Reflow'
+   fKeepIndent     = QueryConfigKey( KeyPath'\KeepIndent')
+   fWrapIndent     = QueryConfigKey( KeyPath'\WrapIndent')
+   fRecognizeLists = QueryConfigKey( KeyPath'\RecognizeLists')
+   fReindentLists  = QueryConfigKey( KeyPath'\ReindentLists')
+
    -- Default is to not reflow indented lines
-   fIndentedIsVerbatim = (QueryConfigKey( KeyPath) <> 1)
-
-   KeyPath = '\NEPMD\User\Reflow\Mail\IndentLists'
+   fIndentedIsVerbatim = (fKeepIndent)
    -- Default is to indent lists
-   fIndentLists = (QueryConfigKey( KeyPath) <> 0)
+   fIndentLists = (fReindentLists)
 
    .line = 1
@@ -381 +390 @@
    -- Add a blank line after last to make reflow of the last par easy
    insertline '', .last + 1
-   i = 0
-   --do forever
-   do while i < 10000
-      i = i + 1  -- Added only as emergency stop, for nothing else.
-                 -- Maybe this will help to find the bug in it?
+   do i = 1 to .last
       fThisLineIsBlank    = 0
       fThisLineIsVerbatim = 0
@@ -524 +529 @@
 
       if fThisLineIsBlank = 0 then
-         mark_line
+         markline
       endif
 
@@ -547 +552 @@
       endif
 
-   enddo  -- forever
+   enddo  -- i
 
    -- Remove last blank lines