Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xtext: flag tabs, optionally handle tabstops #1049

Merged
merged 1 commit into from Feb 17, 2020

Conversation

poire-z
Copy link
Contributor

@poire-z poire-z commented Feb 16, 2020

Handle tabstops in makeLine() only (to get the segment that fits in the targeted width, with each tab width adjusted so the tab reaches the next tabstop - all that in string logical order).
(But not in shapeLine(), which will just report flags: it's the frontend code job to then handle tabstops just like it handles text justification and alignment.)
Buddy frontend PR: koreader/koreader#5870
Will help closing koreader/koreader#5837,


This change is Reviewable

Handle tabstops in makeLine() only (to get the segment
that fits in the targeted width, with each tab width
adjusted so the tab reaches the next tabstop).
(But not in shapeLine(), which will just report flags:
it's the frontend code job to then handle tabstops just
like it handles text justification and alignment.)
@poire-z poire-z merged commit 2d78203 into koreader:master Feb 17, 2020
@poire-z poire-z deleted the xtext_tabs branch February 17, 2020 15:56
@poire-z
Copy link
Contributor Author

poire-z commented Feb 17, 2020

@NiLuJe : feel free to bring this one (which is a no-op without the frontend buddy PR) with when you bump base in front for your 3 previous commits.

@NiLuJe
Copy link
Member

NiLuJe commented Feb 17, 2020

@poire-z: Waiting on koreader/virdevenv#49 and/or having confirmation that the bots are up to date (@Frenzie ?) ;).

@Frenzie
Copy link
Member

Frenzie commented Feb 17, 2020

@NiLuJe What do you mean exactly? The 0.1.x PB image won't quite build the changes in base properly, so it seems to me there's no point switching it to the new 0.2.x image until base is bumped. But unless you changed something in koxtoolchain I didn't notice (in which case I'd have to rebuild it to pick up the changes) the new image is good to go. Just a little 0.2.0 in the CircleCI config here and on GitLab.

@NiLuJe
Copy link
Member

NiLuJe commented Feb 17, 2020

@Frenzie: Oh, Catch-22 :D. I was waiting for the bump to the new images to bump base :D. (Remember, I don't do Docker, I only have a vague idea of how all of this interacts ^^).

Frenzie added a commit that referenced this pull request Feb 17, 2020
Without it the base CI is now failing to finish properly.

See koreader/virdevenv#49 and #1049 (comment)

Also includes a bump to the base image. See <koreader/virdevenv#48>, closes <#956>.
@Frenzie
Copy link
Member

Frenzie commented Feb 17, 2020

Practically speaking it's basically just a Linux system like yours or mine that's told to build KOReader once a day. The technical container details are quite elegantly abstracted away by Docker as an interface to the relevant Linux kernel features (cgroups).

On GitLab the pipeline automatically run if you change the config, so from that perspective it's the least amount of work to bump base first followed by updating GitLab. Otherwise you have to bother with canceling the pipeline. ;-) (Or not, but that'd be wasteful.)

NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Feb 17, 2020
• Workaround mysterous xtext/hb crner-cases on armv6
  (koreader/koreader-base#1046)
• Use the C BB on every !Android eInk device
  (koreader/koreader-base#1047)
• Switch to our own custom PB TC
  (koreader/koreader-base#1048)
• tabs/tabstop handling in xtext
  (koreader/koreader-base#1049)
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Feb 17, 2020
• Workaround mysterous xtext/hb crner-cases on armv6
  (koreader/koreader-base#1046)
• Use the C BB on every !Android eInk device
  (koreader/koreader-base#1047)
• Switch to our own custom PB TC
  (koreader/koreader-base#1048)
• tabs/tabstop handling in xtext
  (koreader/koreader-base#1049)
NiLuJe pushed a commit that referenced this pull request Feb 18, 2020
Without it the base CI is now failing to finish properly.

See koreader/virdevenv#49 and #1049 (comment)

Also includes a bump to the base image. See <koreader/virdevenv#48>, closes <#956>.
NiLuJe added a commit to koreader/koreader that referenced this pull request Feb 18, 2020
• Workaround mysterous xtext/hb crner-cases on armv6
  (koreader/koreader-base#1046)
• Use the C BB on every !Android eInk device
  (koreader/koreader-base#1047)
• Switch to our own custom PB TC
  (koreader/koreader-base#1048)
• tabs/tabstop handling in xtext
  (koreader/koreader-base#1049)
* Pickup koreader/koreader-base#1050
mwoz123 pushed a commit to mwoz123/koreader that referenced this pull request Mar 29, 2020
• Workaround mysterous xtext/hb crner-cases on armv6
  (koreader/koreader-base#1046)
• Use the C BB on every !Android eInk device
  (koreader/koreader-base#1047)
• Switch to our own custom PB TC
  (koreader/koreader-base#1048)
• tabs/tabstop handling in xtext
  (koreader/koreader-base#1049)
* Pickup koreader/koreader-base#1050
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants