lib/murdoc.rb in murdoc-0.1.0 vs lib/murdoc.rb in murdoc-0.1.1

@@ -8,13 +8,14 @@
 # [ro]: "http://rtomayko.github.com/rocco"
 #
 
 
 module Murdoc
-  def self.generate_from_file(input, output)
-    annotator = Annotator.from_file(input)
+  def self.generate_from_file(input, output, options = {})
+    annotator = Annotator.from_file(input, nil, options)
+    markup_dir = File.dirname(__FILE__)+ "/../markup"
     File.open(output, "w+") do |f|
-      f.puts Formatter.new("markup/template.haml").render(:paragraphs => annotator.paragraphs, :stylesheet => File.read("markup/stylesheet.css"))
+      f.puts Formatter.new("#{markup_dir}/template.haml").render(:paragraphs => annotator.paragraphs, :stylesheet => File.read("#{markup_dir}/stylesheet.css"))
     end
   end
 end
 
 require "murdoc/annotator"
\ No newline at end of file