3.0.2 library update

.versions

@@ -11,7 +11,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-emojione:[email protected].0
+emojione:[email protected].1
 [email protected]
 [email protected]
 [email protected]

INSTALLATION.md

@@ -3,8 +3,8 @@
 We've teamed up with [JSDelivr](http://www.jsdelivr.com/#!emojione) to provide a simple way to install these emoji on any javascript-enabled website. Add the following script and stylesheet links to the head of your webpage:
 
 ```
-<script src="https://cdn.jsdelivr.net/emojione/3.0.0/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/emojione/3.0.0/extras/css/emojione.min.css"/>
+<script src="https://cdn.jsdelivr.net/emojione/3.0.2/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/emojione/3.0.2/extras/css/emojione.min.css"/>
 ```
 
 Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit). **If you wish to serve image assets locally you'll need to install [emojione-assets](https://www.github.com/Ranks/emojione-assets) and include the pngs and/or sprites into your project.** Many of our [demos](https://demos.emojione.com/latest/) use assets locally simply by pointing the `imagePathPNG` variable to your local asset location.

UPGRADE.md

@@ -11,7 +11,9 @@
   - Added vars: 
   	- emojiVersion (str)
 	- emojiSize (str)
-  	- matchGreedy (bool)
+  	- greedyMatch (bool)
+	- spriteSize (str)
+	- riskyMatchAscii (bool)
 
 **PHP**
  - Deprecated vars: 
@@ -20,7 +22,9 @@
  - Added vars:
  	- emojiVersion (str)
 	- emojiSize (str)
-	- matchGreedy (bool)
+	- greedyMatch (bool)
+	- spriteSize (str)
+	- riskyMatchAscii (bool)
  - Tests
 	- [tests/ConversionTest.php] removed testSmileyInsideAnObject()
 	- [tests/ConversionTest.php] removed testShortnameInsideOfObjectTag()

USAGE.md

@@ -1,3 +1,20 @@
+# emojione Usage
+
+## Object Properties
+
+Both PHP and JavaScript libraries now have wider range of available properties to customize your experience. The following are available for both libraries.
+
+ - `emojiVersion` (str) - Used only to direct CDN path. This is a 2-digit version (e.g. '3.0'). Not recommended for usage below 3.0.0.
+ - `emojiSize` (str) **Default: `32`** - Used only to direct CDN path for non-sprite PNG usage. Available options are '32', '64', and '128'.
+ - `greedyMatch` (bool) **Default: `false`** - When `true`, matches non-fully-qualified Unicode values.
+ - `imageTitleTag` (bool) **Default: `true`** - When `false`, removes title attribute from <img> tag.
+ - `sprites` (bool) **Default: `false`** - When `true`, sprite markup will be used. Sprite CSS and PNG assets must be additionally included.
+ - `spriteSize` (str) **Default `32`** - Alternate size is `64`.
+ - `unicodeAlt` (bool) **Default `false`** - When `true`, sets unicode char as alt attribute for ability to copy image as unicode.
+ - `ascii` (bool) **Default `false`** - When `true`, matches ASCII characters (in `unicodeToImage` and `shortnameToImage` functions).
+ - `riskyMatchAscii` (bool) **Default `false`** - When `true`, matches ASCII characters not encapsulated by spaces. Can cause issues when matching (e.g. `C://filepath` or `<button>.</button>` both contain ASCII chars).
+
+
 ## Usage Examples
 
 Below there are some examples of how you will actually use the libraries to convert Unicode emoji characters to :shortnames: and :shortnames: to emoji images.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "main": [
     "extras/css/emojione.css",
     "lib/js/emojione.js"

lib/php/src/Client.php

@@ -9,12 +9,14 @@
 class Client implements ClientInterface
 {
     public $ascii = false; // convert ascii smileys?
+	public $riskyMatchAscii = false; // set true to match ascii without leading/trailing space char
     public $shortcodes = true; // convert shortcodes?
     public $unicodeAlt = true; // use the unicode char as the alt attribute (makes copy and pasting the resulting text better)
 	public $emojiVersion = '3.0';
-	public $emojiSize = '64';
-	public $greedyMatch = true;
+	public $emojiSize = '32'; //available sizes are '32', '64', and '128'
+	public $greedyMatch = false;
     public $sprites = false;
+	public $spriteSize = '32'; // available sizes are '32' and '64'
     public $imagePathPNG = 'https://cdn.jsdelivr.net/emojione/assets';
     public $imageTitleTag = true;
     public $unicode_replaceWith = false;
@@ -35,6 +37,7 @@ public function __construct(RulesetInterface $ruleset = null)
         }
 
 		$this->imagePathPNG = $this->imagePathPNG . '/' . $this->emojiVersion . '/png/' . $this->emojiSize . '/';
+		$this->spriteSize = ($this->spriteSize == '32' || $this->spriteSize == '64') ? $this->spriteSize : '32';
     }
 
     // ##########################################
