Fix emoji categories

lib/unicode/emoji.ex

@@ -4,7 +4,6 @@ defmodule Unicode.Emoji do
   alias Unicode.{Utils, Property}
 
   @emoji Utils.emoji()
-         |> Utils.remove_reserved_codepoints()
          |> Utils.remove_annotations()
 
   def emoji do
@@ -22,6 +21,9 @@ defmodule Unicode.Emoji do
     |> Enum.reduce(0, fn {from, to}, acc -> acc + to - from + 1 end)
   end
 
+  # FIXME This is not correct - if a codepoint has more than one
+  # emoji category, only the first is retained.
+
   for {emoji_category, ranges} <- @emoji,
       range <- ranges do
     case range do

lib/unicode/property.ex

@@ -16,8 +16,11 @@ defmodule Unicode.Property do
   @properties Utils.properties()
               |> Utils.remove_annotations()
 
-  @all_properties @derived_properties
-                  |> Map.merge(@properties)
+  @all_and_derived_properties @properties
+                  |> Map.merge(@derived_properties)
+
+
+  @all_properties @all_and_derived_properties
                   |> Map.merge(Emoji.emoji())
 
   @doc """

lib/utils.ex

@@ -736,6 +736,10 @@ defmodule Unicode.Utils do
       key
   end
 
+  # FIXME this is incorrect since a codepoint
+  # range may have several annotations and this
+  # algorithm will delete the whole range.
+
   @doc false
   @reserved "<reserved"
   def remove_reserved_codepoints(data) do

test/property_test.exs

@@ -0,0 +1,12 @@
+defmodule Unicode.Property.Test do
+  use ExUnit.Case, async: true
+
+  test "Emojis have all their properties" do
+    assert Unicode.properties(128721) ==
+      [:emoji, :emoji_presentation, :extended_pictographic, :grapheme_base]
+
+    assert Unicode.properties("🛑") ==
+      [[:emoji, :emoji_presentation, :extended_pictographic, :grapheme_base]]
+  end
+
+end