From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Implement -Tman .Bf.
Date: Mon, 9 Jul 2012 14:56:13 -0400 (EDT) [thread overview]
Message-ID: <201207091856.q69IuD0U015990@krisdoz.my.domain> (raw)
Log Message:
-----------
Implement -Tman .Bf.
To get the spacing right,
* avoid man(7) code line breaks at places where no spacing is allowed
* allow spacing right after .Sm on
* allow spacing after empty .Fl at the end of an input line
OpenBSD rev. 1.25
Modified Files:
--------------
mdocml:
mdoc_man.c
Revision Data
-------------
Index: mdoc_man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_man.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lmdoc_man.c -Lmdoc_man.c -u -p -r1.26 -r1.27
--- mdoc_man.c
+++ mdoc_man.c
@@ -44,6 +44,7 @@ static int cond_head(DECL_ARGS);
static void font_push(char);
static void font_pop(void);
static void post_bd(DECL_ARGS);
+static void post_bf(DECL_ARGS);
static void post_bk(DECL_ARGS);
static void post_dl(DECL_ARGS);
static void post_enc(DECL_ARGS);
@@ -63,6 +64,7 @@ static void post_vt(DECL_ARGS);
static int pre_an(DECL_ARGS);
static int pre_ap(DECL_ARGS);
static int pre_bd(DECL_ARGS);
+static int pre_bf(DECL_ARGS);
static int pre_bk(DECL_ARGS);
static int pre_br(DECL_ARGS);
static int pre_bx(DECL_ARGS);
@@ -158,7 +160,7 @@ static const struct manact manacts[MDOC_
{ cond_body, pre_enc, post_enc, "<", ">" }, /* Aq */
{ NULL, NULL, NULL, NULL, NULL }, /* At */
{ NULL, NULL, NULL, NULL, NULL }, /* Bc */
- { NULL, NULL, NULL, NULL, NULL }, /* _Bf */
+ { NULL, pre_bf, post_bf, NULL, NULL }, /* Bf */
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bo */
{ cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
{ NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
@@ -396,8 +398,7 @@ print_node(DECL_ARGS)
* This makes the page structure be more consistent.
*/
prev = n->prev ? n->prev : n->parent;
- if (prev && prev->line < n->line &&
- MDOC_Fo != prev->tok && MDOC_Ns != prev->tok)
+ if (MMAN_spc & outflags && prev && prev->line < n->line)
outflags |= MMAN_nl;
act = NULL;
@@ -644,6 +645,40 @@ post_bd(DECL_ARGS)
}
static int
+pre_bf(DECL_ARGS)
+{
+
+ switch (n->type) {
+ case (MDOC_BLOCK):
+ return(1);
+ case (MDOC_BODY):
+ break;
+ default:
+ return(0);
+ }
+ switch (n->norm->Bf.font) {
+ case (FONT_Em):
+ font_push('I');
+ break;
+ case (FONT_Sy):
+ font_push('B');
+ break;
+ default:
+ font_push('R');
+ break;
+ }
+ return(1);
+}
+
+static void
+post_bf(DECL_ARGS)
+{
+
+ if (MDOC_BODY == n->type)
+ font_pop();
+}
+
+static int
pre_bk(DECL_ARGS)
{
@@ -761,7 +796,8 @@ post_fl(DECL_ARGS)
{
font_pop();
- if (0 == n->nchild)
+ if (0 == n->nchild && NULL != n->next &&
+ n->next->line == n->line)
outflags &= ~MMAN_spc;
}
@@ -1007,7 +1043,7 @@ pre_sm(DECL_ARGS)
assert(n->child && MDOC_TEXT == n->child->type);
if (0 == strcmp("on", n->child->string))
- outflags |= MMAN_Sm;
+ outflags |= MMAN_Sm | MMAN_spc;
else
outflags &= ~MMAN_Sm;
return(0);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2012-07-09 18:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201207091856.q69IuD0U015990@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).