From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]); by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 8b377135; for ; Tue, 24 Feb 2015 15:35:14 -0500 (EST) Date: Tue, 24 Feb 2015 15:35:14 -0500 (EST) Message-Id: <5687671756926860742.enqueue@fantadrom.bsd.lv> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: kristaps@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: texi2mdoc: Allow many more (all?) symbols and punctuate. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- Allow many more (all?) symbols and punctuate. Modified Files: -------------- texi2mdoc: extern.h main.c Revision Data ------------- Index: extern.h =================================================================== RCS file: /home/cvs/mdocml/texi2mdoc/extern.h,v retrieving revision 1.12 retrieving revision 1.13 diff -Lextern.h -Lextern.h -u -p -r1.12 -r1.13 --- extern.h +++ extern.h @@ -106,6 +106,7 @@ enum texicmd { TEXICMD_ENV, TEXICMD_EQUIV, TEXICMD_ERROR, + TEXICMD_EURO, TEXICMD_EXAMPLE, TEXICMD_EXCLAMDOWN, TEXICMD_EXDENT, @@ -116,8 +117,15 @@ enum texicmd { TEXICMD_FOOTNOTE, TEXICMD_FTABLE, TEXICMD_FORMAT, + TEXICMD_GEQ, TEXICMD_GRAVE, TEXICMD_GROUP, + TEXICMD_GUILLEMETLEFT, + TEXICMD_GUILLEMETRIGHT, + TEXICMD_GUILLEMOTLEFT, + TEXICMD_GUILLEMOTRIGHT, + TEXICMD_GUILSINGLLEFT, + TEXICMD_GUILSINGLRIGHT, TEXICMD_H, TEXICMD_HEADING, TEXICMD_HEADINGS, @@ -153,6 +161,7 @@ enum texicmd { TEXICMD_KINDEX, TEXICMD_L, TEXICMD_LATEX, + TEXICMD_LEQ, TEXICMD_LOWERSECTIONS, TEXICMD_LSMALL, TEXICMD_MACRO, @@ -177,15 +186,23 @@ enum texicmd { TEXICMD_PARINDENT, TEXICMD_PERIOD, TEXICMD_PINDEX, + TEXICMD_POUNDS, TEXICMD_PRINTINDEX, TEXICMD_PXREF, TEXICMD_QUESTIONDOWN, TEXICMD_QUESTIONMARK, TEXICMD_QUOTATION, + TEXICMD_QUOTEDBLBASE, + TEXICMD_QUOTEDBLLEFT, + TEXICMD_QUOTEDBLRIGHT, + TEXICMD_QUOTESINGLBASE, + TEXICMD_QUOTELEFT, + TEXICMD_QUOTERIGHT, TEXICMD_R, TEXICMD_RAISESECTIONS, TEXICMD_REF, TEXICMD_REFILL, + TEXICMD_REGISTEREDSYMBOL, TEXICMD_RESULT, TEXICMD_RINGACCENT, TEXICMD_SAMP, @@ -225,6 +242,7 @@ enum texicmd { TEXICMD_TABLE, TEXICMD_TEX, TEXICMD_TEXSYM, + TEXICMD_TEXTDEGREE, TEXICMD_TH, TEXICMD_THSMALL, TEXICMD_TIE, Index: main.c =================================================================== RCS file: /home/cvs/mdocml/texi2mdoc/main.c,v retrieving revision 1.42 retrieving revision 1.43 diff -Lmain.c -Lmain.c -u -p -r1.42 -r1.43 --- main.c +++ main.c @@ -160,6 +160,7 @@ static const struct texitok __texitoks[T { doinline, "env", 3 }, /* TEXICMD_ENV */ { dosymbol, "equiv", 5 }, /* TEXICMD_EQUIV */ { dosymbol, "error", 5 }, /* TEXICMD_ERROR */ + { dosymbol, "euro", 4 }, /* TEXICMD_EURO */ { doexample, "example", 7 }, /* TEXICMD_EXAMPLE */ { dosymbol, "exclamdown", 10 }, /* TEXICMD_EXCLAMDOWN */ { doignline, "exdent", 6 }, /* TEXICMD_EXDENT */ @@ -170,8 +171,15 @@ static const struct texitok __texitoks[T { doignbracket, "footnote", 8 }, /* TEXICMD_FOOTNOTE */ { dotable, "ftable", 6 }, /* TEXICMD_FTABLE */ { dodisplay, "format", 6 }, /* TEXICMD_FORMAT */ + { dosymbol, "geq", 3 }, /* TEXICMD_GEQ */ { doaccent, "`", 1 }, /* TEXICMD_GRAVE */ { doblock, "group", 5 }, /* TEXICMD_GROUP */ + { dosymbol, "guillemetleft", 13 }, /* TEXICMD_GUILLEMETLEFT */ + { dosymbol, "guillemetright", 14 }, /* TEXICMD_GUILLEMETRIGHT */ + { dosymbol, "guillemotleft", 13 }, /* TEXICMD_GUILLEMOTLEFT */ + { dosymbol, "guillemotright", 14 }, /* TEXICMD_GUILLEMOTRIGHT */ + { dosymbol, "guilsinglleft", 13 }, /* TEXICMD_GUILSINGLLEFT */ + { dosymbol, "guilsinglright", 14 }, /* TEXICMD_GUILSINGLRIGHT */ { doaccent, "H", 1 }, /* TEXICMD_H */ { dosection, "heading", 7 }, /* TEXICMD_HEADING */ { doignline, "headings", 8 }, /* TEXICMD_HEADINGS */ @@ -207,6 +215,7 @@ static const struct texitok __texitoks[T { doignline, "kindex", 6 }, /* TEXICMD_KINDEX */ { dosymbol, "L", 1 }, /* TEXICMD_L */ { dosymbol, "LaTeX", 5 }, /* TEXICMD_LATEX */ + { dosymbol, "leq", 3 }, /* TEXICMD_LEQ */ { dosecoffs, "lowersections", 13 }, /* TEXICMD_LOWERSECTIONS */ { dosymbol, "l", 1 }, /* TEXICMD_LSMALL */ { domacro, "macro", 5 }, /* TEXICMD_MACRO */ @@ -231,15 +240,23 @@ static const struct texitok __texitoks[T { doignline, "paragraphindent", 15 }, /* TEXICMD_PARINDENT */ { dosymbol, ".", 1 }, /* TEXICMD_PERIOD */ { doignline, "pindex", 6 }, /* TEXICMD_PINDEX */ + { dosymbol, "pounds", 6 }, /* TEXICMD_POUNDS */ { doignline, "printindex", 10 }, /* TEXICMD_PRINTINDEX */ { dolink, "pxref", 5 }, /* TEXICMD_PXREF */ { dosymbol, "questiondown", 12 }, /* TEXICMD_QUESTIONDOWN */ { dosymbol, "?", 1 }, /* TEXICMD_QUESTIONMARK */ { doquotation, "quotation", 9 }, /* TEXICMD_QUOTATION */ + { dosymbol, "quotedblbase", 12 }, /* TEXICMD_QUOTEDBLBASE */ + { dosymbol, "quotedblleft", 12 }, /* TEXICMD_QUOTEDBLLEFT */ + { dosymbol, "quotedblright", 13 }, /* TEXICMD_QUOTEDBLRIGHT */ + { dosymbol, "quotesinglbase", 14 }, /* TEXICMD_QUOTESINGLBASE */ + { dosymbol, "quoteleft", 9 }, /* TEXICMD_QUOTELEFT */ + { dosymbol, "quoteright", 10 }, /* TEXICMD_QUOTERIGHT */ { doinline, "r", 1 }, /* TEXICMD_R */ { dosecoffs, "raisesections", 13 }, /* TEXICMD_RAISESECTIONS */ { dobracket, "ref", 3 }, /* TEXICMD_REF */ { doignline, "refill", 6 }, /* TEXICMD_REFILL */ + { dosymbol, "registeredsymbol", 16 }, /* TEXICMD_REGISTEREDSYMBOL */ { dosymbol, "result", 6 }, /* TEXICMD_RESULT */ { doaccent, "ringaccent", 10 }, /* TEXICMD_RINGACCENT */ { doinline, "samp", 4 }, /* TEXICMD_SAMP */ @@ -279,6 +296,7 @@ static const struct texitok __texitoks[T { dotable, "table", 5 }, /* TEXICMD_TABLE */ { doignblock, "tex", 3 }, /* TEXICMD_TEX */ { dosymbol, "TeX", 3 }, /* TEXICMD_TEXSYM */ + { dosymbol, "textdegree", 10 }, /* TEXICMD_TEXTDEGREE */ { dosymbol, "TH", 2 }, /* TEXICMD_TH */ { dosymbol, "th", 2 }, /* TEXICMD_THSMALL */ { dosymbol, "tie", 3 }, /* TEXICMD_TIE */ @@ -1067,10 +1085,10 @@ dosymbol(struct texi *p, enum texicmd cm { /* Remember to pad us. */ - if (p->seenws && p->outcol && 0 == p->literal) { + if (p->seenws && p->outcol && 0 == p->literal) texiputchar(p, ' '); - p->seenws = 0; - } + + p->seenws = 0; switch (cmd) { case (TEXICMD_AA): @@ -1122,18 +1140,41 @@ dosymbol(struct texi *p, enum texicmd cm case (TEXICMD_ERROR): texiputchars(p, "error\\(->"); break; + case (TEXICMD_EURO): + texiputchars(p, "\\(Eu"); + break; case (TEXICMD_EXCLAMDOWN): texiputchars(p, "\\(r!"); break; case (TEXICMD_EXPANSION): texiputchars(p, "\\(->"); break; + case (TEXICMD_GEQ): + texiputchars(p, "\\(>="); + break; + case (TEXICMD_GUILLEMETLEFT): + case (TEXICMD_GUILLEMOTLEFT): + texiputchars(p, "\\(Fo"); + break; + case (TEXICMD_GUILLEMETRIGHT): + case (TEXICMD_GUILLEMOTRIGHT): + texiputchars(p, "\\(Fc"); + break; + case (TEXICMD_GUILSINGLLEFT): + texiputchars(p, "\\(fo"); + break; + case (TEXICMD_GUILSINGLRIGHT): + texiputchars(p, "\\(fc"); + break; case (TEXICMD_L): texiputchars(p, "\\(/L"); break; case (TEXICMD_LATEX): texiputchars(p, "LaTeX"); break; + case (TEXICMD_LEQ): + texiputchars(p, "\\(<="); + break; case (TEXICMD_LSMALL): texiputchars(p, "\\(/l"); break; @@ -1161,12 +1202,36 @@ dosymbol(struct texi *p, enum texicmd cm case (TEXICMD_PERIOD): texiputchar(p, '.'); break; + case (TEXICMD_POUNDS): + texiputchars(p, "\\(Po"); + break; case (TEXICMD_QUESTIONDOWN): texiputchars(p, "\\(r?"); break; case (TEXICMD_QUESTIONMARK): texiputchar(p, '?'); break; + case (TEXICMD_QUOTEDBLBASE): + texiputchars(p, "\\(Bq"); + break; + case (TEXICMD_QUOTEDBLLEFT): + texiputchars(p, "\\(lq"); + break; + case (TEXICMD_QUOTEDBLRIGHT): + texiputchars(p, "\\(rq"); + break; + case (TEXICMD_QUOTESINGLBASE): + texiputchars(p, "\\(bq"); + break; + case (TEXICMD_QUOTELEFT): + texiputchars(p, "\\(oq"); + break; + case (TEXICMD_QUOTERIGHT): + texiputchars(p, "\\(cq"); + break; + case (TEXICMD_REGISTEREDSYMBOL): + texiputchars(p, "\\(rg"); + break; case (TEXICMD_RESULT): texiputchars(p, "\\(rA"); break; @@ -1184,6 +1249,9 @@ dosymbol(struct texi *p, enum texicmd cm break; case (TEXICMD_TEXSYM): texiputchars(p, "TeX"); + break; + case (TEXICMD_TEXTDEGREE): + texiputchars(p, "\\(de"); break; case (TEXICMD_TH): texiputchars(p, "\\(TP"); -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv