Skip to content

Commit a118117

Browse files
sundermesunderme
committed
Merge branch 'master' of github.com:texstudio-org/texstudio
2 parents dde308e + 93b4e67 commit a118117

20 files changed

+195
-56
lines changed

‎completion.qrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@
338338
<file>completion/bfhletter.cwl</file>
339339
<file>completion/bfhmodule.cwl</file>
340340
<file>completion/bguq.cwl</file>
341+
<file>completion/bib2qr.cwl</file>
341342
<file>completion/bibcop.cwl</file>
342343
<file>completion/bibentry.cwl</file>
343344
<file>completion/biblatex2bibitem.cwl</file>
@@ -2860,6 +2861,7 @@
28602861
<file>completion/polymers.cwl</file>
28612862
<file>completion/polynom.cwl</file>
28622863
<file>completion/polynomial.cwl</file>
2864+
<file>completion/polyomino.cwl</file>
28632865
<file>completion/polytable.cwl</file>
28642866
<file>completion/poormanlog.cwl</file>
28652867
<file>completion/popupmenu.cwl</file>
@@ -3287,6 +3289,7 @@
32873289
<file>completion/setspaceenhanced.cwl</file>
32883290
<file>completion/settobox.cwl</file>
32893291
<file>completion/sf298.cwl</file>
3292+
<file>completion/sfmath.cwl</file>
32903293
<file>completion/sgame.cwl</file>
32913294
<file>completion/sgamevar.cwl</file>
32923295
<file>completion/shadethm.cwl</file>

‎completion/bib2qr.cwl

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# bib2qr package
2+
# Matthew Bertucci 2024/08/01 for v0.2
3+
4+
#include:biblatex
5+
#include:ifthen
6+
#include:qrcode
7+
#include:xstring
8+
9+
#keyvals:\usepackage/bib2qr#c
10+
doiurlbase=%<string%>
11+
qrdelimiter=%<sep code%>
12+
qrversion=%<version%>
13+
qrwidth=##L
14+
#endkeyvals
15+
16+
\qrcite{bibid}#C
17+
\qrfullcite{bibid}#C
18+
\qrfullcite[option%keyvals]{bibid}#C
19+
20+
#keyvals:\qrfullcite
21+
noindent
22+
#endkeyvals

‎completion/citation-style-language.cwl

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# citation-style-language package
2-
# Matthew Bertucci 2024/06/11 for v0.5.0
2+
# Matthew Bertucci 2024/08/02 for v0.6.0
33

44
#include:filehook
55
#include:url
@@ -9,7 +9,9 @@
99
#keyvals:\cslsetup,\usepackage/citation-style-language#c
1010
regression-test#true,false
1111
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
12+
bib-resource=%<resource%>
1213
locale=%<language code%>
14+
ref-section=#none,part,chapter,chapter+,section,section+,subsection,subsection+
1315
backref=#true,page,section,false
1416
bib-font=%<font commands%>
1517
bib-entry-page-break#true,false
@@ -90,29 +92,43 @@ heading=%<text%>
9092
title=%<text%>
9193
prenote=%<text%>
9294
postnote=%<text%>
93-
type=
94-
nottype=
95-
keyword=
96-
notkeyword=
97-
category=
98-
notcategory=
95+
type=%<entry type%>
96+
nottype=%<entry type%>
97+
keyword=%<keyword%>
98+
notkeyword=%<keyword%>
99+
category=%<category%>
100+
notcategory=%<category%>
99101
#endkeyvals
100102

101-
\printbibheading
102-
\printbibheading[options%keyvals]
103+
\begin{refsection}
104+
\begin{refsection}[options%keyvals]
105+
\end{refsection}
106+
\newrefsection
107+
\newrefsection[options%keyvals]
108+
\endrefsection
103109

104-
#keyvals:\printbibheading
105-
heading=%<text%>
106-
title=%<text%>
110+
#keyvals:\begin{refsection},\newrefsection
111+
style=%<style id%>
112+
bib-resource=%<resource%>
113+
locale=%<language code%>
107114
#endkeyvals
108115

116+
\defbibheading{name}{code}#*
117+
\defbibheading{name}[title%text]{code}#*
118+
109119
# not documented
110-
\addtocategory{category}{keys%plain}#*
120+
\addtocategory{category}{keys%plain}#S
111121
\backref{arg}#S
112122
\cslcitation{arg1}{arg2}#S
113123
\cslcite{arg1}{arg2}#S
114-
\DeclareBibliographyCategory{category}#*
115-
\defbibenvironment{name}{begdef}{enddef}{item code}#*
116-
\defbibheading{name}[title%text]{code}#*
117-
\defbibheading{name}{code}#*
118-
\defbibnote{name}{text}#*
124+
\csloptions{arg1}{arg2}#S
125+
\cslundefinedcite{arg}#S
126+
\DeclareBibliographyCategory{category}#S
127+
\defbibenvironment{name}{begdef}{enddef}{item code}#S
128+
\defbibnote{name}{text}#S
129+
\printbibheading#S
130+
\printbibheading[options%keyvals]#S
131+
#keyvals:\printbibheading
132+
heading=%<text%>
133+
title=%<text%>
134+
#endkeyvals

‎completion/class-asmeconf.cwl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# asmeconf class
2-
# Matthew Bertucci 2024/02/07 for v1.37
2+
# Matthew Bertucci 2024/08/02 for v1.38
33

44
#include:etoolbox
55
#include:ifthen
@@ -2026,7 +2026,6 @@ SuppressWarning#true,false
20262026
\JointFirstAuthor
20272027
\keywordname#*
20282028
\keywords{keywords}
2029-
\LogNote{message%text}#*
20302029
\MakeTitlePage#*
20312030
\MyColorOption#*
20322031
\nomenwidth#*

‎completion/fdsymbol.cwl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ opstyle=#serif,sans
4444
\arceq#m
4545
\Assert#*m
4646
\assert#m
47-
\awint,#m
47+
\awint#m
4848
\backcong#m
4949
\backneg#m
5050
\backprime#m
@@ -74,7 +74,7 @@ opstyle=#serif,sans
7474
\bigcurlyvee#m
7575
\bigcurlywedge#m
7676
\bigdoublevee#m
77-
\bigdoublewedge,#m
77+
\bigdoublewedge#m
7878
\bigoast#m
7979
\bigplus#m
8080
\bigsqcap#m

‎completion/fontscale.cwl

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
# fontscale package
2-
# Matthew Bertucci 2024/03/08 for v1.0.0
2+
# Matthew Bertucci 2024/08/05 for v2.0.0
33

44
\fontscalesetup{keyvals}
5+
\fontscalesetup*{keyvals}
56

6-
#keyvals:\fontscalesetup
7-
reset
8-
reset=#initial,preamble
9-
ignore-order#true,false
7+
#keyvals:\fontscalesetup,\fontscalesetup*
108
baselineskip-size-ratio=%<number%>
11-
typographic-scale=#classic-10pt,classic-11pt,classic-12pt,modular,musical
9+
typographic-scale=#classic-10pt,classic-11pt,classic-12pt,musical
1210
classic-10pt
1311
classic-11pt
1412
classic-12pt
15-
modular
1613
musical
17-
modular/ratio=%<number%>
14+
musical/base=##L
1815
musical/ratio=%<number%>
1916
musical/notes=%<integer%>
2017
tiny/scale=%<number%>
@@ -81,10 +78,8 @@ Huge=%<size%>/%<baselineskip%>
8178
\SetFontSize*{size}
8279
\ScaleFont{number}
8380
\SetFontSizeBaselineskip{size}{skip%l}
84-
\PrintFontParameters
85-
\PrintAllFontParameters
86-
\PrintSampleText
87-
\PrintSampleText[text]
88-
\PrintSampleText*
89-
\PrintSampleText*[text]
90-
\PrintFontSizeCommand
81+
\PrintFontSizeParameters
82+
\PrintAllFontSizeParameters
83+
\PrintSampleText{text}
84+
\PrintSampleText*{text}
85+
\PrintFontSizeCommand

‎completion/hvlogos.cwl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
\WikipediA#n
8484
\XeLaTeX#n
8585
\XeTeX#n
86+
\xypic#n
8687

8788
\AMS#*n
8889
\biblatex#*n
@@ -108,6 +109,7 @@
108109
\tikzlogo#*n
109110
\Wikipedia#*n
110111
\wikipedia#*n
112+
\XYpic#*n
111113

112114
\hvLaTeX[L-a kern]#*
113115
\hvLaTeX[L-a kern][La-TeX kern]#*

‎completion/mathabx.cwl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ mathx
444444
\wideddddot{arg}#m
445445
\varnot#m
446446

447-
\mayadelimiters
447+
\mayadelimiters(%<delim1%>,%<delim2%>)
448448
\maya{number}
449449
\mayadigit{digit}
450450
\changenotsign#*

‎completion/mercatormap.cwl

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# mercatormap package
2-
# Matthew Bertucci 2/2/2022 for v1.02
2+
# Matthew Bertucci 2024/08/05 for v1.2.0
33

44
#include:graphicx
5-
#include:pdftexcmds
65
#include:siunitx
76
#include:tikz
87
#include:tikzlibraryshadings
@@ -59,6 +58,7 @@ tile size=##L
5958
\mrcNPcs{name}
6059
\mrcNPlat{name}
6160
\mrcNPlon{name}
61+
\ifmrcNPexists{name}{true}{false}
6262

6363
\ifmrcinmap{latitude}{longitude}{true}{false}
6464
\ifmrcNPinmap{name}{true}{false}
@@ -121,7 +121,7 @@ flex area fit
121121
flex area fit=##L
122122
pixel=%<pixel size%>
123123
dpi=%<dpi value%>
124-
source=#dummy,opentopomap,stamen terrain,stamen terrain-background,stamen terrain-labels,stamen terrain-lines,stamen toner,stamen toner-lite,stamen toner-hybrid,stamen toner-background,stamen toner-labels,stamen toner-lines,stamen watercolor,thunderforest opencyclemap,thunderforest transport,thunderforest landscape,thunderforest outdoors,thunderforest transport-dark,thunderforest spinal-map,thunderforest pioneer,thunderforest mobile-atlas,thunderforest neighbourhood,topplusopen web,topplusopen web grau,topplusopen p5,topplusopen p5 grau,topplusopen p10,topplusopen p10 grau,topplusopen p17.5,topplusopen p17.5 grau,topplusopen p25,topplusopen p25 grau,topplusopen p50,topplusopen p50 grau,topplusopen p100,topplusopen p100 grau,topplusopen p250,topplusopen p250 grau
124+
source=#dummy,opentopomap,thunderforest opencyclemap,thunderforest transport,thunderforest landscape,thunderforest outdoors,thunderforest atlas,thunderforest transport-dark,thunderforest spinal-map,thunderforest pioneer,thunderforest mobile-atlas,thunderforest neighbourhood,topplusopen web,topplusopen web grau,topplusopen web light,topplusopen web light grau,topplusopen p5,topplusopen p5 grau,topplusopen p10,topplusopen p10 grau,topplusopen p17.5,topplusopen p17.5 grau,topplusopen p25,topplusopen p25 grau,topplusopen p50,topplusopen p50 grau,topplusopen p100,topplusopen p100 grau,topplusopen p250,topplusopen p250 grau
125125
#endkeyvals
126126

127127
\mrcsetapikey{name}{value}
@@ -304,13 +304,61 @@ node style={%<TikZ options%>}
304304
\mrcNPdraworthodrome{name1}{name2}
305305
\mrcNPdraworthodrome[TikZ options]{name1}{name2}
306306

307+
\mrcNPfromOrthoFraction{name}{lat1}{lon1}{lat2}{lon2}{fraction}
308+
\mrcNPfromOrthoFraction{name}[\angle]{lat1}{lon1}{lat2}{lon2}{fraction}
309+
\mrcNPfromOrthoFractionNamed{name}{name1}{name2}{fraction}
310+
\mrcNPfromOrthoFractionNamed{name}[\angle]{name1}{name2}{fraction}
311+
\mrcNPfromOrthoDistance{name}{lat1}{lon1}{lat2}{lon2}{distance}
312+
\mrcNPfromOrthoDistance{name}[\angle]{lat1}{lon1}{lat2}{lon2}{distance}
313+
\mrcNPfromOrthoDistanceNamed{name}{name1}{name2}{distance}
314+
\mrcNPfromOrthoDistanceNamed{name}[\angle]{name1}{name2}{distance}
315+
307316
\mrcprettyorthodistance{lat1}{lon1}{lat2}{lon2}
308317
\mrcNPprettyorthodistance{name1}{name2}
309318
\mrcstoreorthodistance{macro%cmd}{lat1}{lon1}{lat2}{lon2}#d
310319
\mrcprettyloxodistance{lat1}{lon1}{lat2}{lon2}
311320
\mrcNPprettyloxodistance{name1}{name2}
312321
\mrcstoreloxodistance{macro%cmd}{lat1}{lon1}{lat2}{lon2}#d
313322

