From owner-dev-commits-src-main@freebsd.org Mon Dec 28 17:47:46 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D71F24BC759; Mon, 28 Dec 2020 17:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4Q4L5Wm9z4W0j; Mon, 28 Dec 2020 17:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC5AA1D675; Mon, 28 Dec 2020 17:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BSHlkmU031248; Mon, 28 Dec 2020 17:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BSHlkIF031247; Mon, 28 Dec 2020 17:47:46 GMT (envelope-from git) Date: Mon, 28 Dec 2020 17:47:46 GMT Message-Id: <202012281747.0BSHlkIF031247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c37a66937407 - main - Correct font.h comment describing vfnt font maps MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c37a6693740748d8534ebdb49acbdd05cc21b5f2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Dec 2020 17:47:46 -0000 The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c37a6693740748d8534ebdb49acbdd05cc21b5f2 commit c37a6693740748d8534ebdb49acbdd05cc21b5f2 Author: Ed Maste AuthorDate: 2020-12-28 16:56:00 +0000 Commit: Ed Maste CommitDate: 2020-12-28 17:47:12 +0000 Correct font.h comment describing vfnt font maps Commit 41fb06651122 doubled the number of glyph maps in the vfnt format from 2 to 4 to support double-width characters, but a comment describing the maps was not updated to match. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/sys/font.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/sys/font.h b/sys/sys/font.h index 73b6d39683a6..f8bf151c5f52 100644 --- a/sys/sys/font.h +++ b/sys/sys/font.h @@ -42,11 +42,13 @@ /* * Fonts. * - * Remapping tables are used to map Unicode points to glyphs. They need - * to be sorted, because vtfont_lookup() performs a binary search. Each - * font has two remapping tables, for normal and bold. When a character - * is not present in bold, it uses a normal glyph. When no glyph is - * available, it uses glyph 0, which is normally equal to U+FFFD. + * Fonts support normal and bold weights, and single and double width glyphs. + * Mapping tables are used to map Unicode points to glyphs. They are sorted by + * code point, and vtfont_lookup() uses this to perform a binary search. Each + * font has four mapping tables: two weights times two halves (left/single, + * right). When a character is not present in a bold map the glyph from the + * normal map is used. When no glyph is available, it uses glyph 0, which is + * normally equal to U+FFFD. */ enum vfnt_map_type {