glyph 0.4.2 → 0.5.0

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
 lib = File.expand_path(File.dirname(__FILE__) + '/lib')
 $: << lib
 require 'rubygems'
@@ -7,55 +9,32 @@ require "#{lib}/glyph.rb"
 
 task :default => :spec
 
+# RSpec
 begin
-	require 'yard'
-	YARD::Rake::YardocTask.new(:yardoc) do |t|
-		t.files   = ['lib/**/*.rb', './README.textile', 'lib/*.rb'] 
-		t.options = ['--no-private']
+	require "rspec/core/rake_task"
+	RSpec::Core::RakeTask.new(:spec) do |t|
+		t.pattern = 'spec/**/*_spec.rb'
+		t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
 	end
-rescue LoadError
-	task :yardoc do
-		abort "YARD is not available. Install it with: gem install yard"
-	end
-end
-
-begin
-	require 'jeweler'
-	Jeweler::Tasks.new do |s|
-		s.name = "glyph"
-		s.summary = "Glyph -- A Ruby-powered Document Authoring Framework"
-		s.description = "Glyph is a framework for structured document authoring."
-		s.email = "h3rald@h3rald.com"
-		s.homepage = "http://www.h3rald.com/glyph/"
-		s.authors = ["Fabio Cevasco"]
-		s.files.exclude 'book/output/web/**/*'
-		s.files.exclude 'book/output/web5/**/*'
-		s.files.exclude 'book/output/html5/**/*'
-		s.add_dependency 'gli', '>= 1.1.1' # Command line interface
-		s.add_dependency 'extlib', '>= 0.9.15' # Extension methods
-		s.add_dependency 'rake', '>= 0.8.7' # Glyph rasks
-		s.add_development_dependency 'rspec', '>= 1.3.0' # Test suite
-		s.add_development_dependency 'yard', '>= 0.6.0' # Documentation suite
-		s.add_development_dependency 'jeweler', '1.4.0' # Gem management
-		s.add_development_dependency 'directory_watcher', ">= 1.3.2" # Auto-regeneration
-		s.add_development_dependency 'haml', ">= 3.0.15" # Sass filter
-		s.add_development_dependency 'RedCloth', ">= 4.2.3" # Textile filter
-		s.add_development_dependency 'bluecloth', ">= 2.0.7" # Markdown filter
-		s.add_development_dependency 'coderay', ">= 0.9.3" # Syntax Highlighting
+	RSpec::Core::RakeTask.new(:test) do |t|
+		args = ARGV.reverse
+		args.pop
+		t.pattern = args.join " "
+		t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
 	end
-	Jeweler::GemcutterTasks.new
 rescue LoadError
-	puts "Jeweler is not available. Install it with: gem install jeweler"
+	puts "RSpec is not available. Install it with: gem install rspec"
 end
 
+# Yard
 begin
-	require "spec/rake/spectask"
-	Spec::Rake::SpecTask.new('spec') do |t|
-		t.spec_files = FileList['spec/**/*_spec.rb']
-		t.spec_opts = ["--color"]
+	require 'yard'
+	YARD::Rake::YardocTask.new(:yardoc) do |t|
+		t.files   = ['lib/**/*.rb', './README.textile', 'lib/*.rb']
+		t.options = ['--no-private']
 	end
 rescue LoadError
-	puts "RSpec is not available. Install it with: gem install rspec"
+	puts "YARD is not available. Install it with: gem install yard"
 end
 
 FileList['tasks/**/*.rake'].each { |t| load t}

data/benchmark.rb

@@ -45,7 +45,6 @@ ul[
 
 reset_glyph
 Glyph.run! 'load:all'
-Glyph::SNIPPETS[:test] = text
 Benchmark.bm(30) do |x|
 
 	sep
@@ -56,7 +55,7 @@ Benchmark.bm(30) do |x|
 	puts " => Macro Set: Glyph"
 	sep
 	rep(x, "section[...]") { macro_exec "section[#{text}]" }
-	rep(x, "snippet[...]") { macro_exec "snippet[test]" }
+	rep(x, "snippet[...]") { macro_exec "snippet:[test|#{text}]snippet[test]" }
   rep(x, "textile[...]") { macro_exec "textile[#{text}]" }
 	rep(x, "markdown[...]") { macro_exec "markdown[#{text}]" }
 	rep(x, "HTML text") { macro_exec html }

data/book/config.yml

@@ -4,19 +4,19 @@
   :subtitle: Rapid Document Authoring Framework
   :author: Fabio Cevasco
   :draft: true
-  :revision: v0.4.2
+  :revision: v0.5.0
   :filename: glyph
   :title: Glyph
   :styles: link
 :output: 
-  :h3rald: 
+  :h3rald:
     :multifile: true
-    :extension: '.html'
-    :filter_target: 'html'
-    :base: '/glyph/book/'
-    :macro_dirs: ['html', 'html5']
-    :layout_dirs: ['web5']
-    :layouts: 
+    :extension: .html
+    :filter_target: html
+    :base: /glyph/book/
+    :macro_reps: html5
+    :layout_dir: web5
+    :layouts:
       :topic: bookpage
       :index: bookindex
   :pdf: 

data/book/document.glyph

@@ -1,27 +1,21 @@
 book[
 	@head[
-		?[not[eq[$[document.output]|h3rald]]|
+		?[not/output?[h3rald]|
 			style[default.css]
-			?[eq[$[document.output]|pdf]|style[pagination.css]]
+			?[output?[pdf]|style[pagination.css]]
 			?[eq[$[filters.highlighter]|coderay]|style[coderay.css]]
 			?[eq[$[filters.highlighter]|ultraviolet]|style[ultraviolet/lazy.css]]
 		]
 	]
 	@pre-title[
-		?[
-			and[
-				eq[$[document.output]|pdf]|
-				eq[$[output.pdf.generator]|prince]
-			]|image[@width[20%]@height[20%]glyph/glyph.svg]]
-		?[
-			or[
-				eq[$[document.output]|html]|
-				and[
-					eq[$[document.output]|pdf]|
-					eq[$[output.pdf.generator]|wkhtmltopdf]]
-			]|image[glyph/glyph.png]]
+		?[and[
+			output?[pdf]|
+			eq[$[output.pdf.generator]|prince]]|
+			  image[@width[20%]@height[20%]glyph/glyph.svg]|
+			  image[glyph/glyph.png]]
 	]
 	@frontmatter[
+    include[snippets]
 		toc[3]
 		introduction[
 			@title[Introduction]
@@ -70,6 +64,11 @@ book[
 				@id[attribute_intro]
 				@src[text_editing/attribute_intro]
 			]
+			section[
+				@title[Macro Composition]
+				@id[composition]
+				@src[text_editing/macro_composition]
+			]
 			section[
 				@title[Escaping and Quoting]
 				@id[esc_quot]
@@ -122,19 +121,19 @@ book[
 				@src[text_editing/stylesheets]
 			]
 			section[
-				@title[Including Files and Snippets]
+				@title[Content Reuse]
 				@id[incl]
 				@src[text_editing/inclusions]
 			]
-			section[
-				@title[Evaluating Ruby code and Configuration Settings]
-				@src[text_editing/evaluation]
-			]
 			section[
 				@title[Conditional Macros]
 				@id[cond_macros]
 				@src[text_editing/conditionals]
 			]
+			section[
+				@title[Simple Programming and Code Evaluation]
+				@src[text_editing/evaluation]
+			]
 		]
 		chapter[
 			@title[Generating Output Files]

data/book/lib/layouts/bookindex.glyph

@@ -1,71 +1,86 @@
-<!DOCTYPE html> 
-<html lang="en"> 
-	<head> 
-		<title>Glyph - Document Authoring Framework</title> 
-
-
-
-		<meta charset="utf-8" /> 
-		<meta name="author" content="Fabio Cevasco" /> 
-		<meta name="copyright" content="Fabio Cevasco" /> 
-		<meta name="robots" content="all, follow" /> 
-		<meta name="Revisit-After" content="2 Days" /> 
-		<meta name="language" content="en" /> 
-		<meta name="target_country" content="en-us" /> 
-		<meta name="country" content="United States" /> 
-		<meta name="description" content="H3RALD - Fabio Cevasco's Web Site" /> 
-
-		<meta name="keywords" content="h3rald, fabio cevasco, glyph" /> 
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>Glyph - Document Authoring Framework</title>
+		
+		<meta charset="utf-8" />
+		<meta name="author" content="Fabio Cevasco" />
+		<meta name="copyright" content="Fabio Cevasco" />
+		<meta name="robots" content="all, follow" />
+		<meta name="Revisit-After" content="2 Days" />
+		<meta name="language" content="en" />
+		<meta name="target_country" content="en-us" />
+		<meta name="country" content="United States" />
+                <meta name="readability-verification" content="XmaVzRjmcFL5Bb2Fu9TZVdDKzhA3apQdxexTB2rK"/>
+		<meta name="description" content="H3RALD - Fabio Cevasco's Web Site" />
+		
+		<meta name="keywords" content="h3rald, fabio cevasco, glyph" />
 		<link rel="shortcut icon" href="/favicon.png" type="image/png" /> 
-		<meta content="44.388041;9.073248" name="ICBM" /> 
-
-
-		<link rel="stylesheet" type="text/css" href="/styles/html5reset.css" /> 
-		<link rel="stylesheet" type="text/css" href="/styles/style.css" /> 
+		<meta content="44.388041;9.073248" name="ICBM" />
 
-		<!--\[if lte IE 8\]>
-		<script src="/js/html5.js" type="text/javascript"></script>
-		<!\[endif\]--> 
-	</head> 
-	<body> 
-		<!--\[if lte IE 6\]>
-		<div id="ie-warning">
-			This site is not compatible with Internet Explorer 6 or lower. You should consider using a more modern browser for a better &ndash; and <em>safer</em> &ndash; web experience. \[<a href="http://browsehappy.com/browsers/">Read More &raquo;</a>\]
-		</div>
-		<!\[endif\]--> 
+		<link rel="stylesheet" type="text/css" href="/styles/html5reset.css" />
+		<link rel="stylesheet" type="text/css" href="/styles/style.css" />
 
-		<section id="container"> 
-
-			<header class="page"> 
-				<nav class="home-link"> 
-					<a href="/"> 
-						<img src="/images/h3rald_small.png" alt="H3RALD" class="default"/> 
-						<!\[if !IE\]> 
-						<img src="/images/h3rald_hover_small.png" alt="H3RALD" class="hover"/> 
-						<!\[endif\]> 
-					</a> 
-				</nav> 
-
-				<nav class="section"> 
-					/<a href="/glyph/" rel="archives">GLYPH</a> 
-				</nav> 
-
-			</header> 
-			<article class="page"> 
-				<header> 
-					<hgroup> 
-					<h1>Glyph - Document Authoring Framework</h1> 
-					<h2>Documentation</h2> 
-					</hgroup> 
-				</header> 
-				<section id="body-text" class="glyph-index"> 
+    <script src="http://www.google.com/jsapi?key=ABQIAAAAr6RY1Z6dchG_sX9WDLSy3xRlq2n1sm52B5HDRR5tm6o8XM18FhR56xHNNH6CsX86uN5VoTrglpyOyQ" type="text/javascript"></script>
+		<script src="/js/sevenup.js" type="text/javascript"></script>
+		<script src="/js/sevenup_black.js" type="text/javascript"></script>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+		<script src="/js/jquery-timeago.js" type="text/javascript"></script>
+		<script src="/js/jquery-easing.js" type="text/javascript"></script>
+		<script src="/js/jquery-fancybox.js" type="text/javascript"></script>
+		<script src="/js/date.js" type="text/javascript"></script>
+		<script src="/js/feeds.js" type="text/javascript"></script>
+		<script src="/js/hyphenator.js" type="text/javascript"></script>
+		<script src="/js/init.js" type="text/javascript"></script>
+		<script src="/js/search.js" type="text/javascript"></script>
+	</head>
+	<body>
+		<section id="container">
+			
+				<header class="page">
+	<nav class="home-link">
+		<a href="/">
+			<img src="/images/h3rald_small.png" alt="H3RALD" class="default"/>
+			<!\[if !IE\]>
+			<img src="/images/h3rald_hover_small.png" alt="H3RALD" class="hover"/>
+			<!\[endif\]>
+		</a>
+	</nav>
+	
+	<nav class="section">
+		/<a href="/glyph/" rel="glyph">GLYPH</a>
+	</nav>
+	
+</header>
+				<article class="page">
+					<header>
+	<hgroup>
+		<h1>Glyph - Document Authoring Framework</h1>
+		<h2>Documentation</h2>
+		
+	</hgroup>
+	
+</header>
+					<section id="body-text" class="hyphenate glyph-index">
 					toc[]
-				</section> 
-			</article> 
-
-
-			<footer> 
-				<section class="ads"> 
+          <nav id="sharing-buttons">
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="h3rald">Tweet</a>
+<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<g:plusone size="medium"></g:plusone>
+<script type="text/javascript">
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')\[0\]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+</nav>
+					</section>
+				</article>
+					
+			
+			<footer>
+				<section class="ads">
 					<script type="text/javascript"><!--
 						google_ad_client = "pub-2871497824158668";
 						/* 728x90, created 9/10/10 */
@@ -73,52 +88,39 @@
 						google_ad_width = 728;
 						google_ad_height = 90;
 						//-->
-					</script> 
-					<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> 
-					</script> 
-				</section> 
-				<section> 
-					<nav> 
-						<a href="/about/">ABOUT</a>\|<a href="/contact/">CONTACT</a> 
-					</nav> 
-					<p>H3RALD Web Site v8.1 &mdash; &copy; 2010 &mdash; <em>Fabio Cevasco</em></p> 
-				</section> 
-			</footer> 
-		</section><!-- #container end --> 
-		<script src="http://www.google.com/jsapi?key=ABQIAAAAr6RY1Z6dchG_sX9WDLSy3xRlq2n1sm52B5HDRR5tm6o8XM18FhR56xHNNH6CsX86uN5VoTrglpyOyQ" type="text/javascript"></script> 
-		<!-- <script src="/js/jquery.js" type="text/javascript"></script> --> 
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-		<script src="/js/jquery-timeago.js" type="text/javascript"></script> 
-		<script src="/js/jquery-easing.js" type="text/javascript"></script> 
-		<script src="/js/jquery-fancybox.js" type="text/javascript"></script> 
-		<script src="/js/jquery-toc.js" type="text/javascript"></script> 
-		<script src="/js/date.js" type="text/javascript"></script> 
-		<script src="/js/feeds.js" type="text/javascript"></script> 
-		<script src="/js/search.js" type="text/javascript"></script> 
-		<script src="/js/hyphenator.min.js" type="text/javascript"></script> 
-		<script src="/js/init.js" type="text/javascript"></script> 
-		<!-- Start Google Analytics --> 
-		<script type="text/javascript"> 
-			.[=
-			var _gaq = _gaq \|\| [];
-			_gaq.push(['_setAccount', 'UA-18587377-1']);
-			_gaq.push(['_trackPageview']);
+					</script>
+					<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+					</script>
+				</section>
+				<section>
+					<nav>
+						<a href="/about/">ABOUT</a>\|<a href="/contact/">CONTACT</a>
+					</nav>
+					<p>H3RALD Web Site v8.1.2 &copy; 2004 &mdash; 2011 <em>Fabio Cevasco</em></p>
+				</section>
+			</footer>
+		</section><!-- #container end -->
+		
+ <!-- Start Google Analytics --> 
+ <script type="text/javascript">
+  var _gaq = _gaq \|\| \[\];
+  _gaq.push(\['_setAccount', 'UA-18587377-1'\]);
+  _gaq.push(\['_trackPageview'\]);
 
-			(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			})();
-			=]
-		</script> 
-		<!-- End Google Analytics --> 
-		<!-- Start of StatCounter Code --> 
-		<script type="text/javascript"> 
-			var sc_project=6193656; 
-			var sc_invisible=1; 
-			var sc_security="57f7ee2a"; 
-		</script> 
-		<script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"></script> 
-		<!-- End of StatCounter Code --> 
-	</body> 
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')\[0\]; s.parentNode.insertBefore(ga, s);
+  })();
+ </script> 
+ <!-- End Google Analytics --> 
+ <!-- Start of StatCounter Code --> 
+  <script type="text/javascript"> 
+	var sc_project=6193656; 
+	var sc_invisible=1; 
+	var sc_security="57f7ee2a"; 
+	</script> 
+	<script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"></script> 
+	<!-- End of StatCounter Code --> 
+	</body>
 </html>

data/book/lib/layouts/bookpage.glyph

@@ -1,74 +1,90 @@
 <!DOCTYPE html> 
 <html lang="en"> 
 	<head> 
-		<title>{{title}} &ndash; Glyph Documentation</title> 
-
-
-
-		<meta charset="utf-8" /> 
-		<meta name="author" content="Fabio Cevasco" /> 
-		<meta name="copyright" content="Fabio Cevasco" /> 
-		<meta name="robots" content="all, follow" /> 
-		<meta name="Revisit-After" content="2 Days" /> 
-		<meta name="language" content="en" /> 
-		<meta name="target_country" content="en-us" /> 
-		<meta name="country" content="United States" /> 
-		<meta name="description" content="H3RALD - Fabio Cevasco's Web Site" /> 
-
-		<meta name="keywords" content="h3rald, fabio cevasco, glyph" /> 
+    <title>{{title}} - Glyph</title> 
+		<link href='http://fonts.googleapis.com/css?family=Crimson+Text:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
+		
+		
+		
+		<meta charset="utf-8" />
+		<meta name="author" content="Fabio Cevasco" />
+		<meta name="copyright" content="Fabio Cevasco" />
+		<meta name="robots" content="all, follow" />
+		<meta name="Revisit-After" content="2 Days" />
+		<meta name="language" content="en" />
+		<meta name="target_country" content="en-us" />
+		<meta name="country" content="United States" />
+                <meta name="readability-verification" content="XmaVzRjmcFL5Bb2Fu9TZVdDKzhA3apQdxexTB2rK"/>
+		<meta name="description" content="H3RALD - Fabio Cevasco's Web Site" />
+		
+		<meta name="keywords" content="h3rald, fabio cevasco, glyph" />
 		<link rel="shortcut icon" href="/favicon.png" type="image/png" /> 
-		<meta content="44.388041;9.073248" name="ICBM" /> 
-
-
-		<link rel="stylesheet" type="text/css" href="/styles/html5reset.css" /> 
-		<link rel="stylesheet" type="text/css" href="/styles/style.css" /> 
+		<meta content="44.388041;9.073248" name="ICBM" />
 
-		<!--\[if lte IE 8\]>
-		<script src="/js/html5.js" type="text/javascript"></script>
-		<!\[endif\]--> 
-	</head> 
-	<body> 
-		<!--\[if lte IE 6\]>
-		<div id="ie-warning">
-			This site is not compatible with Internet Explorer 6 or lower. You should consider using a more modern browser for a better &ndash; and <em>safer</em> &ndash; web experience. \[<a href="http://browsehappy.com/browsers/">Read More &raquo;</a>\]
-		</div>
-		<!\[endif\]--> 
+		<link rel="stylesheet" type="text/css" href="/styles/html5reset.css" />
+		<link rel="stylesheet" type="text/css" href="/styles/style.css" />
 
-		<section id="container"> 
-
-			<header class="page"> 
-				<nav class="home-link"> 
-					<a href="/"> 
-						<img src="/images/h3rald_small.png" alt="H3RALD" class="default"/> 
-						<!\[if !IE\]> 
-						<img src="/images/h3rald_hover_small.png" alt="H3RALD" class="hover"/> 
-						<!\[endif\]> 
-					</a> 
-				</nav> 
-
-				<nav class="section"> 
-					/<a href="/glyph/" rel="archives">GLYPH</a> 
-				</nav> 
-
-			</header> 
-			<article class="page"> 
-				<header> 
-					<hgroup> 
-					<h1>{{title}}</h1> 
-					<h2>Glyph Documentation</h2>
-					</hgroup> 
-				</header> 
-				<section id="body-text" class="hyphenate glyph-book"> 
+    <script src="http://www.google.com/jsapi?key=ABQIAAAAr6RY1Z6dchG_sX9WDLSy3xRlq2n1sm52B5HDRR5tm6o8XM18FhR56xHNNH6CsX86uN5VoTrglpyOyQ" type="text/javascript"></script>
+		<script src="/js/sevenup.js" type="text/javascript"></script>
+		<script src="/js/sevenup_black.js" type="text/javascript"></script>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
+		<script src="/js/jquery-timeago.js" type="text/javascript"></script>
+		<script src="/js/jquery-easing.js" type="text/javascript"></script>
+		<script src="/js/jquery-fancybox.js" type="text/javascript"></script>
+		<script src="/js/date.js" type="text/javascript"></script>
+		<script src="/js/feeds.js" type="text/javascript"></script>
+		<script src="/js/hyphenator.js" type="text/javascript"></script>
+		<script src="/js/init.js" type="text/javascript"></script>
+		<script src="/js/search.js" type="text/javascript"></script>
+	</head>
+	<body>
+		<section id="container">
+			
+				<header class="page">
+	<nav class="home-link">
+		<a href="/">
+			<img src="/images/h3rald_small.png" alt="H3RALD" class="default"/>
+			<!\[if !IE\]>
+			<img src="/images/h3rald_hover_small.png" alt="H3RALD" class="hover"/>
+			<!\[endif\]>
+		</a>
+	</nav>
+	
+	<nav class="section">
+		/<a href="/glyph/" rel="glyph">GLYPH</a>
+	</nav>
+	
+</header>
+				<article class="page glyph-book">
+					<header>
+	<hgroup>
+		<h1>{{title}}</h1> 
+		<h2>Glyph</h2>
+	</hgroup>
+  </header>
+					<section id="body-text" class="hyphenate glyph-book">
 
 							navigation[{{id}}]
 							{{contents}}
 							navigation[{{id}}]
-				</section> 
-			</article> 
-
-
-			<footer> 
-				<section class="ads"> 
+										<nav id="sharing-buttons">
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="h3rald">Tweet</a>
+<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<g:plusone size="medium"></g:plusone>
+<script type="text/javascript">
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')\[0\]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+</nav>
+					</section>
+				</article>
+					
+			
+			<footer>
+				<section class="ads">
 					<script type="text/javascript"><!--
 						google_ad_client = "pub-2871497824158668";
 						/* 728x90, created 9/10/10 */
@@ -76,52 +92,40 @@
 						google_ad_width = 728;
 						google_ad_height = 90;
 						//-->
-					</script> 
-					<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> 
-					</script> 
-				</section> 
-				<section> 
-					<nav> 
-						<a href="/about/">ABOUT</a>\|<a href="/contact/">CONTACT</a> 
-					</nav> 
-					<p>H3RALD Web Site v8.1 &mdash; &copy; 2010 &mdash; <em>Fabio Cevasco</em></p> 
-				</section> 
-			</footer> 
-		</section><!-- #container end --> 
-		<script src="http://www.google.com/jsapi?key=ABQIAAAAr6RY1Z6dchG_sX9WDLSy3xRlq2n1sm52B5HDRR5tm6o8XM18FhR56xHNNH6CsX86uN5VoTrglpyOyQ" type="text/javascript"></script> 
-		<!-- <script src="/js/jquery.js" type="text/javascript"></script> --> 
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-		<script src="/js/jquery-timeago.js" type="text/javascript"></script> 
-		<script src="/js/jquery-easing.js" type="text/javascript"></script> 
-		<script src="/js/jquery-fancybox.js" type="text/javascript"></script> 
-		<script src="/js/jquery-toc.js" type="text/javascript"></script> 
-		<script src="/js/date.js" type="text/javascript"></script> 
-		<script src="/js/feeds.js" type="text/javascript"></script> 
-		<script src="/js/search.js" type="text/javascript"></script> 
-		<script src="/js/hyphenator.min.js" type="text/javascript"></script> 
-		<script src="/js/init.js" type="text/javascript"></script> 
-		<!-- Start Google Analytics --> 
-		<script type="text/javascript"> 
-			.[=
-			var _gaq = _gaq \|\| [];
-			_gaq.push(['_setAccount', 'UA-18587377-1']);
-			_gaq.push(['_trackPageview']);
+					</script>
+					<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+					</script>
+				</section>
+				<section>
+					<nav>
+						<a href="/about/">ABOUT</a>\|<a href="/contact/">CONTACT</a>
+					</nav>
+					<p>H3RALD Web Site v8.1.2 &copy; 2004 &mdash; 2011 <em>Fabio Cevasco</em></p>
+				</section>
+			</footer>
+		</section><!-- #container end -->
+		
+		
+ <!-- Start Google Analytics --> 
+ <script type="text/javascript">
+  var _gaq = _gaq \|\| \[\];
+  _gaq.push(\['_setAccount', 'UA-18587377-1'\]);
+  _gaq.push(\['_trackPageview'\]);
 
-			(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-			})();
-			=]
-		</script> 
-		<!-- End Google Analytics --> 
-		<!-- Start of StatCounter Code --> 
-		<script type="text/javascript"> 
-			var sc_project=6193656; 
-			var sc_invisible=1; 
-			var sc_security="57f7ee2a"; 
-		</script> 
-		<script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"></script> 
-		<!-- End of StatCounter Code --> 
-	</body> 
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')\[0\]; s.parentNode.insertBefore(ga, s);
+  })();
+ </script> 
+ <!-- End Google Analytics --> 
+ <!-- Start of StatCounter Code --> 
+  <script type="text/javascript"> 
+	var sc_project=6193656; 
+	var sc_invisible=1; 
+	var sc_security="57f7ee2a"; 
+	</script> 
+	<script type="text/javascript" src="http://www.statcounter.com/counter/counter_xhtml.js"></script> 
+	<!-- End of StatCounter Code --> 
+	</body>
 </html>