From 8e0b342ce4ecf8696faacf1317de36cf37022423 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 22 Aug 2023 02:47:23 -0500 Subject: [PATCH] Fix so setting $LOCALHTML supports change of image format --- doc/include/constants.m4 | 4 ++++ doc/include/macros.m4 | 2 +- make_files/make_docs.mk | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/include/constants.m4 b/doc/include/constants.m4 index 9cba59b..986526d 100644 --- a/doc/include/constants.m4 +++ b/doc/include/constants.m4 @@ -35,7 +35,11 @@ dnl type of documentation generated. dnl dnl The extension (png, svg, etc.) to use when referencing image files. +dnl Caution: When changing the html related extensions the documentation's +dnl $HTML_IMAGE_FILES Makefile variable, set based on $LOCALHTML, must +dnl also be correspondingly changed. define(`sdb_html_image_extension', `svg') +define(`sdb_html_file_image_extension', `png') define(`sdb_latex_image_extension', `png') divert(`0')dnl Output with m4 again diff --git a/doc/include/macros.m4 b/doc/include/macros.m4 index c1cf3ce..9b0dbdb 100644 --- a/doc/include/macros.m4 +++ b/doc/include/macros.m4 @@ -64,7 +64,7 @@ define(`sdb_html_er_image_path', `/$1.sdb_html_image_extension') dnl Transform a path to an image so that it is suitable for html file: URL dnl output -define(`sdb_html_file_er_image_path', `/$1.sdb_html_image_extension') +define(`sdb_html_file_er_image_path', `/$1.sdb_html_file_image_extension') dnl Transform a path to an image so that it is suitable for latex output define(`sdb_latex_er_image_path', `/$1.sdb_latex_image_extension') diff --git a/make_files/make_docs.mk b/make_files/make_docs.mk index 7081d7b..6814ace 100644 --- a/make_files/make_docs.mk +++ b/make_files/make_docs.mk @@ -157,8 +157,12 @@ SVG_FILES := $(patsubst %.svg,%.svg,$(PARTIAL_PATHS)) PNG_FILES := $(patsubst %.svg,%.png,$(PARTIAL_PATHS)) ifdef LOCALHTML +# When changing this the doc/include/constants.m4 sdb_html_file_image_extension +# macro must be changed so exensions correspond. HTML_IMAGE_FILES := $(PNG_FILES) else +# When changing this the doc/include/constants.m4 sdb_html_image_extension +# macro must be changed so exensions correspond. HTML_IMAGE_FILES := $(SVG_FILES) endif -- 2.34.1