rmultimarkdown 4.5.3.2 → 4.6.0.1

data/MultiMarkdown-4/parser.h

@@ -14,7 +14,7 @@
 
 #define TABSTOP 4
 
-#define MMD_VERSION "4.5.3"
+#define MMD_VERSION "4.6"
 
 #define MMD_COPYRIGHT \
 	"Copyright (c) 2013-2014 Fletcher T. Penney.\n\n" \
@@ -33,16 +33,6 @@
 /* This is the type used for the $$ pseudovariable passed to parents */
 #define YYSTYPE 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;
-
 /* This is the data we store in the parser context */
 typedef struct {
 	char *charbuf;              /* Input buffer */
@@ -69,6 +59,7 @@ typedef struct {
 	node *links;                 /* ... links */
 	node *glossary;              /* ... glossary */
 	node *citations;             /* ... citations */
+	node *abbreviations;         /* ... abbreviations */
 	node *used_notes;            /* notes that have been referenced */
 	node *result_tree;           /* reference to entire result tree */
 	int   footnote_to_print;     /* set while we are printing so we can reverse link */
@@ -88,7 +79,7 @@ typedef struct {
 	bool  lyx_definition_hit;    /* CRC  - True when a definition has been encountered */
 	bool  lyx_definition_open;   /* CRC - Have not completed a definition list entry */
 	bool  lyx_in_header;         /* CRC - In a table header */
-	bool  lyx_fragile;           /* CRC - in a beamer fragile frame */
+	bool  lyx_in_frame;           /* CRC - in a beamer frame */
 	bool  lyx_beamerbullet;      /* CRC - beamer bullet list (add <+->) */
 	int   lyx_debug_nest;        /* CRC - nesting level for enhanced debugging */
 	bool  lyx_table_need_line;   /* CRC - need a line at the top */
@@ -158,6 +149,7 @@ link_data * extract_link_data(char *label, scratch_pad *scratch);
 node * mk_autolink(char *text);
 
 void   extract_references(node *list, scratch_pad *scratch);
+void   extract_abbreviations(node *list, scratch_pad *scratch);
 
 bool   extension(int ext, unsigned long extensions);
 
@@ -167,9 +159,13 @@ void   trim_trailing_newlines(char *str);
 
 /* other utilities */
 char * label_from_string(char *str);
+char * ascii_label_from_string(char *str);
 char * clean_string(char *str);
+char * string_from_node_tree(node *n);
 char * label_from_node_tree(node *n);
 char * label_from_node(node *n);
+char * ascii_label_from_node_tree(node *n);
+char * ascii_label_from_node(node *n);
 void   print_raw_node(GString *out, node *n);
 void   print_raw_node_tree(GString *out, node*n);
 

data/MultiMarkdown-4/rtf.c

@@ -135,6 +135,7 @@ void print_rtf_node(GString *out, node *n, scratch_pad *scratch) {
 			scratch->odf_para_type = old_type;
 			break;
 		case VERBATIM:
+		case VERBATIMFENCE:
 			pad_rtf(out, 2, scratch);
 			g_string_append_printf(out, "{\\pard " kCodeStyle);
 			print_rtf_code_string(out,n->str,scratch);
@@ -157,6 +158,7 @@ void print_rtf_node(GString *out, node *n, scratch_pad *scratch) {
 					break;
 				case CODE:
 				case VERBATIM:
+				case VERBATIMFENCE:
 					g_string_append_printf(out, "{\\pard " kCodeStyle);
 					break;
 				default:
@@ -379,7 +381,7 @@ void print_rtf_node(GString *out, node *n, scratch_pad *scratch) {
 						scratch->odf_para_type = CITATION;
 						
 						/* change to represent cite count only */
-						lev = cite_count_node_from_end(temp_node);
+						// lev = cite_count_node_from_end(temp_node);
 						g_string_append_printf(out, "{\\super\\chftn}{\\footnote\\ftnalt\\pard\\plain\\chtfn ");
 						scratch->padded = 2;
 						if (temp_node->children != NULL) {
@@ -392,7 +394,7 @@ void print_rtf_node(GString *out, node *n, scratch_pad *scratch) {
 						/* We are reusing a previous citation */
 
 						/* Change lev to represent cite count only */
-						lev = cite_count_node_from_end(temp_node);
+						// lev = cite_count_node_from_end(temp_node);
 					
 						g_string_append_printf(out, "REUSE CITATION");
 					}
@@ -449,6 +451,7 @@ void print_rtf_node(GString *out, node *n, scratch_pad *scratch) {
 			g_string_append_printf(out, "\\\n");
 			break;
 		case NOTELABEL:
+		case GLOSSARYLABEL:
 		case FOOTER:
 		case LINKREFERENCE:
 			break;

data/MultiMarkdown-4/transclude.c

@@ -116,7 +116,7 @@ void transclude_source(GString *source, char *basedir, char *stack, int output_f
 		g_string_append_c(folder, '/');
 	}
 
-	//fprintf(stderr, "Transclude using '%s'\n", folder->str);
+	/* fprintf(stderr, "Transclude using '%s'\n", folder->str); */
 
 	/* Iterate through {{foo.txt}} and substitute contents of file without metadata */
 
@@ -127,92 +127,108 @@ void transclude_source(GString *source, char *basedir, char *stack, int output_f
 		if (stop == NULL)
 			break;
 
-		// TODO: Need to check that we found something reasonable 
-
-		strncpy(real,start+2,stop-start-2);
-		real[stop-start-2] = '\0';
-
-		filename = g_string_new(folder->str);
-		g_string_append_printf(filename, "%s",real);
-
-		/* Adjust for wildcard extensions */
-		/* But not if output_format == 0 */
-		if (output_format && strncmp(&filename->str[strlen(filename->str) - 2],".*",2) == 0) {
-			g_string_erase(filename, strlen(filename->str) - 2, 2);
-			if (output_format == TEXT_FORMAT) {
-				g_string_append(filename,".txt");
-			} else if (output_format == HTML_FORMAT) {
-				g_string_append(filename,".html");
-			} else if (output_format == LATEX_FORMAT) {
-				g_string_append(filename,".tex");
-			} else if (output_format == BEAMER_FORMAT) {
-				g_string_append(filename,".tex");
-			} else if (output_format == MEMOIR_FORMAT) {
-				g_string_append(filename,".tex");
-			} else if (output_format == ODF_FORMAT) {
-				g_string_append(filename,".fodt");
-			} else if (output_format == OPML_FORMAT) {
-				g_string_append(filename,".opml");
-			} else if (output_format == LYX_FORMAT) {
-				g_string_append(filename,".lyx");
-			} else if (output_format == RTF_FORMAT) {
-				g_string_append(filename,".rtf");
-			} else {
-				/* default extension -- in this case we only have 1 */
-				g_string_append(filename,".txt");
+		/* Check that we found something reasonable -- we cap at 1000 characters */
+        if (stop - start < 1000) {
+			strncpy(real,start+2,stop-start-2);
+			real[stop-start-2] = '\0';
+
+			filename = g_string_new(folder->str);
+			g_string_append_printf(filename, "%s",real);
+
+			/* Adjust for wildcard extensions */
+			/* But not if output_format == 0 */
+			if (output_format && strncmp(&filename->str[strlen(filename->str) - 2],".*",2) == 0) {
+				g_string_erase(filename, strlen(filename->str) - 2, 2);
+				if (output_format == TEXT_FORMAT) {
+					g_string_append(filename,".txt");
+				} else if (output_format == HTML_FORMAT) {
+					g_string_append(filename,".html");
+				} else if (output_format == LATEX_FORMAT) {
+					g_string_append(filename,".tex");
+				} else if (output_format == BEAMER_FORMAT) {
+					g_string_append(filename,".tex");
+				} else if (output_format == MEMOIR_FORMAT) {
+					g_string_append(filename,".tex");
+				} else if (output_format == ODF_FORMAT) {
+					g_string_append(filename,".fodt");
+				} else if (output_format == OPML_FORMAT) {
+					g_string_append(filename,".opml");
+				} else if (output_format == LYX_FORMAT) {
+					g_string_append(filename,".lyx");
+				} else if (output_format == RTF_FORMAT) {
+					g_string_append(filename,".rtf");
+				} else {
+					/* default extension -- in this case we only have 1 */
+					g_string_append(filename,".txt");
+				}
 			}
-		}
 
-		pos = stop - source->str;
+			pos = stop - source->str;
 
-		/* Don't reparse ourselves */
-		if (stack != NULL) {
-			temp = strstr(stack,filename->str);
+			/* Don't reparse ourselves */
+			if (stack != NULL) {
+				temp = strstr(stack,filename->str);
 
-			if ((temp != NULL) && (temp[strlen(filename->str)] == '\n')){
-				start = strstr(source->str + pos,"{{");
-				g_string_free(filename, true);
-				continue;
+				if ((temp != NULL) && (temp[strlen(filename->str)] == '\n')){
+					start = strstr(source->str + pos,"{{");
+					g_string_free(filename, true);
+					continue;
+				}
 			}
-		}
 
-		/* Read file */
-		if ((input = fopen(filename->str, "r")) != NULL ) {
-			filebuffer = g_string_new("");
+			/* Read file */
+			if ((input = fopen(filename->str, "r")) != NULL ) {
+				filebuffer = g_string_new("");
 
-			while ((curchar = fgetc(input)) != EOF)
-				g_string_append_c(filebuffer, curchar);
-			
-			fclose(input);
+				while ((curchar = fgetc(input)) != EOF)
+					g_string_append_c(filebuffer, curchar);
+				
+				fclose(input);
 
- 			pos = start - source->str;
+	 			pos = start - source->str;
 
-			g_string_erase(source, pos, 2 + stop - start);
+				g_string_erase(source, pos, 2 + stop - start);
 
-			/* Update stack list */
-			stackstring = g_string_new(stack);
-			g_string_append_printf(stackstring,"%s\n",filename->str);
+				/* Update stack list */
+				stackstring = g_string_new(stack);
+				g_string_append_printf(stackstring,"%s\n",filename->str);
 
 
-			/* Recursively transclude files */
-			transclude_source(filebuffer, folder->str, stackstring->str, output_format);
+				/* Recursively transclude files */
+				transclude_source(filebuffer, folder->str, stackstring->str, output_format);
 
-			temp = source_without_metadata(filebuffer->str, 0x000000);
+				temp = source_without_metadata(filebuffer->str, 0x000000);
 
-			g_string_insert(source, pos, temp);
+				g_string_insert(source, pos, temp);
 
-			pos += strlen(temp);
-			g_string_free(filebuffer, true);
-			g_string_free(stackstring, true);
-		} else {
-			/* fprintf(stderr, "error opening file: %s\n", filename->str); */
-		}
+				pos += strlen(temp);
+				g_string_free(filebuffer, true);
+				g_string_free(stackstring, true);
+			} else {
+				/* fprintf(stderr, "error opening file: %s\n", filename->str); */
+			}
 
+            g_string_free(filename, true);
+        } else {
+        	/* Our "match" was > 1000 characters long */
+            pos = stop - source->str;
+        }
 		start = strstr(source->str + pos,"{{");
-		g_string_free(filename, true);
 	}
 
 	g_string_free(folder, true);
 	free(path);
 	free(base);
 }
+
+/* Allow for a footer to specify files to be appended to the end of the text, and then transcluded.
+	Useful for appending a list of footnotes, citations, abbreviations, etc. to each separate file,
+	but not including multiple copies when processing the master file. */
+void append_mmd_footers(GString *source) {
+	/* Look for mmd_footer metadata */
+	if (has_metadata(source->str, 0x000000)) {
+		char *meta = extract_metadata_value(source->str, 0x000000, "mmdfooter");
+		if (meta != NULL)
+			g_string_append_printf(source, "\n\n{{%s}}\n",meta);
+	}
+}

data/MultiMarkdown-4/transclude.h

@@ -24,3 +24,4 @@
 
 char *	source_without_metadata(char * source, unsigned long extensions);
 void	transclude_source(GString *source, char *basedir, char *stack, int format);
+void append_mmd_footers(GString *source);

data/MultiMarkdown-4/writer.c

@@ -36,12 +36,19 @@ char * export_node_tree(node *list, int format, unsigned long extensions) {
 #ifdef DEBUG_ON
 	fprintf(stderr, "extract_references\n");
 #endif
-	/* Parse for link, images, etc reference definitions */
+
 	if ((format != OPML_FORMAT) &&
 		(format != CRITIC_ACCEPT_FORMAT) &&
 		(format != CRITIC_REJECT_FORMAT) &&
-		(format != CRITIC_HTML_HIGHLIGHT_FORMAT))
+		(format != CRITIC_HTML_HIGHLIGHT_FORMAT)) {
+			/* Parse for link, images, etc reference definitions */
 			extract_references(list, scratch);
+
+			/* Find defined abbreviations */
+			extract_abbreviations(list, scratch);
+			/* Apply those abbreviations to source text */
+			find_abbreviations(list, scratch);
+		}
 	
 	/* Change our desired format based on metadata */
 	if (format == LATEX_FORMAT)
@@ -76,12 +83,21 @@ char * export_node_tree(node *list, int format, unsigned long extensions) {
 #endif
 			break;
 		case LATEX_FORMAT:
+			if ((list != NULL) && (list->key != METADATA)) {
+				print_latex_node_tree(out, scratch->abbreviations, scratch);
+			}
 			print_latex_node_tree(out, list, scratch);
 			break;
 		case MEMOIR_FORMAT:
+			if ((list != NULL) && (list->key != METADATA)) {
+				print_memoir_node_tree(out, scratch->abbreviations, scratch);
+			}
 			print_memoir_node_tree(out, list, scratch);
 			break;
 		case BEAMER_FORMAT:
+			if ((list != NULL) && (list->key != METADATA)) {
+				print_beamer_node_tree(out, scratch->abbreviations, scratch);
+			}
 			print_beamer_node_tree(out, list, scratch);
 			break;
 		case LYX_FORMAT:
@@ -194,6 +210,106 @@ void extract_references(node *list, scratch_pad *scratch) {
 	}
 }
 
+/* extract_abbreviations -- traverse node tree and find abbreviation definitions */
+void extract_abbreviations(node *list, scratch_pad *scratch) {
+	node *temp;
+
+	while (list != NULL) {
+		switch (list->key) {
+			case ABBREVIATION:
+				temp = copy_node(list);
+				list->key = KEY_COUNTER;	/* Mark this as dead; we will use it elsewhere */
+				trim_trailing_whitespace(temp->str);
+				scratch->abbreviations = cons(temp, scratch->abbreviations);
+				break;
+			case HEADINGSECTION:
+			case RAW:
+			case LIST:
+				extract_abbreviations(list->children, scratch);
+				break;
+			default:
+				/* Try to boost performance by skipping dead ends */
+				break;
+		}
+		list = list->next;
+	}
+}
+
+
+/* find_abbreviations -- use abbreviations to look for matching strings */
+void find_abbreviations(node *list, scratch_pad *scratch) {
+	node *abbr = scratch->abbreviations;
+	node *temp, *target, *end = NULL;
+	bool ismatch;
+
+	// Don't look if we didn't define any abbreviations */
+	if (abbr->key == KEY_COUNTER)
+		return;
+	
+	while (list != NULL) {
+		switch (list->key) {
+			case STR:
+				/* Look for matching abbrevation */
+				/*fprintf(stderr, "Check '%s' for matching abbr\n", list->str); */
+				abbr = scratch->abbreviations;
+				while (abbr != NULL) {
+					if (abbr->key != KEY_COUNTER) {
+						ismatch = true;
+						temp = abbr->children->children;
+						target = list;
+
+						while((ismatch) && (temp != NULL) && (target != NULL)) {
+							switch (temp->key) {
+								case STR:
+									if (strcmp(temp->str, target->str) != 0) {
+										ismatch = false;
+									}
+								case SPACE:
+								case KEY_COUNTER:
+									break;
+								default:
+									if (temp->key != target->key)
+										ismatch = false;
+									break;
+							}
+							temp = temp->next;
+							end = target;
+							target = target->next;
+						}
+						if ((ismatch) && (temp == NULL)) {
+							temp = copy_node(abbr);
+							temp->next = NULL;
+							list->children = temp;
+							if (list != end) {
+								list->key = ABBRSTART;
+                                if (end != NULL)
+                                    end->key = ABBRSTOP;
+							} else {
+								list->key = ABBR;
+							}
+						}
+					}
+					abbr = abbr->next;
+				}
+				break;
+			case LIST:
+			case HEADINGSECTION:
+			case PARA:
+			case LINK:
+			case LINKREFERENCE:
+			case NOTEREFERENCE:
+				/* Check children of these elements */
+				find_abbreviations(list->children, scratch);
+				break;
+			default:
+				/* Everything else we skip */
+				break;
+		}
+		list = list->next;
+	}
+}
+
+
 /* extract_link_data -- given a label, parse the link data and return */
 link_data * extract_link_data(char *label, scratch_pad *scratch) {
 	char *temp;

data/MultiMarkdown-4/writer.h

@@ -15,6 +15,9 @@
 char * export_node_tree(node *list, int format, unsigned long extensions);
 
 void extract_references(node *list, scratch_pad *scratch);
+void extract_abbreviations(node *list, scratch_pad *scratch);
+void find_abbreviations(node *list, scratch_pad *scratch);
+
 link_data * extract_link_data(char *label, scratch_pad *scratch);
 
 void pad(GString *out, int num, scratch_pad *scratch);