all repos — h3rald @ 3c06ebaed13b93924fed7a3d8f44b47183eeadfa

The sources of https://h3rald.com

content/glyph/book/changelog.html

 1
 2
 3
 4
 5
 6
 7
 8
 9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 208
 209
 210
 211
 212
 213
 214
 215
 216
 217
 218
 219
 220
 221
 222
 223
 224
 225
 226
 227
 228
 229
 230
 231
 232
 233
 234
 235
 236
 237
 238
 239
 240
 241
 242
 243
 244
 245
 246
 247
 248
 249
 250
 251
 252
 253
 254
 255
 256
 257
 258
 259
 260
 261
 262
 263
 264
 265
 266
 267
 268
 269
 270
 271
 272
 273
 274
 275
 276
 277
 278
 279
 280
 281
 282
 283
 284
 285
 286
 287
 288
 289
 290
 291
 292
 293
 294
 295
 296
 297
 298
 299
 300
 301
 302
 303
 304
 305
 306
 307
 308
 309
 310
 311
 312
 313
 314
 315
 316
 317
 318
 319
 320
 321
 322
 323
 324
 325
 326
 327
 328
 329
 330
 331
 332
 333
 334
 335
 336
 337
 338
 339
 340
 341
 342
 343
 344
 345
 346
 347
 348
 349
 350
 351
 352
 353
 354
 355
 356
 357
 358
 359
 360
 361
 362
 363
 364
 365
 366
 367
 368
 369
 370
 371
 372
 373
 374
 375
 376
 377
 378
 379
 380
 381
 382
 383
 384
 385
<!DOCTYPE html> 
<html lang="en"> 
	<head> 
		<title>Glyph - Changelog</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" /> 
		<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" /> 

		<!--[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]--> 

		<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="/projects/" rel="archives">PROJECTS</a> 
				</nav> 

			</header> 
			<article class="page"> 
				<header> 
					<hgroup> 
					<h1>Changelog</h1> 
					</hgroup> 
				</header> 
				<section id="body-text" class="hyphenate"> 

							<nav><a href="/glyph/book/config/output.html">output.* &larr;</a><a href="/glyph/book/index.html">Contents</a></nav>
							




	<section class="section">
<header><h1 id="h_231">v0.4.1 &ndash; September 25th 2010</h1></header>
<section class="section">
<header><h1 id="h_232">4 Bugs Fixed</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/169">#169</a></td>
		<td><p>*.scss files are now supported by the <a href="/glyph/book/macros/macros_structure.html#m_style"><code>style</code></a> macro.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/170">#170</a></td>
		<td><p>Improved default CodeRay stylesheet.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/171">#171</a></td>
		<td><p><span class="caps">SCSS</span> now used internally by Glyph to generate default <span class="caps">CSS</span> files.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/173">#173</a></td>
		<td><p>Consecutive escape sequences are now interpreted correctly in topics.</p></td></tr></table>

</section>

</section>

	<section class="section">
<header><h1 id="h_233">v0.4.0 &ndash; September 3th 2010</h1></header>
<section class="section">
<header><h1 id="h_234">13 Features Implemented</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/40">#40</a></td>
		<td><p>A new <a href="/glyph/book/ref_commands.html#c_stats"><code>stats</code></a> command can be used to display statistics about project files, snippets, macros, bookmarks and links.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/73">#73</a></td>
		<td><p>It is now possible to validate online <span class="caps">HTTP</span> links.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/112">#112</a></td>
		<td><p>It is now possible to use <em>wkhtmltopdf</em> instead of Prince to generate <span class="caps">PDF</span> files from <span class="caps">HTML</span> files.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/114">#114</a></td>
		<td><p>It is now possible to generate documents comprised of multiple files (topics).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/115">#115</a></td>
		<td><p>It is now possible to define layouts (used when generating multi-file outputs) using Glyph macros.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/120">#120</a></td>
		<td><p>It is now possible to compile your project to a single HTML5 file (<code>html5</code> output) or multiple files (<code>web5</code> output)</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/135">#135</a></td>
		<td><p>Stylesheets can now be linked and imported as well as embedded.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/138">#138</a></td>
		<td><p><code>web</code> and <code>web5</code> output formats inherit <code>html</code> macros.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/142">#142</a></td>
		<td><p>A new <a href="/glyph/book/macros/macros_block.html#m_navigation"><code>navigation</code></a> macro can be used in <code>web</code> and <code>web5</code> outputs to navigate through topics.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/143">#143</a></td>
		<td><p>A topic-based <span class="caps">TOC</span> is generated when compiling to <code>web</code> or <code>web5</code></p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/144">#144</a></td>
		<td><p>Two new validators are now available to check whether a macro has (or doesn&#8217;t have) a certain ancestor: <code>within</code> and <code>not_within</code>.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/147">#147</a></td>
		<td><p>The default stylesheets provided by Glyph are now compatible with HTML5 outputs (html5 and web5).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/148">#148</a></td>
		<td><p>It is now possible to create custom tasks and commands to extend Glyph functionality.</p></td></tr></table>

</section>
	
	
		<section class="section">
<header><h1 id="h_235">7 Bugs Fixed</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/133">#133</a></td>
		<td><p>Added <span class="caps">HTML</span> charset to Glyph documents (utf-8).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/136">#136</a></td>
		<td><p>Moved utility functions to separate <code>Glyph::Utils</code> module.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/139">#139</a></td>
		<td><p>Heavily restructured Glyph configuration.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/140">#140</a></td>
		<td><p>Added <code>Glyph::Macro::Helpers</code> module to avoid code duplication in macros for different output formats.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/141">#141</a></td>
		<td><p>Prevented non-rb files to be loaded as macros.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/145">#145</a></td>
		<td><p>Dotfiles are now ignored by <a href="/glyph/book/ref_commands.html#c_init"><code>init</code></a> command.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/167">#167</a></td>
		<td><p>Fixed <span class="caps">PDF</span> book download links.</p></td></tr></table>

</section>

</section>

	<section class="section">
<header><h1 id="h_236">v0.3.0 &ndash; June 13th 2010</h1></header>
<section class="section">
<header><h1 id="h_237">13 Features Implemented</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/39">#39</a></td>
		<td><p>A new <a href="/glyph/book/ref_commands.html#c_outline"><code>outline</code></a> command is available to display the document outline.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/110">#110</a></td>
		<td><p>It is now possible to use Glyph language to produce arbitrary <span class="caps">XML</span> code.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/111">#111</a></td>
		<td><p>System settings are now stored within a <code>system.*</code> namespace and cannot be changed via the <a href="/glyph/book/macros/macros_core.html#m_config_"><code>config:</code></a> macro or the <a href="/glyph/book/ref_commands.html#c_config"><code>config</code></a> command.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/116">#116</a></td>
		<td><p>It is now possible to use named attributes within Glyph macros.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/119">#119</a></td>
		<td><p><a id="new_parser"></a>A new parser was implemented from scratch to improve performance. Treetop gem no longer required.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/121">#121</a></td>
		<td><p>Some macros have been removed in favor of <span class="caps">XML</span> fallback, others have been updated.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/123">#123</a></td>
		<td><p>The SyntaxNode class has been specialized to differentiate between macros, attributes, parameters, text and escapes.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/124">#124</a></td>
		<td><p>Implemented new <a href="/glyph/book/macros/macros_structure.html#m_article"><code>article</code></a> macro and <a href="/glyph/book/macros/macros_structure.html#m_book"><code>book</code></a> macro.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/126">#126</a></td>
		<td><p>A new <a href="/glyph/book/macros/macros_core.html#m_rewrite_"><code>rewrite:</code></a> macro has been implemented to create simple macros using just Glyph code.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/127">#127</a></td>
		<td><p>A new <a href="/glyph/book/macros/macros_core.html#m_alias"><code>alias</code></a> macro has been implemented to create macro aliases.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/128">#128</a></td>
		<td><p>A blacklist for <span class="caps">XML</span> tags has been exposed via the <code>language.options.xml_blacklist</code> setting.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/129">#129</a></td>
		<td><p>The <a href="/glyph/book/macros/macros_core.html#m_include"><code>include</code></a> macro can now be used in lite mode, it can evaluate ruby files and requires relative paths.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/130">#130</a></td>
		<td><p>A new &#8220;safe mode&#8221; has been implemented to explicitly forbid certain potentially unsafe macros.</p></td></tr></table>

</section>
	
	
		<section class="section">
<header><h1 id="h_238">3 Bugs Fixed</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/109">#109</a></td>
		<td><p>Performance has been dramatically improved by implementing a parser from scratch (see <a href="#new_parser">#119</a>)</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/122">#122</a></td>
		<td><p>Macro encoding/decoding no longer necessary due to the new parser (see <a href="#new_parser">#119</a>)</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/125">#125</a></td>
		<td><p>Warning messages have been streamlined.</p></td></tr></table>

</section>

</section>

	<section class="section">
<header><h1 id="h_239">v0.2.0 &ndash; May 9th 2010</h1></header>
<section class="section">
<header><h1 id="h_240">11 Features Implemented</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/62">#62</a></td>
		<td><p>A new <a href="/glyph/book/macros/macros_filters.html#m_highlight"><code>highlight</code></a> macro is available to highlight source code (CodeRay or UltraViolet required).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/76">#76</a></td>
		<td><p>It is now possible to use Glyph programmatically via the new <code>Glyph#filter</code> and <code>Glyph#compile</code> methods.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/87">#87</a></td>
		<td><p>It is now possible to define snippets inside a Glyph source file using the <a href="/glyph/book/macros/macros_core.html#m_snippet_"><code>snippet:</code></a> macro.</p></td></tr>	
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/88">#88</a></td>
		<td><p>It is now possible to change configuration settings inside a Glyph source file using the <a href="/glyph/book/macros/macros_core.html#m_config_"><code>config:</code></a> macro (Jabbslad).</p></td></tr>	
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/89">#89</a></td>
		<td><p>It is now possible to compile a single Glyph source file without creating a Glyph project.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/92">#92</a></td>
		<td><p>6 new macros have been defined to allow conditional processing (<a href="/glyph/book/macros/macros_core.html#m_condition"><code>condition</code></a> macro, <a href="/glyph/book/macros/macros_core.html#m_eq"><code>eq</code></a> macro, <a href="/glyph/book/macros/macros_core.html#m_not"><code>not</code></a> macro, <a href="/glyph/book/macros/macros_core.html#m_and"><code>and</code></a> macro, <a href="/glyph/book/macros/macros_core.html#m_or"><code>or</code></a> macro, <a href="/glyph/book/macros/macros_core.html#m_match"><code>match</code></a> macro)</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/94">#94</a></td>
		<td><p>It is now possible to add <em>validators</em> to macros, for example to check the number of parameters they take.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/97">#97</a></td>
		<td><p>The <a href="/glyph/book/ref_commands.html#c_compile"><code>compile</code></a> command command can now take an extra <code>--auto</code> switch to trigger document auto-regeneration whenever a source file is changed (koraktor).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/99">#99</a></td>
		<td><p>Added a <code>document.draft</code> setting. If set to <code>true</code>, comments and TODOs are rendered in output files.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/100">#100</a></td>
		<td><p><a id="system_css"></a>Glyph <span class="caps">CSS</span> files are no longer copied to new projects, but they can be referenced as if they were (see also <a href="#css_not_copied">#93</a>).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/108">#108</a></td>
		<td><p>It is now possible to define Glyph macros within Glyph source files using the <a href="/glyph/book/macros/macros_core.html#m_macro_"><code>macro:</code></a> macro.</p></td></tr></table>

</section>
	
	
		<section class="section">
<header><h1 id="h_241">8 Bugs Fixed</h1></header>
<table><tr><th>ID</th>
					<th>Description</th></tr>
				
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/86">#86</a></td>
		<td><p>Warning and error messages have been updated, and it is now possible to show additional debug information. Additionally, syntax errors are now handled before the document is processed.</p></td></tr> 
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/93">#93</a></td>
		<td><p><a id="css_not_copied"></a>Default css files were not copied when creating a new project. The issue has been resolved by allowing the <a href="/glyph/book/macros/macros_structure.html#m_style"><code>style</code></a> macro to reference Glyph&#8217;s system styles (see also <a href="#system_css">#100</a>).</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/95">#95</a></td>
		<td><p>The <a href="/glyph/book/ref_commands.html#c_config"><code>config</code></a> command did not save data to <span class="caps">YAML</span> configuration files. This has been fixed ensuring that internal configuration overrides are not saved to the <span class="caps">YAML</span> file too.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/98">#98</a></td>
		<td><p>Glyph is now fully compatible with Ruby 1.9.1 and JRuby 1.4.0.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/101">#101</a></td>
		<td><p>Additional tests have been developed to improve Textile support. There should no longer be errors when using textile block elements inside Glyph macros.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/103">#103</a></td>
		<td><p>Fixed a bug that caused test failures when deleting the test project directory.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/104">#104</a></td>
		<td><p>Nested Glyph macros calling <code>Macro#interpret</code> no longer ignore escape delimiters.</p></td></tr>
		
	<tr><td><a href="http://github.com/h3rald/glyph/issues/closed#issue/107">#107</a></td>
		<td><p>Added the possibility to encode (using the <code>encode</code> macro) and decode (using the <code>decode</code> macro) macros so that they can be interpreted later.</p></td></tr></table>

</section>

</section>

	<section class="section">
<header><h1 id="h_242">v0.1.0 &ndash; April 8th 2010</h1></header>
Initial release.

</section>
							<nav><a href="/glyph/book/config/output.html">output.* &larr;</a><a href="/glyph/book/index.html">Contents</a></nav>
				</section> 
			</article> 


			<footer> 
				<section class="ads"> 
					<script type="text/javascript"><!--
						google_ad_client = "pub-2871497824158668";
						/* 728x90, created 9/10/10 */
						google_ad_slot = "3963343166";
						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']);

			(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>