refactor: removed width measurement for code blocks

refactor: removed width measurement for code blocks # Conflicts: # tests/colors/ref/1.png # tests/colors/ref/2.png # tests/colors/ref/3.png # tests/colors/ref/4.png
catppuccin · Jan 5, 2025 · 34b8656 · 34b8656
1 parent db33533
commit 34b8656
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 28 deletions.
diff --git a/src/styling/code.pdf b/src/styling/code.pdf
diff --git a/src/styling/code.typ b/src/styling/code.typ
@@ -9,7 +9,6 @@
   outset: 3pt,
   radius: 3pt,
   breakable: false,
-  width: it => measure(it).width + 2cm,
 )
 
 #let default-code-box-config = (
@@ -45,11 +44,6 @@
   #show raw.where(block: true): it => (
     context [
       #let config = default-code-block-config + (fill: palette.colors.crust.rgb) + block-config
-
-      #if type(config.at("width")) == function {
-        config.insert("width", (config.at("width"))(it))
-      }
-
       #block(..config, it)
     ]
   )

diff --git a/tests/background/ref/1.png b/tests/background/ref/1.png
diff --git a/tests/background/ref/10.png b/tests/background/ref/10.png
diff --git a/tests/background/ref/11.png b/tests/background/ref/11.png
diff --git a/tests/background/ref/12.png b/tests/background/ref/12.png
diff --git a/tests/background/ref/13.png b/tests/background/ref/13.png
diff --git a/tests/background/ref/14.png b/tests/background/ref/14.png
diff --git a/tests/background/ref/15.png b/tests/background/ref/15.png
diff --git a/tests/background/ref/16.png b/tests/background/ref/16.png
diff --git a/tests/background/ref/2.png b/tests/background/ref/2.png
diff --git a/tests/background/ref/3.png b/tests/background/ref/3.png
diff --git a/tests/background/ref/4.png b/tests/background/ref/4.png
diff --git a/tests/background/ref/5.png b/tests/background/ref/5.png
diff --git a/tests/background/ref/6.png b/tests/background/ref/6.png
diff --git a/tests/background/ref/7.png b/tests/background/ref/7.png
diff --git a/tests/background/ref/8.png b/tests/background/ref/8.png
diff --git a/tests/background/ref/9.png b/tests/background/ref/9.png
diff --git a/tests/background/test.typ b/tests/background/test.typ
@@ -11,31 +11,33 @@
   }
 }
 
-#for p in perms [
-  #pagebreak(weak: true)
-  #show: catppuccin.with(p.flavor, code-block: p.code-block, code-syntax: p.syntax)
+#for p in perms {
+  show: catppuccin.with(p.flavor, code-block: p.code-block, code-syntax: p.syntax)
+  pagebreak(weak: true)
 
-  = #get-flavor(p.flavor).name
-  - Code block: #p.code-block
-  - Code syntax: #p.syntax
+  [
+    = #get-flavor(p.flavor).name
+    - Code block: #p.code-block
+    - Code syntax: #p.syntax
 
-  ```typ
-  #import "/src/lib.typ": catppuccin, flavors, get-flavor
+    ```typ
+    #import "/src/lib.typ": catppuccin, flavors, get-flavor
 
-  #let perms = ()
-  #for flavor in flavors.values() {
-    for code-block in (true, false) {
-      for syntax in (true, false) {
-        perms.push((flavor: flavor, code-block: code-block, syntax: syntax))
+    #let perms = ()
+    #for flavor in flavors.values() {
+      for code-block in (true, false) {
+        for syntax in (true, false) {
+          perms.push((flavor: flavor, code-block: code-block, syntax: syntax))
+        }
       }
     }
-  }
 
-  #for p in perms [
-    #show: catppuccin.with(p.flavor, code-block: p.code-block, code-syntax: p.syntax)
-    = #get-flavor(p.flavor).name
-    == Code block: #p.code-block
-    == Code syntax: #p.syntax
+    #for p in perms [
+      #show: catppuccin.with(p.flavor, code-block: p.code-block, code-syntax: p.syntax)
+      = #get-flavor(p.flavor).name
+      == Code block: #p.code-block
+      == Code syntax: #p.syntax
+    ]
+    ```
   ]
-  ```
-]
+}
diff --git a/tests/colors/ref/1.png b/tests/colors/ref/1.png
diff --git a/tests/colors/ref/2.png b/tests/colors/ref/2.png
diff --git a/tests/colors/ref/3.png b/tests/colors/ref/3.png
diff --git a/tests/colors/ref/4.png b/tests/colors/ref/4.png
diff --git a/tests/colors/test.typ b/tests/colors/test.typ
@@ -19,7 +19,7 @@
   grid(
     columns: 4,
     column-gutter: 1cm,
-    row-gutter: 1em,
+    row-gutter: 3.5mm,
     ..swatches,
   )
 }