glyph 0.2.0 → 0.3.0

data/macros/html/block.rb

@@ -2,133 +2,90 @@
 
 macro :note do
 	%{<div class="#{@name}">
-<span class="note-title">#{@name.to_s.capitalize}</span>#{@value}
+<span class="note-title">#{@name.to_s.capitalize}</span>#{value}
 
 </div>}
 end
 
 macro :box do
-	exact_parameters 2, :level => :warning
+	exact_parameters 2
 	%{<div class="box">
-<div class="box-title">#{params[0]}</div>
-#{params[1]}
+<div class="box-title">#{param(0)}</div>
+#{param(1)}
 
 </div>}
 end
 
-macro :code do
-	min_parameters 1 
+macro :codeblock do
+	exact_parameters 1 
 	%{
 <div class="code">
 <pre>
 <code>
-#{@value}
+#{value}
 </code>
 </pre>
 </div>}
 end
 
-macro :highlight do
-	min_parameters 2  
-	lang = params[0]
-	text = raw_params[1..raw_params.length-1].join '\\|'
-	text.gsub!(/\\(.)/){$1}
-	highlighter = Glyph["highlighters.current"].to_sym rescue nil
-	if !highlighter then
-		begin
-			require 'coderay'
-			highlighter = :coderay
-		rescue LoadError
-			begin 
-				require 'uv'
-				highlighter = :ultraviolet
-			rescue LoadError
-				macro_error "No highlighter installed. Please run: gem install coderay"
-			end
-		end
-		Glyph["highlighter.current"] = highlighter
-	end
-	target = Glyph["highlighters.target"]
-	result = ""
-	case highlighter.to_sym
-	when :coderay
-		begin
-			require 'coderay'
-			result = CodeRay.scan(text, lang).div(Glyph["highlighters.coderay"])
-		rescue LoadError
-			macro_error "CodeRay highlighter not installed. Please run: gem install coderay"
-		rescue Exception => e
-			macro_error e.message
-		end
-	when :ultraviolet
-		begin
-			require 'uv'
-			target = 'xhtml' if target == 'html'
-			result = Uv.parse(text.to_s, target.to_s, lang.to_s, 
-							 Glyph["highlighters.ultraviolet.line_numbers"], 
-							 Glyph["highlighters.ultraviolet.theme"].to_s)
-		rescue LoadError
-			macro_error "UltraViolet highlighter not installed. Please run: gem install ultraviolet"
-		rescue Exception => e
-			puts e.backtrace
-			macro_error e.message
-		end
-	else
-		macro_error "No highlighter installed. Please run: gem install coderay"
-	end
-	result
-end
-
-macro :title do
-	no_parameters
-	%{<h1>
-			#{Glyph["document.title"]}
-</h1>}
-end
-
-macro :img do
+macro :image do
 	min_parameters 1
 	max_parameters 3
-	image = params[0]
-	width = params[1]
+	image = param(0)
+	alt = "@alt[-]" unless attr(:alt)
 	source_file = Glyph.lite? ? image : Glyph::PROJECT/"images/#{image}"
 	dest_file = Glyph.lite? ? image : "images/#{image}"
- 	w = (width) ? "width=\"#{width}\"" : ''
-	height = params[2]
- 	h = (height) ? "height=\"#{height}\"" : ''
 	Glyph.warning "Image '#{image}' not found" unless Pathname.new(dest_file).exist? 
