From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: .Bl -column never gets blank lines between rows
Date: Wed, 8 Mar 2017 10:08:39 -0500 (EST) [thread overview]
Message-ID: <12371365138210911553.enqueue@fantadrom.bsd.lv> (raw)
Log Message:
-----------
.Bl -column never gets blank lines between rows
Modified Files:
--------------
mdocml:
mdoc_markdown.c
mdocml/regress/mdoc/Bl:
Makefile
Added Files:
-----------
mdocml/regress/mdoc/Bl:
colNoIt.out_markdown
column.out_markdown
Revision Data
-------------
Index: mdoc_markdown.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_markdown.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lmdoc_markdown.c -Lmdoc_markdown.c -u -p -r1.9 -r1.10
--- mdoc_markdown.c
+++ mdoc_markdown.c
@@ -1151,7 +1151,8 @@ md_pre_It(struct roff_node *n)
case ROFFT_HEAD:
bln = n->parent->parent;
- if (bln->norm->Bl.comp == 0)
+ if (bln->norm->Bl.comp == 0 &&
+ bln->norm->Bl.type != LIST_column)
outflags |= MD_sp;
outflags |= MD_nl;
@@ -1180,6 +1181,9 @@ md_pre_It(struct roff_node *n)
printf("%d.\t", ++bln->norm->Bl.count);
escflags &= ~ESC_FON;
break;
+ case LIST_column:
+ outflags |= MD_br;
+ return 0;
default:
return 0;
}
Index: Makefile
===================================================================
RCS file: /home/cvs/mdocml/mdocml/regress/mdoc/Bl/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lregress/mdoc/Bl/Makefile -Lregress/mdoc/Bl/Makefile -u -p -r1.5 -r1.6
--- regress/mdoc/Bl/Makefile
+++ regress/mdoc/Bl/Makefile
@@ -14,7 +14,7 @@ LINT_TARGETS += empty noIt emptyhead emp
LINT_TARGETS += bareIt bareTa break breakingIt broken
MARKDOWN_TARGETS = item inset diag ohang bullet dash enum hang tag
-MARKDOWN_TARGETS += extend nested offset secstart
+MARKDOWN_TARGETS += column colNoIt extend nested offset secstart
MARKDOWN_TARGETS += notype multitype badargs
MARKDOWN_TARGETS += empty noIt emptyhead emptytag emptyitem multitag
MARKDOWN_TARGETS += bareIt bareTa unclosed breakingIt breakingTa broken
--- /dev/null
+++ regress/mdoc/Bl/colNoIt.out_markdown
@@ -0,0 +1,15 @@
+BL-COLNOIT(1) - General Commands Manual
+
+# NAME
+
+**Bl-colNoIt** - column lists without item macros
+
+# DESCRIPTION
+
+ **a** b
+ *c* d
+
+ a b
+ c d
+
+OpenBSD - August 20, 2016
--- /dev/null
+++ regress/mdoc/Bl/column.out_markdown
@@ -0,0 +1,78 @@
+BL-COLUMN(1) - General Commands Manual
+
+# NAME
+
+**Bl-column** - lists with multiple columns
+
+# DESCRIPTION
+
+ a
+
+ a b
+
+ a b cc
+ a b cc
+ a b cc
+ a b cc
+ a b cc
+
+ a b cc d
+
+ a b cc d e
+
+ 5 + 35 + 4 + 34 = 78:
+
+ x35xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x34xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ a b
+
+ 5 + (22+4)*2 + 21 = 78:
+
+ x22xxxxxxxxxxxxxxxxxxx x22xxxxxxxxxxxxxxxxxxx x21xxxxxxxxxxxxxxxxxx
+ a b c
+
+ 5 + 16 + (4+15)*3 = 78:
+
+ x16xxxxxxxxxxxxx x15xxxxxxxxxxxx x15xxxxxxxxxxxx x15xxxxxxxxxxxx
+ a b c d
+
+ 5 + 13 + (3+12)*4 = 78:
+
+ x13xxxxxxxxxx x12xxxxxxxxx x12xxxxxxxxx x12xxxxxxxxx x12xxxxxxxxx
+ a b c d e
+
+ a b
+ a b
+ a b
+ a b
+ a b
+ a b
+
+ a
+ a b
+ a b c
+ a b c d
+ a b c d e
+
+ a b c d
+ a b c d
+ a b c d
+ a b c d
+ a b c d
+ a b c d
+ a b c d
+ a b c d
+
+ aa OpenBSD OpenBSD OpenBSD tab-tab
+ aa OpenBSD OpenBSD Ox tab-ta
+ aa Ox OpenBSD OpenBSD ta-tab
+ aa Ox OpenBSD Ox ta-ta
+ aa Ox OpenBSD OpenBSD ta-bl/ta
+ aa OpenBSD OpenBSD Ox ta/bl-ta
+ aa OpenBSD OpenBSD OpenBSD ta/bl-bl/ta
+ aa bb ta at eol
+ aa bb
+ tab at eol
+
+ aa bb cc dd
+
+OpenBSD - October 14, 2015
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2017-03-08 15:08 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=12371365138210911553.enqueue@fantadrom.bsd.lv \
--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).