glyph 0.5.1 → 0.5.2

data/macros/block.rb

@@ -92,7 +92,7 @@ macro :navigation do
 	# Get the previous topic
 	previous_topic = @node[:document].topics.last
 	if previous_topic then
-		@data[:previous] = render :link, :target => "#{base_url}#{previous_topic[:src].gsub(/\..+$/, '.html')}", :title => previous_topic[:title]
+		@data[:previous] = render :link, :target => "#{base_url}#{previous_topic[:src].gsub(/\..+$/, '.html')}", :title => "← "+previous_topic[:title]
 	else
 		@data[:previous] = ""
 	end
@@ -100,7 +100,7 @@ macro :navigation do
 	@data[:next] = placeholder do |document|
 		current_topic = document.topics.select{|t| t[:id] == topic_id}[0] rescue nil
 		next_topic = document.topics[document.topics.index(current_topic)+1] rescue nil
-		render :link, :title => next_topic[:title], :target => "#{base_url}#{next_topic[:src].gsub(/\..+$/, '.html')}" if next_topic
+		render :link, :title => next_topic[:title]+" →", :target => "#{base_url}#{next_topic[:src].gsub(/\..+$/, '.html')}" if next_topic
 	end
 	render
 end

data/macros/reps/html.rb

@@ -171,9 +171,10 @@ rep :toc_sublist do |data|
 end
 
 rep :section do |data|
