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

HTML writer: Use embed tag for images with non-image extensions.

Browse source 
(e.g.  PDFs).

Closes #264.
This commit is contained in:
John MacFarlane 2011-07-16 10:11:04 -07:00
parent dd59cd2341
commit 8d13ff5bc3
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@ import Text.XHtml.Transitional hiding ( stringToHtml, unordList, ordList )
import qualified Text.XHtml.Transitional as XHtml import qualified Text.XHtml.Transitional as XHtml
import Text.TeXMath import Text.TeXMath
import Text.XML.Light.Output import Text.XML.Light.Output
import System.FilePath (takeExtension)
data WriterState = WriterState data WriterState = WriterState
{ stNotes :: [Html] -- ^ List of notes { stNotes :: [Html] -- ^ List of notes
@ -320,6 +321,17 @@ attrsToHtml opts (id',classes',keyvals) =
[prefixedId opts id' | not (null id')] ++ [prefixedId opts id' | not (null id')] ++
map (\(x,y) -> strAttr x y) keyvals map (\(x,y) -> strAttr x y) keyvals
imageExts :: [String]
imageExts = [ "art", "bmp", "cdr", "cdt", "cpt", "cr2", "crw", "djvu", "erf",
"gif", "ico", "ief", "jng", "jpg", "jpeg", "nef", "orf", "pat", "pbm",
"pcx", "pgm", "png", "pnm", "ppm", "psd", "ras", "rgb", "svg", "tiff",
"wbmp", "xbm", "xpm", "xwd" ]
treatAsImage :: FilePath -> Bool
treatAsImage fp =
let ext = map toLower $ drop 1 $ takeExtension fp
in null ext || ext `elem` imageExts
-- | Convert Pandoc block element to HTML. -- | Convert Pandoc block element to HTML.
blockToHtml :: WriterOptions -> Block -> State WriterState Html blockToHtml :: WriterOptions -> Block -> State WriterState Html
blockToHtml _ Null = return noHtml blockToHtml _ Null = return noHtml
@ -603,7 +615,7 @@ inlineToHtml opts inline =
return $ anchor ! ([href s] ++ return $ anchor ! ([href s] ++
if null tit then [] else [title tit]) $ if null tit then [] else [title tit]) $
linkText linkText
(Image txt (s,tit)) -> do (Image txt (s,tit)) | treatAsImage s -> do
let alternate' = stringify txt let alternate' = stringify txt
let attributes = [src s] ++ let attributes = [src s] ++
(if null tit (if null tit
@ -614,6 +626,13 @@ inlineToHtml opts inline =
else [alt alternate'] else [alt alternate']
return $ image ! attributes return $ image ! attributes
-- note: null title included, as in Markdown.pl -- note: null title included, as in Markdown.pl
(Image _ (s,tit)) -> do
let attributes = [src s] ++
(if null tit
then []
else [title tit])
return $ itag "embed" ! attributes
-- note: null title included, as in Markdown.pl
(Note contents) -> do (Note contents) -> do
st <- get st <- get
let notes = stNotes st let notes = stNotes st