@@ -89,8 +92,9 @@ public function shortnameToUnicode($string)
         {
             $ruleset = $this->getRuleset();
             $asciiRegexp = $ruleset->getAsciiRegexp();
+			$asciiRX = ($this->riskyMatchAscii) ? '|(()'.$asciiRegexp.'())' : '|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))';
 
-            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))/S', array($this, 'asciiToUnicodeCallback'), $string);
+            $string = preg_replace_callback('/'.$this->ignoredRegexp.$asciiRX.'/S', array($this, 'asciiToUnicodeCallback'), $string);
         }
 
         return $string;
@@ -123,7 +127,9 @@ public function asciiToShortname($string)
     {
         $ruleset = $this->getRuleset();
         $asciiRegexp = $ruleset->getAsciiRegexp();
-        return preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))/S', array($this, 'asciiToShortnameCallback'), $string);
+		$asciiRX = ($this->riskyMatchAscii) ? '|(()'.$asciiRegexp.'())' : '|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))';
+
+        return preg_replace_callback('/'.$this->ignoredRegexp.$asciiRX.'/S', array($this, 'asciiToShortnameCallback'), $string);
     }
 
     /**
@@ -143,8 +149,9 @@ public function shortnameToImage($string)
         {
             $ruleset = $this->getRuleset();
             $asciiRegexp = $ruleset->getAsciiRegexp();
+			$asciiRX = ($this->riskyMatchAscii) ? '|(()'.$asciiRegexp.'())' : '|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))';
 
-            $string = preg_replace_callback('/'.$this->ignoredRegexp.'|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))/S', array($this, 'asciiToImageCallback'), $string);
+            $string = preg_replace_callback('/'.$this->ignoredRegexp.$asciiRX.'/S', array($this, 'asciiToImageCallback'), $string);
         }
 
         return $string;
@@ -169,7 +176,18 @@ public function toShort($string)
      */
     public function unicodeToImage($string)
     {
-        return preg_replace_callback('/'.$this->ignoredRegexp.'|'.$this->unicodeRegexp.'/u', array($this, 'unicodeToImageCallback'), $string);
+        $string = preg_replace_callback('/'.$this->ignoredRegexp.'|'.$this->unicodeRegexp.'/u', array($this, 'unicodeToImageCallback'), $string);
+
+		if ($this->ascii)
+        {
+            $ruleset = $this->getRuleset();
+            $asciiRegexp = $ruleset->getAsciiRegexp();
+			$asciiRX = ($this->riskyMatchAscii) ? '|(()'.$asciiRegexp.'())' : '|((\\s|^)'.$asciiRegexp.'(?=\\s|$|[!,.?]))';
+
+            $string = preg_replace_callback('/'.$this->ignoredRegexp.$asciiRX.'/S', array($this, 'asciiToImageCallback'), $string);
+        }
+
+		return $string;
     }
 
     // ##########################################
@@ -255,7 +273,7 @@ public function shortnameToImageCallback($m)
 
             $unicode = $shortcode_replace[$shortname][0];
             $filename = $shortcode_replace[$shortname][2];
-			$category = $shortcode_replace[$shortname][3];
+			$category = (strpos($filename, '-1f3f') !== false) ? 'diversity' : $shortcode_replace[$shortname][3];
             $titleTag = $this->imageTitleTag ? 'title="'.htmlspecialchars($shortname).'"' : '';
 
             if ($this->unicodeAlt)
