summaryrefslogtreecommitdiff
path: root/pango
Commit message (Collapse)AuthorAgeFilesLines
* Neuter g_debug in line-breakingtake-out-gdebugMatthias Clasen2021-11-181-35/+37
| | | | | | This code gets run for gtks size-allocation, and we don't want it to be any slower than it has to be, when not debugging it.
* Add pango_tab_array_to/from_stringserialize-attrs-and-tabsMatthias Clasen2021-11-172-0/+106
|
* Add pango_attr_list_to/from_stringMatthias Clasen2021-11-172-0/+548
| | | | | | Add an api to serialize PangoAttrList. This will be useful in testing and debugging.
* Merge branch 'rewrite-line-breaking' into 'main'Matthias Clasen2021-11-171-215/+312
|\ | | | | | | | | Rewrite process_item See merge request GNOME/pango!509
| * Fix a thinko in zero_line_final_spaceMatthias Clasen2021-11-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | We must not add the width of the space back to remaining_width, since we're just correcting the glyphs to match the accounting that process_item has already done. This was showing up as justification operating on wrong numbers when justifying lines with a final space, leading to uneven margins.
| * Correct the extra_width accountingMatthias Clasen2021-11-161-2/+5
| |
| * Rewrite process_itemMatthias Clasen2021-11-161-214/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not an entire rewrite, the basic approach to fitting items is still the same. The main difference here is that we shape and measure a possible breakpoint before accepting it as candidate for breaking. This is necessary to ensure that we have accurate width information when making decisions about this breakpoint - the width we are calculating based on log widths is only an approximation (due to things like clusters, hyphens, final spaces, etc). To avoid excessive shaping, we only do this extra work when we are close to the end of the line.
* | build: Bump the harfbuzz reqMatthias Clasen2021-11-161-8/+4
|/ | | | | | | We are using the hb metrics api in more places now, so just require 2.6.0 where it was introduced. That version is almost 2 years old now, so that is hopefully not too much of a burden.
* More tweaks, and commentsMatthias Clasen2021-11-151-15/+22
|
* Go back to an array for disabled breakpointsMatthias Clasen2021-11-151-10/+24
| | | | | It turns out that we do need to look for longer breakpoints after all if we want to find optimal solutions.
* Fix line-break accounting moreMatthias Clasen2021-11-151-5/+11
| | | | | | | | | | | | | | | When looking for breakpoints, we were assuming that there is no point to keep looking forward once we hit a spot where the broken off part is too long. But with hyphen insertion, that is no longer true, necessarily. Consider 'bli '. Breaking after 'bl' will insert 'bl-', which might be longer than 'bli', which is what will be inserted when we break after the i. To fix this, keep looking for breakpoints as long as there is still a chance to find one.
* Improve the BREAK_ALL_FIT caseMatthias Clasen2021-11-151-9/+30
| | | | | We always need to check if we still fit, after shaping. The width we use before is just an estimate.
* layout: Simplify things one more timeMatthias Clasen2021-11-141-16/+9
| | | | | | | | | | | | | The key insight here is that if we find a broken item does not fit, we are only interested in finding an *earlier* breakpoint - the later ones aren't going to produce a shorter run. So we can just keep track of the last char we want to allow breaking at. This fixes the case of finding the minimum width with wrap mode PANGO_WRAP_WORD.
* CosmeticsMatthias Clasen2021-11-141-1/+0
|
* Fix a bug in Small Caps handlingMatthias Clasen2021-11-131-2/+2
| | | | | | | | | We were not passing the correct split_offset to pango_item_split(). Testcase included. Fixes: #627
* Fix a thinkoltr-line-breaking-fixesMatthias Clasen2021-11-121-1/+1
|
* Fix another corner case of space-handlingMatthias Clasen2021-11-121-5/+17
| | | | This keeps spiraling :(
* Fix up one more case of break-after-spaceMatthias Clasen2021-11-121-11/+11
| | | | | | If the break is at the end of the item, we were forgetting to check for the space before the break.
* Handle break-after-space correctlyMatthias Clasen2021-11-121-1/+15
| | | | | | | | | | | | | | When we are breaking after a space, we must not count the width of the space towards the line, since we are zeroing it later. It is a bit annoying that there are multiple places where this has to be taken into account. Another missing bit in this code is that we are only looking at a single whitespace character before the break, when we should really look for a sequence of spaces.
* Correctly reinstate remaining_widthMatthias Clasen2021-11-121-1/+3
| | | | | When unsplitting an item, we were sometimes calculating the remaining_width incorrectly.
* Simplify find_break_extra_widthMatthias Clasen2021-11-121-25/+1
| | | | We can use the log_widths that we already have.
* Simplify breakpoint disablingMatthias Clasen2021-11-121-30/+9
| | | | | | We only want this inside process_item, so we can make this a purely local thing, without modifying log_attrs.
* CosmeticsMatthias Clasen2021-11-121-1/+2
|
* Merge branch 'ctweight' into 'main'Matthias Clasen2021-11-121-4/+5
|\ | | | | | | | | coretext: correctly clamp the core text weights at min/max values See merge request GNOME/pango!502
| * coretext: correctly clamp the core text weights at min/max valuesJeremy Tan2021-11-121-4/+5
| | | | | | | | Addresses bug found in #624
* | Try harder to not produce overlong linesavoid-overlong-linesMatthias Clasen2021-11-111-0/+48
| | | | | | | | | | | | | | | | | | | | | | Our accounting for run lengths is imperfect (mainly due to log widths for clusters being evenly distributed), so it can happen that after reshaping the split item, we find that it does not actually fit in the remaining width. Previously, we would just use the split run at that point and produce an overlong line. Instead, undo the split, disable the breakpoint we used, and try again.
* | Add pango_item_unsplitMatthias Clasen2021-11-112-1/+30
| | | | | | | | | | | | This undoes the effect of pango_item_split. We will use this in future commits. Private for now.
* | Reserve the remaining bits in PangoLogAttrMatthias Clasen2021-11-111-0/+2
| | | | | | | | This will let us use some of them during layout.
* | CosmeticsMatthias Clasen2021-11-111-2/+2
| |
* | layout: Fix a poblem with hyphen widthMatthias Clasen2021-11-101-8/+5
|/ | | | | In some cases, we were forgetting to account for the width of a hyphen.
* Merge branch 'newer-fontconfig' into 'main'Matthias Clasen2021-11-093-29/+16
|\ | | | | | | | | Bump fontconfig dep to 2.13.0 See merge request GNOME/pango!499
| * fc: Drop unnecessary ifdefsMatthias Clasen2021-11-083-29/+16
| | | | | | | | We are requiring a new enough fontconfig now.
* | Call hb_font_set_ptem when creating fontsset-ptemMatthias Clasen2021-11-081-21/+20
|/ | | | | This is useful information for Harfbuzz to have, so pass it along.
* Update docsMatthias Clasen2021-11-081-1/+2
| | | | Add the new variant values to the docs.
* itemize: Handle text transformssmall-capsMatthias Clasen2021-11-081-17/+70
| | | | | | Take text transforms into account when emulating Small Caps. This requires us to have log attrs to determine word starts.
* Reshuffle itemize APIMatthias Clasen2021-11-083-31/+59
| | | | | | | | | | | Split the post-processing off into a separate function that can take log attrs in addition. This will allow us to handle word starts when dealing with text transforms for emulated Small Caps. So far, this is all private API that is used from PangoLayout. Please file an issue if you want to access Small Caps emulation without PangoLayout.
* Cosmetics: Add the right sectionMatthias Clasen2021-11-071-1/+4
| | | | Move private API out of the 'Public API' section.
* Reshuffle private headers a bitMatthias Clasen2021-11-073-14/+15
| | | | pango_itemize_with_font belongs into pango-item-private.h.
* shape: Be consistent when getting text transformsMatthias Clasen2021-11-071-2/+3
| | | | We want last-one-wins semantics here.
* itemize: Emulate other casing variantsMatthias Clasen2021-11-071-67/+130
| | | | | | | | | | | | When we detect that one of the other casing variants is requested, but not available via OpenType font features, emulate it by splitting the item into lowercase and uppercase runs and apply a suitable font scale and text transform to the runs to get the desired effect. Still to do: resolve conflics with preexisting text transform attributes.
* fc: Implement the other casing variantsMatthias Clasen2021-11-071-5/+66
| | | | | | Pass all the PangoVariant values through the FcPattern by translating them into suitable OpenType features in the pattern.
* Add more casing variantsMatthias Clasen2021-11-072-3/+30
| | | | | Add values for all the css casing variants to the PangoVariant enum.
* itemize: Implement emulated Small CapsMatthias Clasen2021-11-071-1/+181
| | | | | | | | | | | When we detect that Small Caps are requested, but not available via OpenType font features, emulate Small Caps by splitting the item into lowercase and uppercase runs and add text transform and font scale attributes to the lowercase runs to get the effect of Small Caps. Still to do: resolve conflicts with preexisting text transform attributes.
* itemize: Break out a helperMatthias Clasen2021-11-071-27/+32
| | | | | | Factor out the 'consider as space' part from the itemization code, so we can reuse it when breaking items into upper- and lowercase runs.
* itemize: Handle PANGO_FONT_SCALE_SMALL_CAPSMatthias Clasen2021-11-071-17/+39
| | | | This is not used by anything yet.
* Add PANGO_FONT_SCALE_SMALL_CAPSMatthias Clasen2021-11-071-1/+3
| | | | | This will be used in the implementation of emulated Small Caps.
* shape: Use the new helperMatthias Clasen2021-11-061-68/+2
|
* pango-item: Add a helperMatthias Clasen2021-11-062-0/+73
| | | | | | Add a helper function that used to live with the Harfbuzz shaping code in shape.c. It will be used in the itemize code too, in the future.
* fc: Implement PANGO_VARIANT_SMALL_CAPSMatthias Clasen2021-11-051-0/+21
| | | | | | | Arrange for PANGO_VARIANT_SMALL_CAPS to be translated into the OpenType feature smcp=1 and back. This makes small caps survive a roundtrip from font description to font and back.
* Fix advance widths with transformsadvance-transformMatthias Clasen2021-11-051-29/+13
| | | | | | | | | | The hb_font_t we were passing to Harfbuzz for shaping was not taking context transforms into account, and therefore was not scaling advance widths as necessary. Always go through pangos glyph extents to fix this. Fixes: #620
View Lorry Controller Status