Commit graph

68 commits

Author SHA1 Message Date
Xiao YiFang 570949b9f9 fix conflict with upstream as codebase has changed a lot 2022-11-06 10:09:09 +08:00
Xiao YiFang f33743b448 Merge commit 'fdcd6a37' into gd-master 2022-11-06 10:05:49 +08:00
Igor Kushnir 38f5fa6c90 Don't warn about unclosed DSL [mN] tags
According to DSL documentation, closing the [mN] tags is optional:
unclosed [mN] tags affect formatting until the end of a card.

As many dictionaries don't close the [mN] tags, GoldenDict printed
multiple unclosed-tag warnings during each word lookup.
2022-11-05 17:37:43 +03:00
Igor Kushnir 7c0c586418 Extract is_mN() and isAnyM() 2022-11-05 17:37:43 +03:00
Igor Kushnir d6696b0800 Expand unclosed tag DSL warning message
The dictionary name, article and the tag name help to locate the issue.

GD_FDPRINTF() => gdWarning() to improve flexibility and user options.
2022-11-05 17:37:43 +03:00
Xiao YiFang 8f5a552e77 work around to fix too long headword in dsl 2022-06-28 20:47:38 +08:00
Xiao YiFang ba10f68c1c clean code: replace throw() with noexcept 2022-06-03 21:29:06 +08:00
Xiao YiFang 40f67d7f0f fix: dsl dictionary crash when skip expandOptionalParts as headword is too long 2022-05-21 22:50:04 +08:00
YiFang acf3165374 Fix merge conflict 2022-05-06 13:26:23 +08:00
Abs62 f5fdb2ae51 DSL: Fix escaped brackets handling in inside card headwords 2022-04-30 12:56:37 +03:00
xiaoyifang 7b5511a7bd upgrade to qt6.2 2022-03-11 22:00:45 +08:00
yifang 2a08b6290e fix:dsl dictionary parse. 2022-03-03 00:26:21 +08:00
yifang b652d50291 optimize: wchar use builtin char32_t
optimize: wchar use builtin char32_t
2022-02-17 22:33:58 +08:00
xiaoyifang c7d33f4eb9 clean code: remove old cpp feature 2022-01-09 16:35:07 +08:00
yifang 98ca729446 remove qt_version_check macro 2021-12-13 22:45:57 +08:00
xiaoyifang 5eac08c97a rename qt4x5.hh to utils.hh
the filename qt4x5 is not proper now,for the qt4 version can never meet.and the qt5 is actually mean qt>5 .
2021-12-13 22:45:35 +08:00
xiaoyifang 8405035d2f refract encoding method 2021-11-06 16:55:51 +08:00
xiaoyifang f0a3df3d6f refract encoding method 2021-11-06 16:26:30 +08:00
xiaoyifang 02a88c98ad load dsl dictionary performance improved 2021-11-06 15:45:36 +08:00
xiaoyifang 2633b32458 load dsl dictionary performance improved 2021-11-06 12:41:26 +08:00
xiaoyifang fb2b667cc5 refract code 2021-10-23 17:37:29 +08:00
yifang cc9fa33733 fix linux compile error 2021-10-23 12:05:16 +08:00
xiaoyifang c9652bbb74 qstream peformance 2021-10-21 22:20:07 +08:00
xiaoyifang ded545ecf3 fix dictionary parse error:
1,mdx dictionary load error in windows.
2,dsl dictionary load error in windows.
2021-10-19 00:19:25 +08:00
Abs62 7db077bd03 DSL: Don't convert escaped spaces into non-breakable inside [s] tag 2021-02-13 11:39:05 +03:00
Abs62 f0b7b8e33c DSL: Fix {(...)} case handling in insided cards 2019-06-24 17:59:13 +03:00
Abs62 fd00e9d156 Fix gcc 7.3 compiler warnings (#issue 978) 2018-05-21 18:32:04 +03:00
Abs62 1dc4c24966 DSL: Warnings about unknown and unfinished tags 2018-03-19 17:44:12 +03:00
Abs62 274cef7db9 DSL: Trim whitespaces while replace tilde 2017-10-02 20:49:31 +03:00
Abs62 d763c6ec81 Dsl: Add support for "#SOUND_DICTIONARY" directive 2017-07-09 20:15:35 +03:00
Abs62 fd28252253 Dsl: Allow dsl tags before subcard '@' sign 2017-07-04 17:41:38 +03:00
Abs62 992f800263 Dsl: More handle unescaped '@' symbols 2017-07-03 22:45:00 +03:00
Abs62 64afb464ed Dsl: Handle unescaped '@' symbols 2017-07-03 18:12:22 +03:00
Abs62 af0a6f42cc Correct some log messages 2017-06-22 18:02:04 +03:00
Abs62 ae767ab06f DSL: Handle "id" and "name" attributes in "lang" tag 2016-12-22 22:58:01 +03:00
Abs62 b7769c6df1 DSL: Fix escaped symbols handling in <<...>> tag 2015-04-14 18:01:16 +03:00
Abs62 450130cd97 DSL: Handle [video] and [br] tags 2014-10-29 17:46:42 +03:00
Abs62 eac157af29 DSL: Fix accent tags in "<<...>>" references 2014-10-02 17:53:12 +04:00
Abs62 4120213ee8 Rename "DPRINTF" and "FDPRINTF" debug macro 2014-05-11 01:02:31 +04:00
Abs62 9754f5f479 DSL: Fix headwords normalizing 2014-04-24 22:56:47 +04:00
Abs62 01b8ae5e17 DSL: Fix case of several headwords per one insided card 2014-04-24 17:56:38 +04:00
Abs62 362acce554 Dsl: A little improve of unmatched tags diagnostic 2014-04-18 16:34:44 +04:00
Abs62 9ad0d5f985 Implement full-text search 2014-04-16 20:18:28 +04:00
Abs62 95a96852bc DSL: Strip unsorted parts in links to insided cards 2014-02-19 17:45:54 +04:00
Abs62 444938a330 Fix logging to file UTF-8 encoded messages 2013-11-16 22:34:09 +04:00
Abs62 e9ce9c89e8 DSL: Avoid breaking of [m] tag by closing some other tag 2013-11-08 16:53:22 +04:00
Tvangeste 148fd1f275 Fix compilation failures with Visual C++ 2012 (issue #375) 2013-08-07 20:29:36 +02:00
Abs62 4af2d43dd2 DSL: Strip comments "{{...}}" when reading file 2013-07-07 14:48:37 +04:00
Tvangeste f0a122e740 DSL: properly handle [m] tag
In short, [m] = [m0].
2013-07-03 16:00:56 +02:00
Abs62 92db6d2d3e DSL: expand subcard links in card 2013-06-07 16:58:10 +04:00