Skip to content

Commit

Permalink
Merge branch 'v3.0-latest'
Browse files Browse the repository at this point in the history
  • Loading branch information
dpvc committed Jan 24, 2020
2 parents 280023b + ac50dbf commit 61d9ac9
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion advanced/synchronize.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ See the :ref:`typeset-async` section for examples of typesetting using
promises.

In addition to promises, MathJax version 3 introduces
a :ref:`rednderActions <document-renderactions>` configuration option
a :ref:`renderActions <document-renderactions>` configuration option
that provides a means of linking into MathJax's processing pipeline.
This is a priorities list of functions to call during processing,
which includes the default actions of finding the math in the page,
Expand Down
2 changes: 1 addition & 1 deletion input/tex/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ delimiters, and other options for TeX input.

The TeX input processor handles conversion of your mathematical
notation into MathJax's internal format (which is essentially MathML),
and so acts as a TeX to MathML converter. The TeX input processor has
and so acts as a TeX to MathML converter. The TeX input processor
can also be customized through the use of extensions that define
additional functionality (see the :ref:`tex-extensions` section).

Expand Down
3 changes: 3 additions & 0 deletions options/input/tex.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ The Configuration Block
Note that some extensions make additional options available. See the
:ref:`tex-extension-options` section below for details.

Note also that the default for ``processEscapes`` has changed from
``false`` in version 2 to ``true`` in version 3.

-----


Expand Down
2 changes: 1 addition & 1 deletion options/startup/startup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In the example below, :data:`Startup` represents the
.. code-block:: javascript
MathJax = {
loader: {
startup: {
elements: null, // The elements to typeset (default is document body)
typeset: true, // Perform initial typeset?
ready: Startup.defaultReady.bind(Startup), // Called when components are loaded
Expand Down
11 changes: 9 additions & 2 deletions upgrading/v2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ input jax have been combined. For example, the ``tex2jax`` and
``TeX`` options now both occur in the ``tex`` configuration block.

MathJax version 2 included six different output jax, which had been
developed over time to server different purposes. The original
developed over time to serve different purposes. The original
HTML-CSS output jax had the greatest browser coverage, but its output
was browser-dependent, its font detection was fragile, and it was the
slowest of the output processors. The CommonHTML output jax was a
Expand Down Expand Up @@ -347,6 +347,12 @@ Some other changes include:

..
* The ``processEscapes`` option for the `tex2jax` preprocessor (now
for the TeX input jax) had a default value of ``false`` in version 2,
but has default value ``true`` in version 3.

..
* The functionality of the `MathChoice` extension has been moved to
the base TeX package.

Expand Down Expand Up @@ -629,7 +635,8 @@ array. For example
MathJax = {
options: {
renderActions: {
addMenu: [0]
addMenu: [],
checkLoading: []
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion web/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ each of the components, see the :ref:`configuration` pages.
Configuration Using an In-Line Script
-------------------------------------

The easiest way to configure MathJax to to place the ``MathJax``
The easiest way to configure MathJax is to place the ``MathJax``
object in a ``<script>`` tag just before the script that loads MathJax
itself. For example:

Expand Down

0 comments on commit 61d9ac9

Please sign in to comment.