Changeset 481

Timestamp:

03/04/08 12:58:42 (4 years ago)

Author:

mgalloy

Message:

Added image directives to rst markup parser.

Files:

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

trunk/idldoc/src/parser/docparrstmarkupparser__define.pro

@@ -10 +10 @@
 ;   #. (not implemented) code can be marked as `a = findgen(10)`
 ;   #. (not implemented) links: single word and phrase links
+;   #. images
 ;   #. code callouts like::
 ;  
@@ -20 +21 @@
 ;-
 
+
+;+
+; Process directives.
+;-
+pro docparrstmarkupparser::_processDirective, line, pos, len, tree=tree
+  compile_opt strictarr
+  
+  fullDirective = strmid(line, pos + 3L, len)
+  tokens = strsplit(fullDirective, '::[[:space:]]+', /regex, /extract)
+  
+  case strlowcase(tokens[0]) of
+    'image': begin
+        tag = obj_new('MGtmTag', type='image')
+        tag->addAttribute, 'source', tokens[1]
+      end
+    else: self.system->warning, 'unknown rst directive ' + tokens[0]
+  endcase
+
+  beforeDirective = strmid(line, 0, pos)
+  afterDirective = strmid(line, pos + len)
+  tree->addChild, obj_new('MGtmText', text=beforeDirective)
+  tree->addChild, tag
+  tree->addChild, obj_new('MGtmText', text=afterDirective)
+  tree->addChild, obj_new('MGtmTag', type='newline')
+end
 
 ;+
@@ -44 +70 @@
   
   for l = 0L, n_elements(lines) - 1L do begin
-    cleanLine = strtrim(lines[l], 0)
+    cleanline = strtrim(lines[l], 0)
     dummy = stregex(lines[l], ' *[^[:space:]]', length=currentIndent)
     
@@ -52 +78 @@
     endif
     
-    nextIsCode = strmid(cleanLine, 1, /reverse_offset) eq '::'
+    nextIsCode = strmid(cleanline, 1, /reverse_offset) eq '::'
     
     if (nextIsCode) then cleanline = strmid(cleanline, 0, strlen(cleanline) - 1)
     
-    if (code && (currentIndent eq -1 || currentIndent gt indent)) then begin
-      listing->addChild, obj_new('MGtmText', text=strmid(cleanline, indent))
-      listing->addChild, obj_new('MGtmTag', type='newline')
-    endif else begin     
-      para->addChild, obj_new('MGtmText', text=cleanline)
-      para->addChild, obj_new('MGtmTag', type='newline')
+    directivePos = stregex(cleanline, '\.\. [[:alpha:]]+:: [[:alnum:]_/.\-]+', $
+                           length=directiveLen)
+    
+    if ((~code || (currentIndent gt -1 && currentIndent le indent)) && directivePos ne -1L) then begin
+      self->_processDirective, cleanline, directivePos, directiveLen, tree=para
       code = 0B
+    endif else begin
+      if (code && (currentIndent eq -1 || currentIndent gt indent)) then begin
+        listing->addChild, obj_new('MGtmText', text=strmid(cleanline, indent))
+        listing->addChild, obj_new('MGtmTag', type='newline')
+      endif else begin     
+        para->addChild, obj_new('MGtmText', text=cleanline)
+        para->addChild, obj_new('MGtmTag', type='newline')
+        code = 0B
+      endelse
     endelse