aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2025-12-27 21:44:29 +0200
committerPekka Paalanen <pq@iki.fi>2025-12-29 11:19:01 +0200
commite1e8ccd4aea229718d65f8f3008dcec3ff7d04c5 (patch)
tree11c8bb7bb2b9833c4d2e04ffafd126cd293f4033
parentdoc/xsl: fix malformed <variablelist> (diff)
downloadwayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar.gz
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar.bz2
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar.lz
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar.xz
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.tar.zst
wayland-e1e8ccd4aea229718d65f8f3008dcec3ff7d04c5.zip
doc: reinstate image maps
This fixes the errors during the compilation of Architecture.xml that the .map files cannot be found. As a result, the architure diagrams become clickable in the HTML document once again. Signed-off-by: Pekka Paalanen <pq@iki.fi>
-rw-r--r--doc/publican/html/images/meson.build7
-rw-r--r--doc/publican/meson.build12
2 files changed, 14 insertions, 5 deletions
diff --git a/doc/publican/html/images/meson.build b/doc/publican/html/images/meson.build
index 98e5b93..de4cc18 100644
--- a/doc/publican/html/images/meson.build
+++ b/doc/publican/html/images/meson.build
@@ -25,4 +25,11 @@ foreach src : files([
install: true,
install_dir: publican_install_prefix + '/html/images',
)
+
+ publican_image_maps += custom_target(
+ input + '.map',
+ command: [ dot, '-Tcmapx_np', '-o@OUTPUT@', '@INPUT@' ],
+ input: input,
+ output: fs.stem(src) + '.map',
+ )
endforeach
diff --git a/doc/publican/meson.build b/doc/publican/meson.build
index 83556f0..6493280 100644
--- a/doc/publican/meson.build
+++ b/doc/publican/meson.build
@@ -4,6 +4,7 @@ merge_mapcoords_xsl = files('xsl/merge-mapcoords.xsl')
to_publican_xsl = files('xsl/doxygen-to-publican.xsl')
publican_inputs = []
+publican_image_maps = []
foreach src : files([
'Wayland.xml', # must be first in publican_inputs
@@ -66,6 +67,9 @@ publican_inputs += custom_target(
output: 'ServerAPI.xml'
)
+subdir('html/css')
+subdir('html/images')
+
foreach src : files([
'Architecture.xml',
'Introduction.xml'
@@ -76,18 +80,16 @@ foreach src : files([
command: [
xsltproc,
'-o', '@OUTPUT@',
- '--stringparam', 'basedir', '.',
+ '--stringparam', 'basedir', meson.current_build_dir() / 'html',
merge_mapcoords_xsl,
'@INPUT@',
],
- input: [name],
+ input: src,
output: [name],
+ depends: publican_image_maps,
)
endforeach
-subdir('html/css')
-subdir('html/images')
-
custom_target(
'Wayland-docbook-html',
command: [