Rename fz_add_text to fz_show_glyph.

Match naming of fz_moveto/lineto etc for paths.

6 files changed, 10 insertions, 10 deletions

diff --git a/include/mupdf/fitz/text.h b/include/mupdf/fitz/text.h
index 090d372d..1a14fb83 100644
--- a/include/mupdf/fitz/text.h
+++ b/include/mupdf/fitz/text.h
@@ -49,7 +49,7 @@ fz_text *fz_new_text(fz_context *ctx);
 fz_text *fz_keep_text(fz_context *ctx, const fz_text *text);
 void fz_drop_text(fz_context *ctx, const fz_text *text);
 
-void fz_add_text(fz_context *ctx, fz_text *text, fz_font *font, int wmode, const fz_matrix *trm, int gid, int ucs);
+void fz_show_glyph(fz_context *ctx, fz_text *text, fz_font *font, int wmode, const fz_matrix *trm, int glyph, int unicode);
 fz_rect *fz_bound_text(fz_context *ctx, const fz_text *text, const fz_stroke_state *stroke, const fz_matrix *ctm, fz_rect *r);
 
 fz_text *fz_clone_text(fz_context *ctx, const fz_text *text);
diff --git a/source/fitz/text.c b/source/fitz/text.c
index c9dfda9d..87aa2e79 100644
--- a/source/fitz/text.c
+++ b/source/fitz/text.c
@@ -80,7 +80,7 @@ fz_grow_text_span(fz_context *ctx, fz_text_span *span, int n)
 }
 
 void
-fz_add_text(fz_context *ctx, fz_text *text, fz_font *font, int wmode, const fz_matrix *trm, int gid, int ucs)
+fz_show_glyph(fz_context *ctx, fz_text *text, fz_font *font, int wmode, const fz_matrix *trm, int gid, int ucs)
 {
 	fz_text_span *span;
 
diff --git a/source/html/html-layout.c b/source/html/html-layout.c
index 2735dfeb..8a7490c7 100644
--- a/source/html/html-layout.c
+++ b/source/html/html-layout.c
@@ -1156,7 +1156,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p
 								continue;
 							trm.e = *(float *)&p->x_offset;
 							trm.f = *(float *)&p->y_offset;
-							fz_add_text(ctx, text, walker.font, 0, &trm, g->codepoint, c);
+							fz_show_glyph(ctx, text, walker.font, 0, &trm, g->codepoint, c);
 							break;
 						}
 						if (gp == walker.glyph_count)
@@ -1165,7 +1165,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p
 							 * because we've been shaped away into another. We can't afford
 							 * to just drop the codepoint as this will upset text extraction.
 							 */
-							fz_add_text(ctx, text, walker.font, 0, &trm, -1, c);
+							fz_show_glyph(ctx, text, walker.font, 0, &trm, -1, c);
 						}
 						else
 						{
@@ -1179,7 +1179,7 @@ static void draw_flow_box(fz_context *ctx, fz_html *box, float page_top, float p
 									continue;
 								trm.e = *(float *)&p->x_offset;
 								trm.f = *(float *)&p->y_offset;
-								fz_add_text(ctx, text, walker.font, 0, &trm, g->codepoint, -1);
+								fz_show_glyph(ctx, text, walker.font, 0, &trm, g->codepoint, -1);
 							}
 						}
 						idx += l;
@@ -1375,7 +1375,7 @@ static void draw_list_mark(fz_context *ctx, fz_html *box, float page_top, float
 	{
 		s += fz_chartorune(&c, s);
 		g = fz_encode_character_with_fallback(ctx, box->style.font, c, UCDN_SCRIPT_LATIN, &font);
-		fz_add_text(ctx, text, font, 0, &trm, g, c);
+		fz_show_glyph(ctx, text, font, 0, &trm, g, c);
 		trm.e += fz_advance_glyph(ctx, font, g) * box->em;
 	}
 
diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c
index 466978b5..5754c2e5 100644
--- a/source/pdf/pdf-appearance.c
+++ b/source/pdf/pdf-appearance.c
@@ -1908,7 +1908,7 @@ static void add_text(fz_context *ctx, font_info *font_rec, fz_text *text, char *
 		str += n;
 		str_len -= n;
 		gid = fz_encode_character(ctx, font, ucs);
-		fz_add_text(ctx, text, font, 0, &tm, gid, ucs);
+		fz_show_glyph(ctx, text, font, 0, &tm, gid, ucs);
 		tm.e += fz_advance_glyph(ctx, font, gid) * font_rec->da_rec.font_size;
 	}
 }
diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
index f18b593d..7a039980 100644
--- a/source/pdf/pdf-op-run.c
+++ b/source/pdf/pdf-op-run.c
@@ -943,11 +943,11 @@ pdf_show_char(fz_context *ctx, pdf_run_processor *pr, int cid)
 	fz_union_rect(&pr->text_bbox, &bbox);
 
 	/* add glyph to textobject */
-	fz_add_text(ctx, pr->text, fontdesc->font, fontdesc->wmode, &trm, gid, ucsbuf[0]);
+	fz_show_glyph(ctx, pr->text, fontdesc->font, fontdesc->wmode, &trm, gid, ucsbuf[0]);
 
 	/* add filler glyphs for one-to-many unicode mapping */
 	for (i = 1; i < ucslen; i++)
-		fz_add_text(ctx, pr->text, fontdesc->font, fontdesc->wmode, &trm, -1, ucsbuf[i]);
+		fz_show_glyph(ctx, pr->text, fontdesc->font, fontdesc->wmode, &trm, -1, ucsbuf[i]);
 
 	if (fontdesc->wmode == 0)
 	{
diff --git a/source/xps/xps-glyphs.c b/source/xps/xps-glyphs.c
index a87c2862..5d343428 100644
--- a/source/xps/xps-glyphs.c
+++ b/source/xps/xps-glyphs.c
@@ -450,7 +450,7 @@ xps_parse_glyphs_imp(fz_context *ctx, xps_document *doc, const fz_matrix *ctm,
 				tm.f = y - v_offset;
 			}
 
-			fz_add_text(ctx, text, font, is_sideways, &tm, glyph_index, char_code);
+			fz_show_glyph(ctx, text, font, is_sideways, &tm, glyph_index, char_code);
 
 			x += advance * 0.01f * size;
 		}