diff options
| -rw-r--r-- | MANUAL.txt | 2 | ||||
| -rw-r--r-- | changelog.md | 14 | ||||
| -rw-r--r-- | doc/org.md | 4 | ||||
| -rw-r--r-- | man/pandoc.1 | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Org/Inlines.hs | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/MANUAL.txt b/MANUAL.txt index f529264bf..d82cae207 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -2156,7 +2156,7 @@ These variables change the appearance of PDF slides using [`beamer`]. ### Variables for PowerPoint These variables control the visual aspects of a slide show that -are not easily controled via templates. +are not easily controlled via templates. `monofont` : font to use for code. diff --git a/changelog.md b/changelog.md index 642e20196..53d199e5a 100644 --- a/changelog.md +++ b/changelog.md @@ -990,7 +990,7 @@ screen-readers would read it twice, see #4737. + Don't add variation selector if it's already there. This fixes round-trip failures. - + Prevent gratuitious emojification on iOS (#5469). + + Prevent gratuitous emojification on iOS (#5469). iOS chooses to render a number of Unicode entities, including '↩', as big colorful emoji. This can be defeated by appending Unicode VARIATION SELECTOR-15'/'VARIATION SELECTOR-16'. So we now append this @@ -2258,7 +2258,7 @@ * `--ascii` now works with LaTeX output. 100% ASCII output can't be guaranteed, but the writer will use commands like `\"{a}` and `\l` - whenever possible, to avoid emiting a non-ASCII character. + whenever possible, to avoid emitting a non-ASCII character. * For HTML5 output, `--ascii` now uses HTML5 character reference entities rather than numerical entities. @@ -3790,7 +3790,7 @@ * JATS writer: Remove extraneous, significant whitespace (#4335, Nokome Bentley). - * html2pdf: inject base tag wih current working directory (#4413, Mauro + * html2pdf: inject base tag with current working directory (#4413, Mauro Bieg). This helps ensure that linked resources are included. * Add Semigroup instances for everything for which we defined a @@ -6742,7 +6742,7 @@ + Allow `]` inside group in option brackets (#3857). + lstinline with braces can be used (verb cannot be used with braces) (Marc Schreiber, #3535). - + Fix keyval funtion: pandoc did not parse options in braces correctly + + Fix keyval function: pandoc did not parse options in braces correctly (Marc Schreiber, #3642). + When parsing raw LaTeX commands, include trailing space (#1773). Otherwise things like `\noindent foo` break and turn into @@ -6834,7 +6834,7 @@ parse, the parser was applied too often, consuming too much of the input. This only affects `many1Till p end` where `p` matches on a prefix of `end`. - + Provide `parseFromString` (#3690). This is a verison of + + Provide `parseFromString` (#3690). This is a version of `parseFromString` specialied to ParserState, which resets `stateLastStrPos` at the end. This is almost always what we want. This fixes a bug where `_hi_` wasn't treated as emphasis in the @@ -7920,7 +7920,7 @@ + Don't emit HTML for tables unless `raw_html` extension is set (#3154). Emit `[TABLE]` if no suitable table formats are enabled and raw HTML is disabled. - + Check for the `raw_html` extension before emiting a raw HTML block. + + Check for the `raw_html` extension before emitting a raw HTML block. + Abstract out note/ref function (Jesse Rosenthal). + Add ReaderT monad for environment variables (Jesse Rosenthal). @@ -10388,7 +10388,7 @@ + Parse RST class directives. The class directive accepts one or more class names, and creates a Div value with those classes. If the directive has an indented body, the body is parsed as the children of - the Div. If not, the first block folowing the directive is made a + the Div. If not, the first block following the directive is made a child of the Div. This differs from the behavior of rst2xml, which does not create a Div element. Instead, the specified classes are applied to each child of the directive. However, most Pandoc Block diff --git a/doc/org.md b/doc/org.md index 201418303..dabde35ac 100644 --- a/doc/org.md +++ b/doc/org.md @@ -51,7 +51,7 @@ be toggled off by disabling the `citation` extension; e.g. Berkeley-style citations ------------------------ -The semi-offical Org-mode citation syntax was designed by Richard +The semi-official Org-mode citation syntax was designed by Richard Lawrence with additions by contributors on the [emacs-orgmode mailing list]. It is based on John MacFarlane's pandoc Markdown syntax. It's dubbed Berkeley syntax due the place of activity of @@ -94,7 +94,7 @@ Example: ### Parenthetical citation Citations surrounded by parantheses. The syntax is identical to -in-text citations, except for the addtional parentheses enclosing +in-text citations, except for the additional parentheses enclosing the initial `cite` tag. [(cite): See; @Mandelkern1981; and @Watson1953] diff --git a/man/pandoc.1 b/man/pandoc.1 index 55a212bac..0a2de3911 100644 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -2415,7 +2415,7 @@ image for title slide .SS Variables for PowerPoint .PP These variables control the visual aspects of a slide show that are not -easily controled via templates. +easily controlled via templates. .TP \f[B]\f[CB]monofont\f[B]\f[R] font to use for code. diff --git a/src/Text/Pandoc/Readers/Org/Inlines.hs b/src/Text/Pandoc/Readers/Org/Inlines.hs index da638f717..d8204d38f 100644 --- a/src/Text/Pandoc/Readers/Org/Inlines.hs +++ b/src/Text/Pandoc/Readers/Org/Inlines.hs @@ -155,7 +155,7 @@ endline = try $ do -- first to be implemented here and is almost identical to Markdown's citation -- syntax. The org-ref package is in wide use to handle citations, but the -- syntax is a bit limiting and not quite as simple to write. The --- semi-offical Org-mode citation syntax is based on John MacFarlane's Pandoc +-- semi-official Org-mode citation syntax is based on John MacFarlane's Pandoc -- sytax and Org-oriented enhancements contributed by Richard Lawrence and -- others. It's dubbed Berkeley syntax due the place of activity of its main -- contributors. All this should be consolidated once an official Org-mode |