rpeg-multimarkdown 0.1.1 → 0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2ad16113d208ab57ccf7948e4fc1619d9e1b38c0
+  data.tar.gz: 67c7e3e4ce2760a7f795c07b63928585a07d2473
+SHA512:
+  metadata.gz: 9af9add990883aea35b0153b466fbc5e4f61618004cac29922c5910fc4ca680cc1c0c0208f267c2b88d72ac744012154f2f0fa7723f384ec5626810f9705876b
+  data.tar.gz: 35ec043a14a36b40484946fcf577d977263451e88feae0be3dffda11ce54d1d7084e513dcc6c779cbd07f2bbc0ba2bbb914cb41360afc1b7a0d817a8cbb4fcc9

data/README.markdown

@@ -14,17 +14,18 @@ Synopsis
 --------
 
     >> require 'multimarkdown'
+    
     >> puts MultiMarkdown.new('Hello, world.').to_html
-    <p>Hello, world.</p>
+    # <p>Hello, world.</p>
 
     >> puts MultiMarkdown.new('_Hello World!_', :smart, :filter_html).to_html
-    <p><em>Hello World!</em></p>
+    # <p><em>Hello World!</em></p>
 
     >> puts MultiMarkdown.new('_Hello World!_').to_latex
-    \emph{Hello World!}
+    # \emph{Hello World!}
 
     >> puts MultiMarkdown.new("Title: Some document\n\nSome text in the document").extract_metadata("title")
-    Some document
+    # Some document
 
     >> PEGMultiMarkdown.new('Hello! World!')
 
@@ -42,6 +43,8 @@ Hacking:
 
     $ git clone git://github.com/djungelvral/rpeg-multimarkdown.git
     $ cd rpeg-multimarkdown
+    $ git submodule init
+    $ git submodule update
     $ rake test
 
 Changes

data/Rakefile

@@ -7,8 +7,8 @@ require 'rubygems/package_task'
 
 task :default => :test
 
-DLEXT = Config::CONFIG['DLEXT']
-VERS = '0.1.1'
+DLEXT = RbConfig::CONFIG['DLEXT']
+VERS = '0.2'
 
 spec = Gem::Specification.new do |s|
   s.name              = "rpeg-multimarkdown"
@@ -74,7 +74,7 @@ task :gather => 'submodule:exist' do |t|
   files =
     FileList[
       'peg-multimarkdown/markdown_{peg.h,parser.c,output.c,lib.c,lib.h}',
-      'peg-multimarkdown/{utility,parsing}_functions.c',
+      'peg-multimarkdown/{utility,parsing}_functions.{c,h}',
       'peg-multimarkdown/odf.{c,h}'
     ]
   cp files, 'ext/',

data/bin/rpeg-multimarkdown

@@ -55,11 +55,11 @@ class Parser
         @used_short << short = o[2][:short] || short_from(o[0])
         @result[o[0]] = o[2][:default] || false # set default
         klass = o[2][:default].class == Fixnum ? Integer : o[2][:default].class
-
+        desk = o[1] + (o[2][:nodefault] ? "" : " (default is #{@result[o[0]]})")
         if [TrueClass, FalseClass, NilClass].include?(klass) # boolean switch
-          p.on("-" << short, "--[no-]" << o[0].to_s.gsub("_", "-"), o[1]) {|x| @result[o[0]] = x}
+          p.on("-" << short, "--[no-]" << o[0].to_s.gsub("_", "-"), desk) {|x| @result[o[0]] = x}
         else # argument with parameter
-          p.on("-" << short, "--" << o[0].to_s.gsub("_", "-") << " " << o[2][:default].to_s, klass, o[1]) {|x| @result[o[0]] = x}
+          p.on("-" << short, "--" << o[0].to_s.gsub("_", "-") << " " << (o[2][:name] ? "[#{o[2][:name].to_s}]" : ""), klass, desk) {|x| @result[o[0]] = x}
         end
       end
 
@@ -86,14 +86,14 @@ options = Parser.new do |p|
   p.banner = "Ruby interface to MultiMarkdown"
   p.version = "rpeg-multimarkdown 0.1.0"
   p.option :compatibility, "markdown compatibility mode", :default => false
-  p.option :filter_html, "filter out raw HTML (except styles)", :default => false
+  p.option :filter_html, "filter out raw HTML except styles", :default => false
   p.option :process_html, "process MultiMarkdown inside of raw HTML", :default => false
   p.option :filter_styles, "filter out HTML styles", :default => false
   p.option :smart, "use smart typography extension", :default => true
   p.option :notes, "use notes extension", :default => true
-  p.option :output, "send output to FILE (default is stdout)", :default => ""
-  p.option :to, "convert to FORMAT (default is html)", :default => "html", :value_in_set => ["html","latex","memoir","beamer","odf","opml"]
-  p.option :extract, "extract and display specified metadata", :default => ""
+  p.option :output, "send output to FILE (default is stdout)", :name => "FILE", :default => "", :nodefault => true
+  p.option :to, "convert to FORMAT", :name => "FORMAT", :default => "html", :value_in_set => ["html","latex","memoir","beamer","odf","opml"]
+  p.option :extract, "extract and display metadata specified by KEY", :name => "KEY", :default => "", :nodefault => true
 end.process!
 
 # Convert options to MultiMarkdown module's options

