glyph 0.4.2 → 0.5.0

data/tasks/load.rake

@@ -4,7 +4,7 @@ namespace :load do
 	include Glyph::Utils
 
 	desc "Load all files"
-	task :all => [:config, :tasks, :commands, :snippets, :macros] do
+	task :all => [:config, :tasks, :commands, :macros] do
 	end
 
 	desc "Load tasks"
@@ -26,16 +26,6 @@ namespace :load do
 		end
 	end
 
-	desc "Load snippets"
-	task :snippets do
-		unless Glyph.lite? then
-			raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project?
-			snippets = yaml_load Glyph::PROJECT/'snippets.yml'
-			raise RuntimeError, "Invalid snippets file" unless snippets.blank? || snippets.is_a?(Hash)
-			Glyph::SNIPPETS.replace snippets
-		end
-	end
-
 	desc "Load macros"
 	task :macros do
 		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project? || Glyph.lite?
@@ -46,22 +36,17 @@ namespace :load do
 		end
 		load_layouts_from_dir = lambda do |dir|
 			load_files_from_dir(dir, ".glyph") do |file, contents|
-				Glyph.rewrite "layout:#{file.basename(file.extname)}".to_sym, contents
+				Glyph.define "layout/#{file.basename(file.extname)}".to_sym, contents
 			end
 		end
+		out_cfg = "output.#{Glyph['document.output']}"
+		reps_file = "#{Glyph["#{out_cfg}.macro_reps"]}.rb"
 		case  Glyph['options.macro_set']
 		when 'glyph' then
-			Glyph.instance_eval file_load(Glyph::HOME/'macros/core.rb')
-			Glyph.instance_eval file_load(Glyph::HOME/'macros/filters.rb')
-			Glyph.instance_eval file_load(Glyph::HOME/'macros/xml.rb')
-			macro_dirs = Glyph["output.#{Glyph['document.output']}.macro_dirs"]
-			layout_dirs = Glyph["output.#{Glyph['document.output']}.layout_dirs"] || []
-			unless macro_dirs.blank?
-				macro_dirs.each {|d| load_macros_from_dir.call Glyph::HOME/"macros/#{d}" }
-			else
-				warning "No #{Glyph['document.output']} macros defined"
-			end
-			layout_dirs.each {|d| load_layouts_from_dir.call Glyph::HOME/"layouts/#{d}" }
+			load_macros_from_dir.call Glyph::HOME/"macros"
+			# Load representations
+			Glyph.instance_eval file_load(Glyph::HOME/"macros/reps/#{reps_file}")
+			load_layouts_from_dir.call Glyph::HOME/"layouts/#{Glyph["#{out_cfg}.layout_dir"]}"
 		when 'xml' then
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/core.rb') 
 			Glyph.instance_eval file_load(Glyph::HOME/'macros/filters.rb') 
@@ -75,7 +60,7 @@ namespace :load do
 		# load project macros
 		unless Glyph.lite? then
 			load_macros_from_dir.call Glyph::PROJECT/"lib/macros"
-			load_macros_from_dir.call Glyph::PROJECT/"lib/macros/#{Glyph['document.output']}"
+			Glyph.instance_eval file_load(Glyph::PROJECT/"lib/macros/reps/#{reps_file}") rescue nil
 			load_layouts_from_dir.call Glyph::PROJECT/'lib/layouts' if Glyph.multiple_output_files?
 		end
 	end

data/tasks/project.rake

@@ -11,8 +11,6 @@ namespace :project do
 		# Create subdirectories
 		subdirs = ['lib/macros', 'lib/tasks', 'lib/layouts', 'lib/tasks', 'lib/commands', 'text', 'output', 'images', 'styles']
 		subdirs.each {|d| (dir/d).mkpath }
-		# Create snippets
-		yaml_dump Glyph::PROJECT/'snippets.yml', {:test => "This is a \nTest snippet"}
 		# Create files
 		file_copy Glyph::HOME/'document.glyph', Glyph::PROJECT/'document.glyph'
 		config = yaml_load Glyph::HOME/'config.yml'

metadata

@@ -2,12 +2,12 @@
 name: glyph
 version: !ruby/object:Gem::Version 
   hash: 11
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Fabio Cevasco
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
-default_executable: glyph
+date: 2011-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gli
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 19
         segments: 
         - 1
-        - 1
-        - 1
-        version: 1.1.1
+        - 2
+        - 6
+        version: 1.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -74,12 +73,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
+        - 2
+        - 5
         - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 2.5.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,21 +89,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 13
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        - 5
+        version: 0.6.5
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: directory_watcher
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -115,85 +114,69 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: directory_watcher
+  name: sass
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 13
         segments: 
-        - 1
         - 3
-        - 2
-        version: 1.3.2
+        - 1
+        - 7
+        version: 3.1.7
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 3
-        - 0
-        - 15
-        version: 3.0.15
-  type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 57
         segments: 
         - 4
         - 2
-        - 3
-        version: 4.2.3
+        - 7
+        version: 4.2.7
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 7
-        version: 2.0.7
+        version: 2.1.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: coderay
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 53
         segments: 
         - 0
         - 9
-        - 3
-        version: 0.9.3
+        - 7
+        version: 0.9.7
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: Glyph is a framework for structured document authoring.
 email: h3rald@h3rald.com
 executables: 
@@ -201,210 +184,212 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.textile
+- AUTHORS.textile
 - README.textile
+- LICENSE.textile
+- CHANGELOG.textile
 files: 
-- .gitignore
+- Rakefile
 - AUTHORS.textile
-- CHANGELOG.textile
-- LICENSE.textile
 - README.textile
-- Rakefile
-- VERSION
 - benchmark.rb
+- LICENSE.textile
+- CHANGELOG.textile
+- config.yml
+- glyph-0.5.0.gem
+- glyph.gemspec
+- document.glyph
 - bin/glyph
+- lib/glyph/commands.rb
+- lib/glyph/interpreter.rb
+- lib/glyph/system_extensions.rb
+- lib/glyph/bookmark.rb
+- lib/glyph/macro_validators.rb
+- lib/glyph/commands/stats.rb
+- lib/glyph/commands/init.rb
+- lib/glyph/commands/config.rb
+- lib/glyph/commands/outline.rb
+- lib/glyph/commands/todo.rb
+- lib/glyph/commands/add.rb
+- lib/glyph/commands/compile.rb
+- lib/glyph/macro.rb
+- lib/glyph/syntax_node.rb
+- lib/glyph/analyzer.rb
+- lib/glyph/config.rb
+- lib/glyph/document.rb
+- lib/glyph/reporter.rb
+- lib/glyph/parser.rb
+- lib/glyph/node.rb
+- lib/glyph/utils.rb
+- lib/glyph.rb
 - book/config.yml
 - book/document.glyph
+- book/lib/macros/reference.rb
+- book/lib/layouts/project.glyph
+- book/lib/layouts/bookpage.glyph
+- book/lib/layouts/bookindex.glyph
+- book/lib/commands/commands.rb
+- book/lib/tasks/tasks.rake
+- book/images/glyph/glyph.png
 - 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/lib/tasks/tasks.rake
-- book/resources/document_generation.txt
-- book/snippets.yml
-- 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/images/glyph/document_generation.png
 - book/text/getting_started/configuration.glyph
-- book/text/getting_started/create_project.glyph
 - book/text/getting_started/structure.glyph
-- book/text/introduction.glyph
-- book/text/license.glyph
+- book/text/getting_started/create_project.glyph
+- book/text/macros/macros_filters.glyph
+- book/text/macros/macros_structure.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/ref_commands.glyph
+- book/text/license.glyph
+- book/text/acknowledgements.glyph
+- book/text/config/options.glyph
+- book/text/config/output.glyph
+- book/text/config/filters.glyph
+- book/text/config/document.glyph
+- book/text/stats/stats.glyph
 - book/text/stats/bookmarks.glyph
-- book/text/stats/links.glyph
 - book/text/stats/macros.glyph
+- book/text/stats/links.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
-- book/text/text_editing/inclusions.glyph
-- book/text/text_editing/links.glyph
+- book/text/changelog.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/conditionals.glyph
+- book/text/text_editing/inclusions.glyph
 - book/text/text_editing/sections.glyph
-- book/text/text_editing/stylesheets.glyph
+- book/text/text_editing/code.glyph
+- book/text/text_editing/macro_composition.glyph
+- book/text/text_editing/images.glyph
+- book/text/text_editing/esc_quot.glyph
 - book/text/text_editing/topics.glyph
 - book/text/text_editing/xml_fallback.glyph
+- book/text/text_editing/links.glyph
+- book/text/text_editing/stylesheets.glyph
+- book/text/text_editing/glyph_files.glyph
+- book/text/text_editing/attribute_intro.glyph
+- book/text/text_editing/evaluation.glyph
+- book/text/extending/command.glyph
+- book/text/extending/bookmarks_headers.glyph
+- book/text/extending/placeholders.glyph
+- book/text/extending/task.glyph
+- book/text/extending/internals.glyph
+- book/text/extending/params_attrs.glyph
+- book/text/extending/interpreting.glyph
+- book/text/extending/validators.glyph
+- book/text/extending/layouts.glyph
+- book/text/extending/further_reading.glyph
+- book/text/extending/output_format.glyph
+- book/text/extending/commands_tasks.glyph
+- book/text/extending/macro_def.glyph
 - book/text/troubleshooting/errors_command.glyph
-- book/text/troubleshooting/errors_generic.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
+- book/text/troubleshooting/errors_macro.glyph
+- book/text/troubleshooting/errors_generic.glyph
+- book/text/compiling/programmatic_usage.glyph
+- book/text/compiling/compiling.glyph
+- book/text/compiling/lite_mode.glyph
+- book/text/ref_commands.glyph
+- book/text/introduction.glyph
+- book/text/snippets.glyph
+- book/resources/document_generation.txt
 - 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
+- layouts/web/index.glyph
+- layouts/web/topic.glyph
+- macros/block.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/inline.rb
+- macros/core.rb
+- macros/reps/html5.rb
+- macros/reps/html.rb
+- macros/reps/web.rb
+- macros/reps/web5.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/test.scss
-- spec/files/web1.glyph
-- spec/files/web2.glyph
-- spec/files/web_doc.glyph
+- macros/structure.rb
+- 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/bookmark_spec.rb
 - spec/lib/commands_spec.rb
-- spec/lib/config_spec.rb
-- spec/lib/document_spec.rb
-- spec/lib/glyph_spec.rb
-- spec/lib/interpreter_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/node_spec.rb
+- spec/lib/config_spec.rb
+- spec/lib/glyph_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
+- 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_tasks.rake
+- spec/files/container.textile
+- spec/files/test.sass
+- spec/files/custom_command.rb
+- spec/files/markdown.markdown
+- spec/files/references.glyph
+- spec/files/document_for_stats.glyph
+- spec/files/web1.glyph
+- spec/files/document_with_toc.glyph
+- spec/files/ligature.jpg
+- spec/files/article.glyph
+- spec/files/included.textile
+- spec/files/web_doc.glyph
+- spec/files/web2.glyph
+- spec/files/document.glyph
+- spec/files/test.scss
+- spec/config.yml
+- spec/spec_helper.rb
+- styles/pagination.css
 - styles/coderay.css
-- styles/coderay.scss
 - styles/default.css
+- styles/generate
 - styles/default.scss
 - styles/definitions.scss
-- styles/generate
-- styles/pagination.css
-- styles/pagination.scss
-- styles/ultraviolet/active4d.css
-- styles/ultraviolet/all_hallows_eve.css
-- styles/ultraviolet/amy.css
+- styles/ultraviolet/slush_poppies.css
+- styles/ultraviolet/mac_classic.css
 - styles/ultraviolet/blackboard.css
-- styles/ultraviolet/brilliance_black.css
+- styles/ultraviolet/zenburnesque.css
 - styles/ultraviolet/brilliance_dull.css
+- styles/ultraviolet/magicwb_amiga.css
+- styles/ultraviolet/sunburst.css
+- styles/ultraviolet/pastels_on_dark.css
 - styles/ultraviolet/cobalt.css
-- styles/ultraviolet/dawn.css
+- styles/ultraviolet/brilliance_black.css
+- styles/ultraviolet/lazy.css
+- styles/ultraviolet/amy.css
+- styles/ultraviolet/active4d.css
 - styles/ultraviolet/eiffel.css
-- styles/ultraviolet/espresso_libre.css
+- styles/ultraviolet/twilight.css
 - styles/ultraviolet/idle.css
-- styles/ultraviolet/iplastic.css
-- styles/ultraviolet/lazy.css
-- styles/ultraviolet/mac_classic.css
-- styles/ultraviolet/magicwb_amiga.css
-- styles/ultraviolet/pastels_on_dark.css
-- styles/ultraviolet/slush_poppies.css
+- styles/ultraviolet/dawn.css
+- styles/ultraviolet/all_hallows_eve.css
+- styles/ultraviolet/espresso_libre.css
 - styles/ultraviolet/spacecadet.css
-- styles/ultraviolet/sunburst.css
-- styles/ultraviolet/twilight.css
-- styles/ultraviolet/zenburnesque.css
+- styles/ultraviolet/iplastic.css
+- styles/coderay.scss
+- styles/pagination.scss
 - tasks/generate.rake
-- tasks/load.rake
 - tasks/project.rake
-has_rdoc: true
+- tasks/load.rake
 homepage: http://www.h3rald.com/glyph/
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -428,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Glyph -- A Ruby-powered Document Authoring Framework
@@ -457,5 +442,21 @@ test_files:
 - spec/tasks/load_spec.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/project_spec.rb
+- spec/files/custom_tasks.rake
+- spec/files/container.textile
+- spec/files/test.sass
 - spec/files/custom_command.rb
+- spec/files/markdown.markdown
+- spec/files/references.glyph
+- spec/files/document_for_stats.glyph
+- spec/files/web1.glyph
+- spec/files/document_with_toc.glyph
+- spec/files/ligature.jpg
+- spec/files/article.glyph
+- spec/files/included.textile
+- spec/files/web_doc.glyph
+- spec/files/web2.glyph
+- spec/files/document.glyph
+- spec/files/test.scss
+- spec/config.yml
 - spec/spec_helper.rb