Fixed bug in aastex.Figure() where the label was being placed befor…

…e the caption. (#5)

aastex/_aastex.py

@@ -272,16 +272,18 @@ def __init__(
             position=position,
             **kwargs,
         )
-        if isinstance(label, Label):
-            self._label = label
-        else:
+        self.label = label
+
+    @property
+    def _label(self) -> Label:
+        label = self.label
+        if not isinstance(label, Label):
             if ":" in label:
                 label = label.split(":", 1)
-                self._label = Label(Marker(label[1], label[0]))
+                label = Label(Marker(label[1], label[0]))
             else:
-                self._label = Label(Marker(label, self.marker_prefix))
-
-        self.append(self._label)
+                label = Label(Marker(label, self.marker_prefix))
+        return label
 
     def __format__(self, format_spec):
         return Ref(self._label.marker).dumps()
@@ -346,6 +348,10 @@ def add_fig(
 
         self.add_image(filename, **add_image_kwargs)
 
+    def add_caption(self, caption) -> None:
+        super().add_caption(caption)
+        self.append(self._label)
+
 
 class FigureStar(
     Figure,

aastex/_tests/test_aastex.py

@@ -188,6 +188,10 @@ def test_add_fig(self, a: aastex.Figure):
 
         assert r"\includegraphics" in a.dumps()
 
+    def test_add_caption(self, a: aastex.Figure):
+        a.add_caption("foo")
+        assert r"\caption" in a.dumps()
+
 
 @pytest.mark.parametrize(
     argnames="a",