glyph 0.3.0 → 0.4.0

data/book/text/text_editing/section_aliases.glyph

@@ -0,0 +1,28 @@
+	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.
+
+The following table lists the identifiers of all section-like macros, divided according to the part of the book they should be placed in:
+	]
+	table[
+  	tr[
+   		th[Frontmatter]
+    	td[txt[@imprint@ ^&dagger;^, @dedication@ ^&dagger;^, @inspiration@ ^&dagger;^, @foreword@ ^&Dagger;^, @introduction@ ^&Dagger;^, @acknowledgement@ ^&Dagger;^, @prologue@ ^&Dagger;^, @toc@ ^*^]]
+  	]
+  	tr[
+    	th[Bodymatter]
+    	td[txt[@volume@, @book@, @part@, @chapter@]]
+  	]
+  	tr[
+    	th[Backmatter]
+    	td[txt[@epilogue@ ^&Dagger;^, @afterword@ ^&Dagger;^, @postscript@ ^&dagger;^, @appendix@, @addendum@ ^&Dagger;^, @glossary@ ^**&Dagger;^, @colophon@ ^&dagger;^, @bibliography@ ^**&Dagger;^, @promotion@ ^&dagger;^, @references@ ^**&Dagger;^, @index@ ^**&Dagger;^, @lot@ ^**&Dagger;^, @lof@ ^**&Dagger;^]]
+  	]
+	]
+
+	p[strong[*]: The %>[toc] is used to generate the Table of Contents automatically, and it takes no parameters.]
+	p[strong[**]: This macro is likely to be extended in future versions to generate/aggregate content automatically.]
+	p[strong[&dagger;]: This section is not listed in the Table of Contents.]
+	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.
+	]

data/book/text/text_editing/sections.glyph

@@ -1,6 +1,3 @@
-section[
-	@title[Sections and Headers]
-	@id[sec_head]
 
 	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:]
 
@@ -15,7 +12,7 @@ This section is nested into the previous one.
 ] --[End of Section #1]
 	=]
 
-	txt[This example defines two nested sections. If the code[@title] attribute is specified like in this case, it will be converted to a proper HTML header and it will appear in the table of contents (see the %>[toc]).
+	txt[This example defines two nested sections. If the code[@title] attribute is specified like in this case, it will be converted to a proper HTML header and it will appear in the Table of Contents (see the %>[toc]).
 
 Note an important difference from HTML: there is no need for an explicit level for the headers, as it will be determined at runtime when the document is compiled, based on how sections are nested. The previous code snippet (taken as it is), for example, will be transformed into the following HTML code:]
 
@@ -32,32 +29,4 @@ 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).
-
-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.
-
-The following table lists the identifiers of all section-like macros, divided according to the part of the book they should be placed in:
-	]
-	table[
-  	tr[
-   		th[Frontmatter]
-    	td[txt[@imprint@ ^&dagger;^, @dedication@ ^&dagger;^, @inspiration@ ^&dagger;^, @foreword@ ^&Dagger;^, @introduction@ ^&Dagger;^, @acknowledgement@ ^&Dagger;^, @prologue@ ^&Dagger;^, @toc@ ^*^]]
-  	]
-  	tr[
-    	th[Bodymatter]
-    	td[txt[@volume@, @book@, @part@, @chapter@]]
-  	]
-  	tr[
-    	th[Backmatter]
-    	td[txt[@epilogue@ ^&Dagger;^, @afterword@ ^&Dagger;^, @postscript@ ^&dagger;^, @appendix@, @addendum@ ^&Dagger;^, @glossary@ ^**&Dagger;^, @colophon@ ^&dagger;^, @bibliography@ ^**&Dagger;^, @promotion@ ^&dagger;^, @references@ ^**&Dagger;^, @index@ ^**&Dagger;^, @lot@ ^**&Dagger;^, @lof@ ^**&Dagger;^]]
-  	]
-	]
-
-	p[strong[*]: The %>[toc] is used to generate the Table of Contents automatically, and it takes no parameters.]
-	p[strong[**]: This macro is likely to be extended in future versions to generate/aggregate content automatically.]
-	p[strong[&dagger;]: This section is not listed in the Table of Contents.]
-	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.
 	]
