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

EPUB writer: Allow partial dates: YYYY, YYYY-MM.

Browse source 
Improves on #1074, since now we don't default to January 1.
This commit is contained in:
John MacFarlane 2013-12-01 10:16:56 -08:00
parent c3ac04f74f
commit 1f6238f3ba
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Text/Pandoc/Writers/EPUB.hs
View file

@ -56,7 +56,7 @@ import Text.XML.Light hiding (ppTopElement)
import Text.Pandoc.UUID import Text.Pandoc.UUID
import Text.Pandoc.Writers.HTML import Text.Pandoc.Writers.HTML
import Text.Pandoc.Writers.Markdown ( writePlain ) import Text.Pandoc.Writers.Markdown ( writePlain )
import Data.Char ( toLower ) import Data.Char ( toLower, isDigit )
import Network.URI ( unEscapeString ) import Network.URI ( unEscapeString )
import Text.Pandoc.MIME (getMimeType) import Text.Pandoc.MIME (getMimeType)
#if MIN_VERSION_base(4,6,0) #if MIN_VERSION_base(4,6,0)
@ -171,7 +171,8 @@ addMetadataFromXML e@(Element (QName name _ (Just "dc")) attrs _ _) md
, titleFileAs = getAttr "file-as" , titleFileAs = getAttr "file-as"
, titleType = getAttr "type" , titleType = getAttr "type"
} : epubTitle md } } : epubTitle md }
| name == "date" = md{ epubDate = maybe "" id $ normalizeDate $ strContent e } | name == "date" = md{ epubDate = maybe "" id $ normalizeDate'
$ strContent e }
| name == "language" = md{ epubLanguage = strContent e } | name == "language" = md{ epubLanguage = strContent e }
| name == "creator" = md{ epubCreator = | name == "creator" = md{ epubCreator =
Creator{ creatorText = strContent e Creator{ creatorText = strContent e
@ -265,7 +266,7 @@ metadataFromMeta opts meta = EPUBMetadata{
where identifiers = getIdentifier meta where identifiers = getIdentifier meta
titles = getTitle meta titles = getTitle meta
date = maybe "" id $ date = maybe "" id $
(metaValueToString <$> lookupMeta "date" meta) >>= normalizeDate (metaValueToString <$> lookupMeta "date" meta) >>= normalizeDate'
language = maybe "" metaValueToString $ language = maybe "" metaValueToString $
lookupMeta "language" meta `mplus` lookupMeta "lang" meta lookupMeta "language" meta `mplus` lookupMeta "lang" meta
creators = getCreator "creator" meta creators = getCreator "creator" meta
@ -799,6 +800,16 @@ replaceRefs refTable = walk replaceOneRef
Nothing -> x Nothing -> x
replaceOneRef x = x replaceOneRef x = x
-- Variant of normalizeDate that allows partial dates: YYYY, YYYY-MM
normalizeDate' :: String -> Maybe String
normalizeDate' xs =
let xs' = trim xs in
case xs' of
[y1,y2,y3,y4] | all isDigit [y1,y2,y3,y4] -> Just xs' -- YYYY
[y1,y2,y3,y4,'-',m1,m2] | all isDigit [y1,y2,y3,y4,m1,m2] -- YYYY-MM
-> Just xs'
_ -> normalizeDate xs'
toRelator :: String -> Maybe String toRelator :: String -> Maybe String
toRelator x toRelator x
| x `elem` relators = Just x | x `elem` relators = Just x