@@ -269,7 +287,7 @@ public function shortnameToImageCallback($m)
 
             if ($this->sprites)
             {
-                return '<span class="emojione emojione-32-'.$category.' _'.$filename.'" '.$titleTag.'>'.$alt.'</span>';
+                return '<span class="emojione emojione-'.$this->spriteSize.'-'.$category.' _'.$filename.'" '.$titleTag.'>'.$alt.'</span>';
             }
             else
             {
@@ -363,9 +381,9 @@ public function asciiToImageCallback($m)
 			else
 			{
 				$shortname = $ascii_replace[$ascii];
-				$unicode = $shortcode_replace[$shortname][2];
+				$filename = $shortcode_replace[$shortname][2];
 				$uc_output = $shortcode_replace[$shortname][0];
-				$category = $shortcode_replace[$shortname][3];
+				$category = (strpos($filename, '-1f3f') !== false) ? 'diversity' : $shortcode_replace[$shortname][3];
 				$titleTag = $this->imageTitleTag ? 'title="'.htmlspecialchars($shortname).'"' : '';
 
 				// unicode char or shortname for the alt tag? (unicode is better for copying and pasting the resulting text)
@@ -380,11 +398,11 @@ public function asciiToImageCallback($m)
 
 				if ($this->sprites)
 				{
-					return $m[2].'<span class="emojione emojione-32-'.$category.' _'.$unicode.'" '.$titleTag.'>'.$alt.'</span>';
+					return $m[2].'<span class="emojione emojione-'.$this->spriteSize.'-'.$category.' _'.$filename.'" '.$titleTag.'>'.$alt.'</span>';
 				}
 				else
 				{
-					return $m[2].'<img class="emojione" alt="'.$alt.'" '.$titleTag.' src="'.$this->imagePathPNG.$unicode.'.png"/>';
+					return $m[2].'<img class="emojione" alt="'.$alt.'" '.$titleTag.' src="'.$this->imagePathPNG.$filename.'.png"/>';
 				}
 			}
         }
@@ -449,7 +467,7 @@ public function unicodeToImageCallback($m)
 			}
 
             $filename = $shortcode_replace[$shortname][2];
-			$category = $shortcode_replace[$shortname][3];
+			$category = (strpos($filename, '-1f3f') !== false) ? 'diversity' : $shortcode_replace[$shortname][3];
             $titleTag = $this->imageTitleTag ? 'title="'.htmlspecialchars($shortname).'"' : '';
 
             if ($this->unicodeAlt)
