Skip to content

Commit 685340c

Browse files
jcwinklerjcwinkler
committed
Merge branch 'develop'
2 parents 20675a1 + 47b5d16 commit 685340c

File tree

8 files changed

+184
-155
lines changed

8 files changed

+184
-155
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
20-
- name: Set up Python 3.8
21-
uses: actions/setup-python@v2
22-
with:
23-
python-version: 3.8
19+
- uses: actions/checkout@v3
20+
- name: Set up Python
21+
uses: actions/setup-python@v4
2422
- name: Install dependencies
2523
run: |
2624
sudo add-apt-repository --yes ppa:inkscape.dev/stable
@@ -32,7 +30,7 @@ jobs:
3230
python -m pip install --upgrade pip
3331
pip install flake8 pytest
3432
# Needed by Inkscape extensions and image processing:
35-
pip install lxml Pillow
33+
pip install lxml cssselect Pillow
3634
- name: Test installation script
3735
run: |
3836
python test_installation_script.py 2> /dev/null

‎CHANGELOG.rst‎

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,59 @@
1+
Version 1.8.2 (2022-08-27)
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
- Fixed: Each time the extension is executed an annoying warning
4+
``<frozen importlib._bootstrap>:671: ImportWarning: DynamicImporter.exec_module() not found; falling back to load_module()``
5+
is shown (actually, this is the problem of the underlying GTK-framework, not
6+
of TexText) (:issue:`350`)
7+
18
Version 1.8.1 (2022-02-23)
29
~~~~~~~~~~~~~~~~~~~~~~~~~~
310
- Fixed: When re-installing TexText with diffent paths to latex excutables
411
compared to the original setup these new paths are not recognized when
5-
invoking TexText from Inkscape (:issue_num:`345`).
12+
invoking TexText from Inkscape (:issue:`345`).
613

714
Version 1.8.0 (2022-02-03)
815
~~~~~~~~~~~~~~~~~~~~~~~~~~
916
- New: It is now possible to use the ``\documentclass`` statement in the
1017
preamble file. This makes it easier to adjust the fontsize. Old preamble
1118
files without the ``\documentclass`` statement can still be used.
1219
- Changed: Instructions for installation of TexText for Inkscape in
13-
Windows PortableApps (fixes :issue_num:`288`)
20+
Windows PortableApps (fixes :issue:`288`)
1421

1522
Version 1.7.1 (2022-01-04)
1623
~~~~~~~~~~~~~~~~~~~~~~~~~~
1724
- Fixed: In Inkscape 1.2-dev new nodes are not placed in the center of the view.
18-
(:issue_num:`338`)
25+
(:issue:`338`)
1926

2027
Version 1.7.0 (2021-12-27)
2128
~~~~~~~~~~~~~~~~~~~~~~~~~~
2229
- New: Adjustable font size in LaTeX code editor (GTK GUI only)
2330
- Fixed: distutils deprecation warning when running under Python 3.10
2431
- Open: In Inkscape 1.2-dev new nodes are not placed in the center of the view.
25-
(:issue_num:`338`)
32+
(:issue:`338`)
2633

2734
Version 1.6.1 (2021-11-16)
2835
~~~~~~~~~~~~~~~~~~~~~~~~~~
2936
- Fixed: When LaTeX-code is imported via the `File` - `Open` dialog
3037
the error message `ResourceWarning: unclosed file <_io.TextIOWrapper name'...'`
31-
is shown. (:issue_num:`322`)
38+
is shown. (:issue:`322`)
3239

3340
Version 1.6.0 (2021-10-07)
3441
~~~~~~~~~~~~~~~~~~~~~~~~~~
3542
- Fixed: Generated svg objects appear sometimes flipped or far away from
36-
the view center (:issue_num:`283`, :issue_num:`313`)
43+
the view center (:issue:`283`, :issue:`313`)
3744

3845
- New: It is now possible to install TexText system wide for all users
3946
(setup script only, see
4047
`setup documentation <https://textext.github.io/textext/install/advanced.html>`_,
41-
:issue_num:`247`, :issue_num:`314`)
48+
:issue:`247`, :issue:`314`)
4249

4350
Version 1.5.0 (2021-08-19)
4451
~~~~~~~~~~~~~~~~~~~~~~~~~~
4552
- Changed: The feature enabling easy colorization of TexText svg nodes
4653
containing `\sqrt`, `\frac`, and other commands introducing strokes
4754
(lines) in Inkscape is now optional, see
4855
`documentation <https://textext.github.io/textext/usage/gui.html#colorization-of-the-output>`_.
49-
Reason for this is the increased compilation time (cf. :issue_num:`304`).
56+
Reason for this is the increased compilation time (cf. :issue:`304`).
5057

5158
- New (experimental): Support of Inkscape extension manager
5259
(manual install of file downloaded from
@@ -62,7 +69,7 @@ Version 1.4.0 (2021-05-31)
6269
if they contain strokes (as, for example, in fractions,
6370
square-roots or overlines). Just select the node in Inkscape and
6471
click on the fill color in the color bar as you do it with normal
65-
Inkscape text (:issue_num:`291`).
72+
Inkscape text (:issue:`291`).
6673

6774
*Note*: Due to this, execution time per node compilation is longer
6875
compared to previous versions of TexText. However, you do not need to
@@ -74,38 +81,38 @@ Version 1.4.0 (2021-05-31)
7481
Version 1.3.1 (2021-02-26)
7582
~~~~~~~~~~~~~~~~~~~~~~~~~~
7683
- Fixed: Setup script fails on Windows if Inkscape has been installed
77-
via the .msi installer (:issue_num:`280`)
84+
via the .msi installer (:issue:`280`)
7885
- Fixed: Imprecise instructions regarding location of Inkscape
79-
executable in Windows setup script (:issue_num:`280`)
86+
executable in Windows setup script (:issue:`280`)
8087
- Added: Detailed explanation of setup script options (Linux, MacOS,
8188
Windows)
8289

8390
Version 1.3.0 (2020-11-27)
8491
~~~~~~~~~~~~~~~~~~~~~~~~~~
8592
- Fixed: Double backslashes and missing line breaks occur when using
86-
TexText 1.2.0 on nodes created with TexText <= 1.1 (:issue_num:`265`)
93+
TexText 1.2.0 on nodes created with TexText <= 1.1 (:issue:`265`)
8794

8895
**Note: A one-time manual insertion of line breaks will be necessary
8996
when opening such nodes. When having saved them again the line breaks
9097
are kept in the future. Double backslashes are replaced by single ones
9198
automatically.**
92-
- Fixed: Opening TexText is slow (:issue_num:`263`)
99+
- Fixed: Opening TexText is slow (:issue:`263`)
93100
- Fixed: Windows installation script complains about missing
94-
Python GTK3 bindings (:issue_num:`262`)
101+
Python GTK3 bindings (:issue:`262`)
95102
- New: Added explanation to the FAQ/ documentation how to
96-
define a shortcut for opening TexText (:issue_num:`259`). Refer to
103+
define a shortcut for opening TexText (:issue:`259`). Refer to
97104
https://textext.github.io/textext/usage/faq.html#defining-keyboard-shortcut-for-opening-textext-dialog
98105

99106
Version 1.2.0 (2020-10-22)
100107
~~~~~~~~~~~~~~~~~~~~~~~~~~
101108
- Fixed: On Windows and Inkscape 1.0.1 TK interface is shown only
102-
(:issue_num:`253`)
109+
(:issue:`253`)
103110
- Fixed: Color of TexText nodes set in Inkscape not kept after
104-
recompilation (:issue_num:`245`)
105-
- Fixed: `temp.tex` file not encoded in UTF-8 (:issue_num:`241`)
111+
recompilation (:issue:`245`)
112+
- Fixed: `temp.tex` file not encoded in UTF-8 (:issue:`241`)
106113
- Fixed: Installation on Windows via batch file fails if path to
107-
batch file contains spaces (:issue_num:`232`)
108-
- New: TexText group ID is kept after recompilation (:issue_num:`256`)
114+
batch file contains spaces (:issue:`232`)
115+
- New: TexText group ID is kept after recompilation (:issue:`256`)
109116

110117
Version 1.1.0 (2020-07-17)
111118
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -117,7 +124,7 @@ Version 1.1.0 (2020-07-17)
117124
Version 1.0.1 (2020-05-12)
118125
~~~~~~~~~~~~~~~~~~~~~~~~~~
119126
- Fixed: List index out of range if latex compilation fails
120-
(:issue_num:`219`)
127+
(:issue:`219`)
121128

122129
Version 1.0.0 (2020-05-04)
123130
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -135,10 +142,10 @@ Version 1.0.0 (2020-05-04)
135142
- Windows only: setup_win.bat now supports Python like arguments
136143

137144
- **Important Fixes**
138-
- Lost color after re-compilation of node (:issue_num:`206`)
139-
- Operand type error (:issue_num:`186`)
145+
- Lost color after re-compilation of node (:issue:`206`)
146+
- Operand type error (:issue:`186`)
140147
- Gradient fills not properly rendered (e.g. in color bars)
141-
(:issue_num:`148`)
148+
(:issue:`148`)
142149
- Proper parsing and display of LaTeX compiler errors
143150
- Fixed: Double ESC-hit closes TexText window without confirmation
144151

@@ -151,14 +158,14 @@ Version 0.11.1 (2020-05-04)
151158
Version 1.0.0-dev.4 (2020-04-15)
152159
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
153160
- Fixed: Vertical flipping after re-compilation of nodes created with TexText < 1.0
154-
(:issue_num:`205`)
155-
- Fixed: Lost color after re-compilation of node (:issue_num:`206`)
161+
(:issue:`205`)
162+
- Fixed: Lost color after re-compilation of node (:issue:`206`)
156163

157164
Version 1.0.0-dev.3 (2020-04-10)
158165
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
159166
- Compatibility with Inkscape 1.0 Release Candidate 1 modified extension API
160-
(:issue_num:`188`, :issue_num:`193`, :issue_num:`194`, :issue_num:`196`, :issue_num:`202`, :issue_num:`203`)
161-
- Fixed operand type error (:issue_num:`186`)
167+
(:issue:`188`, :issue:`193`, :issue:`194`, :issue:`196`, :issue:`202`, :issue:`203`)
168+
- Fixed operand type error (:issue:`186`)
162169
- Windows only: setup_win.bat now supports Python like arguments
163170

164171
Version 1.0.0-dev.2 (2020-02-10)
@@ -179,7 +186,7 @@ Version 1.0.0-dev.1 (2019-12-17)
179186
dependencies anymore
180187
- New: Added shortcut CTRL+P for displaying the preview image
181188
- Fixed: Gradient fills not properly rendered (e.g. in color bars)
182-
(:issue_num:`148`)
189+
(:issue:`148`)
183190
- Fixed: Double ESC-hit closes TexText window without confirmation
184191
- Internal: Improved exception handling
185192
- Open: On Windows source code syntax highlighting is currently not available
@@ -190,7 +197,7 @@ Version 0.11.0 (2019-06-22)
190197
TexText window. You can select between `Escape` (default), `CTRL + Q` and
191198
`None`.
192199
- New (GTK-version only): TexText asks for confirmation to close the window
193-
in case you made changes to your text (:issue_num:`127`).
200+
in case you made changes to your text (:issue:`127`).
194201
- New: The annoying "Extension is working" window is not shown anymore.
195202
- New: Improved dependency check on incompatible pstoedit and ghostscript
196203
versions
@@ -201,35 +208,35 @@ features will be included in TexText for Inkscape 1.0.
201208
Version 0.10.2 (2019-05-07)
202209
~~~~~~~~~~~~~~~~~~~~~~~~~~~
203210
- New: Disallowed pstoedit 3.73 + ghostscript 9.27 combination during
204-
installation (:issue_num:`126`)
211+
installation (:issue:`126`)
205212

206213
Version 0.10.1 (2019-04-17)
207214
~~~~~~~~~~~~~~~~~~~~~~~~~~~
208215
- Fixed: Inkscape binary not found during installation on some MacOS
209-
installations (:issue_num:`120`)
216+
installations (:issue:`120`)
210217

211218
Version 0.10.0 (2019-04-05)
212219
~~~~~~~~~~~~~~~~~~~~~~~~~~~
213220
- New: Possibility to define default math environment when creating new nodes
214221
(empty, inline math, display math)
215222
- Fixed: Two grey windows appear with no text inside. Inkscape freezes and
216-
becomes unusable (:issue_num:`114`)
223+
becomes unusable (:issue:`114`)
217224
- Fixed: Log file cannot be written in system wide installations of TexText
218-
(:issue_num:`111`)
225+
(:issue:`111`)
219226
- Internal: Automatic CI deployment and documentation upload (thanks to
220227
Sergei Izmailov)
221228

222229
Version 0.9.1 (2018-12-27)
223230
~~~~~~~~~~~~~~~~~~~~~~~~~~
224231
- Fixed: UnicodeDecodeError in setup.py / setup_win.bat
225-
(:issue_num:`101`)
232+
(:issue:`101`)
226233

227234

228235
Version 0.9.0 (2018-12-20)
229236
~~~~~~~~~~~~~~~~~~~~~~~~~~
230237
- New: Scripted setup procedure with automatic check of the
231-
dependencies (:issue_num:`54`, :issue_num:`66`)
232-
- New: Added possibility to wrap long lines (:issue_num:`47`)
238+
dependencies (:issue:`54`, :issue:`66`)
239+
- New: Added possibility to wrap long lines (:issue:`47`)
233240
- New: GUI settings saved to disk and reloaded at next call
234241
(word wrap, auto-indent, spaces instead of tab, showing line numbers,
235242
tab-width)
@@ -238,13 +245,13 @@ Version 0.9.0 (2018-12-20)
238245
to display the preview image in original size with vertical and
239246
horizontal scrolling enabled.
240247
- New: Improved error dialog
241-
- New: Imagemagick is not necessary anymore (:issue_num:`60`)
242-
- New: Automatic dependency checks during installation (:issue_num:`54`)
243-
- New: More detailed and informative logging (:issue_num:`35`)
244-
- Fixed: TeX compile error messages reappear (:issue_num:`17`)
245-
- Internal: Change extension repository layout (:issue_num:`28`)
246-
- Internal: Store TexText config in extension folder (:issue_num:`69`)
247-
- Internal: Add CI to monitor backward compatibility (:issue_num:`57`)
248+
- New: Imagemagick is not necessary anymore (:issue:`60`)
249+
- New: Automatic dependency checks during installation (:issue:`54`)
250+
- New: More detailed and informative logging (:issue:`35`)
251+
- Fixed: TeX compile error messages reappear (:issue:`17`)
252+
- Internal: Change extension repository layout (:issue:`28`)
253+
- Internal: Store TexText config in extension folder (:issue:`69`)
254+
- Internal: Add CI to monitor backward compatibility (:issue:`57`)
248255
- Abandoned: Support for Inkscape <= 0.91.x (see :ref:`faq-old-inkscape` for your options)
249256

250257
Very big thanks go to Sergei Izmailov who again contributed a huge bunch of
@@ -254,12 +261,12 @@ great improvements for this release of the extension.
254261
Version 0.8.2 (2018-12-12)
255262
~~~~~~~~~~~~~~~~~~~~~~~~~~
256263
v0.8.2:
257-
- Fixed: pstoedit/pdf2svg interoperability on distorted nodes :issue_num:`56`
264+
- Fixed: pstoedit/pdf2svg interoperability on distorted nodes :issue:`56`
258265

259266
Version 0.8.1 (2018-08-23)
260267
~~~~~~~~~~~~~~~~~~~~~~~~~~
261268
- Fixed: Loss of user defined preamble file path when re-editing
262-
nodes (:issue_num:`40`, thanks to veltsov@github).
269+
nodes (:issue:`40`, thanks to veltsov@github).
263270
- Added file chooser button for selection of preamble file in Tk
264271
interface
265272

@@ -276,25 +283,25 @@ Version 0.8.0 (2018-08-21)
276283
Version 0.7.3 (2018-05-17)
277284
~~~~~~~~~~~~~~~~~~~~~~~~~~
278285
- Fixed: Failure when trying to re-edit nodes created with very old versions of
279-
TexText. (:issue_num:`15`: "Recompiling of nodes created with TexText < 0.5 fails")
286+
TexText. (:issue:`15`: "Recompiling of nodes created with TexText < 0.5 fails")
280287

281-
- Fixed: :issue_num:`19`: Missing width and height attributes in svg document
288+
- Fixed: :issue:`19`: Missing width and height attributes in svg document
282289
lead to crash
283290

284291
Version 0.7.2 (2018-04-06)
285292
~~~~~~~~~~~~~~~~~~~~~~~~~~
286-
- Fixed: Failure on missing Inkscape version key (:issue_num:`10`: "Error occurred while
293+
- Fixed: Failure on missing Inkscape version key (:issue:`10`: "Error occurred while
287294
converting text from LaTeX to SVG")
288295

289296

290297
Version 0.7.1 (2018-02-06)
291298
~~~~~~~~~~~~~~~~~~~~~~~~~~
292299
- Fixed:
293300
Wrong scaling so that text with explicitly defined font size does not match
294-
size of text with equal font size in Inkscape 0.92.x (:issue_num:`1`)
301+
size of text with equal font size in Inkscape 0.92.x (:issue:`1`)
295302

296303
- Fixed:
297-
"Zero length field name in format" error in Inkcape <= 0.91 (:issue_num:`6`)
304+
"Zero length field name in format" error in Inkcape <= 0.91 (:issue:`6`)
298305

299306

300307
.. note::

‎docs/source/conf.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#
6767
# This is also used if you do content translation via gettext catalogs.
6868
# Usually you set "language" from the command line for these cases.
69-
language = None
69+
language = 'en'
7070

7171
nitpicky = True
7272

@@ -95,7 +95,7 @@
9595
# Add any paths that contain custom static files (such as style sheets) here,
9696
# relative to this directory. They are copied after the builtin static files,
9797
# so a file named "default.css" will overwrite the builtin "default.css".
98-
html_static_path = ['_static']
98+
# html_static_path = ['_static']
9999

100100
# Custom sidebar templates, must be a dictionary that maps document names
101101
# to template names.
@@ -187,20 +187,20 @@
187187
# -- Extension configuration -------------------------------------------------
188188

189189
extlinks = {
190-
'issue_num': ('https://github.com/textext/textext/issues/%s', '#'),
191-
'issue': ('https://github.com/textext/textext/issues/%s', 'issue #'),
192-
'bb_issue_num': ('https://bitbucket.org/pv/textext/issues/%s', 'bb#'),
193-
'bb_issue': ('https://bitbucket.org/pv/textext/issues/%s', 'issue bb#'),
190+
'issue_num': ('https://github.com/textext/textext/issues/%s', '%s'),
191+
'issue': ('https://github.com/textext/textext/issues/%s', 'issue %s'),
192+
'bb_issue_num': ('https://bitbucket.org/pv/textext/issues/%s', 'bb%s'),
193+
'bb_issue': ('https://bitbucket.org/pv/textext/issues/%s', 'issue (on BitBucket) %s'),
194194

195195
# Links to current stable release compatible with Inkscape >= 1.0
196-
'textext_download_zip': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.zip'.format(**locals()), 'v{release}-'.format(**locals())),
197-
'textext_download_tgz': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.tar.gz'.format(**locals()), 'v{release}-'.format(**locals())),
198-
'textext_download_exe': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.exe'.format(**locals()), 'v{release}-'.format(**locals())),
199-
'textext_current_release_page': ('https://github.com/textext/textext/releases/tag/{release}#%s'.format(**locals()), 'v{release}'.format(**locals())),
196+
'textext_download_zip': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.zip'.format(**locals()), 'zip-file for %s'),
197+
'textext_download_tgz': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.tar.gz'.format(**locals()), 'tgz-file for %s'),
198+
'textext_download_exe': ('https://github.com/textext/textext/releases/download/{release}/TexText-%s-{release}.exe'.format(**locals()), 'exe-installer for %s'),
199+
'textext_current_release_page': ('https://github.com/textext/textext/releases/tag/{release}#%s'.format(**locals()), 'Github %s page'),
200200

201201
# Links to last stable release compatible with Inkscape 0.92
202-
'textext_0x_download_zip': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.zip'.format(**locals()), 'v{release_0x}-'.format(**locals())),
203-
'textext_0x_download_tgz': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.tar.gz'.format(**locals()), 'v{release_0x}-'.format(**locals())),
204-
'textext_0x_download_exe': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.exe'.format(**locals()), 'v{release_0x}-'.format(**locals())),
205-
'textext_0x_current_release_page': ('https://github.com/textext/textext/releases/tag/{release_0x}#%s'.format(**locals()),'v{release_0x}'.format(**locals())),
202+
'textext_0x_download_zip': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.zip'.format(**locals()), 'zip-file for %s'),
203+
'textext_0x_download_tgz': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.tar.gz'.format(**locals()), 'tgz-file for %s'),
204+
'textext_0x_download_exe': ('https://github.com/textext/textext/releases/download/{release_0x}/TexText-%s-{release_0x}.exe'.format(**locals()), 'exe-installer for %s'),
205+
'textext_0x_current_release_page': ('https://github.com/textext/textext/releases/tag/{release_0x}#%s'.format(**locals()),'Github %s page'),
206206
}

0 commit comments

Comments
 (0)