glyph 0.4.1 → 0.4.2

data/AUTHORS.textile

@@ -1,9 +1,10 @@
 <p>Glyph was designed and developed by <a href="http://www.h3rald.com">Fabio Cevasco</a> (h3rald).</p>
-<p>Special thanks to the following individuals who contributed to Glyph by reporting and fixing issues and/or proposing and implementing new features:</p>
+<p>Special thanks to the following individuals who contributed to Glyph by reporting and fixing issues, proposing and implementing new features or provided Glyph-related resources and plugins:</p>
 <ul>
 	<li><a href="http://www.jabbslad.com">Jamie Atkinson</a> (Jabbslad)</li>
 	<li><a href="http://koraktor.github.com">Sebastian Staudt</a> (koraktor)</li>
 	<li><a href="http://balcone.eveel.ru">Dmitry A. Ustalov</a> (eveel)</li>
 	<li><a href="http://www.stuartellis.eu">Stuart Ellis</a> (stuartellis)</li>
+	<li>Eric Givens (darthzippy)</li>
 </ul>
     

data/CHANGELOG.textile

@@ -4,9 +4,42 @@
 
 
 	<div class="section">
-<h2 id="h_1">v0.4.1 &ndash; September 25th 2010</h2>
+<h2 id="h_1">v0.4.2 &ndash; October 22th 2010</h2>
 <div class="section">
-<h3 id="h_2">5 Bugs Fixed</h3>
+<h3 id="h_2">3 Features Implemented</h3>
+<table><tr><th>ID</th>
+					<th>Description</th></tr>
+				
+		
+	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/172">#172</a></td>
+		<td><p>A new output? macro macro can be used to test whether Glyph is compiling to a particular output format.</p></td></tr>
+		
+	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/175">#175</a></td>
+		<td><p>The conditional macro now support a third parameter (else branch).</p></td></tr>
+		
+	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/176">#176</a></td>
+		<td><p>A bunch of new aliases and shortcuts are available for the section macro.</p></td></tr></table>
+
+</div>
+	
+	
+		<div class="section">
+<h3 id="h_3">1 Bug Fixed</h3>
+<table><tr><th>ID</th>
+					<th>Description</th></tr>
+				
+		
+	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/178">#178</a></td>
+		<td><p>No error is raised anymore if less than the required parameters/attributes are supplied to a rewritten macro.</p></td></tr></table>
+
+</div>
+
+</div>
+
+	<div class="section">
+<h2 id="h_4">v0.4.1 &ndash; September 23th 2010</h2>
+<div class="section">
+<h3 id="h_5">5 Bugs Fixed</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -31,9 +64,9 @@
 </div>
 
 	<div class="section">
-<h2 id="h_3">v0.4.0 &ndash; September 3th 2010</h2>
+<h2 id="h_6">v0.4.0 &ndash; September 3th 2010</h2>
 <div class="section">
-<h3 id="h_4">13 Features Implemented</h3>
+<h3 id="h_7">13 Features Implemented</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -81,7 +114,7 @@
 	
 	
 		<div class="section">
-<h3 id="h_5">7 Bugs Fixed</h3>
+<h3 id="h_8">7 Bugs Fixed</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -112,9 +145,9 @@
 </div>
 
 	<div class="section">
-<h2 id="h_6">v0.3.0 &ndash; June 13th 2010</h2>
+<h2 id="h_9">v0.3.0 &ndash; June 13th 2010</h2>
 <div class="section">
-<h3 id="h_7">13 Features Implemented</h3>
+<h3 id="h_10">13 Features Implemented</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -162,7 +195,7 @@
 	
 	
 		<div class="section">
-<h3 id="h_8">3 Bugs Fixed</h3>
+<h3 id="h_11">3 Bugs Fixed</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -181,9 +214,9 @@
 </div>
 
 	<div class="section">
-<h2 id="h_9">v0.2.0 &ndash; May 9th 2010</h2>
+<h2 id="h_12">v0.2.0 &ndash; May 9th 2010</h2>
 <div class="section">
-<h3 id="h_10">11 Features Implemented</h3>
+<h3 id="h_13">11 Features Implemented</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -225,7 +258,7 @@
 	
 	
 		<div class="section">
-<h3 id="h_11">8 Bugs Fixed</h3>
+<h3 id="h_14">8 Bugs Fixed</h3>
 <table><tr><th>ID</th>
 					<th>Description</th></tr>
 				
@@ -259,7 +292,7 @@
 </div>
 
 	<div class="section">
-<h2 id="h_12">v0.1.0 &ndash; April 8th 2010</h2>
+<h2 id="h_15">v0.1.0 &ndash; April 8th 2010</h2>
 Initial release.
 
 </div>

data/LICENSE.textile

@@ -1,25 +1,16 @@
 <p>Copyright &copy; 2010 <strong>Fabio Cevasco</strong>, <a href="http://www.h3rald.com">http://www.h3rald.com</a></p> 
-
-<div class="code">
-<pre>
-<code>
-Permission is hereby granted, free of charge, to any person obtaining a copy
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.</p>
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-</code>
-</pre>
-</div>
+THE SOFTWARE.</p>

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/book/config.yml

@@ -4,7 +4,7 @@
   :subtitle: Rapid Document Authoring Framework
   :author: Fabio Cevasco
   :draft: true
-  :revision: v0.4.1
+  :revision: v0.4.2
   :filename: glyph
   :title: Glyph
   :styles: link

data/book/text/acknowledgements.glyph

