Merge pull request #86 from methodofaction/gulp

Gulp build

.gitignore

@@ -1,10 +1,3 @@
-build/firefox/*
-build/opera/*
-build/svg-edit-2.6/*
-build/svg-edit-2.6-src/*
-build/svg-edit-2.6-src.tar.gz
-build/svg-edit-2.6.wgt
-build/svg-edit-2.6.xpi
-build/svg-edit-2.6.zip
+node_modules/*
 .DS_Store
 deploy.sh

Makefile

@@ -1,97 +0,0 @@
-NAME=method-draw
-VERSION=2.6
-PACKAGE=$(NAME)
-MAKEDOCS=naturaldocs/NaturalDocs
-CLOSURE=build/tools/closure-compiler.jar
-YUICOMPRESSOR=build/tools/yuicompressor-2.4.7.jar
-
-# All files that will be compiled by the Closure compiler.
-
-JS_FILES=\
-	lib/pathseg.js \
-	lib/touch.js \
-	lib/js-hotkeys/jquery.hotkeys.min.js \
-	icons/jquery.svgicons.js \
-	lib/jgraduate/jquery.jgraduate.js \
-	lib/contextmenu/jquery.contextMenu.js \
-	src/browser.js \
-	src/svgtransformlist.js \
-	src/math.js \
-	src/units.js \
-	src/svgutils.js \
-	src/sanitize.js \
-	src/history.js \
-	src/select.js \
-	src/draw.js \
-	src/path.js \
-	src/svgcanvas.js \
-	src/method-draw.js \
-	lib/jquery-draginput.js \
-	lib/contextmenu.js \
-	lib/jquery-ui/jquery-ui-1.8.17.custom.min.js \
-	lib/jgraduate/jpicker.min.js \
-	lib/mousewheel.js \
-	extensions/ext-eyedropper.js \
-	extensions/ext-grid.js \
-	extensions/ext-shapes.js \
-	lib/requestanimationframe.js \
-	lib/taphold.js \
-	lib/filesaver.js
-
-CSS_FILES=\
-	lib/jgraduate/css/jPicker.css \
-	lib/jgraduate/css/jgraduate.css \
-	css/method-draw.css \
-
-JS_INPUT_FILES=$(addprefix editor/, $(JS_FILES))
-CSS_INPUT_FILES=$(addprefix editor/, $(CSS_FILES))
-JS_BUILD_FILES=$(addprefix $(PACKAGE)/, $(JS_FILES))
-CSS_BUILD_FILES=$(addprefix $(PACKAGE)/, $(CSS_FILES))
-CLOSURE_JS_ARGS=$(addprefix --js , $(JS_INPUT_FILES))
-COMPILED_JS=editor/method-draw.compiled.js
-COMPILED_CSS=editor/css/method-draw.compiled.css
-
-all: release
-
-# The build directory relies on the JS being compiled.
-$(PACKAGE): $(COMPILED_JS) $(COMPILED_CSS)
-	rm -rf config;
-	mkdir config;
-	if [ -x $(MAKEDOCS) ] ; then $(MAKEDOCS) -i editor/ -o html docs/ -p config/ -oft -r ; fi
-
-	# Make build directory and copy all editor contents into it
-	mkdir -p $(PACKAGE)
-	cp -r editor/* $(PACKAGE)
-
-	# Remove all hidden .svn directories
-	-find $(PACKAGE) -name .svn -type d | xargs rm -rf {} \;
-	-find $(PACKAGE) -name .git -type d | xargs rm -rf {} \;
-
-	# Create the release version of the main HTML file.
-	build/tools/ship.py --i=editor/index.html --on=svg_edit_release > $(PACKAGE)/index.html
-
-# NOTE: Some files are not ready for the Closure compiler: (jquery)
-# NOTE: Our code safely compiles under SIMPLE_OPTIMIZATIONS
-# NOTE: Our code is *not* ready for ADVANCED_OPTIMIZATIONS
-# NOTE: WHITESPACE_ONLY and --formatting PRETTY_PRINT is helpful for debugging.
-
-$(COMPILED_CSS):
-	cat $(CSS_INPUT_FILES) > editor/temp.css;
-	java -jar $(YUICOMPRESSOR) editor/temp.css -o $(COMPILED_CSS) --line-break 0;
-	rm editor/temp.css;
-
-$(COMPILED_JS):
-	java -jar $(CLOSURE) \
-		--compilation_level SIMPLE_OPTIMIZATIONS \
-		$(CLOSURE_JS_ARGS) \
-		--js_output_file $(COMPILED_JS)
-
-compile: $(COMPILED_JS) $(COMPILED_CSS)
-
-release: $(PACKAGE)
-
-clean:
-	rm -rf config
-	rm -rf $(PACKAGE)
-	rm -rf $(COMPILED_JS)
-	rm -rf $(COMPILED_CSS)

build/tools/COPYING

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

build/tools/README

@@ -1,289 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//
-// Contents
-//
-
-The Closure Compiler performs checking, instrumentation, and
-optimizations on JavaScript code. The purpose of this README is to
-explain how to build and run the Closure Compiler.
-
-The Closure Compiler requires Java 6 or higher.
-http://www.java.com/
-
-
-//
-// Building The Closure Compiler
-//
-
-There are three ways to get a Closure Compiler executable.
-
-1) Use one we built for you.
-
-Pre-built Closure binaries can be found at
-http://code.google.com/p/closure-compiler/downloads/list
-
-
-2) Check out the source and build it with Apache Ant.
-
-First, check out the full source tree of the Closure Compiler. There
-are instructions on how to do this at the project site.
-http://code.google.com/p/closure-compiler/source/checkout
-
-Apache Ant is a cross-platform build tool.
-http://ant.apache.org/
-
-At the root of the source tree, there is an Ant file named
-build.xml. To use it, navigate to the same directory and type the
-command
-
-ant jar
-
-This will produce a jar file called "build/compiler.jar".
-
-
-3) Check out the source and build it with Eclipse.
-
-Eclipse is a cross-platform IDE.
-http://www.eclipse.org/
-
-Under Eclipse's File menu, click "New > Project ..." and create a
-"Java Project."  You will see an options screen. Give the project a
-name, select "Create project from existing source," and choose the
-root of the checked-out source tree as the existing directory. Verify
-that you are using JRE version 6 or higher.
-
-Eclipse can use the build.xml file to discover rules. When you
-navigate to the build.xml file, you will see all the build rules in
-the "Outline" pane. Run the "jar" rule to build the compiler in
-build/compiler.jar.
-
-
-//
-// Running The Closure Compiler
-//
-
-Once you have the jar binary, running the Closure Compiler is straightforward.
-
-On the command line, type
-
-java -jar compiler.jar
-
-This starts the compiler in interactive mode. Type
-
-var x = 17 + 25;
-
-then hit "Enter", then hit "Ctrl-Z" (on Windows) or "Ctrl-D" (on Mac or Linux)
-and "Enter" again. The Compiler will respond:
-
-var x=42;
-
-The Closure Compiler has many options for reading input from a file,
-writing output to a file, checking your code, and running
-optimizations. To learn more, type
-
-java -jar compiler.jar --help
-
-You can read more detailed documentation about the many flags at
-http://code.google.com/closure/compiler/docs/gettingstarted_app.html
-
-
-//
-// Compiling Multiple Scripts
-//
-
-If you have multiple scripts, you should compile them all together with
-one compile command.
-
-java -jar compiler.jar --js=in1.js --js=in2.js ... --js_output_file=out.js
-
-The Closure Compiler will concatenate the files in the order they're
-passed at the command line.
-
-If you need to compile many, many scripts together, you may start to
-run into problems with managing dependencies between scripts. You
-should check out the Closure Library. It contains functions for
-enforcing dependencies between scripts, and a tool called calcdeps.py
-that knows how to give scripts to the Closure Compiler in the right
-order.
-
-http://code.google.com/p/closure-library/
-
-//
-// Licensing
-//
-
-Unless otherwise stated, all source files are licensed under
-the Apache License, Version 2.0.
-
-
------
-Code under:
-src/com/google/javascript/rhino
-test/com/google/javascript/rhino
-
-URL: http://www.mozilla.org/rhino
-Version:  1.5R3, with heavy modifications
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: A partial copy of Mozilla Rhino. Mozilla Rhino is an
-implementation of JavaScript for the JVM.  The JavaScript parser and
-the parse tree data structures were extracted and modified
-significantly for use by Google's JavaScript compiler.
-
-Local Modifications: The packages have been renamespaced. All code not
-relavant to parsing has been removed. A JSDoc parser and static typing
-system have been added.
-
-
------
-Code in:
-lib/libtrunk_rhino_parser_jarjared.jar
-
-Rhino
-URL: http://www.mozilla.org/rhino
-Version:  Trunk
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: Mozilla Rhino is an implementation of JavaScript for the JVM.
-
-Local Modifications: None. We've used JarJar to renamespace the code
-post-compilation. See:
-http://code.google.com/p/jarjar/
-
-
------
-Code in:
-lib/args4j_deploy.jar
-
-Args4j
-URL: https://args4j.dev.java.net/
-Version: 2.0.9
-License: MIT
-
-Description:
-args4j is a small Java class library that makes it easy to parse command line
-options/arguments in your CUI application.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/guava-r06.jar
-
-Guava Libraries
-URL: http://code.google.com/p/guava-libraries/
-Version:  R6
-License: Apache License 2.0
-
-Description: Google's core Java libraries.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/hamcrest-core-1.1.jar
-
-Hamcrest
-URL: http://code.google.com/p/hamcrest
-License: BSD
-License File: LICENSE
-
-Description:
-Provides a library of matcher objects (also known as constraints or
-predicates) allowing 'match' rules to be defined declaratively, to be used in
-other frameworks. Typical scenarios include testing frameworks, mocking
-libraries and UI validation rules.
-
-Local modifications:
-The original jars contained both source code and compiled classes.
-
-hamcrest-core-1.1.jar just contains the compiled classes.
-
-
-
------
-Code in:
-lib/jsr305.jar
-
-Annotations for software defect detection
-URL: http://code.google.com/p/jsr-305/
-Version: svn revision 47
-License: BSD License
-
-Description: Annotations for software defect detection.
-
-Local Modifications: None.
-
-
-----
-Code in:
-lib/junit.jar
-
-JUnit
-URL:  http://sourceforge.net/projects/junit/
-Version:  4.5
-License:  Common Public License 1.0
-
-Description: A framework for writing and running automated tests in Java.
-
-Local Modifications: None.
-
-
----
-Code in:
-lib/protobuf-java-2.3.0.jar
-
-Protocol Buffers
-URL: http://code.google.com/p/protobuf/
-Version: 2.3.0
-License: New BSD License
-
-Description: Supporting libraries for protocol buffers,
-an encoding of structured data.
-
-Local Modifications: None
-
-
----
-Code in:
-lib/ant_deploy.jar
-
-URL: http://ant.apache.org/bindownload.cgi
-Version: 1.6.5
-License: Apache License 2.0
-Description:
-  Ant is a Java based build tool. In theory it is kind of like "make"
-  without make's wrinkles and with the full portability of pure java code.
-
-Local Modifications:
-  Modified apache-ant-1.6.5/bin/ant to look in the ant.runfiles directory
-
-
----
-Code in:
-lib/json.jar
-URL: http://json.org/java/index.html
-Version: JSON version 2
-License: MIT license
-Description:
-JSON is a set of java files for use in transmitting data in JSON format.
-
-Local Modifications: None
-

build/tools/ship.py

@@ -1,155 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# ship.py
-#
-# Licensed under the Apache 2 License as is the rest of the project
-# Copyright (c) 2011 Jeff Schiller
-#
-# This script has very little real-world application.  It is only used in our pure-client web app
-# served on GoogleCode so we can have one HTML file, run a build script and generate a 'release'
-# version without having to maintain two separate HTML files.  It does this by evaluating
-# 'processing comments' that are suspicously similar to IE conditional comments and then outputting
-# a new HTML file after evaluating particular variables.
-#
-# This script takes the following inputs:
-#
-# * a HTML file (--i=in.html)
-# * a series of flag names (--on=Foo --on=Bar)
-#
-# Example:
-#
-# in.html:
-#   <!--{if foo}>
-#     FOO!
-#   <!{else}-->
-#     BAR!
-#   <!--{endif}-->
-#
-# $ ship.py --i in.html --on foo
-#
-# out.html:
-#   <!--{if foo}-->
-#     FOO!
-#   <!--{else}>
-#     BAR!
-#   <!{endif}-->
-#
-# It has the following limitations:
-#
-# 1) Only if-else-endif are currently supported.
-# 2) All processing comments must be on one line with no other non-whitespace characters.
-# 3) Comments cannot be nested.
-
-import optparse
-import os
-
-inside_if = False
-last_if_true = False
-
-_options_parser = optparse.OptionParser(
-	usage='%prog --i input.html [--on flag1]',
-	description=('Rewrites an HTML file based on conditional comments and flags'))
-_options_parser.add_option('--i',
-	action='store', dest='input_html_file', help='Input HTML filename')
-_options_parser.add_option('--on',
-	action='append', type='string', dest='enabled_flags',
-	help='name of flag to enable')
-
-def parse_args(args=None):
-  options, rargs = _options_parser.parse_args(args)
-  return options, (None, None)
-
-def parseComment(line, line_num, enabled_flags):
-  global inside_if
-  global last_if_true
-
-  start = line.find('{')
-  end = line.find('}')
-  statement = line[start+1:end].strip()
-  if statement.startswith('if '):
-    if inside_if == True:
-      print 'Fatal Error: Nested {if} found on line ' + str(line_num)
-      print line
-      quit()
-
-    # Evaluate whether the expression is true/false.
-    # only one variable name allowed for now
-    variable_name = statement[3:].strip()
-    if variable_name in enabled_flags:
-      last_if_true = True
-      line = '<!--{if ' + variable_name + '}-->'
-    else:
-      last_if_true = False
-      line = '<!--{if ' + variable_name + '}>'
-
-    inside_if = True
-
-  elif statement == 'else':
-    if inside_if == False:
-      print 'Fatal Error: {else} found without {if} on line ' + str(line_num)
-      print line
-      quit()
-    if inside_if == 'else':
-      print 'Fatal Error: Multiple {else} clauses found in the same if on line ' + str(line_num)
-      print line
-      quit()
-
-    if last_if_true:
-      line = '<!--{else}>'
-    else:
-      line = '<!{else}-->'
-
-    # invert the logic so the endif clause is closed properly
-    last_if_true = not last_if_true
-
-    # ensure we don't have two else statements in the same if
-    inside_if = 'else'
-
-  elif statement == 'endif':
-    if inside_if == False:
-      print 'Fatal Error: {endif} found without {if} on line ' + str(line_num)
-      print line
-      quit()
-
-    if last_if_true:
-      line = '<!--{endif}-->'
-    else:
-      line = '<!{endif}-->'
-
-    inside_if = False
-
-  return line
-
-
-def ship(inFileName, enabled_flags):
-  # read in HTML file
-  lines = file(inFileName, 'r').readlines()
-  out_lines = []
-  i = 0
-
-  # loop for each line of markup
-  for line in lines:
-    strline = line.strip()
-    # if we find a comment, process it and print out
-    if strline.startswith('<!--{') or strline.startswith('<!{'):
-      # using the same indentation as the previous line
-      start = line.find('<')
-      out_lines.append(line[:start] \
-        + parseComment(strline, i, enabled_flags) \
-        + os.linesep)
-    else: # else append line to the output list
-      out_lines.append(line)
-    i += 1
-  
-  return ''.join(out_lines)
-
-if __name__ == '__main__':
-  options, (input, output) = parse_args()
-
-  if options.input_html_file != None:
-    enabled_flags = []
-    if options.enabled_flags != None:
-      enabled_flags.extend(options.enabled_flags)
-    out_file = ship(options.input_html_file, enabled_flags)
-    print out_file

dist/all.css

@@ -1,3 +1,587 @@
+#svg_editor .jPicker .Icon {
+    display: inline-block;
+    height: 24px;
+    position: relative;
+    text-align: left;
+    width: 25px;
+}
+#svg_editor .jPicker .Icon span.Color, #svg_editor .jPicker .Icon span.Alpha {
+    background-position: 2px 2px;
+    display: block;
+    height: 100%;
+    left: 0;
+    position: absolute;
+    top: 0;
+    width: 100%}
+#svg_editor .jPicker .Icon span.Image {
+    background-repeat: no-repeat;
+    cursor: pointer;
+    display: block;
+    height: 100%;
+    left: 0;
+    position: absolute;
+    top: 0;
+    width: 100%}
+#svg_editor .jPicker.Container {
+    z-index: 10;
+}
+
+table#svg_editor .jPicker {
+    width: 545px;
+     z-index: 20;
+}
+
+#svg_editor .jPicker .Move {
+    background-color: #ddd;
+    border-color: #fff #666 #666 #fff;
+    border-style: solid;
+    border-width: 1px;
+    cursor: move;
+    height: 12px;
+    padding: 0;
+}
+#svg_editor .jPicker .Title {
+    display:  none;
+}
+
+#svg_editor .jPicker div.Map {
+    
+  border:  solid #000 1px;
+     
+  cursor: crosshair;
+    
+  height: 260px;
+    
+  margin: 0;
+    
+  overflow: hidden;
+    
+  padding: 0;
+    
+  position: relative;
+    
+  width: 260px;
+    
+}
+#svg_editor .jPicker div[class="Map"] {
+    height: 256px;
+    width: 256px;
+}
+#svg_editor .jPicker div.Bar {
+    border:  solid #000 1px;
+     cursor: n-resize;
+    height: 260px;
+    margin: 0 15px;
+    overflow: hidden;
+    padding: 0;
+    position: relative;
+    width: 24px;
+}
+#svg_editor .jPicker div[class="Bar"] {
+    height: 256px;
+    width: 20px;
+}
+#svg_editor .jPicker .Map .Map1, #svg_editor .jPicker .Map .Map2, #svg_editor .jPicker .Map .Map3, #svg_editor .jPicker .Bar .Map1, #svg_editor .jPicker .Bar .Map2, #svg_editor .jPicker .Bar .Map3, #svg_editor .jPicker .Bar .Map4, #svg_editor .jPicker .Bar .Map5, #svg_editor .jPicker .Bar .Map6 {
+    background-color: transparent;
+    background-image: none;
+    display: block;
+    left: 0;
+    position: absolute;
+    top: 0;
+}
+#svg_editor .jPicker .Map .Map1, #svg_editor .jPicker .Map .Map2, #svg_editor .jPicker .Map .Map3 {
+    height: 2596px;
+    width: 256px;
+}
+#svg_editor .jPicker .Bar .Map1, #svg_editor .jPicker .Bar .Map2, #svg_editor .jPicker .Bar .Map3, #svg_editor .jPicker .Bar .Map4 {
+    height: 3896px;
+    width: 20px;
+}
+#svg_editor .jPicker .Bar .Map5, #svg_editor .jPicker .Bar .Map6 {
+    height: 256px;
+    width: 20px;
+}
+#svg_editor .jPicker .Map .Map1, #svg_editor .jPicker .Map .Map2, #svg_editor .jPicker .Bar .Map6 {
+    background-repeat: no-repeat;
+}
+#svg_editor .jPicker .Map .Map3, #svg_editor .jPicker .Bar .Map5 {
+    background-repeat: repeat;
+}
+#svg_editor .jPicker .Bar .Map1, #svg_editor .jPicker .Bar .Map2, #svg_editor .jPicker .Bar .Map3, #svg_editor .jPicker .Bar .Map4 {
+    background-repeat: repeat-x;
+}
+#svg_editor .jPicker .Map .Arrow {
+    display: block;
+    position: absolute;
+}
+#svg_editor .jPicker .Bar .Arrow {
+    display: block;
+    left: 0;
+    position: absolute;
+}
+#svg_editor .jPicker .Preview {
+    font-size: 9px;
+    text-align: center;
+}
+#svg_editor .jPicker .Preview div.bgt  {
+    height: 62px;
+    margin: 0 auto;
+    padding: 0;
+    width: 62px;
+}
+
+
+#svg_editor .jPicker .Preview div span {
+    border: 1px solid #000;
+    display: block;
+    height: 30px;
+    margin: 0 auto;
+    padding: 0;
+    width: 60px;
+}
+#svg_editor .jPicker .Preview .Active {
+    border-bottom-width: 0;
+}
+#svg_editor .jPicker .Preview .Current {
+    border-top-width: 0;
+    cursor: pointer;
+}
+#svg_editor .jPicker .Button {
+    text-align: center;
+    width: 115px;
+}
+#svg_editor .jPicker .Button input {
+    width: 100px;
+}
+
+#svg_editor .jPicker td.Radio {
+    margin: 0;
+    padding: 0;
+    width: 31px;
+}
+#svg_editor .jPicker td.Radio input {
+    margin: 0 5px 0 0;
+    padding: 0;
+}
+#svg_editor .jPicker td.Text {
+    font-size: 12px!important;
+    height: 22px;
+    margin: 0;
+    padding: 0;
+    text-align: left;
+    width: 70px;
+}
+#svg_editor .jPicker tr.Hex td.Text {
+    width: 100px;
+    color: #666;
+}
+
+#svg_editor .jPicker tr.Hex td.Text span {
+    width: 100px;
+    color: #333;
+}
+#svg_editor .jPicker td.Text input {
+    background-color: #fff;
+    border: 1px inset #aaa;
+    height: 15px;
+    margin: 0 0 0 5px;
+    text-align: left;
+    width: 30px;
+    color: #333;
+}
+
+#svg_editor #color_picker .jPicker tr.Hex td.Text input.Hex {
+    width: 50px;
+    display: inline-block;
+    float: none;
+}
+
+#svg_editor .jPicker tr.Hex td.Text input.AHex {
+    width: 20px;
+    display: none;
+}
+#svg_editor .jPicker .Grid {
+    text-align: center;
+    float: right;
+    width: 108px;
+}
+#svg_editor .jPicker .Grid span.QuickColor {
+    cursor: pointer;
+    display: inline-block;
+    height: 15px;
+    line-height: 15px;
+    margin: 0;
+    padding: 0;
+    width: 18px;
+}
+#svg_editor .jPicker td  {
+  vertical-align:  top;
+}
+#svg_editor .jPicker td.colorsquare  {
+  width:  275px;
+}
+
+#svg_editor .jPicker .prev_div  {
+  margin-top:  -15px;
+}
+
+#svg_editor .jPicker .actions {
+  position: absolute;
+  bottom: 20px;
+  left: 20px;
+  right: 20px;
+}
+
+#svg_editor .jPicker .actions .Ok{
+  position: absolute;
+  top: 0;
+  right: 0px;
+}
+
+#svg_editor .jPicker .actions .Cancel{
+  position: absolute;
+  top: 0;
+  left: 0px;
+}
+
+#svg_editor .jPicker .color_preview {
+  width: 62px;
+  margin: 0 auto;
+}
+
+/* 
+ * jGraduate Default CSS
+ * 
+ * Copyright (c) 2010 Jeff Schiller
+ * http://blog.codedread.com/
+ *
+ * Copyright (c) 2010 Alexis Deveria
+ * http://a.deveria.com/
+ *
+ * Licensed under the Apache License Version 2
+ */
+
+h2.jGraduate_Title {
+  display: none;
+}
+
+.jGraduate_Picker {
+	position: absolute;
+	padding: 20px;
+}
+
+.jGraduate_tabs li {
+	display: inline-block;
+	padding: 5px 10px;
+	margin-right: 5px;
+	cursor: pointer;
+}
+
+li.jGraduate_tab_current {
+  background: #fff;
+  border-radius: 3px 3px 0 0;
+}
+
+.jGraduate_colPick {
+	display: none;
+}
+
+.jGraduate_gradPick {	
+	display: none;
+	overflow: visible;
+/*	position: relative;*/
+}
+
+.jGraduate_tabs {
+	position: relative;
+	background-color: #ddd;
+	padding: 10px 10px 0 10px;
+	margin: -20px -20px 20px -20px;
+	border-radius: 3px 3px 0 0;
+}
+
+div.jGraduate_Swatch {
+	float: left;
+	margin: 0 15px 0 0;
+}
+div.jGraduate_GradContainer {
+	border: solid #000 1px;
+	background-image: url(../images/map-opacity.png); 
+	background-position: 0px 0px;
+	height: 256px;
+	width: 256px;
+	position: relative;
+}
+
+div.jGraduate_GradContainer div.grad_coord {
+  background: rgba(0,0,0,0.8);
+  border: 2px solid white;
+  border-radius: 15px;
+  -moz-border-radius: 5px;
+  width: 14px;
+  height: 14px;
+  position: absolute;
+  margin: -7px -7px;
+  top: 0;
+  left: 0;
+  text-align: center;
+  font-size: 8px;
+  line-height: 14px;
+  color: white;
+  text-decoration: none;
+  cursor: pointer;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+}
+
+.jGraduate_AlphaArrows {
+	position: absolute;
+	margin-top: -10px;
+	margin-left: 250.5px;
+}
+
+div.jGraduate_Opacity {
+	border: 2px inset #eee;
+	margin-top: 14px;
+	background-color: black;
+	background-image: url(../images/Maps.png);
+	background-position: 0px -2816px;
+	height: 20px;
+	cursor: ew-resize;
+}
+
+div.jGraduate_StopSlider {
+	margin: -10px 0 0 -10px;
+	width: 276px;
+	overflow: visible;
+	background: white;
+	height: 45px;
+	cursor: pointer;
+}
+
+div.jGraduate_StopSection {
+	width: 120px;
+	float: left;
+}
+
+div.jGraduate_StopSection.jGraduate_SpreadMethod {
+  display: none;
+}
+
+input.jGraduate_Ok, input.jGraduate_Cancel {
+	display: block;
+	width: 100px;
+}
+input.jGraduate_Ok {
+	margin: 0 0 5px 0;
+}
+
+.colorBox {
+	float: left;
+	height: 16px;
+	width: 16px;
+	border: 1px solid #808080;
+	cursor: pointer;
+	margin: 4px 4px 4px 30px;
+}
+
+.colorBox + label {
+	float: left;
+	margin-top: 7px;
+}
+
+label.jGraduate_Form_Heading {
+
+  color: #333;
+	padding: 2px;
+	font-weight: bold;
+	font-size: 13px;
+}
+
+div.jGraduate_Form_Section {
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	padding: 15px 5px 5px 5px;
+	margin: 5px 2px;
+	width: 100px;
+	text-align: center;
+	overflow: auto;
+	background: #eee;
+}
+
+div.jGraduate_Form label {
+	padding: 0 2px;
+	color: #333;
+}
+
+div.jGraduate_StopSection input[type=text],
+div.jGraduate_Slider input[type=text] {
+	width: 33px;
+	color: #333;
+}
+
+div.jGraduate_LightBox {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: #000;
+	opacity: 0.5;
+	display: none;
+}
+
+div.jGraduate_stopPicker {
+  position: absolute;
+  display: none;
+  background: 
+  white;
+  padding: 20px;
+  border-radius: 3px;
+  width: 530px;
+  height: 300px;
+  box-shadow: 0 5px 25px 
+  black;
+}
+
+
+.jGraduate_gradPick {
+	width: 526px;
+}
+
+.jGraduate_gradPick div.jGraduate_Slider {
+	line-height: 160%
+}
+
+.jGraduate_gradPick div.jGraduate_Slider label:last-child {
+	position: absolute;
+	right: 10px;
+	top: 0;
+	color: #999;
+	font-weight: bold;
+}
+
+.jGraduate_gradPick div.jGraduate_Slider label:last-child input {
+  margin: 0 3px 0 0;
+  color: #333;
+}
+
+.jGraduate_gradPick .jGraduate_Form {
+	float: left;
+	width: 270px;
+	position: absolute;
+	left: 284px;
+	width: 266px;
+	height: 200px;
+	top: 195px;
+	margin: -3px 3px 0px 10px;
+	line-height: 200%;
+}
+
+.jGraduate_gradPick .jGraduate_Form label,
+.jGraduate_gradPick .jGraduate_Form input {
+  width: auto;
+  float: left;
+}
+
+.jGraduate_gradPick .jGraduate_Form.jGraduate_rg_field label, .jGraduate_gradPick .jGraduate_Form.jGraduate_rg_field input {
+width: auto;
+float: left;
+font-size: 11px;
+}
+
+.jGraduate_gradPick .jGraduate_Form.jGraduate_rg_field #color_picker_jGraduate_match_ctr {
+  float: none;
+}
+
+.jGraduate_gradPick .jGraduate_Form label {
+  clear: left;
+}
+
+.jGraduate_gradPick .jGraduate_Points {
+	position: static;
+	float: left;
+  margin: 0;
+  width: auto;
+	}
+
+.jGraduate_Colorblocks {
+	display: table;
+	border-spacing: 0 5px;
+}
+
+.jGraduate_colorblock {
+	display: table-row;
+}
+
+.jGraduate_Colorblocks .jGraduate_colorblock > * {
+	display: table-cell;
+	vertical-align: middle;
+	margin: 0;
+	float: none;
+}
+
+.jGraduate_gradPick .jGraduate_Form_Section {
+	padding-top: 9px;
+}
+
+
+.jGraduate_Slider {
+	text-align: center;
+	float: left;
+	width: 100%;
+  position: relative;
+  margin: 5px 0;
+}
+
+.jGraduate_Slider .jGraduate_Form_Section {
+	border: none;
+	width: 250px;
+	padding: 0 2px;
+	overflow: visible;
+}
+
+
+.jGraduate_Slider label.prelabel {
+	width: 40px;
+	text-align: left;
+}
+
+.jGraduate_SliderBar {
+	width: 140px;
+	float: left;
+	margin: 0 5px;
+	border:1px solid #BBB;
+	height:20px;
+	position: relative;
+}
+
+div.jGraduate_Slider input {
+	margin-top: 5px;
+}
+
+div.jGraduate_Slider img {
+	top: 0;
+	left: 0;
+	position: absolute;
+	cursor:ew-resize;
+}
+
+.jPicker .Button .Ok, .jGraduate_Picker .jGraduate_OkCancel .jGraduate_Ok  {
+  -webkit-appearance: none;
+	margin: 0;
+  position: absolute;
+  bottom: 5px;
+  right: 5px;
+}
+
+.jPicker .Button .Cancel, .jGraduate_Picker .jGraduate_OkCancel .jGraduate_Cancel {
+  margin: 0;
+  position: absolute;
+	bottom: 5px;
+	left: 5px;
+}
+
 /* Comment to prevent wrong concat */
 
 body {
@@ -484,7 +1068,7 @@ html, body {
   opacity: 0.7;
   width: 11px;
   height: 11px;
-  background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAALCAYAAACprHcmAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABV0RVh0Q3JlYXRpb24gVGltZQA2LzE0LzEyP6j5+gAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNXG14zYAAAB4SURBVBiVjZHRCYUwDEVvxIF0kZKN7EjiIrrReR/PSNSKXiikcE5JUtMeADMzXQIcdRfgFWqlyyB7ap1wL+0HAnIv1DqRJUBxTkLUWXIvh9AHkIeb58UkIUnDMH4ZR0otCfhv4ynbtp7ut722ZniFG8L9xx4Ek6QfN9huARmYwR0AAAAASUVORK5CYII=) top left no-repeat;
+  background: transparent url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 11'%3E%3Cpath d='M3.01 2A6 6 0 019 8h1.83l-2.91 2.91L5 8h2a4 4 0 00-3.99-4v1.93L.1 3.02 3.01.1V2z' fill='%23FFF' fill-rule='evenodd'/%3E%3C/svg%3E") top left no-repeat;
   position: absolute;
   top: -2px;
   left: 28px;
@@ -628,6 +1212,7 @@ html, body {
  label {
   display: block;
   color: #999;
+  white-space: nowrap;
 }
 
 div#font-selector { 
@@ -2080,4 +2665,88 @@ input[readonly=readonly]:focus {
 #tool_align_relative select {
   width: 100%;
   display: block;
+}
+@font-face {
+    font-family: 'Arvo';
+    src: url('font-files/arvo-bold-webfont.woff') format('woff');
+    font-weight: bold;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Arvo';
+    src: url('font-files/arvo-bolditalic-webfont.woff') format('woff');
+    font-weight: bold;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Arvo';
+    src: url('font-files/arvo-italic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Arvo';
+    src: url('font-files/arvo-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Euphoria';
+    src: url('font-files/euphoriascript-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Shadows Into Light';
+    src: url('font-files/shadowsintolight-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Simonetta';
+    src: url('font-files/simonetta-black-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Simonetta';
+    src: url('font-files/simonetta-blackitalic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Simonetta';
+    src: url('font-files/simonetta-italic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: italic;
+}
+@font-face {
+    font-family: 'Simonetta';
+    src: url('font-files/simonetta-regular-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Junction';
+    src: url('font-files/Junction-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'League Gothic';
+    src: url('font-files/League_Gothic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Fanwood';
+    src: url('font-files/fanwood-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Fanwood';
+    src: url('font-files/fanwood_italic-webfont.woff') format('woff');
+    font-weight: normal;
+    font-style: italic;
 }

dist/images/NoColor.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17 15">
+  <g stroke="#F00000" fill="none" fill-rule="evenodd">
+    <path d="M.5.5h16v14H.5z"/>
+    <path d="M1 1l15 13" stroke-linecap="square"/>
+    <path d="M1 14L16 1" stroke-linecap="square"/>
+  </g>
+</svg>