Merge branch 'develop'

.travis.yml

@@ -41,12 +41,12 @@ before_script:
 script:
   - export PYTHONPATH="`inkscape.beta -x`:$HOME/.config/inkscape/extensions/"
   #- python -m pytest --verbose -s pytests
-  - xmllint --noout --relaxng inkscape.extension.rng extension/textext.inx
+  - xmllint --noout --relaxng inkscape.extension.rng textext/textext.inx
 after_success:
   # Put a tag if version has changed and (version contains "-dev" on develop) or (version DOES NOT contain "-dev" on master)
   # Reminder: grep -q returns 0 if any match has been found, otherwise nonzero.
-  - VERSION_CHANGED=$(git diff --no-commit-id --name-only -r $TRAVIS_COMMIT_RANGE | grep -q extension/textext/VERSION; echo $?;)
-  - VERSION=$(head -n 1 extension/textext/VERSION)
+  - VERSION_CHANGED=$(git diff --no-commit-id --name-only -r $TRAVIS_COMMIT_RANGE | grep -q textext/VERSION; echo $?;)
+  - VERSION=$(head -n 1 textext/VERSION)
   - echo 'Version changed                     :' $( [ "$VERSION_CHANGED" == 0 ] && echo "Yes" || echo "No")
   - echo 'Version                             :' $VERSION
   - echo 'Travis branch                       :' $TRAVIS_BRANCH

CHANGELOG.rst

@@ -1,23 +1,59 @@
+Version 1.0.0 (2020-05-04)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+- **Important**: This version is only compatible with Inkscape 1.0. Please
+  use TexText 0.11.1 if you use Inkscape 0.92.x
+
+- **Major changes**
+    - TexText can now be found in Inkscape menu entry *"Extensions -> Text -> Tex Text"*
+      (All extensions are required to be in some submenu)
+    - Added shortcut CTRL+P for displaying the preview image
+    - TexText does not need *pstoedit*, *ghostscript* and *pdf2svg* as external
+      dependencies anymore
+    - TexText uses GTK3 user interface now, as Inkscape 1.0 does
+    - Full Python 3 compatibility
+    - Windows only: setup_win.bat now supports Python like arguments
+
+- **Important Fixes**
+    - Lost color after re-compilation of node (:issue_num:`206`)
+    - Operand type error (:issue_num:`186`)
+    - Gradient fills not properly rendered (e.g. in color bars)
+      (:issue_num:`148`)
+    - Proper parsing and display of LaTeX compiler errors
+    - Fixed: Double ESC-hit closes TexText window without confirmation
+
+Version 0.11.1 (2020-05-04)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- **Important**: This version is only compatible with Inkscape 0.92.x Please
+  use TexText 1.0 if you use Inkscape 1.0
+- Modified URLs for help on dependency installation in setup routine
+
+Version 1.0.0-dev.4 (2020-04-15)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Fixed: Vertical flipping after re-compilation of nodes created with TexText < 1.0
+  (:issue_num:`205`)
+- Fixed: Lost color after re-compilation of node (:issue_num:`206`)
+
+Version 1.0.0-dev.3 (2020-04-10)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Compatibility with Inkscape 1.0 Release Candidate 1 modified extension API
+  (:issue_num:`188`, :issue_num:`193`, :issue_num:`194`, :issue_num:`196`, :issue_num:`202`, :issue_num:`203`)
+- Fixed operand type error (:issue_num:`186`)
+- Windows only: setup_win.bat now supports Python like arguments
+
 Version 1.0.0-dev.2 (2020-02-10)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- **Important**: This version is only compatible with Inkscape 1.0 (and its beta
-  releases). Please use TexText 0.11.0 if you use Inkscape 0.92.x
-- New: TexText can now be found in Inkscape menu entry "Extensions -> Text -> Tex Text"
-       (All extensions are required to be in some submenu)
 - New: Enabled TkInter GUI under Python 3
 - New: Proper parsing and display of LaTeX compiler errors
 - Fixed: New nodes were not being placed in the center of the document
 - Fixed: Scale factor is ignored in new nodes
 - Fixed: Inkscape version never stored in TexText node
-- Fixed: Ctrl+P and Ctrl+Q shortcut not working properly under ALL Python
-         interpreters required by Inkscape
+- Fixed: Ctrl+P and Ctrl+Q shortcut not working properly under ALL Python interpreters
+  required by Inkscape
 - Fixed: Setup error URLs do not point to correct issue template
 - Several minor/ internal improvements/ fixes. See commit history of develop branch
 
 Version 1.0.0-dev.1 (2019-12-17)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- **Important**: This version is only compatible with Inkscape 1.0 (and its beta
-  releases). Please use TexText 0.11.0 if you use Inkscape 0.92.x
 - New: TexText does not need pstoedit, ghostscript and pdf2svg as external
   dependencies anymore
 - New: Added shortcut CTRL+P for displaying the preview image

build_packages.py

@@ -19,7 +19,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
 if __name__ == "__main__":
 
-    TexTextVersion = open("extension/textext/VERSION").readline().strip()
+    TexTextVersion = open("textext/VERSION").readline().strip()
 
     parser = argparse.ArgumentParser(description="Build TexText distribution archive for selected platforms."
                                                  "If not otherwise specified zip and tgz packages are built "
@@ -64,8 +64,8 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         with TmpDir() as tmpdir:
             versioned_subdir = os.path.join(tmpdir,"textext-%s" % TexTextVersion)
             os.mkdir(versioned_subdir)
-            shutil.copytree("./extension",
-                            os.path.join(versioned_subdir, "extension"),
+            shutil.copytree("./textext",
+                            os.path.join(versioned_subdir, "textext"),
                             ignore=git_ignore_patterns  # exclude .gitignore files
                             )
             shutil.copy("setup.py", versioned_subdir)

build_windows_installer.nsi

@@ -2,8 +2,8 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "TexText for Inkscape"
-!define /file PRODUCT_VERSION "extension\textext\VERSION"
+!define PRODUCT_NAME "TexText for Inkscape 1.0"
+!define /file PRODUCT_VERSION "textext\VERSION"
 !define PRODUCT_PUBLISHER "TexText developers"
 !define PRODUCT_WEB_SITE "https://github.com/textext/textext"
 !define PRODUCT_DOC_SITE "https://textext.github.io/textext"
@@ -17,7 +17,8 @@
 
 ; Welcome page
 !define MUI_WELCOMEPAGE_TEXT "Setup will guide you through the installation of ${PRODUCT_NAME} \
-${PRODUCT_VERSION}$\n$\nClick Next to continue."
+${PRODUCT_VERSION}$\n$\nPlease note that this version of TexText is only compatible with Inkscape \
+1.0 and newer!$\n$\nClick Next to continue."
 !insertmacro MUI_PAGE_WELCOME
 
 ; License page
@@ -67,14 +68,11 @@ SectionEnd
 
 Section "TexText" -SEC01
   ; The extension files are installed in the subdir "textext" of the
-  ; Inkscape extension directory $INSTDIR. Only the .inx file is put
-  ; into the extension directory itself
-  File "extension\textext.inx"
-
+  ; Inkscape extension directory $INSTDIR.
   SetOutPath "$INSTDIR\textext"
-  File /x "*.pyc" /x "*.log" "extension\textext\*.*"
+  File /x "*.pyc" /x "*.log" "textext\*.*"
   SetOutPath "$INSTDIR\textext\icons"
-  File /r "extension\textext\icons\*.png"
+  File /r "textext\icons\*.png"
 
   ; Make sure that extension files from old TexText versions < 0.9
   ; are removed (they were put directly into Inkscape's extension

docs/source/conf.py

@@ -21,17 +21,17 @@
 # -- Project information -----------------------------------------------------
 
 project = 'TexText'
-copyright = '2019, Alexander Blinne, Brian Clarke, Florent Becker, Jan Winkler, Pit Garbe, Pauli Virtanen, Robert Szalai, Rafal Kolanski, Sergei Izmailov, Toru Araki, @veltsov, Vladislav Gavryusev'
+copyright = '2020, Alexander Blinne, Brian Clarke, Florent Becker, Jan Winkler, Pit Garbe, Pauli Virtanen, Robert Szalai, Rafal Kolanski, Sergei Izmailov, Toru Araki, @veltsov, Vladislav Gavryusev'
 author = 'Alexander Blinne, Brian Clarke, Florent Becker, Jan Winkler, Pit Garbe, Pauli Virtanen, Robert Szalai, Rafal Kolanski, Sergei Izmailov, Toru Araki, @veltsov, Vladislav Gavryusev'
 
 # The full version, including alpha/beta/rc tags
-release = open("../../extension/textext/VERSION").readline().strip()
+release = open("../../textext/VERSION").readline().strip()
 
 # The short X.Y version (for doc title)
 version = ".".join(release.split(".")[:2])
 
 # Last stable 0.x release (compatible with Inkscape 0.92)
-release_0x = "0.11.0"
+release_0x = "0.11.1"
 
 
 # -- General configuration ---------------------------------------------------