diff --git a/NEWS b/NEWS index 584b213ab..61b28556c 100644 --- a/NEWS +++ b/NEWS @@ -5,8 +5,8 @@ You can see the complete list of recent changes, bugfixes and new features in the link:http://pasky.or.cz/gitweb.cgi[gitweb interface]. See the ChangeLog file for details. -ELinks now: ------------ +ELinks 0.11.0 (Elated): +----------------------- * SSL support via GNUTLS now requires 1.2 or higher * support for Lua 4.x was dropped, we only support Lua 5.x now diff --git a/po/Makefile b/po/Makefile index 603aeebb4..3420c00a6 100644 --- a/po/Makefile +++ b/po/Makefile @@ -69,7 +69,7 @@ $(srcdir)$(PACKAGE).pot: $(srcdir)$(POTFILES_ABS_LIST) $(srcdir)perl/gather-acce # either or .po when calling make. Example: make update-po PO=is update-po: Makefile $(srcdir)$(PACKAGE).pot - @cd $(srcdir) + @test -n "$(srcdir)" && cd $(srcdir) @$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \ echo -n "$(lang): "; \ if $(MSGMERGE) $(srcdir)$(lang).po $(srcdir)$(PACKAGE).pot -o $(lang).new.po; then \ diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c index fdb26aeca..1da9786a6 100644 --- a/src/document/dom/renderer.c +++ b/src/document/dom/renderer.c @@ -687,11 +687,25 @@ render_dom_document(struct cache_entry *cached, struct document *document, document->bgcolor = document->options.default_bg; - if (cached->content_type - && !strlcasecmp("application/rss+xml", 19, cached->content_type, -1)) + /* FIXME: Refactor the doctype lookup. */ + if (!strcasecmp("application/rss+xml", cached->content_type)) { doctype = SGML_DOCTYPE_RSS; - else + + } else if (!strcasecmp("application/docbook+xml", cached->content_type)) { + doctype = SGML_DOCTYPE_DOCBOOK; + + } else if (!strcasecmp("application/xbel+xml", cached->content_type) + || !strcasecmp("application/x-xbel", cached->content_type) + || !strcasecmp("application/xbel", cached->content_type)) { + doctype = SGML_DOCTYPE_XBEL; + + } else { + assertm(!strcasecmp("text/html", cached->content_type) + || !strcasecmp("application/xhtml+xml", cached->content_type), + "Couldn't resolve doctype '%s'", cached->content_type); + doctype = SGML_DOCTYPE_HTML; + } parser = init_sgml_parser(SGML_PARSER_STREAM, doctype, &uri); if (!parser) return; diff --git a/src/document/renderer.c b/src/document/renderer.c index d31689402..6c3a1d81a 100644 --- a/src/document/renderer.c +++ b/src/document/renderer.c @@ -241,11 +241,13 @@ render_encoded_document(struct cache_entry *cached, struct document *document) if (document->options.plain) { #ifdef CONFIG_DOM if (cached->content_type - && (!strlcasecmp("text/html", 9, cached->content_type, -1) - || !strlcasecmp("application/rss+xml", 19, cached->content_type, -1) - || !strlcasecmp("application/xbel+xml", 20, cached->content_type, -1) - || !strlcasecmp("application/x-xbel", 18, cached->content_type, -1) - || !strlcasecmp("application/xbel", 16, cached->content_type, -1))) + && (!strcasecmp("text/html", cached->content_type) + || !strcasecmp("application/xhtml+xml", cached->content_type) + || !strcasecmp("application/docbook+xml", cached->content_type) + || !strcasecmp("application/rss+xml", cached->content_type) + || !strcasecmp("application/xbel+xml", cached->content_type) + || !strcasecmp("application/x-xbel", cached->content_type) + || !strcasecmp("application/xbel", cached->content_type))) render_dom_document(cached, document, &buffer); else #endif diff --git a/src/dom/sgml/Makefile b/src/dom/sgml/Makefile index a899f3932..193145e92 100644 --- a/src/dom/sgml/Makefile +++ b/src/dom/sgml/Makefile @@ -1,7 +1,7 @@ top_builddir=../../.. include $(top_builddir)/Makefile.config -SUBDIRS = html rss xbel +SUBDIRS = docbook html rss xbel OBJS = sgml.o parser.o scanner.o include $(top_srcdir)/Makefile.lib diff --git a/src/dom/sgml/docbook/.vimrc b/src/dom/sgml/docbook/.vimrc new file mode 100644 index 000000000..18f65e474 --- /dev/null +++ b/src/dom/sgml/docbook/.vimrc @@ -0,0 +1,2 @@ +:set runtimepath+=. +:runtime ../../../.vimrc diff --git a/src/dom/sgml/docbook/Makefile b/src/dom/sgml/docbook/Makefile new file mode 100644 index 000000000..47d0992ed --- /dev/null +++ b/src/dom/sgml/docbook/Makefile @@ -0,0 +1,6 @@ +top_builddir=../../../.. +include $(top_builddir)/Makefile.config + +OBJS = docbook.o + +include $(top_srcdir)/Makefile.lib diff --git a/src/dom/sgml/docbook/attribute.inc b/src/dom/sgml/docbook/attribute.inc new file mode 100644 index 000000000..f978a45b9 --- /dev/null +++ b/src/dom/sgml/docbook/attribute.inc @@ -0,0 +1,146 @@ +/* DocBook attributes */ + +DOCBOOK_(ATTRIBUTE, ABBR, 0), +DOCBOOK_(ATTRIBUTE, ACTION, 0), +DOCBOOK_(ATTRIBUTE, ALIGN, 0), +DOCBOOK_(ATTRIBUTE, APPLICATION, 0), +DOCBOOK_(ATTRIBUTE, ARCH, 0), +DOCBOOK_(ATTRIBUTE, AREAREFS, 0), +DOCBOOK_(ATTRIBUTE, AUDIENCE, 0), +DOCBOOK_(ATTRIBUTE, AXIS, 0), +DOCBOOK_(ATTRIBUTE, BASEFORM, 0), +DOCBOOK_(ATTRIBUTE, BGCOLOR, 0), +DOCBOOK_(ATTRIBUTE, BORDER, 0), +DOCBOOK_(ATTRIBUTE, CELLSPACING, 0), +DOCBOOK_(ATTRIBUTE, CHAR, 0), +DOCBOOK_(ATTRIBUTE, CHAROFF, 0), +DOCBOOK_(ATTRIBUTE, CHOICE, 0), +DOCBOOK_(ATTRIBUTE, CLASS, 0), +DOCBOOK_(ATTRIBUTE, CMDLENGTH, 0), +DOCBOOK_(ATTRIBUTE, COLNAME, 0), +DOCBOOK_(ATTRIBUTE, COLNUM, 0), +DOCBOOK_(ATTRIBUTE, COLNUMS, 0), +DOCBOOK_(ATTRIBUTE, COLS, 0), +DOCBOOK_(ATTRIBUTE, COLSEP, 0), +DOCBOOK_(ATTRIBUTE, COLSPAN, 0), +DOCBOOK_(ATTRIBUTE, COLWIDTH, 0), +DOCBOOK_(ATTRIBUTE, CONDITION, 0), +DOCBOOK_(ATTRIBUTE, CONFORMANCE, 0), +DOCBOOK_(ATTRIBUTE, CONTENTDEPTH, 0), +DOCBOOK_(ATTRIBUTE, CONTENTS, 0), +DOCBOOK_(ATTRIBUTE, CONTENTWIDTH, 0), +DOCBOOK_(ATTRIBUTE, CONTINUATION, 0), +DOCBOOK_(ATTRIBUTE, COORDS, 0), +DOCBOOK_(ATTRIBUTE, DEF, 0), +DOCBOOK_(ATTRIBUTE, DEFAULTLABEL, 0), +DOCBOOK_(ATTRIBUTE, DEPTH, 0), +DOCBOOK_(ATTRIBUTE, ENCODING, 0), +DOCBOOK_(ATTRIBUTE, ENDTERM, 0), +DOCBOOK_(ATTRIBUTE, ENTITYREF, SGML_ATTRIBUTE_REFERENCE), +DOCBOOK_(ATTRIBUTE, FILEREF, SGML_ATTRIBUTE_REFERENCE), +DOCBOOK_(ATTRIBUTE, FLOAT, 0), +DOCBOOK_(ATTRIBUTE, FLOATSTYLE, 0), +DOCBOOK_(ATTRIBUTE, FORMAT, 0), +DOCBOOK_(ATTRIBUTE, FPI, 0), +DOCBOOK_(ATTRIBUTE, FRAME, 0), +DOCBOOK_(ATTRIBUTE, FUNCTION, 0), +DOCBOOK_(ATTRIBUTE, HEADERS, 0), +DOCBOOK_(ATTRIBUTE, HEIGHT, 0), +DOCBOOK_(ATTRIBUTE, ID, SGML_ATTRIBUTE_IDENTIFIER), +DOCBOOK_(ATTRIBUTE, INHERITNUM, 0), +DOCBOOK_(ATTRIBUTE, LABEL, 0), +DOCBOOK_(ATTRIBUTE, LANG, 0), +DOCBOOK_(ATTRIBUTE, LANGUAGE, 0), +DOCBOOK_(ATTRIBUTE, LEVEL, 0), +DOCBOOK_(ATTRIBUTE, LINENUMBERING, 0), +DOCBOOK_(ATTRIBUTE, LINKEND, 0), +DOCBOOK_(ATTRIBUTE, LINKENDS, 0), +DOCBOOK_(ATTRIBUTE, LINKMODE, 0), +DOCBOOK_(ATTRIBUTE, LOCALINFO, 0), +DOCBOOK_(ATTRIBUTE, MARK, 0), +DOCBOOK_(ATTRIBUTE, MOREINFO, 0), +DOCBOOK_(ATTRIBUTE, MOREROWS, 0), +DOCBOOK_(ATTRIBUTE, NAMEEND, 0), +DOCBOOK_(ATTRIBUTE, NAMESPACE, 0), +DOCBOOK_(ATTRIBUTE, NAMEST, 0), +DOCBOOK_(ATTRIBUTE, NOWRAP, 0), +DOCBOOK_(ATTRIBUTE, NUMERATION, 0), +DOCBOOK_(ATTRIBUTE, ONCLICK, 0), +DOCBOOK_(ATTRIBUTE, ONDBLCLICK, 0), +DOCBOOK_(ATTRIBUTE, ONKEYDOWN, 0), +DOCBOOK_(ATTRIBUTE, ONKEYPRESS, 0), +DOCBOOK_(ATTRIBUTE, ONKEYUP, 0), +DOCBOOK_(ATTRIBUTE, ONMOUSEDOWN, 0), +DOCBOOK_(ATTRIBUTE, ONMOUSEMOVE, 0), +DOCBOOK_(ATTRIBUTE, ONMOUSEOUT, 0), +DOCBOOK_(ATTRIBUTE, ONMOUSEOVER, 0), +DOCBOOK_(ATTRIBUTE, ONMOUSEUP, 0), +DOCBOOK_(ATTRIBUTE, ORIENT, 0), +DOCBOOK_(ATTRIBUTE, ORIGIN, 0), +DOCBOOK_(ATTRIBUTE, OS, 0), +DOCBOOK_(ATTRIBUTE, OTHERACTION, 0), +DOCBOOK_(ATTRIBUTE, OTHERCLASS, 0), +DOCBOOK_(ATTRIBUTE, OTHERFUNCTION, 0), +DOCBOOK_(ATTRIBUTE, OTHERSPATIAL, 0), +DOCBOOK_(ATTRIBUTE, OTHERTEMPORAL, 0), +DOCBOOK_(ATTRIBUTE, OTHERTERM, 0), +DOCBOOK_(ATTRIBUTE, OTHERTYPE, 0), +DOCBOOK_(ATTRIBUTE, OTHERUNITS, 0), +DOCBOOK_(ATTRIBUTE, OVERRIDE, 0), +DOCBOOK_(ATTRIBUTE, PAGENUM, 0), +DOCBOOK_(ATTRIBUTE, PARENTBOOK, 0), +DOCBOOK_(ATTRIBUTE, PATH, 0), +DOCBOOK_(ATTRIBUTE, PERFORMANCE, 0), +DOCBOOK_(ATTRIBUTE, PGWIDE, 0), +DOCBOOK_(ATTRIBUTE, PUBWORK, 0), +DOCBOOK_(ATTRIBUTE, RELATION, 0), +DOCBOOK_(ATTRIBUTE, REMAP, 0), +DOCBOOK_(ATTRIBUTE, RENDERAS, 0), +DOCBOOK_(ATTRIBUTE, REP, 0), +DOCBOOK_(ATTRIBUTE, REVISION, 0), +DOCBOOK_(ATTRIBUTE, REVISIONFLAG, 0), +DOCBOOK_(ATTRIBUTE, ROLE, 0), +DOCBOOK_(ATTRIBUTE, ROTATE, 0), +DOCBOOK_(ATTRIBUTE, ROWSEP, 0), +DOCBOOK_(ATTRIBUTE, ROWSPAN, 0), +DOCBOOK_(ATTRIBUTE, RULES, 0), +DOCBOOK_(ATTRIBUTE, SCALE, 0), +DOCBOOK_(ATTRIBUTE, SCALEFIT, 0), +DOCBOOK_(ATTRIBUTE, SCHEME, 0), +DOCBOOK_(ATTRIBUTE, SCOPE, 0), +DOCBOOK_(ATTRIBUTE, SECURITY, 0), +DOCBOOK_(ATTRIBUTE, SEPCHAR, 0), +DOCBOOK_(ATTRIBUTE, SHORTENTRY, 0), +DOCBOOK_(ATTRIBUTE, SIGNIFICANCE, 0), +DOCBOOK_(ATTRIBUTE, SORTAS, 0), +DOCBOOK_(ATTRIBUTE, SPACING, 0), +DOCBOOK_(ATTRIBUTE, SPAN, 0), +DOCBOOK_(ATTRIBUTE, SPANNAME, 0), +DOCBOOK_(ATTRIBUTE, SPATIAL, 0), +DOCBOOK_(ATTRIBUTE, SRCCREDIT, 0), +DOCBOOK_(ATTRIBUTE, STARTINGLINENUMBER, 0), +DOCBOOK_(ATTRIBUTE, STARTREF, 0), +DOCBOOK_(ATTRIBUTE, STATUS, 0), +DOCBOOK_(ATTRIBUTE, STYLE, 0), +DOCBOOK_(ATTRIBUTE, SUBJECT, 0), +DOCBOOK_(ATTRIBUTE, SUMMARY, 0), +DOCBOOK_(ATTRIBUTE, TABSTYLE, 0), +DOCBOOK_(ATTRIBUTE, TARGETDOC, 0), +DOCBOOK_(ATTRIBUTE, TARGETDOCENT, 0), +DOCBOOK_(ATTRIBUTE, TARGETPTR, 0), +DOCBOOK_(ATTRIBUTE, TEMPORAL, 0), +DOCBOOK_(ATTRIBUTE, TERMLENGTH, 0), +DOCBOOK_(ATTRIBUTE, TGROUPSTYLE, 0), +DOCBOOK_(ATTRIBUTE, TITLE, 0), +DOCBOOK_(ATTRIBUTE, TOCENTRY, 0), +DOCBOOK_(ATTRIBUTE, TYPE, 0), +DOCBOOK_(ATTRIBUTE, UNITS, 0), +DOCBOOK_(ATTRIBUTE, URL, SGML_ATTRIBUTE_REFERENCE), +DOCBOOK_(ATTRIBUTE, USERLEVEL, 0), +DOCBOOK_(ATTRIBUTE, VALIGN, 0), +DOCBOOK_(ATTRIBUTE, VENDOR, 0), +DOCBOOK_(ATTRIBUTE, WEIGTH, 0), +DOCBOOK_(ATTRIBUTE, WIDTH, 0), +DOCBOOK_(ATTRIBUTE, XREFLABEL, 0), +DOCBOOK_(ATTRIBUTE, XREFSTYLE, 0), +DOCBOOK_(ATTRIBUTE, ZONE, 0), diff --git a/src/dom/sgml/docbook/docbook.c b/src/dom/sgml/docbook/docbook.c new file mode 100644 index 000000000..d4b96bdcd --- /dev/null +++ b/src/dom/sgml/docbook/docbook.c @@ -0,0 +1,37 @@ +/* SGML node handling */ +/* $Id: docbook.c,v 1.1.2.24 2004/02/29 02:47:30 jonas Exp $ */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include + +#include "elinks.h" + +#include "dom/sgml/docbook/docbook.h" +#include "dom/sgml/sgml.h" + + +#define DOCBOOK_(node, name, id) \ + SGML_NODE_INFO(DOCBOOK, node, name, id) + +static struct sgml_node_info docbook_attributes[DOCBOOK_ATTRIBUTES] = { + SGML_NODE_HEAD(DOCBOOK, ATTRIBUTE), + +#include "dom/sgml/docbook/attribute.inc" +}; + +static struct sgml_node_info docbook_elements[DOCBOOK_ELEMENTS] = { + SGML_NODE_HEAD(DOCBOOK, ELEMENT), + +#include "dom/sgml/docbook/element.inc" +}; + + +struct sgml_info sgml_docbook_info = { + SGML_DOCTYPE_DOCBOOK, + docbook_attributes, + docbook_elements, +}; diff --git a/src/dom/sgml/docbook/docbook.h b/src/dom/sgml/docbook/docbook.h new file mode 100644 index 000000000..879b34277 --- /dev/null +++ b/src/dom/sgml/docbook/docbook.h @@ -0,0 +1,30 @@ +#ifndef EL__DOM_SGML_DOCBOOK_DOCBOOK_H +#define EL__DOM_SGML_DOCBOOK_DOCBOOK_H + +#include "dom/stack.h" +#include "dom/sgml/sgml.h" + +extern struct sgml_info sgml_docbook_info; + +#define DOCBOOK_(node, name, flags) \ + SGML_NODE_INFO_TYPE(DOCBOOK, node, name) + +enum docbook_element_type { + DOCBOOK_ELEMENT_UNKNOWN, + +#include "dom/sgml/docbook/element.inc" + + DOCBOOK_ELEMENTS, +}; + +enum docbook_attribute_type { + DOCBOOK_ATTRIBUTE_UNKNOWN, + +#include "dom/sgml/docbook/attribute.inc" + + DOCBOOK_ATTRIBUTES, +}; + +#undef DOCBOOK_ + +#endif diff --git a/src/dom/sgml/docbook/element.inc b/src/dom/sgml/docbook/element.inc new file mode 100644 index 000000000..d0ab04093 --- /dev/null +++ b/src/dom/sgml/docbook/element.inc @@ -0,0 +1,411 @@ +/* DOCBOOK elements */ + +DOCBOOK_(ELEMENT, ABBREV, 0), +DOCBOOK_(ELEMENT, ABSTRACT, 0), +DOCBOOK_(ELEMENT, ACCEL, 0), +DOCBOOK_(ELEMENT, ACKNO, 0), +DOCBOOK_(ELEMENT, ACRONYM, 0), +DOCBOOK_(ELEMENT, ACTION, 0), +DOCBOOK_(ELEMENT, ADDRESS, 0), +DOCBOOK_(ELEMENT, AFFILIATION, 0), +DOCBOOK_(ELEMENT, ALT, 0), +DOCBOOK_(ELEMENT, ANCHOR, 0), +DOCBOOK_(ELEMENT, ANSWER, 0), +DOCBOOK_(ELEMENT, APPENDIX, 0), +DOCBOOK_(ELEMENT, APPENDIXINFO, 0), +DOCBOOK_(ELEMENT, APPLICATION, 0), +DOCBOOK_(ELEMENT, AREA, 0), +DOCBOOK_(ELEMENT, AREASET, 0), +DOCBOOK_(ELEMENT, AREASPEC, 0), +DOCBOOK_(ELEMENT, ARG, 0), +DOCBOOK_(ELEMENT, ARTICLE, 0), +DOCBOOK_(ELEMENT, ARTICLEINFO, 0), +DOCBOOK_(ELEMENT, ARTPAGENUMS, 0), +DOCBOOK_(ELEMENT, ATTRIBUTION, 0), +DOCBOOK_(ELEMENT, AUDIODATA, 0), +DOCBOOK_(ELEMENT, AUDIOOBJECT, 0), +DOCBOOK_(ELEMENT, AUTHOR, 0), +DOCBOOK_(ELEMENT, AUTHORBLURB, 0), +DOCBOOK_(ELEMENT, AUTHORGROUP, 0), +DOCBOOK_(ELEMENT, AUTHORINITIALS, 0), +DOCBOOK_(ELEMENT, BEGINPAGE, 0), +DOCBOOK_(ELEMENT, BIBLIOCOVERAGE, 0), +DOCBOOK_(ELEMENT, BIBLIODIV, 0), +DOCBOOK_(ELEMENT, BIBLIOENTRY, 0), +DOCBOOK_(ELEMENT, BIBLIOGRAPHY, 0), +DOCBOOK_(ELEMENT, BIBLIOGRAPHYINFO, 0), +DOCBOOK_(ELEMENT, BIBLIOID, 0), +DOCBOOK_(ELEMENT, BIBLIOMISC, 0), +DOCBOOK_(ELEMENT, BIBLIOMIXED, 0), +DOCBOOK_(ELEMENT, BIBLIOMSET, 0), +DOCBOOK_(ELEMENT, BIBLIORELATION, 0), +DOCBOOK_(ELEMENT, BIBLIOSET, 0), +DOCBOOK_(ELEMENT, BIBLIOSOURCE, 0), +DOCBOOK_(ELEMENT, BLOCKINFO, 0), +DOCBOOK_(ELEMENT, BLOCKQUOTE, 0), +DOCBOOK_(ELEMENT, BOOK, 0), +DOCBOOK_(ELEMENT, BOOKINFO, 0), +DOCBOOK_(ELEMENT, BRIDGEHEAD, 0), +DOCBOOK_(ELEMENT, CALLOUT, 0), +DOCBOOK_(ELEMENT, CALLOUTLIST, 0), +DOCBOOK_(ELEMENT, CAPTION, 0), +DOCBOOK_(ELEMENT, CAUTION, 0), +DOCBOOK_(ELEMENT, CHAPTER, 0), +DOCBOOK_(ELEMENT, CHAPTERINFO, 0), +DOCBOOK_(ELEMENT, CITATION, 0), +DOCBOOK_(ELEMENT, CITEBIBLIOID, 0), +DOCBOOK_(ELEMENT, CITEREFENTRY, 0), +DOCBOOK_(ELEMENT, CITETITLE, 0), +DOCBOOK_(ELEMENT, CITY, 0), +DOCBOOK_(ELEMENT, CLASSNAME, 0), +DOCBOOK_(ELEMENT, CLASSSYNOPSIS, 0), +DOCBOOK_(ELEMENT, CLASSSYNOPSISINFO, 0), +DOCBOOK_(ELEMENT, CMDSYNOPSIS, 0), +DOCBOOK_(ELEMENT, CO, 0), +DOCBOOK_(ELEMENT, CODE, 0), +DOCBOOK_(ELEMENT, COL, 0), +DOCBOOK_(ELEMENT, COLGROUP, 0), +DOCBOOK_(ELEMENT, COLLAB, 0), +DOCBOOK_(ELEMENT, COLLABNAME, 0), +DOCBOOK_(ELEMENT, COLOPHON, 0), +DOCBOOK_(ELEMENT, COLSPEC, 0), +DOCBOOK_(ELEMENT, COMMAND, 0), +DOCBOOK_(ELEMENT, COMPUTEROUTPUT, 0), +DOCBOOK_(ELEMENT, CONFDATES, 0), +DOCBOOK_(ELEMENT, CONFGROUP, 0), +DOCBOOK_(ELEMENT, CONFNUM, 0), +DOCBOOK_(ELEMENT, CONFSPONSOR, 0), +DOCBOOK_(ELEMENT, CONFTITLE, 0), +DOCBOOK_(ELEMENT, CONSTANT, 0), +DOCBOOK_(ELEMENT, CONSTRAINT, 0), +DOCBOOK_(ELEMENT, CONSTRAINTDEF, 0), +DOCBOOK_(ELEMENT, CONSTRUCTORSYNOPSIS, 0), +DOCBOOK_(ELEMENT, CONTRACTNUM, 0), +DOCBOOK_(ELEMENT, CONTRACTSPONSOR, 0), +DOCBOOK_(ELEMENT, CONTRIB, 0), +DOCBOOK_(ELEMENT, COPYRIGHT, 0), +DOCBOOK_(ELEMENT, COREF, 0), +DOCBOOK_(ELEMENT, CORPAUTHOR, 0), +DOCBOOK_(ELEMENT, CORPCREDIT, 0), +DOCBOOK_(ELEMENT, CORPNAME, 0), +DOCBOOK_(ELEMENT, COUNTRY, 0), +DOCBOOK_(ELEMENT, DATABASE, 0), +DOCBOOK_(ELEMENT, DATE, 0), +DOCBOOK_(ELEMENT, DEDICATION, 0), +DOCBOOK_(ELEMENT, DESTRUCTORSYNOPSIS, 0), +DOCBOOK_(ELEMENT, EDITION, 0), +DOCBOOK_(ELEMENT, EDITOR, 0), +DOCBOOK_(ELEMENT, EMAIL, 0), +DOCBOOK_(ELEMENT, EMPHASIS, 0), +DOCBOOK_(ELEMENT, ENTRY, 0), +DOCBOOK_(ELEMENT, ENTRYTBL, 0), +DOCBOOK_(ELEMENT, ENVAR, 0), +DOCBOOK_(ELEMENT, EPIGRAPH, 0), +DOCBOOK_(ELEMENT, EQUATION, 0), +DOCBOOK_(ELEMENT, ERRORCODE, 0), +DOCBOOK_(ELEMENT, ERRORNAME, 0), +DOCBOOK_(ELEMENT, ERRORTEXT, 0), +DOCBOOK_(ELEMENT, ERRORTYPE, 0), +DOCBOOK_(ELEMENT, EXAMPLE, 0), +DOCBOOK_(ELEMENT, EXCEPTIONNAME, 0), +DOCBOOK_(ELEMENT, FAX, 0), +DOCBOOK_(ELEMENT, FIELDSYNOPSIS, 0), +DOCBOOK_(ELEMENT, FIGURE, 0), +DOCBOOK_(ELEMENT, FILENAME, 0), +DOCBOOK_(ELEMENT, FIRSTNAME, 0), +DOCBOOK_(ELEMENT, FIRSTTERM, 0), +DOCBOOK_(ELEMENT, FOOTNOTE, 0), +DOCBOOK_(ELEMENT, FOOTNOTEREF, 0), +DOCBOOK_(ELEMENT, FOREIGNPHRASE, 0), +DOCBOOK_(ELEMENT, FORMALPARA, 0), +DOCBOOK_(ELEMENT, FUNCDEF, 0), +DOCBOOK_(ELEMENT, FUNCPARAMS, 0), +DOCBOOK_(ELEMENT, FUNCPROTOTYPE, 0), +DOCBOOK_(ELEMENT, FUNCSYNOPSIS, 0), +DOCBOOK_(ELEMENT, FUNCSYNOPSISINFO, 0), +DOCBOOK_(ELEMENT, FUNCTION, 0), +DOCBOOK_(ELEMENT, GLOSSARY, 0), +DOCBOOK_(ELEMENT, GLOSSARYINFO, 0), +DOCBOOK_(ELEMENT, GLOSSDEF, 0), +DOCBOOK_(ELEMENT, GLOSSDIV, 0), +DOCBOOK_(ELEMENT, GLOSSENTRY, 0), +DOCBOOK_(ELEMENT, GLOSSLIST, 0), +DOCBOOK_(ELEMENT, GLOSSSEE, 0), +DOCBOOK_(ELEMENT, GLOSSSEEALSO, 0), +DOCBOOK_(ELEMENT, GLOSSTERM, 0), +DOCBOOK_(ELEMENT, GRAPHIC, 0), +DOCBOOK_(ELEMENT, GRAPHICCO, 0), +DOCBOOK_(ELEMENT, GROUP, 0), +DOCBOOK_(ELEMENT, GUIBUTTON, 0), +DOCBOOK_(ELEMENT, GUIICON, 0), +DOCBOOK_(ELEMENT, GUILABEL, 0), +DOCBOOK_(ELEMENT, GUIMENU, 0), +DOCBOOK_(ELEMENT, GUIMENUITEM, 0), +DOCBOOK_(ELEMENT, GUISUBMENU, 0), +DOCBOOK_(ELEMENT, HARDWARE, 0), +DOCBOOK_(ELEMENT, HIGHLIGHTS, 0), +DOCBOOK_(ELEMENT, HOLDER, 0), +DOCBOOK_(ELEMENT, HONORIFIC, 0), +DOCBOOK_(ELEMENT, IMAGEDATA, 0), +DOCBOOK_(ELEMENT, IMAGEOBJECT, 0), +DOCBOOK_(ELEMENT, IMAGEOBJECTCO, 0), +DOCBOOK_(ELEMENT, IMPORTANT, 0), +DOCBOOK_(ELEMENT, INDEX, 0), +DOCBOOK_(ELEMENT, INDEXDIV, 0), +DOCBOOK_(ELEMENT, INDEXENTRY, 0), +DOCBOOK_(ELEMENT, INDEXINFO, 0), +DOCBOOK_(ELEMENT, INDEXTERM, 0), +DOCBOOK_(ELEMENT, INFORMALEQUATION, 0), +DOCBOOK_(ELEMENT, INFORMALEXAMPLE, 0), +DOCBOOK_(ELEMENT, INFORMALFIGURE, 0), +DOCBOOK_(ELEMENT, INFORMALTABLE, 0), +DOCBOOK_(ELEMENT, INITIALIZER, 0), +DOCBOOK_(ELEMENT, INLINEEQUATION, 0), +DOCBOOK_(ELEMENT, INLINEGRAPHIC, 0), +DOCBOOK_(ELEMENT, INLINEMEDIAOBJECT, 0), +DOCBOOK_(ELEMENT, INTERFACE, 0), +DOCBOOK_(ELEMENT, INTERFACENAME, 0), +DOCBOOK_(ELEMENT, INVPARTNUMBER, 0), +DOCBOOK_(ELEMENT, ISBN, 0), +DOCBOOK_(ELEMENT, ISSN, 0), +DOCBOOK_(ELEMENT, ISSUENUM, 0), +DOCBOOK_(ELEMENT, ITEMIZEDLIST, 0), +DOCBOOK_(ELEMENT, ITERMSET, 0), +DOCBOOK_(ELEMENT, JOBTITLE, 0), +DOCBOOK_(ELEMENT, KEYCAP, 0), +DOCBOOK_(ELEMENT, KEYCODE, 0), +DOCBOOK_(ELEMENT, KEYCOMBO, 0), +DOCBOOK_(ELEMENT, KEYSYM, 0), +DOCBOOK_(ELEMENT, KEYWORD, 0), +DOCBOOK_(ELEMENT, KEYWORDSET, 0), +DOCBOOK_(ELEMENT, LABEL, 0), +DOCBOOK_(ELEMENT, LEGALNOTICE, 0), +DOCBOOK_(ELEMENT, LHS, 0), +DOCBOOK_(ELEMENT, LINEAGE, 0), +DOCBOOK_(ELEMENT, LINEANNOTATION, 0), +DOCBOOK_(ELEMENT, LINK, 0), +DOCBOOK_(ELEMENT, LISTITEM, 0), +DOCBOOK_(ELEMENT, LITERAL, 0), +DOCBOOK_(ELEMENT, LITERALLAYOUT, 0), +DOCBOOK_(ELEMENT, LOT, 0), +DOCBOOK_(ELEMENT, LOTENTRY, 0), +DOCBOOK_(ELEMENT, MANVOLNUM, 0), +DOCBOOK_(ELEMENT, MARKUP, 0), +DOCBOOK_(ELEMENT, MEDIALABEL, 0), +DOCBOOK_(ELEMENT, MEDIAOBJECT, 0), +DOCBOOK_(ELEMENT, MEDIAOBJECTCO, 0), +DOCBOOK_(ELEMENT, MEMBER, 0), +DOCBOOK_(ELEMENT, MENUCHOICE, 0), +DOCBOOK_(ELEMENT, METHODNAME, 0), +DOCBOOK_(ELEMENT, METHODPARAM, 0), +DOCBOOK_(ELEMENT, METHODSYNOPSIS, 0), +DOCBOOK_(ELEMENT, MODESPEC, 0), +DOCBOOK_(ELEMENT, MODIFIER, 0), +DOCBOOK_(ELEMENT, MOUSEBUTTON, 0), +DOCBOOK_(ELEMENT, MSG, 0), +DOCBOOK_(ELEMENT, MSGAUD, 0), +DOCBOOK_(ELEMENT, MSGENTRY, 0), +DOCBOOK_(ELEMENT, MSGEXPLAN, 0), +DOCBOOK_(ELEMENT, MSGINFO, 0), +DOCBOOK_(ELEMENT, MSGLEVEL, 0), +DOCBOOK_(ELEMENT, MSGMAIN, 0), +DOCBOOK_(ELEMENT, MSGORIG, 0), +DOCBOOK_(ELEMENT, MSGREL, 0), +DOCBOOK_(ELEMENT, MSGSET, 0), +DOCBOOK_(ELEMENT, MSGSUB, 0), +DOCBOOK_(ELEMENT, MSGTEXT, 0), +DOCBOOK_(ELEMENT, NONTERMINAL, 0), +DOCBOOK_(ELEMENT, NOTE, 0), +DOCBOOK_(ELEMENT, OBJECTINFO, 0), +DOCBOOK_(ELEMENT, OLINK, 0), +DOCBOOK_(ELEMENT, OOCLASS, 0), +DOCBOOK_(ELEMENT, OOEXCEPTION, 0), +DOCBOOK_(ELEMENT, OOINTERFACE, 0), +DOCBOOK_(ELEMENT, OPTION, 0), +DOCBOOK_(ELEMENT, OPTIONAL, 0), +DOCBOOK_(ELEMENT, ORDEREDLIST, 0), +DOCBOOK_(ELEMENT, ORGDIV, 0), +DOCBOOK_(ELEMENT, ORGNAME, 0), +DOCBOOK_(ELEMENT, OTHERADDR, 0), +DOCBOOK_(ELEMENT, OTHERCREDIT, 0), +DOCBOOK_(ELEMENT, OTHERNAME, 0), +DOCBOOK_(ELEMENT, PAGENUMS, 0), +DOCBOOK_(ELEMENT, PARA, 0), +DOCBOOK_(ELEMENT, PARAMDEF, 0), +DOCBOOK_(ELEMENT, PARAMETER, 0), +DOCBOOK_(ELEMENT, PART, 0), +DOCBOOK_(ELEMENT, PARTINFO, 0), +DOCBOOK_(ELEMENT, PARTINTRO, 0), +DOCBOOK_(ELEMENT, PERSONBLURB, 0), +DOCBOOK_(ELEMENT, PERSONNAME, 0), +DOCBOOK_(ELEMENT, PHONE, 0), +DOCBOOK_(ELEMENT, PHRASE, 0), +DOCBOOK_(ELEMENT, POB, 0), +DOCBOOK_(ELEMENT, POSTCODE, 0), +DOCBOOK_(ELEMENT, PREFACE, 0), +DOCBOOK_(ELEMENT, PREFACEINFO, 0), +DOCBOOK_(ELEMENT, PRIMARY, 0), +DOCBOOK_(ELEMENT, PRIMARYIE, 0), +DOCBOOK_(ELEMENT, PRINTHISTORY, 0), +DOCBOOK_(ELEMENT, PROCEDURE, 0), +DOCBOOK_(ELEMENT, PRODUCTION, 0), +DOCBOOK_(ELEMENT, PRODUCTIONRECAP, 0), +DOCBOOK_(ELEMENT, PRODUCTIONSET, 0), +DOCBOOK_(ELEMENT, PRODUCTNAME, 0), +DOCBOOK_(ELEMENT, PRODUCTNUMBER, 0), +DOCBOOK_(ELEMENT, PROGRAMLISTING, 0), +DOCBOOK_(ELEMENT, PROGRAMLISTINGCO, 0), +DOCBOOK_(ELEMENT, PROMPT, 0), +DOCBOOK_(ELEMENT, PROPERTY, 0), +DOCBOOK_(ELEMENT, PUBDATE, 0), +DOCBOOK_(ELEMENT, PUBLISHER, 0), +DOCBOOK_(ELEMENT, PUBLISHERNAME, 0), +DOCBOOK_(ELEMENT, PUBSNUMBER, 0), +DOCBOOK_(ELEMENT, QANDADIV, 0), +DOCBOOK_(ELEMENT, QANDAENTRY, 0), +DOCBOOK_(ELEMENT, QANDASET, 0), +DOCBOOK_(ELEMENT, QUESTION, 0), +DOCBOOK_(ELEMENT, QUOTE, 0), +DOCBOOK_(ELEMENT, REFCLASS, 0), +DOCBOOK_(ELEMENT, REFDESCRIPTOR, 0), +DOCBOOK_(ELEMENT, REFENTRY, 0), +DOCBOOK_(ELEMENT, REFENTRYINFO, 0), +DOCBOOK_(ELEMENT, REFENTRYTITLE, 0), +DOCBOOK_(ELEMENT, REFERENCE, 0), +DOCBOOK_(ELEMENT, REFERENCEINFO, 0), +DOCBOOK_(ELEMENT, REFMETA, 0), +DOCBOOK_(ELEMENT, REFMISCINFO, 0), +DOCBOOK_(ELEMENT, REFNAME, 0), +DOCBOOK_(ELEMENT, REFNAMEDIV, 0), +DOCBOOK_(ELEMENT, REFPURPOSE, 0), +DOCBOOK_(ELEMENT, REFSECT1, 0), +DOCBOOK_(ELEMENT, REFSECT1INFO, 0), +DOCBOOK_(ELEMENT, REFSECT2, 0), +DOCBOOK_(ELEMENT, REFSECT2INFO, 0), +DOCBOOK_(ELEMENT, REFSECT3, 0), +DOCBOOK_(ELEMENT, REFSECT3INFO, 0), +DOCBOOK_(ELEMENT, REFSECTION, 0), +DOCBOOK_(ELEMENT, REFSECTIONINFO, 0), +DOCBOOK_(ELEMENT, REFSYNOPSISDIV, 0), +DOCBOOK_(ELEMENT, REFSYNOPSISDIVINFO, 0), +DOCBOOK_(ELEMENT, RELEASEINFO, 0), +DOCBOOK_(ELEMENT, REMARK, 0), +DOCBOOK_(ELEMENT, REPLACEABLE, 0), +DOCBOOK_(ELEMENT, RETURNVALUE, 0), +DOCBOOK_(ELEMENT, REVDESCRIPTION, 0), +DOCBOOK_(ELEMENT, REVHISTORY, 0), +DOCBOOK_(ELEMENT, REVISION, 0), +DOCBOOK_(ELEMENT, REVNUMBER, 0), +DOCBOOK_(ELEMENT, REVREMARK, 0), +DOCBOOK_(ELEMENT, RHS, 0), +DOCBOOK_(ELEMENT, ROW, 0), +DOCBOOK_(ELEMENT, SBR, 0), +DOCBOOK_(ELEMENT, SCREEN, 0), +DOCBOOK_(ELEMENT, SCREENCO, 0), +DOCBOOK_(ELEMENT, SCREENINFO, 0), +DOCBOOK_(ELEMENT, SCREENSHOT, 0), +DOCBOOK_(ELEMENT, SECONDARY, 0), +DOCBOOK_(ELEMENT, SECONDARYIE, 0), +DOCBOOK_(ELEMENT, SECT1, 0), +DOCBOOK_(ELEMENT, SECT1INFO, 0), +DOCBOOK_(ELEMENT, SECT2, 0), +DOCBOOK_(ELEMENT, SECT2INFO, 0), +DOCBOOK_(ELEMENT, SECT3, 0), +DOCBOOK_(ELEMENT, SECT3INFO, 0), +DOCBOOK_(ELEMENT, SECT4, 0), +DOCBOOK_(ELEMENT, SECT4INFO, 0), +DOCBOOK_(ELEMENT, SECT5, 0), +DOCBOOK_(ELEMENT, SECT5INFO, 0), +DOCBOOK_(ELEMENT, SECTION, 0), +DOCBOOK_(ELEMENT, SECTIONINFO, 0), +DOCBOOK_(ELEMENT, SEE, 0), +DOCBOOK_(ELEMENT, SEEALSO, 0), +DOCBOOK_(ELEMENT, SEEALSOIE, 0), +DOCBOOK_(ELEMENT, SEEIE, 0), +DOCBOOK_(ELEMENT, SEG, 0), +DOCBOOK_(ELEMENT, SEGLISTITEM, 0), +DOCBOOK_(ELEMENT, SEGMENTEDLIST, 0), +DOCBOOK_(ELEMENT, SEGTITLE, 0), +DOCBOOK_(ELEMENT, SERIESVOLNUMS, 0), +DOCBOOK_(ELEMENT, SET, 0), +DOCBOOK_(ELEMENT, SETINDEX, 0), +DOCBOOK_(ELEMENT, SETINDEXINFO, 0), +DOCBOOK_(ELEMENT, SETINFO, 0), +DOCBOOK_(ELEMENT, SGMLTAG, 0), +DOCBOOK_(ELEMENT, SHORTAFFIL, 0), +DOCBOOK_(ELEMENT, SHORTCUT, 0), +DOCBOOK_(ELEMENT, SIDEBAR, 0), +DOCBOOK_(ELEMENT, SIDEBARINFO, 0), +DOCBOOK_(ELEMENT, SIMPARA, 0), +DOCBOOK_(ELEMENT, SIMPLELIST, 0), +DOCBOOK_(ELEMENT, SIMPLEMSGENTRY, 0), +DOCBOOK_(ELEMENT, SIMPLESECT, 0), +DOCBOOK_(ELEMENT, SPANSPEC, 0), +DOCBOOK_(ELEMENT, STATE, 0), +DOCBOOK_(ELEMENT, STEP, 0), +DOCBOOK_(ELEMENT, STEPALTERNATIVES, 0), +DOCBOOK_(ELEMENT, STREET, 0), +DOCBOOK_(ELEMENT, STRUCTFIELD, 0), +DOCBOOK_(ELEMENT, STRUCTNAME, 0), +DOCBOOK_(ELEMENT, SUBJECT, 0), +DOCBOOK_(ELEMENT, SUBJECTSET, 0), +DOCBOOK_(ELEMENT, SUBJECTTERM, 0), +DOCBOOK_(ELEMENT, SUBSCRIPT, 0), +DOCBOOK_(ELEMENT, SUBSTEPS, 0), +DOCBOOK_(ELEMENT, SUBTITLE, 0), +DOCBOOK_(ELEMENT, SUPERSCRIPT, 0), +DOCBOOK_(ELEMENT, SURNAME, 0), +DOCBOOK_(ELEMENT, SYMBOL, 0), +DOCBOOK_(ELEMENT, SYNOPFRAGMENT, 0), +DOCBOOK_(ELEMENT, SYNOPFRAGMENTREF, 0), +DOCBOOK_(ELEMENT, SYNOPSIS, 0), +DOCBOOK_(ELEMENT, SYSTEMITEM, 0), +DOCBOOK_(ELEMENT, TABLE, 0), +DOCBOOK_(ELEMENT, TASK, 0), +DOCBOOK_(ELEMENT, TASKPREREQUISITES, 0), +DOCBOOK_(ELEMENT, TASKRELATED, 0), +DOCBOOK_(ELEMENT, TASKSUMMARY, 0), +DOCBOOK_(ELEMENT, TBODY, 0), +DOCBOOK_(ELEMENT, TD, 0), +DOCBOOK_(ELEMENT, TERM, 0), +DOCBOOK_(ELEMENT, TERTIARY, 0), +DOCBOOK_(ELEMENT, TERTIARYIE, 0), +DOCBOOK_(ELEMENT, TEXTDATA, 0), +DOCBOOK_(ELEMENT, TEXTOBJECT, 0), +DOCBOOK_(ELEMENT, TFOOT, 0), +DOCBOOK_(ELEMENT, TGROUP, 0), +DOCBOOK_(ELEMENT, TH, 0), +DOCBOOK_(ELEMENT, THEAD, 0), +DOCBOOK_(ELEMENT, TIP, 0), +DOCBOOK_(ELEMENT, TITLE, 0), +DOCBOOK_(ELEMENT, TITLEABBREV, 0), +DOCBOOK_(ELEMENT, TOC, 0), +DOCBOOK_(ELEMENT, TOCBACK, 0), +DOCBOOK_(ELEMENT, TOCCHAP, 0), +DOCBOOK_(ELEMENT, TOCENTRY, 0), +DOCBOOK_(ELEMENT, TOCFRONT, 0), +DOCBOOK_(ELEMENT, TOCLEVEL1, 0), +DOCBOOK_(ELEMENT, TOCLEVEL2, 0), +DOCBOOK_(ELEMENT, TOCLEVEL3, 0), +DOCBOOK_(ELEMENT, TOCLEVEL4, 0), +DOCBOOK_(ELEMENT, TOCLEVEL5, 0), +DOCBOOK_(ELEMENT, TOCPART, 0), +DOCBOOK_(ELEMENT, TOKEN, 0), +DOCBOOK_(ELEMENT, TR, 0), +DOCBOOK_(ELEMENT, TRADEMARK, 0), +DOCBOOK_(ELEMENT, TYPE, 0), +DOCBOOK_(ELEMENT, ULINK, 0), +DOCBOOK_(ELEMENT, URI, 0), +DOCBOOK_(ELEMENT, USERINPUT, 0), +DOCBOOK_(ELEMENT, VARARGS, 0), +DOCBOOK_(ELEMENT, VARIABLELIST, 0), +DOCBOOK_(ELEMENT, VARLISTENTRY, 0), +DOCBOOK_(ELEMENT, VARNAME, 0), +DOCBOOK_(ELEMENT, VIDEODATA, 0), +DOCBOOK_(ELEMENT, VIDEOOBJECT, 0), +DOCBOOK_(ELEMENT, VOID, 0), +DOCBOOK_(ELEMENT, VOLUMENUM, 0), +DOCBOOK_(ELEMENT, WARNING, 0), +DOCBOOK_(ELEMENT, WORDASWORD, 0), +DOCBOOK_(ELEMENT, XREF, 0), +DOCBOOK_(ELEMENT, YEAR, 0), diff --git a/src/dom/sgml/sgml.c b/src/dom/sgml/sgml.c index 494453211..145d894d7 100644 --- a/src/dom/sgml/sgml.c +++ b/src/dom/sgml/sgml.c @@ -16,6 +16,7 @@ /* Backend includes: */ +#include "dom/sgml/docbook/docbook.h" #include "dom/sgml/html/html.h" #include "dom/sgml/rss/rss.h" #include "dom/sgml/xbel/xbel.h" @@ -31,6 +32,7 @@ sgml_info_strcmp(const void *key_, const void *node_) } struct sgml_info *sgml_info[SGML_DOCTYPES] = { + &sgml_docbook_info, &sgml_html_info, &sgml_rss_info, &sgml_xbel_info, diff --git a/src/dom/sgml/sgml.h b/src/dom/sgml/sgml.h index 0e059f60a..f3c064e75 100644 --- a/src/dom/sgml/sgml.h +++ b/src/dom/sgml/sgml.h @@ -76,6 +76,7 @@ get_sgml_node_info(struct sgml_node_info list[], struct dom_node *node) } enum sgml_document_type { + SGML_DOCTYPE_DOCBOOK, SGML_DOCTYPE_HTML, SGML_DOCTYPE_RSS, SGML_DOCTYPE_XBEL, diff --git a/src/intl/gettext/Makefile b/src/intl/gettext/Makefile index 82c3f085d..1b45ac0ae 100644 --- a/src/intl/gettext/Makefile +++ b/src/intl/gettext/Makefile @@ -25,9 +25,9 @@ OBJS = \ textdomain.o -# $(builddir)/charset.alias: $(srcdir)/config.charset +# $(builddir)/charset.alias: $(srcdir)config.charset $(builddir)/charset.alias: $(srcdir)config.charset - $(SHELL) $(srcdir)/config.charset '$(host)' > $@.new + $(SHELL) $(srcdir)config.charset '$(host)' > $@.new mv $@.new $@ # FIXME: Building plural.c from plural.y on the fly doesn't work @@ -61,7 +61,7 @@ install-local: $(builddir)/charset.alias all $(MKINSTALLDIRS) $(DESTDIR)$(localedir); \ test -f $(DESTDIR)$(localedir)/locale.alias \ && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ + || orig=$(srcdir)locale.alias; \ temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-add.sed $$orig > $$temp; \ diff --git a/src/mime/backend/default.c b/src/mime/backend/default.c index a32803a8d..466261da6 100644 --- a/src/mime/backend/default.c +++ b/src/mime/backend/default.c @@ -100,6 +100,7 @@ static struct option_info default_mime_options[] = { #ifdef CONFIG_DOM INIT_OPT_MIME_EXTENSION("rss", "application/rss+xml"), INIT_OPT_MIME_EXTENSION("xbel", "application/xbel+xml"), + INIT_OPT_MIME_EXTENSION("sgml", "application/docbook+xml"), #endif NULL_OPTION_INFO, diff --git a/src/session/download.c b/src/session/download.c index ca56d74c6..4f7c5dba8 100644 --- a/src/session/download.c +++ b/src/session/download.c @@ -1147,14 +1147,15 @@ struct { unsigned int plain:1; } static known_types[] = { { "text/html", 0 }, + { "text/plain", 1 }, { "application/xhtml+xml", 0 }, /* RFC 3236 */ #if CONFIG_DOM + { "application/docbook+xml", 1 }, { "application/rss+xml", 1 }, { "application/xbel+xml", 1 }, { "application/xbel", 1 }, { "application/x-xbel", 1 }, #endif - { "text/plain", 1 }, { NULL, 1 }, }; diff --git a/src/util/error.c b/src/util/error.c index eb5949f21..0c2d1cd1d 100644 --- a/src/util/error.c +++ b/src/util/error.c @@ -216,7 +216,7 @@ elinks_log(unsigned char *msg, unsigned char *file, int line, log_files = getenv("ELINKS_FILES"); log_msg = getenv("ELINKS_MSG"); log_name = getenv("ELINKS_LOG"); - log_file = log_name ? fopen(log_name, "a") : stderr; + log_file = log_name ? fopen(log_name, "ab") : stderr; if (!log_file) return; diff --git a/test/docbook/elinks.1.sgml b/test/docbook/elinks.1.sgml new file mode 100644 index 000000000..6ba0abb81 --- /dev/null +++ b/test/docbook/elinks.1.sgml @@ -0,0 +1,150 @@ + + + + + + + + elinks + 1 + + + + elinks + lynx-like alternative character mode WWW browser + + + + + elinks + options + url + + + + DESCRIPTION + + + ELinks is a text mode WWW browser, supporting colors, + table rendering, background downloading, menu driven + configuration interface, tabbed browsing and slim code. + + + + + Frames are supported. You can have different file formats associated + with external viewers. mailto: and telnet: are supported via external + clients. + + + + + ELinks can handle local (file://) or remote + (http://, ftp:// or + https:// if there's compiled-in SSL support) URLs. + It has also basic support for finger:. + + + + + OPTIONS + + + Most options can be set in the user interface or config file, so + usually you do not need to care about them. Note that this list is by + no means complete and it is not kept up-to-date. To get complete list + of commandline options, start ELinks with parameter + --help. + + +&config-cmdoptions; + + + ENVIRONMENT VARIABLES +&config-envvars; + + + FILES +&config-files; + + + PLATFORMS + + + ELinks is known to work on Linux, FreeBSD, OpenBSD, Solaris, IRIX, + HPUX, Digital Unix, AIX, OS/2, BeOS and RISC OS. Port for Win32 is in + state of beta testing. + + + + + BUGS + + + See the BUGS file coming with ELinks distribution + tarball for list of known bugs. + + + + + Please report any other bugs you find to the ELinks mailing list + + elinks-users@linuxfromscratch.org or + the bug system. + + + + + LICENSE + + + ELinks is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + + + + AUTHORS + + + Links was written by Mikulas Patocka + mikulas@artax.karlin.mff.cuni.cz. ELinks - which is + based on Links - was written by Petr Baudis + pasky@ucw.cz. See file AUTHORS in + the source tree for a list of people contributing to this project. + + + + + The homepage of ELinks can be found at http://elinks.or.cz/ + + + + + This manual page was written by Peter Gervai + grin@tolna.net, using excerpts from a (yet?) unknown + Links fan for the Debian GNU/Linux system (but may be used by others). + Contributions from Francis A. Holop. Extended, clarified and made more + up-to-date by Petr Baudis pasky@ucw.cz. Updated by Zas + zas@norz.org. The conversion to DocBook for ELinks 0.5 + and trimming was done by Jonas Fonseca fonseca@diku.dk. + + + + + SEE ALSO + + + elinkskeys(5), + elinks.conf(5), + links(1), + lynx(1), + w3m(1), + wget(1) + + + +