Commit 92613a1eec543a00dd25dc6cdd407929323a811c

Authored by Jay Berkenbilt
1 parent d3501c4f

doc: switch html theme to sphinx_rtd_theme

README-maintainer
@@ -31,6 +31,13 @@ Memory checks: @@ -31,6 +31,13 @@ Memory checks:
31 --enable-werror --disable-shared 31 --enable-werror --disable-shared
32 32
33 33
  34 +CHECKING DOCS ON readthedocs
  35 +
  36 +To check docs on readthedocs.io without running all of CI, push to the
  37 +doc-check branch. Then visit https://qpdf.readthedocs.io/en/doc-check/
  38 +Building docs from pull requests is also enabled.
  39 +
  40 +
34 GOOGLE OSS-FUZZ 41 GOOGLE OSS-FUZZ
35 42
36 * See ../misc/fuzz (not in repo) for unfixed, downloaded fuzz test cases 43 * See ../misc/fuzz (not in repo) for unfixed, downloaded fuzz test cases
appimage/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \ @@ -7,7 +7,7 @@ RUN apt-get update && \
7 inkscape imagemagick busybox-static wget fuse && \ 7 inkscape imagemagick busybox-static wget fuse && \
8 apt-get clean && \ 8 apt-get clean && \
9 rm -rf /var/lib/apt/lists/* 9 rm -rf /var/lib/apt/lists/*
10 -RUN pip3 install sphinx 10 +RUN pip3 install sphinx sphinx_rtd_theme
11 COPY entrypoint /entrypoint 11 COPY entrypoint /entrypoint
12 RUN chmod +x /entrypoint 12 RUN chmod +x /entrypoint
13 ENTRYPOINT [ "/entrypoint" ] 13 ENTRYPOINT [ "/entrypoint" ]
build-scripts/build-linux
@@ -5,7 +5,7 @@ sudo apt-get -y install \ @@ -5,7 +5,7 @@ sudo apt-get -y install \
5 autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ 5 autoconf build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \
6 libssl-dev python3-pip texlive-latex-extra latexmk \ 6 libssl-dev python3-pip texlive-latex-extra latexmk \
7 inkscape imagemagick libtiff-tools ghostscript 7 inkscape imagemagick libtiff-tools ghostscript
8 -pip3 install sphinx 8 +pip3 install sphinx sphinx_rtd_theme
9 ./configure --enable-werror --enable-doc-maintenance \ 9 ./configure --enable-werror --enable-doc-maintenance \
10 --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \ 10 --enable-crypto-native --enable-crypto-openssl --enable-crypto-gnutls \
11 --enable-show-failed-test-output --enable-test-compare-images 11 --enable-show-failed-test-output --enable-test-compare-images
build-scripts/prebuild
@@ -5,7 +5,7 @@ sudo apt-get update @@ -5,7 +5,7 @@ sudo apt-get update
5 sudo apt-get -y install \ 5 sudo apt-get -y install \
6 autoconf build-essential zlib1g-dev libjpeg-dev \ 6 autoconf build-essential zlib1g-dev libjpeg-dev \
7 python3-pip texlive-latex-extra latexmk inkscape imagemagick 7 python3-pip texlive-latex-extra latexmk inkscape imagemagick
8 -pip3 install sphinx 8 +pip3 install sphinx sphinx_rtd_theme
9 ./configure --enable-doc-maintenance 9 ./configure --enable-doc-maintenance
10 make -j$(nproc) build_manual 10 make -j$(nproc) build_manual
11 zip -r doc.zip doc/*html doc/*.pdf 11 zip -r doc.zip doc/*html doc/*.pdf
manual/conf.py
@@ -6,14 +6,19 @@ @@ -6,14 +6,19 @@
6 # 6 #
7 # To see the default sample conf.py, run sphinx-quickstart in an empty 7 # To see the default sample conf.py, run sphinx-quickstart in an empty
8 # directory. Most of the original comments and options were removed. 8 # directory. Most of the original comments and options were removed.
  9 +import sphinx_rtd_theme # noQA F401
9 10
10 project = 'QPDF' 11 project = 'QPDF'
11 copyright = '2005-2021, Jay Berkenbilt' 12 copyright = '2005-2021, Jay Berkenbilt'
12 author = 'Jay Berkenbilt' 13 author = 'Jay Berkenbilt'
13 release = '10.4.0' 14 release = '10.4.0'
14 version = release 15 version = release
15 -html_theme = 'nature' 16 +extensions = [
  17 + 'sphinx_rtd_theme',
  18 +]
  19 +html_theme = 'sphinx_rtd_theme'
16 html_theme_options = { 20 html_theme_options = {
17 "body_max_width": None, 21 "body_max_width": None,
18 } 22 }
  23 +html_logo = '../logo/qpdf.svg'
19 highlight_language = 'none' 24 highlight_language = 'none'
manual/installation.rst
@@ -63,10 +63,11 @@ ghostscript. @@ -63,10 +63,11 @@ ghostscript.
63 Pre-built documentation is distributed with qpdf, so you should 63 Pre-built documentation is distributed with qpdf, so you should
64 generally not need to rebuild the documentation. In order to build the 64 generally not need to rebuild the documentation. In order to build the
65 documentation from source, you need to install `Sphinx 65 documentation from source, you need to install `Sphinx
66 -<https://sphinx-doc.org>`__. To build the PDF version of the  
67 -documentation, you need ``pdflatex``, ``latexmk``, and a fairly complete  
68 -LaTeX installation. Detailed requirements can be found in the Sphinx  
69 -documentation. 66 +<https://sphinx-doc.org>`__ along with the ``sphinx_rtd_doc`` theme
  67 +(``pip install sphinx sphinx_rtd_theme``). To build the PDF version of
  68 +the documentation, you need ``pdflatex``, ``latexmk``, and a fairly
  69 +complete LaTeX installation. Detailed requirements can be found in the
  70 +Sphinx documentation.
70 71
71 .. _building: 72 .. _building:
72 73