document/html: parser -> mikuparser

Since we now have multiple parsers, the name "parser" is no longer suitable.
Now the old Mikulas' parser is called "mikuparser". Also, html/parser.* is
renamed to html/mikuparser/mikuparser.*.

src/document/css/apply.c

@@ -23,7 +23,7 @@
 #include "document/css/stylesheet.h"
 #include "document/format.h"
 #ifndef CONFIG_DOM_HTML
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/parse.h"
 #endif
 #include "document/options.h"
 #include "util/align.h"

src/document/document.c

@@ -18,7 +18,7 @@
 #include "document/forms.h"
 #include "document/html/frames.h"
 #ifndef CONFIG_DOM_HTML
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/parse.h"
 #endif
 #include "document/html/renderer.h"
 #include "document/options.h"

src/document/html/Makefile

@@ -2,8 +2,8 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 
 # The original HTML parser
-SUBDIRS-unless$(CONFIG_DOM_HTML) = parser
-OBJS-unless$(CONFIG_DOM_HTML)	 = parser.o tables.o
+SUBDIRS-unless$(CONFIG_DOM_HTML) = mikuparser
+OBJS-unless$(CONFIG_DOM_HTML)	 = tables.o
 
 # The DOM-based HTML parser
 OBJS-$(CONFIG_DOM_HTML) = dom.o

src/document/html/README

@@ -4,7 +4,7 @@ It's scary, yes.
 The Mikulas renderer lives in renderer.c, frames.c (just small frameset support
 stuff) and tables.c.
 
-The Mikulas parser lives in parser/* and parser.*.
+The Mikulas parser lives in mikuparser/*.
 
 There is also new experimental parser that is based on the DOM engine but uses
 the Mikulas renderer. It lives in dom.c.

src/document/html/internal.h

@@ -4,7 +4,7 @@
 
 #include "document/css/stylesheet.h"
 #define INSIDE_INTERNAL_H
-#include "document/html/parser.h"
+#include "document/html/mikuparser/mikuparser.h"
 #undef INSIDE_INTERNAL_H
 #include "util/lists.h"
 

src/document/html/mikuparser/Makefile

@@ -1,6 +1,6 @@
 top_builddir=../../../..
 include $(top_builddir)/Makefile.config
 
-OBJS = forms.o general.o link.o parse.o stack.o table.o
+OBJS = forms.o general.o link.o mikuparser.o parse.o stack.o table.o
 
 include $(top_srcdir)/Makefile.lib

src/document/html/mikuparser/forms.c

@@ -13,11 +13,11 @@
 
 #include "bfu/listmenu.h"
 #include "bfu/menu.h"
-#include "document/html/parser/forms.h"
-#include "document/html/parser/link.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/forms.h"
+#include "document/html/mikuparser/link.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "document/forms.h"
 #include "intl/charsets.h"

src/document/html/mikuparser/forms.h

@@ -1,8 +1,8 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_FORMS_H
-#define EL__DOCUMENT_HTML_PARSER_FORMS_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_FORMS_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_FORMS_H
 
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/parse.h"
 
 struct html_context;
 

src/document/html/mikuparser/general.c

@@ -18,11 +18,11 @@
 #include "config/options.h"
 #include "document/css/apply.h"
 #include "document/html/frames.h"
-#include "document/html/parser/general.h"
-#include "document/html/parser/link.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/general.h"
+#include "document/html/mikuparser/link.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "document/html/tables.h"
 #include "document/options.h"

src/document/html/mikuparser/general.h

@@ -1,8 +1,8 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_GENERAL_H
-#define EL__DOCUMENT_HTML_PARSER_GENERAL_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_GENERAL_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_GENERAL_H
 
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/parse.h"
 
 element_handler_T html_address;
 element_handler_T html_base;

src/document/html/mikuparser/link.c

@@ -21,10 +21,10 @@
 #include "config/options.h"
 #include "config/kbdbind.h"
 #include "document/html/frames.h"
-#include "document/html/parser/link.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/link.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "globhist/globhist.h"
 #include "mime/mime.h"

src/document/html/mikuparser/link.h

@@ -1,8 +1,8 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_LINK_H
-#define EL__DOCUMENT_HTML_PARSER_LINK_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_LINK_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_LINK_H
 
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/parse.h"
 
 struct html_context;
 

src/document/html/mikuparser/mikuparser.c

@@ -18,10 +18,10 @@
 #include "document/css/css.h"
 #include "document/css/stylesheet.h"
 #include "document/html/frames.h"
-#include "document/html/parser/link.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/link.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "document/options.h"
 #include "document/renderer.h"

src/document/html/mikuparser/mikuparser.h

@@ -1,6 +1,6 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_H
-#define EL__DOCUMENT_HTML_PARSER_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_MIKUPARSER_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_MIKUPARSER_H
 
 #include "document/format.h"
 #include "intl/charsets.h" /* unicode_val_T */
@@ -10,7 +10,7 @@
 
 #ifndef INSIDE_INTERNAL_H
 #ifdef CONFIG_DOM_HTML
-#error html/parser.h included even though DOM parser is configured to use!
+#error html/mikuparser/mikuparser.h included even though DOM parser is configured to use!
 #endif
 #endif
 
@@ -135,7 +135,7 @@ struct html_element {
 	unsigned char *name;
 	int namelen;
 	unsigned char *options;
-	/* See document/html/parser/parse.c's element_info.linebreak
+	/* See document/html/mikuparser/parse.c's element_info.linebreak
 	 * description. */
 	int linebreak;
 	struct frameset_desc *frameset;

src/document/html/mikuparser/parse.c

@@ -14,12 +14,12 @@
 
 #include "document/css/apply.h"
 #include "document/css/parser.h"
-#include "document/html/parser/forms.h"
-#include "document/html/parser/general.h"
-#include "document/html/parser/link.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/forms.h"
+#include "document/html/mikuparser/general.h"
+#include "document/html/mikuparser/link.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "document/options.h"
 #include "intl/charsets.h"

src/document/html/mikuparser/parse.h

@@ -1,6 +1,6 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_PARSE_H
-#define EL__DOCUMENT_HTML_PARSER_PARSE_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_PARSE_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_PARSE_H
 
 struct html_context;
 struct document_options;

src/document/html/mikuparser/stack.c

@@ -12,9 +12,9 @@
 #include "elinks.h"
 
 #include "document/document.h"
-#include "document/html/parser/stack.h"
-#include "document/html/parser/parse.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/stack.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "protocol/uri.h"
 #include "util/conv.h"

src/document/html/mikuparser/stack.h

@@ -1,8 +1,8 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_STACK_H
-#define EL__DOCUMENT_HTML_PARSER_STACK_H
+#ifndef EL__DOCUMENT_HTML_MIKUPARSER_STACK_H
+#define EL__DOCUMENT_HTML_MIKUPARSER_STACK_H
 
-#include "document/html/parser.h"
+#include "document/html/mikuparser/mikuparser.h"
 
 struct html_context;
 

src/document/html/mikuparser/table.c

@@ -14,9 +14,9 @@
 
 #include "elinks.h"
 
-#include "document/html/parser/parse.h"
-#include "document/html/parser/table.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/table.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/options.h"
 #include "util/color.h"
 #include "util/conv.h"

src/document/html/mikuparser/table.h

@@ -1,6 +1,6 @@
 
-#ifndef EL__DOCUMENT_HTML_PARSER_TABLE_H
-#define EL__DOCUMENT_HTML_PARSER_TABLE_H
+#ifndef EL__DOCUMENT_HTML_TABLE_H
+#define EL__DOCUMENT_HTML_TABLE_H
 
 #include "util/color.h"
 

src/document/html/renderer.c

@@ -18,8 +18,8 @@
 #ifdef CONFIG_DOM_HTML
 #include "document/html/dom.h"
 #else
-#include "document/html/parser.h"
-#include "document/html/parser/parse.h"
+#include "document/html/mikuparser/mikuparser.h"
+#include "document/html/mikuparser/parse.h"
 #include "document/html/tables.h"
 #endif
 #include "document/html/renderer.h"

src/document/html/tables.c

@@ -9,9 +9,9 @@
 
 #include "elinks.h"
 
-#include "document/html/parser/parse.h"
-#include "document/html/parser/table.h"
-#include "document/html/parser.h"
+#include "document/html/mikuparser/parse.h"
+#include "document/html/mikuparser/table.h"
+#include "document/html/mikuparser/mikuparser.h"
 #include "document/html/renderer.h"
 #include "document/html/tables.h"
 #include "document/options.h"

src/session/task.c

@@ -18,7 +18,7 @@
 #include "dialogs/status.h"
 #include "document/document.h"
 #ifndef CONFIG_DOM_HTML
-#include "document/html/parser.h"
+#include "document/html/mikuparser/mikuparser.h"
 #endif
 #include "document/refresh.h"
 #include "document/view.h"