X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/e48dc0523b16c52691bda5324e5b294d67a25c70..5b1d0032b0eb6f4a347c0c2cfdbe6e4bb4f959ab:/bk_paper.c

diff --git a/bk_paper.c b/bk_paper.c
index e1721ae..a9f6f24 100644
--- a/bk_paper.c
+++ b/bk_paper.c
@@ -510,7 +510,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords,
 
 	for (page = pages; page; page = page->next) {
 	    sprintf(buf, "%d", ++pagenum);
-	    page->number = ufroma_dup(buf);
+	    page->number = ufroma_dup(buf, CS_ASCII);
 	}
 
 	if (has_index) {
@@ -524,7 +524,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords,
 
 	    /* And don't forget the as-yet-uncreated index. */
 	    sprintf(buf, "%d", ++pagenum);
-	    first_index_page->number = ufroma_dup(buf);
+	    first_index_page->number = ufroma_dup(buf, CS_ASCII);
 	}
     }
 
@@ -683,7 +683,7 @@ void *paper_pre_backend(paragraph *sourceform, keywordlist *keywords,
 	for (page = ipages->next; page; page = page->next) {
 	    char buf[40];
 	    sprintf(buf, "%d", ++pagenum);
-	    page->number = ufroma_dup(buf);
+	    page->number = ufroma_dup(buf, CS_ASCII);
 	}
 
 	/*
@@ -1682,7 +1682,7 @@ static int render_text(page_data *page, para_data *pdata, line_data *ldata,
 
 	    if (text->type == word_HyperLink) {
 		dest.type = URL;
-		dest.url = utoa_dup(text->text);
+		dest.url = utoa_dup(text->text, CS_ASCII);
 		dest.page = NULL;
 	    } else if (text->type == word_PageXref) {
 		dest.type = PAGE;
@@ -2004,13 +2004,6 @@ static void render_para(para_data *pdata, paper_conf *conf,
 	wid = paper_width_simple(pdata, w);
 	sfree(w);
 
-	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);
-
 	for (x = 0; x < conf->base_width; x += conf->leader_separation)
 	    if (x - conf->leader_separation > last_x - conf->left_margin &&
 		x + conf->leader_separation < conf->base_width - wid)
@@ -2020,6 +2013,13 @@ static void render_para(para_data *pdata, paper_conf *conf,
 			      conf->left_margin + x,
 			      (conf->paper_height - conf->top_margin -
 			       pdata->last->ypos), L".");
+
+	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);
     }
 
     /*