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

texstudio-org · Nov 2, 2024 · 7be76b5 · 7be76b5
2 parents 6b7a5b6 + d821cd2
commit 7be76b5
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 140 deletions.
diff --git a/completion/latex-dev.cwl b/completion/latex-dev.cwl
@@ -1,7 +1,7 @@
 # latex mode: LaTeX commands (package level)
 # dani/2006-02-18
 # muzimuzhi/8 Jul 2019
-# Matthew Bertucci 2024/06/01 release
+# Matthew Bertucci 2024/11/01 release
 
 # commands with big Letters and others
 \ActivateGenericHook{hook}#*
@@ -179,13 +179,19 @@
 \IfFormatAtLeastF{date}{false code}#*
 \IfFormatAtLeastT{date}{true code}#*
 \IfFormatAtLeastTF{date}{true code}{false code}#*
+\IfHookEmptyF{hook}{false code}#*
+\IfHookEmptyT{hook}{true code}#*
 \IfHookEmptyTF{hook}{true code}{false code}#*
 \IfInstanceExistsF{type}{instance}{true}{false}#*
 \IfInstanceExistsT{type}{instance}{true}{false}#*
 \IfInstanceExistsTF{type}{instance}{true}{false}#*
 \IfLabelExistsF{label}{false code}#*
 \IfLabelExistsT{label}{true code}#*
 \IfLabelExistsTF{label}{true code}{false code}#*
+\IfMarksEqualF[region]{class%plain}{pos1}{pos2}{false code}#*
+\IfMarksEqualF{class%plain}{pos1}{pos2}{false code}#*
+\IfMarksEqualT[region]{class%plain}{pos1}{pos2}{true code}#*
+\IfMarksEqualT{class%plain}{pos1}{pos2}{true code}#*
 \IfMarksEqualTF[region]{class%plain}{pos1}{pos2}{true code}{false code}#*
 \IfMarksEqualTF{class%plain}{pos1}{pos2}{true code}{false code}#*
 \IfNoValueF{arg}{ValueCode}
@@ -204,6 +210,8 @@
 \IfPropertyExistsF{property}{false code}#*
 \IfPropertyExistsT{property}{true code}#*
 \IfPropertyExistsTF{property}{true code}{false code}#*
+\IfPropertyRecordedF{label}{property}{false code}#*
+\IfPropertyRecordedT{label}{property}{true code}#*
 \IfPropertyRecordedTF{label}{property}{true code}{false code}#*
 \IfTargetDateBefore{date}{before code}{after code}#*
 \IfValueF{arg}{-NoValue-Code}#*
@@ -343,6 +351,7 @@
 \TopMark{class%plain}#*
 \TrimSpaces#*
 \UndeclareTextCommand{cmd}{encoding}#*
+\UseExpandableTaggingSocket{socket}#*
 \UseHook{hook}#*
 \UseHookWithArguments{%<hook%>}{%<number%>}{%<arg1%>}%<{arg2}...%>#*
 \UseInstance{type}{instance}#*

diff --git a/completion/latex-document.cwl b/completion/latex-document.cwl
@@ -3,10 +3,9 @@
 # tbraun/2006-08-03 removed dup inserted by me ...
 # tbraun/2007-02-24 added left/right variants
 # dbitouze/2015-02-21 obsolete font style commands made unusual
-# Matthew Bertucci 2024/06/01 release
+# Matthew Bertucci 2024/11/01 release
 
 #include:latex-dev
-#include:textcomp
 
 \abstractname#*
 \addcontentsline{ext}{type}{entry%text}#*
@@ -688,3 +687,140 @@ leqno
 fleqn
 openbib
 #endkeyvals
+
+# commands formerly defined in textcomp, now part of format
+\capitalacute{A}
+\capitalbreve{A}
+\capitalcaron{A}
+\capitalcedilla{A}
+\capitalcircumflex{A}
+\capitaldieresis{A}
+\capitaldotaccent{A}
+\capitalgrave{A}
+\capitalhungarumlaut{A}
+\capitalmacron{A}
+\capitalnewtie{A}
+\capitalogonek{A}
+\capitalring{A}
+\capitaltie{A}
+\capitaltilde{A}
+\newtie{A}
+\textacutedbl
+\textascendercompwordmark
+\textasciiacute
+\textasciibreve
+\textasciicaron
+\textasciidieresis
+\textasciigrave
+\textasciimacron
+\textasteriskcentered
+\textbaht
+\textbardbl
+\textbigcircle
+\textblank
+\textborn
+\textbrokenbar
+\textbullet
+\textcapitalcompwordmark
+\textcelsius
+\textcent
+\textcentoldstyle
+\textcircled{text}
+\textcircledP
+\textcolonmonetary
+\textcopyleft
+\textcopyright
+\textcurrency
+\textdagger
+\textdaggerdbl
+\textdblhyphen
+\textdblhyphenchar
+\textdegree
+\textdied
+\textdiscount
+\textdiv
+\textdivorced
+\textdollar
+\textdollaroldstyle
+\textdong
+\textdownarrow
+\texteightoldstyle
+\textestimated
+\texteuro
+\textfiveoldstyle
+\textflorin
+\textfouroldstyle
+\textfractionsolidus
+\textgravedbl
+\textguarani
+\textinterrobang
+\textinterrobangdown
+\textlangle
+\textlbrackdbl
+\textleaf
+\textleftarrow
+\textlegacyasteriskcentered
+\textlegacybardbl
+\textlegacybullet
+\textlegacydagger
+\textlegacydaggerdbl
+\textlegacyparagraph
+\textlegacyperiodcentered
+\textlegacysection
+\textlira
+\textlnot
+\textlquill
+\textmarried
+\textmho
+\textminus
+\textmu
+\textmusicalnote
+\textnaira
+\textnineoldstyle
+\textnumero
+\textohm
+\textonehalf
+\textoneoldstyle
+\textonequarter
+\textonesuperior
+\textopenbullet
+\textordfeminine
+\textordmasculine
+\textparagraph
+\textperiodcentered
+\textpertenthousand
+\textperthousand
+\textpeso
+\textpilcrow
+\textpm
+\textquotesingle
+\textquotestraightbase
+\textquotestraightdblbase
+\textrangle
+\textrbrackdbl
+\textrecipe
+\textreferencemark
+\textregistered
+\textrightarrow
+\textrquill
+\textsection
+\textservicemark
+\textsevenoldstyle
+\textsixoldstyle
+\textsterling
+\textsurd
+\textthreeoldstyle
+\textthreequarters
+\textthreequartersemdash
+\textthreesuperior
+\texttildelow
+\texttimes
+\texttrademark
+\texttwelveudash
+\texttwooldstyle
+\texttwosuperior
+\textuparrow
+\textwon
+\textyen
+\textzerooldstyle
+\t{A}
diff --git a/completion/longtable.cwl b/completion/longtable.cwl
@@ -1,5 +1,6 @@
 # mode: longtable.sty
 # dani/2006-02-18
+# updated 2024/10/31 for v4.22
 
 #keyvals:\usepackage/longtable#c
 errorshow
@@ -19,6 +20,7 @@ final
 \end{longtable}
 \LTchunksize
 \LTcapwidth
+\LTcaptype
 \LTleft
 \LTpost
 \LTpre

diff --git a/completion/textcomp.cwl b/completion/textcomp.cwl
@@ -1,6 +1,7 @@
 # textcomp package v2.0n
 # tbraun 04/27/2006
 # muzimuzhi 13 Mar 2020
+# Matthew Bertucci 31 Oct 2024, commands moved to latex-document.cwl
 
 #keyvals:\usepackage/textcomp#c
 full
@@ -12,140 +13,4 @@ warn
 info
 quiet
 force
-#endkeyvals
-
-\capitalacute{A}
-\capitalbreve{A}
-\capitalcaron{A}
-\capitalcedilla{A}
-\capitalcircumflex{A}
-\capitaldieresis{A}
-\capitaldotaccent{A}
-\capitalgrave{A}
-\capitalhungarumlaut{A}
-\capitalmacron{A}
-\capitalnewtie{A}
-\capitalogonek{A}
-\capitalring{A}
-\capitaltie{A}
-\capitaltilde{A}
-\newtie{A}
-\textacutedbl
-\textascendercompwordmark
-\textasciiacute
-\textasciibreve
-\textasciicaron
-\textasciidieresis
-\textasciigrave
-\textasciimacron
-\textasteriskcentered
-\textbaht
-\textbardbl
-\textbigcircle
-\textblank
-\textborn
-\textbrokenbar
-\textbullet
-\textcapitalcompwordmark
-\textcelsius
-\textcent
-\textcentoldstyle
-\textcircled{text}
-\textcircledP
-\textcolonmonetary
-\textcopyleft
-\textcopyright
-\textcurrency
-\textdagger
-\textdaggerdbl
-\textdblhyphen
-\textdblhyphenchar
-\textdegree
-\textdied
-\textdiscount
-\textdiv
-\textdivorced
-\textdollar
-\textdollaroldstyle
-\textdong
-\textdownarrow
-\texteightoldstyle
-\textestimated
-\texteuro
-\textfiveoldstyle
-\textflorin
-\textfouroldstyle
-\textfractionsolidus
-\textgravedbl
-\textguarani
-\textinterrobang
-\textinterrobangdown
-\textlangle
-\textlbrackdbl
-\textleaf
-\textleftarrow
-\textlegacyasteriskcentered
-\textlegacybardbl
-\textlegacybullet
-\textlegacydagger
-\textlegacydaggerdbl
-\textlegacyparagraph
-\textlegacyperiodcentered
-\textlegacysection
-\textlira
-\textlnot
-\textlquill
-\textmarried
-\textmho
-\textminus
-\textmu
-\textmusicalnote
-\textnaira
-\textnineoldstyle
-\textnumero
-\textohm
-\textonehalf
-\textoneoldstyle
-\textonequarter
-\textonesuperior
-\textopenbullet
-\textordfeminine
-\textordmasculine
-\textparagraph
-\textperiodcentered
-\textpertenthousand
-\textperthousand
-\textpeso
-\textpilcrow
-\textpm
-\textquotesingle
-\textquotestraightbase
-\textquotestraightdblbase
-\textrangle
-\textrbrackdbl
-\textrecipe
-\textreferencemark
-\textregistered
-\textrightarrow
-\textrquill
-\textsection
-\textservicemark
-\textsevenoldstyle
-\textsixoldstyle
-\textsterling
-\textsurd
-\textthreeoldstyle
-\textthreequarters
-\textthreequartersemdash
-\textthreesuperior
-\texttildelow
-\texttimes
-\texttrademark
-\texttwelveudash
-\texttwooldstyle
-\texttwosuperior
-\textuparrow
-\textwon
-\textyen
-\textzerooldstyle
-\t{A}
+#endkeyvals