@@ -463,7 +481,7 @@ public function unicodeToImageCallback($m)
 
             if ($this->sprites)
             {
-                return '<span class="emojione emojione-32-'.$category.' _'.$filename.'" '.$titleTag.'>'.$alt.'</span>';
+                return '<span class="emojione emojione-'.$this->spriteSize.'-'.$category.' _'.$filename.'" '.$titleTag.'>'.$alt.'</span>';
             }
             else
             {

lib/php/src/Emojione.php

@@ -5,13 +5,14 @@
 class Emojione
 {
     public static $ascii = false; // convert ascii smileys?
+	public static $riskyMatchAscii = false; // set true to match ascii without leading/trailing space char
     public static $unicodeAlt = true; // use the unicode char as the alt attribute (makes copy and pasting the resulting text better)
 	public static $emojiVersion = '3.0';
-	public static $emojiSize = '64';
+	public static $emojiSize = '32';
 	public static $greedyMatch = false;
     public static $sprites = false;
+	public static $spriteSize = '32';
     public static $imagePathPNG = 'https://cdn.jsdelivr.net/emojione/assets/';
-    public static $imagePathSVGSprites = './../../assets/sprites/emojione.sprites.svg';
     public static $imageTitleTag = true;
     public static $ignoredRegexp = '<object[^>]*>.*?<\/object>|<span[^>]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>';
 	public static $unicodeRegexp = '(?:\x{1F3F3}\x{FE0F}?\x{200D}?\x{1F308}|\x{1F441}\x{FE0F}?\x{200D}?\x{1F5E8}\x{FE0F}?)|[\x{0023}-\x{0039}]\x{FE0F}?\x{20e3}|[\x{1F1E0}-\x{1F1FF}]{2}|(?:[\x{1F468}\x{1F469}])\x{FE0F}?[\x{1F3FA}-\x{1F3FF}]?\x{200D}?(?:[\x{2695}\x{2696}\x{2708}\x{1F4BB}\x{1F4BC}\x{1F527}\x{1F52C}\x{1F680}\x{1F692}\x{1F33E}-\x{1F3ED}])|(?:[\x{2764}\x{1F466}-\x{1F469}\x{1F48B}][\x{200D}\x{FE0F}]+){1,3}[\x{2764}\x{1F466}-\x{1F469}\x{1F48B}]|(?:[\x{2764}\x{1F466}-\x{1F469}\x{1F48B}]\x{FE0F}?){2,4}|(?:[\x{1f46e}\x{1F468}\x{1F469}\x{1f575}\x{1f471}-\x{1f487}\x{1F645}-\x{1F64E}\x{1F926}\x{1F937}]|[\x{1F460}-\x{1F482}\x{1F3C3}-\x{1F3CC}\x{26F9}\x{1F486}\x{1F487}\x{1F6A3}-\x{1F6B6}\x{1F938}-\x{1F93E}]|\x{1F46F})\x{FE0F}?[\x{1F3FA}-\x{1F3FF}]?\x{200D}?[\x{2640}\x{2642}]?\x{FE0F}?|(?:[\x{26F9}\x{261D}\x{270A}-\x{270D}\x{1F385}-\x{1F3CC}\x{1F442}-\x{1F4AA}\x{1F574}-\x{1F596}\x{1F645}-\x{1F64F}\x{1F6A3}-\x{1F6CC}\x{1F918}-\x{1F93E}]\x{FE0F}?[\x{1F3FA}-\x{1F3FF}])|(?:[\x{2194}-\x{2199}\x{21a9}-\x{21aa}]\x{FE0F}?|[\x{0023}-\x{002a}]|[\x{3030}\x{303d}]\x{FE0F}?|(?:[\x{1F170}-\x{1F171}]|[\x{1F17E}-\x{1F17F}]|\x{1F18E}|[\x{1F191}-\x{1F19A}]|[\x{1F1E6}-\x{1F1FF}])\x{FE0F}?|\x{24c2}\x{FE0F}?|[\x{3297}\x{3299}]\x{FE0F}?|(?:[\x{1F201}-\x{1F202}]|\x{1F21A}|\x{1F22F}|[\x{1F232}-\x{1F23A}]|[\x{1F250}-\x{1F251}])\x{FE0F}?|[\x{203c}\x{2049}]\x{FE0F}?|[\x{25aa}-\x{25ab}\x{25b6}\x{25c0}\x{25fb}-\x{25fe}]\x{FE0F}?|[\x{00a9}\x{00ae}]\x{FE0F}?|[\x{2122}\x{2139}]\x{FE0F}?|\x{1F004}\x{FE0F}?|[\x{2b05}-\x{2b07}\x{2b1b}-\x{2b1c}\x{2b50}\x{2b55}]\x{FE0F}?|[\x{231a}-\x{231b}\x{2328}\x{23cf}\x{23e9}-\x{23f3}\x{23f8}-\x{23fa}]\x{FE0F}?|\x{1F0CF}|[\x{2934}\x{2935}]\x{FE0F}?)|[\x{2700}-\x{27bf}]\x{FE0F}?|[\x{1F000}-\x{1F6FF}\x{1F900}-\x{1F9FF}]\x{FE0F}?|[\x{2600}-\x{26ff}]\x{FE0F}?|[\x{0030}-\x{0039}]\x{FE0F}';
@@ -80,15 +81,15 @@ public static function setClient(ClientInterface $client)
     protected static function loadConfig(ClientInterface $client)
     {
         static::$ascii               = $client->ascii;
+		static::$riskyMatchAscii     = $client->riskyMatchAscii;
         static::$unicodeAlt          = $client->unicodeAlt;
         static::$emojiVersion        = $client->emojiVersion;
         static::$emojiSize		     = $client->emojiSize;
 		static::$greedyMatch			 = $client->greedyMatch;
         static::$sprites             = $client->sprites;
+		static::$spriteSize          = $client->spriteSize;
         static::$imagePathPNG        = $client->imagePathPNG;
-        static::$imagePathSVG        = $client->imagePathSVG;
         static::$imageTitleTag       = $client->imageTitleTag;
-        static::$imagePathSVGSprites = $client->imagePathSVGSprites;
         static::$ignoredRegexp       = $client->ignoredRegexp;
         static::$unicodeRegexp       = $client->unicodeRegexp;
         static::$shortcodeRegexp     = $client->shortcodeRegexp;
@@ -105,16 +106,17 @@ protected static function loadConfig(ClientInterface $client)
     protected static function updateConfig(ClientInterface $client)
     {
         $client->ascii               = static::$ascii;
+		$client->riskyMatchAscii     = static::$riskyMatchAscii;
         $client->unicodeAlt          = static::$unicodeAlt;
         $client->emojiVersion	     = static::$emojiVersion;
 		$client->emojiSize			 = static::$emojiSize;
-		$client->greedyMatch			 = static::false;
+		$client->greedyMatch			 = static::$greedyMatch;
         $client->sprites             = static::$sprites;
+		$client->spriteSize          = static::$spriteSize;
         $client->imagePathPNG        = static::$imagePathPNG;
         $client->imageTitleTag       = static::$imageTitleTag;
-        $client->imagePathSVGSprites = static::$imagePathSVGSprites;
         $client->ignoredRegexp       = static::$ignoredRegexp;
         $client->unicodeRegexp       = static::$unicodeRegexp;
         $client->shortcodeRegexp     = static::$shortcodeRegexp;
     }
-}
+}

lib/php/src/Ruleset.php

@@ -7937,8 +7937,6 @@ class Ruleset implements RulesetInterface
 		"\xE3\x8A\x99" => ":secret:",
 		"\xC2\xA9" => ":copyright:",
 		"\xC2\xAE" => ":registered:",
-		"\x23" => ":pound_symbol:",
-		"\x2A" => ":asterisk_symbol:",
 		"\x30" => ":digit_zero:",
 		"\x31" => ":digit_one:",
 		"\x32" => ":digit_two:",
@@ -7950,8 +7948,8 @@ class Ruleset implements RulesetInterface
 		"\x38" => ":digit_eight:",
 		"\x39" => ":digit_nine:"
 	);
