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 rAB0btHV031687 for ; Sun, 10 Nov 2013 19:37:55 -0500 (EST) Received: (from schwarze@localhost) by krisdoz.my.domain (8.14.5/8.14.3/Submit) id rAB0btXd016299; Sun, 10 Nov 2013 19:37:55 -0500 (EST) Date: Sun, 10 Nov 2013 19:37:55 -0500 (EST) Message-Id: <201311110037.rAB0btXd016299@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: In the parser, when closing an explicit block that is not open, X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- In the parser, when closing an explicit block that is not open, close below-subsection implicit scopes that may still be open. In the formatter, make sure indentation is reset when leaving a scope, not only when entering the next one. Improves the formatting of gpg(1); issue reported by jca on ports. Modified Files: -------------- mdocml: man_macro.c man_term.c Revision Data ------------- Index: man_term.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v retrieving revision 1.137 retrieving revision 1.138 diff -Lman_term.c -Lman_term.c -u -p -r1.137 -r1.138 --- man_term.c +++ man_term.c @@ -679,6 +679,7 @@ post_IP(DECL_ARGS) break; case (MAN_BODY): term_newln(p); + p->offset = mt->offset; break; default: break; @@ -766,6 +767,7 @@ post_TP(DECL_ARGS) break; case (MAN_BODY): term_newln(p); + p->offset = mt->offset; break; default: break; Index: man_macro.c =================================================================== RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_macro.c,v retrieving revision 1.76 retrieving revision 1.77 diff -Lman_macro.c -Lman_macro.c -u -p -r1.76 -r1.77 --- man_macro.c +++ man_macro.c @@ -1,7 +1,7 @@ /* $Id$ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012 Ingo Schwarze + * Copyright (c) 2012, 2013 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -298,10 +298,12 @@ blk_close(MACRO_PROT_ARGS) if (ntok == nn->tok && MAN_BLOCK == nn->type) break; - if (NULL != nn) - man_unscope(man, nn, MANDOCERR_MAX); - else + if (NULL == nn) { man_pmsg(man, line, ppos, MANDOCERR_NOSCOPE); + if ( ! rew_scope(MAN_BLOCK, man, MAN_PP)) + return(0); + } else + man_unscope(man, nn, MANDOCERR_MAX); return(1); } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv