mirror/groff
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/groff.git synced 2026-01-26 15:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[pre-grohtml]: Read "DESC"s more like libgroff.

Browse Source 
* src/preproc/html/pre-html.cpp (get_resolution, get_image_generator):
  Read devices' "DESC" files as libgroff does and as documented in
  groff_font(5) (and CSTR #54 [1992]); upon encountering a "charset"
  directive, we stop interpreting directives.
This commit is contained in:
G. Branden Robinson 2025-07-30 19:46:01 -05:00
parent 6af159cc03
commit 99f7e14275
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2025-07-30 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/preproc/html/pre-html.cpp (get_resolution)
(get_image_generator): Read devices' "DESC" files as libgroff
does and as documented in groff_font(5) (and CSTR #54 [1992]);
upon encountering a "charset" directive, we stop interpreting
directives.
2025-07-30 G. Branden Robinson <g.branden.robinson@gmail.com>
* src/preproc/html/pre-html.cpp (get_line): Clear heap-allocated

24
src/preproc/html/pre-html.cpp
View File

@ -24,6 +24,7 @@
#endif
#include <assert.h>
#include <ctype.h> // isspace()
#include <errno.h>
#include <stdarg.h> // va_list, va_end(), va_start(), vsnprintf()
#include <stdio.h> // EOF, FILE, fclose(), feof(), fflush(), fopen(),
@ -337,12 +338,17 @@ static unsigned int get_resolution(void)
f = font_path.open_file(devps_desc, &pathp);
if (0 /* nullptr */ == f)
fatal("cannot open file '%1': %2", devps_desc, strerror(errno));
// XXX: We should break out of this loop if we hit a "charset" line.
// "This line and everything following it in the file are ignored."
// (groff_font(5))
int lineno = 0;
while (get_line(f, pathp, lineno++))
while (get_line(f, pathp, lineno++)) {
(void) sscanf(linebuf, "res %u", &res);
// We must stop reading at a "charset" line; see groff_font(5).
if (strncmp(linebuf, "charset", sizeof "charset") == 0) {
// Don't be fooled by non-groff extensions.
char trailing_char = linebuf[(sizeof "charset") - 1];
if (isspace(trailing_char) || '\0' == trailing_char)
break;
}
}
free(pathp);
fclose(f);
return res;
@ -364,9 +370,6 @@ static char *get_image_generator(void)
f = font_path.open_file(devhtml_desc, &pathp);
if (0 /* nullptr */ == f)
fatal("cannot open file '%1': %2", devhtml_desc, strerror(errno));
// XXX: We should break out of this loop if we hit a "charset" line.
// "This line and everything following it in the file are ignored."
// (groff_font(5))
int lineno = 0;
while (get_line(f, pathp, lineno++)) {
char *cursor = linebuf;
@ -384,6 +387,13 @@ static char *get_image_generator(void)
continue;
generator = cursor;
}
// We must stop reading at a "charset" line; see groff_font(5).
if (strncmp(linebuf, "charset", sizeof "charset") == 0) {
// Don't be fooled by non-groff extensions.
char trailing_char = linebuf[(sizeof "charset") - 1];
if (isspace(trailing_char) || '\0' == trailing_char)
break;
}
}
free(pathp);
fclose(f);