glyph 0.1.0 → 0.2.0

data/styles/ultraviolet/zenburnesque.css

@@ -0,0 +1,91 @@
+pre.zenburnesque .InheritedClass {
+}
+pre.zenburnesque .TypeName {
+   color: #F09040;
+}
+pre.zenburnesque .FloatingPointPrefixOperators {
+   text-decoration: underline;
+}
+pre.zenburnesque .Number {
+   color: #22C0FF;
+}
+pre.zenburnesque .Directive {
+   font-weight: bold;
+}
+pre.zenburnesque .LibraryVariable {
+}
+pre.zenburnesque .Storage {
+}
+pre.zenburnesque .line-numbers {
+   background-color: #A0A0C0;
+   color: #000000;
+}
+pre.zenburnesque .LineNumberDirectives {
+   text-decoration: underline;
+}
+pre.zenburnesque .TagName {
+}
+pre.zenburnesque .StorageTypes {
+   color: #6080FF;
+}
+pre.zenburnesque .Operators {
+   color: #FFFFA0;
+}
+pre.zenburnesque {
+   background-color: #404040;
+   color: #DEDEDE;
+}
+pre.zenburnesque .LibraryConstant {
+}
+pre.zenburnesque .VariantTypes {
+   color: #4080A0;
+}
+pre.zenburnesque .Characters {
+   color: #FF8080;
+}
+pre.zenburnesque .FunctionArgument {
+}
+pre.zenburnesque .LanguageKeyword {
+   color: #FFFFA0;
+}
+pre.zenburnesque .BuiltInConstant {
+}
+pre.zenburnesque .FloatingPointNumbers {
+   text-decoration: underline;
+}
+pre.zenburnesque .ClassTypeName {
+   color: #F4A020;
+}
+pre.zenburnesque .TypeName1 {
+   color: #FFE000;
+}
+pre.zenburnesque .ModuleKeyword {
+   font-weight: bold;
+   color: #FF8000;
+}
+pre.zenburnesque .Invalid {
+}
+pre.zenburnesque .LibraryClassType {
+}
+pre.zenburnesque .LibraryFunction {
+}
+pre.zenburnesque .TagAttribute {
+}
+pre.zenburnesque .FloatingPointInfixOperators {
+   text-decoration: underline;
+}
+pre.zenburnesque .UserDefinedConstant {
+}
+pre.zenburnesque .String {
+   color: #FF2020;
+}
+pre.zenburnesque .FunctionName {
+   font-weight: bold;
+   color: #FFCC66;
+}
+pre.zenburnesque .Variable {
+}
+pre.zenburnesque .Comment {
+   color: #709070;
+   font-style: italic;
+}

data/tasks/generate.rake

@@ -4,53 +4,72 @@ namespace :generate do
 
 	desc "Process source"
 	task :document => ["load:all"] do
-		info "Parsing '#{cfg('document.source')}'..."
-		text = file_load Glyph::PROJECT/cfg('document.source')
-		interpreter = Glyph::Interpreter.new text, :source => "file: #{cfg('document.source')}"
-		info "Processing..."
+		Glyph.info "Parsing '#{Glyph['document.source']}'..."
+		if Glyph.lite? then
+			text = file_load Pathname.new(Glyph['document.source'])
+		else
+			text = file_load Glyph::PROJECT/Glyph['document.source']
+		end
+		interpreter = Glyph::Interpreter.new text, :source => "file: #{Glyph['document.source']}"
+		Glyph.info "Processing..."
 		interpreter.process
-		info "Post-processing..."
+		Glyph.info "Post-processing..."
 		interpreter.postprocess
-		Glyph::DOCUMENT = interpreter.document 
+		Glyph.document = interpreter.document
 	end
 
 	desc "Create a standalone html file"
 	task :html => :document do
-		info "Generating HTML file..."
-		out = Glyph::PROJECT/"output/html"
+		Glyph.info "Generating HTML file..."
+		if Glyph.lite? then
+			out = Pathname.new Glyph['document.output_dir']
+			file = (Glyph['document.output'] == 'pdf') ? Glyph['document.filename']+".html" : Glyph['document.output_file']
+		else
+			out = Glyph::PROJECT/"output/html"
+			file = "#{Glyph['document.filename']}.html"
+		end
+		extension = '.html'
 		out.mkpath
-		file = "#{cfg('document.filename')}.html"
-		file_write out/file, Glyph::DOCUMENT.output
-		info "'#{cfg('document.filename')}.html' generated successfully."
-		images = Glyph::PROJECT/'output/html/images'
-		images.mkpath
-		(Glyph::PROJECT/'images').find do |i|
-			if i.file? then
-				dest = "#{Glyph::PROJECT/'output/html/images'}/#{i.relative_path_from(Glyph::PROJECT/'images')}"
-				Pathname.new(dest).parent.mkpath
-				file_copy i.to_s, dest
+		file_write out/file, Glyph.document.output
+		Glyph.info "'#{file}' generated successfully."
+		unless Glyph.lite? then
+			images = Glyph::PROJECT/'output/html/images'
+			images.mkpath
+			(Glyph::PROJECT/'images').find do |i|
+				if i.file? then
+					dest = "#{Glyph::PROJECT/'output/html/images'}/#{i.relative_path_from(Glyph::PROJECT/'images')}"
+					Pathname.new(dest).parent.mkpath
+					file_copy i.to_s, dest
+				end
 			end
 		end
 	end
 
 	desc "Create a pdf file"
 	task :pdf => :html do
-		info "Generating PDF file..."
-		out = Glyph::PROJECT/"output/pdf"
+		Glyph.info "Generating PDF file..."
+		if Glyph.lite? then
+			out = Pathname.new Glyph['document.output_dir']
+			src = out/"#{Glyph['document.filename']}.html"
+			file = Glyph['document.output_file']
+		else
+			out = Glyph::PROJECT/"output/pdf"
+			src = Glyph::PROJECT/"output/html/#{Glyph['document.filename']}.html"
+			file = "#{Glyph['document.filename']}.pdf"
+		end
 		out.mkpath
-		file = cfg('document.filename')
-		case cfg('pdf_renderer')
+		case Glyph['tools.pdf_generator']
 		when 'prince' then
 			ENV['PATH'] += ";#{ENV['ProgramFiles']}\\Prince\\Engine\\bin" if RUBY_PLATFORM.match /mswin/ 
-			res = system "prince #{Glyph::PROJECT/"output/html/#{file}.html"} -o #{out/"#{file}.pdf"}"
+				res = system "prince #{src} -o #{out/"#{file}"}"
 			if res then
-				info "'#{file}.pdf' generated successfully."
+				Glyph.info "'#{file}' generated successfully."
 			else
-				warning "An error occurred while generating #{file}.pdf"
+				Glyph.error "An error occurred while generating #{file}"
 			end
 			# TODO: support other PDF renderers
 		else
-			warning "Glyph cannot generate PDF. Please specify a valid pdf_renderer setting."
+			Glyph.error "Glyph cannot generate PDF. Please specify a valid tools.pdf_generator setting."
 		end
 	end
 

data/tasks/load.rake

@@ -8,22 +8,24 @@ namespace :load do
 
 	desc "Load snippets"
 	task :snippets do
-		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project?
-		info "Loading snippets..."
-		snippets = yaml_load Glyph::PROJECT/'snippets.yml'
-		raise RuntimeError, "Invalid snippets file" unless snippets.blank? || snippets.is_a?(Hash)
-		Glyph::SNIPPETS.replace snippets
+		unless Glyph.lite? then
+			raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project?
+			Glyph.info "Loading snippets..."
+			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?
-		info "Loading macros..."
+		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project? || Glyph.lite?
+		Glyph.info "Loading macros..."
 		load_macros = lambda do |macro_base|
 			macro_base.children.each do |c|
 				Glyph.instance_eval file_load(c) unless c.directory?
 			end
-			macro_dir = macro_base/cfg("filters.target").to_s
+			macro_dir = macro_base/Glyph["filters.target"].to_s
 			if macro_dir.exist? then
 				macro_dir.children.each do |f|
 					Glyph.instance_eval file_load(f)
@@ -31,25 +33,26 @@ namespace :load do
 			end
 		end
 		load_macros.call Glyph::HOME/"macros"
-		load_macros.call Glyph::PROJECT/"lib/macros" rescue nil
+		unless Glyph.lite? then
+			load_macros.call Glyph::PROJECT/"lib/macros" rescue nil
+		end
 	end
 
 	desc "Load configuration files"
 	task :config do
-		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project?
+		raise RuntimeError, "The current directory is not a valid Glyph project" unless Glyph.project? || Glyph.lite?
 		# Save overrides set by commands...
 		overrides = Glyph::PROJECT_CONFIG.dup
-		Glyph::PROJECT_CONFIG.read
+		Glyph::PROJECT_CONFIG.read unless Glyph.lite?
 		Glyph::PROJECT_CONFIG.merge! overrides
 		Glyph::SYSTEM_CONFIG.read
 		Glyph::GLOBAL_CONFIG.read
-		Glyph.reset_config
-		Glyph.config_override("structure.headers", 
-										[:section] +
-										cfg('structure.frontmatter') + 
-										cfg('structure.backmatter') + 
-										cfg('structure.bodymatter') - 
-										cfg('structure.hidden'))
+        Glyph.config_refresh
+		Glyph["structure.headers"] = [:section] +
+													Glyph['structure.frontmatter'] + 
+													Glyph['structure.backmatter'] + 
+													Glyph['structure.bodymatter'] - 
+													Glyph['structure.hidden']
 	end
 
 end

data/tasks/project.rake

@@ -16,9 +16,11 @@ namespace :project do
 		file_copy Glyph::HOME/'document.glyph', Glyph::PROJECT/'document.glyph'
 		config = yaml_load Glyph::HOME/'config.yml'
 	 	config[:document][:filename] = dir.basename.to_s
+	 	config[:document][:title] = dir.basename.to_s
 		config[:document][:author] = ENV['USER'] || ENV['USERNAME'] 	
+		config.delete(:structure)
 		yaml_dump Glyph::PROJECT/'config.yml', config
-		info "Project '#{dir.basename}' created successfully."
+		Glyph.info "Project '#{dir.basename}' created successfully."
 	end
 
 	desc "Add a new text file to the project"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: glyph
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Fabio Cevasco
@@ -9,69 +14,191 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +02:00
+date: 2010-05-09 00:00:00 +02:00
 default_executable: glyph
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gli
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: treetop
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 1
+        - 1
+        - 11
+        version: 1.1.11
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 4
+        version: 1.5.4
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: directory_watcher
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 3
+        version: 2.2.3
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 3
+        version: 4.2.3
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 0
+        - 7
+        version: 2.0.7
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 3
+        version: 0.9.3
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: ruby-prof
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
+  type: :development
+  version_requirements: *id013
 description: Glyph is a framework for structured document authoring.
 email: h3rald@h3rald.com
 executables: 
@@ -79,8 +206,12 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE.textile
 - README.textile
 files: 
+- AUTHORS.textile
+- CHANGELOG.textile
+- LICENSE.textile
 - README.textile
 - Rakefile
 - VERSION
@@ -94,17 +225,25 @@ files:
 - book/output/html/images/glyph.png
 - book/output/html/images/glyph.svg
 - book/output/pdf/glyph.pdf
+- book/script/authors
+- book/script/changelog
+- book/script/compile.rb
+- book/script/license
+- book/script/prof
+- book/script/prof_results.htm
+- book/script/readme
 - book/snippets.yml
-- book/styles/css3.css
-- book/styles/default.css
-- book/text/authoring.textile
-- book/text/extending.textile
-- book/text/getting_started.textile
-- book/text/introduction.textile
-- book/text/ref_commands.textile
-- book/text/ref_config.textile
-- book/text/ref_macros.textile
-- book/text/troubleshooting.textile
+- book/text/acknowledgement.glyph
+- book/text/authoring.glyph
+- book/text/changelog.glyph
+- book/text/extending.glyph
+- book/text/getting_started.glyph
+- book/text/introduction.glyph
+- book/text/license.glyph
+- book/text/ref_commands.glyph
+- book/text/ref_config.glyph
+- book/text/ref_macros.glyph
+- book/text/troubleshooting.glyph
 - config.yml
 - document.glyph
 - glyph.gemspec
@@ -116,6 +255,7 @@ files:
 - lib/glyph/glyph_language.treetop
 - lib/glyph/interpreter.rb
 - lib/glyph/macro.rb
+- lib/glyph/macro_validators.rb
 - lib/glyph/node.rb
 - lib/glyph/system_extensions.rb
 - macros/common.rb
@@ -123,6 +263,7 @@ files:
 - macros/html/block.rb
 - macros/html/inline.rb
 - macros/html/structure.rb
+- spec/files/article.glyph
 - spec/files/container.textile
 - spec/files/document.glyph
 - spec/files/document_with_toc.glyph
@@ -136,15 +277,39 @@ files:
 - spec/lib/glyph_spec.rb
 - spec/lib/interpreter_spec.rb
 - spec/lib/macro_spec.rb
+- spec/lib/macro_validators_spec.rb
 - spec/lib/node_spec.rb
 - spec/macros/filters_spec.rb
 - spec/macros/macros_spec.rb
+- spec/macros/textile_spec.rb
 - spec/spec_helper.rb
 - spec/tasks/generate_spec.rb
 - spec/tasks/load_spec.rb
 - spec/tasks/project_spec.rb
-- styles/css3.css
+- styles/coderay.css
 - styles/default.css
+- styles/pagination.css
+- styles/ultraviolet/active4d.css
+- styles/ultraviolet/all_hallows_eve.css
+- styles/ultraviolet/amy.css
+- styles/ultraviolet/blackboard.css
+- styles/ultraviolet/brilliance_black.css
+- styles/ultraviolet/brilliance_dull.css
+- styles/ultraviolet/cobalt.css
+- styles/ultraviolet/dawn.css
+- styles/ultraviolet/eiffel.css
+- styles/ultraviolet/espresso_libre.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/spacecadet.css
+- styles/ultraviolet/sunburst.css
+- styles/ultraviolet/twilight.css
+- styles/ultraviolet/zenburnesque.css
 - tasks/generate.rake
 - tasks/load.rake
 - tasks/project.rake
@@ -161,28 +326,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Glyph -- A Ruby-powered Document Authoring Framework
 test_files: 
 - spec/macros/filters_spec.rb
+- spec/macros/textile_spec.rb
 - spec/macros/macros_spec.rb
 - spec/lib/interpreter_spec.rb
 - spec/lib/commands_spec.rb
 - spec/lib/node_spec.rb
 - spec/lib/macro_spec.rb
+- spec/lib/macro_validators_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/glyph_spec.rb
 - spec/lib/document_spec.rb