diff --git a/grammar.js b/grammar.js
index f6097a561..22ce9de7a 100644
--- a/grammar.js
+++ b/grammar.js
@@ -874,11 +874,17 @@ module.exports = grammar({
             '\\vref',
             '\\Vref',
             '\\autoref',
+            '\\autoref*',
             '\\pageref',
+            '\\pageref*',
+            '\\autopageref',
+            '\\autopageref*',
             '\\cref',
-            '\\Cref',
             '\\cref*',
+            '\\Cref',
             '\\Cref*',
+            '\\cpageref',
+            '\\Cpageref',
             '\\namecref',
             '\\nameCref',
             '\\lcnamecref',
@@ -886,7 +892,9 @@ module.exports = grammar({
             '\\nameCrefs',
             '\\lcnamecrefs',
             '\\labelcref',
+            '\\labelcref*',
             '\\labelcpageref',
+            '\\labelcpageref*',
           ),
         ),
         field('names', $.curly_group_text_list),
@@ -896,7 +904,14 @@ module.exports = grammar({
       seq(
         field(
           'command',
-          choice('\\crefrange', '\\crefrange*', '\\Crefrange', '\\Crefrange*'),
+          choice(
+            '\\crefrange',
+            '\\crefrange*',
+            '\\Crefrange',
+            '\\Crefrange*',
+            '\\cpagerefrange',
+            '\\Cpagerefrange',
+          ),
         ),
         field('from', $.curly_group_text),
         field('to', $.curly_group_text),
diff --git a/src/grammar.json b/src/grammar.json
index ff869b0d5..a849444cb 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -5143,26 +5143,50 @@
                 "type": "STRING",
                 "value": "\\autoref"
               },
+              {
+                "type": "STRING",
+                "value": "\\autoref*"
+              },
               {
                 "type": "STRING",
                 "value": "\\pageref"
               },
               {
                 "type": "STRING",
-                "value": "\\cref"
+                "value": "\\pageref*"
               },
               {
                 "type": "STRING",
-                "value": "\\Cref"
+                "value": "\\autopageref"
+              },
+              {
+                "type": "STRING",
+                "value": "\\autopageref*"
+              },
+              {
+                "type": "STRING",
+                "value": "\\cref"
               },
               {
                 "type": "STRING",
                 "value": "\\cref*"
               },
+              {
+                "type": "STRING",
+                "value": "\\Cref"
+              },
               {
                 "type": "STRING",
                 "value": "\\Cref*"
               },
+              {
+                "type": "STRING",
+                "value": "\\cpageref"
+              },
+              {
+                "type": "STRING",
+                "value": "\\Cpageref"
+              },
               {
                 "type": "STRING",
                 "value": "\\namecref"
@@ -5191,9 +5215,17 @@
                 "type": "STRING",
                 "value": "\\labelcref"
               },
+              {
+                "type": "STRING",
+                "value": "\\labelcref*"
+              },
               {
                 "type": "STRING",
                 "value": "\\labelcpageref"
+              },
+              {
+                "type": "STRING",
+                "value": "\\labelcpageref*"
               }
             ]
           }
@@ -5232,6 +5264,14 @@
               {
                 "type": "STRING",
                 "value": "\\Crefrange*"
+              },
+              {
+                "type": "STRING",
+                "value": "\\cpagerefrange"
+              },
+              {
+                "type": "STRING",
+                "value": "\\Cpagerefrange"
               }
             ]
           }
diff --git a/src/node-types.json b/src/node-types.json
index 44200e369..3fe42ef4a 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -4352,6 +4352,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "\\Cpageref",
+            "named": false
+          },
           {
             "type": "\\Cref",
             "named": false
@@ -4364,10 +4368,26 @@
             "type": "\\Vref",
             "named": false
           },
+          {
+            "type": "\\autopageref",
+            "named": false
+          },
+          {
+            "type": "\\autopageref*",
+            "named": false
+          },
           {
             "type": "\\autoref",
             "named": false
           },
+          {
+            "type": "\\autoref*",
+            "named": false
+          },
+          {
+            "type": "\\cpageref",
+            "named": false
+          },
           {
             "type": "\\cref",
             "named": false
@@ -4384,10 +4404,18 @@
             "type": "\\labelcpageref",
             "named": false
           },
+          {
+            "type": "\\labelcpageref*",
+            "named": false
+          },
           {
             "type": "\\labelcref",
             "named": false
           },
+          {
+            "type": "\\labelcref*",
+            "named": false
+          },
           {
             "type": "\\lcnamecref",
             "named": false
@@ -4416,6 +4444,10 @@
             "type": "\\pageref",
             "named": false
           },
+          {
+            "type": "\\pageref*",
+            "named": false
+          },
           {
             "type": "\\ref",
             "named": false
@@ -4446,6 +4478,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "\\Cpagerefrange",
+            "named": false
+          },
           {
             "type": "\\Crefrange",
             "named": false
@@ -4454,6 +4490,10 @@
             "type": "\\Crefrange*",
             "named": false
           },
+          {
+            "type": "\\cpagerefrange",
+            "named": false
+          },
           {
             "type": "\\crefrange",
             "named": false
@@ -8511,6 +8551,14 @@
     "type": "\\Citeauthor*",
     "named": false
   },
+  {
+    "type": "\\Cpageref",
+    "named": false
+  },
+  {
+    "type": "\\Cpagerefrange",
+    "named": false
+  },
   {
     "type": "\\Cref",
     "named": false
@@ -8911,10 +8959,22 @@
     "type": "\\autocite*",
     "named": false
   },
+  {
+    "type": "\\autopageref",
+    "named": false
+  },
+  {
+    "type": "\\autopageref*",
+    "named": false
+  },
   {
     "type": "\\autoref",
     "named": false
   },
+  {
+    "type": "\\autoref*",
+    "named": false
+  },
   {
     "type": "\\avolcite",
     "named": false
@@ -9059,6 +9119,14 @@
     "type": "\\colorbox",
     "named": false
   },
+  {
+    "type": "\\cpageref",
+    "named": false
+  },
+  {
+    "type": "\\cpagerefrange",
+    "named": false
+  },
   {
     "type": "\\cref",
     "named": false
@@ -9287,10 +9355,18 @@
     "type": "\\labelcpageref",
     "named": false
   },
+  {
+    "type": "\\labelcpageref*",
+    "named": false
+  },
   {
     "type": "\\labelcref",
     "named": false
   },
+  {
+    "type": "\\labelcref*",
+    "named": false
+  },
   {
     "type": "\\lcnamecref",
     "named": false
@@ -9375,6 +9451,10 @@
     "type": "\\pageref",
     "named": false
   },
+  {
+    "type": "\\pageref*",
+    "named": false
+  },
   {
     "type": "\\paragraph",
     "named": false