summaryrefslogtreecommitdiff
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.
* Merge branch 'serialize-attrs-and-tabs' into 'main'Matthias Clasen2021-11-1748-905/+1435
|\ | | | | | | | | Add pango_attr_list_to/from_string See merge request GNOME/pango!512
| * Add pango_tab_array_to/from_stringserialize-attrs-and-tabsMatthias Clasen2021-11-173-0/+154
| |
| * Use serialization api in testattributesMatthias Clasen2021-11-173-552/+337
| |
| * tests: Reuse attribute serialization codeMatthias Clasen2021-11-1740-353/+309
| | | | | | | | Update affected test outputs.
| * Add pango_attr_list_to/from_stringMatthias Clasen2021-11-174-0/+635
|/ | | | | | Add an api to serialize PangoAttrList. This will be useful in testing and debugging.
* Merge branch 'rewrite-line-breaking' into 'main'Matthias Clasen2021-11-173-216/+640
|\ | | | | | | | | 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
| |
| * ci: Don't run testrandom on macOsMatthias Clasen2021-11-161-1/+6
| | | | | | | | | | It fails there (although it shouldn't), and I don't have the means to debug it.
| * CosmeticsMatthias Clasen2021-11-161-1/+1
| |
| * Another small leak fixMatthias Clasen2021-11-161-0/+1
| |
| * Fix a small memleakMatthias Clasen2021-11-161-1/+3
| | | | | | | | | | Our asan ci is unforgiving, and point out every memory leak.
| * 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.
| * tests: Add spiced up wrapping testsBenjamin Otte2021-11-152-1/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Generate random string that looks like a sentence. * Measure the size at 100 random widths. * assert that for those widths, when sorted, the measured widths are increasing and the heights are decreasing. * Generate random string that looks like a sentence. * Generate a 2nd string adding hyphen + newline after every char of original string. * Assert that wrap-char wrap with width=0 is not larger than the width of the 2nd string The tests also generate random strings in LTR, RTL or both at the same time to spice the test up even more. It does that by picking random words out of hunspell directories, and if none are installed, it falls back to lorem ipsum.
* | Merge branch 'matthiasc/for-main' into 'main'Matthias Clasen2021-11-172-9/+5
|\ \ | | | | | | | | | | | | build: Bump the harfbuzz req See merge request GNOME/pango!511
| * | build: Bump the harfbuzz reqMatthias Clasen2021-11-162-9/+5
|/ / | | | | | | | | | | | | 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.
* | Merge branch 'matthiasc/for-main' into 'main'Matthias Clasen2021-11-161-3/+0
|\ \ | |/ |/| | | | | pango-view: Remove debug spew See merge request GNOME/pango!508
| * pango-view: Remove debug spewMatthias Clasen2021-11-161-3/+0
|/
* Merge branch 'line-breaking-fixes3' into 'main'Matthias Clasen2021-11-152-38/+78
|\ | | | | | | | | More line breaking fixes See merge request GNOME/pango!507
| * Update affected testsline-breaking-fixes3Matthias Clasen2021-11-151-6/+6
| | | | | | | | Some of the layout tests now get better line breaks.
| * 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
|/
* Merge branch 'fix-itemize-crash' into 'main'Matthias Clasen2021-11-132-2/+32
|\ | | | | | | | | | | | | Fix a bug in Small Caps handling Closes #627 See merge request GNOME/pango!505
| * Skip the test on macOSfix-itemize-crashMatthias Clasen2021-11-131-0/+6
| |
| * Fix a bug in Small Caps handlingMatthias Clasen2021-11-132-2/+26
|/ | | | | | | | | We were not passing the correct split_offset to pango_item_split(). Testcase included. Fixes: #627
* Merge branch 'ltr-line-breaking-fixes' into 'main'Matthias Clasen2021-11-121-68/+51
|\ | | | | | | | | Simplify breakpoint disabling See merge request GNOME/pango!504
| * 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.
* Merge branch 'matthiasc/for-main' into 'main'Matthias Clasen2021-11-121-1/+2
|\ | | | | | | | | Cosmetics See merge request GNOME/pango!503
| * 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
* | Merge branch 'avoid-overlong-lines' into 'main'Matthias Clasen2021-11-125-9/+112
|\ \ | | | | | | | | | | | | layout: Try harder to not produce overlong lines See merge request GNOME/pango!501
| * | 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.
| * | pango-view: Accept width 0Matthias Clasen2021-11-111-2/+2
| | | | | | | | | | | | | | | | | | GTK frequently uses this width during measuring, so it is good if we can reproduce what happens in this case.
| * | pango-view: Add --pango-unitsMatthias Clasen2021-11-111-4/+28
| | | | | | | | | | | | This can make it easier to reproduce problems.
| * | CosmeticsMatthias Clasen2021-11-111-2/+2
|/ /
* | Merge branch 'fix-hyphen-width' into 'main'Matthias Clasen2021-11-114-16/+39
|\ \ | |/ |/| | | | | layout: Fix a poblem with hyphen width See merge request GNOME/pango!500
View Lorry Controller Status