From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p6N9lQ88015529 for ; Sat, 23 Jul 2011 05:47:26 -0400 (EDT) Received: (from kristaps@localhost) by krisdoz.my.domain (8.14.3/8.14.3/Submit) id p6N9lP1A015555; Sat, 23 Jul 2011 05:47:25 -0400 (EDT) Date: Sat, 23 Jul 2011 05:47:25 -0400 (EDT) Message-Id: <201107230947.p6N9lP1A015555@krisdoz.my.domain> 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: mdocml: The circumflex is also a special space character. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- The circumflex is also a special space character. Note this and clean up some documentation in eqn.7. Also add some version notes, although I'm not ready for a release yet. Modified Files: -------------- mdocml: eqn.7 eqn.c index.sgml Revision Data ------------- Index: eqn.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/eqn.c,v retrieving revision 1.30 retrieving revision 1.31 diff -Leqn.c -Leqn.c -u -p -r1.30 -r1.31 --- eqn.c +++ eqn.c @@ -648,7 +648,7 @@ again: if ('{' == *start || '}' == *start) ssz = 1; else - ssz = strcspn(start + 1, " ~\"{}\t") + 1; + ssz = strcspn(start + 1, " ^~\"{}\t") + 1; next = start + (int)ssz; if ('\0' == *next) next = NULL; @@ -662,6 +662,7 @@ again: ep->cur++; while (' ' == ep->data[(int)ep->cur] || '\t' == ep->data[(int)ep->cur] || + '^' == ep->data[(int)ep->cur] || '~' == ep->data[(int)ep->cur]) ep->cur++; } else { Index: index.sgml =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/index.sgml,v retrieving revision 1.128 retrieving revision 1.129 diff -Lindex.sgml -Lindex.sgml -u -p -r1.128 -r1.129 --- index.sgml +++ index.sgml @@ -311,6 +311,14 @@ News

+ xx-07-2011: version 1.11.5 +

+

+ Significant eqn improvements. mdocml can now parse arbitrary equations + (although few GNU troff extensions are accepted, nor is mixing low-level roff with eqn). See the eqn manual for details. For the time being, equations are rendered as simple in-line text. +

+

12-07-2011: version 1.11.4

Index: eqn.7 =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/eqn.7,v retrieving revision 1.18 retrieving revision 1.19 diff -Leqn.7 -Leqn.7 -u -p -r1.18 -r1.19 --- eqn.7 +++ eqn.7 @@ -64,35 +64,35 @@ case-sensitive literals in the input: .Bd -literal -offset indent eqn : box | eqn box box : text - | "{" eqn "}" - | "define" text text - | "gfont" text - | "gsize" text - | "set" text text - | "undef" text + | \*q{\*q eqn \*q}\*q + | \*qdefine\*q text text + | \*qgfont\*q text + | \*qgsize\*q text + | \*qset\*q text text + | \*qundef\*q text | box pos box | box mark - | pile "{" list "}" + | pile \*q{\*q list \*q}\*q | font box - | "size" text box - | "left" text eqn ["right" text] -text : TEXT -pile : "lpile" | "cpile" | "rpile" -pos : "over" | "sup" | "sub" | "to" | "from" -mark : "dot" | "dotdot" | "hat" | "tilde" | "vec" - | "dyad" | "bar" | "under" -font : "roman" | "italic" | "bold" -list : eqn - | list "above" eqn + | \*qsize\*q text box + | \*qleft\*q text eqn [\*qright\*q text] +text : [^space\e\*q]+ | \e\*q.*\e\*q +pile : \*qlpile\*q | \*qcpile\*q | \*qrpile\*q +pos : \*qover\*q | \*qsup\*q | \*qsub\*q | \*qto\*q | \*qfrom\*q +mark : \*qdot\*q | \*qdotdot\*q | \*qhat\*q | \*qtilde\*q | \*qvec\*q + | \*qdyad\*q | \*qbar\*q | \*qunder\*q +font : \*qroman\*q | \*qitalic\*q | \*\*qbold\*q +list : eqn + | list \*qabove\*q eqn +space : [\e^~ \et] .Ed .Pp -Data in TEXT form is a non-empty sequence of non-space characters or a -non-empty quoted string. -Unless within a quoted string, white-space (and enclosing literal quote -pairs) is thrown away. -Quoted strings are not scanned for replacement definitions. +White-space consists of the space, tab, circumflex, and tilde +characters. +If within a quoted string, these space characters are retained. +Quoted strings are also not scanned for replacement definitions. .Pp -The following TEXT terms are translated into a rendered glyph, if +The following text terms are translated into a rendered glyph, if available: alpha, beta, chi, delta, epsilon, eta, gamma, iota, kappa, lambda, mu, nu, omega, omicron, phi, pi, psi, rho, sigma, tau, theta, upsilon, xi, zeta, DELTA, GAMMA, LAMBDA, OMEGA, PHI, PI, PSI, SIGMA, @@ -197,6 +197,10 @@ The text string .Sq \e\*q is interpreted as a literal quote in troff. In mandoc, this is interpreted as a comment. +.It +In troff, The circumflex and tilde white-space symbols map to +fixed-width spaces. +In mandoc, these characters are synonyms for the space character. .El .Sh SEE ALSO .Xr mandoc 1 , -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv