Changeset 652

Timestamp:

05/05/10 15:59:44 (2 years ago)

Author:

mgalloy

Message:

Basic links for ticket #5. Still need to do some type of lookup for things like my_routine.

Files:

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

trunk/src/parser/docparrstmarkupparser__define.pro

@@ -11 +11 @@
 ;   3. (not implemented) *emphasis* and **bold**
 ;   
-;   4. (not implemented) code can be marked as `a = findgen(10)`
+;   4. (not implemented) code can be marked as `a = findgen(10)`, this can also
+;      give a link to an item like a paramater, routine, file, or directory, 
+;      i.e., `my_routine`, `my_routine.pro`.
 ;   
 ;   5. (not implemented) links like: `my site <michaelgalloy.com>`_
@@ -98 +100 @@
   
   if (obj_valid(file)) then file->addImageRef, filename
+end
+
+
+function docparrstmarkupparser::_processLink, text, reference=reference
+  compile_opt strictarr
+
+  tokens = stregex(text, '(.*) <(.*)>', /extract, /subexpr)
+  
+  if (tokens[0] eq '') then begin
+    reference = ''
+    return, text
+  endif
+  
+  link_text = tokens[1]
+  reference = tokens[2]
+  
+  return, link_text
+end
+
+
+;+
+; Handle inline markup like emphasis, bold, and links.
+; 
+; :Params:
+;    para : in, required, type=MGtmTag object
+;       current paragraph
+;    line : in, required, type=string
+;       current line
+;-
+pro docparrstmarkupparser::_processInlines, para, line
+  compile_opt strictarr
+
+  tokens = strsplit(line, '`', /extract, /preserve_null, count=ntokens)
+  
+  ; always should have the first element
+  para->addChild, obj_new('MGtmText', text=self->_processText(tokens[0]))
+  
+  for i = 0L, ntokens / 2L - 1L do begin
+    link_text = self->_processLink(tokens[2 * i + 1], reference=reference)
+    
+    tag = obj_new('MGtmTag', type='link')    
+    tag->addAttribute, 'reference', reference
+    para->addChild, tag
+    
+    tag->addChild, obj_new('MGtmText', text=link_text)
+    
+    if (2 * i + 2 lt ntokens) then begin
+      para->addChild, obj_new('MGtmText', $
+                              text=self->_processText(tokens[2 * i + 2]))
+    endif
+  endfor
+  
+  para->addChild, obj_new('MGtmTag', type='newline')
 end
 
@@ -264 +319 @@
           header_level = 0
         endif else begin
-          if (cleanline ne '') then begin
-            para->addChild, obj_new('MGtmText', $
-                                    text=self->_processText(cleanline, code=code))
-            para->addChild, obj_new('MGtmTag', type='newline')
+          if (cleanline ne '') then begin            
+            self->_processInlines, para, cleanline            
           endif
         endelse