From 1e32ce92fb5a90954b6ae01c90e2d5febb88ea8b Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Fri, 6 Sep 2024 11:32:05 +0800
Subject: [PATCH 1/2] Include base KOMA macro/env in KOMA art, book, rept

---
 data/packages/class-scrartcl.json             | 787 +++++++++++++++++-
 data/packages/class-scrbook.json              | 787 +++++++++++++++++-
 data/packages/class-scrreprt.json             | 787 +++++++++++++++++-
 .../class-scrartcl,scrreprt,scrbook.json      | 780 +----------------
 dev/packages/class-scrartcl.json              | 787 +++++++++++++++++-
 dev/packages/class-scrbook.json               | 787 +++++++++++++++++-
 dev/packages/class-scrreprt.json              | 787 +++++++++++++++++-
 dev/parse-cwl.ts                              |  14 +-
 8 files changed, 4690 insertions(+), 826 deletions(-)

diff --git a/data/packages/class-scrartcl.json b/data/packages/class-scrartcl.json
index eb8c78e00..4db8e4359 100644
--- a/data/packages/class-scrartcl.json
+++ b/data/packages/class-scrartcl.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
     },
     {
-      "name": "typearea"
+      "name": "backmatter"
     },
     {
-      "name": "scrlogo"
+      "name": "capfont",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "caplabelfont",
+      "unusual": true
+    },
+    {
+      "name": "captionformat",
+      "unusual": true
+    },
+    {
+      "name": "chapapp",
+      "unusual": true
+    },
+    {
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1210,6 +1900,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/data/packages/class-scrbook.json b/data/packages/class-scrbook.json
index 52ba99b94..47da43c4f 100644
--- a/data/packages/class-scrbook.json
+++ b/data/packages/class-scrbook.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
+    },
+    {
+      "name": "backmatter"
+    },
+    {
+      "name": "capfont",
+      "unusual": true
+    },
+    {
+      "name": "caplabelfont",
+      "unusual": true
     },
     {
-      "name": "typearea"
+      "name": "captionformat",
+      "unusual": true
     },
     {
-      "name": "scrlogo"
+      "name": "chapapp",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1409,6 +2099,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/data/packages/class-scrreprt.json b/data/packages/class-scrreprt.json
index 2ba1961b6..7e18fac1c 100644
--- a/data/packages/class-scrreprt.json
+++ b/data/packages/class-scrreprt.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
+    },
+    {
+      "name": "backmatter"
+    },
+    {
+      "name": "capfont",
+      "unusual": true
+    },
+    {
+      "name": "caplabelfont",
+      "unusual": true
     },
     {
-      "name": "typearea"
+      "name": "captionformat",
+      "unusual": true
     },
     {
-      "name": "scrlogo"
+      "name": "chapapp",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1409,6 +2099,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/dev/packages/class-scrartcl,scrreprt,scrbook.json b/dev/packages/class-scrartcl,scrreprt,scrbook.json
index 2257c8858..f2fb1a4ec 100644
--- a/dev/packages/class-scrartcl,scrreprt,scrbook.json
+++ b/dev/packages/class-scrartcl,scrreprt,scrbook.json
@@ -1,781 +1,7 @@
 {
-  "deps": [
-    {
-      "name": "scrpage2"
-    }
-  ],
-  "macros": [
-    {
-      "name": "addchap",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:short title}]{${1:title}}"
-      }
-    },
-    {
-      "name": "addchap",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addchap*",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addpart",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:short title}]{${1:title}}"
-      }
-    },
-    {
-      "name": "addpart",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addpart*",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addsec",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:short title}]{${1:title}}"
-      }
-    },
-    {
-      "name": "addsec",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addsec*",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "addtokomafont",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}",
-        "snippet": "{${1:name}}{${2:cmd}}"
-      }
-    },
-    {
-      "name": "areaset",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}{}",
-        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
-      }
-    },
-    {
-      "name": "areaset",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}",
-        "snippet": "{${1:width}}{${2:height}}"
-      }
-    },
-    {
-      "name": "captionabove",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:entry}]{${1:text}}"
-      }
-    },
-    {
-      "name": "captionabove",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "captionbelow",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:entry}]{${1:text}}"
-      }
-    },
-    {
-      "name": "captionbelow",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "chapappifchapterprefix",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "dedication",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "deffootnote",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}{}",
-        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
-      }
-    },
-    {
-      "name": "deffootnotemark",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:definition}}"
-      }
-    },
-    {
-      "name": "deffootnote",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}{}{}",
-        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
-      }
-    },
-    {
-      "name": "dictumauthorformat",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:cmd}}"
-      }
-    },
-    {
-      "name": "dictum",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:author}]{${1:text}}"
-      }
-    },
-    {
-      "name": "dictum",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "enlargethispage"
-    },
-    {
-      "name": "extratitle",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:shorttitle}}"
-      }
-    },
-    {
-      "name": "ifpdfoutput",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}",
-        "snippet": "{${1:then}}{${2:else}}"
-      }
-    },
-    {
-      "name": "ifthispageodd",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}",
-        "snippet": "{${1:true}}{${2:false}}"
-      }
-    },
-    {
-      "name": "lowertitleback",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "maketitle",
-      "arg": {
-        "format": "[]",
-        "snippet": "[${1:pagenumber}]"
-      }
-    },
-    {
-      "name": "marginline",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "markboth",
-      "unusual": true
-    },
-    {
-      "name": "markleft",
-      "unusual": true
-    },
-    {
-      "name": "markright",
-      "unusual": true
-    },
-    {
-      "name": "minisec",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "othersectionlevelsformat",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:level}}"
-      }
-    },
-    {
-      "name": "publishers",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "setbibpreamble",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "setcapindent",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapindent*",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapmargin",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapmargin*",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapmargin",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:left}]{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapmargin*",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:middle}]{${1:indent}}"
-      }
-    },
-    {
-      "name": "setcapwidth",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:align}]{${1:width}}"
-      }
-    },
-    {
-      "name": "setcapwidth",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:width}}"
-      }
-    },
-    {
-      "name": "setchapterpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:pos}]{${1:text}}"
-      }
-    },
-    {
-      "name": "setchapterpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "[][]{}",
-        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
-      }
-    },
-    {
-      "name": "setchapterpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "SetDIVList",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:list}}"
-      }
-    },
-    {
-      "name": "setindexpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "setkomafont",
-      "unusual": true,
-      "arg": {
-        "format": "{}{}",
-        "snippet": "{${1:name}}{${2:cmd}}"
-      }
-    },
-    {
-      "name": "setpartpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:pos}]{${1:text}}"
-      }
-    },
-    {
-      "name": "setpartpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "[][]{}",
-        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
-      }
-    },
-    {
-      "name": "setpartpreamble",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "subject",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "subtitle",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "textsubscript",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "textsuperscript",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "titlehead",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:head}}"
-      }
-    },
-    {
-      "name": "typearea",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:bcor}]{${1:div}}"
-      }
-    },
-    {
-      "name": "typearea",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:div}}"
-      }
-    },
-    {
-      "name": "uppertitleback",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:text}}"
-      }
-    },
-    {
-      "name": "usekomafont",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:name}}"
-      }
-    },
-    {
-      "name": "appendixmore"
-    },
-    {
-      "name": "autodot"
-    },
-    {
-      "name": "backmatter"
-    },
-    {
-      "name": "capfont",
-      "unusual": true
-    },
-    {
-      "name": "caplabelfont",
-      "unusual": true
-    },
-    {
-      "name": "captionformat",
-      "unusual": true
-    },
-    {
-      "name": "chapapp",
-      "unusual": true
-    },
-    {
-      "name": "chapterformat",
-      "unusual": true
-    },
-    {
-      "name": "chaptermarkformat",
-      "unusual": true
-    },
-    {
-      "name": "chapterpagestyle",
-      "unusual": true
-    },
-    {
-      "name": "contentsname",
-      "unusual": true
-    },
-    {
-      "name": "descfont",
-      "unusual": true
-    },
-    {
-      "name": "dictumwidth",
-      "unusual": true
-    },
-    {
-      "name": "figureformat",
-      "unusual": true
-    },
-    {
-      "name": "frontmatter"
-    },
-    {
-      "name": "indexpagestyle",
-      "unusual": true
-    },
-    {
-      "name": "listfigurename",
-      "unusual": true
-    },
-    {
-      "name": "listtablename",
-      "unusual": true
-    },
-    {
-      "name": "mainmatter"
-    },
-    {
-      "name": "partformat",
-      "unusual": true
-    },
-    {
-      "name": "partpagestyle",
-      "unusual": true
-    },
-    {
-      "name": "raggeddictum",
-      "unusual": true
-    },
-    {
-      "name": "raggeddictumauthor",
-      "unusual": true
-    },
-    {
-      "name": "raggeddictumtext",
-      "unusual": true
-    },
-    {
-      "name": "raggedsection",
-      "unusual": true
-    },
-    {
-      "name": "sectfont",
-      "unusual": true
-    },
-    {
-      "name": "sectionmarkformat",
-      "unusual": true
-    },
-    {
-      "name": "setcaphanging",
-      "unusual": true
-    },
-    {
-      "name": "subsectionmarkformat",
-      "unusual": true
-    },
-    {
-      "name": "tableformat",
-      "unusual": true
-    },
-    {
-      "name": "titlepagestyle",
-      "unusual": true
-    },
-    {
-      "name": "pdfoutput",
-      "unusual": true
-    },
-    {
-      "name": "pdfpageheight",
-      "unusual": true
-    },
-    {
-      "name": "pdfpagewidth",
-      "unusual": true
-    },
-    {
-      "name": "KOMAScript",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:}}"
-      }
-    },
-    {
-      "name": "cleardoublepageusingstyle",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:pagestyle%special}}"
-      }
-    },
-    {
-      "name": "cleardoubleemptypage"
-    },
-    {
-      "name": "cleardoubleplainpage"
-    },
-    {
-      "name": "cleardoublestandardpage"
-    },
-    {
-      "name": "cleardoubleoddusingstyle",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:pagestyle%special}}"
-      }
-    },
-    {
-      "name": "cleardoubleoddemptypage"
-    },
-    {
-      "name": "cleardoubleoddpage"
-    },
-    {
-      "name": "cleardoubleoddplainpage"
-    },
-    {
-      "name": "cleardoubleoddstandardpage"
-    },
-    {
-      "name": "cleardoubleevenusingstyle",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:pagestyle%special}}"
-      }
-    },
-    {
-      "name": "cleardoubleevenemptypage"
-    },
-    {
-      "name": "cleardoubleevenpage"
-    },
-    {
-      "name": "cleardoubleevenplainpage"
-    },
-    {
-      "name": "cleardoubleevenstandardpage"
-    },
-    {
-      "name": "defpagestyle",
-      "arg": {
-        "format": "{}{}{}",
-        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
-      }
-    },
-    {
-      "name": "newpagestyle",
-      "arg": {
-        "format": "{}{}{}",
-        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
-      }
-    },
-    {
-      "name": "renewpagestyle",
-      "arg": {
-        "format": "{}{}{}",
-        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
-      }
-    },
-    {
-      "name": "providepagestyle",
-      "arg": {
-        "format": "{}{}{}",
-        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
-      }
-    }
-  ],
-  "envs": [
-    {
-      "name": "addmargin",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "addmargin*",
-      "unusual": true,
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:indent}}"
-      }
-    },
-    {
-      "name": "addmargin",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:leftindent}]{${1:indent}}"
-      }
-    },
-    {
-      "name": "addmargin*",
-      "unusual": true,
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:middleindent}]{${1:indent}}"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "[]{}",
-        "snippet": "[${2:short}]{${1:title}}"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "[]{}[]",
-        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "[]{}[][]",
-        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "{}",
-        "snippet": "{${1:title}}"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "{}[]",
-        "snippet": "{${1:title}}[${2:pos}]"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "{}[][]",
-        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
-      }
-    },
-    {
-      "name": "captionbeside",
-      "arg": {
-        "format": "{}[][][]",
-        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
-      }
-    }
-  ],
+  "deps": [],
+  "macros": [],
+  "envs": [],
   "keys": {},
   "args": []
 }
