glyph 0.3.0 → 0.4.0

data/spec/tasks/project_spec.rb

@@ -11,11 +11,11 @@ describe "project:create" do
 		delete_project_dir
 	end
 
-	it "[create] should not create a new project if no valid directory is supplied" do
+	it "should not create a new project if no valid directory is supplied" do
 		lambda { Glyph.run! 'project:create', 'test_dir' }.should raise_error
 	end
 
-	it "[create] should create a new project if an existing empty directory is supplied" do
+	it "should create a new project if an existing empty directory is supplied" do
 		lambda { Glyph.run! 'project:create', Glyph::PROJECT }.should_not raise_error
 		(Glyph::PROJECT/'lib').exist?.should == true
 		(Glyph::PROJECT/'document.glyph').exist?.should == true
@@ -26,7 +26,25 @@ describe "project:create" do
 		(Glyph::PROJECT/'output').exist?.should == true
 	end
 
-	it "[add] should add new files to project" do
+	it "should create a project in a directory containing just Gemfiles or hidden files" do
+		file_write Glyph::PROJECT/".test", "..." 
+		file_write Glyph::PROJECT/"Gemfile", "..." 
+		lambda { Glyph.run! 'project:create', Glyph::PROJECT }.should_not raise_error
+	end
+end
+
+describe "project:add" do
+
+	before do
+		create_project_dir
+	end
+
+	after do
+		delete_project_dir
+	end
+
+
+	it "should add new files to project" do
 		create_project
 		lambda { Glyph.run 'project:add', 'test.textile'}.should_not raise_error
 		(Glyph::PROJECT/'text/test.textile').exist?.should == true

data/styles/default.css

@@ -35,7 +35,7 @@ body {
 	margin: auto;
 	text-align: center;
 }
