rmultimarkdown 6.4.0.3 → 6.7.0.0

data/ext/mmd/writer.h

@@ -60,20 +60,27 @@
 	#include "CuTest.h"
 #endif
 
-#include "d_string.h"
+#include "libMultiMarkdown.h"
+#include "uthash.h"
+
+/*
+ #include "d_string.h"
 #include "mmd.h"
 #include "stack.h"
 #include "token.h"
 #include "uthash.h"
-
+*/
 
 #define kMaxExportRecursiveDepth 1000		//!< Maximum recursion depth when exporting token tree -- to prevent stack overflow with "pathologic" input
 
 #define kMaxTableColumns 48					//!< Maximum number of table columns for specifying alignment
 
+typedef struct asset asset;
+typedef struct stack stack;
+
 typedef struct {
-	struct link *		link_hash;
-	struct meta *		meta_hash;
+	struct link 	*	link_hash;
+	struct meta 	*	meta_hash;
 
 	unsigned long		extensions;
 	short				output_format;
@@ -83,26 +90,29 @@ typedef struct {
 	short				skip_token;
 
 	short				footnote_para_counter;
-	stack *				used_footnotes;
-	stack *				inline_footnotes_to_free;
+	stack 		*		used_footnotes;
+	stack 		*		inline_footnotes_to_free;
 	struct fn_holder *	footnote_hash;
 	short				footnote_being_printed;
 
 	int 				random_seed_base;
 
-	stack *				used_citations;
-	stack *				inline_citations_to_free;
+	int 				random_seed_base_labels;
+	int 				label_counter;
+
+	stack 		*		used_citations;
+	stack 		*		inline_citations_to_free;
 	struct fn_holder *	citation_hash;
 	short				citation_being_printed;
-	char *				bibtex_file;
+	char 		*		bibtex_file;
 
-	stack *				used_glossaries;
-	stack *				inline_glossaries_to_free;
+	stack 		*		used_glossaries;
+	stack 		*		inline_glossaries_to_free;
 	struct fn_holder *	glossary_hash;
 	short				glossary_being_printed;
 
-	stack *				used_abbreviations;
-	stack *				inline_abbreviations_to_free;
+	stack 		*		used_abbreviations;
+	stack 		*		inline_abbreviations_to_free;
 	struct fn_holder *	abbreviation_hash;
 
 	short				language;
@@ -110,9 +120,9 @@ typedef struct {
 
 	short				base_header_level;
 
-	stack *				header_stack;
+	stack 		*		header_stack;
 
-	stack *				outline_stack;
+	stack 		*		outline_stack;
 	short				opml_item_closed;
 
 	short				recurse_depth;
@@ -124,27 +134,29 @@ typedef struct {
 
 	short				odf_para_type;
 
-	struct asset *		asset_hash;
+	struct asset 	*	asset_hash;
 	short				store_assets;
 	short				remember_assets;
+
+	stack 		*		critic_stack;
 } scratch_pad;
 
 
 struct attr {
-	char *				key;
-	char *				value;
-	struct attr *		next;
+	char 		*		key;
+	char 		*		value;
+	struct attr 	*	next;
 };
 
 typedef struct attr attr;
 
 struct link {
-	token *				label;
-	char * 				label_text;
-	char *				clean_text;
-	char *				url;
-	char *				title;
-	attr *				attributes;
+	token 		*		label;
+	char  	*			label_text;
+	char 		*		clean_text;
+	char 		*		url;
+	char 		*		title;
+	attr 		*		attributes;
 	short				flags;
 	UT_hash_handle		hh;
 };
@@ -159,10 +171,10 @@ enum link_flags {
 typedef struct link link;
 
 struct footnote {
-	token *				label;
-	char *				label_text;
-	char *				clean_text;
-	token *				content;
+	token 		*		label;
+	char 		*		label_text;
+	char 		*		clean_text;
+	token 		*		content;
 	size_t				count;
 	bool				free_para;
 
@@ -172,15 +184,15 @@ struct footnote {
 typedef struct footnote footnote;
 
 struct fn_holder {
-	footnote *			note;
+	footnote 	*		note;
 	UT_hash_handle		hh;
 };
 
 typedef struct fn_holder fn_holder;
 
 struct meta {
-	char *				key;
-	char *				value;
+	char 		*		key;
+	char 		*		value;
 	size_t				start;
 	UT_hash_handle		hh;
 };
@@ -188,9 +200,9 @@ struct meta {
 typedef struct meta meta;
 
 struct abbr {
-	char *				abbr;
+	char 		*		abbr;
 	size_t				abbr_len;
-	char *				expansion;
+	char 		*		expansion;
 	size_t				expansion_len;
 	UT_hash_handle		hh;
 };
@@ -219,7 +231,7 @@ void link_free(link * l);
 void footnote_free(footnote * f);
 
 char * label_from_token(const char * source, token * t);
-char * label_from_header(const char * source, token * t);
+char * label_from_header(const char * source, token * t, scratch_pad * scratch);
 
 void parse_brackets(const char * source, scratch_pad * scratch, token * bracket, link ** link, short * skip_token, bool * free_link);
 
@@ -255,10 +267,12 @@ token * manual_label_from_header(token * h, const char * source);
 
 char * label_from_string(const char * str);
 
-char * clean_string(const char * str, bool lowercase);
+char * clean_string(const char * str, bool lowercase, bool clean_url);
 
 short raw_level_for_header(token * header);
 
+void header_clean_trailing_whitespace(token * header, const char * source);
+
 void store_asset(scratch_pad * scratch_pad, char * url);
 asset * extract_asset(scratch_pad * scratch, char * url);
 void asset_free(asset * a);