X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/ae6133691a9d4c044cd2fd14d00e606f194e873e..b5232689b6acadf75a2663aa386cc4685d1139a3:/bk_paper.c diff --git a/bk_paper.c b/bk_paper.c index c4aac9c..fc9f91b 100644 --- a/bk_paper.c +++ b/bk_paper.c @@ -14,11 +14,6 @@ * * - linearised PDF, perhaps? * - * - we should use PDFDocEncoding or Unicode for outline strings, - * now that I actually know how to do them. Probably easiest if - * I do this _after_ bringing in libcharset, since I can simply - * supply PDFDocEncoding in there. - * * - I'm uncertain of whether I need to include a ToUnicode CMap * in each of my font definitions in PDF. Currently things (by * which I mean cut and paste out of acroread) seem to be @@ -78,6 +73,7 @@ #include #include #include +#include #include "halibut.h" #include "paper.h" @@ -119,6 +115,7 @@ struct paper_conf_Tag { int pagenum_fontsize; int footer_distance; wchar_t *lquote, *rquote, *bullet; + wchar_t *contents_text, *index_text; /* These are derived from the above */ int base_width; int page_height; @@ -144,20 +141,24 @@ enum { word_PageXref = word_NotWordType + 1 }; +/* Flags for render_string() */ +#define RS_NOLIG 1 + static font_data *make_std_font(font_list *fontlist, char const *name); static void wrap_paragraph(para_data *pdata, word *words, int w, int i1, int i2, paper_conf *conf); static page_data *page_breaks(line_data *first, line_data *last, int page_height, int ncols, int headspace); static int render_string(page_data *page, font_data *font, int fontsize, - int x, int y, wchar_t *str); + int x, int y, wchar_t *str, unsigned flags); static int render_line(line_data *ldata, int left_x, int top_y, xref_dest *dest, keywordlist *keywords, indexdata *idx, paper_conf *conf); static void render_para(para_data *pdata, paper_conf *conf, keywordlist *keywords, indexdata *idx, paragraph *index_placeholder, page_data *index_page); -static int string_width(font_data *font, wchar_t const *string, int *errs); +static int string_width(font_data *font, wchar_t const *string, int *errs, + unsigned flags); static int paper_width_simple(para_data *pdata, word *text, paper_conf *conf); static para_data *code_paragraph(int indent, word *words, paper_conf *conf); static para_data *rule_paragraph(int indent, paper_conf *conf); @@ -185,7 +186,7 @@ static int fonts_ok(wchar_t *string, ...) va_start(ap, string); while ( (font = va_arg(ap, font_data *)) != NULL) { int errs; - (void) string_width(font, string, &errs); + (void) string_width(font, string, &errs, 0); if (errs) { ret = FALSE; break; @@ -221,7 +222,7 @@ static paper_conf paper_configure(paragraph *source, font_list *fontlist) { * Defaults. */ ret.paper_width = 595 * UNITS_PER_PT; - ret.paper_height = 841 * UNITS_PER_PT; + ret.paper_height = 842 * UNITS_PER_PT; ret.left_margin = 72 * UNITS_PER_PT; ret.top_margin = 72 * UNITS_PER_PT; ret.right_margin = 72 * UNITS_PER_PT; @@ -282,6 +283,8 @@ static paper_conf paper_configure(paragraph *source, font_list *fontlist) { ret.lquote = L"\x2018\0\x2019\0'\0'\0\0"; ret.rquote = uadv(ret.lquote); ret.bullet = L"\x2022\0-\0\0"; + ret.contents_text = L"Contents"; + ret.index_text = L"Index"; /* * Two-pass configuration so that we can pick up global config @@ -308,6 +311,10 @@ static paper_conf paper_configure(paragraph *source, font_list *fontlist) { ret.lquote = uadv(p->keyword); ret.rquote = uadv(ret.lquote); } + } else if (!ustricmp(p->keyword, L"contents")) { + ret.contents_text = uadv(p->keyword); + } else if (!ustricmp(p->keyword, L"index")) { + ret.index_text = uadv(p->keyword); } else if (!ustricmp(p->keyword, L"paper-bullet")) { ret.bullet = uadv(p->keyword); } else if (!ustricmp(p->keyword, L"paper-page-width")) { @@ -396,9 +403,9 @@ static paper_conf paper_configure(paragraph *source, font_list *fontlist) { paper_cfg_fonts(ret.ftitle.fonts, fontlist, uadv(p->keyword), &p->fpos); } else if (!ustricmp(p->keyword, L"paper-chapter-font-size")) { - ret.ftitle.font_size = utoi(uadv(p->keyword)); + ret.fchapter.font_size = utoi(uadv(p->keyword)); } else if (!ustricmp(p->keyword, L"paper-chapter-fonts")) { - paper_cfg_fonts(ret.ftitle.fonts, fontlist, uadv(p->keyword), + paper_cfg_fonts(ret.fchapter.fonts, fontlist, uadv(p->keyword), &p->fpos); } else if (!ustricmp(p->keyword, L"paper-section-font-size")) { wchar_t *q = uadv(p->keyword); @@ -458,29 +465,31 @@ static paper_conf paper_configure(paragraph *source, font_list *fontlist) { * but must be in the title and body fonts. */ while (*uadv(ret.rquote) && *uadv(uadv(ret.rquote))) { int n; - if (!fonts_ok(ret.lquote, - ret.fbase.fonts[FONT_NORMAL], - ret.fbase.fonts[FONT_EMPH], - ret.ftitle.fonts[FONT_NORMAL], - ret.ftitle.fonts[FONT_EMPH], - ret.fchapter.fonts[FONT_NORMAL], - ret.fchapter.fonts[FONT_EMPH], NULL) || - !fonts_ok(ret.rquote, - ret.fbase.fonts[FONT_NORMAL], - ret.fbase.fonts[FONT_EMPH], - ret.ftitle.fonts[FONT_NORMAL], - ret.ftitle.fonts[FONT_EMPH], - ret.fchapter.fonts[FONT_NORMAL], - ret.fchapter.fonts[FONT_EMPH], NULL)) - break; - for (n = 0; n < ret.nfsect; n++) - if (!fonts_ok(ret.lquote, - ret.fsect[n].fonts[FONT_NORMAL], - ret.fsect[n].fonts[FONT_EMPH], NULL) || - !fonts_ok(ret.rquote, - ret.fsect[n].fonts[FONT_NORMAL], - ret.fsect[n].fonts[FONT_EMPH], NULL)) + if (fonts_ok(ret.lquote, + ret.fbase.fonts[FONT_NORMAL], + ret.fbase.fonts[FONT_EMPH], + ret.ftitle.fonts[FONT_NORMAL], + ret.ftitle.fonts[FONT_EMPH], + ret.fchapter.fonts[FONT_NORMAL], + ret.fchapter.fonts[FONT_EMPH], NULL) && + fonts_ok(ret.rquote, + ret.fbase.fonts[FONT_NORMAL], + ret.fbase.fonts[FONT_EMPH], + ret.ftitle.fonts[FONT_NORMAL], + ret.ftitle.fonts[FONT_EMPH], + ret.fchapter.fonts[FONT_NORMAL], + ret.fchapter.fonts[FONT_EMPH], NULL)) { + for (n = 0; n < ret.nfsect; n++) + if (!fonts_ok(ret.lquote, + ret.fsect[n].fonts[FONT_NORMAL], + ret.fsect[n].fonts[FONT_EMPH], NULL) || + !fonts_ok(ret.rquote, + ret.fsect[n].fonts[FONT_NORMAL], + ret.fsect[n].fonts[FONT_EMPH], NULL)) + break; + if (n == ret.nfsect) break; + } ret.lquote = uadv(ret.rquote); ret.rquote = uadv(ret.lquote); } @@ -510,6 +519,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords, paragraph index_placeholder_para; page_data *first_index_page; + init_std_fonts(); fontlist = snew(font_list); fontlist->head = fontlist->tail = NULL; @@ -543,7 +553,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords, */ { word *contents_title; - contents_title = fake_word(L"Contents"); + contents_title = fake_word(conf->contents_text); firstcont = make_para_data(para_UnnumberedChapter, 0, 0, 0, NULL, NULL, contents_title, conf); @@ -611,7 +621,8 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords, if (has_index) { pdata = make_para_data(para_Normal, 0, 0, conf->contents_margin, - NULL, NULL, fake_word(L"Index"), conf); + NULL, NULL, + fake_word(conf->index_text), conf); pdata->next = NULL; pdata->contents_entry = &index_placeholder_para; lastcont->next = pdata; @@ -831,7 +842,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords, /* * Create a set of paragraphs for the index. */ - index_title = fake_word(L"Index"); + index_title = fake_word(conf->index_text); firstidx = make_para_data(para_UnnumberedChapter, 0, 0, 0, NULL, NULL, index_title, conf); @@ -1009,13 +1020,13 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords, width = conf->pagenum_fontsize * string_width(conf->fbase.fonts[FONT_NORMAL], page->number, - NULL); + NULL, 0); render_string(page, conf->fbase.fonts[FONT_NORMAL], conf->pagenum_fontsize, conf->left_margin + (conf->base_width - width)/2, conf->bottom_margin - conf->footer_distance, - page->number); + page->number, 0); } } @@ -1347,7 +1358,7 @@ static font_encoding *new_font_encoding(font_data *font) return fe; } -static int kern_cmp(void *a, void *b) +int kern_cmp(void *a, void *b) { kern_pair const *ka = a, *kb = b; @@ -1362,37 +1373,83 @@ static int kern_cmp(void *a, void *b) return 0; } +int lig_cmp(void *a, void *b) +{ + ligature const *la = a, *lb = b; + + if (la->left < lb->left) + return -1; + if (la->left > lb->left) + return 1; + if (la->right < lb->right) + return -1; + if (la->right > lb->right) + return 1; + return 0; +} + +/* This wouldn't be necessary if C had closures. */ +static font_info *glyph_cmp_fi; + +static int glyph_cmp(void const *a, void const *b) +{ + return strcmp(glyph_cmp_fi->glyphs[*(unsigned short *)a], + glyph_cmp_fi->glyphs[*(unsigned short *)b]); +} + +/* + * Set up the glyphsbyname index for a font. + */ +void font_index_glyphs(font_info *fi) { + int i; + + fi->glyphsbyname = snewn(fi->nglyphs, unsigned short); + for (i = 0; i < fi->nglyphs; i++) + fi->glyphsbyname[i] = i; + glyph_cmp_fi = fi; + qsort(fi->glyphsbyname, fi->nglyphs, sizeof(fi->glyphsbyname[0]), + glyph_cmp); +} + +int find_glyph(font_info const *fi, char const *name) { + int i, j, k, r; + + i = -1; + j = fi->nglyphs; + while (j-i > 1) { + k = (i + j) / 2; + r = strcmp(fi->glyphs[fi->glyphsbyname[k]], name); + if (r == 0) + return fi->glyphsbyname[k]; + else if (r > 0) + j = k; + else + i = k; + } + return -1; +} + static font_data *make_std_font(font_list *fontlist, char const *name) { - const int *widths; - const kern_pair *kerns; int nglyphs; + font_info const *fi; font_data *f; font_encoding *fe; int i; for (fe = fontlist->head; fe; fe = fe->next) - if (strcmp(fe->font->name, name) == 0) + if (strcmp(fe->font->info->name, name) == 0) return fe->font; - /* XXXKERN */ - widths = ps_std_font_widths(name); - kerns = ps_std_font_kerns(name); - if (!widths || !kerns) - return NULL; - - for (nglyphs = 0; ps_std_glyphs[nglyphs] != NULL; nglyphs++); + for (fi = all_fonts; fi; fi = fi->next) + if (strcmp(fi->name, name) == 0) break; + if (!fi) return NULL; f = snew(font_data); f->list = fontlist; - f->name = name; - f->nglyphs = nglyphs; - f->glyphs = ps_std_glyphs; - f->widths = widths; - f->kerns = newtree234(kern_cmp); - for (;kerns->left != 0xFFFF; kerns++) - add234(f->kerns, (void *)kerns); + f->info = fi; + nglyphs = f->info->nglyphs; f->subfont_map = snewn(nglyphs, subfont_map_entry); /* @@ -1406,16 +1463,11 @@ static font_data *make_std_font(font_list *fontlist, char const *name) fe->free_pos = 0xA1; /* only the top half is free */ f->latest_subfont = fe; - for (i = 0; i < (int)lenof(f->bmp); i++) - f->bmp[i] = 0xFFFF; - for (i = 0; i < nglyphs; i++) { wchar_t ucs; - ucs = ps_glyph_to_unicode(f->glyphs[i]); - assert(ucs != 0xFFFF); - f->bmp[ucs] = i; + ucs = ps_glyph_to_unicode(f->info->glyphs[i]); if (ucs >= 0x20 && ucs <= 0x7E) { - fe->vector[ucs] = f->glyphs[i]; + fe->vector[ucs] = f->info->glyphs[i]; fe->indices[ucs] = i; fe->to_unicode[ucs] = ucs; f->subfont_map[i].subfont = fe; @@ -1442,32 +1494,59 @@ static int find_kern(font_data *font, int lindex, int rindex) return 0; wantkp.left = lindex; wantkp.right = rindex; - kp = find234(font->kerns, &wantkp, NULL); + kp = find234(font->info->kerns, &wantkp, NULL); if (kp == NULL) return 0; return kp->kern; } -static int string_width(font_data *font, wchar_t const *string, int *errs) +static int find_lig(font_data *font, int lindex, int rindex) +{ + ligature wantlig; + ligature const *lig; + + if (lindex == 0xFFFF || rindex == 0xFFFF) + return 0xFFFF; + wantlig.left = lindex; + wantlig.right = rindex; + lig = find234(font->info->ligs, &wantlig, NULL); + if (lig == NULL) + return 0xFFFF; + return lig->lig; +} + +static int utoglyph(font_info const *fi, wchar_t u) { + return (u < 0 || u > 0xFFFF ? 0xFFFF : fi->bmp[u]); +} + +static int string_width(font_data *font, wchar_t const *string, int *errs, + unsigned flags) { int width = 0; - int index, oindex; + int nindex, index, oindex, lindex; if (errs) *errs = 0; oindex = 0xFFFF; + index = utoglyph(font->info, *string); for (; *string; string++) { - index = (*string < 0 || *string > 0xFFFF ? 0xFFFF : - font->bmp[*string]); + nindex = utoglyph(font->info, string[1]); if (index == 0xFFFF) { if (errs) *errs = 1; } else { - width += find_kern(font, oindex, index) + font->widths[index]; + if (!(flags & RS_NOLIG) && + (lindex = find_lig(font, index, nindex)) != 0xFFFF) { + index = lindex; + continue; + } + width += find_kern(font, oindex, index) + + font->info->widths[index]; } oindex = index; + index = nindex; } return width; @@ -1495,6 +1574,7 @@ static int paper_width_internal(void *vctx, word *word, int *nspaces) struct paper_width_ctx *ctx = (struct paper_width_ctx *)vctx; int style, type, findex, width, errs; wchar_t *str; + unsigned flags = 0; switch (word->type) { case word_HyperLink: @@ -1514,6 +1594,8 @@ static int paper_width_internal(void *vctx, word *word, int *nspaces) style == word_Emph ? FONT_EMPH : FONT_CODE); + if (style == word_Code || style == word_WeakCode) flags |= RS_NOLIG; + if (type == word_Normal) { str = word->text; } else if (type == word_WhiteSpace) { @@ -1530,7 +1612,7 @@ static int paper_width_internal(void *vctx, word *word, int *nspaces) str = ctx->conf->rquote; } - width = string_width(ctx->pdata->fonts[findex], str, &errs); + width = string_width(ctx->pdata->fonts[findex], str, &errs, flags); if (errs && word->alt) return paper_width_list(vctx, word->alt, NULL, nspaces); @@ -1550,7 +1632,7 @@ static int paper_width_simple(para_data *pdata, word *text, paper_conf *conf) ctx.pdata = pdata; ctx.minspacewidth = (pdata->sizes[FONT_NORMAL] * - string_width(pdata->fonts[FONT_NORMAL], L" ", NULL)); + string_width(pdata->fonts[FONT_NORMAL], L" ", NULL, 0)); ctx.conf = conf; return paper_width_list(&ctx, text, NULL, NULL); @@ -1578,7 +1660,7 @@ static void wrap_paragraph(para_data *pdata, word *words, } spacewidth = (pdata->sizes[FONT_NORMAL] * - string_width(pdata->fonts[FONT_NORMAL], L" ", NULL)); + string_width(pdata->fonts[FONT_NORMAL], L" ", NULL, 0)); if (spacewidth == 0) { /* * A font without a space?! Disturbing. I hope this never @@ -1900,26 +1982,34 @@ static void add_string_to_page(page_data *page, int x, int y, * Returns the updated x coordinate. */ static int render_string(page_data *page, font_data *font, int fontsize, - int x, int y, wchar_t *str) + int x, int y, wchar_t *str, unsigned flags) { char *text; - int textpos, textwid, kern, glyph, oglyph; + int textpos, textwid, kern, nglyph, glyph, oglyph, lig; font_encoding *subfont = NULL, *sf; text = snewn(1 + ustrlen(str), char); textpos = textwid = 0; glyph = 0xFFFF; + nglyph = utoglyph(font->info, *str); while (*str) { oglyph = glyph; - glyph = (*str < 0 || *str > 0xFFFF ? 0xFFFF : - font->bmp[*str]); + glyph = nglyph; + nglyph = utoglyph(font->info, str[1]); if (glyph == 0xFFFF) { str++; continue; /* nothing more we can do here */ } + if (!(flags & RS_NOLIG) && + (lig = find_lig(font, glyph, nglyph)) != 0xFFFF) { + nglyph = lig; + str++; + continue; + } + /* * Find which subfont this character is going in. */ @@ -1940,7 +2030,7 @@ static int render_string(page_data *page, font_data *font, int fontsize, font->subfont_map[glyph].subfont = font->latest_subfont; font->subfont_map[glyph].position = c; - font->latest_subfont->vector[c] = font->glyphs[glyph]; + font->latest_subfont->vector[c] = font->info->glyphs[glyph]; font->latest_subfont->indices[c] = glyph; font->latest_subfont->to_unicode[c] = *str; @@ -1964,7 +2054,7 @@ static int render_string(page_data *page, font_data *font, int fontsize, } text[textpos++] = font->subfont_map[glyph].position; - textwid += font->widths[glyph] * fontsize; + textwid += font->info->widths[glyph] * fontsize; str++; } @@ -1990,6 +2080,7 @@ static int render_text(page_data *page, para_data *pdata, line_data *ldata, int style, type, findex, errs; wchar_t *str; xref_dest dest; + unsigned flags = 0; switch (text->type) { /* @@ -2116,11 +2207,13 @@ static int render_text(page_data *page, para_data *pdata, line_data *ldata, style == word_Emph ? FONT_EMPH : FONT_CODE); + if (style == word_Code || style == word_WeakCode) flags |= RS_NOLIG; + if (type == word_Normal) { str = text->text; } else if (type == word_WhiteSpace) { x += pdata->sizes[findex] * - string_width(pdata->fonts[findex], L" ", NULL); + string_width(pdata->fonts[findex], L" ", NULL, 0); if (nspaces && findex != FONT_CODE) { x += (*nspace+1) * shortfall / nspaces; x -= *nspace * shortfall / nspaces; @@ -2134,7 +2227,7 @@ static int render_text(page_data *page, para_data *pdata, line_data *ldata, str = conf->rquote; } - (void) string_width(pdata->fonts[findex], str, &errs); + (void) string_width(pdata->fonts[findex], str, &errs, flags); if (errs && text->alt) x = render_text(page, pdata, ldata, x, y, text->alt, NULL, @@ -2142,7 +2235,7 @@ static int render_text(page_data *page, para_data *pdata, line_data *ldata, conf); else x = render_string(page, pdata->fonts[findex], - pdata->sizes[findex], x, y, str); + pdata->sizes[findex], x, y, str, flags); if (*xr) (*xr)->rx = x; @@ -2334,14 +2427,14 @@ static void render_para(para_data *pdata, paper_conf *conf, pdata->sizes[FONT_NORMAL], conf->left_margin + x, (conf->paper_height - conf->top_margin - - pdata->last->ypos), L"."); + pdata->last->ypos), L".", 0); render_string(pdata->last->page, pdata->fonts[FONT_NORMAL], pdata->sizes[FONT_NORMAL], conf->paper_width - conf->right_margin - wid, (conf->paper_height - conf->top_margin - - pdata->last->ypos), num); + pdata->last->ypos), num, 0); } /*