Merge pull request #144 from adunning/html-keywords

Add keywords to HTML templates; realign.
jgm · Oct 25, 2015 · de2e524 · de2e524
2 parents 2d4df82 + 400dadd
commit de2e524
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/default.html b/default.html
@@ -9,6 +9,9 @@
 $endfor$
 $if(date-meta)$
  <meta name="date" content="$date-meta$" />
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <style type="text/css">code{white-space: pre;}</style>
@@ -21,7 +24,7 @@
  </style>
 $endif$
 $for(css)$
- <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
+ <link rel="stylesheet" href="$css$" type="text/css" />
 $endfor$
 $if(math)$
  $math$

diff --git a/default.html5 b/default.html5
@@ -9,6 +9,9 @@ $for(author-meta)$
 $endfor$
 $if(date-meta)$
  <meta name="dcterms.date" content="$date-meta$">
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <style type="text/css">code{white-space: pre;}</style>

diff --git a/default.revealjs b/default.revealjs
@@ -8,13 +8,19 @@ $for(author-meta)$
 $endfor$
 $if(date-meta)$
  <meta name="dcterms.date" content="$date-meta$">
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <meta name="apple-mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
- <link rel="stylesheet" href="$revealjs-url$/css/reveal.css"/>
+ <link rel="stylesheet" href="$revealjs-url$/css/reveal.css">
  <style type="text/css">code{white-space: pre;}</style>
+$if(quotes)$
+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
+$endif$
 $if(highlighting-css)$
  <style type="text/css">
 $highlighting-css$
@@ -55,14 +61,16 @@ $endfor$
 
 $if(title)$
 <section>
-  <h1 class="title">$title$</h1>
+ <h1 class="title">$title$</h1>
 $if(subtitle)$
  <h1 class="subtitle">$subtitle$</h1>
 $endif$
 $for(author)$
-  <h2 class="author">$author$</h2>
+ <h2 class="author">$author$</h2>
 $endfor$
- <h3 class="date">$date$</h3>
+$if(date)$
+ <h3 class="date">$date$</h3>
+$endif$
 </section>
 $endif$
 $if(toc)$

diff --git a/default.s5 b/default.s5
@@ -1,20 +1,27 @@
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <meta http-equiv="Content-Style-Type" content="text/css" />
  <meta name="generator" content="pandoc" />
 $for(author-meta)$
+ <meta name="version" content="S5 1.1" />
  <meta name="author" content="$author-meta$" />
 $endfor$
 $if(date-meta)$
  <meta name="date" content="$date-meta$" />
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <style type="text/css">code{white-space: pre;}</style>
  <!-- configuration parameters -->
  <meta name="defaultView" content="slideshow" />
  <meta name="controlVis" content="hidden" />
+$if(quotes)$
+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
+$endif$
 $if(highlighting-css)$
  <style type="text/css">
 $highlighting-css$
@@ -53,12 +60,16 @@ $endfor$
 <div class="presentation">
 $if(title)$
 <div class="titleslide slide">
- <h1>$title$</h1>
+ <h1 class="title">$title$</h1>
 $if(subtitle)$
- <h1 class="subtitle">$subtitle$</h1>
+ <h2 class="subtitle">$subtitle$</h2>
+$endif$
+$if(author)$
+ <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3>
+$endif$
+$if(date)$
+ <h4 class="date">$date$</h4>
 $endif$
- <h2>$for(author)$$author$$sep$<br/>$endfor$</h2>
- <h3>$date$</h3>
 </div>
 $endif$
 $body$

diff --git a/default.slideous b/default.slideous
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$>
+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -11,9 +11,15 @@ $for(author-meta)$
 $endfor$
 $if(date-meta)$
  <meta name="date" content="$date-meta$" />
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <style type="text/css">code{white-space: pre;}</style>
+$if(quotes)$
+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
+$endif$
 $if(highlighting-css)$
  <style type="text/css">
 $highlighting-css$

diff --git a/default.slidy b/default.slidy
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$>
+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -11,9 +11,15 @@ $for(author-meta)$
 $endfor$
 $if(date-meta)$
  <meta name="date" content="$date-meta$" />
+$endif$
+$if(keywords)$
+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
 $endif$
  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
  <style type="text/css">code{white-space: pre;}</style>
+$if(quotes)$
+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
+$endif$
 $if(highlighting-css)$
  <style type="text/css">
 $highlighting-css$
@@ -47,9 +53,11 @@ $if(title)$
 $if(subtitle)$
  <h1 class="subtitle">$subtitle$</h1>
 $endif$
+$if(author)$
  <p class="author">
 $for(author)$$author$$sep$<br/>$endfor$
  </p>
+$endif$
 $if(date)$
  <p class="date">$date$</p>
 $endif$