=================================================================== RCS file: /cvs/mandoc/mdoc.7,v retrieving revision 1.6 retrieving revision 1.10 diff -u -p -r1.6 -r1.10 --- mandoc/mdoc.7 2009/03/16 23:37:28 1.6 +++ mandoc/mdoc.7 2009/03/20 15:14:01 1.10 @@ -1,4 +1,4 @@ -.\" $Id: mdoc.7,v 1.6 2009/03/16 23:37:28 kristaps Exp $ +.\" $Id: mdoc.7,v 1.10 2009/03/20 15:14:01 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -16,7 +16,7 @@ .\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 16 2009 $ +.Dd $Mdocdate: March 20 2009 $ .Dt mdoc 7 .Os .\" SECTION @@ -47,7 +47,23 @@ and, in certain circumstances, the tab character .Sq \et . All manuals must have .Sq \en -line termination. +line termination. +.Pp +The only time a blank line is acceptable is within +the context of +.Sq \&Bd \-literal +or +.Sq \&Bd \-unfilled . +.Pp +Tab characters +.Pq \et +are only acceptable when delimiting +.Sq \&Bl \-column +and in +.Sq \&Bd \-literal +or +.Sq \&Bd \-unfilled +contexts. .\" SUB-SECTION .Ss Reserved Characters Within a macro line, the following characters are reserved: @@ -117,6 +133,10 @@ Grammatic: .Pq space .It \\. .Pq period +.It \\(r! +.Pq upside-down exclamation +.It \\(r? +.Pq upside-down question .El .\" PARAGRAPH .Pp @@ -126,10 +146,14 @@ Enclosures: .Pq left hand .It \\(rh .Pq right hand -.It \\(<< -.Pq left guillemot -.It \\(>> -.Pq right guillemot +.It \\(Fo +.Pq left guillemet +.It \\(Fc +.Pq right guillemet +.It \\(fo +.Pq left guilsing +.It \\(fc +.Pq right guilsing .It \\(rC .Pq right brace .It \\(lC @@ -156,6 +180,10 @@ Enclosures: .Pq left single-quote .It \\(aq .Pq right single-quote +.It \\(Bq +.Pq right low double-quote +.It \\(bq +.Pq right low single-quote .El .\" PARAGRAPH .Pp @@ -186,6 +214,60 @@ Indicatives: .Pp Mathematical: .Bl -tag -width 12n -offset "XXXX" -compact +.It \\(es +.Pq empty set +.It \\(ca +.Pq intersection +.It \\(cu +.Pq union +.It \\(gr +.Pq gradient +.It \\(pd +.Pq partial differential +.It \\(ap +.Pq similarity +.It \\(=) +.Pq proper superset +.It \\((= +.Pq proper subset +.It \\(eq +.Pq equals +.It \\(di +.Pq division +.It \\(mu +.Pq multiplication +.It \\(pl +.Pq addition +.It \\(nm +.Pq not element +.It \\(mo +.Pq element +.It \\(Im +.Pq imaginary +.It \\(Re +.Pq real +.It \\(Ah +.Pq aleph +.It \\(te +.Pq existential quantifier +.It \\(fa +.Pq universal quantifier +.It \\(AN +.Pq logical AND +.It \\(OR +.Pq logical OR +.It \\(no +.Pq logical NOT +.It \\(st +.Pq such that +.It \\(tf +.Pq therefore +.It \\(~~ +.Pq approximate +.It \\(~= +.Pq approximately equals +.It \\(=~ +.Pq congruent .It \\(Gt .Pq greater-than, deprecated .It \\(Lt @@ -221,16 +303,10 @@ Mathematical: .El .\" PARAGRAPH .Pp -Diacritics and letter combinations: +Ligatures: .Bl -tag -width 12n -offset "XXXX" -compact -.It \\(ga -.Pq accent grave -.It \\(aa -.Pq accent accute -.It \\(ad -.Pq accent dieresis -.It \\(a~ -.Pq accent tilde +.It \\(ss +.Pq German eszett .It \\(AE .Pq upper-case AE .It \\(ae @@ -239,6 +315,55 @@ Diacritics and letter combinations: .Pq upper-case OE .It \\(oe .Pq lower-case OE +.It \\(ff +.Pq ff ligature +.It \\(fi +.Pq fi ligature +.It \\(fl +.Pq fl ligature +.It \\(Fi +.Pq ffi ligature +.It \\(Fl +.Pq ffl ligature +.El +.\" PARAGRAPH +.Pp +Diacritics and letters: +.Bl -tag -width 12n -offset "XXXX" -compact +.It \\(ga +.Pq grave accent +.It \\(aa +.Pq accute accent +.It \\(a" +.Pq umlaut accent +.It \\(ad +.Pq dieresis accent +.It \\(a~ +.Pq tilde accent +.It \\(a^ +.Pq circumflex accent +.It \\(ac +.Pq cedilla accent +.It \\(ad +.Pq dieresis accent +.It \\(ah +.Pq caron accent +.It \\(ao +.Pq ring accent +.It \\(ho +.Pq hook accent +.It \\(ab +.Pq breve accent +.It \\(a- +.Pq macron accent +.It \\(-D +.Pq upper-case eth +.It \\(Sd +.Pq lower-case eth +.It \\(TP +.Pq upper-case thorn +.It \\(Tp +.Pq lower-case thorn .It \\('A .Pq upper-case acute A .It \\('E @@ -313,15 +438,80 @@ Diacritics and letter combinations: .Pq lower-case dieresis u .It \\(:y .Pq lower-case dieresis y +.It \\(^A +.Pq upper-case circumflex A +.It \\(^E +.Pq upper-case circumflex E +.It \\(^I +.Pq upper-case circumflex I +.It \\(^O +.Pq upper-case circumflex O +.It \\(^U +.Pq upper-case circumflex U +.It \\(^a +.Pq lower-case circumflex a +.It \\(^e +.Pq lower-case circumflex e +.It \\(^i +.Pq lower-case circumflex i +.It \\(^o +.Pq lower-case circumflex o +.It \\(^u +.Pq lower-case circumflex u +.It \\(,C +.Pq upper-case cedilla C +.It \\(,c +.Pq lower-case cedilla c +.It \\(/L +.Pq upper-case stroke L +.It \\(/l +.Pq lower-case stroke l +.It \\(/O +.Pq upper-case stroke O +.It \\(/o +.Pq lower-case stroke o +.It \\(oA +.Pq upper-case ring A +.It \\(oa +.Pq lower-case ring a .El .\" PARAGRAPH .Pp +Monetary: +.Bl -tag -width 12n -offset "XXXX" -compact +.It \\(Cs +.Pq Scandinavian +.It \\(Do +.Pq dollar +.It \\(Po +.Pq pound +.It \\(Ye +.Pq yen +.It \\(Fn +.Pq florin +.It \\(ct +.Pq cent +.El +.\" PARAGRAPH +.Pp Special symbols: .Bl -tag -width 12n -offset "XXXX" -compact -.It \\(bu -.Pq bullet +.It \\(de +.Pq degree +.It \\(ps +.Pq paragraph +.It \\(sc +.Pq section +.It \\(dg +.Pq dagger +.It \\(dd +.Pq double dagger +.It \\(ci +.Pq circle .It \\(ba .Pq bar +.It \\(bb +.Pq broken bar .It \\(Ba .Pq bar, deprecated .It \\(co