bring in the commits of mtiller and add with some documents
diff --git a/README.md b/README.md
index bf472cb..1b47111 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,23 @@
-0.2.1
-
- pip install weakpoint
+# WeakPoint (Version 0.2.3)
-----
-
-# What It Is?
-----
-
-
-## It is...
-
-a static slideshow generator
-
-
-* use **Markdown** to write your slides
-* display your slides in Web browser
-
-
-----
-
-## It Is Not...
-
-* a powerful slideshow creator
-* WYSIWYG
-
-----
+WeakPoint is a static slideshow generator.
-# Quickstart
-----
+* Use **Markdown** to write your slides
+* Display your slides in Web browser
+* NOT a powerful slideshow authering tool
+* NOT WYSIWYG
+
+
+## DEMO
+
+
+[WeakPoint: Weak is more powerful](http://blog.chengyichao.info/weakpoint/#/step-1)
+
+
## Install
@@ -41,56 +27,24 @@
$ pip install weakpoint
-
-----
-
-
-
-## Create a template
+Create a template:
$ weakpoint init ~/my-file
-The default theme is "light" and you can specify it
-with "-t" option:
+The default theme is "light" and you can specify it with "-t" option:
$ weakpoint init ~/my-file -t dark
-----
-## Write & config your slides
-
-
-
-* Open `~/my-file/slides.md` and write your slides in Markdown
-* Edit `~/my-file/config.yaml` to config your slides
-
-
-
-----
-
-
-## Generate the slideshow
+Generate the slideshow:
$ weakpoint gen
-That's all! Now your slideshow is in `~/my-file/index.html`.
-
-
-You can release it like static web pages.
-
-
-----
-
-# Misc
-
-----
-
## Dependencies
-The technologies behind WeakPoint:
* [Jinja2](http://jinja.pocoo.org/)
* [misaka](http://misaka.61924.nl/)
@@ -99,24 +53,9 @@
* [impress.js](http://bartaz.github.com/impress.js)
* [jmpress.js](https://github.com/shama/jmpress.js/)
-----
-
-## How to Make a Theme
-WeakPoint uses [Jinja2](http://jinja.pocoo.org/) as a templete engine.
+## Contributors
-You can get the content of slides by writing:
-
-
- {% for slide in slides %}
- <div class="content">{{ slide.content }}</div>
- {% endfor %}
-
-
-----
-
-# Thanks
-
-
+Michael Tiller
diff --git a/changelog.md b/changelog.md
index 071dd46..324c326 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,21 +1,27 @@
+# 0.2.3 BY Michael Tiller
+
+* Add support for `python-markdown`(code highlighting as an extension)
+* Initial attempt to include a jmpress option for new 'engine' config
+* Eliminate some duplicated files under 'themes/dark'
+
# 0.2.2
-* add chapter and section attributes into Slide
+* Add chapter and section attributes into Slide
# 0.2.1
-* reconstruct code with Jinja2
-* start to use impress.js as front end
+* Reconstruct code with Jinja2
+* Start to use impress.js as front end
# 0.1.0
* LaTeX enabled
-* use bxslider as front end
+* Use bxslider as front end
# 0.0.1
-* demo
+* Demo
diff --git a/weakpoint/__init__.py b/weakpoint/__init__.py
index 84544f3..fc7a2af 100644
--- a/weakpoint/__init__.py
+++ b/weakpoint/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.2.3'
+__version__ = '0.3.0'
diff --git a/weakpoint/parsers/markdown_parser.py b/weakpoint/parsers/markdown_parser.py
index 9b16edf..d74aac5 100644
--- a/weakpoint/parsers/markdown_parser.py
+++ b/weakpoint/parsers/markdown_parser.py
@@ -1,5 +1,11 @@
import markdown as m
+
+# If you have pygments installed, WeakPoint will highlight
+# the code automatically. Actually, I was considering to make
+# pygements as a dependency of WeakPoint and let user config
+# whether to highlight the code in config.xml
+
try:
import pygments
have_pygments = True
diff --git a/weakpoint/themes/dark/_templates/_settings b/weakpoint/themes/dark/_templates/_settings
deleted file mode 120000
index ed0bd5b..0000000
--- a/weakpoint/themes/dark/_templates/_settings
+++ /dev/null
@@ -1 +0,0 @@
-../../light/_templates/_settings
\ No newline at end of file
diff --git a/weakpoint/themes/dark/_templates/misc.html b/weakpoint/themes/dark/_templates/misc.html
new file mode 120000
index 0000000..0275e46
--- /dev/null
+++ b/weakpoint/themes/dark/_templates/misc.html
@@ -0,0 +1 @@
+./../../light/_templates/misc.html
\ No newline at end of file
diff --git a/weakpoint/themes/dark/assets/css/basic-animation.css b/weakpoint/themes/dark/assets/css/basic-animations.css
similarity index 100%
rename from weakpoint/themes/dark/assets/css/basic-animation.css
rename to weakpoint/themes/dark/assets/css/basic-animations.css
diff --git a/weakpoint/themes/dark/assets/css/pygments.css b/weakpoint/themes/dark/assets/css/pygments.css
new file mode 120000
index 0000000..b6f3101
--- /dev/null
+++ b/weakpoint/themes/dark/assets/css/pygments.css
@@ -0,0 +1 @@
+../../../light/assets/css/pygments.css
\ No newline at end of file
diff --git a/weakpoint/themes/dark/assets/css/style.css b/weakpoint/themes/dark/assets/css/style.css
index 2f93c82..32f7f2a 100644
--- a/weakpoint/themes/dark/assets/css/style.css
+++ b/weakpoint/themes/dark/assets/css/style.css
@@ -31,7 +31,7 @@
.meta {
font-size: 35px;
text-align:center;
-
+ color: white;
}
@@ -43,6 +43,7 @@
}
.title {
+ color: white;
}
h1, h2, h3, h4 {
diff --git a/weakpoint/themes/dark/assets/js b/weakpoint/themes/dark/assets/js
deleted file mode 120000
index fee30fc..0000000
--- a/weakpoint/themes/dark/assets/js
+++ /dev/null
@@ -1 +0,0 @@
-../../light/assets/js
\ No newline at end of file
diff --git a/weakpoint/themes/dark/assets/js/impress.js b/weakpoint/themes/dark/assets/js/impress.js
new file mode 120000
index 0000000..904f5a5
--- /dev/null
+++ b/weakpoint/themes/dark/assets/js/impress.js
@@ -0,0 +1 @@
+./../../../light/assets/js/impress.js
\ No newline at end of file
diff --git a/weakpoint/themes/dark/assets/js/jmpress.js b/weakpoint/themes/dark/assets/js/jmpress.js
new file mode 120000
index 0000000..686d819
--- /dev/null
+++ b/weakpoint/themes/dark/assets/js/jmpress.js
@@ -0,0 +1 @@
+./../../../light/assets/js/jmpress.js
\ No newline at end of file
diff --git a/weakpoint/themes/dark/assets/js/jquery-1.8.3.min.js b/weakpoint/themes/dark/assets/js/jquery-1.8.3.min.js
new file mode 120000
index 0000000..a31a3f3
--- /dev/null
+++ b/weakpoint/themes/dark/assets/js/jquery-1.8.3.min.js
@@ -0,0 +1 @@
+./../../../light/assets/js/jquery-1.8.3.min.js
\ No newline at end of file
diff --git a/weakpoint/themes/light/_templates/_settings/font.html b/weakpoint/themes/light/_templates/_settings/font.html
deleted file mode 100644
index 1d0d96c..0000000
--- a/weakpoint/themes/light/_templates/_settings/font.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if fonts %}
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family={{ fonts }}" type="text/css">
-{% endif %}
diff --git a/weakpoint/themes/light/_templates/_settings/latex.html b/weakpoint/themes/light/_templates/_settings/latex.html
deleted file mode 100644
index c70bbc5..0000000
--- a/weakpoint/themes/light/_templates/_settings/latex.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% if latex %}
-{% endif %}
diff --git a/weakpoint/themes/light/_templates/layout.html b/weakpoint/themes/light/_templates/layout.html
index 31576c4..4a5542e 100644
--- a/weakpoint/themes/light/_templates/layout.html
+++ b/weakpoint/themes/light/_templates/layout.html
@@ -2,9 +2,7 @@
<html>
<head>
{% include 'header.html' %}
- {% include '_settings/analytics.html' %}
- {% include '_settings/latex.html' %}
- {% include '_settings/font.html' %}
+ {% include 'misc.html' %}
{% if title %}
<title>{{ title }} {% if subtitle %} – {{ subtitle }} {% endif %}</title>
{% endif %}
diff --git a/weakpoint/themes/light/_templates/_settings/analytics.html b/weakpoint/themes/light/_templates/misc.html
similarity index 76%
rename from weakpoint/themes/light/_templates/_settings/analytics.html
rename to weakpoint/themes/light/_templates/misc.html
index cc40806..18869ac 100644
--- a/weakpoint/themes/light/_templates/_settings/analytics.html
+++ b/weakpoint/themes/light/_templates/misc.html
@@ -1,5 +1,4 @@
{% if analytics %}
-
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ analytics }}']);
@@ -11,5 +10,12 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
+{% endif %}
+{% if fonts %}
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family={{ fonts }}" type="text/css">
+{% endif %}
+
+
+{% if latex %}
{% endif %}
diff --git a/weakpoint/themes/light/assets/css/pygments.css b/weakpoint/themes/light/assets/css/pygments.css
index d92e20e..6cf8609 100644
--- a/weakpoint/themes/light/assets/css/pygments.css
+++ b/weakpoint/themes/light/assets/css/pygments.css
@@ -1,65 +1,68 @@
-/* This file was generated by the command:
-pygmentize -S trac -f html
-
-But I also had to remove the "mi" and "mo" classes because they interfered
-with MathJAX CSS classes.
-*/
-.highlight .hll { background-color: #ffffcc }
-.highlight .c { color: #999988; font-style: italic } /* Comment */
-.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.highlight .k { font-weight: bold } /* Keyword */
-.highlight .o { font-weight: bold } /* Operator */
-.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
-.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #aa0000 } /* Generic.Error */
-.highlight .gh { color: #999999 } /* Generic.Heading */
-.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.highlight .go { color: #888888 } /* Generic.Output */
-.highlight .gp { color: #555555 } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
-.highlight .gt { color: #aa0000 } /* Generic.Traceback */
-.highlight .kc { font-weight: bold } /* Keyword.Constant */
-.highlight .kd { font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
-.highlight .kr { font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.highlight .m { color: #009999 } /* Literal.Number */
-.highlight .s { color: green } /* Literal.String */
-.highlight .na { color: #008080 } /* Name.Attribute */
-.highlight .nb { font-weight: bold } /* Name.Builtin */
-.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
-.highlight .no { color: #008080 } /* Name.Constant */
-.highlight .ni { color: #800080 } /* Name.Entity */
-.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
-.highlight .nn { color: #555555 } /* Name.Namespace */
-.highlight .nt { color: #000080 } /* Name.Tag */
-.highlight .nv { color: #008080 } /* Name.Variable */
-.highlight .ow { font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #009999 } /* Literal.Number.Float */
-.highlight .mh { color: #009999 } /* Literal.Number.Hex */
-.highlight .mi { color: #009999 } /* Literal.Number.Integer */
-.highlight .mo { color: #009999 } /* Literal.Number.Oct */
-.highlight .sb { color: #bb8844 } /* Literal.String.Backtick */
-.highlight .sc { color: #bb8844 } /* Literal.String.Char */
-.highlight .sd { color: #bb8844 } /* Literal.String.Doc */
-.highlight .s2 { color: #bb8844 } /* Literal.String.Double */
-.highlight .se { color: #bb8844 } /* Literal.String.Escape */
-.highlight .sh { color: #bb8844 } /* Literal.String.Heredoc */
-.highlight .si { color: #bb8844 } /* Literal.String.Interpol */
-.highlight .sx { color: #bb8844 } /* Literal.String.Other */
-.highlight .sr { color: #808000 } /* Literal.String.Regex */
-.highlight .s1 { color: #bb8844 } /* Literal.String.Single */
-.highlight .ss { color: #bb8844 } /* Literal.String.Symbol */
-.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #008080 } /* Name.Variable.Class */
-.highlight .vg { color: #008080 } /* Name.Variable.Global */
-.highlight .vi { color: #008080 } /* Name.Variable.Instance */
-.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+.hll { background-color: #ffffcc }
+.err { color: #a40000; border: 1px solid #ef2929 } /* Error */
+.g { color: #000000 } /* Generic */
+.k { color: #204a87; font-weight: bold } /* Keyword */
+.l { color: #000000 } /* Literal */
+.n { color: #000000 } /* Name */
+.o { color: #ce5c00; font-weight: bold } /* Operator */
+.x { color: #000000 } /* Other */
+.p { color: #000000; font-weight: bold } /* Punctuation */
+.cm { color: #8f5902; font-style: italic } /* Comment.Multiline */
+.cp { color: #8f5902; font-style: italic } /* Comment.Preproc */
+.c1 { color: #8f5902; font-style: italic } /* Comment.Single */
+.cs { color: #8f5902; font-style: italic } /* Comment.Special */
+.gd { color: #a40000 } /* Generic.Deleted */
+.ge { color: #000000; font-style: italic } /* Generic.Emph */
+.gr { color: #ef2929 } /* Generic.Error */
+.gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.gi { color: #00A000 } /* Generic.Inserted */
+.go { color: #000000; font-style: italic } /* Generic.Output */
+.gp { color: #8f5902 } /* Generic.Prompt */
+.gs { color: #000000; font-weight: bold } /* Generic.Strong */
+.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.gt { color: #a40000; font-weight: bold } /* Generic.Traceback */
+.kc { color: #204a87; font-weight: bold } /* Keyword.Constant */
+.kd { color: #204a87; font-weight: bold } /* Keyword.Declaration */
+.kn { color: #204a87; font-weight: bold } /* Keyword.Namespace */
+.kp { color: #204a87; font-weight: bold } /* Keyword.Pseudo */
+.kr { color: #204a87; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #204a87; font-weight: bold } /* Keyword.Type */
+.ld { color: #000000 } /* Literal.Date */
+.m { color: #0000cf; font-weight: bold } /* Literal.Number */
+.s { color: #4e9a06 } /* Literal.String */
+.na { color: #c4a000 } /* Name.Attribute */
+.nb { color: #204a87 } /* Name.Builtin */
+.nc { color: #000000 } /* Name.Class */
+.no { color: #000000 } /* Name.Constant */
+.nd { color: #5c35cc; font-weight: bold } /* Name.Decorator */
+.ni { color: #ce5c00 } /* Name.Entity */
+.ne { color: #cc0000; font-weight: bold } /* Name.Exception */
+.nf { color: #000000 } /* Name.Function */
+.nl { color: #f57900 } /* Name.Label */
+.nn { color: #000000 } /* Name.Namespace */
+.nx { color: #000000 } /* Name.Other */
+.py { color: #000000 } /* Name.Property */
+.nt { color: #204a87; font-weight: bold } /* Name.Tag */
+.nv { color: #000000 } /* Name.Variable */
+.ow { color: #204a87; font-weight: bold } /* Operator.Word */
+.w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+.mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
+.mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */
+/* .mi { color: #0000cf; font-weight: bold } Literal.Number.Integer */
+/* .mo { color: #0000cf; font-weight: bold } Literal.Number.Oct */
+.sb { color: #4e9a06 } /* Literal.String.Backtick */
+.sc { color: #4e9a06 } /* Literal.String.Char */
+.sd { color: #8f5902; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #4e9a06 } /* Literal.String.Double */
+.se { color: #4e9a06 } /* Literal.String.Escape */
+.sh { color: #4e9a06 } /* Literal.String.Heredoc */
+.si { color: #4e9a06 } /* Literal.String.Interpol */
+.sx { color: #4e9a06 } /* Literal.String.Other */
+.sr { color: #4e9a06 } /* Literal.String.Regex */
+.s1 { color: #4e9a06 } /* Literal.String.Single */
+.ss { color: #4e9a06 } /* Literal.String.Symbol */
+.bp { color: #3465a4 } /* Name.Builtin.Pseudo */
+.vc { color: #000000 } /* Name.Variable.Class */
+.vg { color: #000000 } /* Name.Variable.Global */
+.vi { color: #000000 } /* Name.Variable.Instance */
+.il { color: #0000cf; font-weight: bold } /* Literal.Number.Integer.Long */
diff --git a/weakpoint/themes/light/slides.md b/weakpoint/themes/light/slides.md
index 3a88d7b..0e3c8f0 100644
--- a/weakpoint/themes/light/slides.md
+++ b/weakpoint/themes/light/slides.md
@@ -16,7 +16,7 @@
## It Is Not...
-* a powerful slideshow creator
+* a powerful slideshow authoring tool
* WYSIWYG
----
@@ -81,6 +81,29 @@
----
+## Substeps
+
+<p data-jmpress="fade">Fade</p>
+<p data-jmpress="appear">appear</p>
+<p data-jmpress="warp-right">warp-right</p>
+<p data-jmpress="drive-up">drive-up</p>
+
+----
+
+
+## Code Highlighting
+
+ var setArray = function(elems) {
+ this.length = 0;
+ push.apply(this, elems);
+ return this;
+ }
+
+
+
+----
+
+
## Dependencies
The technologies behind WeakPoint:
@@ -94,7 +117,7 @@
----
-## How to Make a Theme
+## Custom Theme
WeakPoint uses [Jinja2](http://jinja.pocoo.org/) as a templete engine.