assembly setup

diff --git a/build.sbt b/build.sbt
index 967dcb0..0b3243a 100644 (file)
--- a/build.sbt
+++ b/build.sbt
@@ -1,9 +1,30 @@
+import AssemblyKeys._
+
+import Keys._
+
+import sbt._
+
+import sbtassembly.Plugin._
+
+
 name := "BlackQuill"
 
 version := "0.1.0"
 
 scalaVersion := "2.10.0"
 
+seq(assemblySettings: _*)
+
+mainClass in assembly := Some("org.blackquill.main")
+
+
+mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
+  {
+    case PathList("META-INF", xs @ _*) => MergeStrategy.discard
+    case _ => MergeStrategy.first
+  }
+}
+
 scalacOptions ++= Seq("-encoding","UTF-8")
 
 libraryDependencies ++= Seq(
@@ -11,8 +32,6 @@ libraryDependencies ++= Seq(
        "commons-io" % "commons-io" % "2.4",
   "commons-logging" % "commons-logging" % "1.0.4",
   "uk.ac.ed.ph.snuggletex" % "snuggletex-core" % "1.2.2",
-  "uk.ac.ed.ph.snuggletex" % "snuggletex-upconversion" % "1.2.2",
-  "uk.ac.ed.ph.snuggletex" % "snuggletex-jeuclid" % "1.2.2",
   "org.scalacheck" %% "scalacheck" % "1.10.1" % "test"
 )
 
@@ -24,3 +43,6 @@ resolvers ++= Seq(
  "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
   "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases"
 )
+
+assemblySettings
+

diff --git a/project/plugins.sbt b/project/plugins.sbt
new file mode 100644 (file)
index 0000000..cbcc7c6
--- /dev/null
+++ b/project/plugins.sbt
@@ -0,0 +1,3 @@
+resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
+
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.0")

diff --git a/src/main/scala/org/blackquill/engine/BQParser.scala b/src/main/scala/org/blackquill/engine/BQParser.scala
index 618961e..994546e 100644 (file)
--- a/src/main/scala/org/blackquill/engine/BQParser.scala
+++ b/src/main/scala/org/blackquill/engine/BQParser.scala
@@ -5,6 +5,7 @@ package org.blackquill.engine
 // BQParser.
 
 import org.apache.commons.logging._
+
 import scala.collection.immutable.List
 import scala.collection.mutable.LinkedHashMap
 import scala.collection.mutable.HashMap
@@ -16,7 +17,14 @@ import scala.util.matching.Regex
 import scala.util.control.Breaks.{break,breakable}
 import scala.xml._
 
+import java.io.ByteArrayInputStream
+
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.parsers.DocumentBuilder
+
+//import org.w3c.dom
 import org.blackquill.engine._
+import org.blackquill.main._
 import org.blackquill.io.FileIO
 import org.blackquill.breadboard.Latexconverter
 
@@ -1223,6 +1231,16 @@ class BQParser {
                s"${docType}\n${header}\n<${htmlTAG}>\n<${bodyTAG}>\n${md.replaceAll("\\\\,","\n")}\n</${bodyTAG}>\n</${htmlTAG}>"
        }
 
+       def toDOM(markdown:String):org.w3c.dom.Document = {
+               val stream = new ByteArrayInputStream(markdown.getBytes())
+
+               val factory = DocumentBuilderFactory.newInstance
+               factory.setNamespaceAware(true)
+               val builder = factory.newDocumentBuilder()
+               builder.parse(stream)
+       }
+
+
        private def paragraphize(doc:String):String = {
                val delimiter = """\,"""
                def f(text:String):String = {

diff --git a/src/main/scala/org/blackquill/main/BlackQuill.scala b/src/main/scala/org/blackquill/main/BlackQuill.scala
index 27fb3dd..c4deb41 100644 (file)
--- a/src/main/scala/org/blackquill/main/BlackQuill.scala
+++ b/src/main/scala/org/blackquill/main/BlackQuill.scala
@@ -72,6 +72,8 @@ object BlackQuill{
       encode = "UTF-8"
     }
 
+    var outputFile = ""
+
     private
     var inputFile = ""
     var force = false
@@ -86,8 +88,6 @@ object BlackQuill{
     var verbose = false
     var encFlag = false
     var encode = "UTF-8"
-
-
   }
 
   def main(args:Array[String]){
@@ -119,10 +119,10 @@ object BlackQuill{
     // - fileHandler.openMarkdownFromString(str:String)
     val text:List[String] = fileHandler openMarkdownFromFile(Switches.getInputfile)
     val output = blackquill(text)
-    val out = new PrintWriter(Switches.dirName + sufRegex.replaceAllIn(Switches.getInputfile,".html"))
+    Switches.outputFile = sufRegex.replaceAllIn(Switches.getInputfile,".html")
+    val out = new PrintWriter(Switches.dirName + Switches.outputFile)
     output.foreach(out.print(_))
     out.close
-    log info output
   }
 
   def blackquill(lines:List[String]):List[String] = {
@@ -136,4 +136,4 @@ object BlackQuill{
     HTML split """\,""" toList
   }
 
-}
+ }