a478a5c · typeable/pandoc

git.iko.soy/typeable/pandoc

Update to released unicode-collation, latest citeproc dev version.

Update citeproc test.

commita478a5c4c8753fd0bf272cd540ca197ae146a196 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 17 Apr 2021, 11:47 (6 years ago) parent7a7fefc

16 files changed+20−30

compare with master

unifiedsplit

cabal.project+1−10

@@ -5,14 +5,5 @@ flags: +embed_data_files

55source-repository-package

66 type: git

77 location: https://github.com/jgm/citeproc

8− tag: b42857be658b8f2649e989e061978e304986f853

8+ tag: f9439e07e9271c7c2674a51efcad2fb8c663b2c8

10−source-repository-package

11− type: git

12− location: https://github.com/jgm/unicode-collation

13− tag: 9d229a5c6bcbaf53d7022575234eb223cfa90d55

14−

15−-- source-repository-package

16−-- type: git

17−-- location: https://github.com/jgm/citeproc

18−-- tag: d44e24696ab444090d0e63e321c3a573f68b2e74

src/Text/Pandoc/App.hs+1−1

@@ -55,7 +55,7 @@ import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts,

5555import Text.Pandoc.App.CommandLineOptions (parseOptions, parseOptionsFromArgs,

5656 options)

5757import Text.Pandoc.App.OutputSettings (OutputSettings (..), optToOutputSettings)

58−import UnicodeCollation.Lang (Lang (..), parseLang)

58+import Text.Collate.Lang (Lang (..), parseLang)

5959import Text.Pandoc.Filter (Filter (JSONFilter, LuaFilter), applyFilters)

6060import Text.Pandoc.PDF (makePDF)

6161import Text.Pandoc.SelfContained (makeSelfContained)

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

@@ -10,7 +10,7 @@ import qualified Data.Text.Encoding as TE

1010import qualified Data.Text as T

1111import Data.Text (Text)

1212import Text.Pandoc.Citeproc.Util (toIETF)

13−import UnicodeCollation.Lang (Lang(..), parseLang)

13+import Text.Collate.Lang (Lang(..), parseLang)

1414

1515biblatexLocalizations :: [(FilePath, ByteString)]

1616biblatexLocalizations = $(embedDir "citeproc/biblatex-localization")

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

@@ -19,7 +19,7 @@ where

1919

2020import Data.Default (Default (def))

2121import Data.Text (Text)

22−import UnicodeCollation.Lang (Lang)

22+import Text.Collate.Lang (Lang)

2323import Text.Pandoc.MediaBag (MediaBag)

2424import Text.Pandoc.Logging (LogMessage, Verbosity (WARNING))

2525import Text.Pandoc.Translations (Translations)

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

@@ -70,7 +70,7 @@ import Network.URI ( escapeURIString, nonStrictRelativeTo,

7070import System.FilePath ((</>), (<.>), takeExtension, dropExtension,

7171 isRelative, splitDirectories)

7272import System.Random (StdGen)

73−import UnicodeCollation.Lang (Lang(..), parseLang, renderLang)

73+import Text.Collate.Lang (Lang(..), parseLang, renderLang)

7474import Text.Pandoc.Class.CommonState (CommonState (..))

7575import Text.Pandoc.Definition

7676import Text.Pandoc.Error

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

@@ -33,7 +33,7 @@ import qualified Data.Set as Set

3333import Data.Text (Text)

3434import qualified Data.Text as T

3535import System.FilePath (addExtension, replaceExtension, takeExtension)

36−import UnicodeCollation.Lang (renderLang)

36+import Text.Collate.Lang (renderLang)

3737import Text.Pandoc.Builder as B

3838import Text.Pandoc.Class.PandocPure (PandocPure)

3939import Text.Pandoc.Class.PandocMonad (PandocMonad (..), getResourcePath,

src/Text/Pandoc/Readers/LaTeX/Lang.hs+1−1

@@ -23,7 +23,7 @@ import qualified Data.Map as M

2323import Data.Text (Text)

2424import qualified Data.Text as T

2525import Text.Pandoc.Shared (extractSpaces)

26−import UnicodeCollation.Lang (Lang(..), renderLang)

26+import Text.Collate.Lang (Lang(..), renderLang)

2727import Text.Pandoc.Class (PandocMonad(..), setTranslations)

2828import Text.Pandoc.Readers.LaTeX.Parsing

2929import Text.Pandoc.Parsing (updateState, option, getState, QuoteContext(..),

src/Text/Pandoc/Writers/ConTeXt.hs+1−1

@@ -21,7 +21,7 @@ import Data.Maybe (mapMaybe)

2121import Data.Text (Text)

2222import qualified Data.Text as T

2323import Network.URI (unEscapeString)

24−import UnicodeCollation.Lang (Lang(..))

24+import Text.Collate.Lang (Lang(..))

2525import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

2626import Text.Pandoc.Definition

2727import Text.Pandoc.ImageSize

src/Text/Pandoc/Writers/Docbook.hs+1−1

@@ -493,4 +493,4 @@ isSectionAttr DocBook4 ("os",_) = True

493493isSectionAttr DocBook4 ("revision",_) = True

494494isSectionAttr DocBook4 ("security",_) = True

495495isSectionAttr DocBook4 ("vendor",_) = True

496−isSectionAttr _ (_,_) = False

496+isSectionAttr _ (_,_) = False

src/Text/Pandoc/Writers/Docx.hs+1−1

@@ -36,7 +36,7 @@ import qualified Data.Text.Lazy as TL

3636import Data.Time.Clock.POSIX

3737import Data.Digest.Pure.SHA (sha1, showDigest)

3838import Skylighting

39−import UnicodeCollation.Lang (renderLang)

39+import Text.Collate.Lang (renderLang)

4040import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

4141import qualified Text.Pandoc.Class.PandocMonad as P

4242import Data.Time

src/Text/Pandoc/Writers/LaTeX.hs+1−1

@@ -29,7 +29,7 @@ import qualified Data.Text as T

2929import Network.URI (unEscapeString)

3030import Text.DocTemplates (FromContext(lookupContext), renderTemplate,

3131 Val(..), Context(..))

32−import UnicodeCollation.Lang (Lang (..), renderLang)

32+import Text.Collate.Lang (Lang (..), renderLang)

3333import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

3434import Text.Pandoc.Definition

3535import Text.Pandoc.Highlighting (formatLaTeXBlock, formatLaTeXInline, highlight,

src/Text/Pandoc/Writers/LaTeX/Lang.hs+1−1

@@ -15,7 +15,7 @@ module Text.Pandoc.Writers.LaTeX.Lang

1515 toBabel

1616 ) where

1717import Data.Text (Text)

18−import UnicodeCollation.Lang (Lang(..))

18+import Text.Collate.Lang (Lang(..))

1919

2020

2121-- In environments \Arabic instead of \arabic is used

src/Text/Pandoc/Writers/ODT.hs+1−1

@@ -24,7 +24,7 @@ import qualified Data.Text as T

2424import qualified Data.Text.Lazy as TL

2525import Data.Time

2626import System.FilePath (takeDirectory, takeExtension, (<.>))

27−import UnicodeCollation.Lang (Lang (..), renderLang)

27+import Text.Collate.Lang (Lang (..), renderLang)

2828import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)

2929import qualified Text.Pandoc.Class.PandocMonad as P

3030import Text.Pandoc.Definition

src/Text/Pandoc/Writers/OpenDocument.hs+1−1

@@ -25,7 +25,7 @@ import Data.Ord (comparing)

2525import qualified Data.Set as Set

2626import Data.Text (Text)

2727import qualified Data.Text as T

28−import UnicodeCollation.Lang (Lang (..), parseLang)

28+import Text.Collate.Lang (Lang (..), parseLang)

2929import Text.Pandoc.Class.PandocMonad (PandocMonad, report, translateTerm,

3030 setTranslations, toLang)

3131import Text.Pandoc.Definition

stack.yaml+2−3

@@ -16,11 +16,10 @@ extra-deps:

1616- texmath-0.12.2

1717- random-1.2.0

1818- xml-conduit-1.9.1.1

19+- unicode-collation-0.1

1920# - citeproc-0.3.0.9

2021- git: https://github.com/jgm/citeproc

21− commit: b42857be658b8f2649e989e061978e304986f853

22−- git: https://github.com/jgm/unicode-collation

23− commit: 9d229a5c6bcbaf53d7022575234eb223cfa90d55

22+ commit: f9439e07e9271c7c2674a51efcad2fb8c663b2c8

2423ghc-options:

2524 "$locals": -fhide-source-paths -Wno-missing-home-modules

2625resolver: lts-17.5

test/command/pandoc-citeproc-320a.md+4−4

@@ -56,6 +56,10 @@ n.d.; al-'Udhrī, n.d.; Uch, n.d.; Uebel, n.d.; Zzz, n.d.).

5656Uch, Ann. n.d.

5757:::

5858

59+::: {#ref-item4 .csl-entry}

60+'Udhrī, Jamīl al-. n.d.

61+:::

62+

5963::: {#ref-item1 .csl-entry}

6064ʾUdhrī, Jamīl al-. n.d.

6165:::

@@ -68,10 +72,6 @@ Uch, Ann. n.d.

6872\'Udhrī, Jamīl al-. n.d.

6973:::

7074

71−::: {#ref-item4 .csl-entry}

72−'Udhrī, Jamīl al-. n.d.

73−:::

74−

7575::: {#ref-item5 .csl-entry}

7676'Udhrī, Jamīl al-. n.d.

7777:::