Log Message: ----------- rudimentary implementation of <simplelist> Modified Files: -------------- docbook2mdoc: docbook2mdoc.c statistics.c Revision Data ------------- Index: statistics.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/statistics.c,v retrieving revision 1.12 retrieving revision 1.13 diff -Lstatistics.c -Lstatistics.c -u -p -r1.12 -r1.13 --- statistics.c +++ statistics.c @@ -372,6 +372,7 @@ main(int argc, char *argv[]) table_add("listitem", NULL); table_add("literal", "TEXT"); table_add("literallayout", NULL); + table_add("member", "TEXT"); table_add("orderedlist", "listitem"); table_add("para", NULL); table_add("paramdef", "parameter"); @@ -401,6 +402,7 @@ main(int argc, char *argv[]) table_add("sect3", NULL); table_add("sect4", NULL); table_add("sgmltag", "TEXT"); + table_add("simplelist", "member"); table_add("structfield", "TEXT"); table_add("structname", "TEXT"); table_add("symbol", "TEXT"); Index: docbook2mdoc.c =================================================================== RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.90 retrieving revision 1.91 diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.90 -r1.91 --- docbook2mdoc.c +++ docbook2mdoc.c @@ -894,6 +894,24 @@ pnode_print(struct format *p, struct pno fputs("$ ", stdout); p->linestate = sv; break; + case NODE_MEMBER: + if ((pp = TAILQ_NEXT(pn, child)) != NULL && + pp->node != NODE_MEMBER) + pp = NULL; + switch (p->linestate) { + case LINE_TEXT: + if (pp != NULL) + print_text(p, ",", 0); + break; + case LINE_MACRO: + if (pp != NULL) + macro_addarg(p, ",", ARG_SPACE); + macro_close(p); + break; + case LINE_NEW: + break; + } + break; case NODE_MML_MROW: case NODE_MML_MI: case NODE_MML_MN: @@ -927,7 +945,8 @@ pnode_print(struct format *p, struct pno case NODE_SGMLTAG: case NODE_TYPE: case NODE_VARNAME: - if (sv != LINE_MACRO && p->linestate == LINE_MACRO) + if (sv != LINE_MACRO && p->linestate == LINE_MACRO && + (pn->parent == NULL || pn->parent->node != NODE_MEMBER)) macro_closepunct(p, pn); break; case NODE_QUOTE: -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv