Merge remote-tracking branch 'upstream/master' into txsXP

octaeder · May 4, 2024 · 9e9d9b8 · 9e9d9b8
2 parents f12ab48 + 9971c78
commit 9e9d9b8
Show file tree

Hide file tree

Showing 38 changed files with 1,296 additions and 859 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -8,7 +8,7 @@ permissions:
 
 env:
   OSX_QT_VERSION: 6.7.0
-  OSX_POPPLER_VERSION: 24.04.0
+  OSX_POPPLER_VERSION: 24.05.0
   OSX_QUAZIP_VERSION: 1.4
 
 jobs:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+if(APPLE)
+set(CMAKE_CXX_STANDARD 20)
+else()
 set(CMAKE_CXX_STANDARD 17)
+endif()
 
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

diff --git a/completion.qrc b/completion.qrc
@@ -2303,6 +2303,7 @@
 <file>completion/mathenv.cwl</file>
 <file>completion/mathfixs.cwl</file>
 <file>completion/mathfont.cwl</file>
+<file>completion/mathgreeks.cwl</file>
 <file>completion/mathpartir.cwl</file>
 <file>completion/mathpazo.cwl</file>
 <file>completion/mathpi.cwl</file>
@@ -3160,6 +3161,7 @@
 <file>completion/RoueQuestions.cwl</file>
 <file>completion/roundbox.cwl</file>
 <file>completion/Royal.cwl</file>
+<file>completion/rpgicons.cwl</file>
 <file>completion/rsfso.cwl</file>
 <file>completion/rsphrase.cwl</file>
 <file>completion/rterface.cwl</file>
@@ -3701,6 +3703,7 @@
 <file>completion/tikzlibrarykarnaugh.cwl</file>
 <file>completion/tikzlibraryknots.cwl</file>
 <file>completion/tikzlibrarylindenmayersystems.cwl</file>
+<file>completion/tikzlibrarymarmots.cwl</file>
 <file>completion/tikzlibrarymath.cwl</file>
 <file>completion/tikzlibrarymatrix.cwl</file>
 <file>completion/tikzlibrarymatrix.skeleton.cwl</file>
@@ -3779,6 +3782,7 @@
 <file>completion/tikzlings-snowmen.cwl</file>
 <file>completion/tikzlings-squirrels.cwl</file>
 <file>completion/tikzlings-wolves.cwl</file>
+<file>completion/tikzmarmots.cwl</file>
 <file>completion/tikz-mirror-lens.cwl</file>
 <file>completion/tikz-network.cwl</file>
 <file>completion/tikz-opm.cwl</file>

diff --git a/completion/atkinson.cwl b/completion/atkinson.cwl
@@ -1,5 +1,5 @@
 # atkinson package
-# Matthew Bertucci 1/11/2022
+# Matthew Bertucci 2024/04/20
 
 #include:ifxetex
 #include:ifluatex
@@ -23,9 +23,6 @@ p
 \atkinsonlf#*
 \atkinsontlf#*
 
-\atkinsonLF{text}
-\atkinsonTLF{text}
-
 # from T1 option of fontenc
 \DH#n
 \NG#n

diff --git a/completion/babel.cwl b/completion/babel.cwl
@@ -1,6 +1,6 @@
 # babel.sty
 # available from ctan
-# tbraun 4.11.2008; Matthew Bertucci 2024/03/29 for v24.3
+# tbraun 4.11.2008; Matthew Bertucci 2024/04/20 for v24.4
 
 #keyvals:\usepackage/babel#c
 %<language%>
@@ -161,7 +161,7 @@ Alph=%<counter%>
 onchar=#ids,fonts,letters
 intraspace=%<base shrink stretch%>
 intrapenalty=%<penalty%>
-transforms=#transliteration.dad,digraphs.ligatures,hyphen.repeat,oneletter.nobreak,prehyphen.nobreak,punctuation.space,diaeresis.hyphen,transliteration.omega,sigma.final,transliteration.hk,punctuation.space,digraphs.hyphen,danda.nobreak,letters.noj,letters.uv,transliteration.iast,transliteration.gajica,kashida.plain
+transforms=#transliteration.dad,digraphs.ligatures,hyphen.repeat,oneletter.nobreak,prehyphen.nobreak,diaeresis.hyphen,transliteration.omega,sigma.final,transliteration.hk,punctuation.space,digraphs.hyphen,danda.nobreak,letters.noj,letters.uv,transliteration.iast,transliteration.gajica,kashida.plain
 justification=#kashida,elongated,unhyphenated,padding
 linebreaking=#kashida,elongated,unhyphenated,padding
 mapfont=
@@ -245,7 +245,6 @@ digraphs.ligatures
 hyphen.repeat
 oneletter.nobreak
 prehyphen.nobreak
-punctuation.space
 diaeresis.hyphen
 transliteration.omega
 sigma.final
@@ -372,6 +371,8 @@ select.encoding=#off
 \addto{cmd}{code}#S
 \AfterBabelCommands{code}#S
 \allowhyphens#S
+\BabelCJKGlue#S
+\BabelCJKSpace#S
 \BabelDated{arg}#S
 \BabelDatedd{arg}#S
 \BabelDateDot#S

diff --git a/completion/citation-style-language.cwl b/completion/citation-style-language.cwl
@@ -1,5 +1,5 @@
 # citation-style-language package
-# Matthew Bertucci 2024/03/12 for v0.4.8
+# Matthew Bertucci 2024/04/22 for v0.4.9
 
 #include:filehook
 #include:url
@@ -15,6 +15,7 @@ bib-font=%<font commands%>
 bib-entry-page-break#true,false
 bib-item-sep=%<<length> or <glue>%>
 bib-hang=##L
+bib-par-indent=##L
 prefix-separator=%<separator%>
 suffix-separator=%<separator%>
 #endkeyvals

diff --git a/completion/class-njuthesis.cwl b/completion/class-njuthesis.cwl
@@ -1,5 +1,5 @@
 # njuthesis class
-# Matthew Bertucci 2024/03/19 for v1.4.0
+# Matthew Bertucci 2024/04/22 for v1.4.1
 
 #include:xtemplate
 #include:class-ctexbook
@@ -33,7 +33,8 @@ decl-page#true,false
 oneside
 twoside
 draft
-anonymous#true,false
+anonymous
+anonymous-mode/no-nju#true,false
 biblatex#true,false
 cleveref#true,false
 ntheorem#true,false

diff --git a/completion/class-se2thesis.cwl b/completion/class-se2thesis.cwl
@@ -1,5 +1,5 @@
 # se2thesis class
-# Matthew Bertucci 2024/02/26 for v3.3.1
+# Matthew Bertucci 2024/04/20 for v3.4.0
 
 #include:graphicx
 #include:translations
@@ -15,7 +15,7 @@
 class=#scrreprt,scrbook
 paper=#a4,b5
 logofile={%<path-to-file%>}
-thesistype=#bachelor,bachelorproposal,master,masterproposal,phd,phdeng,phdproposal
+thesistype=#bachelor,bachelorproposal,master,masterproposal,phd,phdeng,phdphil,phdproposal
 colormode=#cmyk,rgb,bw
 #endkeyvals
 

diff --git a/completion/class-thesis-ekf.cwl b/completion/class-thesis-ekf.cwl
@@ -1,5 +1,5 @@
 # thesis-ekf class
-# Matthew Bertucci 2024/04/13 for v4.3
+# Matthew Bertucci 2024/04/18 for v4.5
 
 #include:kvoptions
 #include:class-report
@@ -9,7 +9,6 @@
 #include:geometry
 #include:lmodern
 #include:fixcmex
-#include:etoolbox
 #include:graphicx
 #include:upquote
 

diff --git a/completion/fontspec.cwl b/completion/fontspec.cwl
@@ -1,7 +1,7 @@
 # fontspec package
 # nja/17 July 2007 for fontspec v1.14
 # muzimuzhi/30 Aug 2019 for fontspec v2.7c
-# Matthew Bertucci 13 Feb 2024 for v2.9a
+# Matthew Bertucci 27 Apr 2024 for v2.9b
 # url: http://www.ctan.org/tex-archive/help/Catalogue/entries/fontspec.html
 
 #keyvals:\usepackage/fontspec#c
@@ -169,7 +169,7 @@ Kerning=#On,Off,Reset,Uppercase,ResetAll
 KpseOnly
 Language=%<language%>
 LetterSpace=%<number%>
-Letters=#SmallCaps,PetiteCaps,UppercaseSmallCaps,UppercasePetiteCaps,Unicase,ResetAll
+Letters=#SmallCaps,PetiteCaps,UppercaseSmallCaps,UppercasePetiteCaps,Unicase,Uppercase,Lowercase,ResetAll
 Ligatures=#Required,Common,Contextual,Rare,Discretionary,Historic,TeX
 LocalForms=#On,Off,Reset
 NFSSFamily=%<font family%>

diff --git a/completion/huaz.cwl b/completion/huaz.cwl
@@ -1,5 +1,5 @@
 # huaz package
-# Matthew Bertucci 2022/10/17 for v1.0
+# Matthew Bertucci 2024/04/30 for v2.0
 
 #include:xstring
 #include:refcount
@@ -17,15 +17,16 @@
 
 \azsaved
 \aznotshow
+\azseparator{kód}
 
 \aref{label}#r
 \aref*{label}#r
 \avref{label}#r
 \avref*{label}#r
 \aeqref{label}#r
-\aeqref*{label}#r
 \aveqref{label}#r
-\aveqref*{label}#r
+\arefeq{label}#r
+\avrefeq{label}#r
 \apageref{label}#r
 \apageref*{label}#r
 \avpageref{label}#r
@@ -36,28 +37,26 @@
 \Avref{label}#r
 \Avref*{label}#r
 \Aeqref{label}#r
-\Aeqref*{label}#r
 \Aveqref{label}#r
-\Aveqref*{label}#r
+\Arefeq{label}#r
+\Avrefeq{label}#r
 \Apageref{label}#r
 \Apageref*{label}#r
 \Avpageref{label}#r
 \Avpageref*{label}#r
 
 \acite{bibid}#C
 \acite[szöveg]{bibid}#C
-\acite*{bibid}#C
-\acite*[szöveg]{bibid}#C
 \avcite{bibid}#C
 \avcite[szöveg]{bibid}#C
-\avcite*{bibid}#C
-\avcite*[szöveg]{bibid}#C
 
 \Acite{bibid}#C
 \Acite[szöveg]{bibid}#C
-\Acite*{bibid}#C
-\Acite*[szöveg]{bibid}#C
 \Avcite{bibid}#C
 \Avcite[szöveg]{bibid}#C
-\Avcite*{bibid}#C
-\Avcite*[szöveg]{bibid}#C
+
+\huazignorecmd{parancs}
+\huazignorecmd[opció]{parancs}
+\huazrefcmd{parancs}
+\huazpagerefcmd{parancs}
+\huazdefcmd{átdefiniáló kód}
diff --git a/completion/jsonparse.cwl b/completion/jsonparse.cwl
@@ -1,27 +1,45 @@
 # jsonparse package
-# Matthew Bertucci 2024/04/11 for v0.5.6
+# Matthew Bertucci 2024/04/30 for v0.8.3
 
 #keyvals:\usepackage/jsonparse#c
 debug
+escape={%<list%>}
+replacement/backspace=%<string%>
+replacement/formfeed=%<string%>
+replacement/linefeed=%<string%>
+replacement/carriage return=%<string%>
+replacement/horizontal tab=%<string%>
 #endkeyvals
 
 \JSONParse{token variable%cmd}{JSON string}#d
+\JSONParse[file]{token variable%cmd}{JSON string}#d
 \JSONParseFromFile{token variable%cmd}{JSON file}#d
-\JSONParseGetValue{token variable}{key%plain}
-\JSONParseGetValue*{token variable}{key%plain}
-\JSONParseGetArrayValues{token variable}{key%plain}{string}
-\JSONParseGetArrayValues{token variable}{key%plain}[subkey]{string}
-\JSONParseGetArrayValues*{token variable}{key%plain}{string}
-\JSONParseGetArrayValues*{token variable}{key%plain}[subkey]{string}
-\JSONParseUseArrayValues{token variable}{key%plain}{command name}
-\JSONParseUseArrayValues{token variable}{key%plain}[subkey]{command name}
-\JSONParseUseArrayValues*{token variable}{key%plain}{command name}
-\JSONParseUseArrayValues*{token variable}{key%plain}[subkey]{command name}
-\JSONParseGetArrayCount{token variable}{key%plain}
-\JSONParseSetChildSeparator{string}
-\JSONParseSetArraySeparator{string}{string}
-\JSONParseSetTrueString{string}
-\JSONParseSetFalseString{string}
-\JSONParseSetNullString{string}
-\JSONParseSetArrayIndexZeroBased
-\JSONParseSetArrayIndexOneBased
+\JSONParseFromFile[file]{token variable%cmd}{JSON file}#d
+\JSONParseKeys{token variable}{token variable%cmd}#d
+\JSONParseValue{token variable}{key%plain}
+\JSONParseValue*{token variable}{key%plain}
+\JSONParseExpandableValue{token variable}{key%plain}
+\JSONParseArrayValues{token variable}{key%plain}{string}
+\JSONParseArrayValues{token variable}{key%plain}[subkey]{string}
+\JSONParseArrayValues*{token variable}{key%plain}{string}
+\JSONParseArrayValues*{token variable}{key%plain}[subkey]{string}
+\JSONParseArrayValuesMap{token variable}{key%plain}{command name}
+\JSONParseArrayValuesMap{token variable}{key%plain}[subkey]{command name}
+\JSONParseArrayValuesMap*{token variable}{key%plain}{command name}
+\JSONParseArrayValuesMap*{token variable}{key%plain}[subkey]{command name}
+\JSONParseArrayIndex
+\JSONParseArrayKey
+\JSONParseArrayValue
+\JSONParseArrayCount{token variable}{key%plain}
+
+\JSONParseSet{keyvals}
+
+#keyvals:\JSONParseSet
+separator/child=%<string%>
+separator/array left=%<string%>
+separator/array right=%<string%>
+replacement/true=%<string%>
+replacement/false=%<string%>
+replacement/null=%<string%>
+array index zero-based#true,false
+#endkeyvals
diff --git a/completion/luamplib.cwl b/completion/luamplib.cwl
@@ -1,5 +1,5 @@
 # luamplib package
-# Matthew Bertucci 3/28/2022 for v2.23.0
+# Matthew Bertucci 2024/05/01 for v2.29.0
 
 #include:luatex
 
@@ -11,6 +11,10 @@
 \endmplibcode#S
 \mplibforcehmode
 \mplibnoforcehmode
+\mpfig
+\mpfig*
+\endmpfig
+\mpfiginstancename#*
 \mpliblegacybehavior{choice%keyvals}
 \MPwidth
 \MPheight
@@ -53,20 +57,25 @@ metafun
 #endkeyvals
 
 # not documented
-\domplibcolor{color}{arg}#*
-\ltxdomplibcode{arg}#*
-\ltxdomplibcodeindeed{arg}#*
-\mplibdocancelnocache{arg}#*
-\mplibdocode{arg}#*
-\mplibdoeveryendmplib[instance name]{MetaPost code}#*
-\mplibdoeveryendmplib{MetaPost code}#*
-\mplibdoeverymplib{MetaPost code}#*
-\mplibdomakenocache{arg}#*
-\mplibputtextbox{arg}#*
-\mplibscratchbox#*
-\mplibsetupcatcodes#*
-\mplibstarttoPDF{llx}{lly}{urx}{ury}#*
-\mplibstoptoPDF#*
-\mplibtextext{font}{size}{text}{hskip}{raise}#*
-\mplibtmptoks{arg}#*
-\mplibtoPDF{pdfliteral}#*
+\domplibcolor{color}{arg}#S
+\ltxdomplibcode{arg}#S
+\ltxdomplibcodeindeed{arg}#S
+\mplibdocancelnocache{arg}#S
+\mplibdocode{arg}#S
+\mplibdoeveryendmplib[instance name]{MetaPost code}#S
+\mplibdoeveryendmplib{MetaPost code}#S
+\mplibdoeverymplib{MetaPost code}#S
+\mplibdomainmpfig#S
+\mplibdomakenocache{arg}#S
+\mplibdoprempfig#S
+\mplibmainmpfig#S
+\mplibmpfigbranch#S
+\mplibprempfig{arg}#S
+\mplibputtextbox{arg}#S
+\mplibscratchbox#S
+\mplibsetupcatcodes#S
+\mplibstarttoPDF{llx}{lly}{urx}{ury}#S
+\mplibstoptoPDF#S
+\mplibtextext{font}{size}{text}{hskip}{raise}#S
+\mplibtmptoks{arg}#S
+\mplibtoPDF{pdfliteral}#S