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

8285308: Win: Japanese logical fonts are drawn with wrong size #8662

Closed
wants to merge 2 commits into from

Conversation

prrace
Copy link
Contributor

@prrace prrace commented May 11, 2022

This replaces the PR from Toshio https://git.openjdk.java.net/jdk/pull/8329
It is similar in the idea from what we converged on towards the end there but

  1. I'd like to preserve all the support for the old encodings since JEP-400 explicitly supports using -Dfile.encoding=windows-31j (for example)
  2. I wanted to have the look up for the font to use in the windows text control succeed on the first font it finds not the last. In practice I expect this to be a no-op but if someone did have two that match .. don't you think they mean the first one to be the primary ?
  3. I needed to update the encoding match to ensure that some optional re-ordering for Japanese logical fonts works in the UTF-8.ja locale as that is now the default.

I verified this fix by changing regional settings as well as passing -Duser.language=ja -Duser.country=JP and logical fonts on lightweights (verified in Font2DTest) are as expected and the "fonttest.java" now behaves as it did in JDK 17 and earlier. Since you need to switch regional settings automating this test was not possible.

@toshiona you very likely want to take a look at it.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8285308: Win: Japanese logical fonts are drawn with wrong size

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8662/head:pull/8662
$ git checkout pull/8662

Update a local copy of the PR:
$ git checkout pull/8662
$ git pull https://git.openjdk.java.net/jdk pull/8662/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8662

View PR using the GUI difftool:
$ git pr show -t 8662

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8662.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 11, 2022

👋 Welcome back prr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title 8285308 8285308: Win: Japanese logical fonts are drawn with wrong size May 11, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label May 11, 2022
@openjdk
Copy link

openjdk bot commented May 11, 2022

@prrace The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label May 11, 2022
@mlbridge
Copy link

mlbridge bot commented May 11, 2022

Webrevs

}
case "ru" -> "RUSSIAN_CHARSET";
case "el" -> "GREEK_CHARSET";
case "iw" -> "HEBREW_CHARSET";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be safe to specify both old(iw)/new(he) language codes for Hebrew, as "he" is now returned for Hebrew by default (https://bugs.openjdk.java.net/browse/JDK-8263202)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok - fixed

@toshiona
Copy link
Contributor

I agree with your fix. It works on my Japanese environment as well.

@openjdk
Copy link

openjdk bot commented May 19, 2022

@prrace This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8285308: Win: Japanese logical fonts are drawn with wrong size

Reviewed-by: kizune, naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 219 new commits pushed to the master branch:

  • de74e0e: 8280035: Use Class.isInstance instead of Class.isAssignableFrom where applicable
  • 9f562ef: 8286872: Refactor add/modify notification icon (TrayIcon)
  • b089229: 8271078: jdk/incubator/vector/Float128VectorTests.java failed a subtest
  • 079312c: 8286182: [BACKOUT] x86: Handle integral division overflow during parsing
  • 7b19226: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • e60d8b5: 8253176: Signature.getParameters should specify that it can throw UnsupportedOperationException
  • aa50625: 8286447: [Linux] AWT should start in Headless mode if headful AWT library not installed
  • 655500a: 8286654: Add an optional description accessor on ToolProvider interface
  • ac6a7d7: 8278367: JNI critical region violation in CTextPipe.m:363
  • 83cec4b: 8284273: Early crashes in os::print_context on AArch64
  • ... and 209 more: https://git.openjdk.java.net/jdk/compare/9583e3657e43cc1c6f2101a64534564db2a9bd84...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 19, 2022
@prrace
Copy link
Contributor Author

prrace commented May 19, 2022

@naotoj @toshiona would one of you be the 2nd APPROVER for this ?

Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@prrace
Copy link
Contributor Author

prrace commented May 19, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 19, 2022

Going to push as commit 40e99a1.
Since your change was applied there have been 220 commits pushed to the master branch:

  • 890771e: 8285517: System.getenv() returns unexpected value if environment variable has non ASCII character
  • de74e0e: 8280035: Use Class.isInstance instead of Class.isAssignableFrom where applicable
  • 9f562ef: 8286872: Refactor add/modify notification icon (TrayIcon)
  • b089229: 8271078: jdk/incubator/vector/Float128VectorTests.java failed a subtest
  • 079312c: 8286182: [BACKOUT] x86: Handle integral division overflow during parsing
  • 7b19226: 8267038: Update IANA Language Subtag Registry to Version 2022-03-02
  • e60d8b5: 8253176: Signature.getParameters should specify that it can throw UnsupportedOperationException
  • aa50625: 8286447: [Linux] AWT should start in Headless mode if headful AWT library not installed
  • 655500a: 8286654: Add an optional description accessor on ToolProvider interface
  • ac6a7d7: 8278367: JNI critical region violation in CTextPipe.m:363
  • ... and 210 more: https://git.openjdk.java.net/jdk/compare/9583e3657e43cc1c6f2101a64534564db2a9bd84...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 19, 2022
@openjdk openjdk bot closed this May 19, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 19, 2022
@openjdk
Copy link

openjdk bot commented May 19, 2022

@prrace Pushed as commit 40e99a1.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants