Skip to content

Commit 03a7b63

Browse files
authored
Merge pull request #284 from AlanDrake/QoL2025
QoL 2025: Topic builder for web, new desktop/mobile layout, general improvements
2 parents 2f0b30c + cbb736f commit 03a7b63

File tree

10 files changed

+479
-62
lines changed

10 files changed

+479
-62
lines changed

Makefile.am

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ websitejs_DATA = \
1818
$(srcdir)/html/js/darkmode.js \
1919
$(srcdir)/vendor/mark.js \
2020
$(srcdir)/vendor/mark.min.js \
21-
search.js
21+
search.js \
22+
navigation.js
2223
websitestatic_DATA = \
2324
$(srcdir)/html/static/favicon.ico \
2425
$(srcdir)/html/static/logo.svg
@@ -35,6 +36,7 @@ CLEANFILES = \
3536
genindex.html \
3637
metadata.lua \
3738
search.js \
39+
navigation.js \
3840
source/ags-help.hhc \
3941
source/ags-help.hhk \
4042
source/ags-help.hhp
@@ -46,6 +48,7 @@ EXTRA_DIST = \
4648
$(srcdir)/html/jslicensing.html \
4749
$(srcdir)/html/template.html5 \
4850
$(srcdir)/html/template.js \
51+
$(srcdir)/html/template_navigation.js \
4952
$(srcdir)/htmlhelp/template.hhc \
5053
$(srcdir)/htmlhelp/template.hhp \
5154
$(srcdir)/htmlhelp/template.html4 \
@@ -62,6 +65,7 @@ EXTRA_DIST = \
6265
$(srcdir)/lua/write_hhp.lua \
6366
$(srcdir)/lua/write_metablock.lua \
6467
$(srcdir)/lua/write_metajs.lua \
68+
$(srcdir)/lua/write_navigationjs.lua \
6569
$(srcdir)/meta/approved_links.txt \
6670
$(srcdir)/syntax/ags.xml \
6771
$(srcdir)/syntax/agsdialog.xml \
@@ -126,6 +130,14 @@ search.js: metadata.lua
126130
--eol lf \
127131
--output $@
128132

133+
navigation.js: source/_Sidebar.md
134+
$(AM_V_GEN)echo | "$(PANDOC)" \
135+
--to "$(srcdir)/lua/write_navigationjs.lua" \
136+
--template "$(srcdir)/html/template_navigation.js" \
137+
--eol lf \
138+
--output $@ \
139+
$<
140+
129141
.md.htm:
130142
$(AM_V_GEN)"$(PANDOC)" --from gfm-tex_math_dollars \
131143
--to html4 \
@@ -157,15 +169,16 @@ source/ags-help.hhk: metadata.lua
157169
--eol crlf \
158170
--output $@
159171

160-
source/ags-help.hhc:
172+
source/ags-help.hhc: source/_Sidebar.md
161173
$(AM_V_GEN)"$(PANDOC)" --from gfm-tex_math_dollars \
162174
--to "$(srcdir)/lua/write_hhc.lua" \
163175
--lua-filter "$(srcdir)/lua/rewrite_links.lua" \
164176
--template "$(srcdir)/htmlhelp/template.hhc" \
165177
--eol crlf \
166178
--wrap=none \
167179
--output $@ \
168-
source/index.md
180+
$<
181+
-$(AM_V_GEN) sed -z -i -E "s/(<\/OBJECT>[^<]*?<UL>)/<param name=\"ImageNumber\" value=\"1\">\n\1/g" source/ags-help.hhc
169182

170183
source/ags-help.hhp:
171184
$(AM_V_GEN)echo | "$(PANDOC)" \

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ AM_CONDITIONAL([BUILD_CHM],
3232

3333
AC_CONFIG_LINKS([source/index.md:source/index.md])
3434
AC_CONFIG_SRCDIR([source/index.md])
35+
AC_CONFIG_LINKS([source/_Sidebar.md:source/_Sidebar.md])
36+
AC_CONFIG_SRCDIR([source/_Sidebar.md])
3537
AC_CONFIG_FILES([Makefile])
3638

3739
m4_define([IMAGEFILES_LIST],

0 commit comments

Comments
 (0)