Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use meta-description instead of description in templates.

Browse source 
Since this is an attribute value, we need to prepare it
in the writer.
This commit is contained in:
John MacFarlane 2020-12-27 23:19:14 -08:00
parent 528b67df59
commit 99e1b67b74
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/templates/default.html4
View file

@ -13,8 +13,8 @@ $endif$
$if(keywords)$ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
$if(description)$ $if(description-meta)$
<meta name="description" content="$description$" /> <meta name="description" content="$description-meta$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
<style type="text/css"> <style type="text/css">

4
data/templates/default.html5
View file

@ -13,8 +13,8 @@ $endif$
$if(keywords)$ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
$if(description)$ $if(description-meta)$
<meta name="description" content="$description$" /> <meta name="description" content="$description-meta$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
<style> <style>

3
src/Text/Pandoc/Writers/HTML.hs
View file

@ -254,6 +254,8 @@ pandocToHtml opts (Pandoc meta blocks) = do
let stringifyHTML = escapeStringForXML . stringify let stringifyHTML = escapeStringForXML . stringify
let authsMeta = map stringifyHTML $ docAuthors meta let authsMeta = map stringifyHTML $ docAuthors meta
let dateMeta = stringifyHTML $ docDate meta let dateMeta = stringifyHTML $ docDate meta
let descriptionMeta = escapeStringForXML $
lookupMetaString "description" meta
slideVariant <- gets stSlideVariant slideVariant <- gets stSlideVariant
let sects = adjustNumbers opts $ let sects = adjustNumbers opts $
makeSections (writerNumberSections opts) Nothing $ makeSections (writerNumberSections opts) Nothing $
@ -352,6 +354,7 @@ pandocToHtml opts (Pandoc meta blocks) = do
defField "author-meta" authsMeta . defField "author-meta" authsMeta .
maybe id (defField "date-meta") maybe id (defField "date-meta")
(normalizeDate dateMeta) . (normalizeDate dateMeta) .
defField "description-meta" descriptionMeta .
defField "pagetitle" defField "pagetitle"
(stringifyHTML . docTitle $ meta) . (stringifyHTML . docTitle $ meta) .
defField "idprefix" (writerIdentifierPrefix opts) . defField "idprefix" (writerIdentifierPrefix opts) .