dany/pdfio
1
0
Fork 0
mirror of https://github.com/michaelrsweet/pdfio.git synced 2024-12-25 12:58:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use regular font for whitespace before monospace text.

Browse Source
This commit is contained in:
Michael R Sweet 2024-12-21 11:50:35 -05:00
parent a24fdee335
commit a1237db52c
No known key found for this signature in database
GPG Key ID: BE67C75EC81F3244
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
examples/md2pdf.c
View File

@ -107,6 +107,7 @@ typedef struct docdata_s // Document formatting data
pdfio_rect_t crop_box; // Crop box (for margins) pdfio_rect_t crop_box; // Crop box (for margins)
pdfio_rect_t art_box; // Art box (for markdown content) pdfio_rect_t art_box; // Art box (for markdown content)
pdfio_obj_t *fonts[DOCFONT_MAX]; // Embedded fonts pdfio_obj_t *fonts[DOCFONT_MAX]; // Embedded fonts
double font_space; // Unit width of a space
size_t num_images; // Number of embedded images size_t num_images; // Number of embedded images
docimage_t images[DOCIMAGE_MAX]; // Embedded images docimage_t images[DOCIMAGE_MAX]; // Embedded images
const char *title; // Document title const char *title; // Document title
@ -349,6 +350,8 @@ main(int argc, // I - Number of command-line arguments
#endif // USE_TRUETYPE #endif // USE_TRUETYPE
} }
dd.font_space = pdfioContentTextMeasure(dd.fonts[DOCFONT_REGULAR], " ", 1.0);
// Add images... // Add images...
add_images(&dd, doc); add_images(&dd, doc);
@ -624,7 +627,7 @@ format_block(docdata_t *dd, // I - Document data
imagenum = 0; imagenum = 0;
url = mmdGetURL(current); url = mmdGetURL(current);
ws = mmdGetWhitespace(current); ws = mmdGetWhitespace(current);
wswidth = 0.0; wswidth = ws ? dd->font_space * fsize : 0.0;
next = mmd_walk_next(block, current); next = mmd_walk_next(block, current);
// Process the node... // Process the node...
@ -714,9 +717,6 @@ format_block(docdata_t *dd, // I - Document data
width = pdfioContentTextMeasure(dd->fonts[font], text, fsize); width = pdfioContentTextMeasure(dd->fonts[font], text, fsize);
height = fsize * LINE_HEIGHT; height = fsize * LINE_HEIGHT;
if (ws)
wswidth = pdfioContentTextMeasure(dd->fonts[font], " ", fsize);
} }
// See if this node will fit on the current line... // See if this node will fit on the current line...
@ -1469,7 +1469,6 @@ render_line(docdata_t *dd, // I - Document data
size_t i; // Looping var size_t i; // Looping var
linefrag_t *frag; // Current line fragment linefrag_t *frag; // Current line fragment
bool in_text = false; // Are we in a text block? bool in_text = false; // Are we in a text block?
// bool ws_after; // Do we have whitespace after this fragment?
if (!dd->st) if (!dd->st)
@ -1517,9 +1516,6 @@ render_line(docdata_t *dd, // I - Document data
else if (frag->text) else if (frag->text)
{ {
// Draw text // Draw text
set_color(dd, frag->color);
set_font(dd, frag->font, frag->height);
if (!in_text) if (!in_text)
{ {
pdfioContentTextBegin(dd->st); pdfioContentTextBegin(dd->st);
@ -1528,20 +1524,19 @@ render_line(docdata_t *dd, // I - Document data
in_text = true; in_text = true;
} }
#if 0 if (frag->ws && frag->font == DOCFONT_MONOSPACE)
if (frag->font != DOCFONT_MONOSPACE && (i + 1) < num_frags && frag[1].ws && frag[1].font == DOCFONT_MONOSPACE)
{ {
// Don't use a monospace space to separate it from non-monospace set_font(dd, DOCFONT_REGULAR, frag->height);
ws_after = true; pdfioContentTextShow(dd->st, UNICODE_VALUE, " ");
frag[1].ws = false;
} }
else
{
ws_after = false;
}
#endif // 0
pdfioContentTextShowf(dd->st, UNICODE_VALUE, "%s%s%s", frag->ws ? " " : "", frag->text, /*ws_after ? " " :*/ ""); set_color(dd, frag->color);
set_font(dd, frag->font, frag->height);
if (frag->font == DOCFONT_MONOSPACE)
pdfioContentTextShow(dd->st, UNICODE_VALUE, frag->text);
else
pdfioContentTextShowf(dd->st, UNICODE_VALUE, "%s%s", frag->ws ? " " : "", frag->text);
if (frag->url && dd->num_links < DOCLINK_MAX) if (frag->url && dd->num_links < DOCLINK_MAX)
{ {