From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1]) by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id q67DvJbc032607 for ; Sat, 7 Jul 2012 09:57:19 -0400 (EDT) Received: (from schwarze@localhost) by krisdoz.my.domain (8.14.5/8.14.3/Submit) id q67DvJZd028394; Sat, 7 Jul 2012 09:57:19 -0400 (EDT) Date: Sat, 7 Jul 2012 09:57:19 -0400 (EDT) Message-Id: <201207071357.q67DvJZd028394@krisdoz.my.domain> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: implement -Tman .Bk; OpenBSD rev. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- implement -Tman .Bk; OpenBSD rev. 1.10 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.12 retrieving revision 1.13 diff -Lmdoc_man.c -Lmdoc_man.c -u -p -r1.12 -r1.13 --- mdoc_man.c +++ mdoc_man.c @@ -35,6 +35,7 @@ struct mman { int mode_space; /* spacing mode: 1 = on */ int need_space; /* next word needs prior ws */ + int mode_keep; /* currently inside a keep */ int need_nl; /* next word needs prior nl */ }; @@ -49,6 +50,7 @@ struct manact { static int cond_body(DECL_ARGS); static int cond_head(DECL_ARGS); static void post_bd(DECL_ARGS); +static void post_bk(DECL_ARGS); static void post_dl(DECL_ARGS); static void post_enc(DECL_ARGS); static void post_nm(DECL_ARGS); @@ -58,6 +60,7 @@ static void post_sect(DECL_ARGS); static void post_sp(DECL_ARGS); static int pre_ap(DECL_ARGS); static int pre_bd(DECL_ARGS); +static int pre_bk(DECL_ARGS); static int pre_br(DECL_ARGS); static int pre_bx(DECL_ARGS); static int pre_dl(DECL_ARGS); @@ -182,8 +185,8 @@ static const struct manact manacts[MDOC_ { NULL, NULL, NULL, NULL, NULL }, /* _Fc */ { cond_body, pre_enc, post_enc, "[", "]" }, /* Oo */ { NULL, NULL, NULL, NULL, NULL }, /* Oc */ - { NULL, NULL, NULL, NULL, NULL }, /* _Bk */ - { NULL, NULL, NULL, NULL, NULL }, /* _Ek */ + { NULL, pre_bk, post_bk, NULL, NULL }, /* Bk */ + { NULL, NULL, NULL, NULL, NULL }, /* Ek */ { NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */ { NULL, NULL, NULL, NULL, NULL }, /* Hf */ { NULL, NULL, NULL, NULL, NULL }, /* Fr */ @@ -225,8 +228,13 @@ print_word(struct mman *mm, const char * * (2) a word that is non-punctuation; and * (3) if punctuation, non-terminating puncutation. */ - if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) - putchar(' '); + if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) { + if (mm->mode_keep) { + putchar('\\'); + putchar('~'); + } else + putchar(' '); + } /* * Reassign needing space if we're not following opening @@ -502,6 +510,29 @@ post_bd(DECL_ARGS) print_word(mm, ".fi"); } mm->need_nl = 1; +} + +static int +pre_bk(DECL_ARGS) +{ + + switch (n->type) { + case (MDOC_BLOCK): + return(1); + case (MDOC_BODY): + mm->mode_keep = 1; + return(1); + default: + return(0); + } +} + +static void +post_bk(DECL_ARGS) +{ + + if (MDOC_BODY == n->type) + mm->mode_keep = 0; } static int -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv