s/wx.Color/wx.Colour/g
Update header.html
Minor Jonah and Sugarcane fixes.

* Added missing String.unDash() function used by
Wikifier.formatHelpers.inlineCssHelper
* Altered the "macro" formatter lookahead regex so that single
greater-than signs are permitted inside macros. (Double greater-than
signs still terminate).
* Added <noscript> messages to alert the reader that Javascript is off.
* Removed Furl link from Sugarcane.
zoom fit

Fixed wonky fit behavior reported
https://github.com/tweecode/twine/issues/28

added line 676
self.zoom(1.0)
Jonah, Sugarcane and Responsive fixes.

* Fixed a bug in my fix of the "macro" formatter lookahead regex -
sorry, it's good now.

* Unminified all the engine JavaScript in the header HTML files using
jsbeautify.com, primarily to make subsequent source diffs more readable,
and secondarily to make development less confusing.

* Moved previous fixes into Responsive:

-- Missing String.unDash

-- Greater-than signs in macros

-- Passage.prototype.render: data-tags attribute only added if tags
exist.

-- Passage.prototype.excerpt fix

* Added fixes to Sugarcane and Responsive:

-- Revised the Rewind menu so that it backtracks through state.history
instead of recalculating the game state using the URL hash.

-- Revised <<back>> and <<return>> so that they backtrack through
state.history instead of recalculating the game state using the URL
hash. This means, among other things, that random numbers used earlier
in the story won't be rerolled by <<back>> or <<return>> usage.

-- Also, <<return>>'s code has been merged with <<back>>'s, since their
only difference is that <<back>> rewinds the game state (and has a
different name).

-- The Responsive syntax for <<back>> has been merged into Sugarcane as
well - "label" and "labeldefault" parameters are valid. Moreover, they
can now be used alongside "steps" and "passage name" parameters, in
either order.

-- Updated Responsive's Passage.prototype.render to match recent
Sugarcane fixes.

* Fixes specific to Responsive:

-- Fixed the broken Rewind menu (missing "snapbackMenu" div and CSS
styles).

-- Fixed the Modernizr credits link.
Fixing Exponential newWidget distance issue

line 263,  passing Pixel coordinates to newWidget() instead of logical to get the correct starting position.
Syntax highlighting improvements and other fixes

Back macro:

* Now it accepts variables for the steps parameter and the

tweelexer.py:

* Now recognises mixed-case and uppercase <html> tags

* /% %/ comments, {{{ }}} monospacing, @@ @@ errors, and

* bold, italic and underline now apply these styles to the text, instead
of just greening it.

* Now handles nested syntax correctly.

* Now handles inline external links correctly.

* Now colours the link and image parts of inline images separately.

* Now colours text inside <<silently>> macros correctly.

Wikifier.formatHelpers:

* Tidied up the regexes for html and image.

* The < and > options for inline images now use CSS float attributes
instead of the deprecated HTML align attributes.

* The title text option for inline images now alters the alt attribute
as well.
#Enforce positive coordinates

This fix causes intersect to be true in intersectsAny if the widget coordinates are negative.
Fixed macros' throwError calls + bugfixes

* Fixed setPageElement() silently creating a needless global.
* Fixed said global being inadvertently used by <<set>>, <<back>>,
<<return>> and <<remember>> for their throwError() calls.
* Fixed a JS syntax error introduced in the previous commit.
* Removed some non-functional delete statements.
Fixed strings in <<set>> being wrongly parsed

This fixes the bug where twee macro operators inside strings passed to
<<set>> and <<print>> (such as <<print "Ten and two">>) would be wrongly
converted to Javascript operators (such as "Ten && two"). This should
correctly handle strings consisting of both kinds of quotes, as well as
containing escaped quotes.
Minor code and API tidying for all formats

All formats:
* Wrapped the engine code in an immediate function, to keep its
functions from polluting global scope and potentially interfering with
other included JS. Only the "state" and "tale" objects are put into
global scope. Note that this doesn't affect custom scripts/macros,
because they are all eval()-ed within the scope of main().
* Removed the $ function from the engine, so as to allow
jQuery/Prototype to use it. However, a copy of it is added to main(),
which means that old custom scripts may still use it (or override it).
* No longer overrides the built-in String.trim() if it exists.
* The quoteByLine wiki syntax no longer adds a finishing <br> element to
the <blockquote> element.
Responsive:
* Replaced the jQuery 1.7.2 code with a Google CDN call for jQuery 2.0.
This fixes the bug where a Unicode symbol in the jQuery code made the
Twine compiler not work with this format.
* Moved the Modernizr, matchMedia and Respond.js code below the engine
code, for readability.
* Made the "main-container" div have a padding-top of 1em.
Added <<else if>>

* Updated <<if>> to support <<else if>>, which essentially allows
multiple <<if>> macros to be chained together without nesting. I'm sure
you understand.
* This also eliminates a few implicit globals that
macros['if'].handler() was creating when it ran.
* Added 'to' as a Twine macro parameter keyword. This is converted to '
= ' by Wikifier.parse(). I noticed a few people on my Twitter feed were
getting confused between 'eq' and '=', so hopefully this will serve to
disambiguate them further.
HTML5 History

Altered Sugarcane so that it now uses HTML5 history management instead
of hashchanges. This means, apart from keeping the URL tidy, a number of
non-deterministic non-link-based state changes (setting a random number,
using a custom macro) are now properly remembered when you go back in
the browser. (One downside, though, is that you can no longer bookmark a
particular page to 'save your game'.)

The hashchange code still remains as an IE9 fallback.
Consolidated Sugarcane/Responsive code

* Consolidated the Javascript of Sugarcane and Responsive so that they
are now almost identical. This included folding the HTML5 History code
into Responsive and the storearea obfuscation code into Sugarcane, among
other things.
* Fixed a bug in a previous <blockquote> fix.
* Changed some of the <head> HTML in the two formats, in particular
using the HTML5 <meta charset="utf-8"> tag.
* Added "continued line" and "HTML tag" syntax to the Sugarcane
Wikifier. See these pages for rationale:
http://www.glorioustrainwrecks.com/node/5400
http://www.glorioustrainwrecks.com/node/5452
* Removed unused textPrimitives.
* tweelexer.py: Fixed a syntax highlighting bug.
Rearranged/sorted story format engine code

I've consolidated the engine code between Sugarcane/Responsive and
Jonah. All the functions that should be the same in both are
synchronised, and all those that are different have been moved to the
bottom of the script sections in each, in a marked section. This should
make future fixes to the 'general Twine runtime' much easier to apply
across all 3 formats.
Merge remote-tracking branch 'webbedspace/master' into webbedspace_test

Conflicts:
	targets/sugarcane/header.html