-.title, h1 {
+.titlepage h1, .halftitlepage h1 {
 	font-size: 2.5em;
 	font-weight: bold;
 	line-height: 1.5em;
@@ -174,22 +174,27 @@ body {
 	color: #000;
 	font-size: 1em;
 }
-h2 {
+h2, section section h1, h1.toc-header {
 	display: block;
 	font-size: 2em;
 	font-weight: bold;
 	margin: 3em 0 1em 0;
 }
-h3 {
+h3, section section section h1 {
 	font-size: 1.6em;
 	font-weight: bold;
 	margin: 3em 0 1em 0;
 }
-h4 {
+h4, section section section section h1 {
 	font-size: 1.3em;
 	font-weight: bold;
 	margin: 3em 0 1em 0;
 }
+h5, section section section section section h1 {
+	font-size: 1.2em;
+	font-weight: bold;
+	margin: 3em 0 1em 0;
+}
 em {
 	font-style: italic;
 }
@@ -213,6 +218,33 @@ span.line-numbers{
 	padding: 3px;
 }
 
+nav, .navigation {
+	display: block;
+	margin: 1em auto;
+	text-align: center;
+	border: 1px solid #E6E6E6;
+}
+
+nav.contents {
+	margin: auto;
+	text-align: left;
+	border: none;
+}
+
+nav a, .navigation a {
+	margin: 1em;
+}
+
+nav.contents a {
+	margin: 0;
+}
+
+mark {
+	font-weight:bolder;
+	font-style: italic;
+	background: none;
+}
+
 pre>code {
 	font-size: 1em;
 }
@@ -225,6 +257,10 @@ td>div.code, td>code {
 	padding: 0.2em;
 }
 
+.topic{
+	margin: 2em auto;
+}
+
 /* FONTS */
 
 body {

data/styles/pagination.css

@@ -44,6 +44,8 @@ ol.toc {
 	string-set: book-title content();
 }
 
+/* TOC Counters */
+
 .toc>li[class~=chapter] {
 	counter-increment: toc1;
 	counter-reset: toc2;
@@ -86,41 +88,56 @@ ol.toc {
 	margin: 1em 0;
 }
 
-.toc ol li[class~=bodymatter]::before {
+/* TOC Margins */
+
+.toc ol li[class]::before {
 	margin-left: 1em;
-	content: counter(toc1) "." counter(toc2) " ";
 }
-.toc ol li[class~=appendix]::before {
-	margin-left: 1em;
-	content: counter(appendix1, upper-latin) "." counter(toc2) " ";
+
+.toc ol ol li[class]::before {
+	margin-left: 2em;
 }
 
+.toc ol ol ol li[class]::before {
+	margin-left: 3em;
+}
+
+.toc ol ol ol ol li[class]::before {
+	margin-left: 4em;
+}
+
+/* TOC Numbers */
+
+.toc ol li[class~=frontmatter]::before {
+	content: "   ";
+}
+
+.toc ol li[class~=bodymatter]::before {
+	content: counter(toc1) "." counter(toc2) "   ";
+}
+.toc ol li[class~=appendix]::before {
+	content: counter(appendix1, upper-latin) "." counter(toc2) "   ";
+}
 
 .toc ol ol li[class~=bodymatter]::before {
-	margin-left: 1em;
-	content: counter(toc1) "." counter(toc2) "." counter(toc3) " ";
+	content: counter(toc1) "." counter(toc2) "." counter(toc3) "   ";
 }
 .toc ol ol li[class~=appendix]::before {
-	margin-left: 1em;
-	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) " ";
+	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "   ";
 }
 
 .toc ol ol ol li[class~=bodymatter]::before {
-	margin-left: 1em;
-	content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) " ";
+	content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) "   ";
 }
 .toc ol ol ol li[class~=appendix]::before {
-	margin-left: 1em;
-	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) " ";
+	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "   ";
 }
 
 .toc ol ol ol ol li[class~=bodymatter]::before {
-	margin-left: 1em;
-	content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) " ";
+	content: counter(toc1) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   ";
 }
 .toc ol ol ol ol li[class~=appendix]::before {
-	margin-left: 1em;
-	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) " ";
+	content: counter(appendix1, upper-latin) "." counter(toc2) "." counter(toc3) "." counter(toc4) "." counter(toc5) "   ";
 }
 
 div.frontmatter{
@@ -131,40 +148,41 @@ div.backmatter{
 	page: backmatter;
 }
 
-.bodymatter h2::before {
-	content: "Chapter " counter(h2, upper-roman) " – ";
+.bodymatter h2::before, .bodymatter h1:before {
+	content: "Chapter " counter(h2, upper-roman) ":   ";
 	counter-reset: footnote;
 }
 
-.backmatter h2::before {
-	content: "Appendix " counter(a2, upper-latin) " – ";
+.backmatter h2::before, .bodymatter section h1:before {
+	content: "Appendix " counter(a2, upper-latin) ":   ";
 }
 
-.bodymatter h3::before {
-	content: counter(h2) "." counter(h3) " ";
+.bodymatter h3::before,.bodymatter section  h1:before {
+	content: counter(h2) "." counter(h3) "   ";
 }
 
-.backmatter h3::before {
-	content: counter(a2, upper-latin) "." counter(h3) " ";
+.backmatter h3::before, .bodymatter section section h1:before {
+	content: counter(a2, upper-latin) "." counter(h3) "   ";
 }
 
-.bodymatter h4::before {
-	content: counter(h2) "." counter(h3) "." counter(h4) " ";
+.bodymatter h4::before, .bodymatter section section h1:before {
+	content: counter(h2) "." counter(h3) "." counter(h4) "   ";
 }
 
-.backmatter h4::before {
-	content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) " ";
+.backmatter h4::before, .bodymatter section section section h2:before {
+	content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "   ";
 }
 
-.bodymatter h5::before {
-	content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) " ";
+.bodymatter h5::before, .bodymatter section section section section h2:before {
+	content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "   ";
 }
 
-.backmatter h5::before {
-	content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) " ";
+.backmatter h5::before, .bodymatter section section section section h2:before {
+	content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) "   ";
 }
 
-h2 { 
+h2, section h1 { 
+	padding-top: 2em;
 	string-set: chapter-title content();
 	page-break-before: always;
 }
@@ -173,32 +191,32 @@ h2 {
 	page-break-before: avoid;
 }
 
-.bodymatter h2{
+.bodymatter h2, .bodymatter h1{
 	counter-increment: h2;
 	counter-reset: h3;
 }
 
-.backmatter h2{
+.backmatter h2, .backmatter h1{
 	counter-increment: a2;
 	counter-reset: h3;
 }
 
-.bodymatter h3, .backmatter h3 {
+.bodymatter h3, .backmatter h3, .bodymatter section h1, .backmatter section h1 {
 	counter-increment: h3;
 	counter-reset: h4;
 }	
 
-.bodymatter h4, .backmatter h4 {
+.bodymatter h4, .backmatter h4, .bodymatter section section h1, .backmatter section section h1 {
 	counter-increment: h4;
 	counter-reset: h5;
 }	
 
-.bodymatter h5, .backmatter h5 {
+.bodymatter h5, .backmatter h5, .bodymatter section section section h1, .backmatter section section section h1 {
 	counter-increment: h5;
 }
 
-h2, h3, h4, h5 { page-break-after: avoid }
-table, .box, .note, .important, .tip, .caution, .code { page-break-inside: avoid }
+h1, h2, h3, h4, h5 { page-break-after: avoid }
+.box, .note, .important, .tip, .caution, .code { page-break-inside: avoid }
 
 /* Footnotes */
 

data/tasks/generate.rake

@@ -2,52 +2,121 @@
 
 namespace :generate do
 
-	desc "Process source"
+	include Glyph::Utils
+
+	desc "Copy image files"
+	task :images => [:document] do
+		unless Glyph.lite? then
+			info "Copying images..."
+			with_files_from('images') do |src, dest|
+				file_copy src, dest
+			end
+		end
+	end
+
+	desc "Copy style files"
+	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']
+			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'
+				subdir = f.parent.relative_path_from(styles_dir).to_s.gsub(/^\./, '')
+				dir = out_dir/subdir
+				dir.mkpath
+				case
+				when f.extname == ".css" then
+					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')
+					file_write out_file, style
+				else
+					raise RuntimeError, "Unsupported stylesheet: '#{f.basename}'"
+				end
+			end
+		end
+	end
+
+	desc "Process source files and create a Glyph document"
 	task :document => ["load:all"] do
 		if Glyph.lite? then
 			text = file_load Pathname.new(Glyph['document.source'])
 		else
 			text = file_load Glyph::PROJECT/Glyph['document.source']
 		end
-		interpreter = Glyph::Interpreter.new text, :source => {:name => "#{Glyph['document.source']}"}, :info => true
+		require 'net/http' if Glyph['options.url_validation']
+		name = Glyph['document.source']
+		interpreter = Glyph::Interpreter.new text, :source => {:name => name, :file => name, :topic => nil}, :info => true
 		interpreter.parse
-		Glyph.info "Processing..."
+		info "Processing..."
 		interpreter.process
-		Glyph.info "Post-processing..."
+		info "Post-processing..."
 		interpreter.postprocess
 		Glyph.document = interpreter.document
 	end
 
-	desc "Create a standalone html file"
-	task :html => :document do
-		Glyph.info "Generating HTML file..."
+	desc "Create a standalone HTML file"
+	task :html => [:images, :styles] 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']
 		else
-			out = Glyph::PROJECT/"output/html"
-			file = "#{Glyph['document.filename']}.html"
+			out = (Glyph['document.output'] == 'pdf') ? 'html' : Glyph['document.output']
+			out = Glyph::PROJECT/"output/#{out}"
+			extension = (Glyph['document.output'] == 'pdf') ? Glyph["output.html.extension"] : Glyph["output.#{Glyph['document.output']}.extension"]
+			file = "#{Glyph['document.filename']}#{extension}"
 		end
-		extension = '.html'
 		out.mkpath
 		file_write out/file, Glyph.document.output
-		Glyph.info "'#{file}' generated successfully."
-		unless Glyph.lite? then
-			images = Glyph::PROJECT/'output/html/images'
-			images.mkpath
-			(Glyph::PROJECT/'images').find do |i|
-				if i.file? then
-					dest = "#{Glyph::PROJECT/'output/html/images'}/#{i.relative_path_from(Glyph::PROJECT/'images')}"
-					Pathname.new(dest).parent.mkpath
-					file_copy i.to_s, dest
-				end
-			end
+		info "'#{file}' generated successfully."
+	end
+
+	desc "Create a standalone HTML 5 file"
+	task :html5 => [:html] do; end
+
+	desc "Create multiple HTML files"
+	task :web => [:images, :styles] do
+		info "Generating HTML files..."
+		if Glyph.lite? then
+			out = Pathname.new Glyph['document.output_dir']
+		else
+			out = Glyph::PROJECT/"output/#{Glyph['document.output']}"
+		end
+		raise RuntimeError, "You cannot have an 'images' directory under your 'text' directory." if (Glyph::PROJECT/"text/images").exist?
+		raise RuntimeError, "You cannot have a 'styles' directory under your 'text' directory." if (Glyph::PROJECT/"text/styles").exist?
+		out.mkpath
+		index_layout = Glyph["output.#{Glyph['document.output']}.layouts.index"] || :index
+		# Generate index topic
+		context = {} 
+		context[:document] = Glyph::Document.new(Glyph::DocumentNode.new).inherit_from(Glyph.document)
+		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
+		Glyph['system.quiet'] = q
+		file_write out/"index.html", index_topic
+		# Generate all topics
+		Glyph.document.topics.each do |topic|
+			extension = "#{Glyph["output.#{Glyph['document.output']}.extension"]}"
+			file = topic[:src].gsub(/\..+$/, extension)
+			file += extension unless file.match /#{Regexp.escape(extension)}$/
+			info "Generating topic '#{file}'"
+			(out/file).parent.mkpath
+			file_write out/file, topic[:contents]
 		end
+		info "Web output generated successfully."
 	end
 
+	desc "Create multiple HTML 5 files"
+	task :web5 => [:web] do; end
+
 	desc "Create a pdf file"
 	task :pdf => :html do
-		Glyph.info "Generating PDF file..."
+		info "Generating PDF file..."
 		if Glyph.lite? then
 			out = Pathname.new Glyph['document.output_dir']
 			src = out/"#{Glyph['document.filename']}.html"
@@ -58,18 +127,28 @@ namespace :generate do
 			file = "#{Glyph['document.filename']}.pdf"
 		end
 		out.mkpath
-		case Glyph['tools.pdf_generator']
-		when 'prince' then
-			ENV['PATH'] += ";#{ENV['ProgramFiles']}\\Prince\\Engine\\bin" if RUBY_PLATFORM.match /mswin/ 
-				res = system "prince #{src} -o #{out/"#{file}"}"
-			if res then
-				Glyph.info "'#{file}' generated successfully."
+		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	
+			if (out/file).exist? then
+				info "'#{file}' generated successfully."
 			else
-				Glyph.error "An error occurred while generating #{file}"
+				error "An error occurred while generating #{file}"
 			end
-			# TODO: support other PDF renderers
+		end
+		case Glyph['output.pdf.generator']
+		when 'prince' then
+			generate_pdf.call ";#{ENV['ProgramFiles']}\\Prince\\Engine\\bin", %{prince #{src} -o #{out/"#{file}"}}
+		when 'wkhtmltopdf' then
+			generate_pdf.call ";#{ENV['ProgramFiles']}\\wkhtmltopdf", %{wkhtmltopdf #{src} #{out/"#{file}"}}
 		else
-			Glyph.error "Glyph cannot generate PDF. Please specify a valid tools.pdf_generator setting."
+			# TODO: support other PDF renderers
+			error "Glyph cannot generate PDF. Please specify a valid output.pdf.generator setting."
 		end
 	end