commit 73075728f23c64e56bffe38883a1cf0c84c4d349
parent e79a2f3368a2880914ebb46945df5375a83ffbc3
Author: nibo <nibo@relim.de>
Date: Mon, 10 Feb 2025 13:30:12 +0100
Fix overlapping page no and chord diagram
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,6 +1,7 @@
VERSION = 0.1.0
PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man
+# Control whether log messages are colored.
COLOR = 0
VARS = -DVERSION=\"${VERSION}\" -DCOLOR=${COLOR} -DPREFIX=\"${PREFIX}\"
CFLAGS = -std=c23 -pedantic -Wall -Wextra
diff --git a/lorid.1 b/lorid.1
@@ -18,6 +18,8 @@ reads text from one or more
and if no
.I FILE
was provided then from stdin.
+.B lorid
+assumes the text is encoded in UTF-8.
The text will be parsed according to the chordpro specification
and then converted to pdf. These two steps can be altered by
changing the configuration file.
@@ -91,4 +93,4 @@ man page.
.SH CHORDPRO
.PP
-You can find the chordpro specification at https://www.chordpro.org/chordpro/.
+You find the chordpro specification at https://www.chordpro.org/chordpro/.
diff --git a/src/out_pdf.c b/src/out_pdf.c
@@ -1787,7 +1787,7 @@ pdf_page_add_page_no(struct PDFContext *ctx, enum NumeralSystem numeral_system)
(*texts)[ctx->text]->text = strdup(page_no);
(*texts)[ctx->text]->style = style;
(*texts)[ctx->text]->x = MEDIABOX_WIDTH - MARGIN_HORIZONTAL / 2 - width;
- (*texts)[ctx->text]->y = ctx->margin_bottom / 2;
+ (*texts)[ctx->text]->y = MARGIN_BOTTOM / 2;
(*texts)[ctx->text]->width = width;
switch (g_config->output->page_no->align) {
case A_LEFT:
@@ -2702,7 +2702,7 @@ pdf_content_render(struct PDFContent *content, pdfio_file_t *file)
}
if (pages[p]->diagrams) {
double x = MARGIN_HORIZONTAL;
- double y = 40.0;
+ double y = 50.0;
double size = 50.0;
double padding = 30.0;
struct ChordDiagram **d;