data/ext/extconf.rb

@@ -2,10 +2,10 @@ require 'mkmf'
 
 dir_config('peg_multimarkdown')
 
-$objs = %w[markdown.o markdown_lib.o markdown_output.o markdown_parser.o]
+$objs = %w[markdown.o markdown_lib.o markdown_output.o markdown_parser.o parsing_functions.o utility_functions.o]
 
 if pkg_config = find_executable('pkg-config')
-  $CFLAGS = "-fcommon "+`#{pkg_config} --cflags glib-2.0`
+  $CFLAGS = "-fcommon -std=gnu89 "+`#{pkg_config} --cflags glib-2.0`
   $LDFLAGS = `#{pkg_config} --libs glib-2.0`
 else
   fail "glib2 not found"

data/ext/markdown.c

@@ -80,8 +80,22 @@ rb_multimarkdown_extract_metadata(VALUE self, VALUE key)
 void Init_peg_multimarkdown()
 {
     rb_cMultiMarkdown = rb_define_class("PEGMultiMarkdown", rb_cObject);
+    /* 
+     * Document-method: PEGMultiMarkdown#to_html
+     * Return string containing HTML generated from `text` 
+     */
     rb_define_method(rb_cMultiMarkdown, "to_html", rb_multimarkdown_to_html, -1);
+    /* 
+     * Document-method: PEGMultiMarkdown#to_latex
+     * Return string containing latex generated from `text` 
+     */
     rb_define_method(rb_cMultiMarkdown, "to_latex", rb_multimarkdown_to_latex, -1);
+    /* 
+     * Document-method: PEGMultiMarkdown#extract_metadata
+     * call-seq:
+     *     extract_metadata(key)
+     * Extract metadata specified by `key` from `text`
+     */
     rb_define_method(rb_cMultiMarkdown, "extract_metadata", rb_multimarkdown_extract_metadata, 1);
 }
 

data/ext/markdown_lib.c

@@ -1,9 +1,10 @@
+
 /**********************************************************************
 
   markdown_lib.c - markdown in C using a PEG grammar.
   (c) 2008 John MacFarlane (jgm at berkeley dot edu).
 
-  portions Copyright (c) 2010-2011 Fletcher T. Penney
+  portions Copyright (c) 2010-2013 Fletcher T. Penney
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License or the MIT
@@ -22,6 +23,7 @@
 #include "markdown_peg.h"
 
 #define TABSTOP 4
+#define VERSION "3.7"
 
 /* preformat_text - allocate and copy text buffer while
  * performing tab expansion. */
@@ -99,9 +101,9 @@ static void print_tree(element * elt, int indent) {
             default:                 key = "?";
         }
         if ( elt->key == STR ) {
-            fprintf(stderr, "0x%x: %s   '%s'\n", (int)elt, key, elt->contents.str);
+            fprintf(stderr, "0x%p: %s   '%s'\n", (void *)elt, key, elt->contents.str);
         } else {
-            fprintf(stderr, "0x%x: %s\n", (int)elt, key);
+            fprintf(stderr, "0x%p: %s\n", (void *)elt, key);
         }
         if (elt->children)
             print_tree(elt->children, indent + 4);
@@ -155,27 +157,30 @@ GString * markdown_to_g_string(char *text, int extensions, int output_format) {
 
     formatted_text = preformat_text(text);
 
+    references = parse_references(formatted_text->str, extensions);
+    notes = parse_notes(formatted_text->str, extensions, references);
+    labels = parse_labels(formatted_text->str, extensions, references, notes);
+
     if (output_format == OPML_FORMAT) {
         result = parse_markdown_for_opml(formatted_text->str, extensions);
     } else {
-        references = parse_references(formatted_text->str, extensions);
-        notes = parse_notes(formatted_text->str, extensions, references);
-        labels = parse_labels(formatted_text->str, extensions, references, notes);
         result = parse_markdown_with_metadata(formatted_text->str, extensions, references, notes, labels);
-
         result = process_raw_blocks(result, extensions, references, notes, labels);
     }
 
     g_string_free(formatted_text, TRUE);
 
-    print_element_list(out, result, output_format, extensions);
-
+    if (result == NULL) {
+        /* The parsing was aborted */
+        g_string_append(out,"MultiMarkdown was unable to parse this file.");
+    } else {
+        print_element_list(out, result, output_format, extensions);
+    }
     free_element_list(result);
 
-    if (output_format != OPML_FORMAT) {
-        free_element_list(references);
-        free_element_list(labels);
-    }
+    free_element_list(references);
+    free_element_list(labels);
+
     return out;
 }
 