-] 

data/book/text/text_editing/stylesheets.glyph

@@ -1,10 +1,10 @@
-section[
-	@title[Adding Stylesheets]
-	@id[stylesheets]
 	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).]
+	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].
+	]
 	section[
 		@title[Default Stylesheets]
 		@id[default_stylesheets]
@@ -32,5 +32,3 @@ section[
 			]
 		]
 	]
-]
-

data/book/text/text_editing/topics.glyph

@@ -0,0 +1,33 @@
+txt[
+Sections can also be used to create _topics_. In a technical writing context, the term topic identifies a single page of an online help (e.g. a Compiled HTML file, or CHM). Topics should generally be:
+* self-contained, in the sense that they should make sense on their own, ideally without the need to be read in sequence
+* be used for either _concepts_, _tasks_ or _references_
+* be divided into meaningful sections like _Introduction_, _Procedure_, _Result_
+
+Glyph does not formally enforce the correctness of topic composition and usage, but it does enable authors to create them as a sort of external sections. Consider the following Glyph code:
+]
+highlight[=html|
+section[
+	@title[My First Topic]
+	@id[first_topic]
+	@src[test/first_topic.glyph]
+]
+=]
+txt[
+This is an ordinary section with a title and an explicit ID, but it has no contents. Instead, its code[@src] attribute references an external file. If you are generating a single-file document, like a standalone HTML file or a PDF file, the code snippet above is exactly the same as the following:
+]
+highlight[=html|
+section[
+	@title[My First Topic]
+	@id[first_topic]
+	include[test/first_topic.glyph]
+]
+=]
+txt[
+On the other hand, if you are planning on producing a document comprised of multiple files (see =>[#web_output]), the code[@src] attribute tells Glyph to create a _topic_ for the section. In this case:
+* The code[@title] attribute must be specified and is used as the topic title
+* The body of the topic is constituted by the contents of the file referenced by the code[@src] attribute.
+* The topic file is rendered according to a specific =>[#layouts|layout]. 
+* The location of the topic is the same as the location of the included file, mirrored in the output folder.
+* Glyph takes care of changing the file extensions and resolving links automatically, regardless of the output target.
+]

data/book/text/text_editing/xml_fallback.glyph

@@ -0,0 +1,73 @@
+	p[Sure Textile and Markdown are great, but sometimes you may want to just use HTML, without the extra verbosity, of course. Take tables for example: Textile offers an easy way to create them, but things may get dirty when you need to have multiple paragraphs or lists within cells.]
+	p[Very early versions of Glyph used to offered some simple code[table], code[tr], code[tr], code[td] macros just for that. Of course the problem was that thy didn't offer any way to customize the markup by adding, for example, CSS classes.]
+	p[Instead, by default, Glyph can convert any unrecognized macro to the corresponding XML element and macro attributes to XML attributes.]
+	box[Example|
+		p[&[gcode]]
+		highlight[=html|
+table[@class[features]
+  tr[
+		th[ID]
+		th[Priority]
+		th[Description]
+  ]
+  tr[
+    td[27]
+    td[span[@style[color:red;font-weight:bold;] HIGH]]
+    td[HTML output]
+  ]
+  tr[
+    td[42]
+    td[span[@style[color:green;font-weight:bols;] LOW]]
+    td[
+      p[Support for less-used tags:]
+      ul[
+        li[cite]
+        li[sup]
+        li[...]
+      ]
+    ]
+  ]
+]
+			=]
+		p[&[htmlcode]]
+		highlight[=html|
+<table class="features">
+  <tr>
+    <th>ID</th>
+    <th>Priority</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>27</td>
+    <td><span style="color:red;font-weight:bold;">HIGH</span></td>
+    <td>HTML output</td>
+  </tr>
+  <tr>
+    <td>42</td>
+    <td><span style="color:green;font-weight:bold;">LOW</span></td>
+    <td>
+      <p>Support for less-used tags:</p>
+      <ul>
+        <li>cite</li>
+        <li>sup</li>
+        <li>...</li>
+      </ul>
+    </td>
+  </tr>
+</table>
+    =]
+	]
+	p[Basically, if the $>[options.xml_fallback] is set to code[true], any macro unknown to Glyph with at most one parameter will be converted to an XML tag with the same name and any attribute will be converted to the corresponding XML attribute.]
+	important[While macro names and attributes are validated so that an error is returned if they contain illegal character, no check is performed against any particular XML schema.]
+	txt[Additionally, it is possible to force macro-to-XML conversion by prepending an equal sign to any macro, so for example code[=\.=snippet[test]=] will be converted into @<snippet>test</snippet>@.]
+	section[
+		@title[Blacklisted XML tags]
+		@id[xml_blacklist]
+		txt[
+By default, the following tags are blacklisted and will be ignored:
+%[=Glyph['options.xml_blacklist'].map{\|v\| "* @#{v}@"}.join("\n")=]
+
+			tip[You can change this list by modifying the $>[options.xml_blacklist].]
+		]
+ 
+	]

data/book/text/troubleshooting/errors_command.glyph

@@ -1,5 +1,3 @@
-section[
-	@title[Command Errors]
 	error_table[
 		ref_error[Source file '\.em[source_file]' does not exist|
 Returned if Glyph is running in =>[#lite_mode|lite mode] and the specified source file was not found.
@@ -36,4 +34,3 @@ The name of an unknown setting was specified for the #>[config].
 Returned by the #>[config] when attempting to override a setting in the code[system.*] namespace.
 		]
 	]
-] 

data/book/text/troubleshooting/errors_generic.glyph

@@ -1,8 +1,6 @@
-section[
-	@title[Generic Errors]
 	error_table[
 		ref_error[Invalid alias: macro '\.em[macro_name]' already exists|
-The alias name supplied to the @macro_alias@ method has already been used for another macro or alias.
+The alias name supplied to the code[macro_alias] method has already been used for another macro or alias.
 		]
 		ref_error[Undefined macro '\.em[macro_name]'|
 The document contains a macro that does not exist, i.e. it is not a standard or used-defined =>[#macro_ref|Glyph macro or alias].
@@ -10,8 +8,8 @@ The document contains a macro that does not exist, i.e. it is not a standard or
 		ref_error[An error occurred when generating _file-name_.pdf|
 Returned if Prince could not generate the PDF file or if Prince is not installed. Normally, Prince provides additional details on the specific error(s).
 		]
-		ref_error[Glyph cannot generate PDF. Please specify a valid tools.pdf_generator setting|
-Returned if the $>[tools.pdf_generator] has not be set to a valid PDF renderer. Currently, the only supported value for this setting is code[prince].
+		ref_error[Glyph cannot generate PDF. Please specify a valid output.pdf.generator setting|
+Returned if the $>[output.pdf.generator] has not be set to a valid PDF renderer. Currently, the only supported values for this setting are code[prince] and code[wkhtmltopdf].
 		]
 		ref_error[The current directory is not a valid Glyph project|
 Returned if a glyph command was executed outside a valid glyph project directory.
@@ -25,5 +23,22 @@ The code[snippet.yml] file contains invalid data. Most likely, it does not evalu
 		ref_error[File '\.em[file_name]' already exists|
 Returned if the name of an existing file was specified as a parameter for the #>[add].
 		]
+		ref_error[Unknown macro '\.em[macro_name]'|
+Returned by the #>[stats] if the specified macro was not found.
+		]
+		ref_error[Macro '\.em[macro_name]' is not used in this document|
+Returned by the #>[stats] if the specified macro is defined but unused.
+		]
+		ref_error[Bookmark '\.em[bookmark_name]' does not exist|
+Returned by the #>[stats] if the specified bookmark does not exist.
+		]
+		ref_error[No link matching /\.em[regexp]/ was found|
+Returned by the #>[stats] if the no link target matches the supplied regular expression.
+		]
+		ref_error[Unknown snippet '\.em[snippet_name]'|
+Returned by the #>[stats] if the specified snippet was not found.
+		]
+		ref_error[Snippet '\.em[snippet_name]' is not used in this document|
+Returned by the #>[stats] if the specified snippet is defined but unused.
+		]
 	]
-] 

data/book/text/troubleshooting/errors_macro.glyph

@@ -1,5 +1,3 @@
-section[
-	@title[Macro Errors]
 	txt[
 The following errors are displayed in the form:
 
@@ -29,7 +27,7 @@ Returned if the macro was called with a different number of parameters than.
 Returned by the %>[include] if used in =>[#lite_mode|lite mode].
 		]
 		ref_error[Filter macro '\.em[extension]' not available|
-Returned by a filter macro if $>[filters.by_file_extension] is set to @true@, but the extension was not recognized.
+Returned by a filter macro if $>[options.filters_by_file_extension] is set to @true@, but the extension was not recognized.
 		]
 		ref_error[Invalid regular expression: em[regexp]|
 Returned by the %>[match] if an invalid regular expression was supplied.
@@ -56,7 +54,7 @@ Returned by the %>[snippet] if an invalid snippet ID was supplied.
 Returned by the %>[include] if an invalid file was supplied.
 		]
 		ref_error[Filter macro '\.em[macro_name]' not found|
-Returned by the %>[include] if the $>[filters.by_file_extension] is set to @true@ but the file extension of the included file is not recognized as a filter macro.
+Returned by the %>[include] if the $>[options.filters_by_file_extension] is set to @true@ but the file extension of the included file is not recognized as a filter macro.
 		]
 		ref_error[RedCloth gem not installed. Please run: gem install RedCloth|
 Returned by the %>[textile] if the RedCloth gem is not installed.
@@ -89,10 +87,15 @@ An invalid XML attribute name was supplied to the code[\|xml\|] system macro (se
 Returned if a forbidden macro was used in safe mode (see =>[#modes]).
 		]
 		ref_error[Cannot reset 'system.\.em[setting_name]' setting (system use only).|
-Returned by the =>[config:] when attempting to override a setting in the code[system.*] namespace.
+Returned by the =>[#m_config_] when attempting to override a setting in the code[system.*] namespace.
 		]
 		ref_error[Macro '\.em[macro_name]' cannot be defined by itself|
-Returned by the =>[rewrite:] if it contains a macro with the same name.
-		]
+Returned by the =>[#m_rewrite_] if it contains a macro with the same name.
+		]
+		ref_error[Macro '\.em[macro_a]' must be within a '\.em[macro_b]' macro|
+Returned if a macro was used in the wrong place.
+		] 
+		ref_error[Macro '\.em[macro_a]' must not be within a '\.em[macro_b]' macro|
+Returned if a macro was used in the wrong place.
+		] 
 	]
-]

data/book/text/troubleshooting/errors_parser.glyph

@@ -1,5 +1,3 @@
-section[
-	@title[Parsing Errors]
 	error_table[
 		ref_error[Macro delimiter '\.em[delimiter]' not escaped|
 Returned in case of unescaped code[\[]or code[\]].
@@ -26,4 +24,3 @@ Returned if an escaping macro contains another escaping macro.
 Returned if a parameter delimiter is outside a macro or inside an attribute.
 		]
 	]
-]

data/config.yml

@@ -6,32 +6,68 @@
   :filename: ""
   :revision: ""
   :draft: false
-  :output: 'html'
-:language:
-  :set: 'glyph' # xml, core, filters
-  :options:
-    :xml_fallback: true
-    :xml_blacklist:
-      - applet
-      - base
-      - basefont
-      - embed
-      - frame
-      - frameset
-      - iframe
-      - isindex
-      - meta
-      - noframes
-      - noscript
-      - object
-      - param
-      - title
-:tools:
-  :pdf_generator: 'prince'
+  :output: html
+  :styles: embed # link, import
+:options:
+  :url_validation: false
+  :macro_set: 'glyph' # core, xml, filters
+  :safe_mode: false
+  :filter_by_file_extension: true
+  :xml_fallback: true
+  :xml_blacklist:
+    - applet
+    - base
+    - basefont
+    - embed
+    - frame
+    - frameset
+    - iframe
+    - isindex
+    - meta
+    - noframes
+    - noscript
+    - object
+    - param
+    - title
+:output:
+  :html:
+    :multifile: false
+    :extension: '.html'
+    :filter_target: 'html'
+    :macro_dirs: ['html']
+  :html5:
+    :multifile: false
+    :extension: '.html'
+    :filter_target: 'html'
+    :macro_dirs: ['html', 'html5']
+  :pdf:
+    :multifile: false
+    :extension: '.pdf'
+    :filter_target: 'html'
+    :generator: 'wkhtmltopdf'
+    :macro_dirs: ['html']
+  :web:
+    :multifile: true
+    :extension: '.html'
+    :filter_target: 'html'
+    :macro_dirs: ['html']
+    :layout_dirs: ['web']
+    :layouts:
+      :topic: 'topic'
+      :index: 'index'
+    :base: "/"
+  :web5:
+    :multifile: true
+    :extension: '.html'
+    :filter_target: 'html'
+    :macro_dirs: ['html', 'html5']
+    :layout_dirs: ['web5']
+    :layouts:
+      :topic: 'topic'
+      :index: 'index'
+    :base: "/"
 :filters:
-  :by_file_extension: true
   :highlighter: 'coderay'
-  :target: 'html'
   :markdown:
     :converter: 'bluecloth'
   :redcloth:
@@ -44,7 +80,6 @@
     :theme: 'lazy'
 :system:
   :quiet: false
-  :output_targets: [:html, :pdf]
   :structure:
     :hidden:
       - :imprint

data/glyph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glyph}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabio Cevasco"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-09-03}
   s.default_executable = %q{glyph}
   s.description = %q{Glyph is a framework for structured document authoring.}
   s.email = %q{h3rald@h3rald.com}
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
      "README.textile"
   ]
   s.files = [
-    "AUTHORS.textile",
+    ".gitignore",
+     "AUTHORS.textile",
      "CHANGELOG.textile",
      "LICENSE.textile",
      "README.textile",
@@ -29,33 +30,40 @@ Gem::Specification.new do |s|
      "bin/glyph",
      "book/config.yml",
      "book/document.glyph",
-     "book/images/document_generation.png",
-     "book/images/glyph.png",
-     "book/images/glyph.svg",
+     "book/images/glyph/commands_tasks.png",
+     "book/images/glyph/document_generation.png",
+     "book/images/glyph/glyph.eps",
+     "book/images/glyph/glyph.png",
+     "book/images/glyph/glyph.svg",
+     "book/lib/commands/commands.rb",
+     "book/lib/layouts/bookindex.glyph",
+     "book/lib/layouts/bookpage.glyph",
+     "book/lib/layouts/project.glyph",
      "book/lib/macros/reference.rb",
-     "book/output/html/glyph.html",
-     "book/output/html/images/document_generation.png",
-     "book/output/html/images/glyph.png",
-     "book/output/html/images/glyph.svg",
-     "book/output/pdf/glyph.pdf",
+     "book/lib/tasks/tasks.rake",
      "book/resources/document_generation.txt",
-     "book/script/authors",
-     "book/script/changelog",
-     "book/script/license",
-     "book/script/readme",
      "book/snippets.yml",
-     "book/text/acknowledgement.glyph",
+     "book/text/acknowledgements.glyph",
      "book/text/changelog.glyph",
      "book/text/compiling/compiling.glyph",
      "book/text/compiling/lite_mode.glyph",
      "book/text/compiling/programmatic_usage.glyph",
+     "book/text/config/document.glyph",
+     "book/text/config/filters.glyph",
+     "book/text/config/options.glyph",
+     "book/text/config/output.glyph",
      "book/text/extending/bookmarks_headers.glyph",
+     "book/text/extending/command.glyph",
+     "book/text/extending/commands_tasks.glyph",
      "book/text/extending/further_reading.glyph",
      "book/text/extending/internals.glyph",
      "book/text/extending/interpreting.glyph",
+     "book/text/extending/layouts.glyph",
      "book/text/extending/macro_def.glyph",
+     "book/text/extending/output_format.glyph",
      "book/text/extending/params_attrs.glyph",
      "book/text/extending/placeholders.glyph",
+     "book/text/extending/task.glyph",
      "book/text/extending/validators.glyph",
      "book/text/getting_started/configuration.glyph",
      "book/text/getting_started/create_project.glyph",
@@ -68,10 +76,15 @@ Gem::Specification.new do |s|
      "book/text/macros/macros_inline.glyph",
      "book/text/macros/macros_structure.glyph",
      "book/text/ref_commands.glyph",
-     "book/text/ref_config.glyph",
-     "book/text/ref_macros.glyph",
+     "book/text/stats/bookmarks.glyph",
+     "book/text/stats/links.glyph",
+     "book/text/stats/macros.glyph",
+     "book/text/stats/snippets.glyph",
+     "book/text/stats/stats.glyph",
+     "book/text/text_editing/attribute_intro.glyph",
      "book/text/text_editing/code.glyph",
      "book/text/text_editing/conditionals.glyph",
+     "book/text/text_editing/esc_quot.glyph",
      "book/text/text_editing/evaluation.glyph",
      "book/text/text_editing/glyph_files.glyph",
      "book/text/text_editing/images.glyph",
@@ -79,41 +92,71 @@ Gem::Specification.new do |s|
      "book/text/text_editing/links.glyph",
      "book/text/text_editing/macro_intro.glyph",
      "book/text/text_editing/raw_html.glyph",
+     "book/text/text_editing/section_aliases.glyph",
      "book/text/text_editing/sections.glyph",
      "book/text/text_editing/stylesheets.glyph",
+     "book/text/text_editing/topics.glyph",
+     "book/text/text_editing/xml_fallback.glyph",
      "book/text/troubleshooting/errors_command.glyph",
      "book/text/troubleshooting/errors_generic.glyph",
-     "book/text/troubleshooting/errors_intro.glyph",
      "book/text/troubleshooting/errors_macro.glyph",
      "book/text/troubleshooting/errors_parser.glyph",
      "config.yml",
      "document.glyph",
      "glyph.gemspec",
+     "layouts/web/index.glyph",
+     "layouts/web/topic.glyph",
+     "layouts/web5/index.glyph",
+     "layouts/web5/topic.glyph",
      "lib/glyph.rb",
+     "lib/glyph/analyzer.rb",
+     "lib/glyph/bookmark.rb",
      "lib/glyph/commands.rb",
+     "lib/glyph/commands/add.rb",
+     "lib/glyph/commands/compile.rb",
+     "lib/glyph/commands/config.rb",
+     "lib/glyph/commands/init.rb",
+     "lib/glyph/commands/outline.rb",
+     "lib/glyph/commands/stats.rb",
+     "lib/glyph/commands/todo.rb",
      "lib/glyph/config.rb",
      "lib/glyph/document.rb",
      "lib/glyph/interpreter.rb",
      "lib/glyph/macro.rb",
+     "lib/glyph/macro_helpers.rb",
      "lib/glyph/macro_validators.rb",
      "lib/glyph/node.rb",
      "lib/glyph/parser.rb",
+     "lib/glyph/reporter.rb",
      "lib/glyph/syntax_node.rb",
      "lib/glyph/system_extensions.rb",
+     "lib/glyph/utils.rb",
      "macros/core.rb",
      "macros/filters.rb",
      "macros/html/block.rb",
      "macros/html/inline.rb",
      "macros/html/structure.rb",
+     "macros/html5/block.rb",
+     "macros/html5/inline.rb",
+     "macros/html5/structure.rb",
      "macros/xml.rb",
      "spec/files/article.glyph",
      "spec/files/container.textile",
+     "spec/files/custom_command.rb",
+     "spec/files/custom_tasks.rake",
      "spec/files/document.glyph",
+     "spec/files/document_for_stats.glyph",
      "spec/files/document_with_toc.glyph",
      "spec/files/included.textile",
      "spec/files/ligature.jpg",
      "spec/files/markdown.markdown",
+     "spec/files/references.glyph",
      "spec/files/test.sass",
+     "spec/files/web1.glyph",
+     "spec/files/web2.glyph",
+     "spec/files/web_doc.glyph",
+     "spec/lib/analyzer_spec.rb",
+     "spec/lib/bookmark_spec.rb",
      "spec/lib/commands_spec.rb",
      "spec/lib/config_spec.rb",
      "spec/lib/document_spec.rb",
@@ -123,11 +166,15 @@ Gem::Specification.new do |s|
      "spec/lib/macro_validators_spec.rb",
      "spec/lib/node_spec.rb",
      "spec/lib/parser_spec.rb",
+     "spec/lib/reporter_spec.rb",
      "spec/lib/syntax_node_spec.rb",
      "spec/macros/core_spec.rb",
      "spec/macros/filters_spec.rb",
+     "spec/macros/html5_spec.rb",
      "spec/macros/macros_spec.rb",
      "spec/macros/textile_spec.rb",
+     "spec/macros/web5_spec.rb",
+     "spec/macros/web_spec.rb",
      "spec/macros/xml_spec.rb",
      "spec/spec_helper.rb",
      "spec/tasks/generate_spec.rb",
@@ -164,17 +211,22 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.h3rald.com/glyph/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  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/web_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/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/config_spec.rb",
@@ -182,9 +234,11 @@ Gem::Specification.new do |s|
      "spec/lib/parser_spec.rb",
      "spec/lib/syntax_node_spec.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/files/custom_command.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -192,40 +246,40 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gli>, [">= 0.3.1"])
-      s.add_runtime_dependency(%q<extlib>, [">= 0.9.12"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<gli>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<extlib>, [">= 0.9.15"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_development_dependency(%q<rspec>, [">= 1.1.11"])
-      s.add_development_dependency(%q<yard>, [">= 1.5.4"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
       s.add_development_dependency(%q<jeweler>, ["= 1.4.0"])
       s.add_development_dependency(%q<directory_watcher>, [">= 1.3.2"])
-      s.add_development_dependency(%q<haml>, [">= 3.0.6"])
+      s.add_development_dependency(%q<haml>, [">= 3.0.15"])
       s.add_development_dependency(%q<RedCloth>, [">= 4.2.3"])
       s.add_development_dependency(%q<bluecloth>, [">= 2.0.7"])
       s.add_development_dependency(%q<coderay>, [">= 0.9.3"])
     else
-      s.add_dependency(%q<gli>, [">= 0.3.1"])
-      s.add_dependency(%q<extlib>, [">= 0.9.12"])
+      s.add_dependency(%q<gli>, [">= 1.1.1"])
+      s.add_dependency(%q<extlib>, [">= 0.9.15"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<rspec>, [">= 1.1.11"])
-      s.add_dependency(%q<yard>, [">= 1.5.4"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<yard>, [">= 0.6.0"])
       s.add_dependency(%q<jeweler>, ["= 1.4.0"])
       s.add_dependency(%q<directory_watcher>, [">= 1.3.2"])
-      s.add_dependency(%q<haml>, [">= 3.0.6"])
+      s.add_dependency(%q<haml>, [">= 3.0.15"])
       s.add_dependency(%q<RedCloth>, [">= 4.2.3"])
       s.add_dependency(%q<bluecloth>, [">= 2.0.7"])
       s.add_dependency(%q<coderay>, [">= 0.9.3"])
     end
   else
-    s.add_dependency(%q<gli>, [">= 0.3.1"])
-    s.add_dependency(%q<extlib>, [">= 0.9.12"])
+    s.add_dependency(%q<gli>, [">= 1.1.1"])
+    s.add_dependency(%q<extlib>, [">= 0.9.15"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<rspec>, [">= 1.1.11"])
-    s.add_dependency(%q<yard>, [">= 1.5.4"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<yard>, [">= 0.6.0"])
     s.add_dependency(%q<jeweler>, ["= 1.4.0"])
     s.add_dependency(%q<directory_watcher>, [">= 1.3.2"])
-    s.add_dependency(%q<haml>, [">= 3.0.6"])
+    s.add_dependency(%q<haml>, [">= 3.0.15"])
     s.add_dependency(%q<RedCloth>, [">= 4.2.3"])
     s.add_dependency(%q<bluecloth>, [">= 2.0.7"])
     s.add_dependency(%q<coderay>, [">= 0.9.3"])