-	%{<img src="#{dest_file}" #{w} #{h} alt="-"/>}
+	interpret "img[#{alt}@src[#{dest_file}]#{@node.attrs.join}]"
 end
 
-macro :fig do
+macro :figure do
 	min_parameters 1
 	max_parameters 2
-	image = params[0]
-	caption = params[1] 
-	caption ||= nil
-	caption = %{<div class="caption">#{caption}</div>} if caption
+	image = param(0)
+	alt = "@alt[-]" unless attr(:alt)
+	caption = param(1) rescue nil
+	caption = "div[@class[caption]#{caption}]" if caption
 	source_file = Glyph.lite? ? image : Glyph::PROJECT/"images/#{image}"
 	dest_file = Glyph.lite? ? image : "images/#{image}"
 	Glyph.warning "Figure '#{image}' not found" unless Pathname.new(dest_file).exist? 
-	%{<div class="figure">
-<img src="#{dest_file}" alt="-"/>
+	interpret %{div[@class[figure]
+img[#{alt}@src[#{dest_file}]#{@node.attrs.join}]
 #{caption}
-</div>}
+]}
 end
 
+macro :title do
+	no_parameters
+	unless Glyph["document.title"].blank? then
+	%{<h1>
+			#{Glyph["document.title"]}
+</h1>}
+	else
+		""
+	end
+end
 
 macro :subtitle do
 	no_parameters
+	unless Glyph["document.subtitle"].blank? then
 	%{<h2>
 #{Glyph["document.subtitle"]}
 </h2>}
+	else
+		""
+	end
 end
 
 macro :author do
 	no_parameters
+	unless Glyph['document.author'].blank? then
 	%{<div class="author">
 by <em>#{Glyph["document.author"]}</em>
 </div>}
+	else
+		""
+	end
 end
 
 macro :pubdate do
@@ -138,31 +95,12 @@ macro :pubdate do
 </div>}
 end
 
-macro :table do
-	exact_parameters 1
-	%{<table>
-#{@value}
-</table>}
-end
-
-macro :tr do
-	exact_parameters 1, :level => :warning
-	%{<tr>
-#{@value}	
-</tr>}
-end
-
-macro :td do
-	exact_parameters 1, :level => :warning
-	%{<td>
-#{@value}
-
-</td>}
-end
-
-macro :th do
-	exact_parameters 1, :level => :warning
-	%{<th>#{@value}</th>}
+macro :revision do
+	unless Glyph["document.revision"].blank? then
+	%{<div class="revision">#{Glyph['document.revision']}</div>}
+	else
+		""
+	end
 end
 
 macro_alias :important => :note

data/macros/html/inline.rb

@@ -3,20 +3,18 @@
 macro :anchor do 
 	min_parameters 1
 	max_parameters 2
-	ident, title = params
+	ident = param(0)
+	title = param(1) rescue nil
 	macro_error "Bookmark '#{ident}' already exists" if bookmark? ident
 	bookmark :id => ident, :title => title
 	%{<a id="#{ident}">#{title}</a>}
 end
 
-macro :codeph do
-	%{<code>#@value</code>}
-end
-
 macro :link do
 	min_parameters 1
 	max_parameters 2
-	href, title = params
+	href = param(0)
+	title = param(1) rescue nil
 	if href.match /^#/ then
 		anchor = href.gsub(/^#/, '').to_sym
 		bmk = bookmark? anchor
@@ -31,12 +29,13 @@ macro :link do
 		end
 	end
 	title ||= href
-	%{<a href="#{href}">#{title}</a>}
+	%{<a href="#{href}">#{title.to_s}</a>}
 end
 
 macro :fmi do
 	exact_parameters 2, :level => :warning
-	topic, href = params
+	topic = param(0) 
+	href = param(1)
 	link = placeholder do |document| 
 		interpret "link[#{href}]"
 	end
@@ -45,18 +44,18 @@ end
 
 macro :draftcomment do
 	if Glyph['document.draft'] then
-		%{<span class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>#{@value}</span>}
+		%{<span class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>#{value}</span>}
 	else
 		""
 	end
 end
 
 macro :todo do
-	min_parameters 1
-	todo = "[#{@source}] -- #{@value}"
+	exact_parameters 1
+	todo = {:source => @source, :text => value}
 	 @node[:document].todos << todo unless @node[:document].todos.include? todo
 	if Glyph['document.draft']  then
-	 	%{<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>#{@value}</span>} 
+	 	%{<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>#{value}</span>} 
 	else
 		""
 	end

data/macros/html/structure.rb

@@ -1,67 +1,127 @@
 #!/usr/bin/env ruby
 
-macro :div do 
-	exact_parameters 1, :level => :warning
-%{<div class="#{@name}">
-#{@value}
+macro :section do 
+	exact_parameters 1
+	h = ""
+	h_title = attr :title
+	h_id = attr :id
+	h_notoc = attr :notoc 
+	macro_warning "Please specify a title for section ##{h_id}" if h_id && !h_title
+	if h_title then
+		level = 1
+		@node.ascend do |n| 
+			if n.is_a?(Glyph::MacroNode) && Glyph["system.structure.headers"].include?(n[:name]) then
+				level+=1
+			end
+		end
+		h_id ||= "h_#{@node[:document].headers.length+1}"
+		h_id = h_id.to_sym
+		header :title => h_title, :level => level, :id => h_id, :notoc => h_notoc
+		@node[:header] = h_id
+		macro_error "Bookmark '#{h_id}' already exists" if bookmark? h_id
+		bookmark :id => h_id, :title => h_title
+		h = %{<h#{level} id="#{h_id}">#{h_title}</h#{level}>\n}	
+	end
+	%{<div class="#{@name}">
+#{h}#{value}
 
 </div>}	
 end
 
-macro :header do
-	min_parameters 1
-	max_parameters 2
-	title = params[0]
-	h_id = params[1]
-	h_id = nil if h_id.blank?
-	level = 1
-	@node.ascend do |n| 
-		if Glyph["structure.headers"].include? n[:macro] then
-			level+=1
-		end
-	end
-	h_id ||= "h_#{@node[:document].headers.length+1}".to_sym
-	header :title => title, :level => level, :id => h_id
-	@node[:header] = h_id
-	macro_error "Bookmark '#{h_id}' already exists" if bookmark? h_id
-	bookmark :id => h_id, :title => title
-	%{<h#{level} id="#{h_id}">#{title}</h#{level}>}	
+macro :article do
+	exact_parameters 1
+	head = raw_attr(:head)
+ 	head ||= %{style[default.css]}
+	pre_title = raw_attr(:"pre-title")
+	post_title = raw_attr(:"post-title")
+	pubdate = @node.attr(:pubdate) ? "div[@class[pubdate]#{@node.attr(:pubdate).contents}]" : "pubdate[]"
+	halftitlepage = raw_attr(:halftitlepage)
+	halftitlepage ||= %{
+			#{pre_title}
+			title[]
+			subtitle[]
+			author[]
+			#{pubdate}
+			#{post_title}
+	}
+	interpret %{document[
+	head[#{head}]
+	body[
+		halftitlepage[
+			#{halftitlepage}
+		]
+		#{@node.value}
+	]
+]}	
+end
+
+macro :book do
+	no_parameters
+	head = raw_attr(:head) 
+	head ||= %{style[default.css]}
+	pre_title = raw_attr(:"pre-title")
+	post_title = raw_attr(:"post-title")
+	titlepage = raw_attr(:titlepage)
+	pubdate = @node.attr(:pubdate) ? "div[@class[pubdate]#{@node.attr(:pubdate).contents}]" : "pubdate[]"
+	titlepage ||= %{
+			#{pre_title}
+			title[]
+			subtitle[]
+			revision[]
+			author[]
+			#{pubdate}
+			#{post_title}
+	}
+	frontmatter = raw_attr(:frontmatter)
+	bodymatter = raw_attr(:bodymatter)
+	backmatter = raw_attr(:backmatter)
+	frontmatter = "frontmatter[\n#{frontmatter}\n]" if frontmatter
+	bodymatter = "bodymatter[\n#{bodymatter}\n]" if bodymatter
+	backmatter = "backmatter[\n#{backmatter}\n]" if backmatter
+	interpret %{document[
+	head[#{head}]
+	body[
+		titlepage[
+			#{titlepage}
+		]
+		#{frontmatter}
+		#{bodymatter}
+		#{backmatter}
+	]
+]}	
 end
 
+
 macro :document do
-	exact_parameters 1, :level => :warning
+	exact_parameters 1
 	%{<?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">
-#{@value}
+#{value}
 
 </html>}
 end
 
-macro :body do
-	exact_parameters 1, :level => :warning
-	%{<body>
-#{@value}
-
-</body>}
-end
-
 macro :head do
-	exact_parameters 1, :level => :warning
+	exact_parameters 1
+	author = Glyph['document.author'].blank? ? "" : %{<meta name="author" content="#{Glyph["document.author"]}" />
+}
+	copy = Glyph['document.author'].blank? ? "" : %{<meta name="copyright" content="#{Glyph["document.author"]}" />}
 	%{<head>
 <title>#{Glyph["document.title"]}</title>
-<meta name="author" content="#{Glyph["document.author"]}" />
-<meta name="copyright" content="#{Glyph["document.author"]}" />
+#{author}
+#{copy}
 <meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
-#{@value}
+#{value}
 </head>
 }
 end
 
 macro :style do 
-	file = Glyph.lite? ? Pathname.new(@value) : Glyph::PROJECT/"styles/#{@value}"
-	file = Pathname.new Glyph::HOME/'styles'/@value unless file.exist?
-	macro_error "Stylesheet '#{@value}' not found" unless file.exist?
+	exact_parameters 1
+	file = Glyph.lite? ? Pathname.new(value) : Glyph::PROJECT/"styles/#{value}"
+	file = Pathname.new Glyph::HOME/'styles'/value unless file.exist?
+	macro_error "Stylesheet '#{value}' not found" unless file.exist?
 	style = ""
 	case file.extname
 	when ".css"
@@ -84,23 +144,29 @@ macro :style do
 end
 
 macro :toc do 
-	no_parameters
+	max_parameters 1
+	depth = param 0
 	link_header = lambda do |header|
-		%{<a href="##{header[:id]}">#{header[:title].gsub(/@(.+?)@/, '\1')}</a>}
+		%{<a href="##{header[:id]}">#{header[:title]}</a>}
 	end
 	toc = placeholder do |document|
 		descend_section = lambda do |n1, added_headers|
 			list = ""
 			added_headers ||= []
 			n1.descend do |n2, level|
-				if Glyph['structure.headers'].include?(n2[:macro])
-					next if n2.find_parent{|node| Glyph['structure.special'].include? node[:macro] } 
-					header_id = n2.children.select{|n| n[:header]}[0][:header] rescue nil
+				if n2.is_a?(Glyph::MacroNode) && Glyph['system.structure.headers'].include?(n2[:name]) then
+					next if n2.find_parent{|node| Glyph['system.structure.special'].include? node[:name] }
+					header_id = n2[:header]
+					header_hash = document.header?(header_id)
+					next if depth && header_hash && (header_hash[:level]-1 > depth.to_i) || header_hash && header_hash[:notoc]
 					next if added_headers.include? header_id
 					added_headers << header_id
 					# Check if part of frontmatter, bodymatter or backmatter
-					container = n2.find_parent{|node| node[:macro].in? [:frontmatter, :bodymatter, :appendix, :backmatter]}[:macro] rescue nil
-					list << "<li class=\"#{container} #{n2[:macro]}\">#{link_header.call(document.header?(header_id))}</li>\n" if header_id
+					container = n2.find_parent do |node| 
+						node.is_a?(Glyph::MacroNode) && 
+							node[:name].in?([:frontmatter, :bodymatter, :appendix, :backmatter])
+					end[:name] rescue nil
+					list << "<li class=\"#{container} #{n2[:name]}\">#{link_header.call(header_hash)}</li>\n" if header_id
 					child_list = ""
 					n2.children.each do |c|
 						child_list << descend_section.call(c, added_headers)
@@ -110,8 +176,9 @@ macro :toc do
 			end
 			list
 		end
+		toc_title = attr(:title) || "Table of Contents"
 		%{<div class="contents">
-<h2 class="toc-header" id="h_toc">Table of Contents</h2>
+<h2 class="toc-header" id="h_toc">#{toc_title}</h2>
 <ol class="toc">
 #{descend_section.call(document.structure, nil)}
 </ol>
@@ -124,15 +191,13 @@ end
 #  http://microformats.org/wiki/book-brainstorming
 #  http://en.wikipedia.org/wiki/Book_design
 
-macro_alias :section => :div
-
-(Glyph['structure.frontmatter'] + Glyph['structure.bodymatter'] + Glyph['structure.backmatter']).
-	each {|s| macro_alias s => :div }
+(Glyph['system.structure.frontmatter'] + Glyph['system.structure.bodymatter'] + Glyph['system.structure.backmatter']).
+	each {|s| macro_alias s => :section }
 
-macro_alias :frontcover => :div
-macro_alias :titlepage => :div
-macro_alias :halftitlepage => :div
-macro_alias :frontmatter => :div
-macro_alias :bodymatter => :div
-macro_alias :backmatter => :div
-macro_alias :backcover => :div
+macro_alias :frontcover => :section
+macro_alias :titlepage => :section
+macro_alias :halftitlepage => :section
+macro_alias :frontmatter => :section
+macro_alias :bodymatter => :section
+macro_alias :backmatter => :section
+macro_alias :backcover => :section