0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move font::is_cjk_char() to help browser implementation

Browse source
This commit is contained in:
Iris Morelle 2021-03-10 17:37:04 -03:00
parent c5e1f77e80
commit 055eb13e67
10 changed files with 56 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source_lists/libwesnoth
View file

@ -7,7 +7,6 @@ display_context.cpp
events.cpp
floating_label.cpp
font/font_config.cpp
font/marked-up_text.cpp
font/sdl_ttf_compat.cpp
font/standard_colors.cpp
font/text.cpp

1
src/display.cpp
View file

@ -29,7 +29,6 @@
#include "hotkey/command_executor.hpp"
#include "language.hpp"
#include "log.hpp"
#include "font/marked-up_text.hpp"
#include "map/map.hpp"
#include "map/label.hpp"
#include "minimap.hpp"

1
src/display_chat_manager.cpp
View file

@ -20,7 +20,6 @@
#include "game_board.hpp" // <-- only needed for is_observer()
#include "preferences/game.hpp"
#include "log.hpp"
#include "font/marked-up_text.hpp"
#include "font/sdl_ttf_compat.hpp"
#include "mp_ui_alerts.hpp"
#include "serialization/string_utils.hpp"

1
src/editor/palette/location_palette.cpp
View file

@ -17,7 +17,6 @@
#include "editor/palette/location_palette.hpp"
#include "gettext.hpp"
#include "font/marked-up_text.hpp"
#include "font/sdl_ttf_compat.hpp"
#include "font/standard_colors.hpp"
#include "tooltips.hpp"

91
src/font/marked-up_text.cpp
View file

@ -1,91 +0,0 @@
/*
Copyright (C) 2003 - 2018 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
/**
* @file
* Support for simple markup in text (fonts, colors, images).
* E.g. "@Victory" will be shown in green.
*/
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "gettext.hpp"
#include "font/marked-up_text.hpp"
#include "font/standard_colors.hpp"
#include "lexical_cast.hpp"
#include "sdl/surface.hpp"
#include "serialization/string_utils.hpp"
#include "serialization/unicode.hpp"
#include "video.hpp"
#include "wml_exception.hpp"
#include "preferences/general.hpp"
namespace font {
bool is_cjk_char(const char32_t ch)
{
/**
* You can check these range at http://unicode.org/charts/
* see the "East Asian Scripts" part.
* Notice that not all characters in that part is still in use today, so don't list them all here.
* Below are characters that I guess may be used in wesnoth translations.
*/
//FIXME add range from Japanese-specific and Korean-specific section if you know the characters are used today.
if (ch < 0x2e80) return false; // shortcut for common non-CJK
return
//Han Ideographs: all except Supplement
(ch >= 0x4e00 && ch < 0x9fcf) ||
(ch >= 0x3400 && ch < 0x4dbf) ||
(ch >= 0x20000 && ch < 0x2a6df) ||
(ch >= 0xf900 && ch < 0xfaff) ||
(ch >= 0x3190 && ch < 0x319f) ||
//Radicals: all except Ideographic Description
(ch >= 0x2e80 && ch < 0x2eff) ||
(ch >= 0x2f00 && ch < 0x2fdf) ||
(ch >= 0x31c0 && ch < 0x31ef) ||
//Chinese-specific: Bopomofo and Bopomofo Extended
(ch >= 0x3104 && ch < 0x312e) ||
(ch >= 0x31a0 && ch < 0x31bb) ||
//Yi-specific: Yi Radicals, Yi Syllables
(ch >= 0xa490 && ch < 0xa4c7) ||
(ch >= 0xa000 && ch < 0xa48d) ||
//Japanese-specific: Hiragana, Katakana, Kana Supplement
(ch >= 0x3040 && ch <= 0x309f) ||
(ch >= 0x30a0 && ch <= 0x30ff) ||
(ch >= 0x1b000 && ch <= 0x1b001) ||
//Ainu-specific: Katakana Phonetic Extensions
(ch >= 0x31f0 && ch <= 0x31ff) ||
//Korean-specific: Hangul Syllables, Hangul Jamo, Hangul Jamo Extended-A, Hangul Jamo Extended-B
(ch >= 0xac00 && ch < 0xd7af) ||
(ch >= 0x1100 && ch <= 0x11ff) ||
(ch >= 0xa960 && ch <= 0xa97c) ||
(ch >= 0xd7b0 && ch <= 0xd7fb) ||
//CJK Symbols and Punctuation
(ch >= 0x3000 && ch < 0x303f) ||
//Halfwidth and Fullwidth Forms
(ch >= 0xff00 && ch < 0xffef);
}
} // end namespace font

36
src/font/marked-up_text.hpp
View file

@ -1,36 +0,0 @@
/*
Copyright (C) 2003 - 2018 by David White <dave@whitevine.net>
Part of the Battle for Wesnoth Project https://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#pragma once
#include "color.hpp"
class CVideo;
class surface;
#include <string>
#include <SDL2/SDL_rect.h>
namespace font {
/**
* Determine if a char32_t is a CJK character
*
* @retval true Input-char is a CJK char
* @retval false Input-char is a not CJK char.
*/
bool is_cjk_char(const char32_t ch);
} // end namespace font

58
src/help/help_impl.cpp
View file

@ -29,7 +29,6 @@
#include "log.hpp" // for LOG_STREAM, logger, etc
#include "utils/make_enum.hpp" // for operator<<
#include "map/map.hpp" // for gamemap
#include "font/marked-up_text.hpp" // for is_cjk_char, word_wrap_text
#include "font/standard_colors.hpp" // for NORMAL_COLOR
#include "font/sdl_ttf_compat.hpp"
#include "units/race.hpp" // for unit_race, etc
@ -95,6 +94,61 @@ const std::string era_prefix = "era_";
const std::string variation_prefix = "variation_";
const std::string ability_prefix = "ability_";
static bool is_cjk_char(const char32_t ch)
{
/**
* You can check these range at http://unicode.org/charts/
* see the "East Asian Scripts" part.
* Notice that not all characters in that part is still in use today, so don't list them all here.
* Below are characters that I guess may be used in wesnoth translations.
*/
//FIXME add range from Japanese-specific and Korean-specific section if you know the characters are used today.
if (ch < 0x2e80) return false; // shortcut for common non-CJK
return
//Han Ideographs: all except Supplement
(ch >= 0x4e00 && ch < 0x9fcf) ||
(ch >= 0x3400 && ch < 0x4dbf) ||
(ch >= 0x20000 && ch < 0x2a6df) ||
(ch >= 0xf900 && ch < 0xfaff) ||
(ch >= 0x3190 && ch < 0x319f) ||
//Radicals: all except Ideographic Description
(ch >= 0x2e80 && ch < 0x2eff) ||
(ch >= 0x2f00 && ch < 0x2fdf) ||
(ch >= 0x31c0 && ch < 0x31ef) ||
//Chinese-specific: Bopomofo and Bopomofo Extended
(ch >= 0x3104 && ch < 0x312e) ||
(ch >= 0x31a0 && ch < 0x31bb) ||
//Yi-specific: Yi Radicals, Yi Syllables
(ch >= 0xa490 && ch < 0xa4c7) ||
(ch >= 0xa000 && ch < 0xa48d) ||
//Japanese-specific: Hiragana, Katakana, Kana Supplement
(ch >= 0x3040 && ch <= 0x309f) ||
(ch >= 0x30a0 && ch <= 0x30ff) ||
(ch >= 0x1b000 && ch <= 0x1b001) ||
//Ainu-specific: Katakana Phonetic Extensions
(ch >= 0x31f0 && ch <= 0x31ff) ||
//Korean-specific: Hangul Syllables, Hangul Jamo, Hangul Jamo Extended-A, Hangul Jamo Extended-B
(ch >= 0xac00 && ch < 0xd7af) ||
(ch >= 0x1100 && ch <= 0x11ff) ||
(ch >= 0xa960 && ch <= 0xa97c) ||
(ch >= 0xd7b0 && ch <= 0xd7fb) ||
//CJK Symbols and Punctuation
(ch >= 0x3000 && ch < 0x303f) ||
//Halfwidth and Fullwidth Forms
(ch >= 0xff00 && ch < 0xffef);
}
bool section_is_referenced(const std::string &section_id, const config &cfg)
{
if (const config &toplevel = cfg.child("toplevel"))
@ -1391,7 +1445,7 @@ std::string get_first_word(const std::string &s)
return re;
char32_t firstchar = *ch;
if (font::is_cjk_char(firstchar)) {
if (is_cjk_char(firstchar)) {
re = unicode_cast<std::string>(firstchar);
}
return re;

1
src/show_dialog.cpp
View file

@ -23,7 +23,6 @@
#include "help/help.hpp"
#include "hotkey/command_executor.hpp"
#include "log.hpp"
#include "font/marked-up_text.hpp"
#include "font/sdl_ttf_compat.hpp"
#include "font/standard_colors.hpp"
#include "sdl/rect.hpp"

1
src/widgets/button.cpp
View file

@ -21,7 +21,6 @@
#include "game_errors.hpp"
#include "picture.hpp"
#include "log.hpp"
#include "font/marked-up_text.hpp"
#include "font/sdl_ttf_compat.hpp"
#include "font/standard_colors.hpp"
#include "sdl/rect.hpp"

1
src/widgets/menu.cpp
View file

@ -21,7 +21,6 @@
#include "language.hpp"
#include "lexical_cast.hpp"
#include "picture.hpp"
#include "font/marked-up_text.hpp"
#include "font/sdl_ttf_compat.hpp"
#include "sdl/rect.hpp"
#include "sound.hpp"