[PATCH 1/2] doc: replace :math: for subscripts in notmuch-sexp-queries(7)

[PATCH 1/2] doc: replace :math: for subscripts in notmuch-sexp-queries(7)

[David Bremner]

Sphinx pulls in mathjax to do :math:, which complicates viewing the
html version offline. The direct :sub: is supported directly in html.
---
 doc/man7/notmuch-sexp-queries.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst
index 3c33232f..bc8e5086 100644
--- a/doc/man7/notmuch-sexp-queries.rst
+++ b/doc/man7/notmuch-sexp-queries.rst
@@ -336,10 +336,10 @@ NOTES
                in notmuch, this modifier is not supported in the
                ``path`` field.
 
-.. |q1| replace:: :math:`q_1`
-.. |q2| replace:: :math:`q_2`
-.. |qn| replace:: :math:`q_n`
+.. |q1| replace:: `q`\ :sub:`1`
+.. |q2| replace:: `q`\ :sub:`2`
+.. |qn| replace:: `q`\ :sub:`n`
 
-.. |p1| replace:: :math:`p_1`
-.. |p2| replace:: :math:`p_2`
-.. |pn| replace:: :math:`p_n`
+.. |p1| replace:: `p`\ :sub:`1`
+.. |p2| replace:: `p`\ :sub:`2`
+.. |pn| replace:: `p`\ :sub:`n`
-- 
2.34.1

[PATCH 2/2] debian: package HTML docs

[David Bremner]

This is particularly useful for the docs for the notmuch2 python
bindings, which are otherwise not packaged.
---
 debian/control | 18 +++++++++++++++++-
 debian/rules   |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9872d602..a11d4130 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,8 @@ Recommends:
  gnupg-agent,
  gpgsm,
 Suggests:
- mailscripts
+ mailscripts,
+ notmuch-doc,
 Description: thread-based email index, search and tagging
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
@@ -65,6 +66,21 @@ Description: thread-based email index, search and tagging
  .
  This package contains the notmuch command-line interface
 
+Package: notmuch-doc
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+Suggests:
+ notmuch
+Description: thread-based email index, search and tagging
+ Notmuch is a system for indexing, searching, reading, and tagging
+ large collections of email messages in maildir or mh format. It uses
+ the Xapian library to provide fast, full-text search with a very
+ convenient search syntax.
+ .
+ This package contains the HTML documentation
+
 Package: libnotmuch5
 Section: libs
 Architecture: any
diff --git a/debian/rules b/debian/rules
index fa0551a9..55867126 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with python3,elpa
+	dh $@ --with python3,elpa,sphinxdoc
 
 override_dh_auto_configure:
 	BASHCMD=/bin/bash ./configure --prefix=/usr \
@@ -19,7 +19,7 @@ override_dh_auto_test:
 	dh_auto_test -- V=1
 
 override_dh_auto_build:
-	dh_auto_build -- V=1
+	dh_auto_build -- V=1 all sphinx-html
 	PYBUILD_NAME=notmuch dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python
 	PYBUILD_NAME=notmuch2 dh_auto_build --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	$(MAKE) -C contrib/notmuch-mutt
-- 
2.34.1