323+
### 10 Animations ###
324+
\begin{mrcAnimation}{options%keyvals}
325+
\end{mrcAnimation}
326+
327+
#keyvals:\begin{mrcAnimation}#c
328+
start-position=%<latitude%>/%<longitude%>
329+
named-start-position=%<name%>
330+
final-position=%<latitude%>/%<longitude%>
331+
named-final-position=%<name%>
332+
position=%<latitude%>/%<longitude%>
333+
named-position=%<name%>
334+
frames=%<integer%>
335+
drop-first-frame#true,false
336+
drop-last-frame#true,false
337+
drop-no-frame
338+
scale-denominators=%<time and scale sequence%>
339+
common-scale-denominator=%<scale denominator%>
340+
timewarp=%<macro%>
341+
timewarp-identity
342+
timewarp-slow-start
343+
timewarp-slow-start=%<exponent%>
344+
timewarp-slow-final
345+
timewarp-slow-final=%<exponent%>
346+
timewarp-slow-start-final
347+
timewarp-slow-start-final=%<exponent%>
348+
#endkeyvals
349+
350+
\mrcTimewarpIdentity#*
351+
\mrcTimewarpSlowStart#*
352+
\mrcTimewarpSlowFinal#*
353+
\mrcTimewarpSlowStartFinal#*
354+
355+
\mrcAnimFrame
356+
\mrcAnimTime
357+
\mrcAnimScaleDenom
358+
\mrcAnimLatitude
359+
\mrcAnimLongitude
360+
\mrcAnimAngle
361+
314362
# not documented
315363
\mermaplastfivesum{arg}#*
316364
\mrcpkgprefix#*

‎completion/moreverb.cwl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
\begin{listing}{start line}#V
1313
\begin{listing}[interval]{start line}#V
1414
\end{listing}
15+
\begin{listing*}{start line}#V
16+
\begin{listing*}[interval]{start line}#V
17+
\end{listing*}
1518
\begin{listingcont}#V
1619
\end{listingcont}
20+
\begin{listingcont*}#V
21+
\end{listingcont*}
1722
\listinglabel#*
1823
\listinginput{start line}{file}
1924
\listinginput[interval]{start line}{file}

‎completion/pgfplotsthemebeamer.cwl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# pgfplotsthemebeamer package
2-
# Matthew Bertucci 2024/07/29 for v0.1
2+
# Matthew Bertucci 2024/08/02 for v0.2
33

4-
#include:pgfopts
54
#include:pgfplots
65

76
#keyvals:\usepackage/pgfplotsthemebeamer#c
@@ -10,4 +9,4 @@ all
109

1110
#keyvals:\begin{axis}#c,\begin{loglogaxis}#c,\begin{semilogxaxis}#c,\begin{semilogyaxis}#c,\addplot#c,\addplot3#c,\addplot+#c,\pgfplotsset#c,\begin{groupplot}#c,\nextgroupplot#c,\begin{smithchart}#c,\begin{polaraxis}#c,\begin{ternaryaxis}#c
1211
beamercolors
13-
#endkeyvals
12+
#endkeyvals

‎completion/piton.cwl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# piton package
2-
# Matthew Bertucci 2024/05/24 for v3.0b
2+
# Matthew Bertucci 2024/07/30 for v3.1
33

44
#include:l3keys2e
55
#include:luatexbase
@@ -68,6 +68,8 @@ marker/include-lines
6868
comment-latex=%<string%>
6969
math-comments#true,false
7070
detected-commands={%<csname1,csname2,...%>}
71+
detected-beamer-commands={%<csname1,csname2,...%>}
72+
detected-beamer-environments={%<envname1,envname2,...%>}
7173
line-numbers/absolute
7274
marker={%<options%>}
7375
marker/beginning=%<spec%>
@@ -97,6 +99,7 @@ line-numbers/skip-empty-lines#true,false
9799
line-numbers/label-empty-lines#true,false
98100
line-numbers/resume
99101
line-numbers/sep=##L
102+
line-numbers/format=%<font commands%>
100103
splittable
101104
splittable=%<integer%>
102105
background-color=#%color

‎completion/polyomino.cwl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# polyomino package
2+
# Matthew Bertucci 2024/08/02 for v1.0
3+
4+
#include:tikz
5+
6+
\polyomino{polyomino spec}
7+
\polyomino[options%keyvals]{polyomino spec}
8+
9+
#keyvals:\polyomino#c
10+
at=%<point%>
11+
empty cell=%<token list%>
12+
grid#true,false
13+
grid style={%<options%>}
14+
p={%<name%>}{%<options%>}
15+
row sep=%<token list%>
16+
#endkeyvals

0 commit comments

Comments
 (0)