Merge pull request #32 from eed3si9n/topic/subs

subtitles
softprops · Feb 22, 2013 · 7075a5c · 7075a5c
2 parents de3abfc + 332c44c
commit 7075a5c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -119,6 +119,16 @@ In `sectiona.md`, you'll want to reference `foo.jpg` as
 
      ![foo](sectiona/foo.jpg)
 
+### subtitles
+
+Here's how you can add subtitles to a slide.
+
+    !SLIDE
+
+    ハロー!
+
+    #SUB Hello!
+
 ### assets
 
 #### js and css

diff --git a/core/src/main/resources/css/show.css b/core/src/main/resources/css/show.css
@@ -15,7 +15,14 @@ body {
   overflow: hidden;
 }
 #slides .content .container {
-   padding:.5em;
+  padding:.5em;
+  height:80%;
+}
+#slides .content .subtitle {
+  padding:.5em;
+  background:#000;
+  color:#fff;
+  width: 100%;
 }
 #reel {
   width: 1000000px;

diff --git a/core/src/main/scala/Markup.scala b/core/src/main/scala/Markup.scala
@@ -27,15 +27,29 @@ trait Markup { self: Resolver with Config =>
     val slides = content.split("(?m)^!SLIDE")
     if(slides.isEmpty) log("no slides within file %s at index %s" format(content, index))
     ((new xml.NodeBuffer, index) /: slides.drop(1))( (a, s) => {
-      (a._1 &+ (<div class="content" id={"slide-%s" format a._2}>
-       <div class="container">{
-         s.split("\n")(0).trim match {
-            case Meta(meta) => {
-              <div>{ xml.PCData( s.split("\n").toList.drop(1).mkString("") ) }</div>
-            }
-            case _ => parseMarkdown(s)
+      (a._1 &+ (<div class="content" id={"slide-%s" format a._2}>{
+        val lines = s.lines.toList
+        lines.head.trim match {
+          case Meta(meta) => {
+            <div class="container">
+              <div>{ xml.PCData( lines.drop(1).mkString("") ) }</div>
+            </div>
           }
-        }</div>
+          case _ =>
+            lines.partition(_.startsWith("#SUB ")) match {
+              case (Nil, nonsubs) =>
+                <div class="container">
+                  {parseMarkdown(nonsubs.mkString("\n"))}
+                </div>
+              case (subs, nonsubs) =>
+                <div class="container">
+                  {parseMarkdown(nonsubs.mkString("\n"))}
+                </div>
+                <div class="subtitle">
+                  {parseMarkdown(subs.map(_.drop(5)).mkString("\n"))}
+                </div>
+            }
+        }}
       </div>), a._2 + 1)
     })
   }

diff --git a/core/src/main/scala/Resolver.scala b/core/src/main/scala/Resolver.scala
@@ -39,7 +39,7 @@ class FileSystemResolver(uri: URI) extends Resolver {
   import java.util.regex.Pattern
   private def file(p: String) = new File(uri.toURL.getFile, p)
   private def url(p: String) = new URL(uri.toURL, p)
-  privte def lastSeg(p: String) = p.split(Pattern.quote(File.separator)).last
+  private def lastSeg(p: String) = p.split(Pattern.quote(File.separator)).last
   def configuration = IO.slurp(url("conf.js")).get
   def resolve(p: String) =
     if(file(p) exists) IO.slurp(url(p))

diff --git a/project/build.scala b/project/build.scala
@@ -47,7 +47,7 @@ object Build extends sbt.Build {
 
   /** core transformations from txt files to html slide formated html */
   lazy val core = Project(
-    "PictureShow Core",
+    "PictureShow_Core",
     file("core"),
     settings = standardSettings ++ Seq(
       libraryDependencies ++= Seq(codec, specs)
@@ -56,7 +56,7 @@ object Build extends sbt.Build {
 
   /** serves generated html on a configurable port */
   lazy val server = Project(
-    "PictureShow Server",
+    "PictureShow_Server",
     file("server"),  
     settings = standardSettings ++ Seq(
       libraryDependencies ++= Seq(uff, ufj)
@@ -66,15 +66,15 @@ object Build extends sbt.Build {
 
   /** caches generated html to disk */
   lazy val offln = Project(
-    "PictureShow Offline",
+    "PictureShow_Offline",
     file("offline"),
     settings = standardSettings,
     dependencies = Seq(core)
   )
 
   /** command line client, pshow */
   lazy val app = Project(
-    "PictureShow Conscript", 
+    "PictureShow_Conscript", 
     file("conscript"),
     settings = standardSettings ++ conscript.Harness.conscriptSettings,
     dependencies = Seq(core, server, offln)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("net.databinder" % "conscript-plugin" % "0.3.3")
+addSbtPlugin("net.databinder" % "conscript-plugin" % "0.3.5")
 
 addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")