diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-11 22:25:57 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-01-11 23:15:30 -0800 |
| commit | 91510a109f9284934fd5b6386fa23a5fc37b09bb (patch) | |
| tree | 2cee03745727c1926ccfefcdf52e6c4b1a6603dc /templates | |
| parent | e8ad4ba43c7c187a5b6ee6025bc6039488d7f420 (diff) | |
| download | pandoc-91510a109f9284934fd5b6386fa23a5fc37b09bb.tar.gz | |
Improvements to --html5 support:
+ <nav> for TOC, <figure> for figures, type attribute in <ol>.
+ Don't add math javascript in html5.
+ Use style attributes instead of deprecated width, align.
+ html template: move <title> after <meta>.
Note: charset needs to be declared before title.
+ slidy and s5 templates: move <title> after <meta>.
+ html template: Added link to html5 shim for IE.
+ Make --html5 have an effect only for 'html' writer (not s5, slidy, epub).
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/html.template | 10 | ||||
| -rw-r--r-- | templates/s5.template | 2 | ||||
| -rw-r--r-- | templates/slidy.template | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/templates/html.template b/templates/html.template index eabda4f44..3f8b76fed 100644 --- a/templates/html.template +++ b/templates/html.template @@ -6,7 +6,6 @@ $else$ <html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$> $endif$ <head> - <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> $if(html5)$ <meta charset="utf-8" /> $else$ @@ -19,6 +18,12 @@ $endfor$ $if(date)$ <meta name="date" content="$date$" /> $endif$ + <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> +$if(html5)$ + <!--[if lt IE 9]> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> +$endif$ $if(highlighting-css)$ <style type="text/css"> $highlighting-css$ @@ -28,8 +33,11 @@ $for(css)$ <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/> $endfor$ $if(math)$ +$if(html5)$ +$else$ $math$ $endif$ +$endif$ $for(header-includes)$ $header-includes$ $endfor$ diff --git a/templates/s5.template b/templates/s5.template index 480c1e435..c1f727f6e 100644 --- a/templates/s5.template +++ b/templates/s5.template @@ -1,7 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> $for(author)$ @@ -10,6 +9,7 @@ $endfor$ $if(date)$ <meta name="date" content="$date$" /> $endif$ + <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> <!-- configuration parameters --> <meta name="defaultView" content="slideshow" /> <meta name="controlVis" content="hidden" /> diff --git a/templates/slidy.template b/templates/slidy.template index f625c36e2..9cfdb8f5e 100644 --- a/templates/slidy.template +++ b/templates/slidy.template @@ -3,7 +3,6 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> - <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="pandoc" /> $for(author)$ @@ -13,6 +12,7 @@ $if(date)$ <meta name="date" content="$date$" /> $endif$ $if(highlighting-css)$ + <title>$if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$</title> <style type="text/css"> $highlighting-css$ </style> |