Updates

wheresaddie · Dec 13, 2013 · 715487c · 715487c
1 parent 4cfc9e3
commit 715487c
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 21 deletions.
diff --git a/emojinal/graphics.js b/emojinal/graphics.js
@@ -2,7 +2,7 @@ var canvas = document.querySelector('canvas');
 Graphics = new Processing(canvas);
 
 // Graphics.size(2048/2, 1536 - 100)
-Graphics.size(600, 600)
+Graphics.size(600, 600);
 Graphics.background(255);
 
 Graphics.emojinalDraw = function(fn) {
@@ -23,7 +23,8 @@ Emojinal.lookupTable["🎨✒"] = "Graphics.line<4"
 Emojinal.lookupTable["🎨✏"] = "Graphics.text<3"
 Emojinal.lookupTable["🎨⚪"] = "Graphics.ellipse<4"
 Emojinal.lookupTable["🎨◻"] = "Graphics.rect<4"
-Emojinal.lookupTable["🎨💄"] = "Graphics.fill"
+Emojinal.lookupTable["🎨🚿💄"] = "Graphics.fill"
+Emojinal.lookupTable["🎨✒💄"] = "Graphics.stroke"
 Emojinal.lookupTable["🎨🚿"] = "Graphics.background"
 Emojinal.lookupTable["🎨🔄"] = "Graphics.emojinalDraw"
 

diff --git a/emojinal/parser.coffee b/emojinal/parser.coffee
@@ -35,8 +35,8 @@ window.Emojinal.parser = PEG.buildParser "
   places_emoji    = '🏠' / '🏡' / '🏫' / '🏢' / '🏣' / '🏥' / '🏦' / '🏪' / '🏩' / '🏨' / '💒' / '⛪' / '🏬' / '🏤' / '🌇' / '🌆' / '🏯' / '🏰' / '⛺' / '🏭' / '🗼' / '🗾' / '🗻' / '🌄' / '🌅' / '🌃' / '🗽' / '🌉' / '🎠' / '🎡' / '⛲' / '🎢' / '🚢' / '⛵' / '🚤' / '🚣' / '⚓' / '🚀' / '✈' / '💺' / '🚁' / '🚂' / '🚊' / '🚉' / '🚞' / '🚆' / '🚄' / '🚅' / '🚈' / '🚇' / '🚝' / '🚋' / '🚃' / '🚎' / '🚌' / '🚍' / '🚙' / '🚘' / '🚗' / '🚕' / '🚖' / '🚛' / '🚚' / '🚨' / '🚓' / '🚔' / '🚒' / '🚑' / '🚐' / '🚲' / '🚡' / '🚟' / '🚠' / '🚜' / '💈' / '🚏' / '🎫' / '🚦' / '🚥' / '⚠' / '🚧' / '🔰' / '⛽' / '🏮' / '🎰' / '♨' / '🗿' / '🎪' / '🎭' / '📍' / '🚩'
   symbol_emoji    = '1⃣' / '2⃣' / '3⃣' / '4⃣' / '5⃣' / '6⃣' / '7⃣' / '8⃣' / '9⃣' / '0⃣' / '🔟' / '🔢' / '#⃣' / '🔣' / '⬆' / '⬇' / '⬅' / '➡' / '🔠' / '🔡' / '🔤' / '↗' / '↖' / '↘' / '↙' / '↔' / '↕' / '🔄' / '◀' / '▶' / '🔼' / '🔽' / '↩' / '↪' / 'ℹ' / '⏪' / '⏩' / '⏫' / '⏬' / '⤵' / '⤴' / '🆗' / '🔀' / '🔁' / '🔂' / '🆕' / '🆙' / '🆒' / '🆓' / '🆖' / '📶' / '🎦' / '🈁' / '🈯' / '🈳' / '🈵' / '🈴' / '🈲' / '🉐' / '🈹' / '🈺' / '🈶' / '🈚' / '🚻' / '🚹' / '🚺' / '🚼' / '🚾' / '🚰' / '🚮' / '🅿' / '♿' / '🚭' / '🈷' / '🈸' / '🈂' / 'Ⓜ' / '🛂' / '🛄' / '🛅' / '🛃' / '🉑' / '㊙' / '㊗' / '🆑' / '🆘' / '🆔' / '🚫' / '🔞' / '📵' / '🚯' / '🚱' / '🚳' / '🚷' / '🚸' / '⛔' / '✳' / '❇' / '❎' / '✅' / '✴' / '💟' / '🆚' / '📳' / '📴' / '🅰' / '🅱' / '🆎' / '🅾' / '💠' / '➿' / '♻' / '♈' / '♉' / '♊' / '♋' / '♌' / '♍' / '♎' / '♏' / '♐' / '♑' / '♒' / '♓' / '⛎' / '🔯' / '🏧' / '💹' / '💲' / '💱' / '©' / '®' / '™' / '❌' / '‼' / '⁉' / '❗' / '❓' / '❕' / '❔' / '⭕' / '🔝' / '🔚' / '🔙' / '🔛' / '🔜' / '🔃' / '🕛' / '🕧' / '🕐' / '🕜' / '🕑' / '🕝' / '🕒' / '🕞' / '🕓' / '🕟' / '🕔' / '🕠' / '🕕' / '🕖' / '🕗' / '🕘' / '🕙' / '🕚' / '🕡' / '🕢' / '🕣' / '🕤' / '🕥' / '🕦' / '✖' / '➕' / '➖' / '➗' / '♠' / '♥' / '♣' / '♦' / '💮' / '💯' / '✔' / '☑' / '🔘' / '🔗' / '➰' / '〰' / '〽' / '🔱' / '◼' / '◻' / '◾' / '◽' / '▪' / '▫' / '🔺' / '🔲' / '🔳' / '⚫' / '⚪' / '🔴' / '🔵' / '🔻' / '⬜' / '⬛' / '🔶' / '🔷' / '🔸' / '🔹'
 
-  space           = [\\n ]* { return undefined }
-  mandatory_space = [\\n ]+ { return undefined }
+  space           = [\\n\\uFE0F ]* { return undefined }
+  mandatory_space = [\\n\\uFE0F ]+ { return undefined }
   "
 
 # add more emoji mappings here

diff --git a/emojinal/parser.js b/emojinal/parser.js