Skip to content

Commit

Permalink
Merge bc896fe into 21d7e1e
Browse files Browse the repository at this point in the history
  • Loading branch information
rossbar committed Mar 20, 2020
2 parents 21d7e1e + bc896fe commit 9c537dc
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = "pandas_sphinx_theme"
html_theme = "pydata_sphinx_theme"
html_logo = "_static/logo.png"

# Add any paths that contain custom static files (such as style sheets) here,
Expand Down
2 changes: 1 addition & 1 deletion docs/develop/test_infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The tests are run using [pytest](https://docs.pytest.org)/[TravisCI](https://tra
The tests are ordered in a hierarchical fashion:

1. In `tests/test_syntax` are tests that check that the source text is being correctly converted to the Markdown ([mistletoe](https://github.com/miyuchina/mistletoe)) AST.
2. In `tests/test_commonmark` the [CommonMark](https://github.com/commonmark/CommonMark.git) test set is run; to check that the parser is complying with the CommonMark specification.
2. In `tests/test_commonmark` the [CommonMark](https://github.com/commonmark/CommonMark.git) test set is run to check that the parser is complying with the CommonMark specification.
3. In `tests/test_renderers` are tests that check that the Markdown AST is being correctly converted to the docutils/sphinx AST. This includes testing that roles and directives are correctly parsed and run.
4. In `tests/test_sphinx` are tests that check that minimal sphinx project builds are running correctly, to convert MyST markdown files to HTML.
5. In `.circleci` the package documentation (written in MyST format) is built and tested for build errors/warnings.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MyST syntax and {doc}`Sphinx <sphinx:intro>`. This allows for native markdown su
directives.

```{warning}
The MyST parser is in an alpha stage, and may have breaking syntax to its implementation
The MyST parser is in an alpha stage, and may have breaking changes to its implementation
and to the syntax that it supports. Use at your own risk. If you find any issues,
please report them
[in the MyST issues](https://github.com/ExecutableBookProject/meta/issues/24)
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt

This file was deleted.

14 changes: 7 additions & 7 deletions docs/using/benchmark.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ Readability, however, is emphasized above all else. A Markdown-formatted
document should be publishable as-is, as plain text, without looking
like it's been marked up with tags or formatting instructions. While
Markdown's syntax has been influenced by several existing text-to-HTML
filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
[Grutatext] [5], and [EtText] [6] -- the single biggest source of
inspiration for Markdown's syntax is the format of plain text email.
filters -- including [Setext][1], [atx][2], [Textile][3], [reStructuredText][4],
[Grutatext][5], and [EtText][6] -- the single biggest source of
inspiration for Markdown's syntax is the format of plain-text email.

[1]: http://docutils.sourceforge.net/mirror/setext.html
[2]: http://www.aaronsw.com/2002/atx/
Expand All @@ -79,7 +79,7 @@ inspiration for Markdown's syntax is the format of plain text email.
[6]: http://ettext.taint.org/doc/

To this end, Markdown's syntax is comprised entirely of punctuation
characters, which punctuation characters have been carefully chosen so
characters which have been carefully chosen so
as to look like what they mean. E.g., asterisks around a word actually
look like \*emphasis\*. Markdown lists look like, well, lists. Even
blockquotes look like quoted passages of text, assuming you've ever
Expand Down Expand Up @@ -226,7 +226,7 @@ work best -- and look better -- when you format them with hard breaks.

<h3 id="header">Headers</h3>

Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
Markdown supports two styles of headers, [Setext][1] and [atx][2].

Setext-style headers are "underlined" using equal signs (for first-level
headers) and dashes (for second-level headers). For example:
Expand All @@ -237,8 +237,8 @@ headers) and dashes (for second-level headers). For example:
This is an H2
-------------

This is an H2
-------------
% This is an H2
% -------------

Any number of underlining `=`'s or `-`'s will work.

Expand Down
10 changes: 5 additions & 5 deletions docs/using/syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ print('yep!')
## Roles - an in-line extension point

Roles are similar to directives - they allow you to define arbitrary new
functionality in Sphinx, but they are use *in-line*. To define an in-line
functionality in Sphinx, but they are used *in-line*. To define an in-line
role, use the following form:

````{list-table}
Expand Down Expand Up @@ -592,8 +592,8 @@ This is equivalent to the following directive:
### Front Matter

This is a YAML block at the start of the document, as used for example in
[jekyll](https://jekyllrb.com/docs/front-matter/). Sphinx intercepts this data and
stores it within the global environment (as discussed
[jekyll](https://jekyllrb.com/docs/front-matter/). Sphinx intercepts these data and
stores them within the global environment (as discussed
[here](https://www.sphinx-doc.org/en/master/usage/restructuredtext/field-lists.html)).

A classic use-case is to specify 'orphan' documents, that are not specified in any
Expand Down Expand Up @@ -626,7 +626,7 @@ Is below, but it won't be parsed into the document.
% my comment

````{important}
Since comments are a block level entity, they will terminate the previous block.
Since comments are a block-level entity, they will terminate the previous block.
In practical terms, this means that the following lines
will be broken up into two paragraphs, resulting in a new line between them:
Expand Down Expand Up @@ -756,7 +756,7 @@ indented by four or more spaces, will also be included in the footnote definitio
That continues for all indented lines
Plus any precding unindented lines,
Plus any preceding unindented lines,
that are not separated by a blank line
This is not part of the footnote.
Expand Down
4 changes: 2 additions & 2 deletions docs/using/use_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ print(document.pformat())

## Sphinx Renderer

The `myst_parser.docutils_renderer.SphinxRenderer` builds on the `DocutilsRenderer` to add sphinx specific nodes, e.g. for cross-referencing between documents.
The `myst_parser.docutils_renderer.SphinxRenderer` builds on the `DocutilsRenderer` to add sphinx-specific nodes, e.g. for cross-referencing between documents.

```{note}
To use sphinx specific roles and directives outside of a `sphinx-build`, they must first be loaded with the `load_sphinx_env=True` option.
To use sphinx-specific roles and directives outside of a `sphinx-build`, they must first be loaded with the `load_sphinx_env=True` option.
```

````python
Expand Down
4 changes: 2 additions & 2 deletions myst_parser/block_tokens.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ def read(cls, lines):
class BlockBreak(block_tokens.BlockToken):
"""Block break token ``+++``.
This syntax is myst specific, used to denote the start of a new block of text.
This constuct's intended use case is for mapping to cell based document formats,
This myst-specific syntax is used to denote the start of a new block of text.
This construct's intended use-case is for mapping to cell-based document formats,
like jupyter notebooks, to indicate a new text cell.
"""

Expand Down
2 changes: 1 addition & 1 deletion myst_parser/html_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


class HTMLRenderer(html_renderer.HTMLRenderer):
"""This HTML render uses the uses the MyST spec block and span tokens.
"""This HTML renderer uses the uses the MyST spec block and span tokens.
It is used to test compliance with the commonmark spec,
and can be used for basic previews,
Expand Down
2 changes: 1 addition & 1 deletion myst_parser/json_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


class JsonRenderer(json.JsonRenderer):
"""This JSON render uses the MyST spec block and span tokens.
"""This JSON renderer uses the MyST spec block and span tokens.
"""

default_block_tokens = (
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"pytest-regressions",
"beautifulsoup4",
],
"rtd": ["sphinxcontrib-bibtex", "ipython"],
"rtd": ["sphinxcontrib-bibtex", "ipython", "pydata-sphinx-theme"],
},
zip_safe=True,
)

0 comments on commit 9c537dc

Please sign in to comment.