glyph 0.4.0 → 0.4.1

data/book/text/text_editing/stylesheets.glyph

@@ -1,7 +1,7 @@
 	p[Currently, Glyph does not provide any native way to format text and pages. The reason is that there's absolutely no need for that: CSS does the job just fine. In particular, CSS3 offers specific attributes and elements that can be used specifically for paginated documents. That's no replacement for LaTeX by any means, but it is enough if you're not looking for advanced typographical features.]
 	p[You can embed CSS files using the %>[style], like this:]
 	p[code[= style[default.css] =]]
-	txt[In this case, the %>[style] looks for a @default.css@ file in the @/styles@ folder of your Glyph project _and_ among the default Glyph stylesheets, and embeds it within a @<style>@ tag. If you supply a file with a @.sass@ extension, it will interpret it as a Sass file and convert it to CSS automatically (if the _Haml_ gem is installed).]
+	txt[In this case, the %>[style] looks for a @default.css@ file in the @/styles@ folder of your Glyph project _and_ among the default Glyph stylesheets, and embeds it within a @<style>@ tag. If you supply a file with a @.sass@ or @.scss@ extension, it will interpret it as a Sass file and convert it to CSS automatically (if the _Haml_ gem is installed).]
 	tip[
 By default, stylesheets are embedded within text files. If necessary, you can choose to link them or import them by changing the values of the $>[document.styles].
 	]

data/config.yml

@@ -74,6 +74,8 @@
     :restrictions: []
   :coderay:
     # See options at http://coderay.rubychan.de/doc/classes/CodeRay/Encoders/HTML.html
+    :line_numbers: :inline
+    :tab_width: 2
     :css: :class 
   :ultraviolet:
     :line_numbers: true

data/glyph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glyph}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabio Cevasco"]
-  s.date = %q{2010-09-03}
+  s.date = %q{2010-09-23}
   s.default_executable = %q{glyph}
   s.description = %q{Glyph is a framework for structured document authoring.}
   s.email = %q{h3rald@h3rald.com}
@@ -152,6 +152,7 @@ Gem::Specification.new do |s|
      "spec/files/markdown.markdown",
      "spec/files/references.glyph",
      "spec/files/test.sass",
+     "spec/files/test.scss",
      "spec/files/web1.glyph",
      "spec/files/web2.glyph",
      "spec/files/web_doc.glyph",
@@ -181,8 +182,13 @@ Gem::Specification.new do |s|
      "spec/tasks/load_spec.rb",
      "spec/tasks/project_spec.rb",
      "styles/coderay.css",
+     "styles/coderay.scss",
      "styles/default.css",
+     "styles/default.scss",
+     "styles/definitions.scss",
+     "styles/generate",
      "styles/pagination.css",
+     "styles/pagination.scss",
      "styles/ultraviolet/active4d.css",
      "styles/ultraviolet/all_hallows_eve.css",
      "styles/ultraviolet/amy.css",
@@ -214,32 +220,32 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Glyph -- A Ruby-powered Document Authoring Framework}
   s.test_files = [
-    "spec/macros/core_spec.rb",
+    "spec/macros/web5_spec.rb",
      "spec/macros/web_spec.rb",
-     "spec/macros/html5_spec.rb",
-     "spec/macros/filters_spec.rb",
-     "spec/macros/web5_spec.rb",
+     "spec/macros/macros_spec.rb",
      "spec/macros/textile_spec.rb",
+     "spec/macros/filters_spec.rb",
      "spec/macros/xml_spec.rb",
-     "spec/macros/macros_spec.rb",
-     "spec/lib/interpreter_spec.rb",
-     "spec/lib/analyzer_spec.rb",
-     "spec/lib/commands_spec.rb",
-     "spec/lib/node_spec.rb",
-     "spec/lib/bookmark_spec.rb",
+     "spec/macros/core_spec.rb",
+     "spec/macros/html5_spec.rb",
+     "spec/files/custom_command.rb",
+     "spec/lib/parser_spec.rb",
      "spec/lib/macro_spec.rb",
-     "spec/lib/macro_validators_spec.rb",
      "spec/lib/config_spec.rb",
+     "spec/lib/reporter_spec.rb",
+     "spec/lib/analyzer_spec.rb",
+     "spec/lib/macro_validators_spec.rb",
+     "spec/lib/interpreter_spec.rb",
      "spec/lib/glyph_spec.rb",
-     "spec/lib/parser_spec.rb",
-     "spec/lib/syntax_node_spec.rb",
+     "spec/lib/bookmark_spec.rb",
      "spec/lib/document_spec.rb",
-     "spec/lib/reporter_spec.rb",
+     "spec/lib/syntax_node_spec.rb",
+     "spec/lib/node_spec.rb",
+     "spec/lib/commands_spec.rb",
+     "spec/spec_helper.rb",
      "spec/tasks/load_spec.rb",
-     "spec/tasks/generate_spec.rb",
      "spec/tasks/project_spec.rb",
-     "spec/files/custom_command.rb",
-     "spec/spec_helper.rb"
+     "spec/tasks/generate_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/glyph/document.rb

@@ -9,14 +9,7 @@ module Glyph
 	# as well as replacing placeholders.
 	class Document
 
-		ESCAPES = [
-			['\\]', ']'], 
-			['\\[', '['],
-			['\\=', '='],
-			['\\.', ''],
-			['\\\\', '\\'],
-			['\\|', '|']
-		]
+		ESCAPES = /\\([\\\]\[\|.=])/
 
 		attr_reader :bookmarks, :placeholders, :headers, :styles, :context, :errors, :todos, :topics, :links, :toc
 
@@ -49,15 +42,19 @@ module Glyph
 
 		# Copies bookmarks, headers, todos, styles and placeholders from another Glyph::Document
 		# @param [Glyph::Document] document a valid Glyph::Document
-		def inherit_from(document)
-			@bookmarks = document.bookmarks
-			@headers = document.headers
-			@todos = document.todos
-			@styles = document.styles
-			@topics = document.topics
-			@placeholders = document.placeholders
-			@toc = document.toc
-			@links = document.links
+		# @param [Hash] data specifies which data will be inherited (e.g. bookmarks, headers, ...).
+		# 	By default, all data is inherited.
+		# @example Inheriting everything except topics
+		# 	doc1.inherit_from doc2, :topics => false 
+		def inherit_from(document, data={})
+			@bookmarks = document.bookmarks unless data[:bookmarks] == false
+			@headers = document.headers unless data[:headers] == false
+			@todos = document.todos unless data[:todos] == false
+			@styles = document.styles unless data[:styles] == false
+			@topics = document.topics unless data[:topics] == false
+			@placeholders = document.placeholders unless data[:placeholders] == false
+			@toc = document.toc unless data[:toc] == false
+			@links = document.links unless data[:links] == true
 			self
 		end
 
@@ -139,17 +136,13 @@ module Glyph
 			return (@state = :finalized) if @context[:embedded]
 			raise RuntimeError, "Document cannot be finalized due to previous errors" unless @context[:document].errors.blank?
 			# Substitute placeholders
-			ESCAPES.each{|e| @output.gsub! e[0], e[1]}
 			@placeholders.each_pair do |key, value| 
 				begin
 					key_s = key.to_s
 					value_s = value.call(self).to_s
-					toc[:contents].gsub! key_s, value_s if toc[:contents].to_s.match key_s 
-					if Glyph.multiple_output_files? then
-						@topics.each do |t|
-							ESCAPES.each{|e| t[:contents].gsub! e[0], e[1]}
-							t[:contents].gsub! key_s, value_s
-						end
+					toc[:contents].gsub! key_s, value_s rescue nil
+					@topics.each do |t|
+						t[:contents].gsub! key_s, value_s
 					end
 					@output.gsub! key_s, value_s
 				rescue Glyph::MacroError => e
@@ -158,6 +151,12 @@ module Glyph
 					Glyph.warning e.message
 				end
 			end
+			# Substitute escape sequences
+			@output.gsub!(ESCAPES) { |match| ($1 == '.') ? '' : $1 }
+			toc[:contents].gsub!(ESCAPES) { |match| ($1 == '.') ? '' : $1 } rescue nil
+			@topics.each do |t|
+				t[:contents].gsub!(ESCAPES) { |match| ($1 == '.') ? '' : $1 }
+			end
 			@state = :finalized
 		end
 

data/lib/glyph/macro.rb

@@ -218,7 +218,6 @@ module Glyph
 				@node << subtree
 				result = interpreter.document.output
 			end
-			result.gsub(/\\*([\[\]])/){"\\#$1"}
 			result
 		end
 
@@ -252,7 +251,7 @@ module Glyph
 			block = Glyph::MACROS[@name]
 			macro_error "Undefined macro '#@name'}" unless block
 			res = instance_exec(@node, &block).to_s
-			res.gsub!(/\\*([\[\]\|])/){"\\#$1"} 
+			res.gsub!(/\\?([\[\]\|])/){"\\#$1"} 
 			res
 		end
 

data/macros/html/structure.rb

@@ -120,12 +120,12 @@ macro :style do
 	when 'embed' then
 		style = ""
 		case file.extname
-		when ".css"
+		when ".css" then
 			style = file_load file
-		when ".sass"
+		when ".sass", ".scss" then
 			begin
 				require 'sass'
-				style = Sass::Engine.new(file_load(file)).render
+				style = Sass::Engine.new(file_load(file), :syntax => file.extname.gsub(/^\./, '').to_sym).render
 			rescue LoadError
 				macro_error "Haml is not installed. Please run: gem install haml"
 			rescue Exception

data/macros/html5/block.rb

@@ -24,7 +24,7 @@ macro :figure do
 	caption = "figcaption[#{param(1)}]" rescue nil
 	figure_element_for image, alt, caption do |alt, dest_file, caption|
 		interpret %{=figure[
-img[#{alt}@src[#{Glyph['document.base']}#{dest_file}]#{@node.attrs.join}]
+img[#{alt}@src[#{Glyph["output.#{Glyph['document.output']}.base"]}#{dest_file}]#{@node.attrs.join}]
 					#{caption}
 ]}
 	end

data/spec/files/test.sass

@@ -1,2 +1,4 @@
+$test: 10px
 #main  
   background-color: #0000ff
+  margin: $test + 2px

data/spec/files/test.scss

@@ -0,0 +1,5 @@
+$test: 10px;
+#main {
+  background-color: blue;
+	margin: $test + 2px;
+}

data/spec/lib/macro_spec.rb

@@ -194,9 +194,9 @@ describe Glyph::Macro do
 		Glyph.macro :test_int do
 			interpret "- #{value} -"
 		end
-		text1 = %{em[test\\\\\.\\[...\\\\\.\\]]} # test\\\.\[\\\.\]
-		text2 = %{em[=test\\\\\\.[...\\\\\\.]=]}  # test\\\.[\\\.]
-		text3 = %{test_int[em[=test\\\\\.[...\\\\\.]=]]}
+		text1 = "em[test\\\\\\.\\[...\\\\\\.\\]]" # test\\\.\[\\\.\]
+		text2 = "em[=test\\\\\\.[...\\\\\\.]=]"  # test\\\.[\\\.]
+		text3 = "test_int[em[=test\\\\\\.[...\\\\\\.]=]]"
 		out = "<em>test\\[...\\]</em>"
 		output_for(text1).should == out
 		output_for(text2).should == out

data/spec/macros/filters_spec.rb

@@ -55,8 +55,9 @@ interpret text
 		code = %{def test_method(a, b)
 				puts a+b
 			end}
-			cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre><span class=\"r\">def</span> 
-			<span class=\"fu\">test_method</span>(a, b) puts a+b <span class=\"r\">end</span></pre></div> </div>}
+			cr_result = %{<div class=\"CodeRay\"> <div class=\"code\"><pre><span class=\"no\">1</span> <span class=\"r\">def</span> <span class=\"fu\">test_method</span>(a, b) 
+				<span class=\"no\">2</span> puts a+b 
+				<span class=\"no\">3</span> <span class=\"r\">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>}

data/spec/macros/html5_spec.rb

@@ -44,7 +44,7 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue; }</style>
+				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
 			</head>
 		</html>
 		}.gsub(/\n|\t/, '')

data/spec/macros/macros_spec.rb

@@ -40,8 +40,8 @@ describe "Macro:" do
 	end
 
 	it "document, head, style" do
-		interpret "document[head[style[test.sass]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == %{
+		file_copy Glyph::SPEC_DIR/'files/test.scss', Glyph::PROJECT/'styles/test.scss'
+		doc = %{
 		<?xml version="1.0" encoding="utf-8"?>
 		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 		<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
@@ -51,10 +51,14 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue; }</style>
+				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
 			</head>
 		</html>
-		}.gsub(/\n|\t/, '')
+		}
+		interpret "document[head[style[test.sass]]]"
+		@p.document.output.gsub(/\n|\t/, '').should == doc.gsub(/\n|\t/, '')
+		interpret "document[head[style[test.scss]]]"
+		@p.document.output.gsub(/\n|\t/, '').should == doc.gsub(/\n|\t/, '')
 	end	
 
 	it "style should link files by absolute or relative path in Lite mode" do
