Set leading when changing font

Author: camelpunch

lib/mudbrick.ex

@@ -45,17 +45,20 @@ defmodule Mudbrick do
   end
 
   def font({_document, content_stream_object} = context, user_identifier, opts) do
+    import ContentStream
+
     case Map.fetch(content_stream_object.value.page.fonts, user_identifier) do
       {:ok, font} ->
-        ContentStream.add(
-          context,
+        context
+        |> add(
           ContentStream.Tf,
           Keyword.put(
             opts,
             :font,
             font.value
           )
         )
+        |> add(ContentStream.TL, leading: Keyword.fetch!(opts, :size) * 1.2)
 
       :error ->
         raise Font.Unregistered, "Unregistered font: #{user_identifier}"
@@ -90,7 +93,6 @@ defmodule Mudbrick do
     [first_part | parts] = String.split(text, "\n")
 
     context
-    |> add(ContentStream.TL, leading: tf.size * 1.2)
     |> add(ContentStream.Tj, font: tf.font, text: first_part)
     |> then(fn context ->
       for part <- parts, reduce: context do

test/mudbrick/content_stream_test.exs

@@ -32,9 +32,8 @@ defmodule Mudbrick.ContentStreamTest do
       """)
 
     assert content_stream.value.operations
-           |> render(3) ==
+           |> render(2) ==
              """
-             12.0 TL
              (a) Tj
              (b) '\
              """
@@ -56,9 +55,8 @@ defmodule Mudbrick.ContentStreamTest do
       """)
 
     assert content_stream.value.operations
-           |> render(3) ==
+           |> render(2) ==
              """
-             12.0 TL
              <00A5> Tj
              <00B4> '\
              """

test/mudbrick/font_test.exs

@@ -39,7 +39,6 @@ defmodule Mudbrick.FontTest do
              (black and ) Tj
              q
              1.0 0.0 0.0 rg
-             12.0 TL
              (red) Tj
              (text) '
              Q

test/mudbrick_test.exs

@@ -95,12 +95,12 @@ defmodule MudbrickTest do
              stream
              BT
              /F2 100 Tf
-             300 400 Td
              120.0 TL
+             300 400 Td
              (hello, world!) Tj
              /F1 10 Tf
-             0 -24 Td
              12.0 TL
+             0 -24 Td
              (a new line!) Tj
              ET
              endstream