-	css_class = data[:name].to_s.match(/[a-z0-9_-]/i) ? data[:name] : "section"
-	title = data[:title] ? %{<h#{data[:level]} id="#{data[:id]}">#{data[:title]}</h#{data[:level]}>\n} : ""
-	%{<div class="#{css_class}">
+	sec_class = data[:name].to_s.match(/[a-z0-9_-]/i) ? data[:name] : "section"
+  hd_class = data[:toc] ? "toc" : "notoc"
+	title = data[:title] ? %{<h#{data[:level]} id="#{data[:id]}" class="#{hd_class}">#{data[:title]}</h#{data[:level]}>\n} : ""
+	%{<div class="#{sec_class}">
 #{title}#{data[:content]}
 
 </div>}	

data/macros/reps/html5.rb

@@ -91,9 +91,10 @@ rep :toc do |data|
 end
 
 rep :section do |data|
-	css_class = data[:name].to_s.match(/[a-z0-9_-]/i) ? data[:name] : "section"
-	title = data[:title] ? %{<header><h1 id="#{data[:id]}">#{data[:title]}</h1></header>\n} : ""
-	%{<section class="#{css_class}">
+	sec_class = data[:name].to_s.match(/[a-z0-9_-]/i) ? data[:name] : "section"
+  hd_class = data[:toc] ? "toc" : "notoc"
+	title = data[:title] ? %{<header><h1 id="#{data[:id]}" class="#{hd_class}">#{data[:title]}</h1></header>\n} : ""
+	%{<section class="#{sec_class}">
 #{title}#{data[:content]}
 
 </section>}	

data/macros/structure.rb

@@ -27,6 +27,7 @@ macro :section do
 			:definition => @source_file,
 			:file => (attr(:src) || @source_file)
 		@node[:header] = bmk
+    @data[:toc] = !attr(:notoc)
 		@data[:title] = attr :title
 		@data[:level] = level
 		@data[:id] = bmk.code

data/spec/config.yml

@@ -1,7 +1,7 @@
---- 
+---
 :a: 1
-:b: 
+:b:
   :b1: 1111
   :b2: 2222
-  :b3: 
+  :b3:
     :b12: 2222

data/spec/lib/commands_spec.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
-require 'glyph/commands'
 
 describe "glyph" do
 
@@ -14,11 +14,6 @@ describe "glyph" do
 		reset_quiet
 		delete_project
 	end
-  
-  it "[-v] should pront the program name and version and quit" do
-    run_command(["-v"]).should == "Glyph v#{Glyph::VERSION}\n\n"
-    run_command(["-v", "compile"]).should == "Glyph v#{Glyph::VERSION}\n\n"
-  end
 
 	it "[init] should create a project in the current directory" do
 		delete_project
@@ -35,7 +30,7 @@ describe "glyph" do
 
 	it "[config] should write configuration settings" do
 		create_project
-		run_command_successfully(["config", "test_setting", true]).should == true
+		run_command_successfully(["config", "test_setting", "true"]).should == true
 		Glyph::CONFIG.get(:test_setting).should == true
 		Glyph::PROJECT_CONFIG.read
 		Glyph::PROJECT_CONFIG.get('test_setting').should == true
@@ -54,7 +49,7 @@ describe "glyph" do
 	it "[config] should not overwrite system settings" do
 		create_project
 		Glyph['system.test_setting'] = false
-		run_command(["config", "system.test_setting", true]).match(/warning.+\(system use only\)/m).should_not == nil
+		run_command(["config", "system.test_setting", "true"]).match(/warning.+\(system use only\)/m).should_not == nil
 		Glyph['system.test_setting'].should == false
 	end
 
@@ -147,27 +142,23 @@ describe "glyph" do
 		file_copy "#{Glyph::PROJECT}/../files/ligature.jpg", "#{Glyph::PROJECT}/ligature.jpg"
 		run_command_successfully(["compile", "article.glyph"]).should == true
 		Pathname.new('article.html').exist?.should == true
-		file_load('article.html').gsub(/\t|\n/, '').should == %{
+		compact_html(file_load('article.html')).should == compact_html(%{
+      <?xml version="1.0"?>
 			<div class="section">
-				改善 Test -- Test Snippet
+			  &#x6539;&#x5584; Test -- Test Snippet
 			</div>
-		}.gsub(/\t|\n/, '')
+		})
 		(Glyph::PROJECT/'article.html').unlink
 		Glyph['document.output'] = 'pdf'
 		src = Glyph::PROJECT/'article.html'
 		out = Glyph::PROJECT/'article.pdf'
-		generate_pdf = lambda do |gen|
-			Glyph.enable 'generate:html'
-			Glyph.enable 'generate:pdf'
-			Glyph.enable 'generate:pdf_through_html'
-			Glyph['output.pdf.generator'] = gen
-			run_command_successfully(["compile", "article.glyph"]).should == true
-			src.exist?.should == true
-			out.exist?.should == true
-			out.unlink
-		end
-		generate_pdf.call 'prince'
-		generate_pdf.call 'wkhtmltopdf'
+    Glyph.enable 'generate:html'
+    Glyph.enable 'generate:pdf'
+    Glyph.enable 'generate:pdf_through_html'
+    run_command_successfully(["compile", "article.glyph"]).should == true
+    src.exist?.should == true
+    out.exist?.should == true
+    out.unlink
 		Glyph.lite_mode = false
 	end	
 
@@ -189,11 +180,7 @@ describe "glyph" do
 		err = "Document cannot be finalized due to previous errors"
 		res = run_command(["compile"])
 		out = file_load Glyph::PROJECT/'output/html/test_project.html'
-		out.should == %{<div class="section">
-<h2 id="h_1">Test</h2>
-
-
-</div>}
+		compact_html(out).should == %{<?xml version="1.0"?><div class="section"><h2 id="h_1" class="toc">Test</h2></div>}
 		res.match("error: #{err}").should == nil
 	end
 

data/spec/macros/core_spec.rb

@@ -84,10 +84,10 @@ describe "Macro:" do
 		interpret text
 		@p.document.output.gsub(/\n|\t/, '').should == %{
 			<div class="section">
-			<h2 id="h_1">Container section</h2>
+			<h2 id="h_1" class="toc">Container section</h2>
 			This is a test.
 				<div class="section">
-				<h3 id="h_2">Test Section</h3>	
+				<h3 id="h_2" class="toc">Test Section</h3>	
 				<p>&#8230;</p>
 				</div>
 			</div>
@@ -97,10 +97,10 @@ describe "Macro:" do
 	it "include should work in Lite mode" do
 		Glyph.lite_mode = true
 		result = %{<div class="section">
-<h2 id="h_1">Container section</h2>
+<h2 id="h_1" class="toc">Container section</h2>
 This is a test.
 	<div class="section">
-	<h3 id="h_2">Test Section</h3>
+	<h3 id="h_2" class="toc">Test Section</h3>
 		<p>&#8230;</p>
 	</div>
 

data/spec/macros/filters_spec.rb

@@ -55,10 +55,10 @@ interpret text
 		code = %{def test_method(a, b)
 				puts a+b
 			end}
-			cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre><span class=\"line-numbers\"><a href=\"#n1\" name=\"n1\">1</a></span><span class=\"keyword\">def</span> <span class=\"function\">test_method</span>(a, b) <span class=\"line-numbers\"><a href=\"#n2\" name=\"n2\">2</a></span> puts a+b <span class=\"line-numbers\"><a href=\"#n3\" name=\"n3\">3</a></span> <span class=\"keyword\">end</span> </pre></div> </div>}
+			cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre><span class=\"line-numbers\"><a href=\"#n1\" name=\"n1\">1</a></span><span class=\"keyword\">def</span> <span class=\"function\">test_method</span>(a, b) <span class=\"line-numbers\"><a href=\"#n2\" name=\"n2\">2</a></span> puts a+b <span class=\"line-numbers\"><a href=\"#n3\" name=\"n3\">3</a></span> <span class=\"keyword\">end</span></pre></div> </div>}
 			uv_result = %{<pre class=\"iplastic\"><span class=\"Keyword\">def</span> 
 			<span class=\"FunctionName\">test_method</span>(<span class=\"Arguments\">a<span class=\"Arguments\">,</span> b</span>) 
-			puts a<span class=\"Keyword\">+</span>b <span class=\"Keyword\">end</span> </pre>}
+			puts a<span class=\"Keyword\">+</span>b <span class=\"Keyword\">end</span></pre>}
 			Glyph['filters.ultraviolet.theme'] = 'iplastic'
 			check = lambda do |hl, result|
 				Glyph["filters.highlighter"] = hl.to_sym
@@ -74,7 +74,7 @@ interpret text
 	it "textile_section, markdown_section" do
 		output_for("§txt[*test*]").should == "<div class=\"section\">\n<p><strong>test</strong></p>\n\n</div>"
 		output_for("§md[*test*]").should == "<div class=\"section\">\n<p><em>test</em></p>\n\n</div>"
-		output_for("textile_section[@title[test]...]").should == "<div class=\"section\">\n<h2 id=\"h_1\">test</h2>\n<p>&#8230;</p>\n\n</div>"
+		output_for("textile_section[@title[test]...]").should == "<div class=\"section\">\n<h2 id=\"h_1\" class=\"toc\">test</h2>\n<p>&#8230;</p>\n\n</div>"
 	end
 
 

data/spec/macros/html5_spec.rb

@@ -21,11 +21,11 @@ describe "Macro:" do
 		interpret text
 		doc = @p.document
 		doc.output.gsub(/\n|\t/, '').should == %{<section class="chapter">
-					<header><h1 id="h_1">Chapter X</h1></header>... 
+					<header><h1 id="h_1" class="toc">Chapter X</h1></header>... 
 					<section class="section">
-					<header><h1 id="sec-y">Section Y</h1></header>... 
+					<header><h1 id="sec-y" class="toc">Section Y</h1></header>... 
 						<section class="section">
-						<header><h1 id="h_3">Another section</h1></header>...
+						<header><h1 id="h_3" class="toc">Another section</h1></header>...
 						</section>
 					</section>
 				</section>

data/spec/macros/macros_spec.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 
 describe "Macro:" do
@@ -27,11 +28,11 @@ describe "Macro:" do
 		interpret text
 		doc = @p.document
 		doc.output.gsub(/\n|\t/, '').should == %{<div class="chapter">
-					<h2 id="h_1">Chapter X</h2>... 
+					<h2 id="h_1" class="toc">Chapter X</h2>... 
 					<div class="section">
-					<h3 id="sec-y">Section Y</h3>... 
+					<h3 id="sec-y" class="toc">Section Y</h3>... 
 						<div class="section">
-						<h4 id="h_3">Another section</h4>...
+						<h4 id="h_3" class="toc">Another section</h4>...
 						</div>
 					</div>
 				</div>
@@ -188,4 +189,28 @@ describe "Macro:" do
 		Glyph['document.draft'] = false
 	end
 
+  it "Aliased section titles should be at the same level of non-aliased section titles" do
+    normal = %{
+      section[
+        @title[Title2]
+        ...
+      ]
+    }
+    aliased = %{
+      §[
+        @title[Title2]
+        ...
+      ]
+    }
+    container = lambda do |s|
+      %{
+      section[
+        @title[Title]
+        #{s}
+      ]
+      }
+    end
+    output_for(container.call aliased).should == output_for(container.call normal)
+  end
+
 end	

data/spec/macros/textile_spec.rb

@@ -44,7 +44,7 @@ Testing:
 ]]}
 		result =
 %{<div class="section">
-<h2 id="h_1">Test</h2>
+<h2 id="h_1" class="toc">Test</h2>
 #@html
 </div>}
 		filter(text1).should == result
@@ -108,7 +108,7 @@ Testing:
 </div>}
 		result = 
 %{<div class="section">
-<h2 id="h_1">Test</h2>
+<h2 id="h_1" class="toc">Test</h2>
 #@html
 <div class="code">
 <pre>

data/spec/macros/web5_spec.rb

@@ -24,9 +24,9 @@ describe "Macro:" do
 
 	it "navigation" do
 		Glyph.run! 'generate:web5'
-		web1 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/web1.html')
-		web2 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/b/web2.html')
-		web1.match(%{<nav> | <a href="/index.html">Contents</a> | <a href="/a/b/web2.html">&rarr; Topic #2</a></nav>}).blank?.should == false
-		web2.match(%{<nav><a href="/a/web1.html">Topic #1</a> | <a href="/index.html">Contents</a> | </nav>}).blank?.should == false
+		web1 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/web1.html').gsub(/\n|\t|  /, '')
+		web2 = Glyph.file_load(Glyph::PROJECT/'output/web5/a/b/web2.html').gsub(/\n|\t|  /, '') 
+		web1.should match(%{<nav>|<a href="/index.html">Contents</a>|<a href="/a/b/web2.html">&rarr; Topic #2</a></nav>})
+		web2.should match(%{<nav><a href="/a/web1.html">Topic #1</a>|<a href="/index.html">Contents</a>|</nav>})
 	end
 end	

data/spec/macros/web_spec.rb

@@ -31,8 +31,8 @@ describe "Macro:" do
 
 	it "navigation" do
 		Glyph.run! 'generate:web'
-		web1 = Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
-		web2 = Glyph.file_load(Glyph::PROJECT/'output/web/a/b/web2.html')
+		web1 = compact_html Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
+		web2 = compact_html Glyph.file_load(Glyph::PROJECT/'output/web/a/b/web2.html')
 		web1.match(%{<div class="navigation"> | <a href="/index.html">Contents</a> | <a href="/a/b/web2.html">Topic #2</a></div>}).blank?.should == false
 		web2.match(%{<div class="navigation"><a href="/a/web1.html">Topic #1</a> | <a href="/index.html">Contents</a> | </div>}).blank?.should == false
 	end
@@ -44,13 +44,13 @@ describe "Macro:" do
 		index.match(%{href="/a/web1.html#h_3"}).blank?.should == false
 		index.match(%{href="/a/b/web2.html#h_7"}).blank?.should == false
 		web1 = Glyph.file_load(Glyph::PROJECT/'output/web/a/web1.html')
-    web1.should match(/<h2 id="t_0">Topic #1<\/h2>/) #  Headers are reset in each topic
+    web1.should match(/<h2 id="t_0" class="toc">Topic #1<\/h2>/) #  Headers are reset in each topic
 		delete_project
 		reset_quiet
 		create_web_project
 		Glyph['document.output'] = 'html'
 		Glyph.run! 'generate:html'
-		index = Glyph.file_load(Glyph::PROJECT/'output/html/test_project.html')
+		index = compact_html Glyph.file_load(Glyph::PROJECT/'output/html/test_project.html')
     index.should match(%{<li class="section"><a href="#h_3">Topic #1</a></li><li><ol><li class="section"><a href="#h_4">Test #1a</a></li>})
 		index.match(%{href="a/web1.html#h_3"}).blank?.should == true
 		index.match(%{href="a/b/web2.html#h_7"}).blank?.should == true

data/spec/spec_helper.rb

@@ -13,6 +13,8 @@ rescue
 end
 
 require "glyph"
+require "glyph/commands"
+
 
 Glyph['system.quiet'] = true
 
@@ -71,7 +73,7 @@ end
 def run_command(cmd, return_code=false)
 	result = 0
 	out = stdout_for do
-		result = GLI.run cmd
+		result = TOPLEVEL_BINDING.eval('self').run cmd
 	end
 	return_code ? result : out
 end
@@ -166,3 +168,12 @@ def macro_node(name, options={})
 		:escape => false
 	}.merge options)
 end
+
+
+def compact_html(html)
+  html.tap do |h|
+    h.gsub! /\n|\t/, ''
+    h.gsub! /\s{2,}/, ''
+    h.gsub! /\>\s*\</, '><'
+  end
+end

data/spec/tasks/generate_spec.rb

@@ -104,7 +104,7 @@ describe "generate" do
 		# check that index.html is created
 		index = (Glyph::PROJECT/'output/web/index.html')
 		index.exist?.should == true
-		file_load(index).should match(/<li class="section"><a href="\/test\/a\/b\/web2.html#h_7">Topic #2<\/a>/)
+		compact_html(file_load(index)).should match(/<li class="section"><a href="\/test\/a\/b\/web2.html#h_7">Topic #2<\/a>/)
 	  #	check that topics are copied in the proper directories
 		web1 = (Glyph::PROJECT/'output/web/a/web1.html')
 		web1.exist?.should == true

data/styles/coderay.css

@@ -3,12 +3,13 @@
  */
 .CodeRay {
   background-color: #FFF;
-  border: 1px solid #CCC;
+  border: 1px solid #ECECEC;
   line-height: 1.3em;
   font-size: 12px;
-  font-family: Monospace;
+  font-family: 'Inconsolata', Monospace;
   color: #000;
-  padding: 1em 0px 1em 1em; }
+  padding: 10px;
+  margin: 1em 0; }
 
 .CodeRay pre, .CodeRay code {
   padding: 0;
@@ -32,11 +33,10 @@ table.CodeRay td {
   vertical-align: top; }
 
 .CodeRay .line-numbers, .CodeRay .no {
-  border: 1px solid #ECECEC;
-  margin: 0 inherit;
+  margin: 0 2px 0 0;
   background-color: #ECECEC;
   color: #AAA;
-  padding: 0px 7px;
+  width: 20px;
   text-align: right; }
 
 .CodeRay .line-numbers tt {
@@ -90,7 +90,9 @@ ol.CodeRay li {
 
 .CodeRay .comment {
   color: #998;
-  font-style: italic; }
+  font-style: italic;
+  border: 0;
+  background: transparent; }
 
 .CodeRay .char {
   color: #04D; }

data/styles/coderay.scss

@@ -4,12 +4,13 @@
  */
 .CodeRay {
   background-color: #FFF;
-  border: 1px solid #CCC;
+  border: 1px solid #ECECEC;
   line-height: 1.3em;
   font-size: 12px;
-  font-family: Monospace;
+  font-family: 'Inconsolata', Monospace;
   color: #000;
-  padding: 1em 0px 1em 1em;
+  padding: 10px;
+  margin: 1em 0;
 }
 .CodeRay pre, .CodeRay code {
   padding: 0;
@@ -29,11 +30,10 @@ table.CodeRay td {
 }
 
 .CodeRay .line-numbers, .CodeRay .no {
-  border: 1px solid #ECECEC;
-  margin: 0 inherit;
+  margin: 0 2px 0 0;
   background-color: #ECECEC;
   color: #AAA;
-  padding: 0px 7px;
+  width: 20px;
   text-align: right;
 }
 .CodeRay .line-numbers tt { font-weight: bold }
@@ -55,7 +55,7 @@ ol.CodeRay li { white-space: pre }
 .CodeRay .attribute-value { color:#700 }
 .CodeRay .attribute-value-fat { color:#C00 }
 .CodeRay .binary { color:#509; font-weight:bold }
-.CodeRay .comment  { color:#998; font-style: italic;}
+.CodeRay .comment  { color:#998; font-style: italic; border: 0; background: transparent;}
 
 .CodeRay .char { color:#04D }
 .CodeRay .ch .content { color:#04D }