90af138 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fix typos in comments, doc strings, error messages, and tests

Typos reported by https://fossies.org/linux/test/pandoc-master.tar.gz/codespell.html See: #6738

commit90af1384433b1f537fa51f1018539d4d401ec73b authorAlbert Krewinkel <albert@zeitkraut.de> dateWed 14 Oct 2020, 21:32 (6 years ago) parent0b3b774

17 files changed+22−25

compare with master

unifiedsplit

changelog.md+4−4 src/Text/Pandoc/Citeproc.hs+1−4 src/Text/Pandoc/Class/PandocMonad.hs+1−1 src/Text/Pandoc/Error.hs+2−2 src/Text/Pandoc/Lua/Marshaling/MediaBag.hs+1−1 src/Text/Pandoc/Readers/Creole.hs+1−1 src/Text/Pandoc/Readers/Odt/Generic/Utils.hs+1−1 src/Text/Pandoc/Readers/Org/Blocks.hs+1−1 test/command/biblatex-thesis.md+1−1 test/command/yaml-metadata-blocks.md+3−3 test/epub/features.epub test/epub/features.native+1−1 test/tables/planets.html4+1−1 test/tables/planets.html5+1−1 test/tables/planets.native+1−1 test/textile-reader.native+1−1 test/textile-reader.textile+1−1

changelog.md+4−4

@@ -33,7 +33,7 @@

3333

3434 * Fix MANUAL.txt CSL JSON conversion examples.

3535

36− * Fix spelling errors in chengelog, MANUAL.txt, `doc/org.md` (#6738).

36+ * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738).

3737

3838

3939## pandoc 2.11 (2020-10-11)

@@ -3369,7 +3369,7 @@

33693369 * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered

33703370 in HTML and PDF as a unicode minus sign.

33713371

3372− * Ms writer: Ensure we have a newline after .EN in disply math (#5251).

3372+ * Ms writer: Ensure we have a newline after .EN in display math (#5251).

33733373

33743374 * RST writer: Don't wrap simple table header lines (#5128).

33753375

@@ -9016,11 +9016,11 @@

90169016 + Allow alignments to be specified in Markdown grid tables. For

90179017 example,

90189018

9019− +-------+---------------+--------------------+

9019+ +-------|---------------|--------------------+

90209020 | Right | Left | Centered |

90219021 +=========:+:=================+:=============:+

90229022 | Bananas | $1.34 | built-in wrapper |

9023− +-------+---------------+--------------------+

9023+ +-------|---------------|--------------------+

90249024

90259025 + Allow Small Caps elements to be created using bracketed spans (as

90269026 they already can be using HTML-syntax spans) (#3191, Kolen Cheung).

src/Text/Pandoc/Citeproc.hs+1−4

@@ -197,7 +197,7 @@ getRefsFromBib locale idpred t = do

197197 case formatFromExtension fp of

198198 Just f -> getRefs locale f idpred (Just fp) raw

199199 Nothing -> throwError $ PandocAppError $

200− "Could not deterine bibliography format for " <> t

200+ "Could not determine bibliography format for " <> t

201201

202202getRefs :: PandocMonad m

203203 => Locale

@@ -532,6 +532,3 @@ removeFinalPeriod ils =

532532 case lastMay ils of

533533 Just (Str ".") -> initSafe ils

534534 _ -> ils

535−

536−

537−

src/Text/Pandoc/Class/PandocMonad.hs+1−1

@@ -600,7 +600,7 @@ makeCanonical = Posix.joinPath . transformPathParts . splitDirectories

600600 go (_:as) ".." = as

601601 go as x = x : as

602602

603−-- | Trys to run an action on a file: for each directory given, a

603+-- | Tries to run an action on a file: for each directory given, a

604604-- filepath is created from the given filename, and the action is run on

605605-- that filepath. Returns the result of the first successful execution

606606-- of the action, or throws a @PandocResourceNotFound@ exception if the

src/Text/Pandoc/Error.hs+2−2

@@ -10,8 +10,8 @@

1010 Stability : alpha

1111 Portability : portable

1212

13−This module provides a standard way to deal with possible errors encounted

14−during parsing.

13+This module provides a standard way to deal with possible errors

14+encountered during parsing.

1515

1616-}

1717module Text.Pandoc.Error (

src/Text/Pandoc/Lua/Marshaling/MediaBag.hs+1−1

@@ -34,7 +34,7 @@ instance Peekable MediaItems where

3434 peek = peekMediaItems

3535

3636-- | Push an iterator triple to be used with Lua's @for@ loop construct.

37−-- Each iterator invokation returns a tripple consisting of an item's

37+-- Each iterator invocation returns a triple containing the item's

3838-- filename, MIME type, and content.

3939pushIterator :: MediaBag -> Lua NumResults

4040pushIterator mb = do

src/Text/Pandoc/Readers/Creole.hs+1−1

@@ -252,7 +252,7 @@ inlineNowiki = B.code <$> (start >> manyTillChar (noneOf "\n\r") end)

252252 end = try $ string "}}}" >> lookAhead (noneOf "}")

253253

254254placeholder :: PandocMonad m => CRLParser m B.Inlines

255−-- The semantics of the placeholder is basicallly implementation

255+-- The semantics of the placeholder is basically implementation

256256-- dependent, so there is no way to DTRT for all cases.

257257-- So for now we just drop them.

258258placeholder = B.text <$> try (string "<<<" >> manyTill anyChar (string ">>>")

src/Text/Pandoc/Readers/Odt/Generic/Utils.hs+1−1

@@ -41,7 +41,7 @@ import Data.Maybe

4141-- > foldr (.) id

4242-- where '(.)' are 'id' are the ones from "Control.Category"

4343-- and 'foldr' is the one from "Data.Foldable".

44−-- The noun-form was chosen to be consistend with 'sum', 'product' etc

44+-- The noun-form was chosen to be consistent with 'sum', 'product' etc

4545-- based on the discussion at

4646-- <https://groups.google.com/forum/#!topic/haskell-cafe/VkOZM1zaHOI>

4747-- (that I was not part of)

src/Text/Pandoc/Readers/Org/Blocks.hs+1−1

@@ -289,7 +289,7 @@ verseBlock blockType = try $ do

289289 return (trimInlinesF $ pure nbspIndent <> line)

290290

291291-- | Read a code block and the associated results block if present. Which of

292−-- boths blocks is included in the output is determined using the "exports"

292+-- the blocks is included in the output is determined using the "exports"

293293-- argument in the block header.

294294codeBlock :: PandocMonad m => BlockAttributes -> Text -> OrgParser m (F Blocks)

295295codeBlock blockAttrs blockType = do

test/command/biblatex-thesis.md+1−1

@@ -2,7 +2,7 @@

22% pandoc -f biblatex -t markdown -s

33@comment{excerpted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib

5−TODO: Uppercase letters follwing hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!)

5+TODO: Uppercase letters following hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!)

66}

88@thesis{geer,

test/command/yaml-metadata-blocks.md+3−3

@@ -21,18 +21,18 @@ scientific: 3.7e-5

2121bool: true

2222more: False

2323nothing: null

24−emtpy: []

24+empty: []

2525nested:

2626 int: 8

2727 float: 2.5

2828 bool: true

2929 more: False

3030 nothing: null

31− emtpy: []

31+ empty: []

3232 scientific: 3.7e-5

3333---

3434^D

35−Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]})

35+Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]})

3636[]

3737```

3838```

test/epub/features.epub

Binary file not shown.

test/epub/features.native+1−1

@@ -64,7 +64,7 @@

6464 ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "."]]

6565 ,Div ("content-mathml-001.xhtml#mathml-025",["section","ctest"],[])

6666 [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-025"],Str "Testing",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "rowspan",Space,Str "attributes,",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "fonts"]

67− ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(colum",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."]

67+ ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(column",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."]

6868 ,Plain [Math DisplayMath "\\begin{matrix}\n & {\\operatorname{cov}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{L} \\right)} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cov}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{L} \\right)} & \\\\\n\\end{matrix}"]

6969 ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Link ("",[],[]) [Str "Cicho\324's",Space,Str "Diagram"] ("http://en.wikipedia.org/wiki/Cicho%C5%84's_diagram",""),Str ":",Space,Str "."]]

7070 ,Div ("content-mathml-001.xhtml#mathml-026",["section","ctest"],[])

test/tables/planets.html4+1−1

@@ -17,7 +17,7 @@

1717</thead>

1818<tbody>

1919<tr class="odd">

20−<th align="center" colspan="2" rowspan="4">Terrestial planets</th>

20+<th align="center" colspan="2" rowspan="4">Terrestrial planets</th>

2121<th>Mercury</th>

2222<td align="right">0.330</td>

2323<td align="right">4,879</td>

test/tables/planets.html5+1−1

@@ -17,7 +17,7 @@

1717</thead>

1818<tbody>

1919<tr class="odd">

20−<th style="text-align: center;" colspan="2" rowspan="4">Terrestial planets</th>

20+<th style="text-align: center;" colspan="2" rowspan="4">Terrestrial planets</th>

2121<th>Mercury</th>

2222<td style="text-align: right;">0.330</td>

2323<td style="text-align: right;">4,879</td>

test/tables/planets.native+1−1

@@ -29,7 +29,7 @@

2929 [(TableBody ("",[],[]) (RowHeadColumns 3)

3030 []

3131 [Row ("",[],[])

32− [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestial planets"]]

32+ [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestrial planets"]]

3333 ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Mercury"]]

3434 ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "0.330"]]

3535 ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "4,879"]]

test/textile-reader.native+1−1

@@ -90,7 +90,7 @@ Pandoc (Meta {unMeta = fromList []})

9090,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]]

9191,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."]

9292,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."]

93−,Para [Str "Elipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."]

93+,Para [Str "Ellipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."]

9494,Para [Str "Quotes",Space,Str "and",Space,Str "apostrophes",Space,Str ":",Space,Quoted DoubleQuote [Str "I\8217d",Space,Str "like",Space,Str "to",Space,Str "thank",Space,Str "you"],Space,Str "for",Space,Str "example."]

9595,Header 1 ("links",[],[]) [Str "Links"]

9696,Header 2 ("explicit",[],[]) [Str "Explicit"]

test/textile-reader.textile+1−1

@@ -162,7 +162,7 @@ Subscripts: ~here~ H[ ~2~]O, H[ ~23~]O, H[ ~many of them~]O.

162162

163163Dashes : How cool -- automatic dashes.

164164

165−Elipses : He thought and thought ... and then thought some more.

165+Ellipses : He thought and thought ... and then thought some more.

166166

167167Quotes and apostrophes : "I'd like to thank you" for example.

168168