From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: implement the tbl(7) layout modifiers "b" (bold) and "i"
Date: Sun, 16 May 2021 13:11:51 -0500 (EST) [thread overview]
Message-ID: <c2a98e4f6a15c437@mandoc.bsd.lv> (raw)
Log Message:
-----------
implement the tbl(7) layout modifiers "b" (bold) and "i" (italic)
in HTML output mode, similar to tbl_term.c, function tbl_word();
issue reported by Oliver dot Corff at email dot de
Modified Files:
--------------
mandoc:
html.c
tbl_html.c
Revision Data
-------------
Index: html.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/html.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -Lhtml.c -Lhtml.c -u -p -r1.271 -r1.272
--- html.c
+++ html.c
@@ -140,6 +140,7 @@ html_alloc(const struct manoutput *outop
h = mandoc_calloc(1, sizeof(struct html));
h->tag = NULL;
+ h->metac = h->metal = ESCAPE_FONTROMAN;
h->style = outopts->style;
if ((h->base_man1 = outopts->man) == NULL)
h->base_man2 = NULL;
Index: tbl_html.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/tbl_html.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -Ltbl_html.c -Ltbl_html.c -u -p -r1.33 -r1.34
--- tbl_html.c
+++ tbl_html.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014,2015,2017,2018,2021 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -119,6 +119,7 @@ print_tbl(struct html *h, const struct t
const char *hspans, *vspans, *halign, *valign;
const char *bborder, *lborder, *rborder;
char hbuf[4], vbuf[4];
+ enum mandoc_esc save_font;
int i;
if (h->tblt == NULL)
@@ -240,8 +241,15 @@ print_tbl(struct html *h, const struct t
"vertical-align", valign,
"text-align", halign,
"border-right-style", rborder);
- if (dp->string != NULL)
+ if (dp->string != NULL) {
+ save_font = h->metac;
+ if (dp->layout->flags & TBL_CELL_BOLD)
+ html_setfont(h, ESCAPE_FONTBOLD);
+ else if (dp->layout->flags & TBL_CELL_ITALIC)
+ html_setfont(h, ESCAPE_FONTITALIC);
print_text(h, dp->string);
+ html_setfont(h, save_font);
+ }
}
print_tagq(h, tt);
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2021-05-16 18:11 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=c2a98e4f6a15c437@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.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).