diff options
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | changelog | 2 | ||||
| m--------- | data/templates | 14 | ||||
| -rw-r--r-- | stack.pkg.yaml | 4 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | tests/Tests/Old.hs | 3 | ||||
| -rw-r--r-- | tests/lhs-test.latex | 2 | ||||
| -rw-r--r-- | tests/lhs-test.latex+lhs | 2 | ||||
| -rw-r--r-- | tests/writer.latex | 2 | ||||
| -rw-r--r-- | tests/writer.man | 2 |
10 files changed, 20 insertions, 23 deletions
@@ -1423,11 +1423,11 @@ Thus, for example, Header Identifier ------------------------------- ---------------------------- - Header identifiers in HTML `header-identifiers-in-html` - *Dogs*?--in *my* house? `dogs--in-my-house` - [HTML], [S5], or [RTF]? `html-s5-or-rtf` - 3. Applications `applications` - 33 `section` + `Header identifiers in HTML` `header-identifiers-in-html` + `*Dogs*?--in *my* house?` `dogs--in-my-house` + `[HTML], [S5], or [RTF]?` `html-s5-or-rtf` + `3. Applications` `applications` + `33` `section` These rules should, in most cases, allow one to determine the identifier from the header text. The exception is when several headers have the @@ -14,7 +14,7 @@ pandoc (1.15.1) * For `markdown_mmd`, add: `implicit_figures`, `superscripts`, `subscripts` (#2401). - * Added `odt` as input format (MarLinn). Added new module + * Added `odt` as input format (Martin Linnemann). Added new module `Text.Pandoc.Reader.ODT` (API change). Fully implemented features: Paragraphs, Headers, Basic styling, Unordered lists, Ordered lists, External Links, Internal Links, Footnotes, Endnotes, Blockquotes. diff --git a/data/templates b/data/templates -Subproject 319b641365d23a3a5f84c569a35dbaeef4362b9 +Subproject 60228b40052fd4afaacd69f7d4f253d7ce04573 diff --git a/stack.pkg.yaml b/stack.pkg.yaml index 031524d6a..e7ce11752 100644 --- a/stack.pkg.yaml +++ b/stack.pkg.yaml @@ -16,7 +16,5 @@ ghc-options: highlighting-kate: '-pgmP cpphs -optP--cpp' packages: - '.' -- 'https://hackage.haskell.org/package/highlighting-kate-0.6/highlighting-kate-0.6.tar.gz' -- 'https://hackage.haskell.org/package/texmath-0.8.4/texmath-0.8.4.tar.gz' - 'https://hackage.haskell.org/package/pandoc-citeproc-0.8.0.1/pandoc-citeproc-0.8.0.1.tar.gz' -resolver: lts-3.9 +resolver: lts-3.10 diff --git a/stack.yaml b/stack.yaml index ed354819d..55b96046c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,4 +8,4 @@ flags: packages: - '.' extra-deps: [] -resolver: lts-3.9 +resolver: lts-3.10 diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs index e36025632..c27d30deb 100644 --- a/tests/Tests/Old.hs +++ b/tests/Tests/Old.hs @@ -202,7 +202,8 @@ writerTests format , test "tables" opts "tables.native" ("tables" <.> format) ] where - opts = ["-r", "native", "-w", format, "--columns=78"] + opts = ["-r", "native", "-w", format, "--columns=78", + "--variable", "pandoc-version="] s5WriterTest :: String -> [String] -> String -> Test s5WriterTest modifier opts format diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index 2e2aba670..4eed48b19 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -12,7 +12,7 @@ \else \usepackage{fontspec} \fi - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} \fi % use upquote if available, for straight quotes in verbatim environments diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs index 7c293b2e6..21219e99a 100644 --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -12,7 +12,7 @@ \else \usepackage{fontspec} \fi - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} \fi % use upquote if available, for straight quotes in verbatim environments diff --git a/tests/writer.latex b/tests/writer.latex index 392c556de..013f2c342 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -12,7 +12,7 @@ \else \usepackage{fontspec} \fi - \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \newcommand{\euro}{€} \fi % use upquote if available, for straight quotes in verbatim environments diff --git a/tests/writer.man b/tests/writer.man index 4b0731772..48d907fc0 100644 --- a/tests/writer.man +++ b/tests/writer.man @@ -1,5 +1,3 @@ -.\" Automatically generated by Pandoc 1.15.1 -.\" .hy .TH "Pandoc Test Suite" "" "July 17, 2006" "" "" .PP |