diff --git a/.gitignore b/.gitignore index a136337..3a8476b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.pdf +/label-item.pdf +/label-wide.pdf diff --git a/Readme.md b/Readme.md index 822175c..77488b2 100644 --- a/Readme.md +++ b/Readme.md @@ -11,22 +11,6 @@ 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) diff --git a/assets/ccchh-no-padding.svg b/assets/ccchh-no-padding.svg deleted file mode 100644 index 7e41354..0000000 --- a/assets/ccchh-no-padding.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - Exported SVG - - - - - - diff --git a/fonts/Inter-Black.ttf b/fonts/Inter-Black.ttf deleted file mode 100644 index 034a73e..0000000 Binary files a/fonts/Inter-Black.ttf and /dev/null differ diff --git a/fonts/Inter-BlackItalic.ttf b/fonts/Inter-BlackItalic.ttf deleted file mode 100644 index 7eb4b51..0000000 Binary files a/fonts/Inter-BlackItalic.ttf and /dev/null differ diff --git a/fonts/Inter-Bold.ttf b/fonts/Inter-Bold.ttf deleted file mode 100644 index 15e908f..0000000 Binary files a/fonts/Inter-Bold.ttf and /dev/null differ diff --git a/fonts/Inter-BoldItalic.ttf b/fonts/Inter-BoldItalic.ttf deleted file mode 100644 index 1e7bc41..0000000 Binary files a/fonts/Inter-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Inter-ExtraBold.ttf b/fonts/Inter-ExtraBold.ttf deleted file mode 100644 index c1449e8..0000000 Binary files a/fonts/Inter-ExtraBold.ttf and /dev/null differ diff --git a/fonts/Inter-ExtraBoldItalic.ttf b/fonts/Inter-ExtraBoldItalic.ttf deleted file mode 100644 index f0f4260..0000000 Binary files a/fonts/Inter-ExtraBoldItalic.ttf and /dev/null differ diff --git a/fonts/Inter-ExtraLight.ttf b/fonts/Inter-ExtraLight.ttf deleted file mode 100644 index e98ac27..0000000 Binary files a/fonts/Inter-ExtraLight.ttf and /dev/null differ diff --git a/fonts/Inter-ExtraLightItalic.ttf b/fonts/Inter-ExtraLightItalic.ttf deleted file mode 100644 index cf74046..0000000 Binary files a/fonts/Inter-ExtraLightItalic.ttf and /dev/null differ diff --git a/fonts/Inter-Italic.ttf b/fonts/Inter-Italic.ttf deleted file mode 100644 index e0421ee..0000000 Binary files a/fonts/Inter-Italic.ttf and /dev/null differ diff --git a/fonts/Inter-Light.ttf b/fonts/Inter-Light.ttf deleted file mode 100644 index 31ac788..0000000 Binary files a/fonts/Inter-Light.ttf and /dev/null differ diff --git a/fonts/Inter-LightItalic.ttf b/fonts/Inter-LightItalic.ttf deleted file mode 100644 index 0bd6cec..0000000 Binary files a/fonts/Inter-LightItalic.ttf and /dev/null differ diff --git a/fonts/Inter-Medium.ttf b/fonts/Inter-Medium.ttf deleted file mode 100644 index 9342730..0000000 Binary files a/fonts/Inter-Medium.ttf and /dev/null differ diff --git a/fonts/Inter-MediumItalic.ttf b/fonts/Inter-MediumItalic.ttf deleted file mode 100644 index a607d9f..0000000 Binary files a/fonts/Inter-MediumItalic.ttf and /dev/null differ diff --git a/fonts/Inter-Regular.ttf b/fonts/Inter-Regular.ttf deleted file mode 100644 index c544be4..0000000 Binary files a/fonts/Inter-Regular.ttf and /dev/null differ diff --git a/fonts/Inter-SemiBold.ttf b/fonts/Inter-SemiBold.ttf deleted file mode 100644 index a32e2b8..0000000 Binary files a/fonts/Inter-SemiBold.ttf and /dev/null differ diff --git a/fonts/Inter-SemiBoldItalic.ttf b/fonts/Inter-SemiBoldItalic.ttf deleted file mode 100644 index 7f28786..0000000 Binary files a/fonts/Inter-SemiBoldItalic.ttf and /dev/null differ diff --git a/fonts/Inter-Thin.ttf b/fonts/Inter-Thin.ttf deleted file mode 100644 index af78ac3..0000000 Binary files a/fonts/Inter-Thin.ttf and /dev/null differ diff --git a/fonts/Inter-ThinItalic.ttf b/fonts/Inter-ThinItalic.ttf deleted file mode 100644 index 681cbf2..0000000 Binary files a/fonts/Inter-ThinItalic.ttf and /dev/null differ diff --git a/label-item-rotated.typ b/label-item-rotated.typ deleted file mode 100644 index e86e97a..0000000 --- a/label-item-rotated.typ +++ /dev/null @@ -1,72 +0,0 @@ -#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" -) diff --git a/label-item.typ b/label-item.typ index 3153bd2..f623e69 100644 --- a/label-item.typ +++ b/label-item.typ @@ -1,5 +1,6 @@ #set text( - font: "Inter", + //font: "pt sans", + font: "ubuntu", fallback: false, size: 11pt, lang: "en", @@ -10,41 +11,7 @@ width: 38mm, height: 90mm, flipped: false, - // 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), + margin: (x: 3mm, top: 3mm, bottom: 3mm+9pt), footer-descent: 0%, footer: [ #set text(size: 8pt) @@ -55,18 +22,16 @@ #import "@preview/cades:0.3.0": qr-code -#let item(itemname, itemslug, usage) = [ - == #itemname - #qr-code("https://wiki.hamburg.ccc.de/item:" + itemslug) +#let item(itemslug) = [ + #qr-code("https://wiki.hamburg.ccc.de/item:#itemslug") #text(8pt)[wiki.hamburg.ccc.de/item:#itemslug] - === Usage - #usage ] -#item( - "Prusa i3 MK3s", - "prusa-i3", - // "Introduction required" - "See instructions (in the wiki)" - // "Freely" -) +== Prusa i3 MK3S + +#item[prusa-i3] + +=== Usage +//Introduction required +See instructions (in the wiki) +//Freely diff --git a/label-wide.typ b/label-wide.typ index 37894ec..83933f1 100644 --- a/label-wide.typ +++ b/label-wide.typ @@ -1,5 +1,6 @@ #set text( - font: "Inter", + //font: "pt sans", + font: "ubuntu", fallback: false, size: 14pt, lang: "en", diff --git a/licenses/inter-4.0-font_OFL-1.1_license b/licenses/inter-4.0-font_OFL-1.1_license deleted file mode 100644 index 9b2ca37..0000000 --- a/licenses/inter-4.0-font_OFL-1.1_license +++ /dev/null @@ -1,92 +0,0 @@ -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.