source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mandoc: implement the tbl(7) layout modifiers "b" (bold) and "i"
@ 2021-05-16 18:11 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2021-05-16 18:11 UTC (permalink / raw)
  To: source

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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-05-16 18:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-16 18:11 mandoc: implement the tbl(7) layout modifiers "b" (bold) and "i" schwarze

source@mandoc.bsd.lv

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/mandoc-source

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 mandoc-source mandoc-source/ http://inbox.vuxu.org/mandoc-source \
		source@mandoc.bsd.lv
	public-inbox-index mandoc-source

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.mandoc.source


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git