de2e524 · typeable/pandoc

git.iko.soy/typeable/pandoc

Merge pull request #144 from adunning/html-keywords

Add keywords to HTML templates; realign.

commitde2e524e7df0a9d4159f2794deaa2e1847c87d46 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 25 Oct 2015, 12:18 (11 years ago) parent2d4df82 400dadd

6 files changed+51−12

compare with master

unifiedsplit

default.html+4−1 default.html5+3 default.revealjs+12−4 default.s5+16−5 default.slideous+7−1 default.slidy+9−1

default.html+4−1

@@ -9,6 +9,9 @@ $for(author-meta)$

99$endfor$

1010$if(date-meta)$

1111 <meta name="date" content="$date-meta$" />

12+$endif$

13+$if(keywords)$

14+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />

1215$endif$

1316 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1417 <style type="text/css">code{white-space: pre;}</style>

@@ -21,7 +24,7 @@ $highlighting-css$

2124 </style>

2225$endif$

2326$for(css)$

24− <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>

27+ <link rel="stylesheet" href="$css$" type="text/css" />

2528$endfor$

2629$if(math)$

2730 $math$

default.html5+3

@@ -9,6 +9,9 @@ $for(author-meta)$

99$endfor$

1010$if(date-meta)$

1111 <meta name="dcterms.date" content="$date-meta$">

12+$endif$

13+$if(keywords)$

14+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">

1215$endif$

1316 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1417 <style type="text/css">code{white-space: pre;}</style>

default.revealjs+12−4

@@ -8,13 +8,19 @@ $for(author-meta)$

88$endfor$

99$if(date-meta)$

1010 <meta name="dcterms.date" content="$date-meta$">

11+$endif$

12+$if(keywords)$

13+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">

1114$endif$

1215 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1316 <meta name="apple-mobile-web-app-capable" content="yes">

1417 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">

1518 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">

16− <link rel="stylesheet" href="$revealjs-url$/css/reveal.css"/>

19+ <link rel="stylesheet" href="$revealjs-url$/css/reveal.css">

1720 <style type="text/css">code{white-space: pre;}</style>

21+$if(quotes)$

22+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>

23+$endif$

1824$if(highlighting-css)$

1925 <style type="text/css">

2026$highlighting-css$

@@ -55,14 +61,16 @@ $endfor$

5561

5662$if(title)$

5763<section>

58− <h1 class="title">$title$</h1>

64+ <h1 class="title">$title$</h1>

5965$if(subtitle)$

6066 <h1 class="subtitle">$subtitle$</h1>

6167$endif$

6268$for(author)$

63− <h2 class="author">$author$</h2>

69+ <h2 class="author">$author$</h2>

6470$endfor$

65− <h3 class="date">$date$</h3>

71+$if(date)$

72+ <h3 class="date">$date$</h3>

73+$endif$

6674</section>

6775$endif$

6876$if(toc)$

default.s5+16−5

@@ -1,20 +1,27 @@

11<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

2−<html xmlns="http://www.w3.org/1999/xhtml">

2+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>

33<head>

44 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

55 <meta http-equiv="Content-Style-Type" content="text/css" />

66 <meta name="generator" content="pandoc" />

77$for(author-meta)$

8+ <meta name="version" content="S5 1.1" />

89 <meta name="author" content="$author-meta$" />

910$endfor$

1011$if(date-meta)$

1112 <meta name="date" content="$date-meta$" />

13+$endif$

14+$if(keywords)$

15+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />

1216$endif$

1317 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1418 <style type="text/css">code{white-space: pre;}</style>

1519

1620 <meta name="defaultView" content="slideshow" />

1721 <meta name="controlVis" content="hidden" />

22+$if(quotes)$

23+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>

24+$endif$

1825$if(highlighting-css)$

1926 <style type="text/css">

2027$highlighting-css$

@@ -53,12 +60,16 @@ $endfor$

5360<div class="presentation">

5461$if(title)$

5562<div class="titleslide slide">

56− <h1>$title$</h1>

63+ <h1 class="title">$title$</h1>

5764$if(subtitle)$

58− <h1 class="subtitle">$subtitle$</h1>

65+ <h2 class="subtitle">$subtitle$</h2>

66+$endif$

67+$if(author)$

68+ <h3 class="author">$for(author)$$author$$sep$<br/>$endfor$</h3>

69+$endif$

70+$if(date)$

71+ <h4 class="date">$date$</h4>

5972$endif$

60− <h2>$for(author)$$author$$sep$<br/>$endfor$</h2>

61− <h3>$date$</h3>

6273</div>

6374$endif$

6475$body$

default.slideous+7−1

@@ -1,7 +1,7 @@

11<?xml version="1.0" encoding="utf-8"?>

22<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

33 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

4−<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$>

4+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>

55<head>

66 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

77 <meta http-equiv="Content-Style-Type" content="text/css" />

@@ -11,9 +11,15 @@ $for(author-meta)$

1111$endfor$

1212$if(date-meta)$

1313 <meta name="date" content="$date-meta$" />

14+$endif$

15+$if(keywords)$

16+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />

1417$endif$

1518 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1619 <style type="text/css">code{white-space: pre;}</style>

20+$if(quotes)$

21+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>

22+$endif$

1723$if(highlighting-css)$

1824 <style type="text/css">

1925$highlighting-css$

default.slidy+9−1

@@ -1,7 +1,7 @@

11<?xml version="1.0" encoding="utf-8"?>

22<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

33 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

4−<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$>

4+<html xmlns="http://www.w3.org/1999/xhtml"$if(lang)$ lang="$lang$" xml:lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>

55<head>

66 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

77 <meta http-equiv="Content-Style-Type" content="text/css" />

@@ -11,9 +11,15 @@ $for(author-meta)$

1111$endfor$

1212$if(date-meta)$

1313 <meta name="date" content="$date-meta$" />

14+$endif$

15+$if(keywords)$

16+ <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />

1417$endif$

1518 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>

1619 <style type="text/css">code{white-space: pre;}</style>

20+$if(quotes)$

21+ <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>

22+$endif$

1723$if(highlighting-css)$

1824 <style type="text/css">

1925$highlighting-css$

@@ -47,9 +53,11 @@ $if(title)$

4753$if(subtitle)$

4854 <h1 class="subtitle">$subtitle$</h1>

4955$endif$

56+$if(author)$

5057 <p class="author">

5158$for(author)$$author$$sep$<br/>$endfor$

5259 </p>

60+$endif$

5361$if(date)$

5462 <p class="date">$date$</p>

5563$endif$