@@ -1,10 +1,11 @@
 txt[
 Glyph was designed and developed by =>[http://www.h3rald.com|Fabio Cevasco] (h3rald).
 
-Special thanks to the following individuals who contributed to Glyph by reporting and fixing issues and/or proposing and implementing new features:
+Special thanks to the following individuals who contributed to Glyph by reporting and fixing issues, proposing and implementing new features or provided Glyph-related resources and plugins:
 * =>[http://www.jabbslad.com|Jamie Atkinson] (Jabbslad)
 * =>[http://koraktor.github.com|Sebastian Staudt] (koraktor)
 * =>[http://balcone.eveel.ru|Dmitry A. Ustalov] (eveel)
 * =>[http://www.stuartellis.eu|Stuart Ellis] (stuartellis)
+* Eric Givens (darthzippy)
 ]
     

data/book/text/changelog.glyph

@@ -2,9 +2,11 @@
 macro :features do
 	verb = (@name == :features) ? "Implemented" : "Fixed"
 	total = @node.child_macros.length
+	name = @name.to_s.capitalize
+	name.chop! if total == 1
 	interpret %{
 		section[
-			@title[#{total} #{@name.to_s.capitalize} #{verb}]
+			@title[#{total} #{name} #{verb}]
 			table[
 				tr[
 					th[ID]
@@ -35,7 +37,17 @@ rw:[issue|
 	%:[#>|"#{value} command"]
 	%:[$>|"#{value} setting"]
 ]
-release[0.4.1|September 25th 2010|
+release[0.4.2|October 22th 2010|
+	features[
+		issue[172|A new %>[output?] macro can be used to test whether Glyph is compiling to a particular output format.]
+		issue[175|The conditional macro now support a third parameter (else branch).]
+		issue[176|A bunch of new aliases and shortcuts are available for the section macro.]
+	]
+	bugs[
+		issue[178|No error is raised anymore if less than the required parameters/attributes are supplied to a rewritten macro.]
+	]
+]
+release[0.4.1|September 23th 2010|
 	bugs[
 		issue[169|*.scss files are now supported by the %>[style].]
 		issue[170|Improved default CodeRay stylesheet.]

data/book/text/license.glyph

@@ -1,16 +1,13 @@
 p[Copyright © 2010 strong[Fabio Cevasco], =>[http://www.h3rald.com]] 
-codeblock[
-Permission is hereby granted, free of charge, to any person obtaining a copy
+p[Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+furnished to do so, subject to the following conditions:]
+p[The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.]
+p[THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

data/book/text/macros/macros_core.glyph

@@ -141,6 +141,15 @@ Checks a string against a regular expression.
 		@params[-p[0|The expression to negate]]
 	]
 
+	ref_macro[
+		@n[output?]
+		@desc[Evaluates to true if Glyph is generating output in the specified format(s).]
+		@example[=?[output?[web\|web5]\|This text is printed only when generating web or web5 output.]=]
+		@params[
+			-p[0, ...|a valid output target.]
+		]
+	]
+
 	ref_macro[
 		@n[or]
 		@desc[Conditional @or@ operator, to be used with the %>[condition].]

data/book/text/macros/macros_filters.glyph

@@ -1,3 +1,23 @@
+rw:[filtered_section|
+	ref_macro[
+		@n[{{markup}}_section]
+		@desc[Creates a section (see %>[section]) whose content can be formatted with {{markup}} markup.]
+		@aliases[{{aliases}}]
+		@block_example[=
+{{markup}}_section[
+	@title[Test Section]
+	@id[test]
+Some *{{markup}}* text.
+]
+		=]
+		@params[-p[0|The text of the section]]
+		@attrs[
+			-a[title|The title of the section &[opt]]
+			-a[id|The ID of the section &[opt]]
+			-a[notoc|If not blank, the header will not appear in the Table of Contents. &[opt]]
+		]
+	]
+]
 	ref_macro[
 		@n[markdown]
 		@desc[
@@ -10,6 +30,11 @@ Uses a Markdown converter (BlueCloth, RDiscount, Maruku or Kramdown) to transfor
 		@params[-p[0|The Markdown text to filter.]]
 	]
 
+	filtered_section[
+		@markup[markdown]
+		@aliases[§md, md_section]
+	]
+
 	ref_macro[
 		@n[textile]
 		@desc[
@@ -22,9 +47,14 @@ Uses the RedCloth gem to transform the value into HTML or LaTeX, depending on th
 		@params[-p[0|The Textile text to filter.]]
 	]
 
+	filtered_section[
+		@markup[textile]
+		@aliases[§txt, txt_section]
+	]
+
 	ref_macro[
 		@n[highlight]
-		@desc[Highlights a piece of source code (second parameter) according to the specified language (first parameter). fmi[code highligting|#source_code].]
+		@desc[Highlights a piece of source code according to the specified language. fmi[code highligting|#source_code].]
 		@block_example[=
 highlight[ruby\|
   def hello
@@ -32,4 +62,8 @@ highlight[ruby\|
   end
 ]
 		=]
+		@params[
+			-p[0|A programming language supported by the underlying highlighter.]
+			-p[1|The code to highlight.]
+		]
 	]

data/book/text/macros/macros_structure.glyph

@@ -64,7 +64,7 @@ Used to create a book. By default, it includes the following macros:
 
 	ref_macro[
 		@n[section]
-		@desc[Creates a section (@<div>@ tag).]
+		@desc[Creates a section (@<div>@ or @<section>@ tag).]
 		@aliases[%[=Glyph['system.structure'].values.flatten.uniq.map{\|a\| a.to_s }.push("section").sort.join(', ')=]]
 		@block_example[=
 section[

data/book/text/text_editing/conditionals.glyph

@@ -12,18 +12,18 @@ Consider the following code:
 	]
 	highlight[=html|
 ?[$[document.draft]\|
-This is a first draft of the Glyph Book]
-?[not[$[document.draft]]\|
+This is a first draft of the Glyph Book\|
 This is the official version of the Glyph Book]
 	=]
 	txt[
 In this case, if @document.draft@ is set to @true@, "This is a first draft of the Glyph Book" will be displayed; if not, "This is the official version of the Glyph Book" will be displayed instead.
 
-The %>[condition] takes two parameters:
-* the first one is the condition to evaluate
-* the second one is the text to include in the document only if the condition is satisfied.
+The %>[condition] takes up to three parameters:
+# the condition to evaluate
+# the text to include in the document only if the condition is satisfied.
+# _(Optional)_ the text to include in the document if the condition is _not_ satisfied.
 
-Note that _both_ parameters can contain macros, of course, so you can write things like:
+Note that _all_ parameters can contain macros, of course, so you can write things like:
 	]
 	highlight[=html|
 ?[and[

data/book/text/text_editing/glyph_files.glyph

@@ -1,4 +1,7 @@
 	txt[
 The @text@ folder of any Glyph folder contains all the text source files used to produce a document. Although there are no restrictions on the extension of the files in this folder, you may want to use @.glyph@, especially if =>[http://www.vim.org|Vim] is your favorite text editor.
+
 The reason is simple: a Glyph syntax file is =>[http://www.vim.org/scripts/script.php?script_id=3086|available on vim.org]. Although not essential, syntax highlighting does help when editing Glyph files. 
+
+If you use TextMate, you may want to check out Eric Givens' =>[http://github.com/darthzippy/glyph.tmbundle|Glyph TextMate Bundle].
 	]

data/book/text/text_editing/section_aliases.glyph

@@ -1,5 +1,5 @@
 	txt[
-There are _a lot_ of macros that can be used in the same way as @section@, one for each element commonly used in =>[http://en.wikipedia.org/wiki/Book_design|book design]. Each one of them is a simple wrapper for a @<div>@ tag with a @class@ attribute set to its name.
+There are _a lot_ of macros that can be used in the same way as @section@, one for each element commonly used in =>[http://en.wikipedia.org/wiki/Book_design|book design]. 
 
 The following table lists the identifiers of all section-like macros, divided according to the part of the book they should be placed in:
 	]
@@ -24,5 +24,5 @@ The following table lists the identifiers of all section-like macros, divided ac
 	p[strong[&Dagger;]: Any subsection of this section is not listed in the Table of Contents.]
 
 	note[
-		code[frontmatter], code[bodymatter] and code[backmatter] are also macro identifiers, but they are exposed as attributes for the %>[book] and the %>[article], so if you're using either of these two macros as your root macro for your document, there's no need to use them explicitly.
+		code[frontmatter], code[bodymatter] and code[backmatter] are also macro identifiers, but they are also exposed as attributes for the %>[book] and the %>[article], so if you're using either of these two macros as your root macro for your document, there's no need to use them explicitly.
 	]

data/book/text/text_editing/sections.glyph

@@ -1,5 +1,5 @@
 
-	p[Glyph documents are normally organized as a hierarchical tree of nested chapters, appendixes, sections, etc. To define a section, use the %>[section], like so:]
+	p[Glyph documents are normally organized as a hierarchical tree of nested chapters, appendixes, sections, etc. To define a section, use the %>[section] (aliased by code[§]), like so:]
 
 	highlight[=html|
 section[
@@ -30,3 +30,25 @@ Note an important difference from HTML: there is no need for an explicit level f
 	txt[
 By default, in Glyph the first header level is _2_, so the two headers are rendered as @h2@ and @h3@, respectively (@--\[...\]@ macros are _comments_, therefore they are not included in the final output).
 	]
+  section[
+		@title[Markup-aware sections]
+		txt[Although Glyph can be used on its own to produce valid HTML or XML code, you may often want to use &[markups] to save some typing. Typically, you'll end up writing a lot of code like this:]
+	
+		highlight[=html|
+section[
+	@title[My Textile section]
+	textile[
+Textile markup can be used _here_.
+	]
+]
+		=]
+		txt[To save you even more typing, you can use the %>[textile_section] (aliased by @txt_section@ and @§txt@) and the %>[markdown_section] (aliased by @md_section@ and @§md@). By doing so, the previous code snippet can be written like this:]
+		highlight[=html|
+§txt[
+	@title[My Textile section]
+Textile markup can be used _here_.
+]
+		=]
+		tip[txt[On an Italian keyboard, you can type a @§@ character by pressing *SHIFT + &ugrave;*. Unfortunately, that's about the only useful thing an Italian keyboard does. If you use Vim, you can map it to some key sequence like @''s@, like this: @map! ''s <C-V>u00A7@.]]
+ 
+	]

data/glyph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glyph}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabio Cevasco"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-10-22}
   s.default_executable = %q{glyph}
   s.description = %q{Glyph is a framework for structured document authoring.}
   s.email = %q{h3rald@h3rald.com}
@@ -220,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/web5_spec.rb",
+    "spec/macros/core_spec.rb",
      "spec/macros/web_spec.rb",
-     "spec/macros/macros_spec.rb",
-     "spec/macros/textile_spec.rb",
+     "spec/macros/html5_spec.rb",
      "spec/macros/filters_spec.rb",
+     "spec/macros/web5_spec.rb",
+     "spec/macros/textile_spec.rb",
      "spec/macros/xml_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/config_spec.rb",
-     "spec/lib/reporter_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/lib/macro_spec.rb",
      "spec/lib/macro_validators_spec.rb",
-     "spec/lib/interpreter_spec.rb",
+     "spec/lib/config_spec.rb",
      "spec/lib/glyph_spec.rb",
-     "spec/lib/bookmark_spec.rb",
-     "spec/lib/document_spec.rb",
+     "spec/lib/parser_spec.rb",
      "spec/lib/syntax_node_spec.rb",
-     "spec/lib/node_spec.rb",
-     "spec/lib/commands_spec.rb",
-     "spec/spec_helper.rb",
+     "spec/lib/document_spec.rb",
+     "spec/lib/reporter_spec.rb",
      "spec/tasks/load_spec.rb",
+     "spec/tasks/generate_spec.rb",
      "spec/tasks/project_spec.rb",
-     "spec/tasks/generate_spec.rb"
+     "spec/files/custom_command.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/glyph.rb

@@ -212,11 +212,11 @@ module Glyph
 			body = text.dup
 			# Parameters
 			body.gsub!(/\{\{(\d+)\}\}/) do
-				raw_param($1.to_i).strip
+				raw_param($1.to_i).to_s.strip
 			end
 			# Attributes
 			body.gsub!(/\{\{([^\[\]\|\\\s]+)\}\}/) do
-				raw_attr($1.to_sym).strip
+				raw_attr($1.to_sym).to_s.strip
 			end
 			interpret body
 		end

data/lib/glyph/macro.rb

@@ -57,12 +57,13 @@ module Glyph
 		# @option options [Boolean] :strip whether the value is stripped or not
 		# @return [String, nil] the value of the attribute
 		# @since 0.3.0
-		def attribute(name, options={:strip => true})
+		def attribute(name, options={:strip => true, :null_if_blank => true})
 			return @attributes[name.to_sym] if @attributes && @attributes[name.to_sym]
 			return nil unless @node.attribute(name)
 			@attributes = {} unless @attributes
 			@attributes[name] = @node.attribute(name).evaluate(@node, :attrs => true).to_s
 			@attributes[name].strip! if options[:strip]
+			@attributes[name] = nil if @attributes[name].blank? && options[:null_if_blank]
 			@attributes[name]
 		end
 
@@ -72,12 +73,13 @@ module Glyph
 		# @option options [Boolean] :strip whether the value is stripped or not
 		# @return [String, nil] the value of the parameter
 		# @since 0.3.0
-		def parameter(n, options={:strip => true})
+		def parameter(n, options={:strip => true, :null_if_blank => true})
 			return @parameters[n] if @parameters && @parameters[n]
 			return nil unless @node.parameter(n)
 			@parameters = Array.new(@node.parameters.length) unless @parameters
 			@parameters[n] = @node.parameter(n).evaluate(@node, :params => true).to_s
 			@parameters[n].strip! if options[:strip]
+			@parameters[n] = nil if @parameters[n].blank? && options[:null_if_blank]
 			@parameters[n]
 		end
 
@@ -86,12 +88,13 @@ module Glyph
 		# @option options [Boolean] :strip whether the value is stripped or not
 		# @return [Hash] the macro attributes
 		# @since 0.3.0
-		def attributes(options={:strip => true})
+		def attributes(options={:strip => true, :null_if_blank => true})
 			return @attributes if @attributes
 			@attributes = {}
 			@node.attributes.each do |value|
 				@attributes[value[:name]] = value.evaluate(@node, :attrs => true)
 				@attributes[value[:name]].strip! if options[:strip]
+				@attributes[value[:name]] = nil if @attributes[value[:name]].blank? && options[:null_if_blank]
 			end
 			@attributes
 		end
@@ -101,12 +104,13 @@ module Glyph
 		# @option options [Boolean] :strip whether the value is stripped or not
 		# @return [Array] the macro parameters
 		# @since 0.3.0
-		def parameters(options={:strip => true})
+		def parameters(options={:strip => true, :null_if_blank => true})
 			return @parameters if @parameters
 			@parameters = []
 			@node.parameters.each do |value|
 				@parameters << value.evaluate(@node, :params => true)
 				@parameters.last.strip! if options[:strip]
+				@parameters.last = nil if @parameters.last.blank? && options[:null_if_blank]
 			end
 			@parameters
 		end

data/lib/glyph/macro_helpers.rb

@@ -158,7 +158,8 @@ module Glyph
 						list = ""
 						added_headers ||= []
 						n1.descend do |n2, level|
-							if n2.is_a?(Glyph::MacroNode) && Glyph['system.structure.headers'].include?(n2[:name]) then
+							#if n2.is_a?(Glyph::MacroNode) && Glyph['system.structure.headers'].include?(n2[:name]) then
+							if n2.is_a?(Glyph::MacroNode) && n2[:name].in?(Glyph.titled_sections) then
 								if Glyph.multiple_output_files? then
 									# Only consider topics/booklets when building TOC for web/web5
 									next if !n2.attribute(:src) && n2.child_macros.select{|child| child.attribute(:src)}.blank? 
@@ -201,7 +202,8 @@ module Glyph
 					level = 1
 					@node.ascend do |n| 
 						break if n.respond_to?(:attribute) && n.attribute(:class) && n.attribute(:class).children.join.strip == "topic"
-						if n.is_a?(Glyph::MacroNode) && Glyph["system.structure.headers"].include?(n[:name]) then
+						#if n.is_a?(Glyph::MacroNode) && Glyph["system.structure.headers"].include?(n[:name]) then
+						if n.is_a?(Glyph::MacroNode) && n[:name].in?(Glyph.titled_sections) then
 							level+=1
 						end
 					end

data/lib/glyph/utils.rb

@@ -121,10 +121,21 @@ module Glyph
 			ALIASES[:by_alias][name.to_sym]
 		end
 
+		# Returns the names of the macro aliases referencing the supplied definition
+		# @param [String, Symbol] name the macro name to check
 		def macro_aliases_for(name)
 			ALIASES[:by_def][name.to_sym]
 		end
 
+		# Returns a list of macro names corresponding to sections
+		# that commonly have a title
+		def titled_sections
+			(Glyph['system.structure.frontmatter']+
+			Glyph['system.structure.bodymatter']+
+			Glyph['system.structure.backmatter']+
+			[:section]).uniq
+		end
+
 		# Returns true if the macro names point to the same definition
 		# @param [String, Symbol] ident1 the first macro to compare
 		# @param [String, Symbol] ident2 the second macro to compare

data/macros/core.rb

@@ -131,9 +131,9 @@ end
 
 macro :condition do
 	min_parameters 1
-	max_parameters 2
+	max_parameters 3
 	res = param(0)
-	(res.blank? || res == "false") ? "" : param(1).to_s
+	(res.blank? || res == "false") ? param(2).to_s : param(1).to_s
 end
 
 macro :eq do
@@ -195,6 +195,10 @@ macro "rewrite:" do
 	nil
 end
 
+macro "output?" do
+	Glyph['document.output'].in? parameters
+end
+
 macro_alias '--' => :comment
 macro_alias '&' => :snippet
 macro_alias '&:' => 'snippet:'

data/macros/filters.rb

@@ -70,6 +70,28 @@ macro :markdown do
 	end
 end
 
+rewrite "textile_section", 
+%{section[
+		@src[{{src}}]
+		@id[{{id}}]
+		@notoc[{{notoc}}]
+		@title[{{title}}]
+		textile[
+{{0}}
+		]
+	]}
+
+rewrite "markdown_section", 
+%{section[
+		@src[{{src}}]
+		@id[{{id}}]
+		@notoc[{{notoc}}]
+		@title[{{title}}]
+		markdown[
+{{0}}
+		]
+	]}
+
 macro :highlight do
 	exact_parameters 2  
 	lang = param(0)
@@ -123,3 +145,7 @@ end
 
 macro_alias :md => :markdown
 macro_alias :txt => :textile
+macro_alias :txt_section => :textile_section
+macro_alias :md_section => :markdown_section
+macro_alias "§txt" => :textile_section
+macro_alias "§md" => :markdown_section

data/macros/html/structure.rb

@@ -181,6 +181,7 @@ end
 (Glyph['system.structure.frontmatter'] + Glyph['system.structure.bodymatter'] + Glyph['system.structure.backmatter']).
 	each {|s| macro_alias s => :section }
 
+macro_alias "§" => :section
 macro_alias :frontcover => :section
 macro_alias :titlepage => :section
 macro_alias :halftitlepage => :section

data/macros/html5/structure.rb

@@ -130,6 +130,7 @@ end
 (Glyph['system.structure.frontmatter'] + Glyph['system.structure.bodymatter'] + Glyph['system.structure.backmatter']).
 	each {|s| macro_alias s => :section }
 
+macro_alias "§" => :section
 macro_alias :frontcover => :section
 macro_alias :titlepage => :section
 macro_alias :halftitlepage => :section

data/spec/lib/commands_spec.rb

@@ -231,10 +231,11 @@ test_project - Outline
 		reset_quiet
 		create_project
 		out = run_command(["stats", "-ms"])
-		out.should match "-- Total Macro Definitions: 44" 
+		total_macros = (Glyph::MACROS.keys - Glyph::ALIASES[:by_alias].keys).uniq.length
+		out.should match "-- Total Macro Definitions: #{total_macros}" 
 		out.should match "-- Unused Snippets: test"
 		out = run_command(["stats"])
-		out.should match "-- Total Macro Definitions: 44" 
+		out.should match "-- Total Macro Definitions: #{total_macros}" 
 		out.should_not match "-- Unused Snippets: test"
 		out.should match "-- Total Unreferenced Bookmarks: 3"
 		out = run_command(["stats", "-lb", "--bookmark=md"])

data/spec/lib/macro_spec.rb

@@ -176,6 +176,32 @@ describe Glyph::Macro do
 		m.node.attribute(:b)[:value].should == nil
 	end
 
+	it "should treat empty parameters/attributes as null" do
+		Glyph.macro :test_ap do
+			result = ""
+			if attr(:a) then
+				result << "(a)"
+			else
+				result << "(!a)"
+			end
+			if param(0) then
+				result << "(0)"
+			else
+				result << "(!0)"
+			end
+			if param(1) then
+				result << "(1)"
+			else
+				result << "(!1)"
+			end
+			result
+		end
+		output_for("test_ap[]").should == "(!a)(!0)(!1)"
+		output_for("test_ap[@a[]|]").should == "(!a)(!0)(!1)"
+		output_for("test_ap[@a[.]|]").should == "(a)(!0)(!1)"
+		output_for("test_ap[@a[.].|.]").should == "(a)(0)(1)"
+	end
+
 	it "should expose a path method to determine its location" do
 		tree = Glyph::Parser.new(%{
 		test1[

data/spec/macros/core_spec.rb

@@ -74,6 +74,11 @@ describe "Macro:" do
 		Glyph['test_config'].should == true
 	end
 
+	it "condition (else)" do
+		output_for("?[true|OK|NOT OK]").should == "OK"
+		output_for("?[false|OK|NOT OK]").should == "NOT OK"
+	end
+
 	it "comment" do
 		output_for("--[config:[some_random_setting|test]]").should == ""
 		Glyph[:some_random_setting].should == nil
@@ -182,6 +187,7 @@ Test -- Test Snippet
 		define_em_macro
 		interpret("rewrite:[rw_test|em[{{0}}\\.em[{{a}}]]]").process
 		output_for("rw_test[test @a[em[A!]]]").should == "<em>test<em><em>A!</em></em></em>"
+		output_for("rw_test[]").should == "<em><em></em></em>"
 	end
 
 	it "rewrite should detect mutual definitions" do
@@ -191,4 +197,14 @@ Test -- Test Snippet
 		end.should raise_error(Glyph::MacroError)
 	end
 
+	it "output?" do
+		out = Glyph['document.output']
+		Glyph['document.output'] = "html"
+		output_for("?[output?[html|web]|YES!]").should == "YES!"
+		Glyph['document.output'] = "web"
+		output_for("?[output?[html|web]|YES!]").should == "YES!"
+		Glyph['document.output'] = "web5"
+		output_for("?[output?[html|web]|YES!|NO...]").should == "NO..."
+	end
+
 end	

data/spec/macros/filters_spec.rb

@@ -73,5 +73,11 @@ interpret text
 			check.call 'coderay', cr_result if cr
 	end
 
+	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>"
+	end
+
 
 end	

data/styles/coderay.css

@@ -1,49 +1,38 @@
-.CodeRay {
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  background-color: #222;
-  font-family: 'Courier New', 'Terminal', monospace;
-  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; }
+.CodeRay pre {
+  line-height: 1.2em;
+  margin: 0px;
+  color: #FFF; }
+.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; }

data/styles/coderay.scss

@@ -1,10 +1,10 @@
 @import "definitions.scss";
 .CodeRay {
-	@include codeblock;
   pre {
 		line-height: 1.2em;
     margin: 0px;
-    padding: 0px; }
+		color: #FFF;
+  }
 	.no {
 		font-weight: bold;
 		color: #595959;

data/styles/default.css

@@ -1,6 +1,6 @@
 * {
-  border: none;
   font-family: inherit;
+  border: none;
   font-size: 100%;
   font-style: inherit;
   margin: 0;
@@ -201,7 +201,7 @@ a {
   a:hover {
     color: #005b91; }
 
-pre > code {
+.code > pre {
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   border-radius: 5px;
@@ -209,11 +209,10 @@ pre > code {
   font-family: 'Courier New', 'Terminal', monospace;
   color: #E6E0DB;
   padding: 20px;
-  overflow: auto;
-  font-size: 0.8em;
+  overflow: auto hidden;
   margin: 20px 0 20px 0; }
 
-code {
+code, .CodeRay {
   font-size: 0.8em; }
 
 span.line-numbers {

data/styles/default.scss

@@ -1,8 +1,8 @@
 @import "definitions.scss";
 
 * {
-  border: none;
   font-family: inherit;
+  border: none;
   font-size: 100%;
   font-style: inherit;
   margin: 0;
@@ -207,11 +207,11 @@ a {
   &:hover {
     color: $link-hover-color; } }
 
-pre > code {
-	@include codeblock; }
+.code > pre {
+  @include codeblock; }
 
-code { 
-	font-size: 0.8em; }
+code, .CodeRay { 
+  font-size: 0.8em; }
 
 span.line-numbers {
   margin: 0;

data/styles/definitions.scss

@@ -14,7 +14,5 @@ $link-hover-color: #005B91;
   font-family: 'Courier New', 'Terminal', monospace;
   color: #E6E0DB;
   padding: 20px;
-  overflow: auto;
-  font-size: 0.8em;
-  margin: 20px 0 20px 0;
-}
+  overflow: auto hidden;
+  margin: 20px 0 20px 0; }

data/styles/generate

@@ -1,3 +1,3 @@
-sass pagination.scss > pagination.css
-sass default.scss > default.css
-sass coderay.scss > coderay.css
+sass pagination.scss pagination.css
+sass default.scss default.css
+sass coderay.scss coderay.css

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glyph
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Fabio Cevasco
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -06:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: glyph
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -433,29 +433,29 @@ signing_key:
 specification_version: 3
 summary: Glyph -- A Ruby-powered Document Authoring Framework
 test_files: 
-- spec/macros/web5_spec.rb
+- spec/macros/core_spec.rb
 - spec/macros/web_spec.rb
-- spec/macros/macros_spec.rb
-- spec/macros/textile_spec.rb
+- spec/macros/html5_spec.rb
 - spec/macros/filters_spec.rb
+- spec/macros/web5_spec.rb
+- spec/macros/textile_spec.rb
 - spec/macros/xml_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/config_spec.rb
-- spec/lib/reporter_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/lib/macro_spec.rb
 - spec/lib/macro_validators_spec.rb
-- spec/lib/interpreter_spec.rb
+- spec/lib/config_spec.rb
 - spec/lib/glyph_spec.rb
-- spec/lib/bookmark_spec.rb
-- spec/lib/document_spec.rb
+- spec/lib/parser_spec.rb
 - spec/lib/syntax_node_spec.rb
-- spec/lib/node_spec.rb
-- spec/lib/commands_spec.rb
-- spec/spec_helper.rb
+- spec/lib/document_spec.rb
+- spec/lib/reporter_spec.rb
 - spec/tasks/load_spec.rb
-- spec/tasks/project_spec.rb
 - spec/tasks/generate_spec.rb
+- spec/tasks/project_spec.rb
+- spec/files/custom_command.rb
+- spec/spec_helper.rb