Move basically the entire label content inside the item function

Move basically the entire label content, except for the footer, inside
the item function.
This results in a more simplified workflow for generating labels for
different items, since there's just one function call left where the
arguments need to be modified.

.gitignore

@@ -1,2 +1 @@
-/label-item.pdf
+*.pdf
-/label-wide.pdf

Readme.md

@@ -11,6 +11,22 @@ There are two versions:
   * height could be adjusted, if needed, but keep in mind to change the paper size when printing
 - label-item: 38x90mm for use with DK-11208 pre-cut address labels
 
-General notes:
+### General Notes
+
 - Labels with CCCHH logo in the footer are meant for items owned by CCCHH.
 - The QL-500 does not have an automatic cutter, so it's recommended to only print one page at a time.
+- In order for typst to discover the font we use and bundle, you need to manually make typst aware of our fonts directory via e.g. the `--font-path` option.
+
+### Example Usage
+
+To compile e.g. `label-wide.typ`, you can use the following command:
+
+```
+typst compile --font-path=./fonts label-wide.typ
+```
+
+## Fonts Used
+
+We're using and also bundling the [Inter 4.0 font](https://github.com/rsms/inter/tree/v4.0) (see also the [Inter Font Website](https://rsms.me/inter/)).
+It was licensed under the SIL OPEN FONT LICENSE Version 1.1.
+A copy of the license can be found under: [`licenses/inter-4.0-font_OFL-1.1_license`](./licenses/inter-4.0-font_OFL-1.1_license)

assets/ccchh-no-padding.svg

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="260mm"
+   height="60.000542mm"
+   viewBox="0 0 260 60.000544"
+   version="1.1"
+   id="svg4"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs4" />
+  <title
+     id="title1">Exported SVG</title>
+  <style
+     id="style1"><![CDATA[
+polygon {
+shape-rendering:crispEdges;
+stroke-width:0.270000;
+}
+.s1 {
+stroke:#000000;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s2 {
+stroke:#19b219;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s3 {
+stroke:#7f4c00;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s4 {
+stroke:#00cc00;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s5 {
+stroke:#000000;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s6 {
+stroke:#ff19ff;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s7 {
+stroke:#ff0000;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s8 {
+stroke:#ffff00;
+stroke-width:0.245682;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.s9 {
+stroke:#001919;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.sa {
+stroke:#006666;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.sb {
+stroke:#00ffff;
+stroke-width:0.491365;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.sc {
+stroke:#ff0000;
+stroke-width:1.310307;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.sd {
+stroke:#191919;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+.se {
+stroke:#000000;
+stroke-width:0.163788;
+stroke-linecap:round;
+stroke-linejoin:round;
+stroke-dasharray:2.457,2.457;
+fill:none;
+}
+.sf {
+stroke:#000000;
+stroke-width:0.491365;
+stroke-linecap:round;
+stroke-linejoin:round;
+fill:none;
+}
+]]></style>
+  <path
+     d="M 57.272,17.500535 A 30,30 0 0 0 23.603,0.69053504 30,30 0 0 0 -3.3555206e-7,30.000535 30,30 0 0 0 23.603,59.310535 a 30,30 0 0 0 33.669,-16.81 H 51.651 A 25,25 0 0 1 23.53,54.148535 25,25 0 0 1 4.9999997,30.000535 25,25 0 0 1 23.53,5.851535 a 25,25 0 0 1 28.121,11.649 h 5.621"
+     class="s0"
+     id="path1" />
+  <path
+     d="m 48.54,22.500535 a 20,20 0 0 0 -22.36,-12.132 20,20 0 0 0 -16.1800003,19.632 20,20 0 0 0 16.1800003,19.631 20,20 0 0 0 22.36,-12.131 h 12.413 a 30,30 0 0 0 26.394,22.382 30,30 0 0 0 29.925,-17.382 h -5.621 a 25,25 0 0 1 -26.904,11.941 25,25 0 0 1 -19.622,-21.941 H 44.79 a 15,15 0 0 1 -16.044,12.447 15,15 0 0 1 -13.746,-14.947 15,15 0 0 1 13.746,-14.948 15,15 0 0 1 16.044,12.448 h 20.335 a 25,25 0 0 1 19.622,-21.942 25,25 0 0 1 26.904,11.942 h 5.621 A 30,30 0 0 0 87.347,0.11753504 30,30 0 0 0 60.953,22.500535 H 48.54"
+     class="s0"
+     id="path2" />
+  <path
+     d="m 108.54,22.500535 a 20,20 0 0 0 -22.36,-12.132 20,20 0 0 0 -16.18,19.632 20,20 0 0 0 16.18,19.631 20,20 0 0 0 22.36,-12.131 h 12.413 a 30,30 0 0 0 26.394,22.382 30,30 0 0 0 29.925,-17.382 h -5.621 a 25,25 0 0 1 -26.904,11.941 25,25 0 0 1 -19.622,-21.941 H 104.79 a 15,15 0 0 1 -16.044,12.447 15,15 0 0 1 -13.746,-14.947 15,15 0 0 1 13.746,-14.948 15,15 0 0 1 16.044,12.448 h 20.335 a 25,25 0 0 1 19.622,-21.942 25,25 0 0 1 26.904,11.942 h 5.621 A 30,30 0 0 0 147.347,0.11753504 30,30 0 0 0 120.953,22.500535 H 108.54"
+     class="s0"
+     id="path3" />
+  <path
+     d="m 168.54,22.500535 a 20,20 0 0 0 -22.36,-12.132 20,20 0 0 0 -16.18,19.632 20,20 0 0 0 16.18,19.631 20,20 0 0 0 22.36,-12.131 H 185 v 22.5 h 15 v -22.5 h 15 v 22.5 h 15 v -22.5 h 15 v 22.5 h 15 V 5.3503881e-4 H 245 V 22.500535 H 230 V 5.3503881e-4 H 215 V 22.500535 H 200 V 5.3503881e-4 H 185 V 22.500535 h -16.46 m -3.75,5 H 190 v -22.5 h 5 v 22.5 h 25 v -22.5 h 5 v 22.5 h 25 v -22.5 h 5 v 50 h -5 v -22.5 h -25 v 22.5 h -5 v -22.5 h -25 v 22.5 h -5 v -22.5 h -25.21 a 15,15 0 0 1 -16.044,12.447 15,15 0 0 1 -13.746,-14.947 15,15 0 0 1 13.746,-14.948 15,15 0 0 1 16.044,12.448"
+     class="s0"
+     id="path4" />
+</svg>

label-item-rotated.typ

@@ -0,0 +1,72 @@
+#set text(
+  font: "Inter",
+  fallback: false,
+  size: 11pt,
+  lang: "en",
+)
+
+// for DK-11208 (address label)
+#set page(
+  width: 38mm,
+  height: 90mm,
+  flipped: true,
+  // Those are modified margins from label-item.typ. See that file for
+  // documentation on why these margins are the way they are.
+  // Of note for this paticular document:
+  // - We don't have a footer, so no need to add 9pt to the bottom margin.
+  // - Since this document is flipped, the margins are on different sides.
+  margin: (bottom: 0mm, top: 4mm, left: 9mm, right: 0mm),
+)
+
+#import "@preview/cades:0.3.0": qr-code
+
+#let item(itemname, itemslug, usage) = [
+  #grid(
+    columns: 1,
+    // 9pt for the bottom row to make its content fit on the page.
+    rows: (1fr, 9pt),
+    gutter: 2mm,
+    [
+      #grid(
+        columns: (1fr, auto),
+        rows: 1,
+        gutter: 2mm,
+        [
+          == #itemname
+
+          === Usage
+          #usage
+        ],
+        [
+          #qr-code("https://wiki.hamburg.ccc.de/item:" + itemslug)
+        ]
+      )
+    ],
+    [
+      #grid(
+        columns: (1fr, auto),
+        rows: 1,
+        gutter: 2mm,
+        [ 
+          #set text(size: 8pt)
+          #set align(start + bottom)
+          wiki.hamburg.ccc.de/item:#itemslug
+        ],
+        [ 
+          #set align(end + bottom)
+          // For a 9pt ccchh.svg with padding, 6.84pt is roughly the size of the
+          // actual logo.
+          #image("assets/ccchh-no-padding.svg", height: 6.84pt, alt: "CCCHH")
+        ],
+      )
+    ]
+  )
+]
+
+#item(
+  "Prusa i3 MK3S",
+  "prusa-i3",
+  // "Introduction required"
+  "See instructions (in the Wiki)"
+  // "Freely"
+)

