utopia 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a8ab7d4e3b2ae63d567e00b81cb6a0eca2faebb
-  data.tar.gz: 354541a358b910c86713a002411af739eda77d68
+SHA256:
+  metadata.gz: 281493fd02c38ac70b4717044a5cc1cf6e75a77891a824705bfb4535d43ab0e6
+  data.tar.gz: 2b6a12707192d90030e2bc9ef07dd34aa799d0fa416fdeda1c7910eadc7ded1d
 SHA512:
-  metadata.gz: 1e580af2a4540e8456cb892f3fadeda156213720a2cfe7f3779f62eaf09d0152cbe5ce8ef9132cffc0a79b4e726321b3685ca63e44acfdab1eaa3e42c0b5b753
-  data.tar.gz: 88ec745909cbc0b8e2a96a4f18cf6a3d63f20fb80f356a6ecbe644dee614ec0cae5045cd949a07f8d243dfacb419d973c7cec02db7468731d1fb50fb5e2c2e0d
+  metadata.gz: d60e658394b717982b04177ff3ae04b4ffb9207b4f7f8a4b797136c3b5debc46b1d088c4766cfc3234f5ee85d6a9d3b654f6f88ad3fe0db1f550b5eff7b1efdf
+  data.tar.gz: 998b66866873427ac342f3abe04e9b8c67172a3fb9d232633ad096af6af915ba4564ac9656c6d4be3c376362784ca7bacc0d56ad8d4697fb1c3ec15b504fd034

data/.codeclimate.yml

@@ -1,4 +1,5 @@
 exclude_paths:
+- "docs/**/*"
 - "documentation/**/*"
 - "setup/**/*"
 - "benchmarks/*"

data/.travis.yml

@@ -8,11 +8,13 @@ before_install:
   - git config --global user.name "Samuel Williams"
   # https://github.com/rubygems/rubygems/issues/1448
   - gem update --system
-  - gem install bundler
+  # I don't know why I need to install this on travis in order for tests to function.
+  - gem install bundler samovar
 rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
   - jruby-head
   - ruby-head
 env: COVERAGE=true BENCHMARK=true

data/Gemfile

@@ -13,6 +13,8 @@ group :development do
 	
 	gem 'json'
 	gem 'msgpack'
+	
+	gem "rackula"
 end
 
 group :test do

data/README.md

@@ -1,4 +1,4 @@
-# ![Utopia Logo](materials/utopia.png?raw=true)
+# ![Utopia Logo](materials/utopia.svg)
 
 Utopia is a website generation framework which provides a robust set of tools to build highly complex dynamic websites. It uses the filesystem heavily for content and provides functions for interacting with files and directories as structure representing the website.
 
@@ -39,7 +39,7 @@ Create a new site:
 
 ## Usage
 
-There is an excellent documentation wiki included with the source code. Simply clone this repository and `rake documentation`. This documentation wiki is editable, so feel free to submit a PR with improvements.
+There is an excellent documentation wiki included with the source code. Simply clone this repository and `rake documentation:server`. This documentation wiki is editable, so feel free to submit a PR with improvements.
 
 ## Contributing
 

data/Rakefile

@@ -3,13 +3,25 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:test)
 
-task :documentation do
-	sh('yard', '-o', "documentation/public/code")
-	
-	Bundler.with_clean_env do	
-		Dir.chdir('documentation') do
-			sh('bundle', 'install', '--quiet')
-			sh('bundle', 'exec', 'rake')
+namespace :documentation do
+	task :yard do
+		sh('yard', '-o', "documentation/public/code")
+	end
+
+	task :server => :yard do
+		Bundler.with_clean_env do
+			Dir.chdir('documentation') do
+				sh('bundle', 'install', '--quiet')
+				sh('bundle', 'exec', 'rake')
+			end
+		end
+	end
+
+	task :static => :yard do
+		require 'rackula/command'
+		
+		Dir.chdir("documentation") do
+			Rackula::Command::Top["generate", "--force", "--output-path", "../docs"].invoke
 		end
 	end
 end

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.apache.css

@@ -0,0 +1,6 @@
+.syntax-theme-base .apache .tag {
+  color: #00c; }
+.syntax-theme-base .apache .tag-name {
+  color: #00f; }
+.syntax-theme-base .apache .tag-name {
+  font-weight: bold; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.applescript.css

@@ -0,0 +1,5 @@
+.syntax-theme-base .applescript {
+  font-family: Geneva, Helvetica, sans-serif; }
+  .syntax-theme-base .applescript .keyword {
+    color: #00f;
+    font-weight: bold; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.assembly.css

@@ -0,0 +1,8 @@
+.syntax-theme-base .assembly .register {
+  color: #3caa20;
+  font-style: italic; }
+.syntax-theme-base .assembly .label {
+  font-weight: bold;
+  color: #2a85b3; }
+.syntax-theme-base .assembly .directive {
+  color: #828a3d; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.bash-script.css

@@ -0,0 +1,6 @@
+.syntax-theme-base .bash-script .function {
+  font-weight: bold; }
+.syntax-theme-base .bash-script .option {
+  color: #03f; }
+.syntax-theme-base .bash-script .env {
+  font-style: italic; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.bash.css

@@ -0,0 +1,10 @@
+.syntax-theme-base .bash {
+  color: #555; }
+  .syntax-theme-base .bash .prompt {
+    color: #0c0;
+    font-weight: bold; }
+  .syntax-theme-base .bash .bash-script {
+    font-style: normal;
+    color: black; }
+  .syntax-theme-base .bash .stderr {
+    color: red; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.clang.css

@@ -0,0 +1,3 @@
+.syntax-theme-base .preprocessor {
+  color: #63381f;
+  font-style: italic; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.css.css

@@ -0,0 +1,14 @@
+.syntax-theme-base .css .selector {
+  color: #458;
+  font-weight: bold; }
+.syntax-theme-base .css .property {
+  color: teal; }
+.syntax-theme-base .css .color-box {
+  position: relative; }
+  .syntax-theme-base .css .color-box .sample {
+    border: 1px solid #000;
+    position: absolute;
+    left: 0.2em;
+    right: 0.2em;
+    top: 0.2em;
+    bottom: 0.2em; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.diff.css

@@ -0,0 +1,16 @@
+.syntax-theme-base .syntax .add {
+  color: green; }
+.syntax-theme-base .syntax .del {
+  color: red; }
+.syntax-theme-base .syntax .insert {
+  color: green; }
+.syntax-theme-base .syntax .insert-line {
+  background-color: #cfc !important; }
+.syntax-theme-base .syntax .remove {
+  color: red; }
+.syntax-theme-base .syntax .remove-line {
+  background-color: #fcc !important; }
+.syntax-theme-base .syntax .offset {
+  color: blue; }
+.syntax-theme-base .syntax .offset-line {
+  background-color: #ccf !important; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.html.css

@@ -0,0 +1,5 @@
+.syntax-theme-base .html .doctype {
+  font-weight: bold;
+  color: #938; }
+.syntax-theme-base .html .javascript, .syntax-theme-base .html .css {
+  font-style: italic; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.ocaml.css

@@ -0,0 +1,3 @@
+.syntax .ocaml .operator {
+  color: #06C;
+  font-weight: bold; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.protobuf.css

@@ -0,0 +1,2 @@
+.syntax .protobuf .variable {
+  font-weight: bold; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.python.css

@@ -0,0 +1,6 @@
+.syntax-theme-base .python .decorator {
+  color: #ffb600;
+  font-weight: bold; }
+.syntax-theme-base .python .builtin {
+  color: #33f;
+  font-style: italic; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.ruby.css

@@ -0,0 +1,2 @@
+.syntax-theme-base .ruby .string .ruby {
+  color: #000; }

data/docs/_components/jquery-syntax/base/jquery.syntax.brush.xml.css

@@ -0,0 +1,18 @@
+.syntax-theme-base .xml .cdata-content {
+  color: #046;
+  border-radius: 0.5em; }
+.syntax-theme-base .xml .xml-tag, .syntax-theme-base .xml .cdata {
+  color: #00c; }
+.syntax-theme-base .xml .tag-name, .syntax-theme-base .xml .cdata-tag {
+  color: #00f;
+  font-weight: bold; }
+.syntax-theme-base .xml .namespace {
+  color: #00c; }
+.syntax-theme-base .xml .attribute {
+  color: #00c; }
+.syntax-theme-base .xml .instruction {
+  color: #00c; }
+.syntax-theme-base .xml .entity, .syntax-theme-base .xml .percent-escape {
+  color: #666;
+  background-color: #ddd;
+  border-radius: 0.5em; }

data/docs/_components/jquery-syntax/base/jquery.syntax.core.css

@@ -0,0 +1,62 @@
+pre code.syntax-theme-base {
+  display: block; }
+  pre code.syntax-theme-base > span {
+    display: block;
+    white-space: pre-wrap; }
+  pre code.syntax-theme-base .indent {
+    display: block;
+    float: left; }
+  pre code.syntax-theme-base .text {
+    white-space: pre-wrap;
+    display: block;
+    overflow: hidden;
+    padding-left: 1rem;
+    text-indent: -1rem; }
+
+.syntax-theme-base {
+  font-family: Menlo, Monaco, Consolas, monospace;
+  line-height: 1.15em; }
+  .syntax-theme-base a {
+    text-decoration: none;
+    color: inherit; }
+  .syntax-theme-base .function {
+    color: #33f; }
+  .syntax-theme-base .keyword, .syntax-theme-base .access {
+    color: #7a0968; }
+  .syntax-theme-base .type {
+    color: #3239D6; }
+  .syntax-theme-base .comment {
+    color: #6ac; }
+  .syntax-theme-base .constant {
+    color: #1c00ce; }
+  .syntax-theme-base .string, .syntax-theme-base .symbol {
+    color: #c41a15; }
+  .syntax-theme-base .string .escape {
+    color: #f99; }
+  .syntax-theme-base .operator {
+    color: #000000; }
+  .syntax-theme-base .href {
+    color: #0e0eff;
+    text-decoration: underline; }
+  .syntax-theme-base .variable {
+    color: #466997; }
+  .syntax-theme-base .highlight {
+    background-color: #fdfdba; }
+  .syntax-theme-base pre {
+    overflow: auto;
+    font-family: inherit; }
+
+.syntax-container.syntax-theme-base {
+  position: relative; }
+  .syntax-container.syntax-theme-base .toolbar {
+    font-size: 80%;
+    text-align: right;
+    padding: 0 0.2em 0.2em; }
+    .syntax-container.syntax-theme-base .toolbar a {
+      margin-left: 1em; }
+  .syntax-container.syntax-theme-base pre.raw {
+    overflow: auto;
+    padding: 0 0.4em 0 !important;
+    margin: 0 !important;
+    background-color: #f0f0f0;
+    border: 1px solid #aaa; }

data/docs/_components/jquery-syntax/base/jquery.syntax.editor.css

@@ -0,0 +1,6 @@
+.syntax-container.syntax-theme-base div.editor.syntax {
+  padding: 0.2em !important;
+  margin: 0 !important;
+  white-space: pre; }
+.syntax-container.syntax-theme-base div.editor.syntax:focus {
+  outline: none; }

data/docs/_components/jquery-syntax/base/theme.js

@@ -0,0 +1 @@
+Syntax.themes["base"] = []

data/docs/_components/jquery-syntax/bright/jquery.syntax.core.css

@@ -0,0 +1,27 @@
+.syntax-container.syntax-theme-bright .syntax {
+  font-family: Menlo, Monaco, Consolas, monospace;
+  line-height: 1.5em; }
+  .syntax-container.syntax-theme-bright .syntax .function {
+    color: #33f; }
+  .syntax-container.syntax-theme-bright .syntax .keyword {
+    color: #3c3; }
+  .syntax-container.syntax-theme-bright .syntax .access {
+    color: #ffb600;
+    font-weight: bold; }
+  .syntax-container.syntax-theme-bright .syntax .type {
+    color: #191;
+    font-weight: bold; }
+  .syntax-container.syntax-theme-bright .syntax .comment {
+    color: #6ac;
+    font-style: italic; }
+  .syntax-container.syntax-theme-bright .syntax .string, .syntax-container.syntax-theme-bright .syntax .constant {
+    color: #f33; }
+  .syntax-container.syntax-theme-bright .syntax .string .escape {
+    color: #f99; }
+  .syntax-container.syntax-theme-bright .syntax .operator {
+    color: #c00; }
+  .syntax-container.syntax-theme-bright .syntax .href {
+    color: #00f;
+    text-decoration: underline; }
+  .syntax-container.syntax-theme-bright .syntax .variable {
+    color: #22c; }

data/docs/_components/jquery-syntax/bright/theme.js

@@ -0,0 +1 @@
+Syntax.themes["bright"] = ["base"]

data/docs/_components/jquery-syntax/jquery.syntax.brush.apache.js

@@ -0,0 +1,41 @@
+// brush: "apache" aliases: []
+
+//	This file is part of the "jQuery.Syntax" project, and is distributed under the MIT License.
+//	Copyright (c) 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+//	See <jquery.syntax.js> for licensing details.
+
+Syntax.register('apache', function(brush) {
+	brush.push({
+		pattern: /(<(\w+).*?>)/gi,
+		matches: Syntax.extractMatches(
+		{
+			klass: 'tag',
+			allow: ['attribute', 'tag-name', 'string']
+		},
+		{
+			klass: 'tag-name',
+			process: Syntax.lib.webLinkProcess("site:http://httpd.apache.org/docs/trunk/ directive", true)
+		})
+	});
+
+	brush.push({
+		pattern: /(<\/(\w+).*?>)/gi,
+		matches: Syntax.extractMatches({klass: 'tag', allow: ['tag-name']}, {klass: 'tag-name'})
+	});
+
+	brush.push({
+		pattern: /^\s+([A-Z][\w]+)/gm,
+		matches: Syntax.extractMatches({
+			klass: 'function',
+			allow: ['attribute'],
+			process: Syntax.lib.webLinkProcess("site:http://httpd.apache.org/docs/trunk/ directive", true)
+		})
+	});
+
+	brush.push(Syntax.lib.perlStyleComment);
+	brush.push(Syntax.lib.singleQuotedString);
+	brush.push(Syntax.lib.doubleQuotedString);
+	
+	brush.push(Syntax.lib.webLink);
+});
+

data/docs/_components/jquery-syntax/jquery.syntax.brush.applescript.js

@@ -0,0 +1,57 @@
+// brush: "applescript" aliases: []
+
+//	This file is part of the "jQuery.Syntax" project, and is distributed under the MIT License.
+//	Copyright (c) 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+//	See <jquery.syntax.js> for licensing details.
+
+Syntax.register('applescript', function(brush) {
+	var keywords = ["after", "before", "beginning", "continue", "copy", "each", "end", "every", "from", "get", "global", "in", "local", "named", "of", "return", "set", "some", "that", "the", "then", "times", "to", "where", "whose", "with", "without"]
+	
+	brush.push(keywords, {klass: 'keyword'});
+	
+	var ordinals = ["first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth", "ninth", "tenth", "last", "front", "back", "middle"];
+	
+	brush.push(ordinals, {klass: 'keyword'});
+	
+	var specials = ["activate", "add", "alias", "AppleScript", "ask", "attachment", "boolean", "class", "constant", "delete", "duplicate", "empty", "exists", "false", "id", "integer", "list", "make", "message", "modal", "modified", "new", "no", "paragraph", "pi", "properties", "quit", "real", "record", "remove", "rest", "result", "reveal", "reverse", "run", "running", "save", "string", "true", "word", "yes"];
+	
+	brush.push(specials, {klass: 'keyword'});
+	
+	var comments = [
+		/(\-\-|#).*$/gm,
+		/\(\*(?:[\s\S]*?\(\*[\s\S]*?\*\))*[\s\S]*?\*\)/gm,
+		Syntax.lib.perlStyleComment.pattern
+	];
+	
+	brush.push(Syntax.lib.webLink);
+	brush.push(comments, {klass: 'comment', allow: ['href']});
+	
+	brush.push(Syntax.lib.doubleQuotedString);
+	
+	var constants = [
+		/\b\d+(st|nd|rd|th)\b/g,
+		/(-)?(\d)+(\.(\d)?)?(E\+(\d)+)?/g
+	];
+	
+	brush.push(constants, {klass: 'constant'});
+	
+	brush.push({
+		pattern: /&|¬|=|≠|>|<|≥|>=|≤|<=|\*|\+|-|\/|÷|\^/g,
+		klass: 'operator'
+	});
+	
+	brush.push({
+		pattern: /\b(?:and|as|div|mod|not|or|return(?!\s&)(ing)?|equals|(is(n't| not)? )?equal( to)?|does(n't| not) equal|(is(n't| not)? )?(greater|less) than( or equal( to)?)?|(comes|does(n't| not) come) (after|before)|is(n't| not)?( in)? (back|front) of|is(n't| not)? behind|is(n't| not)?( (in|contained by))?|does(n't| not) contain|contain(s)?|(start|begin|end)(s)? with|((but|end) )?(consider|ignor)ing|prop(erty)?|(a )?ref(erence)?( to)?|repeat (until|while|with)|((end|exit) )?repeat|((else|end) )?if|else|(end )?(script|tell|try)|(on )?error|(put )?into|(of )?(it|me)|its|my|with (timeout( of)?|transaction)|end (timeout|transaction))\b/g,
+		klass: 'keyword'
+	})
+	
+	brush.push({
+		pattern: /\b(?:about|above|against|around|at|below|beneath|beside|between|by|(apart|aside) from|(instead|out) of|into|on(to)?|over|since|thr(ough|u)|under)\b/g,
+		klass: 'keyword'
+	})
+	
+	brush.push({
+		pattern: /\b(?:adding folder items to|after receiving|choose( ((remote )?application|color|folder|from list|URL))?|clipboard info|set the clipboard to|(the )?clipboard|entire contents|display(ing| (alert|dialog|mode))?|document( (edited|file|nib name))?|file( (name|type))?|(info )?for|giving up after|(name )?extension|quoted form|return(ed)?|second(?! item)(s)?|list (disks|folder)|text item(s| delimiters)?|(Unicode )?text|(disk )?item(s)?|((current|list) )?view|((container|key) )?window|with (data|icon( (caution|note|stop))?|parameter(s)?|prompt|properties|seed|title)|case|diacriticals|hyphens|numeric strings|punctuation|white space|folder creation|application(s( folder)?| (processes|scripts position|support))?|((desktop )?(pictures )?|(documents|downloads|favorites|home|keychain|library|movies|music|public|scripts|sites|system|users|utilities|workflows) )folder|desktop|Folder Action scripts|font(s| panel)?|help|internet plugins|modem scripts|(system )?preferences|printer descriptions|scripting (additions|components)|shared (documents|libraries)|startup (disk|items)|temporary items|trash|on server|in AppleTalk zone|((as|long|short) )?user name|user (ID|locale)|(with )?password|in (bundle( with identifier)?|directory)|(close|open for) access|read|write( permission)?|(g|s)et eof|using( delimiters)?|starting at|default (answer|button|color|country code|entr(y|ies)|identifiers|items|name|location|script editor)|hidden( answer)?|open(ed| (location|untitled))?|error (handling|reporting)|(do( shell)?|load|run|store) script|administrator privileges|altering line endings|get volume settings|(alert|boot|input|mount|output|set) volume|output muted|(fax|random )?number|round(ing)?|up|down|toward zero|to nearest|as taught in school|system (attribute|info)|((AppleScript( Studio)?|system) )?version|(home )?directory|(IPv4|primary Ethernet) address|CPU (type|speed)|physical memory|time (stamp|to GMT)|replacing|ASCII (character|number)|localized string|from table|offset|summarize|beep|delay|say|(empty|multiple) selections allowed|(of|preferred) type|invisibles|showing( package contents)?|editable URL|(File|FTP|News|Media|Web) [Ss]ervers|Telnet hosts|Directory services|Remote applications|waiting until completion|saving( (in|to))?|path (for|to( (((current|frontmost) )?application|resource))?)|POSIX (file|path)|(background|RGB) color|(OK|cancel) button name|cancel button|button(s)?|cubic ((centi)?met(re|er)s|yards|feet|inches)|square ((kilo)?met(re|er)s|miles|yards|feet)|(centi|kilo)?met(re|er)s|miles|yards|feet|inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees (Celsius|Fahrenheit|Kelvin)|print( (dialog|settings))?|clos(e(able)?|ing)|(de)?miniaturized|miniaturizable|zoom(ed|able)|attribute run|action (method|property|title)|phone|email|((start|end)ing|home) page|((birth|creation|current|custom|modification) )?date|((((phonetic )?(first|last|middle))|computer|host|maiden|related) |nick)?name|aim|icq|jabber|msn|yahoo|address(es)?|save addressbook|should enable action|city|country( code)?|formatte(r|d address)|(palette )?label|state|street|zip|AIM [Hh]andle(s)?|my card|select(ion| all)?|unsaved|(alpha )?value|entr(y|ies)|group|(ICQ|Jabber|MSN) handle|person|people|company|department|icon image|job title|note|organization|suffix|vcard|url|copies|collating|pages (across|down)|request print time|target( printer)?|((GUI Scripting|Script menu) )?enabled|show Computer scripts|(de)?activated|awake from nib|became (key|main)|call method|of (class|object)|center|clicked toolbar item|closed|for document|exposed|(can )?hide|idle|keyboard (down|up)|event( (number|type))?|launch(ed)?|load (image|movie|nib|sound)|owner|log|mouse (down|dragged|entered|exited|moved|up)|move|column|localization|resource|script|register|drag (info|types)|resigned (active|key|main)|resiz(e(d)?|able)|right mouse (down|dragged|up)|scroll wheel|(at )?index|should (close|open( untitled)?|quit( after last window closed)?|zoom)|((proposed|screen) )?bounds|show(n)?|behind|in front of|size (mode|to fit)|update(d| toolbar item)?|was (hidden|miniaturized)|will (become active|close|finish launching|hide|miniaturize|move|open|quit|(resign )?active|((maximum|minimum|proposed) )?size|show|zoom)|bundle|data source|movie|pasteboard|sound|tool(bar| tip)|(color|open|save) panel|coordinate system|frontmost|main( (bundle|menu|window))?|((services|(excluded from )?windows) )?menu|((executable|frameworks|resource|scripts|shared (frameworks|support)) )?path|(selected item )?identifier|data|content(s| view)?|character(s)?|click count|(command|control|option|shift) key down|context|delta (x|y|z)|key( code)?|location|pressure|unmodified characters|types|(first )?responder|playing|(allowed|selectable) identifiers|allows customization|(auto saves )?configuration|visible|image( name)?|menu form representation|tag|user(-| )defaults|associated file name|(auto|needs) display|current field editor|floating|has (resize indicator|shadow)|hides when deactivated|level|minimized (image|title)|opaque|position|release when closed|sheet|title(d)?)\b/g,
+		klass: 'keyword'
+	})
+});

data/docs/_components/jquery-syntax/jquery.syntax.brush.assembly.js

@@ -0,0 +1,37 @@
+// brush: "assembly" aliases: ["asm"]
+
+//	This file is part of the "jQuery.Syntax" project, and is distributed under the MIT License.
+//	Copyright (c) 2011 Samuel G. D. Williams. <http://www.oriontransfer.co.nz>
+//	See <jquery.syntax.js> for licensing details.
+
+Syntax.register('assembly', function(brush) {
+	brush.push(Syntax.lib.cStyleComment);
+	brush.push(Syntax.lib.cppStyleComment);
+	
+	brush.push({pattern: /\.[a-zA-Z_][a-zA-Z0-9_]*/gm, klass: 'directive'});
+	
+	brush.push({pattern: /^[a-zA-Z_][a-zA-Z0-9_]*:/gm, klass: 'label'});
+	
+	brush.push({
+		pattern: /^\s*([a-zA-Z]+)/gm,
+		matches: Syntax.extractMatches({klass: 'function'})
+	});
+	
+	brush.push({pattern: /(-[0-9]+)|(\b[0-9]+)|(\$[0-9]+)/g, klass: 'constant'});
+	brush.push({pattern: /(\-|\b|\$)(0x[0-9a-f]+|[0-9]+|[a-z0-9_]+)/gi, klass: 'constant'});
+	
+	brush.push({pattern: /%\w+/g, klass: 'register'});
+	
+	// Strings
+	brush.push(Syntax.lib.singleQuotedString);
+	brush.push(Syntax.lib.doubleQuotedString);
+	brush.push(Syntax.lib.stringEscape);
+	
+	// Numbers
+	brush.push(Syntax.lib.decimalNumber);
+	brush.push(Syntax.lib.hexNumber);
+	
+	// Comments
+	brush.push(Syntax.lib.perlStyleComment);
+	brush.push(Syntax.lib.webLink);
+});