-
-    protected $asciiRegexp = '(\\*\\\\0\\/\\*|\\*\\\\O\\/\\*|\\-___\\-|\\:\'\\-\\)|\'\\:\\-\\)|\'\\:\\-D|\\>\\:\\-\\)|>\\:\\-\\)|\'\\:\\-\\(|\\>\\:\\-\\(|>\\:\\-\\(|\\:\'\\-\\(|O\\:\\-\\)|0\\:\\-3|0\\:\\-\\)|0;\\^\\)|O;\\-\\)|0;\\-\\)|O\\:\\-3|\\-__\\-|\\:\\-Þ|\\:\\-Þ|\\<\\/3|<\\/3|\\:\'\\)|\\:\\-D|\'\\:\\)|\'\\=\\)|\'\\:D|\'\\=D|\\>\\:\\)|>\\:\\)|\\>;\\)|>;\\)|\\>\\=\\)|>\\=\\)|;\\-\\)|\\*\\-\\)|;\\-\\]|;\\^\\)|\'\\:\\(|\'\\=\\(|\\:\\-\\*|\\:\\^\\*|\\>\\:P|>\\:P|X\\-P|\\>\\:\\[|>\\:\\[|\\:\\-\\(|\\:\\-\\[|\\>\\:\\(|>\\:\\(|\\:\'\\(|;\\-\\(|\\>\\.\\<|>\\.<|#\\-\\)|%\\-\\)|X\\-\\)|\\\\0\\/|\\\\O\\/|0\\:3|0\\:\\)|O\\:\\)|O\\=\\)|O\\:3|B\\-\\)|8\\-\\)|B\\-D|8\\-D|\\-_\\-|\\>\\:\\\\|>\\:\\\\|\\>\\:\\/|>\\:\\/|\\:\\-\\/|\\:\\-\\.|\\:\\-P|\\:Þ|\\:Þ|\\:\\-b|\\:\\-O|O_O|\\>\\:O|>\\:O|\\:\\-X|\\:\\-#|\\:\\-\\)|\\(y\\)|\\<3|<3|\\:D|\\=D|;\\)|\\*\\)|;\\]|;D|\\:\\*|\\=\\*|\\:\\(|\\:\\[|\\=\\(|\\:@|;\\(|D\\:|\\:\\$|\\=\\$|#\\)|%\\)|X\\)|B\\)|8\\)|\\:\\/|\\:\\\\|\\=\\/|\\=\\\\|\\:L|\\=L|\\:P|\\=P|\\:b|\\:O|\\:X|\\:#|\\=X|\\=#|\\:\\)|\\=\\]|\\=\\)|\\:\\])';
+	
+	protected $asciiRegexp = '(\\<3|&lt;3|\\<\\/3|&lt;\\/3|\\:\'\\)|\\:\'\\-\\)|\\:D|\\:\\-D|\\=D|\\:\\)|\\:\\-\\)|\\=\\]|\\=\\)|\\:\\]|\'\\:\\)|\'\\:\\-\\)|\'\\=\\)|\'\\:D|\'\\:\\-D|\'\\=D|\\>\\:\\)|&gt;\\:\\)|\\>;\\)|&gt;;\\)|\\>\\:\\-\\)|&gt;\\:\\-\\)|\\>\\=\\)|&gt;\\=\\)|;\\)|;\\-\\)|\\*\\-\\)|\\*\\)|;\\-\\]|;\\]|;D|;\\^\\)|\'\\:\\(|\'\\:\\-\\(|\'\\=\\(|\\:\\*|\\:\\-\\*|\\=\\*|\\:\\^\\*|\\>\\:P|&gt;\\:P|X\\-P|x\\-p|\\>\\:\\[|&gt;\\:\\[|\\:\\-\\(|\\:\\(|\\:\\-\\[|\\:\\[|\\=\\(|\\>\\:\\(|&gt;\\:\\(|\\>\\:\\-\\(|&gt;\\:\\-\\(|\\:@|\\:\'\\(|\\:\'\\-\\(|;\\(|;\\-\\(|\\>\\.\\<|&gt;\\.&lt;|D\\:|\\:\\$|\\=\\$|#\\-\\)|#\\)|%\\-\\)|%\\)|X\\)|X\\-\\)|\\*\\\\0\\/\\*|\\\\0\\/|\\*\\\\O\\/\\*|\\\\O\\/|O\\:\\-\\)|0\\:\\-3|0\\:3|0\\:\\-\\)|0\\:\\)|0;\\^\\)|O\\:\\-\\)|O\\:\\)|O;\\-\\)|O\\=\\)|0;\\-\\)|O\\:\\-3|O\\:3|B\\-\\)|B\\)|8\\)|8\\-\\)|B\\-D|8\\-D|\\-_\\-|\\-__\\-|\\-___\\-|\\>\\:\\\\|&gt;\\:\\\\|\\>\\:\\/|&gt;\\:\\/|\\:\\-\\/|\\:\\-\\.|\\:\\/|\\:\\\\|\\=\\/|\\=\\\\|\\:L|\\=L|\\:P|\\:\\-P|\\=P|\\:\\-p|\\:p|\\=p|\\:\\-Þ|\\:\\-&THORN;|\\:Þ|\\:&THORN;|\\:þ|\\:&thorn;|\\:\\-þ|\\:\\-&thorn;|\\:\\-b|\\:b|d\\:|\\:\\-O|\\:O|\\:\\-o|\\:o|O_O|\\>\\:O|&gt;\\:O|\\:\\-X|\\:X|\\:\\-#|\\:#|\\=X|\\=x|\\:x|\\:\\-x|\\=#||\\(y\\))';
 
     /**
      * Returns the shortcode unicode replacement rules

package.js

@@ -1,7 +1,7 @@
 Package.describe({
   name: 'emojione:emojione',
   summary: 'Meteor Package of the https://www.emojione.com/ set.',
-  version: '3.0.1',
+  version: '3.0.2',
   git: 'https://github.com/Ranks/emojione.git'
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images.",
   "author": "EmojiOne <[email protected]> (http://emojione.com)",
   "main": "lib/js/emojione.js",