glyph 0.3.0 → 0.4.0

data/macros/core.rb

@@ -69,7 +69,7 @@ macro :include do
 				macro_warning e.message, e
 			end
 		else
-			if Glyph["filters.by_file_extension"] && !ext.in?(['rb','glyph']) then
+			if Glyph["options.filter_by_file_extension"] && !ext.in?(['rb','glyph']) then
 				if Glyph::MACROS.include?(ext.to_sym) then
 					contents = "#{ext}[#{contents}]"
 				else 
@@ -77,7 +77,9 @@ macro :include do
 				end
 			end
 			begin 
-				update_source v
+				folder = Glyph.lite? ? "" : "text/" 
+				topic = (attr(:topic) && Glyph.multiple_output_files?) ? folder+v : nil
+				update_source v, folder+v, topic
 				interpret contents
 			rescue Glyph::MutualInclusionError => e
 				raise
@@ -135,18 +137,21 @@ macro :condition do
 end
 
 macro :eq do
+	within :condition
 	min_parameters 1
 	max_parameters 2
 	(param(0).to_s == param(1).to_s)	? true : nil
 end
 
 macro :not do
+	within :condition
 	max_parameters 1
 	v = param(0).to_s
 	(v.blank? || v == "false") ? true : nil 
 end
 
 macro :and do
+	within :condition
 	min_parameters 1
 	max_parameters 2
 	res_a = !param(0).blank?
@@ -155,6 +160,7 @@ macro :and do
 end
 
 macro :or do
+	within :condition
 	min_parameters 1
 	max_parameters 2
 	res_a = !param(0).blank?
@@ -163,6 +169,7 @@ macro :or do
 end
 
 macro :match do
+	within :condition
 	exact_parameters 2
 	val = param(0).to_s
 	regexp = param(1).to_s
@@ -184,19 +191,7 @@ macro "rewrite:" do
 			macro_error "Macro '#{macro_name}' cannot be defined by itself"
 		end
 	end
-	string = raw_param(1)
-	Glyph.macro macro_name do
-		s = string.dup
-		# Parameters
-		s.gsub!(/\{\{(\d+)\}\}/) do
-			raw_param($1.to_i).strip
-		end
-		# Attributes
-		s.gsub!(/\{\{([^\[\]\|\\\s]+)\}\}/) do
-			raw_attr($1.to_sym).strip
-		end
-		interpret s
-	end
+	Glyph.rewrite macro_name, raw_param(1).dup	
 	nil
 end
 

data/macros/filters.rb

@@ -2,14 +2,13 @@
 
 macro :textile do
 	exact_parameters 1
-	rc = nil
 	begin
 		require 'RedCloth'
-		rc = RedCloth.new value, Glyph::CONFIG.get("filters.redcloth.restrictions")
 	rescue Exception
 		macro_error "RedCloth gem not installed. Please run: gem install RedCloth"
 	end
-	target = Glyph["filters.target"]
+	rc = RedCloth.new value, Glyph::CONFIG.get("filters.redcloth.restrictions")
+	target = Glyph["output.#{Glyph['document.output']}.filter_target"]
 	case target.to_sym
 	when :html
 		rc.to_html.gsub /<p><\/p>/, ''
@@ -63,7 +62,7 @@ macro :markdown do
 	else
 	 macro_error "No supported MarkDown converter installed. Please run: gem install bluecloth"
 	end
-	target = Glyph["filters.target"]
+	target = Glyph["output.#{Glyph['document.output']}.filter_target"]
 	if target.to_sym == :html then
 		md.to_html
 	else
@@ -98,7 +97,7 @@ macro :highlight do
 		end
 	end
 	Glyph["highlighter.current"] = highlighter
-	target = Glyph["filters.target"]
+	target = Glyph["output.#{Glyph['document.output']}.filter_target"]
 	result = ""
 	case highlighter.to_sym
 	when :coderay

data/macros/html/block.rb

@@ -33,10 +33,9 @@ macro :image do
 	max_parameters 3
 	image = param(0)
 	alt = "@alt[-]" unless attr(:alt)
-	source_file = Glyph.lite? ? image : Glyph::PROJECT/"images/#{image}"
-	dest_file = Glyph.lite? ? image : "images/#{image}"
-	Glyph.warning "Image '#{image}' not found" unless Pathname.new(dest_file).exist? 
-	interpret "img[#{alt}@src[#{dest_file}]#{@node.attrs.join}]"
+	image_element_for image, alt do |alt, dest_file|
+		interpret "img[#{alt}@src[#{Glyph["output.#{Glyph['document.output']}.base"]}#{dest_file}]#{@node.attrs.join}]"
+	end
 end
 
 macro :figure do
@@ -44,47 +43,39 @@ macro :figure do
 	max_parameters 2
 	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? 
-	interpret %{div[@class[figure]
-img[#{alt}@src[#{dest_file}]#{@node.attrs.join}]
-#{caption}
+	caption = "div[@class[caption]#{param(1)}]" rescue nil
+	figure_element_for image, alt, caption do |alt, dest_file, caption|
+		interpret %{div[@class[figure]
+img[#{alt}@src[#{Glyph["output.#{Glyph['document.output']}.base"]}#{dest_file}]#{@node.attrs.join}]
+					#{caption}
 ]}
+	end
 end
 
 macro :title do
 	no_parameters
-	unless Glyph["document.title"].blank? then
-	%{<h1>
-			#{Glyph["document.title"]}
+	title_element do
+		%{<h1>
+	#{Glyph["document.title"]}
 </h1>}
-	else
-		""
 	end
 end
 
 macro :subtitle do
 	no_parameters
-	unless Glyph["document.subtitle"].blank? then
-	%{<h2>
-#{Glyph["document.subtitle"]}
+	subtitle_element do 
+		%{<h2>
+	#{Glyph["document.subtitle"]}
 </h2>}
-	else
-		""
 	end
 end
 
 macro :author do
 	no_parameters
-	unless Glyph['document.author'].blank? then
-	%{<div class="author">
+	author_element do 
+		%{<div class="author">
 by <em>#{Glyph["document.author"]}</em>
 </div>}
-	else
-		""
 	end
 end
 
@@ -96,11 +87,36 @@ macro :pubdate do
 end
 
 macro :revision do
-	unless Glyph["document.revision"].blank? then
-	%{<div class="revision">#{Glyph['document.revision']}</div>}
-	else
-		""
+	no_parameters
+	revision_element do
+		%{<div class="revision">#{Glyph['document.revision']}</div>}
+	end
+end
+
+macro :navigation do
+	exact_parameters 1
+	procs = {}
+	procs[:contents] = lambda do
+		%{<a href="#{Glyph["output.#{Glyph['document.output']}.base"]}index.html">Contents</a>}
+	end
+	procs[:previous] = lambda do |topic|
+		if topic then
+			%{<a href="#{Glyph["output.#{Glyph['document.output']}.base"]}#{topic[:src].gsub(/\..+$/, '.html')}">#{topic[:title]} &larr;</a>}
+		else
+			""
+		end
+	end
+	procs[:next] = lambda do |topic|
+		if topic then
+			%{<a href="#{Glyph["output.#{Glyph['document.output']}.base"]}#{topic[:src].gsub(/\..+$/, '.html')}">&rarr; #{topic[:title]}</a>}
+		else
+			""
+		end
+	end
+	procs[:navigation] = lambda do |contents, prev_link, next_link|
+		%{<div class="navigation">#{prev_link}#{contents}#{next_link}</div>}
 	end
+	navigation_element_for param(0).to_sym, procs
 end
 
 macro_alias :important => :note

data/macros/html/inline.rb

@@ -3,61 +3,35 @@
 macro :anchor do 
 	min_parameters 1
 	max_parameters 2
-	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>}
+	bookmark :id => param(0), :title => param(1), :file => @source_file
+	%{<a id="#{param(0)}">#{(param(1) rescue nil)}</a>}
 end
 
 macro :link do
 	min_parameters 1
 	max_parameters 2
-	href = param(0)
-	title = param(1) rescue nil
-	if href.match /^#/ then
-		anchor = href.gsub(/^#/, '').to_sym
-		bmk = bookmark? anchor
-		if bmk then
-			title ||= bmk[:title]
-		else
-			plac = placeholder do |document|
-				macro_error "Bookmark '#{anchor}' does not exist" unless document.bookmarks[anchor] 
-				document.bookmarks[anchor][:title]
-			end
-			title ||= plac
-		end
+	link_element_for param(0), param(1) do |target, title|
+		%{<a href="#{target}">#{title}</a>}
 	end
-	title ||= href
-	%{<a href="#{href}">#{title.to_s}</a>}
 end
 
 macro :fmi do
 	exact_parameters 2, :level => :warning
-	topic = param(0) 
-	href = param(1)
-	link = placeholder do |document| 
-		interpret "link[#{href}]"
+	fmi_element_for param(0), param(1) do |topic, link|
+		%{<span class="fmi">for more information on #{topic}, see #{link}</span>}
 	end
-	%{<span class="fmi">for more information on #{topic}, see #{link}</span>}
 end
 
 macro :draftcomment do
-	if Glyph['document.draft'] then
+	draftcomment_element do |value|
 		%{<span class="comment"><span class="comment-pre"><strong>Comment:</strong> </span>#{value}</span>}
-	else
-		""
 	end
 end
 
 macro :todo do
 	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>} 
-	else
-		""
+	todo_element do |value|
+		%{<span class="todo"><span class="todo-pre"><strong>TODO:</strong> </span>#{value}</span>} 
 	end
 end
 

data/macros/html/structure.rb

@@ -1,31 +1,21 @@
 #!/usr/bin/env ruby
 
 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}	
+	max_parameters 1
+	if raw_attribute(:src) && Glyph.multiple_output_files? then
+		required_attribute :title
 	end
-	%{<div class="#{@name}">
-#{h}#{value}
+	procs = {}
+	procs[:title] = lambda do |level, ident, title|
+		%{<h#{level} id="#{ident}">#{title}</h#{level}>\n}	
+	end
+	procs[:body] = lambda do |title, value|
+		%{<div class="#{@name}">
+#{title}#{value}
 
 </div>}	
+	end
+	section_element_for procs
 end
 
 macro :article do
@@ -112,79 +102,76 @@ macro :head do
 #{author}
 #{copy}
 <meta name="generator" content="Glyph v#{Glyph::VERSION} (http://www.h3rald.com/glyph)" />
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 #{value}
 </head>
 }
 end
 
 macro :style do 
+	within :head
 	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"
-		style = file_load file
-	when ".sass"
-		begin
-			require 'sass'
-			style = Sass::Engine.new(file_load(file)).render
-		rescue LoadError
-			macro_error "Haml is not installed. Please run: gem install haml"
-		rescue Exception
-			raise
+
+	@node[:document].style file
+	case Glyph['document.styles'].to_s
+	when 'embed' then
+		style = ""
+		case file.extname
+		when ".css"
+			style = file_load file
+		when ".sass"
+			begin
+				require 'sass'
+				style = Sass::Engine.new(file_load(file)).render
+			rescue LoadError
+				macro_error "Haml is not installed. Please run: gem install haml"
+			rescue Exception
+				raise
+			end
+		else
+			macro_error "Extension '#{file.extname}' not supported."
 		end
+%{<style type="text/css">
+			#{style}
+</style>}
+	when 'import' then
+%{<style type="text/css">
+	@import url("#{Glyph["output.#{Glyph['document.output']}.base"]}styles/#{value.gsub(/\..+$/, '.css')}");
+</style>}
+	when 'link' then
+%{<link href="#{Glyph["output.#{Glyph['document.output']}.base"]}styles/#{value.gsub(/\..+$/, '.css')}" rel="stylesheet" type="text/css" />}
 	else
-		macro_error "Extension '#{file.extname}' not supported."
+		macro_error "Value '#{Glyph['document.styles']}' not allowed for 'document.styles' setting"
 	end
-	%{<style type="text/css">
-#{style}
-</style>}
 end
 
 macro :toc do 
 	max_parameters 1
-	depth = param 0
-	link_header = lambda do |header|
-		%{<a href="##{header[:id]}">#{header[:title]}</a>}
+	link_proc = lambda do |head|
+		(!Glyph.multiple_output_files? || (head.definition != head.file)) ? %{<a href="#{head.link(@source_file)}">#{head.title}</a>} : head.title
 	end
-	toc = placeholder do |document|
-		descend_section = lambda do |n1, added_headers|
-			list = ""
-			added_headers ||= []
-			n1.descend do |n2, level|
-				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 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)
-					end	
-					list << "<li><ol>#{child_list}</ol></li>\n" unless child_list.blank?
-				end
-			end
-			list
-		end
-		toc_title = attr(:title) || "Table of Contents"
+	toc_list_proc = lambda do |descend_proc, bmk, document|
 		%{<div class="contents">
-<h2 class="toc-header" id="h_toc">#{toc_title}</h2>
+<h2 class="toc-header" id="#{bmk}">#{bmk.title}</h2>
 <ol class="toc">
-#{descend_section.call(document.structure, nil)}
+						#{descend_proc.call(document.structure, nil)}
 </ol>
 </div>}
 	end
-	toc
+	toc_item_proc = lambda do |classes, header|
+		"<li class=\"#{classes.join(" ").strip}\">#{header}</li>"
+	end
+	toc_sublist_proc = lambda do |contents|
+		"<li><ol>#{contents}</ol></li>\n"
+	end
+	toc_element_for param(0), attr(:title), 
+		:link => link_proc, 
+		:toc_list => toc_list_proc, 
+		:toc_item => toc_item_proc, 
+		:toc_sublist => toc_sublist_proc
 end
 
 # See: