Changeset 757

Timestamp:

08/25/11 13:29:53 (9 months ago)

Author:

mgalloy

Message:

Handling blank lines before and after a code block so extra margin (deleted in last commit) is no longer needed.

Files:

• trunk/src/parser/docparrstmarkupparser__define.pro (modified) (4 diffs)

trunk/src/parser/docparrstmarkupparser__define.pro

@@ -242 +242 @@
   code = 0B
   nextIsCode = 0B
+  lastWasCodeStart = 0B
   
   para = obj_new('MGtmTag', type='paragraph')
@@ -299 +300 @@
     endif
     
+    lastWasCodeStart = nextIsCode
     nextIsCode = strmid(cleanline, 1, /reverse_offset) eq '::'
     
@@ -305 +307 @@
     directivePos = stregex(cleanline, '\.\. [[:alpha:]]+:: [[:alnum:] _/.\-]+', $
                            length=directiveLen)
-    
+                           
     if ((~code || (currentIndent gt -1 && currentIndent le indent)) $
           && directivePos ne -1L) then begin
@@ -313 +315 @@
     endif else begin
       if (code && (currentIndent eq -1 || currentIndent gt indent)) then begin
-        listing->addChild, obj_new('MGtmText', $
-                                   text=self->_processText(strmid(cleanline, $
-                                                                  indent), $
-                                                           code=code))
-        listing->addChild, obj_new('MGtmTag', type='newline')
-      endif else begin     
+        listing_text = self->_processText(strmid(cleanline, indent), code=code)
+        if ((~lastWasCodeStart $
+                || (strcompress(listing_text, /remove_all) ne '')) $
+              && ((strcompress(listing_text, /remove_all) ne '') $
+                || (l lt (n_elements(lines) - 1L)))) then begin
+          listing->addChild, obj_new('MGtmText', text=listing_text)                                                                                                                     
+          listing->addChild, obj_new('MGtmTag', type='newline')
+        endif
+      endif else begin
+        if (code && obj_valid(listing)) then begin
+          blankLine = listing->getChild(/last)
+          listing->removeChild, /last
+          obj_destroy, blankLine
+        endif
+        
         code = 0B
+
         if (header_level gt 0L) then begin
           header_level = 0