Added metadata 'encoding' to define html document charset

twilson63 · Sep 7, 2013 · 0cd846a · 0cd846a
1 parent 8a0c2d8
commit 0cd846a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -89,6 +89,7 @@ the following fields.
 * **output**: A location to save the rendered document (default: *FILENAME-cleaver.html*)
 * **controls**: Option whether or not arrow buttons should be included (default: *true*)
 * **agenda**: Option whether or not to insert an agenda slide (similar to a table of contents) after the title (default: *false*)
+* **encoding**: A specified content encoding (default: *utf-8*)
 
 If author is included, the following slide will be automatically inserted
 at the end of your presentation:

diff --git a/examples/basic.md b/examples/basic.md
@@ -16,7 +16,12 @@ output: basic.html
 
 Content can be written in **Markdown!** New lines no longer need two angle brackets.
 
-This will be in a separate paragraph
+This will be in a separate paragraph.
+
+<img src="http://whatismarkdown.com/workspace/img/logo.gif" alt="Drawing" style="width: 150px;"/>
+
+    ![markdown-logo](logo.gif)
+    <img src="logo.gif" />
 
 --
 
@@ -27,3 +32,13 @@ This will be in a separate paragraph
 * Item gamma
 
 No need for multiple templates!
+
+--
+
+### Unicode
+
+* 林花謝了春紅 太匆匆
+* 胭脂淚 留人醉 幾時重
+* Matching Pairs «»‹› “”‘’「」〈〉《》〔〕
+* Greek αβγδ εζηθ ικλμ νξοπ ρςτυ φχψω
+* currency  ¤ $ ¢ € ₠ £ ¥
diff --git a/lib/cleaver.js b/lib/cleaver.js
@@ -90,11 +90,14 @@ Cleaver.prototype._renderSlideshow = function () {
   var putControls = this.metadata.controls || (this.metadata.controls === undefined);
   var outputLocation = this.metadata.output || path.basename(this.file, '.md') + '-cleaver.html';
 
+  // TODO: handle defaults gracefully
   var title = this.metadata.title || 'Untitled';
+  var encoding = this.metadata.encoding || 'utf-8';
 
   var slideData = {
     slides: this.slides,
     title: title,
+    encoding: encoding,
     controls: putControls,
     style: this.resources.loaded.style,
     externalStyle: this.external.loaded.style,

diff --git a/templates/layout.mustache b/templates/layout.mustache
@@ -1,5 +1,6 @@
 <html>
 <head>
+  <meta charset="{{encoding}}">
   <title>{{title}}</title>
   <style type="text/css">
     {{{style}}}