@@ -68,7 +72,7 @@ describe "Macro:" do
 				<meta name="copyright" content="#{Glyph["document.author"]}" />
 				<meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
 				<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-				<style type=\"text/css\">#main {  background-color: blue; }</style>
+				<style type=\"text/css\">#main {  background-color: blue;  margin: 12px; }</style>
 			</head>
 		</html>
 		}.gsub(/\n|\t/, '')
@@ -76,8 +80,6 @@ describe "Macro:" do
 		Dir.chdir Glyph::PROJECT
 		interpret "document[head[style[styles/test.sass]]]"
 		@p.document.output.gsub(/\n|\t/, '').should == result
-		interpret "document[head[style[#{Glyph::PROJECT}/styles/test.sass]]]"
-		@p.document.output.gsub(/\n|\t/, '').should == result
 	end
 
 	it "style should import and link stylesheets" do

data/styles/coderay.css

@@ -1,121 +1,49 @@
 .CodeRay {
-  background-color: #f8f8f8;
-  border: 1px solid silver;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  background-color: #222;
   font-family: 'Courier New', 'Terminal', monospace;
-  color: #000;
-}
-.CodeRay pre { margin: 0px; }
-
-span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
-
-table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
-table.CodeRay td { padding: 2px 4px; vertical-align: top; }
-
-.CodeRay .line_numbers, .CodeRay .no {
-  background-color: #def;
-  color: gray;
-  text-align: right;
-}
-.CodeRay .line_numbers a:target, .CodeRay .no a:target { color: blue; }
-.CodeRay .line_numbers .highlighted, .CodeRay .no .highlighted { color: red; }
-.CodeRay .no { padding: 0px 4px; }
-.CodeRay .code { width: 100%; }
-.CodeRay .code pre { overflow: auto; }
-
-.CodeRay .debug { color:white ! important; background:blue ! important; }
-
-.CodeRay .an { color:#007 }
-.CodeRay .at { color:#f08 }
-.CodeRay .av { color:#700 }
-.CodeRay .bi { color:#509; font-weight:bold }
-.CodeRay .c  { color:#888; }
-.CodeRay .c .dl { color:#444; }
-.CodeRay .c .ch { color:#444; }
-
-.CodeRay .ch { color:#04D }
-.CodeRay .ch .k { color:#04D }
-.CodeRay .ch .dl { color:#039 }
-
-.CodeRay .cl { color:#B06; font-weight:bold }
-.CodeRay .cm { color:#A08; font-weight:bold }
-.CodeRay .co { color:#036; font-weight:bold }
-.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:#60E; font-weight:bold }
-.CodeRay .fu { color:#06B; font-weight:bold }
-.CodeRay .gv { color:#d70; font-weight:bold }
-.CodeRay .hx { color:#058; font-weight:bold }
-.CodeRay .i  { color:#00D; font-weight:bold }
-.CodeRay .ic { color:#B44; font-weight:bold }
-
-.CodeRay .il { background-color: hsla(0,0%,0%,0.1); color: black }
-.CodeRay .il .idl { font-weight: bold; color: #666 }
-.CodeRay .idl { font-weight: bold; color: #666; }
-
-.CodeRay .im { color:#f00; }
-.CodeRay .in { color:#B2B; font-weight:bold }
-.CodeRay .iv { color:#33B }
-.CodeRay .la { color:#970; font-weight:bold }
-.CodeRay .lv { color:#963 }
-.CodeRay .ns { color:#707; font-weight:bold }
-.CodeRay .oc { color:#40E; font-weight:bold }
-.CodeRay .op { }
-.CodeRay .pc { color:#058; 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:#080; 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:hsla(300,100%,50%,0.1); color:#808 }
-.CodeRay .rx .k { }
-.CodeRay .rx .dl { color:#404 }
-.CodeRay .rx .mod { color:#C2C }
-.CodeRay .rx .fu  { color:#404; font-weight: bold }
-
-.CodeRay .s { background-color:hsla(0,100%,50%,0.1); color: #D20; }
-.CodeRay .s .k { }
-.CodeRay .s .ch { color: #b0b; }
-.CodeRay .s .dl { color: #710; }
-
-.CodeRay .sh { background-color:hsla(120,100%,50%,0.1); color:#2B2 }
-.CodeRay .sh .k { }
-.CodeRay .sh .dl { color:#161 }
-
-.CodeRay .sy { color:#A60 }
-.CodeRay .sy .k { color:#A60 }
-.CodeRay .sy .dl { color:#630 }
-
-.CodeRay .ta { color:#070 }
-.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 .head .filename { color: white; }
-
-.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; }
-
+  color: #E6E0DB;
+  padding: 20px;
+  overflow: auto;
+  font-size: 0.8em;
+  margin: 20px 0 20px 0; }
+  .CodeRay pre {
+    line-height: 1.2em;
+    margin: 0px;
+    padding: 0px; }
+  .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; }