Skip to content

Commit

Permalink
Merge branch 'master' of github.com:texstudio-org/texstudio
Browse files Browse the repository at this point in the history
  • Loading branch information
sunderme committed Apr 17, 2024
2 parents 9945ff4 + f688908 commit a8db3ff
Show file tree
Hide file tree
Showing 19 changed files with 152 additions and 40 deletions.
3 changes: 3 additions & 0 deletions completion.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -1389,6 +1389,7 @@
<file>completion/envmath.cwl</file>
<file>completion/eolang.cwl</file>
<file>completion/eolgrab.cwl</file>
<file>completion/epcqrcode.cwl</file>
<file>completion/epic.cwl</file>
<file>completion/epigrafica.cwl</file>
<file>completion/epigraph.cwl</file>
Expand Down Expand Up @@ -1972,6 +1973,7 @@
<file>completion/jslectureplanner.cwl</file>
<file>completion/jslogo.cwl</file>
<file>completion/jsmembertable.cwl</file>
<file>completion/jsonparse.cwl</file>
<file>completion/jsverb.cwl</file>
<file>completion/jumplines.cwl</file>
<file>completion/junicode.cwl</file>
Expand Down Expand Up @@ -2167,6 +2169,7 @@
<file>completion/lplfitch.cwl</file>
<file>completion/lsabon.cwl</file>
<file>completion/lscape.cwl</file>
<file>completion/lscapeenhanced.cwl</file>
<file>completion/lstautogobble.cwl</file>
<file>completion/lstbayes.cwl</file>
<file>completion/lstdoc.cwl</file>
Expand Down
5 changes: 3 additions & 2 deletions completion/biblatex-chicago.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# biblatex-chicago package
# Matthew Bertucci 2022/07/03 for v3.18
# Matthew Bertucci 2024/04/16 for v3.20

#include:etoolbox
#include:nameref
Expand Down Expand Up @@ -32,6 +32,7 @@ sortupper#true,false
sortlocale=
sortcites#true,false
sortsets#true,false
pluralothers#true,false
maxnames=%<integer%>
minnames=%<integer%>
maxbibnames=%<integer%>
Expand Down Expand Up @@ -138,7 +139,7 @@ uniquetitle#true,false
uniquebaretitle#true,false
uniquework#true,false
uniqueprimaryauthor#true,false
uniquename=#true,false,init,full,allinit,allfull,mininit,minfull
uniquename=#true,false,init,full,allinit,allfull,mininit,minfull,minyearinit,minyearfull
uniquelist=#true,false,minyear
nohashothers#true,false
nosortothers#true,false
Expand Down
2 changes: 1 addition & 1 deletion completion/biblatex.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ notetype=#foot+end,footonly,endonly
hyperref=#true,false,auto,manual
backref#true,false
backrefstyle=#none,three,two,two+,three+,all+
backrefsetstyle=#=setonly,memonly,setormem,setandmem,memandset,setplusmem
backrefsetstyle=#setonly,memonly,setormem,setandmem,memandset,setplusmem
backreffloats#true,false
indexing=#true,false,cite,bib
loadfiles#true,false
Expand Down
8 changes: 5 additions & 3 deletions completion/class-acmart.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# acmart class
# Matthew Bertucci 2023/11/10 for v2.00
# Matthew Bertucci 2024/04/14 for v2.06

#include:xkeyval
#include:xstring
Expand Down Expand Up @@ -228,10 +228,8 @@ TWEB
\position{position}
\institution{institution}
\department{department}
\streetaddress{address}
\city{city}
\state{state}
\postcode{postcode}
\country{country}
\authorsaddresses{contact addresses}
\titlenote{text}
Expand Down Expand Up @@ -453,6 +451,10 @@ nonamebreak=
\begin{translatedabstract}{language}#*
\end{translatedabstract}#*

# deprecated
\streetaddress{address}#S
\postcode{postcode}#S

# common language options
#ifOption:language=english
#include:babel
Expand Down
7 changes: 5 additions & 2 deletions completion/class-bithesis.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# bithesis class
# Matthew Bertucci 2024/03/25 for v3.7.1
# Matthew Bertucci 2024/04/11 for v3.7.3

#include:l3keys2e
#include:class-ctexbook
Expand Down Expand Up @@ -30,7 +30,6 @@
#include:listings
#include:enumitem
#include:fmtcount
#include:stmaryrd
#include:environ

#keyvals:\documentclass/bithesis#c
Expand Down Expand Up @@ -106,6 +105,9 @@ style/mathFont=#asana,bonum,cm,concrete,dejavu,erewhon,euler,fira,garamond,gfsne
style/windowsSimSunFakeBold#true,false
style/unicodeMathOptions=%<任意选项%>
style/hyphen#true,false
style/mathAboveDisplaySkip=##L
style/mathBelowDisplaySkip=##L
style/betterTimesNewRoman#true,false
TOC={%<键值列表%>}
TOC/abstract#true,false
TOC/abstractEn#true,false
Expand All @@ -124,6 +126,7 @@ misc/arialFont=%<字符串%>
misc/tabularFontSize=%<其他字号%>
misc/autoref={%<键值列表%>}
misc/hideLinks#true,false
misc/floatSeparation=%<实数%>
const={%<键值列表%>}
const/autoref={%<键值列表%>}
const/style/substituteSymbol=%<字符串%>
Expand Down
6 changes: 4 additions & 2 deletions completion/class-bookcover.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# bookcover class
# Matthew Bertucci 12/30/2021 for v3.3
# Matthew Bertucci 2024/04/08 for v3.6

#include:kvoptions
#include:geometry
Expand All @@ -10,6 +10,7 @@
#include:fgruler

#keyvals:\documentclass/bookcover#c
cover=#default,a0,a1,a2,a3,a4,a5,a6,b0,b1,b2,b3,b4,b5,b6,c0,c1,c2,c3,c4,c5,c6,b0j,b1j,b2j,b3j,b4j,b5j,b6j,ansia,ansib,ansic,ansid,ansie,letter,legal,executive
coverheight=##L
coverwidth=##L
spinewidth=##L
Expand Down Expand Up @@ -158,6 +159,7 @@ reversemarginpar#true,false

\begin{bookcoverdescription}
\end{bookcoverdescription}
\showbookcoverparameters

#ifOption:trimmed
\bookcovertrimmedpart{trimmed part}
Expand Down Expand Up @@ -199,4 +201,4 @@ trimmingcolor=#%color
\makebookcover#*

\bookcover#S
\endbookcover#S
\endbookcover#S
5 changes: 4 additions & 1 deletion completion/class-ltugboat.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ltugboat class
# Matthew Bertucci 2023/10/31 for v2.31
# Matthew Bertucci 2024/04/16 for v2.32

#include:mflogo
#include:gettitlestring
Expand Down Expand Up @@ -420,6 +420,8 @@ runningoff
\tubomitdoioptiontrue#*
\tubraggedfoot#*
\tubreflect{text}#*
\tubruninglue#*
\tubruninsecfmt#*
\tubrunningauthor#*
\tubsecfmt#*
\tubsechook#*
Expand Down Expand Up @@ -472,5 +474,6 @@ runningoff
\XSL
\XSLFO
\XSLT
\YAML
\ylap{text}
\zlap{text}
5 changes: 2 additions & 3 deletions completion/class-thesis-ekf.cwl
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# thesis-ekf class
# Matthew Bertucci 2022/06/07 for v4.2
# Matthew Bertucci 2024/04/13 for v4.3

#include:kvoptions
#include:class-report
#include:iftex
#include:cmap
#include:setspace
#include:hyperref
#include:geometry
Expand Down Expand Up @@ -75,4 +74,4 @@ datesep=%<separator%>
\institute{institute%text}
\logo{kép vagy szöveg}
\supervisor{name}
\supervisorcaption{text}
\supervisorcaption{text}
19 changes: 19 additions & 0 deletions completion/epcqrcode.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# epcqrcode package
# Matthew Bertucci 2024/04/11 for v1.0

#include:qrcode
#include:xstring
#include:calculator

\epcqr{keyvals}

#keyvals:\epcqr
bic=%<BIC%>
name=%<text%>
iban=%<IBAN%>
amount=%<number%>
reason=%<text%>
ref=%<text%>
text=%<text%>
information=%<text%>
#endkeyvals
12 changes: 7 additions & 5 deletions completion/fancyqr.cwl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# fancyqr package
# Matthew Bertucci 2022/08/20 for v1.1
# Matthew Bertucci 2024/04/13 for v2.0