\ No newline at end of file
diff --git a/dev/packages/class-scrartcl.json b/dev/packages/class-scrartcl.json
index eb8c78e00..4db8e4359 100644
--- a/dev/packages/class-scrartcl.json
+++ b/dev/packages/class-scrartcl.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
     },
     {
-      "name": "typearea"
+      "name": "backmatter"
     },
     {
-      "name": "scrlogo"
+      "name": "capfont",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "caplabelfont",
+      "unusual": true
+    },
+    {
+      "name": "captionformat",
+      "unusual": true
+    },
+    {
+      "name": "chapapp",
+      "unusual": true
+    },
+    {
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1210,6 +1900,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/dev/packages/class-scrbook.json b/dev/packages/class-scrbook.json
index 52ba99b94..47da43c4f 100644
--- a/dev/packages/class-scrbook.json
+++ b/dev/packages/class-scrbook.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
+    },
+    {
+      "name": "backmatter"
+    },
+    {
+      "name": "capfont",
+      "unusual": true
+    },
+    {
+      "name": "caplabelfont",
+      "unusual": true
     },
     {
-      "name": "typearea"
+      "name": "captionformat",
+      "unusual": true
     },
     {
-      "name": "scrlogo"
+      "name": "chapapp",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1409,6 +2099,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/dev/packages/class-scrreprt.json b/dev/packages/class-scrreprt.json
index 2ba1961b6..7e18fac1c 100644
--- a/dev/packages/class-scrreprt.json
+++ b/dev/packages/class-scrreprt.json
@@ -1,23 +1,713 @@
 {
   "deps": [
+    {
+      "name": "scrpage2"
+    },
     {
       "name": "scrkbase"
     },
     {
-      "name": "tocbasic"
+      "name": "tocbasic"
+    },
+    {
+      "name": "typearea"
+    },
+    {
+      "name": "scrlogo"
+    },
+    {
+      "name": "scrlayer-scrpage",
+      "if": "emulatestandardclasses"
+    }
+  ],
+  "macros": [
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addchap*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addpart*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short title}]{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addsec*",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "addtokomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}",
+        "snippet": "[${3:bcor}]{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "areaset",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:width}}{${2:height}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionabove",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:entry}]{${1:text}}"
+      }
+    },
+    {
+      "name": "captionbelow",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "chapappifchapterprefix",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "dedication",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "deffootnotemark",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:definition}}"
+      }
+    },
+    {
+      "name": "deffootnote",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}{}{}",
+        "snippet": "[${4:width}]{${1:indent}}{${2:parindent}}{${3:definition}}"
+      }
+    },
+    {
+      "name": "dictumauthorformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:cmd}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:author}]{${1:text}}"
+      }
+    },
+    {
+      "name": "dictum",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "enlargethispage"
+    },
+    {
+      "name": "extratitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:shorttitle}}"
+      }
+    },
+    {
+      "name": "ifpdfoutput",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:then}}{${2:else}}"
+      }
+    },
+    {
+      "name": "ifthispageodd",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:true}}{${2:false}}"
+      }
+    },
+    {
+      "name": "lowertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "maketitle",
+      "arg": {
+        "format": "[]",
+        "snippet": "[${1:pagenumber}]"
+      }
+    },
+    {
+      "name": "marginline",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "markboth",
+      "unusual": true
+    },
+    {
+      "name": "markleft",
+      "unusual": true
+    },
+    {
+      "name": "markright",
+      "unusual": true
+    },
+    {
+      "name": "minisec",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "othersectionlevelsformat",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:level}}"
+      }
+    },
+    {
+      "name": "publishers",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setbibpreamble",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setcapindent",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapindent*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:left}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middle}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:align}]{${1:width}}"
+      }
+    },
+    {
+      "name": "setcapwidth",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:width}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setchapterpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "SetDIVList",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:list}}"
+      }
+    },
+    {
+      "name": "setindexpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "setkomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}{}",
+        "snippet": "{${1:name}}{${2:cmd}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:pos}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "[][]{}",
+        "snippet": "[${2:pos}][${3:width}]{${1:text}}"
+      }
+    },
+    {
+      "name": "setpartpreamble",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subject",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "subtitle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsubscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "textsuperscript",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "titlehead",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:head}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:bcor}]{${1:div}}"
+      }
+    },
+    {
+      "name": "typearea",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:div}}"
+      }
+    },
+    {
+      "name": "uppertitleback",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:text}}"
+      }
+    },
+    {
+      "name": "usekomafont",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:name}}"
+      }
+    },
+    {
+      "name": "appendixmore"
+    },
+    {
+      "name": "autodot"
+    },
+    {
+      "name": "backmatter"
+    },
+    {
+      "name": "capfont",
+      "unusual": true
+    },
+    {
+      "name": "caplabelfont",
+      "unusual": true
     },
     {
-      "name": "typearea"
+      "name": "captionformat",
+      "unusual": true
     },
     {
-      "name": "scrlogo"
+      "name": "chapapp",
+      "unusual": true
     },
     {
-      "name": "scrlayer-scrpage",
-      "if": "emulatestandardclasses"
-    }
-  ],
-  "macros": [
+      "name": "chapterformat",
+      "unusual": true
+    },
+    {
+      "name": "chaptermarkformat",
+      "unusual": true
+    },
+    {
+      "name": "chapterpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "contentsname",
+      "unusual": true
+    },
+    {
+      "name": "descfont",
+      "unusual": true
+    },
+    {
+      "name": "dictumwidth",
+      "unusual": true
+    },
+    {
+      "name": "figureformat",
+      "unusual": true
+    },
+    {
+      "name": "frontmatter"
+    },
+    {
+      "name": "indexpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "listfigurename",
+      "unusual": true
+    },
+    {
+      "name": "listtablename",
+      "unusual": true
+    },
+    {
+      "name": "mainmatter"
+    },
+    {
+      "name": "partformat",
+      "unusual": true
+    },
+    {
+      "name": "partpagestyle",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictum",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumauthor",
+      "unusual": true
+    },
+    {
+      "name": "raggeddictumtext",
+      "unusual": true
+    },
+    {
+      "name": "raggedsection",
+      "unusual": true
+    },
+    {
+      "name": "sectfont",
+      "unusual": true
+    },
+    {
+      "name": "sectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "setcaphanging",
+      "unusual": true
+    },
+    {
+      "name": "subsectionmarkformat",
+      "unusual": true
+    },
+    {
+      "name": "tableformat",
+      "unusual": true
+    },
+    {
+      "name": "titlepagestyle",
+      "unusual": true
+    },
+    {
+      "name": "pdfoutput",
+      "unusual": true
+    },
+    {
+      "name": "pdfpageheight",
+      "unusual": true
+    },
+    {
+      "name": "pdfpagewidth",
+      "unusual": true
+    },
+    {
+      "name": "KOMAScript",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:}}"
+      }
+    },
+    {
+      "name": "cleardoublepageusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleemptypage"
+    },
+    {
+      "name": "cleardoubleplainpage"
+    },
+    {
+      "name": "cleardoublestandardpage"
+    },
+    {
+      "name": "cleardoubleoddusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleoddemptypage"
+    },
+    {
+      "name": "cleardoubleoddpage"
+    },
+    {
+      "name": "cleardoubleoddplainpage"
+    },
+    {
+      "name": "cleardoubleoddstandardpage"
+    },
+    {
+      "name": "cleardoubleevenusingstyle",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:pagestyle%special}}"
+      }
+    },
+    {
+      "name": "cleardoubleevenemptypage"
+    },
+    {
+      "name": "cleardoubleevenpage"
+    },
+    {
+      "name": "cleardoubleevenplainpage"
+    },
+    {
+      "name": "cleardoubleevenstandardpage"
+    },
+    {
+      "name": "defpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "newpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "renewpagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
+    {
+      "name": "providepagestyle",
+      "arg": {
+        "format": "{}{}{}",
+        "snippet": "{${1:pagestyle%specialDef}}{${2:header}}{${3:footer}}"
+      }
+    },
     {
       "name": "defaultpapersize",
       "if": "emulatestandardclasses"
@@ -1409,6 +2099,87 @@
     }
   ],
   "envs": [
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:leftindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "addmargin*",
+      "unusual": true,
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:middleindent}]{${1:indent}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}",
+        "snippet": "[${2:short}]{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "[]{}[][]",
+        "snippet": "[${2:short}]{${1:title}}[${3:pos}][${4:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}",
+        "snippet": "{${1:title}}"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[]",
+        "snippet": "{${1:title}}[${2:pos}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}]"
+      }
+    },
+    {
+      "name": "captionbeside",
+      "arg": {
+        "format": "{}[][][]",
+        "snippet": "{${1:title}}[${2:pos}][${3:width}][${4:offset}]"
+      }
+    },
     {
       "name": "addmargin*",
       "arg": {
diff --git a/dev/parse-cwl.ts b/dev/parse-cwl.ts
index d321e3da4..751855ca0 100644
--- a/dev/parse-cwl.ts
+++ b/dev/parse-cwl.ts
@@ -446,12 +446,24 @@ function findArg(arg: string, regexp: RegExp, index: number): string | false {
  * @returns The parsed package object.
  */
 function parsePkg(pkgName: string): PackageRaw {
-    const content = fs.readFileSync(`cwl/${pkgName}.cwl`).toString()
+    let content = fs.readFileSync(`cwl/${pkgName}.cwl`).toString()
+    content = handleKomaClasses(pkgName, content)
     const pkg: PackageRaw = { deps: [], macros: [], envs: [], keys: {}, args: [] }
     parseLines(pkg, content.split('\n'))
     return pkg
 }
 
+function handleKomaClasses(pkgName: string, content: string): string {
+    if (!['class-scrartcl', 'class-scrbook', 'class-scrreprt', 'class-scrartcl,scrreprt,scrbook'].includes(pkgName)) {
+        return content
+    }
+    if (pkgName === 'class-scrartcl,scrreprt,scrbook') {
+        return ''
+    }
+    const baseContent = fs.readFileSync('cwl/class-scrartcl,scrreprt,scrbook.cwl').toString()
+    return baseContent + '\n' + content
+}
+
 /**
  * Parses an array of file paths and converts CWL files to JSON format.
  *

From 6533600de1b1e858602dab1cc3e06758e875d2ce Mon Sep 17 00:00:00 2001
From: James Yu <yujianqiaojames@gmail.com>
Date: Fri, 6 Sep 2024 11:46:23 +0800
Subject: [PATCH 2/2] Add a test to KOMA base suggestions

---
 test/fixtures/armory/intellisense/koma.tex |  3 +++
 test/suites/04_intellisense.test.ts        | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 test/fixtures/armory/intellisense/koma.tex

diff --git a/test/fixtures/armory/intellisense/koma.tex b/test/fixtures/armory/intellisense/koma.tex
new file mode 100644
index 000000000..f92bf0813
--- /dev/null
+++ b/test/fixtures/armory/intellisense/koma.tex
@@ -0,0 +1,3 @@
+\documentclass{scrartcl}
+\begin{document}
+\end{document}
diff --git a/test/suites/04_intellisense.test.ts b/test/suites/04_intellisense.test.ts
index ba9bad09e..2ec7f5ea1 100644
--- a/test/suites/04_intellisense.test.ts
+++ b/test/suites/04_intellisense.test.ts
@@ -441,4 +441,15 @@ suite('Intellisense test suite', () => {
         assert.ok(undefined === suggestions.items.find(item => item.label === '#+' && item.insertText instanceof vscode.SnippetString && item.insertText.value === '\\bigcup'))
         assert.ok(undefined === suggestions.items.find(item => item.label === '#8'))
     })
+
+    test.run('suggest base KOMAScript macros/envs in KOMAScript class', async (fixture: string) => {
+        await test.load(fixture, [
+            {src: 'intellisense/koma.tex', dst: 'main.tex'}
+        ])
+        const suggestions = test.suggest(0, 1)
+        // in class-scrartcl.cwl
+        assert.ok(suggestions.labels.includes('\\addpart{}'))
+        // in base
+        assert.ok(suggestions.labels.includes('\\addchap{}'))
+    })
 })