uniform-pandoc 0.1.5.1 → 0.1.5.2

raw patch · 6 files changed

+30/−25 lines, 6 filesdep +bytestringdep ~uniform-jsondep ~uniformBasePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: bytestring

Dependency ranges changed: uniform-json, uniformBase

API changes (from Hackage documentation)

Files

• ChangeLog.md +2/−0
• README.md +9/−10
• src/Uniform/Pandoc.hs +3/−1
• src/Uniform/PandocHTMLwriter.hs +1/−0
• src/Uniform/PandocImports.hs +7/−7
• uniform-pandoc.cabal +8/−7

@@ -11,4 +11,6 @@    0.1.5 branch for ghc 9.2.5   0.1.5.1  +0.1.5.2 removed pandoc2pdf which was used for an experiment to directly convert to pdf using the pandoc internal process. +        now use uniform-latex2pdf (which uses lualatex separately) 

@@ -1,13 +1,13 @@-# Package Pandoc in Blog+# Package Pandoc for use in a Static Web Generator (e.g. `daino`) -Pandoc is exetensively used in the conversion of the blog contributions (structured as markdown with metada) to the html and the pdf files in the blog as web presence (including options to print).+Pandoc is convenient to used for the conversion of the source of a web page  (structured as markdown with metadata) to the `html` and the `pdf` files in a  web site (including options to print). The functions collected in this package must not depend on-- the structure of the storage or the presentation of the site, neither before or after the conversion (this is concentrated in, for example, in the modules in SSG).+- the structure of the storage or the presentation of the site, neither before or after the conversion (this is concentrated in, for example, in the modules in `daino`). - specific choices of how the posts are converted.  Therefore:-- the input for the function is either text, json, or absulte path; the results are some text format (text, html).-- details of the conversions are explicitely stated and not controlled values in modules in this package. +- the input for the function is either text, json, or absolute path; the results are some text format (text, html).+- details of the conversions are explicitly stated and not controlled values in modules in this package.   The main functions are: - md -> docrep: bakeOneMD2docrep@@ -17,11 +17,11 @@             -- move from ssg     addRefs (in Docrep.hs) -    - issue: docrep structure potentical conflict between-        the yaml collected from md and values in pandoc meta+    - issue: docrep structure potentially conflict between+        the yaml collected from `md` and values in pandoc meta  - docrep -> panrep: bakeOneDocrep2panrep-    docrep2panrep (todo fix docrep)+    docrep2panrep       addindex2yam  @@ -32,6 +32,5 @@             - bakeOneFile2panrep              - docrep2panrep -Common Structures imported in SSG are: -import Uniform.PandocImports ( panrepFileType, texSnipFileType )+Common Structures imported in `daino` are:  import Uniform.PandocImports ( panrepFileType, texSnipFileType )

@@ -28,6 +28,7 @@   , module Uniform.PandocHTMLwriter   , module Uniform.BibTex   , module Uniform.Markdown+--   , module Uniform.Pandoc2pdf   ) where @@ -38,6 +39,7 @@  import qualified Text.Pandoc                   as Pandoc import Text.Pandoc ( ReaderOptions, WriterOptions(..) )        - +-- import Uniform.Pandoc2pdf  was used to directly convert with pandoc to pdf+ justToKeepWarningAway :: Int  justToKeepWarningAway = 0 

@@ -63,6 +63,7 @@ applyTemplate4 debug t1 vals = do     templ1 <- liftIO $ DocTemplates.compileTemplate mempty t1     -- err1 :: Either String (Doc Text) <- liftIO $ DocTemplates.applyTemplate mempty (unwrap7 templText) (unDocValue val)+         let templ3 = case templ1 of             Left msg -> errorT ["applyTemplate4 error", showT msg]             Right tmp2 -> tmp2

@@ -48,7 +48,7 @@ import Text.Pandoc.Shared (stringify) import Uniform.Json       -import Uniform.Yaml  +-- import Uniform.Yaml   import UniformBase -- import Data.Aeson.Types ( parseMaybe ) @@ -120,12 +120,12 @@     go (Pandoc.MetaInlines m) = toJSON $ stringify m     go (Pandoc.MetaBlocks m) = toJSON $ stringify m -readYaml2value :: Path Abs File -> ErrIO Value--- | read a yaml file to a value--- error when syntax issue-readYaml2value fp = do-  t <- read8 fp yamlFileType-  return . yaml2value $ t+-- readYaml2value :: Path Abs File -> ErrIO Value+-- -- | read a yaml file to a value+-- -- error when syntax issue+-- readYaml2value fp = do+--   t <- read8 fp yamlFileType+--   return . yaml2value $ t  latexOptions :: WriterOptions -- | reasonable extension - crucial!

@@ -4,15 +4,15 @@ -- -- see: https://github.com/sol/hpack ----- hash: 2d9a95b3ba7424337cb39832bb4c0778264e754af7183c04d36b78e760c486be+-- hash: 23e738df4148467a39dce1927da4a9d97e6e8431a3956036cc1d406b4d2c0481  name:           uniform-pandoc-version:        0.1.5.1+version:        0.1.5.2 synopsis:       handling of   some pandoc stuff description:    remove particular aspects of abstraction  category:       Uniform handling of   some pandoc stuff-homepage:       https://github.com/git@github.com:andrewufrank/u4blog.git#readme-bug-reports:    https://github.com/git@github.com:andrewufrank/u4blog.git/issues+homepage:       https://github.com/andrewufrank/u4blog.git#readme+bug-reports:    https://github.com/andrewufrank/u4blog.git/issues author:         Andrew Frank maintainer:     Andrew U. Frank <andrewufrank@gmail.com> copyright:      2021 Andrew U. Frank@@ -25,7 +25,7 @@  source-repository head   type: git-  location: https://github.com/git@github.com:andrewufrank/u4blog.git+  location: https://github.com/andrewufrank/u4blog.git   subdir: uniform-pandoc  library@@ -43,9 +43,10 @@   build-depends:       aeson     , base >=4.7 && <5+    , bytestring     , doclayout     , doctemplates     , pandoc >=2.11-    , uniform-json >=0.0.6-    , uniformBase >=0.1.4+    , uniform-json >=0.1.5.2+    , uniformBase >=0.1.5.1   default-language: Haskell2010