#include:tikz
#include:pict2e
#include:qrcode

\fancyqr{URL}#U
Expand All @@ -22,6 +22,9 @@ left color=#%color
r color=#%color
right color=#%color
gradient angle=%<degrees%>
random color=%<colors%>
width=##L
size=##L
# from qrcode
height=##L
level=#L,M,Q,H
Expand All @@ -46,17 +49,16 @@ flat
frame
blobs
glitch
swift
dots
default
#endkeyvals

\FancyLoadDefault
\FancyQrLoadDefault

# not documented
\FancyQrColor{arg}#S
\filename#S
\GetPattern#S
\gradient#S
\newpattern#S
\qrm#S
\qrm#S
5 changes: 3 additions & 2 deletions completion/gitinfo-lua.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# gitinfo-lua package
# Matthew Bertucci 2023/11/11 for v1.0.0
# Matthew Bertucci 2024/04/12 for v1.1.0

#include:luacode
#include:pgfopts
Expand All @@ -9,6 +9,7 @@ contrib
alpha
authors
titlepage
rootdir
#endkeyvals

\gitdirectory{path%definition}
Expand All @@ -29,4 +30,4 @@ titlepage
\forgittag[format]{csname}
\forgittagseq{csname}
\gittag{csname}{tag}
\gittag[format]{csname}{tag}
\gittag[format]{csname}{tag}
30 changes: 20 additions & 10 deletions completion/hulipsum.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# hulipsum package
# Matthew Bertucci 9/22/2021 for v1.1
# Matthew Bertucci 2024/04/08 for v1.2

\hulipsum
\hulipsum[num]
Expand All @@ -8,12 +8,22 @@
\hulipsum*[num]
\hulipsum*[%<num%>-%<num%>]

\sethulipsumdefault{num}#*
\sethulipsumdefault{%<num%>-%<num%>}#*
\hulipsumsave[num]#*
\hulipsumsave[%<num%>-%<num%>]#*
\hulipsumsave*[num]#*
\hulipsumsave*[%<num%>-%<num%>]#*
\hulipsumexp#*
\hulipsumdocument#*
\hulipsumdocument[part]#*
\sethulipsumdefault{num}
\sethulipsumdefault{%<num%>-%<num%>}
\hulipsumsave[num]
\hulipsumsave[%<num%>-%<num%>]
\hulipsumsave*[num]
\hulipsumsave*[%<num%>-%<num%>]
\hulipsumexp

\hulipsumdocument
\hulipsumdocument[options%keyvals]

#keyvals:\hulipsumdocument
maketitle#true,false
tableofcontents#true,false
part#true,false
abstract#true,false
math#true,false
bibliography#true,false
#endkeyvals
27 changes: 27 additions & 0 deletions completion/jsonparse.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# jsonparse package
# Matthew Bertucci 2024/04/11 for v0.5.6

#keyvals:\usepackage/jsonparse#c
debug
#endkeyvals

\JSONParse{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
13 changes: 13 additions & 0 deletions completion/lscapeenhanced.cwl
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# lscapeenhanced package
# Matthew Bertucci 2024/04/16 for v1.0

#include:lscape
#include:xpatch

#keyvals:\usepackage/lscapeenhanced#c
pdflscape
#endkeyvals

#ifOption:pdflscape
#include:pdflscape
#endif
3 changes: 2 additions & 1 deletion completion/ltugcomn.cwl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ltugcomn package
# Matthew Bertucci 2023/10/31 for v2.31
# Matthew Bertucci 2024/04/16 for v2.32

#include:mflogo

Expand Down Expand Up @@ -307,5 +307,6 @@
\XSL
\XSLFO
\XSLT
\YAML
\ylap{text}
\zlap{text}
3 changes: 1 addition & 2 deletions completion/pdflscape.cwl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# pdflscape package
# Matthew Bertucci 8/29/2021 for v0.12
# Matthew Bertucci 2024/04/16 for v0.13

#include:iftex
#include:lscape
#include:atbegshi
Loading

0 comments on commit a8db3ff

Please sign in to comment.