Changeset 127

Timestamp:

04/26/2006 23:04:48 (3 years ago)

Author:

cardmagic

Message:

Fixing a few pieces of the docbook export, like footnotes

Files:

• trunk/lib/redcloth/docbook.rb (modified) (3 diffs)

trunk/lib/redcloth/docbook.rb

@@ -255 +255 @@
       text.gsub!( %r{<programlisting>\n}, "<programlisting>" )
       text.gsub!( %r{\n</programlisting>}, "</programlisting>\n" )
-
+      
+      i = 1
+      text.gsub!(/\[\d+\]/) do |ref|
+        id = ref[/\d+/].to_i
+        if id == i
+          i += 1
+          if text =~ /<footnote id="fn#{id}">(.*?)<\/footnote>/
+            "<footnote id=\"footnote#{id}\">#{$1}</footnote>"
+          else
+            ref
+          end
+        else
+          ref
+        end
+      end
+      
+      text.gsub!(/<footnote id="fn\d+">(.*?)<\/footnote>/, '')
+      
       DOCBOOK_TAGS.each do |qtag_rc, ht, qtag_re, rtype, escaped_re|
           text.gsub!( escaped_re ) do |m|
@@ -568 +585 @@
     def docbook_fn_( tag, num, atts, cite, content )
         atts << " id=\"fn#{ num }\""
-        content = "<superscript>#{ num }</superscript> #{ content }"
         atts = shelve( atts ) if atts
-        "<para>#{ content }</para>"
+        "<footnote#{atts}><para>#{ content }</para></footnote>"
     end
 
@@ -689 +705 @@
     end
 
-    def docbook_footnote_ref( text ) 
-        text.gsub!( /\b\[([0-9]+?)\](\s)?/,
-            '<superscript><link linkend="#fn\1">\1</link></superscript>\2' )
-    end
-
     def inline_docbook_glyphs( text, level = 0 )
         if text !~ HASTAG_MATCH
             docbook_pgl text
-            docbook_footnote_ref text
         else
             codepre = 0