=================================================================== RCS file: /cvs/docbook2mdoc/node.c,v retrieving revision 1.16 retrieving revision 1.22 diff -u -p -r1.16 -r1.22 --- docbook2mdoc/node.c 2019/04/14 20:13:25 1.16 +++ docbook2mdoc/node.c 2019/04/16 21:21:27 1.22 @@ -1,4 +1,4 @@ -/* $Id: node.c,v 1.16 2019/04/14 20:13:25 schwarze Exp $ */ +/* $Id: node.c,v 1.22 2019/04/16 21:21:27 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * Copyright (c) 2019 Ingo Schwarze @@ -58,7 +58,7 @@ static const struct nodeprop properties[] = { { "fieldsynopsis", CLASS_TRANS }, { "filename", CLASS_LINE }, { "firstterm", CLASS_LINE }, - { "footnote", CLASS_TRANS }, + { "footnote", CLASS_BLOCK }, { "funcdef", CLASS_BLOCK }, { "funcprototype", CLASS_BLOCK }, { "funcsynopsis", CLASS_TRANS }, @@ -66,6 +66,7 @@ static const struct nodeprop properties[] = { { "function", CLASS_LINE }, { "glossterm", CLASS_LINE }, { "group", CLASS_ENCL }, + { "imagedata", CLASS_TEXT }, { "xi:include", CLASS_VOID }, { "index", CLASS_TRANS }, { "info", CLASS_TRANS }, @@ -77,7 +78,7 @@ static const struct nodeprop properties[] = { { "link", CLASS_ENCL }, { "listitem", CLASS_TRANS }, { "literal", CLASS_ENCL }, - { "literallayout", CLASS_BLOCK }, + { "literallayout", CLASS_NOFILL }, { "manvolnum", CLASS_TRANS }, { "markup", CLASS_LINE }, { "member", CLASS_LINE }, @@ -92,6 +93,7 @@ static const struct nodeprop properties[] = { { "mml:msup", CLASS_LINE }, { "modifier", CLASS_LINE }, { "note", CLASS_BLOCK }, + { "olink", CLASS_ENCL }, { "option", CLASS_LINE }, { "orderedlist", CLASS_BLOCK }, { "para", CLASS_BLOCK }, @@ -99,7 +101,8 @@ static const struct nodeprop properties[] = { { "parameter", CLASS_LINE }, { "personname", CLASS_TRANS }, { "preface", CLASS_BLOCK }, - { "programlisting", CLASS_BLOCK }, + { "productname", CLASS_LINE }, + { "programlisting", CLASS_NOFILL }, { "prompt", CLASS_TRANS }, { "pubdate", CLASS_TRANS }, { "quote", CLASS_ENCL }, @@ -118,7 +121,7 @@ static const struct nodeprop properties[] = { { "replaceable", CLASS_LINE }, { "row", CLASS_BLOCK }, { "sbr", CLASS_BLOCK }, - { "screen", CLASS_BLOCK }, + { "screen", CLASS_NOFILL }, { "section", CLASS_BLOCK }, { "simplelist", CLASS_TRANS }, { "simplesect", CLASS_BLOCK }, @@ -126,7 +129,7 @@ static const struct nodeprop properties[] = { { "subscript", CLASS_TEXT }, { "subtitle", CLASS_BLOCK }, { "superscript", CLASS_TEXT }, - { "synopsis", CLASS_BLOCK }, + { "synopsis", CLASS_NOFILL }, { "systemitem", CLASS_LINE }, { "table", CLASS_TRANS }, { "tbody", CLASS_TRANS }, @@ -142,6 +145,7 @@ static const struct nodeprop properties[] = { { "varname", CLASS_LINE }, { "warning", CLASS_BLOCK }, { "wordasword", CLASS_TRANS }, + { "xref", CLASS_LINE }, { "[UNKNOWN]", CLASS_VOID }, { "(t)", CLASS_TEXT }, { "(e)", CLASS_TEXT } @@ -154,14 +158,19 @@ static const char *const attrkeys[ATTRKEY__MAX] = { "cols", "DEFINITION", "endterm", + "entityref", + "fileref", "href", "id", "linkend", + "localinfo", "NAME", "open", "PUBLIC", "rep", "SYSTEM", + "targetdoc", + "targetptr", "url", "xlink:href" };