Revert "Introduce TextObject"

This reverts commit 6f75b44.

This turned out to be more trouble than it was worth, for now.

Author: camelpunch

lib/mudbrick.ex

@@ -1,6 +1,5 @@
 defmodule Mudbrick do
   alias Mudbrick.ContentStream
-  alias Mudbrick.ContentStream.TextObject
   alias Mudbrick.Document
   alias Mudbrick.Font
   alias Mudbrick.Page
@@ -52,22 +51,22 @@ defmodule Mudbrick do
       {:ok, font} ->
         context
         |> add(
-          TextObject.Tf,
+          ContentStream.Tf,
           Keyword.put(
             opts,
             :font,
             font.value
           )
         )
-        |> add(TextObject.TL, leading: Keyword.fetch!(opts, :size) * 1.2)
+        |> add(ContentStream.TL, leading: Keyword.fetch!(opts, :size) * 1.2)
 
       :error ->
         raise Font.Unregistered, "Unregistered font: #{user_identifier}"
     end
   end
 
   def text_position(context, x, y) do
-    ContentStream.add(context, TextObject.Td, tx: x, ty: y)
+    ContentStream.add(context, ContentStream.Td, tx: x, ty: y)
   end
 
   def text(context, text, colour: {r, g, b}) do
@@ -114,24 +113,19 @@ defmodule Mudbrick do
     [first_part | parts] = String.split(text, "\n")
 
     context
-    |> add(TextObject.Tj, font: tf.font, text: first_part)
+    |> add(ContentStream.Tj, font: tf.font, text: first_part)
     |> then(fn context ->
       for part <- parts, reduce: context do
         acc ->
-          add(acc, TextObject.Apostrophe, font: tf.font, text: part)
+          add(acc, ContentStream.Apostrophe, font: tf.font, text: part)
       end
     end)
   end
 
   defp latest_font_operation!(content_stream) do
-    Enum.find_value(
-      content_stream.value.text_objects,
-      fn text_object ->
-        Enum.find(
-          text_object.operations,
-          &match?(%TextObject.Tf{}, &1)
-        )
-      end
+    Enum.find(
+      content_stream.value.operations,
+      &match?(%ContentStream.Tf{}, &1)
     ) || raise Font.NotSet, "No font chosen"
   end
 end

lib/mudbrick/content_stream.ex

@@ -1,16 +1,15 @@
 defmodule Mudbrick.ContentStream do
   @enforce_keys [:page]
-  defstruct page: nil, text_objects: []
+  defstruct page: nil, operations: []
 
-  alias Mudbrick.ContentStream.TextObject
   alias Mudbrick.Document
 
   defmodule Rg do
     defstruct [:r, :g, :b]
 
     defimpl Mudbrick.Object do
       def from(%Rg{r: r, g: g, b: b}) do
-        ["#{r} #{g} #{b} rg"]
+        [[r, g, b] |> Enum.map_join(" ", &to_string/1), " rg"]
       end
     end
   end
@@ -31,33 +30,102 @@ defmodule Mudbrick.ContentStream do
     end
   end
 
+  defmodule Tf do
+    defstruct [:font, :size]
+
+    defimpl Mudbrick.Object do
+      def from(tf) do
+        [
+          Mudbrick.Object.from(tf.font.resource_identifier),
+          " ",
+          to_string(tf.size),
+          " Tf"
+        ]
+      end
+    end
+  end
+
+  defmodule Td do
+    defstruct [:tx, :ty]
+
+    defimpl Mudbrick.Object do
+      def from(td) do
+        [td.tx, td.ty, "Td"]
+        |> Enum.map(&to_string/1)
+        |> Enum.intersperse(" ")
+      end
+    end
+  end
+
+  defmodule TL do
+    defstruct [:leading]
+
+    defimpl Mudbrick.Object do
+      def from(tl) do
+        [to_string(tl.leading), " TL"]
+      end
+    end
+  end
+
+  defmodule Tj do
+    defstruct font: nil,
+              operator: "Tj",
+              text: nil
+  end
+
+  defmodule Apostrophe do
+    defstruct font: nil,
+              operator: "'",
+              text: nil
+  end
+
+  defimpl Mudbrick.Object, for: [Tj, Apostrophe] do
+    def from(op) do
+      if op.font.descendant do
+        {glyph_ids_decimal, _positions} =
+          OpenType.layout_text(op.font.parsed, op.text)
+
+        glyph_ids_hex = Enum.map(glyph_ids_decimal, &Mudbrick.to_hex/1)
+
+        ["<", glyph_ids_hex, "> ", op.operator]
+      else
+        [Mudbrick.Object.from(op.text), " ", op.operator]
+      end
+    end
+  end
+
   def new(opts \\ []) do
     struct!(__MODULE__, opts)
   end
 
   def add({doc, contents_obj}, operation) do
     Document.update(doc, contents_obj, fn contents ->
-      Map.update!(contents, :text_objects, fn
-        [] ->
-          [TextObject.new(operations: [operation])]
-
-        [object] ->
-          [Map.update!(object, :operations, &[operation | &1])]
+      Map.update!(contents, :operations, fn operations ->
+        [operation | operations]
       end)
     end)
   end
 
-  def add(context, mod, opts) do
-    add(context, struct!(mod, opts))
+  def add({doc, contents_obj}, mod, opts) do
+    Document.update(doc, contents_obj, fn contents ->
+      Map.update!(contents, :operations, fn operations ->
+        [struct!(mod, opts) | operations]
+      end)
+    end)
   end
 
   defimpl Mudbrick.Object do
     def from(content_stream) do
-      Mudbrick.Object.from(
-        Mudbrick.Stream.new(
-          data: Enum.map_join(content_stream.text_objects, "\n", &Mudbrick.Object.from/1)
-        )
+      Mudbrick.Stream.new(
+        data: [
+          "BT\n",
+          content_stream.operations
+          |> Enum.reverse()
+          |> Mudbrick.join("\n"),
+          "\nET"
+        ]
       )
+      |> Mudbrick.Object.from()
     end
   end
 end

lib/mudbrick/content_stream/text_object.ex

@@ -3,7 +3,7 @@ defmodule Mudbrick.ContentStreamTest do
 
   import Mudbrick
 
-  alias Mudbrick.ContentStream.TextObject.Tj
+  alias Mudbrick.ContentStream.Tj
   alias Mudbrick.Font
   alias Mudbrick.Indirect
 
@@ -30,7 +30,7 @@ defmodule Mudbrick.ContentStreamTest do
       b\
       """)
 
-    assert List.last(content_stream.value.text_objects).operations
+    assert content_stream.value.operations
            |> render(2) ==
              """
              (a) Tj
@@ -53,7 +53,7 @@ defmodule Mudbrick.ContentStreamTest do
       b\
       """)
 
-    assert List.last(content_stream.value.text_objects).operations
+    assert content_stream.value.operations
            |> render(2) ==
              """
              <00A5> Tj
@@ -73,7 +73,7 @@ defmodule Mudbrick.ContentStreamTest do
       |> text_position(0, 700)
       |> text("CO₂")
 
-    [show_text_operation | _] = List.last(content_stream.value.text_objects).operations
+    [show_text_operation | _] = content_stream.value.operations
 
     assert %Tj{
              text: "CO₂",
@@ -97,7 +97,7 @@ defmodule Mudbrick.ContentStreamTest do
         |> text_position(0, 700)
         |> text("CO₂")
 
-      assert List.last(content_stream.value.text_objects).operations
+      assert content_stream.value.operations
              |> render(1) ==
                """
                <001100550174> Tj\