-Thtml: Use hexadecimal character references

-Thtml: Use hexadecimal character references

[Anthony J. Bentley]

Hi,

Since Unicode codepoints are universally referred to in hexadecimal,
this would make the HTML source easier to reason about while debugging.
I have learned many hexadecimal codepoints over the years, but not a
single one in decimal.

The longest character reference, "&#x10ffff", is the same length as
"&#1114111", so numbuf doesn't need to be increased in size.

Index: html.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/html.c,v
retrieving revision 1.85
diff -u -p -r1.85 html.c
--- html.c	23 Jun 2017 02:31:39 -0000	1.85
+++ html.c	13 Jul 2017 16:11:23 -0000
@@ -451,7 +451,7 @@ print_encode(struct html *h, const char 
 		    (c > 0x7E && c < 0xA0))
 			c = 0xFFFD;
 		if (c > 0x7E) {
-			(void)snprintf(numbuf, sizeof(numbuf), "&#%d;", c);
+			(void)snprintf(numbuf, sizeof(numbuf), "&#x%x;", c);
 			print_word(h, numbuf);
 		} else if (print_escape(h, c) == 0)
 			print_byte(h, c);
@@ -514,7 +514,7 @@ print_otag(struct html *h, enum htmltag 
 		print_indent(h);
 	else if ((h->flags & HTML_NOSPACE) == 0) {
 		if (h->flags & HTML_KEEP)
-			print_word(h, "&#160;");
+			print_word(h, "&#xa0;");
 		else {
 			if (h->flags & HTML_PREKEEP)
 				h->flags |= HTML_KEEP;
@@ -777,7 +777,7 @@ print_text(struct html *h, const char *w
 				h->flags |= HTML_KEEP;
 			print_endword(h);
 		} else
-			print_word(h, "&#160;");
+			print_word(h, "&#xa0;");
 	}
 
 	assert(NULL == h->metaf);
--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv

Re: -Thtml: Use hexadecimal character references

[Ingo Schwarze]

Hi,

Anthony J. Bentley wrote on Thu, Jul 13, 2017 at 07:05:36PM -0600:

> Since Unicode codepoints are universally referred to in hexadecimal,
> this would make the HTML source easier to reason about while debugging.
> I have learned many hexadecimal codepoints over the years, but not a
> single one in decimal.

I agree.  But codepoints conventionally use capital hex digits
and at least four of them.

Feel free to commit in the following form, if you agree,
and i'll merge to bsd.lv and adjust the test suite.

Thanks,
  Ingo


Index: html.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/html.c,v
retrieving revision 1.85
diff -u -p -r1.85 html.c
--- html.c	23 Jun 2017 02:31:39 -0000	1.85
+++ html.c	14 Jul 2017 12:33:16 -0000
@@ -451,7 +451,7 @@ print_encode(struct html *h, const char 
 		    (c > 0x7E && c < 0xA0))
 			c = 0xFFFD;
 		if (c > 0x7E) {
-			(void)snprintf(numbuf, sizeof(numbuf), "&#%d;", c);
+			(void)snprintf(numbuf, sizeof(numbuf), "&#x%.4X;", c);
 			print_word(h, numbuf);
 		} else if (print_escape(h, c) == 0)
 			print_byte(h, c);
@@ -514,7 +514,7 @@ print_otag(struct html *h, enum htmltag 
 		print_indent(h);
 	else if ((h->flags & HTML_NOSPACE) == 0) {
 		if (h->flags & HTML_KEEP)
-			print_word(h, "&#160;");
+			print_word(h, "&#x00A0;");
 		else {
 			if (h->flags & HTML_PREKEEP)
 				h->flags |= HTML_KEEP;
@@ -777,7 +777,7 @@ print_text(struct html *h, const char *w
 				h->flags |= HTML_KEEP;
 			print_endword(h);
 		} else
-			print_word(h, "&#160;");
+			print_word(h, "&#x00A0;");
 	}
 
 	assert(NULL == h->metaf);
--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv