snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-06 15:47:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove script method from hyphenator classes to streamline language-specific hyphenation logic

Browse Source
This commit is contained in:
Arthur Tazhitdinov 2026-01-08 02:42:24 +05:00
parent 8822e83394
commit 34d2b81f40
7 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Epub/Epub/hyphenation/EnglishHyphenator.cpp
View File

@ -343,8 +343,6 @@ const EnglishHyphenator& EnglishHyphenator::instance() {
return instance; return instance;
} }
Script EnglishHyphenator::script() const { return Script::Latin; }
std::vector<size_t> EnglishHyphenator::breakIndexes(const std::vector<CodepointInfo>& cps) const { std::vector<size_t> EnglishHyphenator::breakIndexes(const std::vector<CodepointInfo>& cps) const {
return englishBreakIndexes(cps); return englishBreakIndexes(cps);
} }

1
lib/Epub/Epub/hyphenation/EnglishHyphenator.h
View File

@ -7,7 +7,6 @@ class EnglishHyphenator final : public LanguageHyphenator {
public: public:
static const EnglishHyphenator& instance(); static const EnglishHyphenator& instance();
Script script() const override;
std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const override; std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const override;
private: private:

2
lib/Epub/Epub/hyphenation/HyphenationCommon.h
View File

@ -9,8 +9,6 @@ struct CodepointInfo {
size_t byteOffset; size_t byteOffset;
}; };
enum class Script { Latin, Cyrillic, Mixed };
// Minimum number of codepoints required in prefix and suffix for hyphenation. // Minimum number of codepoints required in prefix and suffix for hyphenation.
constexpr size_t MIN_PREFIX_CP = 2; constexpr size_t MIN_PREFIX_CP = 2;
constexpr size_t MIN_SUFFIX_CP = 2; constexpr size_t MIN_SUFFIX_CP = 2;

20
lib/Epub/Epub/hyphenation/Hyphenator.cpp
View File

@ -13,25 +13,6 @@
namespace { namespace {
// Central registry for language-specific hyphenators supported on device.
const std::array<const LanguageHyphenator*, 2>& registeredHyphenators() {
static const std::array<const LanguageHyphenator*, 2> hyphenators = {
&EnglishHyphenator::instance(),
&RussianHyphenator::instance(),
};
return hyphenators;
}
// Finds the hyphenator matching the detected script.
const LanguageHyphenator* hyphenatorForScript(const Script script) {
for (const auto* hyphenator : registeredHyphenators()) {
if (hyphenator->script() == script) {
return hyphenator;
}
}
return nullptr;
}
// Maps a BCP-47 language tag to a language-specific hyphenator. // Maps a BCP-47 language tag to a language-specific hyphenator.
const LanguageHyphenator* hyphenatorForLanguage(const std::string& langTag) { const LanguageHyphenator* hyphenatorForLanguage(const std::string& langTag) {
if (langTag.empty()) return nullptr; if (langTag.empty()) return nullptr;
@ -109,7 +90,6 @@ std::vector<size_t> collectBreakIndexes(const std::vector<CodepointInfo>& cps) {
return {}; return {};
} }
// Use cached hyphenator to avoid repeated language lookups.
if (const auto* hyphenator = cachedHyphenator()) { if (const auto* hyphenator = cachedHyphenator()) {
auto indexes = hyphenator->breakIndexes(cps); auto indexes = hyphenator->breakIndexes(cps);
return indexes; return indexes;

1
lib/Epub/Epub/hyphenation/LanguageHyphenator.h
View File

@ -7,6 +7,5 @@
class LanguageHyphenator { class LanguageHyphenator {
public: public:
virtual ~LanguageHyphenator() = default; virtual ~LanguageHyphenator() = default;
virtual Script script() const = 0;
virtual std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const = 0; virtual std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const = 0;
}; };

2
lib/Epub/Epub/hyphenation/RussianHyphenator.cpp
View File

@ -405,8 +405,6 @@ const RussianHyphenator& RussianHyphenator::instance() {
return instance; return instance;
} }
Script RussianHyphenator::script() const { return Script::Cyrillic; }
std::vector<size_t> RussianHyphenator::breakIndexes(const std::vector<CodepointInfo>& cps) const { std::vector<size_t> RussianHyphenator::breakIndexes(const std::vector<CodepointInfo>& cps) const {
return russianBreakIndexes(cps); return russianBreakIndexes(cps);
} }

1
lib/Epub/Epub/hyphenation/RussianHyphenator.h
View File

@ -7,7 +7,6 @@ class RussianHyphenator final : public LanguageHyphenator {
public: public:
static const RussianHyphenator& instance(); static const RussianHyphenator& instance();
Script script() const override;
std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const override; std::vector<size_t> breakIndexes(const std::vector<CodepointInfo>& cps) const override;
private: private: