Merge branch 'master' of git+ssh://ssh.github.com:443/yogsototh/krambook

Conflicts:
	.gitignore
	Rakefile

Rakefile

@@ -29,6 +29,7 @@ task :svg do
                 exit 1
             end
             command=%{pdf2svg tmp/#{@pdfname}.pdf svgsite/#{@pdfname}-%d.svg all}
+            puts command
             system(command)
             hdecal=110
             vdecal=120
@@ -92,12 +93,10 @@ task :html do
         end
 
         def process_template
-            puts "PROCESS: "+@template_file
             txt=File.read(@template_file)
 
             # puts "READ: " + txt
             txt.sub!( /<!-- INCLUDES -->/ ) do
-                    puts "HERE"
                     @filelist.map do |source,dest| 
                          %{<div class="block">
                              <h3>

filters/mkd_post_latex_macros_to_html.rb

@@ -38,7 +38,7 @@ class MarkdownPostLatexMacrosToHTML
         content.gsub(/(^<p>\s*)?POSTMACRO\((\w(\w|\d|\\_)*)\) = LATEX: ((.|\n)*?) (HTML: ((.|\n)*?) )?ENDMACRO((\s|\n)*<\/p>)?/m) do |m| 
             name=$2
             value=CGI::unescapeHTML($7).gsub("&rdquo;",'"')
-            puts "SAVE HTML MACRO: #{name} => #{value}"
+            # puts "SAVE HTML MACRO: #{name} => #{value}"
             @macro[name.intern]=value
             ""
         end.gsub(/<p>(\s|\n)*(\\?)%(\w[a-zA-Z0-9_]*)(\s|\n)*<\/p>/m) do |m|