Merge branch 'master' of https://github.com/texstudio-org/texstudio

.github/workflows/cd.yml

@@ -72,9 +72,20 @@ jobs:
           echo "TXS_VERSION=${TXS_VERSION}">> $GITHUB_OUTPUT
           echo "GIT_VERSION=${GIT_VERSION}">> $GITHUB_OUTPUT
       
+      - name: Detect if codesign
+        run: |
+          # Nonexistent context property evaluates to an empty string.
+          # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/contexts#about-contexts
+          if [ -z "${{ secrets.SIGNPATH_API_TOKEN }}" ]; then
+            echo "IF_CODESIGN=false" >> "$GITHUB_ENV"
+            echo "::notice file=.github/workflows/cd.yml,title=Codesign skipped::Secret "SIGNPATH_API_TOKEN" not set."
+          else
+            echo "IF_CODESIGN=true" >> "$GITHUB_ENV"
+          fi
+
       - name: Codesign binary
         id: sign_binary
-        if: true
+        if: env.IF_CODESIGN == 'true'
         uses: signpath/github-action-submit-signing-request@v0.4
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -91,6 +102,7 @@ jobs:
 
       - name: use signed binary
         id: use_signed_binary
+        if: env.IF_CODESIGN == 'true'
         run: |
           mv signed-artifacts/texstudio.exe build/texstudio.exe
 
@@ -122,7 +134,7 @@ jobs:
 
       - name: Codesign
         id: sign
-        if: true
+        if: env.IF_CODESIGN == 'true'
         uses: signpath/github-action-submit-signing-request@v0.4
         with:
           api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -139,13 +151,14 @@ jobs:
 
       - name: copy signed installer
         id: copy_signed_binary
+        if: env.IF_CODESIGN == 'true'
         run: |
           cp signed-artifacts/texstudio-win-qt6-${{ steps.package.outputs.VERSION_NAME }}.exe texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-qt6-signed.exe
     
 
       - name: Upload signed installer to GitHub Artifacts
         id: upload-artifact-signed
-        if: github.event_name == 'push'
+        if: env.IF_CODESIGN == 'true' && github.event_name == 'push'
         uses: actions/upload-artifact@v4
         with:
           name: texstudio-win-qt6-signed-exe
@@ -157,7 +170,9 @@ jobs:
         with:
           name: release-win
           path: |
-            texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-qt6-signed.exe
+            ${{ env.IF_CODESIGN == 'true'
+                && format('texstudio-{0}-win-qt6-signed.exe', steps.package.outputs.GIT_VERSION)
+                || '' }}
             texstudio-${{ steps.package.outputs.GIT_VERSION }}-win-portable-qt6.zip
 
 ###################################
@@ -261,8 +276,8 @@ jobs:
         wget https://github.com/sunderme/homebrew-qt6-modules/releases/download/${{ env.OSX_QT_VERSION }}/QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin.tar.xz
         sudo tar xvf ./QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin.tar.xz -C /usr/local --strip-components=1
         rm QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin.tar.xz
-        brew install cairo fontconfig freetype gettext jpeg libpng libtiff little-cms2 openjpeg
-        brew install ninja pkg-config
+        brew install --quiet cairo fontconfig freetype gettext jpeg libpng libtiff little-cms2 openjpeg
+        brew install --quiet ninja pkg-config
 
     - name: Configure
       run: |
@@ -356,8 +371,8 @@ jobs:
         wget https://github.com/sunderme/homebrew-qt6-modules/releases/download/${{ env.OSX_QT_VERSION }}/QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin-M1.tar.xz
         sudo tar xvf ./QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin-M1.tar.xz -C /usr/local --strip-components=1
         rm QuaZip-${{ env.OSX_QUAZIP_VERSION }}-Darwin-M1.tar.xz
-        brew install cairo fontconfig freetype gettext jpeg libpng libtiff little-cms2 openjpeg
-        brew install ninja pkg-config
+        brew install --quiet cairo fontconfig freetype gettext jpeg libpng libtiff little-cms2 openjpeg
+        brew install --quiet ninja pkg-config
 
     - name: Configure
       run: |

CMakeLists.txt

@@ -198,14 +198,16 @@ else()
 		endif()
 	else()
                 message(STATUS "Using internal QuaZIP and internal zlib")
-                set(ZLIB_BUILD_EXAMPLES OFF)
-                set(SKIP_INSTALL_LIBRARIES ON)
-                add_subdirectory(src/zlib-1.3.1)
-                set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1)
-                if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-                    set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1/libzlibd.dll)
-                else()
-                    set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1/libzlib.dll)
+                if(WIN32)
+                    set(ZLIB_BUILD_EXAMPLES OFF)
+                    set(SKIP_INSTALL_LIBRARIES ON)
+                    add_subdirectory(src/zlib-1.3.1)
+                    set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1)
+                    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+                        set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1/libzlibd.dll)
+                    else()
+                        set(ZLIB_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/src/zlib-1.3.1/libzlib.dll)
+                    endif()
                 endif()
 		set(BUILD_SHARED_LIBS OFF)
   		set(QUAZIP_INSTALL OFF)

completion.qrc

@@ -338,6 +338,7 @@
 <file>completion/bfhletter.cwl</file>
 <file>completion/bfhmodule.cwl</file>
 <file>completion/bguq.cwl</file>
+<file>completion/bib2qr.cwl</file>
 <file>completion/bibcop.cwl</file>
 <file>completion/bibentry.cwl</file>
 <file>completion/biblatex2bibitem.cwl</file>
@@ -1411,6 +1412,7 @@
 <file>completion/eqexpl.cwl</file>
 <file>completion/eq-fetchbbl.cwl</file>
 <file>completion/eqlist.cwl</file>
+<file>completion/eqnalign.cwl</file>
 <file>completion/eqname.cwl</file>
 <file>completion/eqnarray.cwl</file>
 <file>completion/eqnnumwarn.cwl</file>
@@ -1548,6 +1550,7 @@
 <file>completion/filemod.cwl</file>
 <file>completion/filemod-expmin.cwl</file>
 <file>completion/filesdo.cwl</file>
+<file>completion/fillwith.cwl</file>
 <file>completion/finstrut.cwl</file>
 <file>completion/firamath-otf.cwl</file>
 <file>completion/FiraMono.cwl</file>
@@ -1791,6 +1794,7 @@
 <file>completion/hangulfontset.cwl</file>
 <file>completion/hanjacnt.cwl</file>
 <file>completion/hanzibox.cwl</file>
+<file>completion/har2nat.cwl</file>
 <file>completion/hardwrap.cwl</file>
 <file>completion/harmony.cwl</file>
 <file>completion/harpoon.cwl</file>
@@ -1875,6 +1879,7 @@
 <file>completion/hyperbar.cwl</file>
 <file>completion/hyperref.cwl</file>
 <file>completion/hyperxmp.cwl</file>
+<file>completion/hypgotoe.cwl</file>
 <file>completion/hyphenat.cwl</file>
 <file>completion/hyphsubst.cwl</file>
 <file>completion/ibarra.cwl</file>
@@ -2385,6 +2390,7 @@
 <file>completion/metre.cwl</file>
 <file>completion/metrix.cwl</file>
 <file>completion/metsymb.cwl</file>
+<file>completion/mfb-oldstyle.cwl</file>
 <file>completion/mfirstuc.cwl</file>
 <file>completion/mflogo.cwl</file>
 <file>completion/mfpic4ode.cwl</file>
@@ -2860,6 +2866,7 @@
 <file>completion/polymers.cwl</file>
 <file>completion/polynom.cwl</file>
 <file>completion/polynomial.cwl</file>
+<file>completion/polyomino.cwl</file>
 <file>completion/polytable.cwl</file>
 <file>completion/poormanlog.cwl</file>
 <file>completion/popupmenu.cwl</file>
@@ -3287,6 +3294,7 @@
 <file>completion/setspaceenhanced.cwl</file>
 <file>completion/settobox.cwl</file>
 <file>completion/sf298.cwl</file>
+<file>completion/sfmath.cwl</file>
 <file>completion/sgame.cwl</file>
 <file>completion/sgamevar.cwl</file>
 <file>completion/shadethm.cwl</file>
@@ -3434,6 +3442,7 @@
 <file>completion/subdepth.cwl</file>
 <file>completion/subdocs.cwl</file>
 <file>completion/subeqn.cwl</file>
+<file>completion/subeqnarray.cwl</file>
 <file>completion/subfig.cwl</file>
 <file>completion/subfigmat.cwl</file>
 <file>completion/subfigure.cwl</file>

completion/bib2qr.cwl

@@ -0,0 +1,22 @@
+# bib2qr package
+# Matthew Bertucci 2024/08/01 for v0.2
+
+#include:biblatex
+#include:ifthen
+#include:qrcode
+#include:xstring
+
+#keyvals:\usepackage/bib2qr#c
+doiurlbase=%<string%>
+qrdelimiter=%<sep code%>
+qrversion=%<version%>
+qrwidth=##L
+#endkeyvals
+
+\qrcite{bibid}#C
+\qrfullcite{bibid}#C
+\qrfullcite[option%keyvals]{bibid}#C
+
+#keyvals:\qrfullcite
+noindent
+#endkeyvals

completion/citation-style-language.cwl

@@ -1,5 +1,5 @@
 # citation-style-language package
-# Matthew Bertucci 2024/06/11 for v0.5.0
+# Matthew Bertucci 2024/08/02 for v0.6.0
 
 #include:filehook
 #include:url
@@ -9,7 +9,9 @@
 #keyvals:\cslsetup,\usepackage/citation-style-language#c
 regression-test#true,false
 style=#american-chemical-society,american-medical-association,american-political-science-association,american-sociological-association,apa,chicago-author-date,chicago-fullnote-bibliography,chicago-note-bibliography,elsevier-harvard,harvard-cite-them-right,ieee,modern-humanities-research-association,modern-language-association,nature,vancouver
+bib-resource=%<resource%>
 locale=%<language code%>
+ref-section=#none,part,chapter,chapter+,section,section+,subsection,subsection+
 backref=#true,page,section,false
 bib-font=%<font commands%>
 bib-entry-page-break#true,false
@@ -90,29 +92,43 @@ heading=%<text%>
 title=%<text%>
 prenote=%<text%>
 postnote=%<text%>
-type=
-nottype=
-keyword=
-notkeyword=
-category=
-notcategory=
+type=%<entry type%>
+nottype=%<entry type%>
+keyword=%<keyword%>
+notkeyword=%<keyword%>
+category=%<category%>
+notcategory=%<category%>
 #endkeyvals
 
-\printbibheading
-\printbibheading[options%keyvals]
+\begin{refsection}
+\begin{refsection}[options%keyvals]
+\end{refsection}
+\newrefsection
+\newrefsection[options%keyvals]
+\endrefsection
 
-#keyvals:\printbibheading
-heading=%<text%>
-title=%<text%>
+#keyvals:\begin{refsection},\newrefsection
+style=%<style id%>
+bib-resource=%<resource%>
+locale=%<language code%>
 #endkeyvals
 
+\defbibheading{name}{code}#*
+\defbibheading{name}[title%text]{code}#*
+
 # not documented
-\addtocategory{category}{keys%plain}#*
+\addtocategory{category}{keys%plain}#S
 \backref{arg}#S
 \cslcitation{arg1}{arg2}#S
 \cslcite{arg1}{arg2}#S
-\DeclareBibliographyCategory{category}#*
-\defbibenvironment{name}{begdef}{enddef}{item code}#*
-\defbibheading{name}[title%text]{code}#*
-\defbibheading{name}{code}#*
-\defbibnote{name}{text}#*
+\csloptions{arg1}{arg2}#S
+\cslundefinedcite{arg}#S
+\DeclareBibliographyCategory{category}#S
+\defbibenvironment{name}{begdef}{enddef}{item code}#S
+\defbibnote{name}{text}#S
+\printbibheading#S
+\printbibheading[options%keyvals]#S
+#keyvals:\printbibheading
+heading=%<text%>
+title=%<text%>
+#endkeyvals

completion/class-asmeconf.cwl

@@ -1,5 +1,5 @@
 # asmeconf class
-# Matthew Bertucci 2024/02/07 for v1.37
+# Matthew Bertucci 2024/08/02 for v1.38
 
 #include:etoolbox
 #include:ifthen
@@ -2026,7 +2026,6 @@ SuppressWarning#true,false
 \JointFirstAuthor
 \keywordname#*
 \keywords{keywords}
-\LogNote{message%text}#*
 \MakeTitlePage#*
 \MyColorOption#*
 \nomenwidth#*

completion/eqnalign.cwl

@@ -0,0 +1,9 @@
+# eqnalign package
+# Matthew Bertucci for v1.0a
+
+#include:amsmath
+
+\begin{EQNarray}#S\math,array
+\end{EQNarray}#S
+\begin{EQNarray*}#S\math,array
+\end{EQNarray*}#S

completion/fancybox.cwl

@@ -74,6 +74,8 @@ b
 \end{LandScape}#*
 \begin{Landscape}{paperwidth%l}{paperheight%l}{cmd}#*
 \end{Landscape}#*
+\begin{Landscape*}{paperwidth%l}{paperheight%l}{cmd}#*
+\end{Landscape*}#*
 \LandScape{cmd}#*
 \Landscape{paperwidth%l}{paperheight%l}{cmd}#*
 \Landscape*{paperwidth%l}{paperheight%l}{cmd}#*

completion/fdsymbol.cwl

@@ -44,7 +44,7 @@ opstyle=#serif,sans
 \arceq#m
 \Assert#*m
 \assert#m
-\awint,#m
+\awint#m
 \backcong#m
 \backneg#m
 \backprime#m
@@ -74,7 +74,7 @@ opstyle=#serif,sans
 \bigcurlyvee#m
 \bigcurlywedge#m
 \bigdoublevee#m
-\bigdoublewedge,#m
+\bigdoublewedge#m
 \bigoast#m
 \bigplus#m
 \bigsqcap#m

completion/fillwith.cwl

@@ -0,0 +1,39 @@
+# fillwith package
+# Matthew Bertucci 2024/08/13 for v0.3
+
+#include:svn-prov
+#include:xcolor
+
+\fillwith
+\fillwith[options%keyvals]
+\fillwith*
+\fillwith*[options%keyvals]
+\fillwithrules
+\fillwithrules[options%keyvals]
+\fillwithrules*
+\fillwithrules*[options%keyvals]
+\fillwithdottedlines
+\fillwithdottedlines[options%keyvals]
+\fillwithdottedlines*
+\fillwithdottedlines*[options%keyvals]
+\fillwithnolines
+\fillwithnolines[options%keyvals]
+\fillwithnolines*
+\fillwithnolines*[options%keyvals]
+\fillwithset{options%keyvals}
+
+#keyvals:\fillwith#c,\fillwith*#c,\fillwithrules#c,\fillwithrules*#c,\fillwithdottedlines#c,\fillwithdottedlines*#c,\fillwithnolines#c,\fillwithnolines*#c,\usepackage/fillwith#c,\fillwithset#c
+color=#%color
+dottedcolor=#%color
+#endkeyvals
+
+#keyvals:\fillwith#c,\fillwith*#c,\fillwithrules#c,\fillwithrules*#c,\fillwithdottedlines#c,\fillwithdottedlines*#c,\fillwithnolines#c,\fillwithnolines*#c,\fillwithset#c
+cont#true,false
+fillwith ht=%<number%>
+goal ht=##L
+no font=%<font commands%>
+#endkeyvals
+
+#keyvals:\fillwith#c,\fillwith*#c,\fillwithset#c
+style=#rule,dots,line,lines,rules
+#endkeyvals