glyph 0.5.1 → 0.5.2

data/styles/pagination.scss

@@ -1,6 +1,6 @@
 @page {
   size: A4;
-  margin: 40pt 30pt 40pt 30pt;
+  margin: 60pt 30pt 60pt 30pt;
   @top {
     content: string(book-title) " - " string(chapter-title);
     font-style: italic; }
@@ -8,12 +8,14 @@
   @bottom {
     content: counter(page, decimal); } }
 
+.bodymatter > :nth-child(1) {
+  counter-reset: page 1;
+}
 
 @page frontmatter {
   @bottom {
     content: counter(page, lower-roman); } }
 
-
 @page backmatter {
   @bottom {
     content: counter(page, decimal); } }
@@ -134,25 +136,25 @@ div {
   h3::before, section h1:before {
     content: counter(h2) "." counter(h3) "   "; } }
 
-.backmatter h3::before {
+.backmatter h3.toc::before {
   content: counter(a2, upper-latin) "." counter(h3) "   "; }
 
 .bodymatter {
-  section section h1:before {
+  section section h1.toc:before {
     content: counter(a2, upper-latin) "." counter(h3) "   "; }
-  h4::before, section section h1:before {
+  h4.toc::before, section section h1.toc:before {
     content: counter(h2) "." counter(h3) "." counter(h4) "   "; } }
 
-.backmatter h4::before {
+.backmatter h4.toc::before {
   content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "   "; }
 
 .bodymatter {
-  section section section h2:before {
+  section section section h2.toc:before {
     content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "   "; }
-  h5::before, section section section section h2:before {
+  h5.toc::before, section section section section h2.toc:before {
     content: counter(h2) "." counter(h3) "." counter(h4) "." counter(h5) "   "; } }
 
-.backmatter h5::before, .bodymatter section section section section h2:before {
+.backmatter h5.toc::before, .bodymatter section section section section h2.toc:before {
   content: counter(a2, upper-latin) "." counter(h3) "." counter(h4) "." counter(h5) "   "; }
 
 h2, section h1 {
@@ -163,25 +165,23 @@ h2, section h1 {
 .halftitlepage h2, .titlepage h2 {
   page-break-before: avoid; }
 
-.bodymatter {
-  h2, h1 {
+.bodymatter .chapter{
     counter-increment: h2;
-    counter-reset: h3; } }
+    counter-reset: h3; }
 
-.backmatter {
-  h2, h1 {
+.backmatter .appendix {
     counter-increment: a2;
-    counter-reset: h3; } }
+    counter-reset: h3; }
 
-.bodymatter h3, .backmatter h3, .bodymatter section h1, .backmatter section h1 {
+.bodymatter h3.toc, .backmatter h3.toc, .bodymatter section h1.toc, .backmatter section h1.toc {
   counter-increment: h3;
   counter-reset: h4; }
 
-.bodymatter h4, .backmatter h4, .bodymatter section section h1, .backmatter section section h1 {
+.bodymatter h4.toc, .backmatter h4.toc, .bodymatter section section h1.toc, .backmatter section section h1.toc {
   counter-increment: h4;
   counter-reset: h5; }
 
-.bodymatter h5, .backmatter h5, .bodymatter section section section h1, .backmatter section section section h1 {
+.bodymatter h5.toc, .backmatter h5.toc, .bodymatter section section section h1.toc, .backmatter section section section h1.toc {
   counter-increment: h5; }
 
 h1, h2, h3, h4, h5 {

data/tasks/generate.rake

@@ -70,7 +70,7 @@ namespace :generate do
 			file = "#{Glyph['document.filename']}#{extension}"
 		end
 		out.mkpath
-		file_write out/file, Glyph.document.output
+		file_write out/file, clean_xml_document(Glyph.document.output)
 		info "'#{file}' generated successfully."
 	end
 
@@ -133,7 +133,7 @@ namespace :generate do
 		Glyph['system.quiet'] = true
 		index_topic = Glyph::Interpreter.new("layout/#{index_layout}[]", context).document.output
 		Glyph['system.quiet'] = q
-		file_write out/"index.html", index_topic
+		file_write out/"index.html", clean_xml_document(index_topic)
 		# Generate all topics
 		Glyph.document.topics.each do |topic|
 			extension = "#{Glyph["output.#{Glyph['document.output']}.extension"]}"
@@ -141,7 +141,7 @@ namespace :generate do
 			file += extension unless file.match /#{Regexp.escape(extension)}$/
 			info "Generating topic '#{file}'"
 			(out/file).parent.mkpath
-			file_write out/file, topic[:contents]
+			file_write out/file, clean_xml_document(topic[:contents])
 		end
 		info "Web output generated successfully."
 	end

data/tasks/load.rake

@@ -19,10 +19,7 @@ namespace :load do
 	desc "Load commands"
 	task :commands do
 		unless Glyph.lite? then
-			include GLI if (Glyph::PROJECT/'lib/commands').exist?
-			load_files_from_dir(Glyph::PROJECT/'lib/commands', '.rb') do |f, contents|
-				require f
-			end
+      commands_from Glyph::PROJECT/'lib/commands'
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glyph
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &71836550 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *71836550
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &71835940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *71835940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.15
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &71757250 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +53,47 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *71757250
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71756430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *71756430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &71755780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *71755780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &71754960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +101,31 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *71754960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &71754120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.2.1
   type: :development
   prerelease: false
-  version_requirements: *71754120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &71753380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 4.2.9
   type: :development
   prerelease: false
-  version_requirements: *71753380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &71752350 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,18 +149,28 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *71752350
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &71751620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.8
   type: :development
   prerelease: false
-  version_requirements: *71751620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.8
 description: Glyph is a framework for structured document authoring.
 email: h3rald@h3rald.com
 executables:
@@ -134,18 +184,18 @@ extra_rdoc_files:
 files:
 - Rakefile
 - AUTHORS.textile
-- CHANGELOG.textile
-- LICENSE.textile
-- README.textile
 - benchmark.rb
+- CHANGELOG.textile
 - config.yml
 - document.glyph
-- glyph.gemspec
 - glyph-0.5.1.gem
+- glyph-0.5.2.gem
+- glyph.gemspec
+- LICENSE.textile
+- README.textile
 - bin/glyph
 - 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
@@ -153,9 +203,11 @@ files:
 - lib/glyph/commands/outline.rb
 - lib/glyph/commands/stats.rb
 - lib/glyph/commands/todo.rb
+- lib/glyph/commands.rb
 - lib/glyph/config.rb
 - lib/glyph/document.rb
 - lib/glyph/interpreter.rb
+- lib/glyph/macro.rb
 - lib/glyph/macro_validators.rb
 - lib/glyph/node.rb
 - lib/glyph/parser.rb
@@ -163,14 +215,13 @@ files:
 - lib/glyph/syntax_node.rb
 - lib/glyph/system_extensions.rb
 - lib/glyph/utils.rb
-- lib/glyph/macro.rb
 - lib/glyph.rb
-- book/document.glyph
 - book/config.yml
+- book/document.glyph
 - book/lib/commands/commands.rb
-- book/lib/layouts/project.glyph
 - book/lib/layouts/bookindex.glyph
 - book/lib/layouts/bookpage.glyph
+- book/lib/layouts/project.glyph
 - book/lib/macros/reference.rb
 - book/lib/tasks/tasks.rake
 - book/images/glyph/commands_tasks.png
@@ -179,6 +230,7 @@ files:
 - book/images/glyph/glyph.png
 - book/images/glyph/glyph.svg
 - 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
@@ -203,11 +255,12 @@ files:
 - book/text/getting_started/create_project.glyph
 - book/text/getting_started/structure.glyph
 - book/text/introduction.glyph
+- book/text/license.glyph
+- book/text/macros/macros_block.glyph
 - book/text/macros/macros_core.glyph
 - book/text/macros/macros_filters.glyph
 - book/text/macros/macros_inline.glyph
 - book/text/macros/macros_structure.glyph
-- book/text/macros/macros_block.glyph
 - book/text/ref_commands.glyph
 - book/text/snippets.glyph
 - book/text/stats/bookmarks.glyph
@@ -236,13 +289,12 @@ files:
 - book/text/troubleshooting/errors_generic.glyph
 - book/text/troubleshooting/errors_macro.glyph
 - book/text/troubleshooting/errors_parser.glyph
-- book/text/license.glyph
-- book/text/changelog.glyph
 - book/resources/document_generation.txt
 - layouts/web/index.glyph
 - layouts/web/topic.glyph
 - layouts/web5/index.glyph
 - layouts/web5/topic.glyph
+- macros/block.rb
 - macros/core.rb
 - macros/filters.rb
 - macros/inline.rb
@@ -252,7 +304,7 @@ files:
 - macros/reps/web5.rb
 - macros/structure.rb
 - macros/xml.rb
-- macros/block.rb
+- spec/config.yml
 - spec/files/article.glyph
 - spec/files/container.textile
 - spec/files/custom_command.rb
@@ -283,20 +335,22 @@ files:
 - 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/macros/filters_spec.rb
 - spec/spec_helper.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/load_spec.rb
 - spec/tasks/project_spec.rb
-- spec/config.yml
 - styles/coderay.css
+- styles/coderay.scss
+- styles/default.css
 - styles/default.scss
+- styles/definitions.scss
 - styles/generate
 - styles/pagination.css
 - styles/pagination.scss
@@ -321,9 +375,6 @@ files:
 - styles/ultraviolet/sunburst.css
 - styles/ultraviolet/twilight.css
 - styles/ultraviolet/zenburnesque.css
-- styles/coderay.scss
-- styles/default.css
-- styles/definitions.scss
 - tasks/generate.rake
 - tasks/load.rake
 - tasks/project.rake
@@ -348,11 +399,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Glyph -- A Ruby-powered Document Authoring Framework
 test_files:
+- spec/config.yml
 - spec/files/article.glyph
 - spec/files/container.textile
 - spec/files/custom_command.rb
@@ -383,16 +435,15 @@ test_files:
 - 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/macros/filters_spec.rb
 - spec/spec_helper.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/load_spec.rb
 - spec/tasks/project_spec.rb
-- spec/config.yml
 has_rdoc: