Merge remote-tracking branch 'upstream/main'

.github/workflows/main.yml

@@ -52,7 +52,7 @@ jobs:
       - run: pip install bikeshed && bikeshed update
       - run: pip install six
       - run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-      - run: pip install sphinx==3.5.4
+      - run: pip install sphinx==4.0.0
       - run: cd document/core && make all
       - uses: actions/upload-artifact@v2
         with:

document/README.md

@@ -42,7 +42,7 @@ pipenv shell
 Install Python dependencies:
 
 ```
-pipenv install Sphinx==3.5.4
+pipenv install Sphinx==4.0.0
 ```
 
 ### Checking out the repository

document/core/conf.py

@@ -492,8 +492,9 @@
 .. include:: /""" + pwd + """/util/macros.def
 """
 
-# https://www.sphinx-doc.org/en/master/usage/extensions/math.html#confval-mathjax_config
-# http://docs.mathjax.org/en/v2.7-latest/options/input-processors/TeX.html
-mathjax_config = {
-    'TeX': { 'MAXBUFFER': 30*1024 },
+# https://www.sphinx-doc.org/en/master/usage/extensions/math.html#confval-mathjax3_config
+# https://docs.mathjax.org/en/latest/web/configuration.html#configuration
+# https://docs.mathjax.org/en/latest/options/input/tex.html#tex-maxbuffer
+mathjax3_config = {
+    'tex': { 'maxBuffer': 30*1024 },
 }

document/core/index.rst

@@ -29,7 +29,11 @@ WebAssembly Specification
       appendix/index-instructions
       appendix/index-rules
 
-.. only:: html
+..
+   Only include these links when using (multi-page) html builder.
+   (The singlepage html builder is called builder_singlehtml.)
+
+.. only:: builder_html
 
    * :ref:`index-type`
    * :ref:`index-instr`

document/core/intro/overview.rst

@@ -50,7 +50,7 @@ This language is structured around the following concepts.
 **Functions**
   Code is organized into separate *functions*.
   Each function takes a sequence of values as parameters
-  and returns a sequence of values as results. [#arity]_
+  and returns a sequence of values as results.
   Functions can call each other, including recursively,
   resulting in an implicit call stack that cannot be accessed directly.
   Functions may also declare mutable *local variables* that are usable as virtual registers.
@@ -96,8 +96,6 @@ This language is structured around the following concepts.
 
 .. [#stackmachine] In practice, implementations need not maintain an actual operand stack. Instead, the stack can be viewed as a set of anonymous registers that are implicitly referenced by instructions. The :ref:`type system <validation>` ensures that the stack height, and thus any referenced register, is always known statically.
 
-.. [#arity] In the current version of WebAssembly, there may be at most one result value.
-
 
 .. index:: phases, decoding, validation, execution, instantiation, invocation
 

document/core/util/bikeshed/conf.py

@@ -38,4 +38,4 @@
 assert(main_macros_def in rst_prolog)
 rst_prolog  = rst_prolog.replace(main_macros_def, "/" + pwd + "/util/macros.def")
 
-del mathjax_config
+del mathjax3_config

document/core/util/mathjax2katex.py

@@ -160,19 +160,6 @@ def ExtractMath(match):
   data = data.replace(
       '<li class="nav-item nav-item-0"><a href="index.html#document-index">'
       'WebAssembly 1.0</a> »', '')
-  # Drop Index links.
-  data = data.replace(
-      '<li><a class="reference internal" href="index.html#index-type">'
-      '<span class="std std-ref">Index of Types</span></a>', '')
-  data = data.replace(
-      '<li><a class="reference internal" href="index.html#index-instr">'
-      '<span class="std std-ref">Index of Instructions</span></a>', '')
-  data = data.replace(
-      '<li><a class="reference internal" href="index.html#index-rules">'
-      '<span class="std std-ref">Index of Semantic Rules</span></a>', '')
-  data = data.replace(
-      '<li><a class="reference internal" href="genindex.html">'
-      '<span class="std std-ref">Index</span></a>', '')
   # Drop sphinx css.
   data = data.replace(
       '<link href="_static/classic.css" rel="stylesheet" type="text/css">', '')