label-item.typ

@@ -1,6 +1,5 @@
 #set text(
-  //font: "pt sans",
+  font: "Inter",
-  font: "ubuntu",
   fallback: false,
   size: 11pt,
   lang: "en",
@@ -11,7 +10,41 @@
   width: 38mm,
   height: 90mm,
   flipped: false,
-  margin: (x: 3mm, top: 3mm, bottom: 3mm+9pt),
+  // Because, for this document, our printer setup - a Brother P-touch QL-500
+  // label printer driven by a CUPS with the printer-driver-ptouch - and
+  // DK-11208 Large Address Labels (38x90mm), either the printer driver or the
+  // printer itself doesn't properly print on the labels, we need to deploy some
+  // workarounds using margins.
+  // Link to the printer-driver-ptouch:
+  // https://github.com/philpem/printer-driver-ptouch
+  //
+  // For the horizontal margins, we use a 4mm margin on the left and a 0mm
+  // margin on the right.
+  // Do this because by default the print itself is offset to the left sadly. It
+  // seems like the printer is printing from the very edge, where the label
+  // roll, but not the label itself, is. On the label roll on the left there are
+  // 2mm of material until the label itself starts, so we need to offset by 2mm
+  // on the left for the print to be on the label itself. However this offset
+  // also results in a forced margin of 2mm on the right, so to have an even
+  // margin on the resulting label, add another 2mm of margin on the left,
+  // resulting in 4mm of margin on the left in total. Also just don't have any
+  // margin on the right, since there's a forced margin already anyway.
+  //
+  // For the vertical margins, we use a 0mm top margin and a 9mm + 9pt bottom
+  // margin.
+  // Do this because the printer doesn't print from the very top of the label
+  // sadly, so since we then have a forced margin there anyway (one of 6mm), we
+  // don't need to add any top margin.
+  // On the bottom, we already need a margin of 9pt for the image to be fully on
+  // the page. However, because the printer doesn't start at the very top, the
+  // printing ends after the label already ended. To combat this, add a margin
+  // of 7mm for the logo to still be on the page and add another 2mm for the
+  // margin to be same as the margin at the sides (resulting in 9mm).
+  //
+  // These workarounds were developed for this document, our Brother P-touch
+  // QL-500 label printer in combination with DK-11208 Large Address Labels
+  // (38x90mm).
+  margin: (left: 4mm, right: 0mm, top: 0mm, bottom: 9mm + 9pt),
   footer-descent: 0%,
   footer: [
     #set text(size: 8pt)
@@ -22,16 +55,18 @@
 
 #import "@preview/cades:0.3.0": qr-code
 
-#let item(itemslug) = [
+#let item(itemname, itemslug, usage) = [
-  #qr-code("https://wiki.hamburg.ccc.de/item:#itemslug")
+  == #itemname
+  #qr-code("https://wiki.hamburg.ccc.de/item:" + itemslug)
   #text(8pt)[wiki.hamburg.ccc.de/item:#itemslug]
+  === Usage
+  #usage
 ]
 
-== Prusa i3 MK3S
+#item(
-
+  "Prusa i3 MK3s",
-#item[prusa-i3]
+  "prusa-i3",
-
+  // "Introduction required"
-=== Usage
+  "See instructions (in the wiki)"
-//Introduction required
+  // "Freely"
-See instructions (in the wiki)
+)
-//Freely

label-wide.typ

@@ -1,6 +1,5 @@
 #set text(
-  //font: "pt sans",
+  font: "Inter",
-  font: "ubuntu",
   fallback: false,
   size: 14pt,
   lang: "en",

licenses/inter-4.0-font_OFL-1.1_license

@@ -0,0 +1,92 @@
+Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.