Skip to content

Commit b11f39e

Browse files
jcwinklerjcwinkler
committed
Merge branch 'develop'
2 parents 685340c + fd28e2a commit b11f39e

23 files changed

+138
-102
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
python test_installation_script.py 2> /dev/null
3737
python setup.py
38-
wget https://gitlab.com/inkscape/extensions/raw/master/inkscape.extension.rng
38+
wget https://gitlab.com/inkscape/extensions/-/raw/master/inkex/tester/inkscape.extension.rng
3939
- name: Perfom unit-tests
4040
run: |
4141
export PYTHONPATH="`inkscape --system-data-directory`/extensions:$HOME/.config/inkscape/extensions/"

‎CHANGELOG.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 1.9.0 (2023-07.26)
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
- Compatibility with Inkscape 1.3. This version does not support Inkscape
4+
versions 1.2 and older anymore!
5+
16
Version 1.8.2 (2022-08-27)
27
~~~~~~~~~~~~~~~~~~~~~~~~~~
38
- Fixed: Each time the extension is executed an annoying warning

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2007-2022 TexText developers.
1+
Copyright (c) 2006-2023 TexText developers.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎README.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@ Download
3030

3131
Download of the most recent version (and older ones): https://github.com/textext/textext/releases
3232

33+
Compatibility chart:
34+
35+
+---------------------+-------------------------------------------------------------------+
36+
| Inkscape | TexText |
37+
+=====================+===================================================================+
38+
| 1.3.x | `>=1.9.0 <https://github.com/textext/textext/releases>`_ |
39+
+---------------------+-------------------------------------------------------------------+
40+
| 1.2.x, 1.1.x, 1.0.x | `1.8.2 <https://github.com/textext/textext/releases/tag/1.8.2>`_ |
41+
+---------------------+-------------------------------------------------------------------+
42+
| 0.92.x | `0.11 <https://github.com/textext/textext/releases/tag/0.11.0>`_ |
43+
+---------------------+-------------------------------------------------------------------+
44+
3345
Documentation
3446
-------------
3547

‎build_packages.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
This file is part of TexText, an extension for the vector
33
illustration program Inkscape.
44
5-
Copyright (c) 2006-2022 TexText developers.
5+
opyright (c) 2006-2023 TexText developers.
66
77
TexText is released under the 3-Clause BSD license. See
88
file LICENSE.txt or go to https://github.com/textext/textext

‎build_windows_installer.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Unicode True
1919
; Welcome page
2020
!define MUI_WELCOMEPAGE_TEXT "Setup will guide you through the installation of ${PRODUCT_NAME} \
2121
${PRODUCT_VERSION}$\n$\nPlease note that this version of TexText is only compatible with Inkscape \
22-
1.x!$\n$\nClick Next to continue."
22+
1.3!$\n$\nClick Next to continue."
2323
!insertmacro MUI_PAGE_WELCOME
2424

2525
; License page

‎docs/source/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# -- Project information -----------------------------------------------------
2222

2323
project = 'TexText'
24-
copyright = '2022, TexText developers'
24+
copyright = '2023, TexText developers'
2525
author = 'Alexander Blinne, Antonio Russo, Brian Clarke, Florent Becker, Jan Winkler, Pit Garbe, Pauli Virtanen, Robert Szalai, Rafal Kolanski, Sergei Izmailov, Toru Araki, @veltsov, Vladislav Gavryusev'
2626

2727
# The full version, including alpha/beta/rc tags
@@ -192,7 +192,7 @@
192192
'bb_issue_num': ('https://bitbucket.org/pv/textext/issues/%s', 'bb%s'),
193193
'bb_issue': ('https://bitbucket.org/pv/textext/issues/%s', 'issue (on BitBucket) %s'),
194194

195-
# Links to current stable release compatible with Inkscape >= 1.0
195+
# Links to current stable release compatible with Inkscape >= 1.3
196196
'textext_download_zip': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.zip'.format(**locals()), 'zip-file for %s'),
197197
'textext_download_tgz': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.tar.gz'.format(**locals()), 'tgz-file for %s'),
198198
'textext_download_exe': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.exe'.format(**locals()), 'exe-installer for %s'),

‎docs/source/index.rst‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,18 @@ and *re-edit* LaTeX generated SVG elements to your drawing.
1212
Key features
1313
------------
1414

15-
- Compatible with Inkscape **1.x** and **0.92**
15+
- Compatible with Inkscape **1.x** and **0.92**. Compatibility chart:
16+
17+
+---------------------+---------+
18+
| Inkscape | TexText |
19+
+=====================+=========+
20+
| 1.3.x | >= 1.9.0|
21+
+---------------------+---------+
22+
| 1.2.x, 1.1.x, 1.0.x | 1.8.2|
23+
+---------------------+---------+
24+
| 0.92.x | 0.11 |
25+
+---------------------+---------+
26+
1627
- Windows/ Linux/ MacOS support
1728
- LaTeX generated SVG elements can be re-edited later
1829
- Multi-line editor with syntax highlighting
@@ -26,7 +37,9 @@ Key features
2637
- Compatibility with TexText down to version 0.4.x
2738

2839
.. note::
29-
If you are using Inkscape **0.92** please use the :ref:`discontinued release 0.11 of TexText <tt0x>`
40+
- If you are using Inkscape **1.2.x**, **1.1.x**, or **1.0.x** please use
41+
the `discontinued release 1.8.2 of TexText <https://github.com/textext/textext/releases/tag/1.8.2>`_
42+
- If you are using Inkscape **0.92** please use the :ref:`discontinued release 0.11 of TexText <tt0x>`
3043

3144
.. _installation-toc:
3245

‎docs/source/install/linux.rst‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. |TexText| replace:: **TexText**
2-
.. |Inkscape| replace:: **Inkscape 1.2**
2+
.. |Inkscape| replace:: **Inkscape 1.3**
33
.. |InkscapeOld| replace:: **Inkscape 0.92.x**
44

55
.. role:: bash(code)
@@ -28,7 +28,7 @@ Preparation
2828
-----------
2929

3030
1. Make sure that |Inkscape| is installed on your system via your favorite
31-
package manager.
31+
package manager. (You can also use older Inkscape versions, see below)
3232

3333
On **Ubuntu 22.04** + **20.04** and its derivates the most recent version of
3434
|Inkscape| is not part of the default distribution. Perform the following steps
@@ -82,7 +82,9 @@ Download and install |TexText|
8282
1. If you are on Debian Bullseye or later refer to section :ref:`linux-textext-packages`.
8383
Otherwise download the most recent package from the
8484
:textext_current_release_page:`release`
85-
(direct links: :textext_download_zip:`Linux`, :textext_download_tgz:`Linux`)
85+
(direct links: :textext_download_zip:`Linux`, :textext_download_tgz:`Linux`).
86+
In case you are using Inkscape 1.2, 1.1, or 1.0 download
87+
`TexText 1.8.2 <https://github.com/textext/textext/releases/tag/1.8.2>`_!
8688

8789
2. Extract the package and change into the created directory.
8890

‎docs/source/install/macos.rst‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. |TexText| replace:: **TexText**
2-
.. |Inkscape| replace:: **Inkscape 1.2**
2+
.. |Inkscape| replace:: **Inkscape 1.3**
33
.. |InkscapeOld| replace:: **Inkscape 0.92.x**
44

55

@@ -39,11 +39,13 @@ Method 1: Use Inkscape DMG installer (optionally together with Homebrew Python)
3939
`Inkscape download site <https://inkscape.org/release>`_.
4040

4141
2. Install Inkscape. Verify that Inkscape launches and is of version
42-
1.x.
42+
1.3.
4343

4444
3. Download the most recent package of |TexText| from
4545
:textext_current_release_page:`release`
46-
(direct link: :textext_download_zip:`MacOS`)
46+
(direct link: :textext_download_zip:`MacOS`). In case you are still using
47+
Inkscape 1.2, 1.1, or 1.0 download
48+
`TexText 1.8.2 <https://github.com/textext/textext/releases/tag/1.8.2>`_!
4749

4850
Extract the package and change into the created directory.
4951

@@ -87,11 +89,12 @@ Method 1: Use Inkscape DMG installer (optionally together with Homebrew Python)
8789
brew install numpy
8890
brew install pygobject3
8991
90-
8. Install the lxml-tools required by the Inkscape extensions:
92+
8. Install the lxml-tools and cssselect required by the Inkscape extensions:
9193

9294
.. code-block:: bash
9395
9496
$(brew --prefix)/opt/python@3.9/libexec/bin/pip install lxml
97+
$(brew --prefix)/opt/python@3.9/libexec/bin/pip install cssselect
9598
9699
97100
9. Determine the path of the Homebrew python3 executable:
@@ -148,7 +151,7 @@ Preparation
148151
149152
brew install --cask inkscape
150153
151-
Verify that inkscape launches and is of version >= 1.x.
154+
Verify that inkscape launches and is of version >= 1.3
152155

153156
.. _macos-install-textext:
154157

0 commit comments

Comments
 (0)