@@ -198,14 +203,63 @@ char * markdown_to_string(char *text, int extensions, int output_format) {
 char * extract_metadata_value(char *text, int extensions, char *key) {
     char *value;
     element *result;
-    char *meta;
+    element *references;
+    element *notes;
+    element *labels;
     GString *formatted_text;
 
     formatted_text = preformat_text(text);
-    
+
+    references = parse_references(formatted_text->str, extensions);
+    notes = parse_notes(formatted_text->str, extensions, references);
+    labels = parse_labels(formatted_text->str, extensions, references, notes);
+
     result = parse_metadata_only(formatted_text->str, extensions);
-    
-    value = metavalue_for_key(key, result->children);
+
+    value = metavalue_for_key(key, result);
     free_element_list(result);
+    free_element_list(references);
+    free_element_list(labels);
+
     return value;
-}
+}
+
+/* has_metadata - parse document and report whether metadata is present */
+gboolean has_metadata(char *text, int extensions) {
+    gboolean hasMeta;
+    element *result;
+    element *references;
+    element *notes;
+    element *labels;
+    GString *formatted_text;
+    
+    formatted_text = preformat_text(text);
+
+    references = parse_references(formatted_text->str, extensions);
+    notes = parse_notes(formatted_text->str, extensions, references);
+    labels = parse_labels(formatted_text->str, extensions, references, notes);
+    
+    result = parse_metadata_only(formatted_text->str, extensions);
+
+    hasMeta = FALSE;
+    
+    if (result != NULL) {
+        if (result->children != NULL) {
+            hasMeta = TRUE;
+            free_element_list(result);
+        } else {
+            free_element(result);
+        }
+    }
+
+    free_element_list(references);
+    free_element_list(labels);
+    return hasMeta;
+}
+
+/* version - return the MultiMarkdown library version */
+char * mmd_version() {
+    char* result = (char*)malloc(8);
+    sprintf(result, "%s",VERSION);
+    return result;
+}

data/ext/markdown_lib.h

@@ -1,14 +1,18 @@
+#ifndef MARKDOWN_LIB_H
+#define MARKDOWN_LIB_H
+
 #include <stdlib.h>
 #include <stdio.h>
