Merge remote-tracking branch 'origin/master' into fcitx

.github/ISSUE_TEMPLATE/build_error.yml

@@ -0,0 +1,107 @@
+name: Build error
+description: Issues for building Mozc
+title: 'Build error: '
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thank you for your reporting.
+
+ Checking the current CI status and build instructions may address your problem.
+
+ | Linux | Windows | macOS | Android lib |
+ |:-----:|:-------:|:-----:|:-----------:|
+ | [![Linux](https://github.com/google/mozc/actions/workflows/linux.yaml/badge.svg)](https://github.com/google/mozc/actions/workflows/linux.yaml) | [![Windows](https://github.com/google/mozc/actions/workflows/windows.yaml/badge.svg)](https://github.com/google/mozc/actions/workflows/windows.yaml) | [![macOS](https://github.com/google/mozc/actions/workflows/macos.yaml/badge.svg)](https://github.com/google/mozc/actions/workflows/macos.yaml) | [![Android lib](https://github.com/google/mozc/actions/workflows/android.yaml/badge.svg)](https://github.com/google/mozc/actions/workflows/android.yaml) |
+
+ Build instructions:
+ * [Linux / Android-lib](https://github.com/google/mozc/blob/master/docs/build_mozc_in_docker.md)
+ * [macOS](https://github.com/google/mozc/blob/master/docs/build_mozc_in_osx.md)
+ * [Windows](https://github.com/google/mozc/blob/master/docs/build_mozc_in_windows.md)
+
+ - type: textarea
+ id: description
+ attributes:
+ label: Description
+ description: A clear and concise description of what the issue is.
+ validations:
+ required: true
+
+ - type: input
+ id: commit_id
+ attributes:
+ label: Commit ID
+ description: If this is not the latest commit, please try the latest commit before reporting.
+ placeholder: d50a8b9ae28c4fba265f734b38bc5ae392fe4d25
+ validations:
+ required: true
+
+ - type: dropdown
+ id: target
+ attributes:
+ label: Build target
+ options:
+ - Linux
+ - macOS
+ - Windows
+ - Android-lib
+ - Others (no guarantee)
+ validations:
+ required: true
+
+ - type: dropdown
+ id: build_status
+ attributes:
+ label: CI build status
+ description: Status of https://github.com/google/mozc#build-status
+ options:
+ - passing
+ - failure
+ validations:
+ required: true
+
+ - type: input
+ id: os
+ attributes:
+ label: OS version
+ placeholder: Ubuntu 24.04, macOS 15.1, etc
+ validations:
+ required: true
+
+ - type: textarea
+ id: environment
+ attributes:
+ label: Build environment
+ value: |
+ - Python version (optional): [e.g. 3.11, etc. 3.9+ is required]
+ - Qt6 version (optional): [e.g. 6.7.2, etc.]
+ - Compiler version (optional): [e.g. MSVC 2019, Xcode 14.1, etc.]
+ validations:
+ required: false
+
+ - type: textarea
+ id: steps
+ attributes:
+ label: Build commands
+ description: Steps of command lines to reproduce your error.
+ value: |
+ 1. git ...
+ 2. cd ...
+ 3. bazel ...
+ validations:
+ required: true
+
+ - type: textarea
+ id: logs
+ attributes:
+ label: Error logs
+ validations:
+ required: true
+
+ - type: textarea
+ id: context
+ attributes:
+ label: Additional context
+ description: Add any other context about the problem here.
+ validations:
+ required: false

.github/ISSUE_TEMPLATE/discussions.yml

@@ -0,0 +1,19 @@
+name: Discussions (Q&A, ideas)
+description: please use Discussions rather than Issues for those topics.
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ > [!IMPORTANT]
+ > Please use Discussions rather than Issues for those topics.
+ >
+ > https://github.com/google/mozc/discussions
+
+ - type: input
+ id: na
+ attributes:
+ label: 'N/A'
+ placeholder: Do not use this field.
+ validations:
+ required: true

.github/ISSUE_TEMPLATE/typing_issue.yml

@@ -0,0 +1,26 @@
+name: Typing issue
+description: Please use https://forms.gle/oXgwbqzvSyVHNBSc7 for reporting typing issues
+title: 'Typing issue: '
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ > [!IMPORTANT]
+ > Please use the Google Form for reporting typing issues.
+ >
+ > https://forms.gle/oXgwbqzvSyVHNBSc7
+ >
+ > The
+ > [reports](https://docs.google.com/spreadsheets/d/1AAK8wiTfIhj339Rb98lIRwgGfHndVz-jFXFNXZNQyeo/pubhtml?gid=649291758&single=true)
+ > will be updated in 10 mins.
+ >
+ > See https://github.com/google/mozc/issues/1056
+
+ - type: input
+ id: na
+ attributes:
+ label: 'N/A'
+ placeholder: Do not use this field.
+ validations:
+ required: true

src/data/dictionary_oss/BUILD.bazel

@@ -32,26 +32,31 @@ load("//converter:evaluation.bzl", "evaluation")
 
 package(default_visibility = ["//:__subpackages__"])
 
-exports_files([
- "collocation.txt",
- "collocation_suppression.txt",
- "connection_single_column.txt",
- "dictionary00.txt",
- "dictionary01.txt",
- "dictionary02.txt",
- "dictionary03.txt",
- "dictionary04.txt",
- "dictionary05.txt",
- "dictionary06.txt",
- "dictionary07.txt",
- "dictionary08.txt",
- "dictionary09.txt",
- "id.def",
- "reading_correction.tsv",
- "regression_test_result.tsv",
- "suffix.txt",
- "suggestion_filter.txt",
-])
+exports_files(
+ srcs = ["id.def"],
+ visibility = [
+ "//converter:__pkg__", # for :converter_main
+ "//data_manager:__subpackages__",
+ ],
+)
+
+exports_files(
+ srcs = [
+ "collocation.txt",
+ "collocation_suppression.txt",
+ "connection_single_column.txt",
+ "reading_correction.tsv",
+ "suffix.txt",
+ "suggestion_filter.txt",
+ ],
+ visibility = ["//data_manager:__subpackages__"],
+)
+
+exports_files(
+ # dictionary00.txt is used in system_dictionary_test.cc.
+ srcs = ["dictionary00.txt"],
+ visibility = ["//dictionary/system:__pkg__"],
+)
 
 filegroup(
  name = "base_dictionary_data",

src/dictionary/gen_zip_code_seed.py

@@ -125,12 +125,14 @@ def ReadJigyosyoEntry(zip_code, level1, level2, level3, name):
 def ParseTownName(level3):
  """Parse town name."""
  # Skip some exceptional cases
- # 871-0099 中津市の次に番地がくる場合 (大分県中津市)
- # 409-0142 小菅村の次に1~663番地がくる場合 (山梨県北都留郡小菅村)
- # 409-0211 小菅村の次に664番地以降がくる場合 (山梨県北都留郡小菅村)
- # 901-3601 渡名喜村一円 (沖縄県島尻郡渡名喜村)
+ # 中津市の次に番地がくる場合 : 871-0099 大分県中津市
+ # 小菅村の次に1~663番地がくる場合 : 409-0142 山梨県北都留郡小菅村
+ # 小菅村の次に664番地以降がくる場合 : 409-0211 山梨県北都留郡小菅村
+ # 渡名喜村一円 : 901-3601 沖縄県島尻郡渡名喜村
+ # 琴平町の次に４２７番地以降がくる場合（川西） : 766-0001 香川県仲多度郡琴平町
+ # 琴平町の次に１～４２６番地がくる場合（川東） : 766-0002 香川県仲多度郡琴平町
  if (level3.find(u'以下に掲載がない場合') != -1 or
- level3.endswith(u'がくる場合') or
+ level3.find(u'がくる場合') != -1 or
  level3.endswith(u'村一円')):
  return ['']
 

src/mac/GoogleJapaneseInputController.h

@@ -87,10 +87,10 @@
  NSTimeInterval lastKeyDownTime_;
  uint16_t lastKeyCode_;
 
- /** |candidateController_| controls the candidate windows. */
- std::unique_ptr<mozc::renderer::RendererInterface> candidateController_;
+ /** |mozcRenderer_| controls the candidate windows. */
+ std::unique_ptr<mozc::renderer::RendererInterface> mozcRenderer_;
 
- /** |rendererCommand_| stores the command sent to |candidateController_| */
+ /** |rendererCommand_| stores the command sent to |mozcRenderer_| */
  mozc::commands::RendererCommand rendererCommand_;
 
  /** |mozcClient_| manages connection to the mozc server. */