From 0b724565ad10fa018f7b97751263e782b6f8db52 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 3 May 2023 16:44:15 +0000 Subject: [PATCH] chore(letter): meta data got lost during pandoc processing --- src/Utils/Print.hs | 12 ++++++------ templates/letter/fraport_qualification.md | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Utils/Print.hs b/src/Utils/Print.hs index 4e1f9954f..a044f4892 100644 --- a/src/Utils/Print.hs +++ b/src/Utils/Print.hs @@ -123,8 +123,9 @@ mdTemplating template meta = runExceptT $ do , P.writerTemplate = Just tmpl } ExceptT . pure . over _Left P.renderError . P.runPure $ do - md_txt <- P.writeMarkdown writerOpts $ appMeta setIsDeFromLang $ addMeta meta doc - P.readMarkdown readerOpts md_txt + md_txt <- P.writeMarkdown writerOpts $ appMeta setIsDeFromLang $ addMeta meta doc + addMeta meta <$> P.readMarkdown readerOpts md_txt -- NOTE: meta is lost along the way somehow, despite P.pandocExtensions containing Ext_yaml_metadata_block + -- | creates a PDF using a LaTeX template @@ -132,12 +133,11 @@ pdfLaTeX :: LetterKind -> P.Pandoc -> HandlerFor UniWorX (Either Text LBS.ByteSt pdfLaTeX lk doc = do -- e_tmpl <- fmap (over _Left P.renderError) . liftIO . P.runIO $ compileTemplate $ templateLatex lk e_tmpl <- memcachedBy (Just . Right $ 6 * diffHour) ("LetterKind-latex: \n" <> tshow lk) (fmap (over _Left P.renderError) . liftIO . P.runIO $ compileTemplate $ templateLatex lk) - actRight e_tmpl $ \tmpl -> fmap (over _Left P.renderError) .liftIO . P.runIO $ do + actRight e_tmpl $ \tmpl -> fmap (over _Left P.renderError) . liftIO . P.runIO $ do let writerOpts = def { P.writerExtensions = P.pandocExtensions , P.writerTemplate = Just tmpl } makePDF writerOpts $ appMeta setIsDeFromLang doc - - + renderLetter :: (MDLetter l) => Entity User -> l -> Text -> Handler (Either Text LBS.ByteString) renderLetter rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do @@ -157,7 +157,7 @@ renderLetter rcvrEnt@Entity{entityVal=rcvr} mdl apcIdent = do ] e_md <- mdTemplating tmpl meta actRight e_md $ pdfLaTeX kind - -- return $ over _Left P.renderError result + -- TODO: apcIdent does not make sense for multiple letters renderLetters :: (MDLetter l, Foldable f) => Entity User -> f l -> Text -> Handler (Either Text LBS.ByteString) diff --git a/templates/letter/fraport_qualification.md b/templates/letter/fraport_qualification.md index 01af7f394..2a7f86a65 100644 --- a/templates/letter/fraport_qualification.md +++ b/templates/letter/fraport_qualification.md @@ -5,11 +5,6 @@ lang: de-de is-de: true date: 11.11.1111 -test1: this **is really** a test -test2: 'this **is another** test' -test3: | -

First

-

Here is some text with emphasis to see. ... \renewcommand{\familydefault}{\sfdefault}