Merge branch 'develop'

jcwinkler · jcwinkler · commit a7f423f8a442 · 2024-02-20T10:00:43.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 /.idea/
 /textext/.cache.json
 /textext/config.json
+.DS_Store
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -16,6 +16,7 @@ went into the development of the project.
 - Alexander Blinne
 - Antonio Russo
 - Brian Clarke
+- dongguaguaguagua@github
 - Florent Becker
 - jocelynetienne@github
 - Markus Wallerberger
@@ -25,6 +26,7 @@ went into the development of the project.
 - Robert Szalai
 - Rafal Kolanski
 - Toru Araki
+- user202729@github
 - veltsov@github
 - Vladislav Gavryusev
 - xuestrange@github
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+Version 1.10.2 (2024-02-20)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Fixed: Wrong environment inserted when `Display Math` option is selected 
+  in `New Node Content` menu while typst is the active compiler (:Issue:`417`)
+
 Version 1.10.1 (2023-11-18)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - Fixed: Installation issue on Windows.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 |status-ci| |status-downloads|
 
-TexText - A TeX extension for Inkscape
-======================================
+TexText - A TeX / typst extension for Inkscape
+==============================================
 
 TexText is a Python plugin for the vector graphics editor
 `Inkscape <http://www.inkscape.org/>`__ providing the possibility to add
diff --git a/build_packages.py b/build_packages.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/pytests/conftest.py b/pytests/conftest.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/pytests/test_compatibility.py b/pytests/test_compatibility.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/test_installation_script.py b/test_installation_script.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/textext/VERSION b/textext/VERSION
@@ -1 +1 @@
-1.10.1
+1.10.2
diff --git a/textext/__main__.py b/textext/__main__.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/textext/asktext.py b/textext/asktext.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
@@ -298,7 +298,7 @@ def ask(self, callback, preview_callback=None):
         self._tex_command_tk_str = Tk.StringVar()
         self._tex_command_tk_str.set(self.current_texcmd)
         box = Tk.Frame(box2, relief="groove", borderwidth=2)
-        label = Tk.Label(box, text="TeX command:")
+        label = Tk.Label(box, text="Command:")
         label.pack(pady=2, padx=5, anchor="w")
         for tex_command in self.TEX_COMMANDS:
             Tk.Radiobutton(box, text=tex_command, variable=self._tex_command_tk_str,
@@ -626,7 +626,7 @@ def __init__(self, version_str, text, preamble_file, global_scale_factor, curren
                 {new_node_content}
               </menu>
               <menu action='CloseShortcut'>
-                {close_shortcut} 
+                {close_shortcut}
               </menu>
               <menuitem action='ConfirmClose'/>
             </menu>
@@ -963,7 +963,7 @@ def create_buttons(self):
         button_box.add(self._cancel_button)
 
         self._preview_button = Gtk.Button(label="Preview")
-        self._preview_button.set_tooltip_text("Show/ update preview (CTRL+P)")
+        self._preview_button.set_tooltip_text("LaTeX only: Show/ update preview (CTRL+P)")
         button_box.add(self._preview_button)
 
         self._ok_button = Gtk.Button(stock=Gtk.STOCK_SAVE)
@@ -1034,7 +1034,7 @@ def create_window(self):
 
         # --- Tex command ---
         texcmd_frame = Gtk.Frame()
-        texcmd_frame.set_label("TeX command")
+        texcmd_frame.set_label("Command")
         texcmd_box = Gtk.HBox(homogeneous=False, spacing=0)
         texcmd_frame.add(texcmd_box)
         texcmd_box.set_border_width(3)
@@ -1049,7 +1049,7 @@ def create_window(self):
         self._texcmd_cbox.add_attribute(renderer_text, "text", 0)
 
         self._texcmd_cbox.set_active(self.TEX_COMMANDS.index(self.current_texcmd))
-        self._texcmd_cbox.set_tooltip_text("TeX command used for compiling.")
+        self._texcmd_cbox.set_tooltip_text("Command used for compiling.")
         texcmd_box.pack_start(self._texcmd_cbox, True, True, 5)
 
         # --- Scaling ---
@@ -1270,7 +1270,10 @@ def create_window(self):
                 iter = self._source_buffer.get_iter_at_offset(1)
                 self._source_buffer.place_cursor(iter)
             if new_node_content_value=='DisplayMath':
-                self.text = "$$$$"
+                if self.current_texcmd == "typst":
+                    self.text = "$  $"
+                else:
+                    self.text = "$$$$"
                 self._source_buffer.set_text(self.text)
                 iter = self._source_buffer.get_iter_at_offset(2)
                 self._source_buffer.place_cursor(iter)
diff --git a/textext/base.py b/textext/base.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
@@ -643,7 +643,7 @@ def stroke_to_path(self):
             pass
 
     def pdf_to_png(self, white_bg):
-        """Convert the PDF file to a SVG file"""
+        """Convert the PDF file to a PNG file"""
         kwargs = dict()
         kwargs["export_filename"] = self.tmp('png')
         kwargs["pdf_poppler"] = True
@@ -696,7 +696,7 @@ class TexTextElement(inkex.Group):
     def __init__(self, svg_filename, document_unit):
         """
         :param svg_filename: The name of the file containing the svg-snippet
-        :param document_unit: String specifyling the unit of the document into which the node is going
+        :param document_unit: String specifying the unit of the document into which the node is going
                               to be placed ("mm", "pt", ...)
         """
         super(TexTextElement, self).__init__()
diff --git a/textext/errors.py b/textext/errors.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/textext/requirements_check.py b/textext/requirements_check.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/textext/utility.py b/textext/utility.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext
diff --git a/textext/win_app_paths.py b/textext/win_app_paths.py
@@ -2,7 +2,7 @@
 This file is part of TexText, an extension for the vector
 illustration program Inkscape.
 
-Copyright (c) 2006-2023 TexText developers.
+Copyright (c) 2006-2024 TexText developers.
 
 TexText is released under the 3-Clause BSD license. See
 file LICENSE.txt or go to https://github.com/textext/textext

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2006-2023 TexText developers.`
	`1`	`+Copyright (c) 2006-2024 TexText developers.`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without`