From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 11 14:22:24 2021 Received: (at submit) by debbugs.gnu.org; 11 Nov 2021 19:22:24 +0000 Received: from localhost ([127.0.0.1]:42304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFeS-0001SE-89 for submit@debbugs.gnu.org; Thu, 11 Nov 2021 14:22:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:45604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlFeQ-0001S4-89 for submit@debbugs.gnu.org; Thu, 11 Nov 2021 14:22:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFeP-0003pX-3T for guix-patches@gnu.org; Thu, 11 Nov 2021 14:22:22 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:55501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlFeL-0006GR-EY for guix-patches@gnu.org; Thu, 11 Nov 2021 14:22:20 -0500 Date: Thu, 11 Nov 2021 19:22:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636658534; bh=7diDg4iRGP3oRJuIXdVtoXWulMtKWnslGu5/kI3yKVc=; h=Date:To:From:Reply-To:Subject:From; b=ccONnDixbXIW+B5+kedydwTQpuoj9U1xyBuDJRBFlCM4N9MCN7Kj20MrJZNQqRQvu hujbWETOTxeaNVwjqVsj+Sii1iL1a0iRS4kdX2DaFyWrQK19TutVyLtkaF+lSEaC96 JfrwrO2nUsN+olwxjAkDhFDRJYI4kUQdYDWfmugo= To: Guix Patches From: phodina Subject: [PATCH] gnu: Add font-source-code-pro. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.43.16; envelope-from=phodina@protonmail.com; helo=mail-4316.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: phodina Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/fonts.scm (font-source-code-pro): New variable. diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..9ac7e9e127 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1470,6 +1470,26 @@ (define-public font-sarasa-gothic "Sarasa Gothic is a programming font based on Iosevka and Source Han = Sans, most CJK characters are same height, and double width as ASCII characters.= "))) +(define-public font-source-code-pro + (package + (name "font-source-code-pro") + (version "2.038") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/adobe-fonts/source-code-pro") + (commit (string-append version "R-ro/1.058R-it/1.018R-= VAR")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00h4v3rmxyyaxni6nywacxvjnji2g2pi0b4js1yx0g67fvrv2gag")))) + (build-system font-build-system) + (synopsis "Font for coding environments") + (description "Font Source Code Pro is sedigned as a companion to Sourc= e +Sans.") + (home-page "https://fonts.google.com/specimen/Source+Code+Pro") + (license license:silofl1.1))) + (define-public font-space-grotesk (package (name "font-space-grotesk") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 15 14:56:30 2021 Received: (at 51774) by debbugs.gnu.org; 15 Nov 2021 19:56:30 +0000 Received: from localhost ([127.0.0.1]:56232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmi5e-0007cK-Fd for submit@debbugs.gnu.org; Mon, 15 Nov 2021 14:56:30 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmi5c-0007c2-QK for 51774@debbugs.gnu.org; Mon, 15 Nov 2021 14:56:29 -0500 Received: by mail-wr1-f67.google.com with SMTP id s13so32992789wrb.3 for <51774@debbugs.gnu.org>; Mon, 15 Nov 2021 11:56:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=u1UOQC4lkMGDbM/SAVZgOIRGurLRhXkPZ3wJg239k4k=; b=ebKdn6Uy9PJ2QjamfME/d4i2kUbxaU2+0pydrhgG3vgYMkO5qWZLeGlmDStRhPIb0x Bl4mrNjS+bjV0ME+ZJS4hOa0NxAN+sEyvpB256xOp8FOHtR8u6iAp2X9xlqyl9EzTMBq SRgywGzD8Eryle1pPbxWJWJrnNvZ3U9xYL7hmluqW4l8KKZqkon9Ib14CsoWB/fRhgrX omLT1ldL4jQZuYk1yxmQ/SPOrIxt1pE1GLt/FzGvkosi1oCRdZWPZTpoKxgCIHUo5K3N 5+hHzsPEzcjHV02Iyb7ax4N8rApLbwtpNj+ZEDILvOwxtE9J5FNNgRhfk8L9OQkVKkrp E90w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=u1UOQC4lkMGDbM/SAVZgOIRGurLRhXkPZ3wJg239k4k=; b=ZJuShqyqPa959L037xdBqcx5yJEr0i824ybWwyMif6TrVmfrVyBu0o8ZptVkAaWtI7 30L5jFgE8TIk6Kzoce0VlgZQ0pmJY8ly+sT9xoqgknwshmTf03890FxX78xmCWy0Tz4/ 5Yko755ybWap7fxkUT/aoIvNaHLFbjarx0D744gJ9kgG/nggzOSYxP8tR9UNSv7yUvvu szTehhZXJShbM2EeHLj0FNGQWVSyhlAWknwExxWKPxJImeeWUI80NY9mNCL+PmAwtLgO L00MKSqvf7Z/g8ZQTlT0KGWmixQOT0Owp+ojO+rjns7vT57nPQSmRY13hR0uk+vzSJ6U oncA== X-Gm-Message-State: AOAM530oSFJF2rQhQOqN9cl6GwW0ABkk3RNHZEePpY8oArLwSLC43kio 4Z89aNpL2qHWX0vNS0GwsxI= X-Google-Smtp-Source: ABdhPJzBbOWwqn2rF6XA+aTpMefb6hb5GotSKG2wi76Pv8iDGOM/DoWhxP8T8fVbc3XkWca8VTILMQ== X-Received: by 2002:adf:f0c8:: with SMTP id x8mr1977350wro.290.1637006182836; Mon, 15 Nov 2021 11:56:22 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g18sm378918wmq.4.2021.11.15.11.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 11:56:22 -0800 (PST) Message-ID: Subject: Re: [PATCH] gnu: Add font-source-code-pro. From: Liliana Marie Prikler To: phodina , 51774@debbugs.gnu.org Date: Mon, 15 Nov 2021 20:56:21 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51774 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Donnerstag, den 11.11.2021, 19:22 +0000 schrieb phodina: > * gnu/packages/fonts.scm (font-source-code-pro): New variable. > > diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm > index 3f36a71bdd..9ac7e9e127 100644 > --- a/gnu/packages/fonts.scm > +++ b/gnu/packages/fonts.scm > @@ -1470,6 +1470,26 @@ (define-public font-sarasa-gothic > "Sarasa Gothic is a programming font based on Iosevka and > Source Han Sans, > most CJK characters are same height, and double width as ASCII > characters."))) > > +(define-public font-source-code-pro > + (package > + (name "font-source-code-pro") > + (version "2.038") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url " > https://github.com/adobe-fonts/source-code-pro") > + (commit (string-append version "R-ro/1.058R- > it/1.018R-VAR")))) Am I allowed to ask WTF this versioning scheme is? Should we just pin a hash instead? > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "00h4v3rmxyyaxni6nywacxvjnji2g2pi0b4js1yx0g67fvrv2ga > g")))) > + (build-system font-build-system) > + (synopsis "Font for coding environments") > + (description "Font Source Code Pro is sedigned as a companion to > Source > +Sans.") This scrediption is not very scrediptive ;) Jokes aside, I'd add "[It] preserves the design features and vertical proportions of Source Sans, but alters the glyph widths so that they are uniform across all glyphs and weights." so that Adobe bois know what they're getting. > + (home-page "https://fonts.google.com/specimen/Source+Code+Pro") I'm not sure whether linking to Google fonts of all places is good praxis. Might want to link to Github instead. FWIW the repo advertises this: https://adobe-fonts.github.io/source-code-pro/ Cheers From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 15 17:12:58 2021 Received: (at 51774) by debbugs.gnu.org; 15 Nov 2021 22:12:58 +0000 Received: from localhost ([127.0.0.1]:56395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmkDi-00039w-Gx for submit@debbugs.gnu.org; Mon, 15 Nov 2021 17:12:58 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:20853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmkDg-00039e-M0 for 51774@debbugs.gnu.org; Mon, 15 Nov 2021 17:12:57 -0500 Date: Mon, 15 Nov 2021 22:12:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637014369; bh=ub0NOShzqLnXSt2Tn8WkTWLD06h1d73xoTPVWr9c1sw=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=m3E3A/vrgxkQGxSMhCevinXjEFuwj8FJhJeZm2k5Mq9pz4NAyP8COGPQXQt+a8+d4 uegY5YQ4uSDfBwEzJ+4Nw0pw95j9JAMt/0t8PPFhV3iX5x6z6K3pj8Vlij7hZ3OHw4 pkk8PWcMI1RBFnJCqNanf8+k/2UxPZ44nKFc/cm0= To: Liliana Marie Prikler From: phodina Subject: Re: [PATCH] gnu: Add font-source-code-pro. Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51774 Cc: 51774@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: phodina Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, > > https://github.com/adobe-fonts/source-code-pro") > > > > - (commit (string-append version "R-ro/1.058R- > > > > > > > > it/1.018R-VAR")))) > > Am I allowed to ask WTF this versioning scheme is? Should we just pin > > a hash instead? Hilarious, right? I agree that a hash commit would be better suited here. > > > - (file-name (git-file-name name version)) > > > > > > - (sha256 > > > > > > - (base32 > > > > > > - "00h4v3rmxyyaxni6nywacxvjnji2g2pi0b4js1yx0g67fvrv2ga > > > > > > > > g")))) > > > > - (build-system font-build-system) > > - (synopsis "Font for coding environments") > > - (description "Font Source Code Pro is sedigned as a companion to > > > > Source > > > > +Sans.") > > This scrediption is not very scrediptive ;) Jokes aside, I'd add "[It] > > preserves the design features and vertical proportions of Source Sans, > > but alters the glyph widths so that they are uniform across all glyphs > > and weights." so that Adobe bois know what they're getting. > Thanks for the tip! > > - (home-page "https://fonts.google.com/specimen/Source+Code+Pro") > > I'm not sure whether linking to Google fonts of all places is good > > praxis. Might want to link to Github instead. FWIW the repo > > advertises this: https://adobe-fonts.github.io/source-code-pro/ > > Cheers Sure, github might be more prefereble. PS: Though at the end it comes to which is better: Google vs Microsoft ;-) From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 16 14:07:52 2021 Received: (at 51774) by debbugs.gnu.org; 16 Nov 2021 19:07:52 +0000 Received: from localhost ([127.0.0.1]:59215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn3o8-0000Xa-8t for submit@debbugs.gnu.org; Tue, 16 Nov 2021 14:07:52 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:16200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn3o6-0000XG-I8 for 51774@debbugs.gnu.org; Tue, 16 Nov 2021 14:07:51 -0500 Date: Tue, 16 Nov 2021 19:07:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637089659; bh=afc2q8/N0poUoChnQgNc+0qO6yKb1MYGrDDk9Lej2C8=; h=Date:To:From:Cc:Reply-To:Subject:From; b=W8tPR+P71FYGxKANQlC8ZvF0HOyzkRQ57mH/giECHp2MJ23Bl7fY1zwKRdaK4Yp9K jSo15RSeaE3amaDuSWn7kB+nb0Qy5KrT6JftVdBBkPrNUHGyIXgfV/GirrXBHEKFcx GsM/xmfnbRTMOxDXsnOPn+kRJwDlP8onsbHIbg38= To: Liliana Marie Prikler From: phodina Subject: [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. Message-ID: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51774 Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: phodina Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Jelle pointed out, that this font is already packaged as adobe-source-code-= pro. Thanks, indeed it is. Unfortunately since the version string changed (another backslash) the rege= xp now looks horrible. Maybe it would be better to define it with let to ke= ep the code cleaner. What do you think? Petr * gnu/packages/fonts (font-adobe-source-code-pro): Update to 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..eddbeaba7e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -975,19 +975,20 @@ (define-public font-hack (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") - (version "2.030R-ro-1.050R-it") + (version "2.032R-ro-1.052R-it-1.012R-VAR") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/adobe-fonts/source-code-pro") - (commit (regexp-substitute/global - ;; The upstream tag uses "/" between the roman and i= talic - ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post)))) + (commit (regexp-substitute/global #f "it-" (regexp-substitute= /global + ;; The upstream t= ag uses "/" between the roman and italic + ;; versions, so s= ubstitute our "-" separator here. + #f "R-ro-" versio= n 'pre "R-ro/" 'post) 'pre "it/" + 'post)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) + (base32 "1lqchm8z0ah5y675ycmciqvr8y1v1gcj22ysfs443gm291vy0z4v")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 16 15:29:59 2021 Received: (at 51774) by debbugs.gnu.org; 16 Nov 2021 20:29:59 +0000 Received: from localhost ([127.0.0.1]:59308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn55b-0004Dw-EC for submit@debbugs.gnu.org; Tue, 16 Nov 2021 15:29:59 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:35576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn55a-0004DZ-2a for 51774@debbugs.gnu.org; Tue, 16 Nov 2021 15:29:58 -0500 Received: by mail-wm1-f43.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so3038719wme.0 for <51774@debbugs.gnu.org>; Tue, 16 Nov 2021 12:29:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=K8LW3l6pJ6JqOkhj8HO3IQbrC20nLVm8Hm/YNcOrXdU=; b=GF0e6YeA6Qe9MClKvZ1sIQqVle738ROBCp6s0XdKbN0xTF1L+WHV59R66hJBg9igKw D7ps7cU1blBZbo/e4txBbWiwFXO7Cz9Zaa8p9Bkm6vOySmc0L5Yn3Y7NhRGfsgKOozn3 UUDFUqaLm2xN7O9foD8J0pYwtAQRsXw+fBki6HytKR6WOSq8wB/tMa8T+hzANUtTfegk qxkYwwIf4pL6KwxjltY6PCww2kSx+br7/gjVOYuL078dEGo9UxsTq1buR3teYL3/a1fh aVBv40c5UdqPsHlwaTb4kxFlI6qqemmViGhQlpaWo0N5WYDtirPF+0nzndbxgKTReW4l Gatw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=K8LW3l6pJ6JqOkhj8HO3IQbrC20nLVm8Hm/YNcOrXdU=; b=Mj1acGmFDnGu4S9TAVB/ujcwT479bCRr6FZsXLQofQoMqsIekO21fgULQBlLPasqvs KnIHX2FuUNIKzm3k9UPlP076fh2UVhnMaj5gevsdygdDpN0gu4ir9VWlA9TQ5QYAfGu+ B/oAsz3g9r70d3TeeTCQQpTBF/jUX308DZGtZXTON+wXwYy+5gBOvXfQPOZGMVF08PLt k1Iy5D4OTK79IiVh7JaRfa+Y1OkXNHcZRkCeAOSVkMJrx8KHCrNFRLsF10hBubWN9YjU e2ieuLtsK+hm5MGoR9pi8LqPo6sSiSVt1LHGlymCkU3hemOHCR112y0WLRUpbLwl9j1A NC5A== X-Gm-Message-State: AOAM532vmsVeyC7mG7sn3lNxEboDU/Yhuhq5DQufsS2i0yLU0xzT2P2l PMCxmkY7N6dXkKFPrNadyuI= X-Google-Smtp-Source: ABdhPJze/nqrL3Odek355BjlwWw8z/EGJ4Qfo+sTSf8yU9gnVkWC41mRy0wliL/W0OglKdJzlahC6w== X-Received: by 2002:a05:600c:1d91:: with SMTP id p17mr11250516wms.193.1637094591705; Tue, 16 Nov 2021 12:29:51 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l21sm9187956wrb.38.2021.11.16.12.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 12:29:51 -0800 (PST) Message-ID: Subject: Re: [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. From: Liliana Marie Prikler To: phodina Date: Tue, 16 Nov 2021 21:29:49 +0100 In-Reply-To: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> References: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51774 Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Dienstag, den 16.11.2021, 19:07 +0000 schrieb phodina: > Hi, > > Jelle pointed out, that this font is already packaged as adobe- > source-code-pro. Thanks, indeed it is. > > Unfortunately since the version string changed (another backslash) > the regexp now looks horrible. Maybe it would be better to define it > with let to keep the code cleaner. What do you think? In principle both are fine solutions to me, but the implementation matters. Perhaps someone else has another reason why to use one or the other, but that's it for me. As for the implementation here, see below. > * gnu/packages/fonts (font-adobe-source-code-pro): Update to > 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. Normally, you'd insert two dashes here and comments after that. These lines don't appear in the commit log or the diff. > diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm > index 3f36a71bdd..eddbeaba7e 100644 > --- a/gnu/packages/fonts.scm > +++ b/gnu/packages/fonts.scm > @@ -975,19 +975,20 @@ (define-public font-hack > (define-public font-adobe-source-code-pro > (package > (name "font-adobe-source-code-pro") > - (version "2.030R-ro-1.050R-it") > + (version "2.032R-ro-1.052R-it-1.012R-VAR") > (source > (origin > (method git-fetch) > (uri (git-reference > (url "https://github.com/adobe-fonts/source-code-pro") > - (commit (regexp-substitute/global > - ;; The upstream tag uses "/" between the roman > and italic > - ;; versions, so substitute our "-" separator > here. > - #f "R-ro-" version 'pre "R-ro/" 'post)))) > + (commit (regexp-substitute/global #f "it-" (regexp- > substitute/global > + ;; The > upstream tag uses "/" between the roman and italic > + ;; > versions, so substitute our "-" separator here. > + #f "R-ro-" > version 'pre "R-ro/" 'post) 'pre "it/" > + 'post)))) This regexp could be simplified by noticing that it's always R-/R-/R-, whereas we use R--R--R-. So simply use a regexp that matches R-- and then replace just the dash with a slash. That being said, I'm not sure how much cleaner this is compared to let-binding Cheers. From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 17 07:25:20 2021 Received: (at 51774) by debbugs.gnu.org; 17 Nov 2021 12:25:20 +0000 Received: from localhost ([127.0.0.1]:60379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnK08-0004o1-38 for submit@debbugs.gnu.org; Wed, 17 Nov 2021 07:25:20 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:20524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnK03-0004nV-9Z for 51774@debbugs.gnu.org; Wed, 17 Nov 2021 07:25:19 -0500 Date: Wed, 17 Nov 2021 12:25:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637151904; bh=HteZ9Ev3sMfcPqkDLB3eO8ct/ETx2WLByLK8rTvfQK0=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=gmmjL/hc7MTYj84pgEg31eEHOLTo51TQ8p3q6dKFQNTe5Y21XLK1wnoKL2mhRTB3G rjvYORMFF0lJT3E7YjOfxrqKLtSTrzc9uNiagxbjNBIX8ZKlg1N1BIQD0xqNBwvaP6 9uvOmyy4u6+yIlXpNsSOPGptBe9rVQApsIyP83iE= To: Liliana Marie Prikler From: phodina Subject: [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. Message-ID: In-Reply-To: References: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51774 Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: phodina Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, > This regexp could be simplified by noticing that it's always > > R-/R-/R-, whereas we use > > R--R--R-. So simply use a > > regexp that matches R-- and then replace just the dash > > with a slash. That being said, I'm not sure how much cleaner this is > > compared to let-binding > > Cheers. Thanks. I saw the pattern just I have issue writing down the regexp in Guil= e. Now you made me learn them properly :-D * gnu/packages/fonts (font-adobe-source-code-pro): Update to 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..c3ad57f203 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -975,7 +975,7 @@ (define-public font-hack (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") - (version "2.030R-ro-1.050R-it") + (version "2.032R-ro-1.052R-it-1.012R-VAR") (source (origin (method git-fetch) @@ -984,10 +984,12 @@ (define-public font-adobe-source-code-pro (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and i= talic ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post)))) + #f "((R-ro)|(R-it))(-)" version + 'pre 1 "/" 'post + )))) (file-name (git-file-name name version)) (sha256 - (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) + (base32 "1lqchm8z0ah5y675ycmciqvr8y1v1gcj22ysfs443gm291vy0z4v")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 17 12:18:18 2021 Received: (at 51774-done) by debbugs.gnu.org; 17 Nov 2021 17:18:18 +0000 Received: from localhost ([127.0.0.1]:33770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnOZe-0007Mq-GR for submit@debbugs.gnu.org; Wed, 17 Nov 2021 12:18:18 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnOZR-0007LR-0e for 51774-done@debbugs.gnu.org; Wed, 17 Nov 2021 12:18:17 -0500 Received: by mail-wm1-f65.google.com with SMTP id i8-20020a7bc948000000b0030db7b70b6bso5401622wml.1 for <51774-done@debbugs.gnu.org>; Wed, 17 Nov 2021 09:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=kuWHstx8j3P4gMUQvhx5WQWZz1hoFJAU4Gm/ixc5Jec=; b=l/U6bjxPdObMvvGfWJ6OTkNdN8lquFaiAft/2mrESmRRIehXwbaJePzFkjgUFfqy2B Crr/2lXu8AO6B6K5UHA+Tmoth6HX+dO1IkLbrC+9S+NJN/pQZjc5D5CXnikwWHP0Z0KN iWKz/SX6HFUi9XIut9oN2GgG8Vm9g/IL6okN8xNx1rdhIVFDSRU9SI2kCfq5u2iXfZ5+ kc9yhb/KLuXcEy7ipulR/LYtmRWYOoR75C0uS+/oygX1P5u7RqLgaKSiv78ESvalVuE0 wBV0BQifetTwQuapMYX8bf3qV0ulBv85t+GgBKV7/b4K1GMBnhnETh21WFOwQEg3SJos VXOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=kuWHstx8j3P4gMUQvhx5WQWZz1hoFJAU4Gm/ixc5Jec=; b=aaBiEtrH1B5/CGv6Ezmlzivk7tGnRCMnBIeCwsLI5vTXSptkn5gm/0ZMR2Byg/YDhH FWlVyskSOpia86FVkVMAKioMzaM2X9ARuS44KAcOIGqGR1SW8aintBdsPu2bFzc7rePO nsJSwgO8Lj3p19QSCMz362fZszVGnY4BNVzzTK3pMaHLYGB7UL6vEhEi+BrOXOjO2SHE F53cucawjLIZ/QY6vNDzqfrNCGg/8NNGdC7FHmDFzTpu4ULoTnO0q7YRg31qBXre5pWV 3uk2lwycU1h3jKsiwR30hBd9F9AerxvYyNGpyi+ONsLSyNYOUGe+kcTTMfadMx9TKhTZ xbPw== X-Gm-Message-State: AOAM5320mU72XvS0bgLEuBS5WraSz65NPLyxC7Y7sfYdQQ0eM8wSLDaw RhhO0u6WP+JIPpTOUJ3IkRU= X-Google-Smtp-Source: ABdhPJzjsAuNH2nHDSzJGxjFPGaH90XPz/QTVFy30u/hk4TMqArhZjIRsgtNrQFTQh+KUnNPVUyn3Q== X-Received: by 2002:a1c:8002:: with SMTP id b2mr1594158wmd.2.1637169479165; Wed, 17 Nov 2021 09:17:59 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j134sm314700wmj.3.2021.11.17.09.17.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Nov 2021 09:17:58 -0800 (PST) Message-ID: Subject: Re: [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. From: Liliana Marie Prikler To: phodina Date: Wed, 17 Nov 2021 18:17:57 +0100 In-Reply-To: References: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51774-done Cc: "jlicht@fsfe.org" , 51774-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Mittwoch, den 17.11.2021, 12:25 +0000 schrieb phodina: > Hi Liliana, > > > This regexp could be simplified by noticing that it's always > > > > R-/R-/R-, whereas we use > > > > R--R--R-. So simply use a > > > > regexp that matches R-- and then replace just the > > dash > > > > with a slash. That being said, I'm not sure how much cleaner this > > is > > > > compared to let-binding > > > > Cheers. > > Thanks. I saw the pattern just I have issue writing down the regexp > in Guile. Now you made me learn them properly :-D > > > * gnu/packages/fonts (font-adobe-source-code-pro): Update to > 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. -- Please really really really insert comments that shouldn't turn up in the commit log here. It makes it way easier if we don't have to strip them. Pushed with some slight adjustments to the ChangeLog and aforementioned stripping. Cheers From unknown Fri Jun 20 07:24:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 16 Dec 2021 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator