glyph 0.4.2 → 0.5.0

data/spec/tasks/load_spec.rb

@@ -16,18 +16,6 @@ describe "load" do
 		delete_project
 		lambda { Glyph.run! 'load:all' }.should raise_error
 	end
-	
-	it "[snippets] should load snippet definitions" do
-		lambda { Glyph.run! 'load:snippets'}.should_not raise_error
-		Glyph::SNIPPETS[:test].blank?.should == false
-	end
-
-	it "[snippets] should not load snippets.xml in Lite mode" do
-		Glyph.lite_mode = true
-		lambda { Glyph.run! 'load:snippets'}.should_not raise_error
-		Glyph::SNIPPETS[:test].blank?.should == true
-		Glyph.lite_mode = false
-	end
 
 	it "[macros] should load macro definitions" do
 		lambda { Glyph.run! 'load:macros'}.should_not raise_error
@@ -64,7 +52,7 @@ describe "load" do
 	it "[layouts] should load layouts" do
 		Glyph['document.output'] = 'web'
 		Glyph.run! 'load:macros'
-		Glyph::MACROS[:"layout:topic"].blank?.should == false
+		Glyph::MACROS[:"layout/topic"].blank?.should == false
 	end
 
 	it "[tasks] should load tasks" do

data/styles/coderay.css

@@ -1,38 +1,147 @@
-.CodeRay pre {
-  line-height: 1.2em;
-  margin: 0px;
-  color: #FFF; }
-.CodeRay .no {
-  font-weight: bold;
-  color: #595959; }
-.CodeRay .an {
-  color: #E7BE69; }
-.CodeRay .c {
-  color: #BC9358;
-  font-style: italic; }
-.CodeRay .ch {
-  color: #509E4F; }
-.CodeRay .cl, .CodeRay .co {
-  color: #FFF; }
-.CodeRay .fl {
-  color: #A4C260; }
-.CodeRay .fu {
-  color: #FFC56D; }
-.CodeRay .gv {
-  color: #D0CFFE; }
-.CodeRay .i {
-  color: #A4C260; }
-.CodeRay .iv {
-  color: #D0CFFE; }
-.CodeRay .pp {
-  color: #E7BE69; }
-.CodeRay .r {
-  color: #CB7832; }
-.CodeRay .rx, .CodeRay .s {
-  color: #A4C260; }
-.CodeRay .sy {
-  color: #6C9CBD; }
-.CodeRay .ta {
-  color: #E7BE69; }
-.CodeRay .pc {
-  color: #6C9CBD; }
+/*
+ * Based on: https://github.com/pie4dan/CodeRay-GitHub-Theme/blob/master/coderay.css
+ */
+.CodeRay {
+  background-color: #FFF;
+  border: 1px solid #CCC;
+  line-height: 1.3em;
+  font-size: 12px;
+  font-family: Monospace;
+  color: #000;
+  padding: 1em 0px 1em 1em;
+}
+.CodeRay pre, .CodeRay code {
+  padding: 0;
+  margin: 0;
+}
+
+div.CodeRay { 
+  padding: 0;
+}
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td {
+  padding: 1em 0.5em;
+  vertical-align: top;
+}
+
+.CodeRay .line_numbers, .CodeRay .no {
+  border: 1px solid #ECECEC;
+  margin: 0 inherit;
+  background-color: #ECECEC;
+  color: #AAA;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
+.CodeRay .line { display: block; float: left; width: 100%; }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#998; font-style: italic;}
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#458; font-weight:bold }
+.CodeRay .cm { color:#A08; font-weight:bold }
+.CodeRay .co { color:teal; }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .de { color:#B0B; }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#C00; font-weight:bold }
+.CodeRay .fl { color:#099; }
+.CodeRay .fu { color:#900; font-weight:bold }
+.CodeRay .gv { color:teal; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#099; }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { color: black }
+.CodeRay .il .il { background: #ccc }
+.CodeRay .il .il .il { background: #bbb }
+.CodeRay .il .idl { color: #D14; }
+.CodeRay .idl { color: #D14; }
+
+.CodeRay .im { color:#f00; }
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:teal }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc {  font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight:bold }
+.CodeRay .pt { color:#074; font-weight:bold }
+.CodeRay .r, .kw  { color:#000; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s { color: #D20; }
+.CodeRay .s .s { }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { color: #D14; }
+.CodeRay .s .ch { color: #D14; }
+.CodeRay .s .dl { color: #D14; }
+
+.CodeRay .sh { color:#D14 }
+.CodeRay .sh .k { }
+.CodeRay .sh .dl { color:#D14 }
+
+.CodeRay .sy { color:#990073 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }
+
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }

data/styles/default.css

@@ -38,20 +38,21 @@ body {
   text-align: center; }
   .titlepage h1 {
     font-size: 2.5em;
+    line-height: 1.2em;
     font-weight: bold;
-    line-height: 1.5em;
     margin-bottom: 0.2em; }
 
 .halftitlepage h1 {
   font-size: 2.5em;
   font-weight: bold;
-  line-height: 1.5em;
   margin-bottom: 0.2em; }
 .halftitlepage h2 {
   font-size: 1.1em;
   font-style: italic;
   font-weight: bold;
-  line-height: 1.2em;
+  padding-top: 0;
+  margin-top: 0;
+  line-height: 2.5em;
   margin-bottom: 0.5em;
   prince-bookmark-level: none; }
 
@@ -59,7 +60,9 @@ body {
   font-size: 1.1em;
   font-style: italic;
   font-weight: bold;
-  line-height: 1.2em;
+  padding-top: 0;
+  margin-top: 0;
+  line-height: 2.5em;
   margin-bottom: 0.5em;
   prince-bookmark-level: none; }
 
@@ -126,11 +129,16 @@ sup {
   margin: auto;
   text-align: center; }
 
+code {
+  font-size: 0.8em;
+}
+
 .note, .important, .tip, .caution, .box {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #CCC;
   display: block;
   margin: 0.5em auto;
-  padding: 0 0.5em;
+  padding: 1em;
+  padding-top: 0em;
   width: 600px;
   background: #EEE;
   color: #1F1F1F; }
@@ -146,7 +154,10 @@ sup {
 .box-title {
   display: block;
   text-align: center;
-  font-weight: bold; }
+  font-weight: bold; 
+  font-size: 120%;
+  margin: 0.5em;
+}
 
 .comment {
   display: block;
@@ -201,20 +212,6 @@ a {
   a:hover {
     color: #005b91; }
 
-.code > pre {
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  background-color: #222;
-  font-family: 'Courier New', 'Terminal', monospace;
-  color: #E6E0DB;
-  padding: 20px;
-  overflow: auto hidden;
-  margin: 20px 0 20px 0; }
-
-code, .CodeRay {
-  font-size: 0.8em; }
-
 span.line-numbers {
   margin: 0;
   padding: 3px; }
@@ -251,7 +248,7 @@ td p, td ul, td ol {
 
 /* FONTS */
 body {
-  font-family: "Gentium Book Basic", "Book Antiqua", "Times New Roman", "Serif"; }
+  font-family: 'Crimson Text', 'Palatino', 'Bookman', 'Georgia', 'Times'; }
 
 code, pre {
   font-family: "Droid Sans Mono", "Consolas", "Monaco", "Courier", "Monospace"; }

data/styles/pagination.css

@@ -93,6 +93,36 @@ ol.toc {
 .toc ol ol ol ol li[class~=appendix]::before {
   content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   "; }
 
+h2, section h1 {
+  padding-top: 2em;
+  string-set: chapter-title content();
+  page-break-before: always; }
+
+.halftitlepage h2, .titlepage h2 {
+  page-break-before: avoid; }
+
+.bodymatter .chapter h2, .bodymatter .chapter h1 {
+  counter-increment: h2;
+  counter-reset: h3; }
+
+.backmatter h2, .backmatter h1 {
+  counter-increment: a2;
+  counter-reset: h3; }
+
+.bodymatter h3, .backmatter h3, .bodymatter section h1, .backmatter section h1 {
+  counter-increment: h3;
+  counter-reset: h4; }
+
+.bodymatter h4, .backmatter h4, .bodymatter section section h1, .backmatter section section h1 {
+  counter-increment: h4;
+  counter-reset: h5; }
+
+.bodymatter h5, .backmatter h5, .bodymatter section section section h1, .backmatter section section section h1 {
+  counter-increment: h5; }
+
+h1, h2, h3, h4, h5 {
+  page-break-after: avoid; }
+
 div.frontmatter {
   page: frontmatter; }
 div.backmatter {
@@ -129,36 +159,6 @@ div.backmatter {
 .backmatter h5::before, .bodymatter section section section section h2:before {
   content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) "   "; }
 
-h2, section h1 {
-  padding-top: 2em;
-  string-set: chapter-title content();
-  page-break-before: always; }
-
-.halftitlepage h2, .titlepage h2 {
-  page-break-before: avoid; }
-
-.bodymatter h2, .bodymatter h1 {
-  counter-increment: h2;
-  counter-reset: h3; }
-
-.backmatter h2, .backmatter h1 {
-  counter-increment: a2;
-  counter-reset: h3; }
-
-.bodymatter h3, .backmatter h3, .bodymatter section h1, .backmatter section h1 {
-  counter-increment: h3;
-  counter-reset: h4; }
-
-.bodymatter h4, .backmatter h4, .bodymatter section section h1, .backmatter section section h1 {
-  counter-increment: h4;
-  counter-reset: h5; }
-
-.bodymatter h5, .backmatter h5, .bodymatter section section section h1, .backmatter section section section h1 {
-  counter-increment: h5; }
-
-h1, h2, h3, h4, h5 {
-  page-break-after: avoid; }
-
 .box, .note, .important, .tip, .caution, .code {
   page-break-inside: avoid; }
 

data/tasks/generate.rake

@@ -18,7 +18,7 @@ namespace :generate do
 	task :styles => [:document] do
 		if Glyph['document.styles'].in?(['link', 'import']) && !Glyph.lite? then
 			info "Copying stylesheets..."
-			output = (Glyph['document.output'] == 'pdf') ? 'html' : Glyph['document.output']
+			output = complex_output?  ? 'tmp' : Glyph['document.output']
 			out_dir = Glyph::PROJECT/"output/#{output}/styles"
 			Glyph.document.styles.each do |f|
 				styles_dir = f.parent.to_s.include?(Glyph::HOME/'styles') ? Glyph::HOME/'styles' : Glyph::PROJECT/'styles'
@@ -27,7 +27,7 @@ namespace :generate do
 				dir.mkpath
 				case
 				when f.extname == ".css" then
-					file_copy f, dir/f.basename 
+					file_copy f, dir/f.basename
 				when f.extname == ".sass" then
 					style = Sass::Engine.new(file_load(f.to_s)).render
 					out_file = dir/f.basename.to_s.gsub(/\.sass$/, '.css')
@@ -62,11 +62,11 @@ namespace :generate do
 		info "Generating HTML file..."
 		if Glyph.lite? then
 			out = Pathname.new Glyph['document.output_dir']
-			file = (Glyph['document.output'] == 'pdf') ? Glyph['document.filename']+".html" : Glyph['document.output_file']
+			file = complex_output? ? Glyph['document.filename']+".html" : Glyph['document.output_file']
 		else
-			out = (Glyph['document.output'] == 'pdf') ? 'html' : Glyph['document.output']
+			out = complex_output? ? 'tmp' : Glyph['document.output']
 			out = Glyph::PROJECT/"output/#{out}"
-			extension = (Glyph['document.output'] == 'pdf') ? Glyph["output.html.extension"] : Glyph["output.#{Glyph['document.output']}.extension"]
+			extension = complex_output? ? Glyph["output.html.extension"] : Glyph["output.#{Glyph['document.output']}.extension"]
 			file = "#{Glyph['document.filename']}#{extension}"
 		end
 		out.mkpath
@@ -77,6 +77,41 @@ namespace :generate do
 	desc "Create a standalone HTML 5 file"
 	task :html5 => [:html] do; end
 
+	task :calibre => [:html] do
+		out = Glyph['document.output']
+		output_cfg = "output.#{out}"
+		# TODO: support other e-book renderers
+		unless Glyph["#{output_cfg}.generator"] == "calibre" then
+			error "Glyph cannot generate e-book. At present, output.#{out}.generator can only be set to 'calibre'" 
+		end
+	  Glyph.info "Generating #{Glyph['document.output'].upcase} e-book..."
+		options = Glyph[output_cfg][:calibre].dup
+		options[:isbn] = Glyph['document.isbn'] unless Glyph["document.isbn"].blank?
+		options[:cover] = "#{Glyph::PROJECT}/images/#{Glyph['document.cover']}" unless Glyph["document.cover"].blank?
+		options[:title] = Glyph["document.title"]
+		options[:authors] = Glyph["document.author"]
+    html_file = "#{Glyph::PROJECT}/output/tmp/#{Glyph['document.filename']}.html"
+    out_dir = "#{Glyph::PROJECT}/output/#{out}"
+		out_file = "#{Glyph['document.filename']}.#{out}" 
+		out_path = Pathname.new "#{out_dir}/#{out_file}"
+    Pathname.new(out_dir).mkpath
+    calibre_cmd = "ebook-convert #{html_file} #{out_path} #{options.to_options}"
+		run_external_command calibre_cmd
+		# Remove stylesheets and images (copied by default to output directory)
+		(Pathname.new(out_dir)/"images").rmtree rescue nil
+		(Pathname.new(out_dir)/"styles").rmtree rescue nil
+		if out_path.exist? then
+			info "'#{out_file}' generated successfully."
+		else
+			error "An error occurred while generating #{out_file}"
+		end
+	end
+
+	[:mobi, :epub].each do |out|
+		desc "Create an e-book file in #{out} format"
+		task out => [:calibre] do; end
+	end
+
 	desc "Create multiple HTML files"
 	task :web => [:images, :styles] do
 		info "Generating HTML files..."
@@ -90,13 +125,13 @@ namespace :generate do
 		out.mkpath
 		index_layout = Glyph["output.#{Glyph['document.output']}.layouts.index"] || :index
 		# Generate index topic
-		context = {} 
+		context = {}
 		context[:document] = Glyph::Document.new(Glyph::DocumentNode.new).inherit_from(Glyph.document, :topics => false)
-		context[:source] = {:name => "layout:#{index_layout}", :file => "layouts/#{index_layout}.glyph"}
+		context[:source] = {:name => "layout/#{index_layout}", :file => "layouts/#{index_layout}.glyph"}
 		# Do not display errors (already displayed when document is finalized).
 		q = Glyph['system.quiet']
 		Glyph['system.quiet'] = true
-		index_topic = Glyph::Interpreter.new("layout:#{index_layout}[]", context).document.output
+		index_topic = Glyph::Interpreter.new("layout/#{index_layout}[]", context).document.output
 		Glyph['system.quiet'] = q
 		file_write out/"index.html", index_topic
 		# Generate all topics
@@ -114,8 +149,8 @@ namespace :generate do
 	desc "Create multiple HTML 5 files"
 	task :web5 => [:web] do; end
 
-	desc "Create a pdf file"
-	task :pdf => :html do
+	desc "Create a pdf file (do not call directly)"
+	task :pdf do
 		info "Generating PDF file..."
 		if Glyph.lite? then
 			out = Pathname.new Glyph['document.output_dir']
@@ -123,18 +158,13 @@ namespace :generate do
 			file = Glyph['document.output_file']
 		else
 			out = Glyph::PROJECT/"output/pdf"
-			src = Glyph::PROJECT/"output/html/#{Glyph['document.filename']}.html"
+			src = Glyph::PROJECT/"output/tmp/#{Glyph['document.filename']}.html"
 			file = "#{Glyph['document.filename']}.pdf"
 		end
 		out.mkpath
 		generate_pdf = lambda do |path, cmd|
-			ENV['PATH'] += path if RUBY_PLATFORM.match /mswin/ 
-			IO.popen(cmd+" 2>&1") do |pipe|
-				pipe.sync = true
-				while str = pipe.gets do
-					puts str
-				end
-			end	
+			ENV['PATH'] += path if RUBY_PLATFORM.match /mswin/
+			run_external_command cmd
 			if (out/file).exist? then
 				info "'#{file}' generated successfully."
 			else
@@ -152,4 +182,10 @@ namespace :generate do
 		end
 	end
 
+	desc "Create a pdf file through html"
+	task :pdf_through_html => [:html, :pdf] do; end
+
+	desc "Create a pdf file through html5"
+	task :pdf_through_html5 => [:html5, :pdf] do; end
+
 end