rmultimarkdown 4.5.3.2 → 4.6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d175433e6b773f208302634ae4a98fd19843a33a
-  data.tar.gz: 6196eef19a7bb5802a4a60b757557d83983cf6a8
+  metadata.gz: d09abf7122bde215cae33570b460aa1d63874cfc
+  data.tar.gz: a9cf6ae5f6f8738f471266cd9594285dc32c32a8
 SHA512:
-  metadata.gz: 94a12726d7a0e62191317902b33ae7076e1157c10176a3cba4e838c384ff00ee40e069d069dd505bd98f630a1b2474565c4ad3017816f4c90a461958146bdbf0
-  data.tar.gz: 18d9054243c74d3dafa979e77539cb587b9dddd554fe734d8d23fa578ba870be7ebe6940f79657163613cdeb5d724916a06fdda5cff7badba99e613249bc2410
+  metadata.gz: feba15b48f3fe5ba7340d3c2037b48ebb44d8f1ba82a125216018e646081cf4ce5dd2d67c23c2acc00d8bf3f4854cb2335ea9f885f63d4368221aa9f550dd192
+  data.tar.gz: 0f47cae9ff4087bd5ca8c1780a8aafcdc0b378e71387e580fa892708633f743cc571c66bea40444a447af172604e1495c6b632791a6c4cb9aa7b657dcbaabf1c

data/MultiMarkdown-4/beamer.c

@@ -124,6 +124,8 @@ void print_beamer_node(GString *out, node *n, scratch_pad *scratch) {
 /* print_beamer_endnotes */
 void print_beamer_endnotes(GString *out, scratch_pad *scratch) {
 	scratch->used_notes = reverse_list(scratch->used_notes);
+	scratch->printing_notes = 1;
+	
 	node *note = scratch->used_notes;
 #ifdef DEBUG_ON
 	fprintf(stderr, "start endnotes\n");

data/MultiMarkdown-4/html.c

@@ -68,8 +68,34 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			print_html_node_tree(out,n->children,scratch);
 			break;
 		case STR:
+			/* fprintf(stderr, "str: '%s'\n", n->str); */
 			print_html_string(out,n->str, scratch);
 			break;
+		case ABBR:
+			if (strlen(n->children->str) == 0) {
+				g_string_append_printf(out, "<abbr>");
+			} else {
+				g_string_append_printf(out, "<abbr title=\"");
+				print_html_string(out, n->children->str, scratch);
+				g_string_append_printf(out, "\">");
+			}
+			print_html_string(out,n->str, scratch);
+			g_string_append_printf(out, "</abbr>");
+			break;
+		case ABBRSTART:
+			if (strlen(n->children->str) == 0) {
+				g_string_append_printf(out, "<abbr>");
+			} else {
+				g_string_append_printf(out, "<abbr title=\"");
+				print_html_string(out, n->children->str, scratch);
+				g_string_append_printf(out, "\">");
+			}
+			print_html_string(out,n->str, scratch);
+			break;
+		case ABBRSTOP:
+			print_html_string(out,n->str, scratch);
+			g_string_append_printf(out, "</abbr>");
+			break;		
 		case SPACE:
 			g_string_append_printf(out,"%s",n->str);
 			break;
@@ -110,6 +136,7 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			scratch->padded = 0;
 			break;
 		case VERBATIM:
+		case VERBATIMFENCE:
 			pad(out, 2, scratch);
 			if ((n->children != NULL) && (n->children->key == VERBATIMTYPE)) {
 				trim_trailing_whitespace(n->children->str);
@@ -217,6 +244,7 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 				trim_trailing_whitespace(n->children->str);
 				print_raw_node(out, n->children);
 				g_string_append_printf(out, "\n");
+			} else if (strcmp(n->str, "mmdfooter") == 0) {
 			} else {
 				g_string_append_printf(out,"\t<meta name=\"%s\" content=\"",n->str);
 				print_html_node(out,n->children,scratch);
@@ -287,21 +315,23 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			g_string_append_printf(out, "<br/>\n");
 			break;
 		case MATHSPAN:
-			if (n->str[0] == '$') {
-				n->str[strlen(n->str)-1] = '\0';
-				if (n->str[1] == '$') {
-					n->str[strlen(n->str)-1] = '\0';
-					g_string_append_printf(out, "<span class=\"math\">\\[%s\\]</span>",&n->str[2]);
+			temp = strdup(n->str);
+			if (temp[0] == '$') {
+				temp[strlen(temp)-1] = '\0';
+				if (temp[1] == '$') {
+					temp[strlen(temp)-1] = '\0';
+					g_string_append_printf(out, "<span class=\"math\">\\[%s\\]</span>",&temp[2]);
 				} else {
-					g_string_append_printf(out, "<span class=\"math\">\\(%s\\)</span>",&n->str[1]);
+					g_string_append_printf(out, "<span class=\"math\">\\(%s\\)</span>",&temp[1]);
 				}
-			} else if (n->str[strlen(n->str) - 1] == ']') {
-				n->str[strlen(n->str) - 3] = '\0';
-				g_string_append_printf(out, "<span class=\"math\">%s\\]</span>",n->str);
+			} else if (temp[strlen(temp) - 1] == ']') {
+				temp[strlen(temp) - 3] = '\0';
+				g_string_append_printf(out, "<span class=\"math\">%s\\]</span>",temp);
 			} else {
-				n->str[strlen(n->str) - 3] = '\0';
-				g_string_append_printf(out, "<span class=\"math\">%s\\)</span>",n->str);
+				temp[strlen(temp) - 3] = '\0';
+				g_string_append_printf(out, "<span class=\"math\">%s\\)</span>",temp);
 			}
+			free(temp);
 			break;
 		case STRONG:
 			g_string_append_printf(out, "<strong>");
@@ -410,6 +440,12 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 #ifdef DEBUG_ON
 	fprintf(stderr, "print image\n");
 #endif
+            /* Verify all is well */
+            if (n->link_data == NULL) {
+                fprintf(stderr, "Invalid IMAGEBLOCK or IMAGE -- (null) link_data\n");
+                exit(EXIT_FAILURE);
+            }
+                
 			/* Stash a copy of the link data */
 			if (n->link_data != NULL)
 				temp_link_data = mk_link_data(n->link_data->label, n->link_data->source, n->link_data->title, n->link_data->attr);
@@ -510,10 +546,15 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			}
 			g_string_append_printf(out, " />");
 			if (n->key == IMAGEBLOCK) {
-				if ((n->children != NULL) && (n->children->children != NULL) && (n->children->children->str != NULL)) {
-					g_string_append_printf(out, "\n<figcaption>");
-					print_html_node(out,n->children,scratch);
-					g_string_append_printf(out, "</figcaption>");
+				if (n->children != NULL) {
+					temp_str = g_string_new("");
+					print_html_node(temp_str,n->children,scratch);
+					if (temp_str->currentStringLength > 0) {
+						g_string_append_printf(out, "\n<figcaption>");
+						g_string_append(out, temp_str->str);
+						g_string_append_printf(out, "</figcaption>");
+					}
+					g_string_free(temp_str, true);
 				}
 				g_string_append_printf(out,"\n</figure>");
 				scratch->padded = 0;
@@ -715,6 +756,7 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			g_string_append_printf(out, "</table>\n");
 			scratch->cell_type = 0;
 			scratch->padded = 1;
+			scratch->table_alignment = NULL;
 			break;
 		case TABLESEPARATOR:
 			scratch->table_alignment = n->str;
@@ -801,6 +843,7 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 			fprintf(stderr,"SOURCEBRANCH\n");
 			break;
 		case NOTELABEL:
+		case GLOSSARYLABEL:
 			break;
 		case SUPERSCRIPT:
 			g_string_append_printf(out, "<sup>%s</sup>",n->str);
@@ -808,6 +851,7 @@ void print_html_node(GString *out, node *n, scratch_pad *scratch) {
 		case SUBSCRIPT:
 			g_string_append_printf(out, "<sub>%s</sub>",n->str);
 			break;
+		case ABBREVIATION:
 		case KEY_COUNTER:
 			break;
 		default:

data/MultiMarkdown-4/latex.c

@@ -96,6 +96,42 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 		case STR:
 			print_latex_string(out,n->str, scratch);
 			break;
+		case ABBREVIATION:
+			/* We combine the short and full names, since stripping non-ascii characters may result
+				in a conflict otherwise.  This at least makes it less likely. */
+			width = ascii_label_from_node(n->children);
+			temp = ascii_label_from_string(n->str);
+			g_string_append_printf(out, "\\newacro{%s%s}[",width,temp);
+			print_latex_node_tree(out, n->children, scratch);
+			g_string_append_printf(out, "]{");
+			trim_trailing_whitespace(n->str);
+			print_latex_string(out, n->str, scratch);
+			g_string_append_printf(out, "}\n");
+			free(temp);
+			free(width);
+			break;
+		case ABBRSTART:
+			/* Strip out nodes that are being replaced with the abbreviation */
+			temp_node = n->next;
+			while (temp_node->key != ABBRSTOP) {
+				n->next = temp_node->next;
+				temp_node->next = NULL;
+				free_node(temp_node);
+				temp_node = n->next;
+			}
+			n->next = temp_node->next;
+			temp_node->next = NULL;
+			free_node(temp_node);
+		case ABBR:
+			/* In either case, now we call on the abbreviation */
+			width = ascii_label_from_node(n->children->children);
+			temp = ascii_label_from_string(n->children->str);
+			g_string_append_printf(out, "\\ac{%s%s}", width, temp);
+			free(temp);
+			free(width);
+			break;
+		case ABBRSTOP:
+			break;		
 		case SPACE:
 			g_string_append_printf(out,"%s",n->str);
 			break;
@@ -126,6 +162,7 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			}
 			break;
 		case VERBATIM:
+		case VERBATIMFENCE:
 			pad(out, 2, scratch);
 			if ((n->children != NULL) && (n->children->key == VERBATIMTYPE)) {
 				trim_trailing_whitespace(n->children->str);
@@ -170,6 +207,8 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			if (!(scratch->extensions & EXT_SNIPPET) && (is_latex_complete_doc(n))) {
 				scratch->extensions = scratch->extensions | EXT_COMPLETE;
 			}
+			/* print acronym definitions */
+			print_latex_node_tree(out, scratch->abbreviations, scratch);
 			break;
 		case METAKEY:
 			/* reformat the key */
@@ -221,6 +260,7 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			} else if (strcmp(n->str, "css") == 0) {
 			} else if (strcmp(n->str, "xhtmlheader") == 0) {
 			} else if (strcmp(n->str, "htmlheader") == 0) {
+			} else if (strcmp(n->str, "mmdfooter") == 0) {
 			} else if (strcmp(n->str, "latexinput") == 0) {
 				trim_trailing_whitespace(n->children->str);
 				g_string_append_printf(out, "\\input{%s}\n", n->children->str);
@@ -327,35 +367,37 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			g_string_append_printf(out, "\\\\\n");
 			break;
 		case MATHSPAN:
-			if (n->str[0] == '$') {
-				if (n->str[1] == '$') {
-					if (strncmp(&n->str[2],"\\begin",5) == 0) {
-						n->str[strlen(n->str)-2] = '\0';
-						g_string_append_printf(out, "%s",&n->str[1]);
+			temp = strdup(n->str);
+			if (temp[0] == '$') {
+				if (temp[1] == '$') {
+					if (strncmp(&temp[2],"\\begin",5) == 0) {
+						temp[strlen(temp)-2] = '\0';
+						g_string_append_printf(out, "%s",&temp[1]);
 					} else {
-						g_string_append_printf(out, "%s",n->str);
+						g_string_append_printf(out, "%s",temp);
 					}
 				} else {
-					if (strncmp(&n->str[1],"\\begin",5) == 0) {
-						n->str[strlen(n->str)-1] = '\0';
-						g_string_append_printf(out, "%s",&n->str[1]);
+					if (strncmp(&temp[1],"\\begin",5) == 0) {
+						temp[strlen(temp)-1] = '\0';
+						g_string_append_printf(out, "%s",&temp[1]);
 					} else {
-						g_string_append_printf(out, "%s",n->str);
+						g_string_append_printf(out, "%s",temp);
 					}
 				}
-			} else if (strncmp(&n->str[2],"\\begin",5) == 0) {
+			} else if (strncmp(&temp[2],"\\begin",5) == 0) {
 				/* trim */
-				n->str[strlen(n->str)-3] = '\0';
-				g_string_append_printf(out, "%s", &n->str[2]);
+				temp[strlen(temp)-3] = '\0';
+				g_string_append_printf(out, "%s", &temp[2]);
 			} else {
-				if (n->str[strlen(n->str)-1] == ']') {
-					n->str[strlen(n->str)-3] = '\0';
-					g_string_append_printf(out, "%s\\]", n->str);
+				if (temp[strlen(temp)-1] == ']') {
+					temp[strlen(temp)-3] = '\0';
+					g_string_append_printf(out, "%s\\]", temp);
 				} else {
-					n->str[strlen(n->str)-3] = '\0';
-					g_string_append_printf(out, "$%s$", &n->str[2]);
+					temp[strlen(temp)-3] = '\0';
+					g_string_append_printf(out, "$%s$", &temp[2]);
 				}
 			}
+			free(temp);
 			break;
 		case STRONG:
 			g_string_append_printf(out, "\\textbf{");
@@ -583,10 +625,16 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			
 			if (n->key == IMAGEBLOCK) {
 				if (n->children != NULL) {
-					g_string_append_printf(out, "\n\\caption{");
-					print_latex_node_tree(out, n->children, scratch);
-					g_string_append_printf(out, "}");
+					temp_str = g_string_new("");
+					print_latex_node_tree(temp_str,n->children,scratch);
+					if (temp_str->currentStringLength > 0) {
+						g_string_append_printf(out, "\n\\caption{");
+						g_string_append(out, temp_str->str);
+						g_string_append_printf(out, "}");
+					}
+					g_string_free(temp_str, true);
 				}
+				
 				if (n->link_data->label != NULL) {
 					temp = label_from_string(n->link_data->label);
 					g_string_append_printf(out, "\n\\label{%s}",temp);
@@ -788,7 +836,12 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 					g_string_append_printf(temp_str,"%c",toupper(n->str[i]));
 			}
 			g_string_append_printf(out, "\\begin{tabulary}{\\textwidth}{@{}%s@{}} \\toprule\n", temp_str->str);
-			g_string_free(temp_str, true);
+			
+			if (scratch->table_alignment != NULL)
+				free(scratch->table_alignment);
+
+			scratch->table_alignment = temp_str->str;
+			g_string_free(temp_str, false);
 			break;
 		case TABLECAPTION:
 			if ((n->children != NULL) && (n->children->key == TABLELABEL)) {
@@ -818,11 +871,14 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 		case TABLEROW:
 			print_latex_node_tree(out, n->children, scratch);
 			g_string_append_printf(out, "\\\\\n");
+			scratch->table_column = 0;
 			break;
 		case TABLECELL:
 			scratch->padded = 2;
+			temp = scratch->table_alignment;
 			if ((n->children != NULL) && (n->children->key == CELLSPAN)) {
-				g_string_append_printf(out, "\\multicolumn{%d}{c}{",(int)strlen(n->children->str)+1);
+				g_string_append_printf(out, "\\multicolumn{%d}{%c}{",
+					(int)strlen(n->children->str)+1,tolower(temp[scratch->table_column]));
 			}
 			print_latex_node_tree(out, n->children, scratch);
 			if ((n->children != NULL) && (n->children->key == CELLSPAN)) {
@@ -830,6 +886,10 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			}
 			if (n->next != NULL)
 				g_string_append_printf(out, "&");
+			if ((n->children != NULL) && (n->children->key == CELLSPAN)) {
+				scratch->table_column += (int)strlen(n->children->str);
+			}
+			scratch->table_column++;
 			break;
 		case CELLSPAN:
 			break;
@@ -846,6 +906,7 @@ void print_latex_node(GString *out, node *n, scratch_pad *scratch) {
 			fprintf(stderr,"SOURCEBRANCH\n");
 			break;
 		case NOTELABEL:
+		case GLOSSARYLABEL:
 			break;
 		case SUPERSCRIPT:
 			g_string_append_printf(out, "\\textsuperscript{%s}",n->str);
@@ -1099,7 +1160,14 @@ void print_latex_string(GString *out, char *str, scratch_pad *scratch) {
 				}
 				break;
 			case '-':
-				g_string_append_printf(out, "-{}");
+				str++;
+				if (*str == '-') {
+					g_string_append_printf(out, "-{}");
+					str--;
+				} else {
+					str--;
+					g_string_append_c(out,*str);
+				}
 				break;
 			default:
 				g_string_append_c(out, *str);

data/MultiMarkdown-4/libMultiMarkdown.h

@@ -105,6 +105,7 @@ enum keys {
 	RAW,
 	VERBATIM,
 	VERBATIMTYPE,
+	VERBATIMFENCE,
 	DEFLIST,
 	TERM,
 	DEFINITION,
@@ -127,6 +128,7 @@ enum keys {
 	CITATIONSOURCE,
 	SOURCEBRANCH,
 	NOTELABEL,
+	GLOSSARYLABEL,
 	ATTRVALUE,
 	ATTRKEY,
 	GLOSSARYSOURCE,
@@ -142,9 +144,14 @@ enum keys {
 	SUPERSCRIPT,
 	SUBSCRIPT,
 	VARIABLE,
+	ABBREVIATION,
+	ABBR,
+	ABBRSTART,
+	ABBRSTOP,
 	KEY_COUNTER                      /* This *MUST* be the last item in the list */
 };
 
+
 /* This is the element used in the resulting parse tree */
 struct node {
 	short             key;           /* what type of element are we? */
@@ -155,3 +162,14 @@ struct node {
 };
 
 typedef struct node node;
+
+
+/* Define a structure to simplify handling of links */
+struct link_data {
+	char *label;                /* if this is a reference link */
+	char *source;               /* source URL     */
+	char *title;                /* title string   */
+	node *attr;                 /* attribute tree */
+};
+
+typedef struct link_data link_data;

data/MultiMarkdown-4/lyx.c

@@ -31,6 +31,7 @@
 /* allow the user to change the heading levels */
 
 GString *heading_name[7];
+GString *used_abbreviations;
 
 #if defined(DEBUG_ON) || defined(DUMP_TREES)
   const char * const node_types[] = {
@@ -99,6 +100,7 @@ GString *heading_name[7];
   "CITATIONSOURCE",
   "SOURCEBRANCH",
   "NOTELABEL",
+  "GLOSSARYLABEL",
   "ATTRVALUE",
   "ATTRKEY",
   "GLOSSARYSOURCE",
@@ -113,6 +115,11 @@ GString *heading_name[7];
   "CRITICCOMMENT",
   "SUPERSCRIPT",
   "SUBSCRIPT",
+  "VARIABLE",
+  "ABBREVIATION",
+  "ABBR",
+  "ABBRSTART",
+  "ABBRSTOP",
   "KEY_COUNTER"
   }; 
   
@@ -154,6 +161,7 @@ void perform_lyx_output(GString *out, node* list, scratch_pad *scratch)
 	node *headings;
 	node *base_header_level;
 	char *key;
+
 	
 #ifdef DUMP_TREES
       fprintf(stderr, "\n*** Base Tree ***\n");
@@ -179,6 +187,7 @@ void perform_lyx_output(GString *out, node* list, scratch_pad *scratch)
 		   affect creating the prefixes */
 	
 	GString *lyx_headings = g_string_new("");
+	used_abbreviations = g_string_new("");
 	int hcount;
 	hcount = 0;
 	const char s[2] = ",";
@@ -240,7 +249,7 @@ void perform_lyx_output(GString *out, node* list, scratch_pad *scratch)
 	for (i=0;i<=6;i++){
 		g_string_free(heading_name[i],TRUE);   
 	}
-	
+    g_string_free(used_abbreviations,TRUE);
 }
 
 /* begin_lyx_output -- Check metadata and open the document */
@@ -464,9 +473,6 @@ bool begin_lyx_output(GString *out, node* list, scratch_pad *scratch) {
 			free(tmp);
 			free(token);
 		} 
-	}
-	if(isbeamer){
-	  g_string_append(out,"beamer-fragile\n");
 	}
 	 g_string_append(out,"\\end_modules\n");
 	
@@ -560,7 +566,7 @@ void end_lyx_output(GString *out, node* list, scratch_pad *scratch) {
 if (tree_contains_key(list, METAKEY)) {
 		content = metadata_for_key("bibtex",list);
 		if (content != NULL) {
-			g_string_append(out, "\n\\begin_layout Standart\n");
+			g_string_append(out, "\n\\begin_layout Standard\n");
 			g_string_append(out,"\n\\begin_inset CommandInset bibtex");
 			g_string_append(out,"\nLatexCommand bibtex");
 			value = metavalue_for_key("bibtex",list);
@@ -645,6 +651,56 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 		case STR:
 			print_lyx_string(out,n->str, scratch,LYX_NONE);
 			break;
+		case ABBREVIATION: 
+		   // this work was done in writer.c
+			break;
+		case ABBRSTART:
+			/* Strip out nodes that are being replaced with the abbreviation */
+			temp_node = n->next;
+			while (temp_node->key != ABBRSTOP) {
+				n->next = temp_node->next;
+				temp_node->next = NULL;
+				free_node(temp_node);
+				temp_node = n->next;
+			}
+			n->next = temp_node->next;
+			temp_node->next = NULL;
+			free_node(temp_node);
+		case ABBR:
+			/* In either case, now we call on the abbreviation */
+//			width = ascii_label_from_node(n->children->children);
+            width = string_from_node_tree(n->children->children);
+//			temp = ascii_label_from_string(n->children->str);
+			temp_str = g_string_new("");
+		    g_string_append_printf(temp_str,"[%s]",width);
+		    if(strstr(used_abbreviations->str,temp_str->str)){
+		    	g_string_append(out,width); // just the abbrev
+		    }
+		    else
+		    {
+		    g_string_append(used_abbreviations,temp_str->str);
+		      
+			
+			g_string_append(out,n->children->str);
+			g_string_append_printf(out," (%s)",width);
+			
+			
+			g_string_append(out,"\n\\begin_inset CommandInset nomenclature");
+			g_string_append(out,"\nLatexCommand nomenclature");
+     		g_string_append_printf(out,"\nsymbol \"%s\"",width);
+			g_string_append(out,"\ndescription \"");
+//            g_string_append(out,n->children->str);
+            temp = escape_string(n->children->str);
+            g_string_append(out,temp);
+			g_string_append(out,"\"");		
+			g_string_append(out, "\n\\end_inset\n");
+			free(temp);
+            }
+            g_string_free(temp_str,TRUE);
+			free(width);
+			break;
+		case ABBRSTOP:
+			break;
 		case SPACE:
 			if (strncmp(n->str,"\n",1)==0){
 			  if (no_newline){
@@ -684,16 +740,26 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 					break;
 				case ORDEREDLIST:
 					g_string_append(out, "\n\\begin_layout Enumerate\n");
+			    	if (scratch-> lyx_beamerbullet){
+					  g_string_append(out,"\n\\begin_inset Argument 1");
+					  g_string_append(out,"\nstatus open\n");
+					  g_string_append(out,"\n\\begin_layout Plain Layout");
+					  g_string_append(out,"\n<+->");
+					  g_string_append(out,"\n\\end_layout\n");
+					  g_string_append(out,"\n\\end_inset\n");
+					  scratch -> lyx_beamerbullet = FALSE;
+					}
 					break;
 				case BULLETLIST:
 					g_string_append(out, "\n\\begin_layout Itemize\n");
 					if (scratch-> lyx_beamerbullet){
-					  g_string_append(out,"\n\\begin_inset ERT");
-					  g_string_append(out,"\nstatus collapsed\n");
+					  g_string_append(out,"\n\\begin_inset Argument 1");
+					  g_string_append(out,"\nstatus open\n");
 					  g_string_append(out,"\n\\begin_layout Plain Layout");
-					  g_string_append(out,"\n<+->");
+					  g_string_append(out,"\n+-");
 					  g_string_append(out,"\n\\end_layout\n");
 					  g_string_append(out,"\n\\end_inset\n");
+					  scratch -> lyx_beamerbullet = FALSE;
 					}
 					break;
 				case NOTEREFERENCE:
@@ -742,12 +808,13 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 			if (strncmp(n->str,"<!--",4) == 0) {
 				/* trim "-->" from end */
 				n->str[strlen(n->str)-3] = '\0';
-				g_string_append(out, "\n\\begin_layout Plain\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
+				g_string_append(out, "\n\\begin_layout Plain Layout\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
                 print_latex_string(out,&n->str[4],scratch);				
-				g_string_append(out,"\n\n\\end_layout\n\\end_inset\n\\end_layout\n");
+				g_string_append(out,"\n\n\\end_layout\n\n\\end_inset\n\\end_layout\n");
 			}
 			break;
 		case VERBATIM:
+		case VERBATIMFENCE:
 			old_type = scratch->lyx_para_type;
 			scratch->lyx_para_type = VERBATIM;
 			scratch->lyx_level++;
@@ -804,7 +871,6 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 			#ifdef DEBUG_ON
 	          fprintf(stderr, "\nStart List Item\n");
             #endif
-            i = 0;
             old_type = scratch->lyx_para_type;
 			temp_node = n-> children; /* should be a list node */
 			if(temp_node->children == NULL) {
@@ -1431,8 +1497,10 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 			if (strncmp(n->str,"<!--",4) == 0) {
 				/* trim "-->" from end */
 				n->str[strlen(n->str)-3] = '\0';
+//				g_string_append(out, "\n\\begin_layout Plain Layout\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
 				g_string_append(out, "\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
                 print_lyx_string(out,&n->str[4],scratch,LYX_NONE);				
+//              g_string_append(out,"\n\n\\end_layout\n\\end_inset\n\\end_layout\n");
 				g_string_append(out,"\n\n\\end_layout\n\\end_inset\n");
 			}
 			break;
@@ -1499,6 +1567,7 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 			g_string_append(out,"\n\\end_inset");
 			g_string_append(out, "\n\\end_layout\n");
 			scratch->lyx_table_caption = NULL;
+			scratch->table_alignment = NULL;
 			break;
 		case TABLESEPARATOR:
 			colwidth = 100/scratch->lyx_table_total_cols;
@@ -1651,6 +1720,7 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 			fprintf(stderr,"SOURCEBRANCH\n");
 			break;
 		case NOTELABEL:
+		case GLOSSARYLABEL:
 			break;
 		case SUPERSCRIPT:
 			g_string_append_printf(out, "\n\\begin_inset script superscript\n\n\\begin_layout Plain Layout\n%s\n\\end_layout\n\n\\end_inset\n",n->str);
@@ -1669,25 +1739,36 @@ void print_lyx_node(GString *out, node *n, scratch_pad *scratch, bool no_newline
 /* print_lyx_endnotes */
 void print_lyx_endnotes(GString *out, scratch_pad *scratch) {
 	node *temp_node;
+	bool do_nomenclature;
 	scratch->used_notes = reverse_list(scratch->used_notes);
 	node *note = scratch->used_notes;
 #ifdef DEBUG_ON
 	fprintf(stderr, "start endnotes\n");
 #endif
 
-    	    /* Handle Glossary */
-    temp_node = note;
-    while (temp_node != NULL){
-    	if(temp_node->key == GLOSSARYSOURCE){
+    	    /* Handle Glossary or abbreviations */
+    do_nomenclature = false;
+	if (strcmp(used_abbreviations->str,"")!=0){  // if any abbreviations have been used, print a glossary
+	  do_nomenclature = true; 
+	} else
+	{
+      temp_node = note;
+      while (temp_node != NULL){
+      	  if(temp_node->key == GLOSSARYSOURCE){
+          do_nomenclature = true;
+    	  break;
+          }
+	  temp_node = temp_node->next;
+	  }
+    }
+	
+	if (do_nomenclature){
     	g_string_append(out,"\n\\begin_layout Standard");
     	g_string_append(out,"\n\\begin_inset CommandInset nomencl_print");
     	g_string_append(out,"\nLatexCommand printnomenclature");
     	g_string_append(out,"\nset_width \"auto\"\n");
     	g_string_append(out,"\n\\end_inset\n");
     	g_string_append(out,"\n\\end_layout\n");
-    	break;
-        }
-		temp_node = temp_node->next;
 	}
 
 	if (note == NULL)
@@ -1832,9 +1913,11 @@ void print_lyx_localized_typography(GString *out, unsigned char character, scrat
 /* print_lyx_string - print string, escaping and formatting for LYX */
 void print_lyx_string(GString *out, char *str, scratch_pad *scratch, short environment) {
 	char *tmp;
+	char *start;
 	unsigned char extended_character;
 	if (str == NULL)
 		return;
+	start = str;	/* Store start of string */
 	if (environment == LYX_PLAIN) {
 	   g_string_append(out,"\n\\begin_layout Plain Layout\n\n");
     }   
@@ -1871,7 +1954,7 @@ void print_lyx_string(GString *out, char *str, scratch_pad *scratch, short envir
 			    } else {
 	  				tmp = str;
 					tmp--;
-					if (*tmp == ' ') {
+					if ((tmp > start) && (*tmp == ' ')) {
 						g_string_append(out,"\n");
 					} else {
 						g_string_append(out, "\n "); /* add a space */
@@ -1881,14 +1964,14 @@ void print_lyx_string(GString *out, char *str, scratch_pad *scratch, short envir
 			case '<': /* look for HTML comment LaTeX escape */
 			    if ( (environment != LYX_CODE) && (environment != LYX_PLAIN) && (strncmp(str,"<!--",4) == 0)){
 			       str+=4; /* move past delimeter */
-			       	g_string_append(out, "\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
+			       	g_string_append(out, "\n\\begin_layoutPlain Layout\n\\begin_inset ERT\nstatus collapsed\n\n\\begin_layout Plain Layout\n\n");
                     while(strncmp(str,"-->",3) !=0){
                     	switch (*str){
                     	  case '\\':
 				            g_string_append(out,"\n\\backslash\n\n");
 				            break;
 			              case '\"':
-                            g_string_append(out,"\n\\begin_inset Quotes erd\n\\end_inset\n");
+                            g_string_append(out,"\n\\begin_inset Quotes erd\n\\end_inset\n\\end_layout\n");
 				            break;
                     	  default: 
                     	    g_string_append_c(out,*str);
@@ -2161,3 +2244,19 @@ void print_escaped_node(GString *out, node *n) {
 	  }
     	print_escaped_node_tree(out, n->children);
 	}
+	/* escape string - replace double quotes with escaped version */
+char * escape_string(char *str) {
+	GString *out = g_string_new("");
+	char *clean;
+	while (*str != '\0') {
+		if (*str == '"') {
+				g_string_append(out, "\\\"");
+		} else {
+			g_string_append_c(out, *str);
+		}
+		str++;
+	}
+	clean = out->str;
+	g_string_free(out, false);
+	return clean;
+}