-#include <glib.h>
+#include "glib.h"
 
 enum markdown_extensions {
-    EXT_SMART            = 0x01,
-    EXT_NOTES            = 0x02,
-    EXT_FILTER_HTML      = 0x04,
-    EXT_FILTER_STYLES    = 0x08,
-    EXT_COMPATIBILITY    = 0x10,
-    EXT_PROCESS_HTML     = 0x20,
+    EXT_SMART            = 1 << 0,
+    EXT_NOTES            = 1 << 1,
+    EXT_FILTER_HTML      = 1 << 2,
+    EXT_FILTER_STYLES    = 1 << 3,
+    EXT_COMPATIBILITY    = 1 << 4,
+    EXT_PROCESS_HTML     = 1 << 5,
+	EXT_NO_LABELS		 = 1 << 6,
 };
 
 enum markdown_formats {
@@ -19,10 +23,16 @@ enum markdown_formats {
     OPML_FORMAT,
     GROFF_MM_FORMAT,
     ODF_FORMAT,
-    ODF_BODY_FORMAT
+    ODF_BODY_FORMAT,
+	ORIGINAL_FORMAT
 };
 
 GString * markdown_to_g_string(char *text, int extensions, int output_format);
 char * markdown_to_string(char *text, int extensions, int output_format);
+char * extract_metadata_value(char *text, int extensions, char *key);
+gboolean has_metadata(char *text, int extensions);
+char * mmd_version();
 
 /* vim: set ts=4 sw=4 : */
+#endif
+

data/ext/markdown_output.c

@@ -4,7 +4,7 @@
                       markdown_peg.
   (c) 2008 John MacFarlane (jgm at berkeley dot edu).
   
-  portions Copyright (c) 2010-2011 Fletcher T. Penney
+  portions Copyright (c) 2010-2013 Fletcher T. Penney
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License or the MIT
@@ -22,10 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <glib.h>
+#include "glib.h"
 #include "markdown_peg.h"
-#include "utility_functions.c"
-#include "odf.c"
+#include "odf.h"
+
+#include "utility_functions.h"
 
 static int extensions;
 static int base_header_level = 1;
@@ -36,8 +37,10 @@ static char cell_type = 'd';
 static int language = ENGLISH;
 static bool html_footer = FALSE;
 static int odf_type = 0;
-static bool in_list = FALSE;
 static bool no_latex_footnote = FALSE;
+static bool am_printing_html_footnote = FALSE;
+static int footnote_counter_to_print = 0;
+static int odf_list_needs_end_p = 0;
 
 static void print_html_string(GString *out, char *str, bool obfuscate);
 static void print_html_element_list(GString *out, element *list, bool obfuscate);
@@ -85,6 +88,7 @@ char * metavalue_for_key(char *key, element *list);
 element * element_for_attribute(char *querystring, element *list);
 char * dimension_for_attribute(char *querystring, element *list);
 
+element * locator_for_citation(element *elt);
 
 /**********************************************************************
 
@@ -107,7 +111,7 @@ static void pad(GString *out, int num) {
 }
 
 /* determine whether a certain element is contained within a given list */
-bool list_contains_key(element *list, int key) {
+static bool list_contains_key(element *list, int key) {
     element *step = NULL;
 
     step = list;
@@ -149,7 +153,7 @@ static void print_html_string(GString *out, char *str, bool obfuscate) {
             g_string_append_printf(out, "&quot;");
             break;
         default:
-            if (obfuscate) {
+	  if (obfuscate && ((int) *str < 128) && ((int) *str >= 0)){
                 if (rand() % 2 == 0)
                     g_string_append_printf(out, "&#%d;", (int) *str);
                 else
@@ -184,6 +188,7 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
     int lev;
     char *label;
     element *attribute;
+    element *locator = NULL;
     char *height;
     char *width;
     switch (elt->key) {
@@ -252,10 +257,13 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         print_html_string(out, elt->contents.link->url, obfuscate);
         g_string_append_printf(out, "\" alt=\"");
         print_raw_element_list(out,elt->contents.link->label);
-        if ( extension(EXT_COMPATIBILITY) ) {
+        if ( (extension(EXT_COMPATIBILITY)) || 
+            (strcmp(elt->contents.link->identifier, "") == 0) ) {
             g_string_append_printf(out, "\"");
         } else {
-            g_string_append_printf(out, "\" id=\"%s\"",elt->contents.link->identifier);
+            if (!(extension(EXT_COMPATIBILITY))) {
+                g_string_append_printf(out, "\" id=\"%s\"",elt->contents.link->identifier);
+            }
         }
         if (strlen(elt->contents.link->title) > 0) {
             g_string_append_printf(out, " title=\"");
@@ -315,15 +323,20 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         if (lev > 6)
             lev = 6;
         pad(out, 2);
-        if ( extension(EXT_COMPATIBILITY) ) {
+        if ( extension(EXT_COMPATIBILITY)) {
             /* Use regular Markdown header format */
             g_string_append_printf(out, "<h%1d>", lev);
             print_html_element_list(out, elt->children, obfuscate);
         } else if (elt->children->key == AUTOLABEL) {
-            /* generate a label for each header (MMD)*/
+            /* use label for header since one was specified (MMD)*/
             g_string_append_printf(out, "<h%d id=\"%s\">", lev,elt->children->contents.str);
             print_html_element_list(out, elt->children->next, obfuscate);
+        } else if ( extension(EXT_NO_LABELS)) {
+            /* Don't generate a label */
+            g_string_append_printf(out, "<h%1d>", lev);
+            print_html_element_list(out, elt->children, obfuscate);
         } else {
+            /* generate a label by default for MMD */
             label = label_from_element_list(elt->children, obfuscate);
             g_string_append_printf(out, "<h%d id=\"%s\">", lev, label);
             print_html_element_list(out, elt->children, obfuscate);
@@ -341,6 +354,12 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         pad(out, 2);
         g_string_append_printf(out, "<p>");
         print_html_element_list(out, elt->children, obfuscate);
+        if (am_printing_html_footnote && ( elt->next == NULL)) {
+            g_string_append_printf(out, " <a href=\"#fnref:%d\" title=\"return to article\" class=\"reversefootnote\">&#160;&#8617;</a>", footnote_counter_to_print);
+            /* Only print once. For now, it's the first paragraph, until
+                I can figure out to make it the last paragraph */
+            am_printing_html_footnote = FALSE;
+        }
         g_string_append_printf(out, "</p>");
         padded = 0;
         break;
@@ -406,7 +425,7 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         /* if contents.str == 0, then print note; else ignore, since this
          * is a note block that has been incorporated into the notes list */
         if (elt->contents.str == 0) {
-            if ( (elt->children->contents.str == 0) ){
+            if (elt->children->contents.str == 0) {
                 /* The referenced note has not been used before */
                 add_endnote(elt->children);
                 ++notenumber;
@@ -447,62 +466,63 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         break;
     case NOCITATION:
     case CITATION:
-        if ((elt->children != NULL) && (elt->children->key == LOCATOR)) {
-            GString *temp = g_string_new("");
-            print_html_element(temp,elt->children,obfuscate);
-            label = strdup(temp->str);
-            g_string_free(temp,true);
-            elt->children = elt->children->next;
-        } else {
-            label = NULL;
-        }
+        /* Get locator, if present */
+        locator = locator_for_citation(elt);
+
         if (strncmp(elt->contents.str,"[#",2) == 0) {
             /* reference specified externally */
             if ( elt->key == NOCITATION ) {
+                /* work not cited, but used in bibliography for LaTeX */
                 g_string_append_printf(out, "<span class=\"notcited\" id=\"%s\"/>", elt->contents.str);
             } else {
+                /* work was cited, so output normally */
                 g_string_append_printf(out, "<span class=\"externalcitation\">");
-                if (label != NULL) g_string_append_printf(out, "[%s]", label);
+                if (locator != NULL) {
+                    g_string_append_printf(out, "[");
+                    print_html_element(out,locator,obfuscate);
+                    g_string_append_printf(out, "]");
+                }
                 g_string_append_printf(out, "%s",elt->contents.str);
                 g_string_append_printf(out, "</span>");
             }
         } else {
-            /* reference specified within the MMD document */
+            /* reference specified within the MMD document,
+               so will output as footnote */
             if (elt->children->contents.str == NULL) {
+                /* Work not previously cited in this document,
+                   so create "endnote" */
                 elt->children->key = CITATION;
                 add_endnote(elt->children);
                 ++notenumber;
                 char buf[5];
                 sprintf(buf,"%d",notenumber);
-                
+                /* Store the number for future reference */
                 elt->children->contents.str = strdup(buf);
             }
-            if (label != NULL) {
+            if (locator != NULL) {
                 if ( elt->key == NOCITATION ) {
                     g_string_append_printf(out, "<span class=\"notcited\" id=\"%s\">",
                         elt->children->contents.str);
                 } else {
-                    g_string_append_printf(out, "<a class=\"citation\" href=\"#fn:%s\" title=\"Jump to citation\">[<span class=\"locator\">%s</span>, %s]",
-                        elt->children->contents.str, label, elt->children->contents.str);
+                    g_string_append_printf(out, "<a class=\"citation\" href=\"#fn:%s\" title=\"Jump to citation\">[<span class=\"locator\">", elt->children->contents.str);
+                    print_html_element(out,locator,obfuscate);
+                    g_string_append_printf(out,"</span>, %s]",
+                        elt->children->contents.str);
                 }
-                elt->children = NULL;               
             } else {
                 g_string_append_printf(out, "<a class=\"citation\" href=\"#fn:%s\" title=\"Jump to citation\">[%s]",
                     elt->children->contents.str, elt->children->contents.str);
-                elt->children = NULL;
             }
+            /* Now prune children since will likely be shared elsewhere */
+            elt->children = NULL;
+
             g_string_append_printf(out, "<span class=\"citekey\" style=\"display:none\">%s</span>", elt->contents.str);
-            if (label != NULL) {
-                if ( elt->key == NOCITATION ) {
+            if ((locator != NULL) && (elt->key == NOCITATION)) {
                     g_string_append_printf(out,"</span>");
-                } else {
-                    g_string_append_printf(out,"</a>");
-                }
             } else {
                 g_string_append_printf(out,"</a>");
             }
         }
-        free(label);
         break;
     case LOCATOR:
         print_html_element_list(out, elt->children, obfuscate);
@@ -518,7 +538,7 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
     case TERM:
         pad(out,1);
         g_string_append_printf(out, "<dt>");
-        print_html_string(out, elt->contents.str, obfuscate);
+        print_html_element_list(out, elt->children, obfuscate);
         g_string_append_printf(out, "</dt>\n");
         padded = 1;
         break;
@@ -611,8 +631,14 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
         for (table_column=0;table_column<strlen(table_alignment);table_column++) {
            if ( strncmp(&table_alignment[table_column],"r",1) == 0) {
                 g_string_append_printf(out, "<col style=\"text-align:right;\"/>\n");
+            } else if ( strncmp(&table_alignment[table_column],"R",1) == 0) {
+                g_string_append_printf(out, "<col style=\"text-align:right;\" class=\"extended\"/>\n");
             } else if ( strncmp(&table_alignment[table_column],"c",1) == 0) {
                 g_string_append_printf(out, "<col style=\"text-align:center;\"/>\n");
+            } else if ( strncmp(&table_alignment[table_column],"C",1) == 0) {
+                g_string_append_printf(out, "<col style=\"text-align:center;\" class=\"extended\"/>\n");
+            } else if ( strncmp(&table_alignment[table_column],"L",1) == 0) {
+                g_string_append_printf(out, "<col style=\"text-align:left;\" class=\"extended\"/>\n");
             } else {
                 g_string_append_printf(out, "<col style=\"text-align:left;\"/>\n");
             }
@@ -638,8 +664,12 @@ static void print_html_element(GString *out, element *elt, bool obfuscate) {
     case TABLECELL:
         if ( strncmp(&table_alignment[table_column],"r",1) == 0) {
             g_string_append_printf(out, "\t<t%c style=\"text-align:right;\"", cell_type);
+        } else if ( strncmp(&table_alignment[table_column],"R",1) == 0) {
+            g_string_append_printf(out, "\t<t%c style=\"text-align:right;\"", cell_type);
         } else if ( strncmp(&table_alignment[table_column],"c",1) == 0) {
             g_string_append_printf(out, "\t<t%c style=\"text-align:center;\"", cell_type);
+        } else if ( strncmp(&table_alignment[table_column],"C",1) == 0) {
+            g_string_append_printf(out, "\t<t%c style=\"text-align:center;\"", cell_type);
         } else {
             g_string_append_printf(out, "\t<t%c style=\"text-align:left;\"", cell_type);
         }
@@ -705,8 +735,11 @@ static void print_html_endnotes(GString *out) {
         } else {
             g_string_append_printf(out, "<li id=\"fn:%d\">\n", counter);
             padded = 2;
+            am_printing_html_footnote = TRUE;
+            footnote_counter_to_print = counter;
             print_html_element_list(out, note_elt, false);
-            g_string_append_printf(out, " <a href=\"#fnref:%d\" title=\"return to article\" class=\"reversefootnote\">&#160;&#8617;</a>", counter);
+            am_printing_html_footnote = FALSE;
+            footnote_counter_to_print = 0;
             pad(out, 1);
             g_string_append_printf(out, "</li>");
         }
@@ -737,7 +770,7 @@ static void print_latex_string(GString *out, char *str) {
             g_string_append_printf(out, "\\^{}");
             break;
         case '\\':
-            g_string_append_printf(out, "$\\backslash$");
+            g_string_append_printf(out, "\\textbackslash{}");
             break;
         case '~':
             g_string_append_printf(out, "\\ensuremath{\\sim}");
@@ -818,6 +851,8 @@ static void print_latex_element(GString *out, element *elt) {
     char *label;
     char *height;
     char *width;
+    char *upper;
+    int i;
     double floatnum;
     switch (elt->key) {
     case SPACE:
@@ -871,9 +906,9 @@ static void print_latex_element(GString *out, element *elt) {
             label = label_from_string(elt->contents.link->url,0);
             if (elt->contents.link->label != NULL) {
                     print_latex_element_list(out, elt->contents.link->label);
-                g_string_append_printf(out, " (\\autoref\{%s})", label);             
+                g_string_append_printf(out, " (\\autoref{%s})", label);             
             } else {
-                g_string_append_printf(out, "\\autoref\{%s}", label);
+                g_string_append_printf(out, "\\autoref{%s}", label);
             }
             free(label);
         } else if ( (elt->contents.link->label != NULL) &&
@@ -1188,7 +1223,7 @@ static void print_latex_element(GString *out, element *elt) {
                     }
                 }
             }
-            if (elt->children->contents.str == NULL) {
+            if ((elt->children != NULL) && (elt->children->contents.str == NULL)) {
                 elt->children->contents.str = strdup(elt->contents.str);
                 add_endnote(elt->children);
             }
@@ -1208,7 +1243,9 @@ static void print_latex_element(GString *out, element *elt) {
         break;
     case TERM:
         pad(out,2);
-        g_string_append_printf(out, "\\item[%s]", elt->contents.str);
+        g_string_append_printf(out, "\\item[");
+        print_latex_element_list(out, elt->children);
+        g_string_append_printf(out, "]");
         padded = 0;
         break;
     case DEFINITION:
@@ -1220,6 +1257,7 @@ static void print_latex_element(GString *out, element *elt) {
     case METADATA:
         /* Metadata is present, so this should be a "complete" document */
         print_latex_header(out, elt);
+        html_footer = is_html_complete_doc(elt);
         break;
     case METAKEY:
         if (strcmp(elt->contents.str, "title") == 0) {
@@ -1281,11 +1319,17 @@ static void print_latex_element(GString *out, element *elt) {
         pad(out, 2);
         g_string_append_printf(out, "\\begin{table}[htbp]\n\\begin{minipage}{\\linewidth}\n\\setlength{\\tymax}{0.5\\linewidth}\n\\centering\n\\small\n");
         print_latex_element_list(out, elt->children);
-        g_string_append_printf(out, "\n\\end{tabular}\n\\end{minipage}\n\\end{table}\n");
+        g_string_append_printf(out, "\n\\end{tabulary}\n\\end{minipage}\n\\end{table}\n");
         padded = 0;
         break;
     case TABLESEPARATOR:
-        g_string_append_printf(out, "\\begin{tabular}{@{}%s@{}} \\toprule\n", elt->contents.str);
+        upper = strdup(elt->contents.str);
+
+        for(i = 0; upper[ i ]; i++)
+            upper[i] = toupper(upper[ i ]);
+    
+        g_string_append_printf(out, "\\begin{tabulary}{\\textwidth}{@{}%s@{}} \\toprule\n", upper);
+        free(upper);
         break;
     case TABLECAPTION:
         if (elt->children->key == TABLELABEL) {
@@ -1675,7 +1719,7 @@ static void print_odf_string(GString *out, char *str) {
 }
 
 /* print_odf_element_list - print an element list as ODF */
-void print_odf_element_list(GString *out, element *list) {
+static void print_odf_element_list(GString *out, element *list) {
     while (list != NULL) {
         print_odf_element(out, list);
         list = list->next;
@@ -1683,11 +1727,12 @@ void print_odf_element_list(GString *out, element *list) {
 }
 
 /* print_odf_element - print an element as ODF */
-void print_odf_element(GString *out, element *elt) {
+static void print_odf_element(GString *out, element *elt) {
     int lev;
     char *label;
     char *height;
     char *width;
+    /* element *locator = NULL; */
     int old_type = 0;
     switch (elt->key) {
     case SPACE:
@@ -1727,6 +1772,13 @@ void print_odf_element(GString *out, element *elt) {
         g_string_append_printf(out, "</text:span>");
         break;
     case HTML:
+        /* don't print HTML */
+        /* but do print HTML comments for raw ODF */
+        if (strncmp(elt->contents.str,"<!--",4) == 0) {
+            /* trim "-->" from end */
+            elt->contents.str[strlen(elt->contents.str)-3] = '\0';
+            g_string_append_printf(out, "%s", &elt->contents.str[4]);
+        }
         break;
     case LINK:
         if (elt->contents.link->url[0] == '#') {
@@ -1863,7 +1915,7 @@ void print_odf_element(GString *out, element *elt) {
         if (strncmp(elt->contents.str,"<!--",4) == 0) {
             /* trim "-->" from end */
             elt->contents.str[strlen(elt->contents.str)-3] = '\0';
-            g_string_append_printf(out, "%s", &elt->contents.str[4]);
+            g_string_append_printf(out, "<text:p text:style-name=\"Standard\">%s</text:p>", &elt->contents.str[4]);
         }
         break;
     case VERBATIM:
@@ -1883,6 +1935,10 @@ void print_odf_element(GString *out, element *elt) {
         }
         old_type = odf_type;
         odf_type = BULLETLIST;
+        if (odf_list_needs_end_p) {
+            g_string_append_printf(out, "%s", "</text:p>");
+            odf_list_needs_end_p = 0;
+        }
         g_string_append_printf(out, "%s", "<text:list>");
         print_odf_element_list(out, elt->children);
         g_string_append_printf(out, "%s", "</text:list>");
@@ -1895,6 +1951,10 @@ void print_odf_element(GString *out, element *elt) {
         }
         old_type = odf_type;
         odf_type = ORDEREDLIST;
+        if (odf_list_needs_end_p) {
+            g_string_append_printf(out, "%s", "</text:p>");
+            odf_list_needs_end_p = 0;
+        }
         g_string_append_printf(out, "%s", "<text:list>\n");
         print_odf_element_list(out, elt->children);
         g_string_append_printf(out, "%s", "</text:list>\n");
@@ -1904,10 +1964,12 @@ void print_odf_element(GString *out, element *elt) {
         g_string_append_printf(out, "<text:list-item>\n");
         if (elt->children->children->key != PARA) {
             g_string_append_printf(out, "<text:p text:style-name=\"P2\">");
+            odf_list_needs_end_p = 1;
         }
         print_odf_element_list(out, elt->children);
 
-        if ((list_contains_key(elt->children,BULLETLIST) ||
+       odf_list_needs_end_p = 0;
+       if ((list_contains_key(elt->children,BULLETLIST) ||
             (list_contains_key(elt->children,ORDEREDLIST)))) {
             } else {
                 if (elt->children->children->key != PARA) {
@@ -1956,20 +2018,49 @@ void print_odf_element(GString *out, element *elt) {
         break;
     case NOCITATION:
     case CITATION:
+        /* Get locator, if present */
+        /* locator = locator_for_citation(elt); */
+
         if (strncmp(elt->contents.str,"[#",2) == 0) {
-            /* bibtex citation key */
+            /* reference specified externally, so just display it */
             g_string_append_printf(out, "%s", elt->contents.str);
         } else {
-            g_string_append_printf(out, "[#%s]", elt->contents.str);
+            /* reference specified within the MMD document,
+               so will output as footnote */
+            if (elt->children->contents.str == NULL) {
+                /* First use of this citation */
+                ++notenumber;
+                char buf[5];
+                sprintf(buf, "%d",notenumber);
+                /* Store the number for future reference */
+                elt->children->contents.str = strdup(buf);
+                
+                /* Insert the footnote here */
+                old_type = odf_type;
+                odf_type = NOTE;
+                g_string_append_printf(out, "<text:note text:id=\"cite%s\" text:note-class=\"footnote\"><text:note-body>\n", buf);
+                print_odf_element_list(out, elt->children);
+                g_string_append_printf(out, "</text:note-body>\n</text:note>\n");
+                odf_type = old_type;
+
+                elt->children->key = CITATION;
+            } else {
+                /* Additional reference to prior citation,
+                   and therefore must link to another footnote */
+                g_string_append_printf(out, "<text:span text:style-name=\"Footnote_20_anchor\"><text:note-ref text:note-class=\"footnote\" text:reference-format=\"text\" text:ref-name=\"cite%s\">%s</text:note-ref></text:span>", elt->children->contents.str, elt->children->contents.str);
+            }
+            elt->children = NULL;
         }
-        elt->children = NULL;
+        break;
+    case LOCATOR:
+        print_odf_element_list(out, elt->children);
         break;
     case DEFLIST:
         print_odf_element_list(out, elt->children);
         break;
     case TERM:
         g_string_append_printf(out, "<text:p><text:span text:style-name=\"MMD-Bold\">");
-        print_odf_string(out, elt->contents.str);
+        print_odf_element_list(out, elt->children);
         g_string_append_printf(out, "</text:span></text:p>");
         break;
     case DEFINITION:
@@ -2086,8 +2177,12 @@ void print_odf_element(GString *out, element *elt) {
         } else {
             if ( strncmp(&table_alignment[table_column],"r",1) == 0) {
                 g_string_append_printf(out, " text:style-name=\"MMD-Table-Right\"");
+            } else if ( strncmp(&table_alignment[table_column],"R",1) == 0) {
+                g_string_append_printf(out, " text:style-name=\"MMD-Table-Right\"");
             } else if ( strncmp(&table_alignment[table_column],"c",1) == 0) {
                 g_string_append_printf(out, " text:style-name=\"MMD-Table-Center\"");
+            } else if ( strncmp(&table_alignment[table_column],"C",1) == 0) {
+                g_string_append_printf(out, " text:style-name=\"MMD-Table-Center\"");
             } else {
                 g_string_append_printf(out, " text:style-name=\"MMD-Table\"");
 }
@@ -2129,6 +2224,9 @@ void print_element_list(GString *out, element *elt, int format, int exts) {
     language = ENGLISH;
     html_footer = FALSE;
     no_latex_footnote = FALSE;
+    footnote_counter_to_print = 0;
+    odf_list_needs_end_p = 0;
+    element *title;
 
     extensions = exts;
     padded = 2;  /* set padding to 2, so no extra blank lines at beginning */
@@ -2154,6 +2252,14 @@ void print_element_list(GString *out, element *elt, int format, int exts) {
         break;
     case OPML_FORMAT:
         g_string_append_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<opml version=\"1.0\">\n");
+       if (list_contains_key(elt,METAKEY)) {
+            title = metadata_for_key("title",elt);
+            if (title != NULL) {
+                g_string_append_printf(out,"<head><title>");
+                print_raw_element(out,title->children);
+                g_string_append_printf(out,"</title></head>");
+            }
+        }
         g_string_append_printf(out, "<body>\n");
         print_opml_element_list(out, elt);
         if (html_footer == TRUE) print_opml_metadata(out, elt);
@@ -2192,15 +2298,15 @@ void print_element_list(GString *out, element *elt, int format, int exts) {
 
 void print_html_header(GString *out, element *elt, bool obfuscate) {
     g_string_append_printf(out,
-"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n<!DOCTYPE html>\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n");
+"<!DOCTYPE html>\n<html>\n<head>\n\t<meta charset=\"utf-8\"/>\n");
 
     print_html_element_list(out, elt->children, obfuscate);
-    g_string_append_printf(out, "</head>\n<body>\n");    
+    g_string_append_printf(out, "</head>\n<body>\n\n");    
 }
 
 
 void print_html_footer(GString *out, bool obfuscate) {
-    g_string_append_printf(out, "\n</body>\n</html>");
+    g_string_append_printf(out, "\n\n</body>\n</html>");
 }
 
 
@@ -2214,7 +2320,9 @@ void print_latex_footer(GString *out) {
         pad(out,2);
         g_string_append_printf(out, "\\input{%s}\n", latex_footer);
     }
-	g_string_append_printf(out, "\n\\end{document}");
+    if (html_footer) {
+        g_string_append_printf(out, "\n\\end{document}");
+    }
 }
 
 
@@ -2229,8 +2337,6 @@ void print_memoir_element_list(GString *out, element *list) {
 
 /* print_memoir_element - print an element as LaTeX for memoir class */
 static void print_memoir_element(GString *out, element *elt) {
-    int lev;
-    char *label;
     switch (elt->key) {
     case VERBATIM:
         pad(out, 1);
@@ -2556,6 +2662,20 @@ static bool is_html_complete_doc(element *meta) {
     return FALSE;
 }
 
+/* if citation has a locator, return as element and "prune", else NULL */
+element * locator_for_citation(element *elt) {
+    element *result;
+    
+    if ((elt->children != NULL) && (elt->children->key == LOCATOR)) {
+        /* Locator is present */
+        result = elt->children;
+        elt->children = elt->children->next;
+        return result;
+    } else {
+        /* no locator exists */
+        return NULL;
+    }
+}
 
 /* print_opml_element_list - print an element list as OPML */
 void print_opml_element_list(GString *out, element *list) {
@@ -2702,3 +2822,12 @@ void print_odf_body_element_list(GString *out, element *list) {
         list = list->next;
     }
 }
+
+/* bogus function just references a couple globals defined in utility_functions.c but not used in this source file */
+static void bogus_function()
+{
+	static char* bogus;
+	bogus = charbuf;
+	static element* bogus2;
+	bogus2 = parse_result;
+}