Compare commits

...

1313 Commits

Author SHA1 Message Date
ce1763501b Optimization 2025-02-25 10:59:19 +03:00
896427db83 For bug 72964 2025-02-08 21:59:52 +03:00
2f4b7442c7 Fix CJSContext::GetCurrent method for jsc version 2025-02-06 12:44:39 +03:00
45da53e9ae Refactoring standarttester 2025-02-04 20:12:07 +03:00
a33743cff2 fix bug #73052 2025-02-04 13:44:41 +06:00
a83e19cbdf fix bug #72176 2025-02-03 16:35:23 +00:00
8a991ae24a Merge pull request 'Fix bug #72857' (#208) from fix/bug72857 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/208
2025-02-03 14:35:21 +00:00
6caca87b64 Merge pull request 'For bug #72496' (#207) from fix/bug72496 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/207
2025-02-03 14:35:10 +00:00
9ab884ae24 Merge pull request 'Fix hwp conversion' (#217) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/217
2025-02-03 14:15:54 +00:00
e493d976e3 Fix bug #73036 2025-02-03 16:59:47 +03:00
d75e7342cf Fix bug #73042 2025-02-03 15:45:09 +03:00
ddd750be9c Merge pull request 'Fix write base fonts' (#216) from fix/pdf-standart-fonts into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/216
2025-02-03 12:40:28 +00:00
79a4434583 Fix bug #73040 2025-02-03 15:35:39 +03:00
44ff2aff3c Fix empty FreeText AP 2025-02-03 15:32:41 +03:00
2f4b3e41b3 Fix write base fonts 2025-02-03 15:24:08 +03:00
fe208f5243 Merge pull request 'Fix bug #72961' (#215) from fix/bug-72961 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/215
2025-02-03 11:15:35 +00:00
e41c1d9703 Fix bug #72961 2025-02-03 14:12:29 +03:00
5c5f98a6e3 Fix bug 73014 2025-02-03 10:45:38 +03:00
f9dd82ad47 Merge pull request 'Fix HWP conversion' (#211) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/211
2025-02-03 06:43:31 +00:00
084c8f4b94 Fix bug #72999 2025-02-03 07:17:39 +03:00
bf15325a9e Fix bug #73000 2025-02-03 05:25:55 +03:00
1b50b3a53a Fix bug 72868 2025-02-01 17:39:08 +03:00
70b40c46d2 Fix bug #72721 2025-02-01 11:36:52 +03:00
23798f3c96 Fix ios build 2025-01-31 17:14:07 +03:00
1e8d22080d Merge pull request 'Fix hwp bugs' (#209) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/209
2025-01-31 05:08:55 +00:00
90bcd47fb7 The conversion of the character spacing to hwp has been removed 2025-01-31 03:15:19 +03:00
c1adf0b30c Fix bug #72685 2025-01-31 03:15:12 +03:00
81a4d9ccd0 Fix bug 72936 2025-01-30 16:51:25 +03:00
a97014c173 Disable use filesystem in metafiles (js module) 2025-01-30 14:26:57 +03:00
b3951d083a Fix elements align in html conversion 2025-01-30 10:37:42 +00:00
7d78b37540 Fix bug #72932 2025-01-30 10:37:42 +00:00
ff162d451e Merge pull request 'Fix hwp bug' (#205) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/205
2025-01-30 10:33:13 +00:00
5dc6402006 Fix test file 2025-01-30 13:12:27 +03:00
fae17d9bfc Merge pull request 'For bug #72694' (#204) from fix/bug72694 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/204
2025-01-30 08:02:28 +00:00
931f4edae4 For bug #72694 2025-01-30 13:36:42 +06:00
3609cf1237 Fix bug #72933 2025-01-30 00:49:49 +03:00
cc8fa641aa Merge pull request 'Fix bug 72811' (#203) from fix/bug-72811 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/203
2025-01-29 16:20:19 +00:00
3b9a865d77 Fix bug 72811 2025-01-29 19:07:58 +03:00
f3b0a992bd Fix typo 2025-01-29 18:57:35 +03:00
74f3e7f279 Merge pull request 'Fix hwp conversion' (#202) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/202
2025-01-29 15:45:08 +00:00
d195aa4a79 Fix build 2025-01-29 18:31:12 +03:00
4a384edf08 For bug #72496 2025-01-29 20:23:33 +05:00
30f96cbc6c Fix bug #72705 2025-01-29 18:15:29 +03:00
007362d8be Fix bug #72780 2025-01-29 17:57:54 +03:00
f4aac048ea fix bug #72012 2025-01-29 17:44:17 +03:00
f815fec8ed Fix bug #72714 2025-01-29 17:14:53 +03:00
4ec217226d Fix bug #72721 2025-01-29 16:32:43 +03:00
3cef41e876 Added bookmark conversion, fix bugs, refactoring in hwp format 2025-01-29 16:22:03 +03:00
20bff1d6fe for bug #72794 2025-01-29 11:17:21 +00:00
8da1a109de Fix bug #72857 2025-01-29 02:28:47 +05:00
704cef604e fix bug #72496 2025-01-28 19:26:15 +03:00
3c850e2086 Fix bug #72667 2025-01-28 13:47:20 +00:00
ab660cb8a3 Merge pull request 'for bug #72496' (#198) from For/bug72496 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/198
2025-01-28 13:12:05 +00:00
af4343b1d8 for bug #72496 2025-01-28 16:06:39 +03:00
7e4fe558f4 Fix bug #72847 2025-01-28 15:17:08 +03:00
f942e56361 fix namespaces 2025-01-28 13:46:28 +03:00
8b85f6987f Merge pull request 'Fix bug #72839' (#197) from fix/bug-72839 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/197
2025-01-28 09:13:21 +00:00
cbe412d3c7 Fix bug #72839 2025-01-28 12:03:31 +03:00
d3d9c8df94 Added text indent in hwp conversion 2025-01-27 22:14:25 +03:00
01b582c4b9 Added BorderFill in hwp conversion 2025-01-27 22:01:41 +03:00
4568144a22 Merge branch 'fix/bug72794' into release/v8.3.0 2025-01-27 20:38:15 +03:00
cc4df3726a fix bug #72745 2025-01-27 20:37:02 +03:00
696610862a . 2025-01-27 18:27:20 +03:00
da6a5e9e98 for binary 2025-01-27 15:30:56 +03:00
d395e63b80 Merge pull request 'Fix bug #72657' (#188) from fix/bug72657 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/188
2025-01-27 12:30:02 +00:00
0350675df6 Fix min version 2025-01-27 13:58:30 +03:00
aead2e9fb8 Merge pull request 'Fix bug#72779' (#196) from fix/bug72779 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/196
2025-01-27 10:03:20 +00:00
d12bad7bd1 Fix bug#72779 2025-01-27 15:58:25 +06:00
da2284fff6 Fix bug #72712 2025-01-26 18:26:03 +00:00
1382aa0b3d Fix bug #72780 2025-01-26 18:26:03 +00:00
8ba5df60d9 Fix bug #72705 2025-01-26 18:26:03 +00:00
5299872b17 Fixes for snapshots 2025-01-26 20:18:14 +03:00
e1757dd5d1 fix bug #72796 2025-01-26 12:10:44 +03:00
b5c5a5f1ed Fix bug #72781 2025-01-25 17:56:11 +00:00
6979e17c3d Added polygon and curve conversion in hwp format 2025-01-25 17:56:11 +00:00
c43fb92860 Fixed the correction of large text size in svg 2025-01-25 18:27:22 +03:00
63887c95b6 Use wmf&emf instead conversion to svg in zip images (for native convertations) 2025-01-25 13:39:35 +03:00
d3d4e86925 Merge pull request 'Fix bug #72365' (#179) from fix/bug72365 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/179
2025-01-25 09:25:56 +00:00
f6383571eb fix bug #72794 2025-01-25 12:18:30 +03:00
a6f6a67aed Fix prev commit 2025-01-24 23:30:51 +03:00
f9543ef9de Year Up 2025-01-24 23:03:42 +03:00
bb58be4f18 Add new method for images inside zip 2025-01-24 22:51:04 +03:00
40efe7dabc Fix build 2025-01-24 18:10:29 +00:00
80b7caaf7a Fix bug #72721 2025-01-24 18:10:29 +00:00
08e3dfb061 Fix bug #72772 2025-01-24 18:10:29 +00:00
3a9d91b291 Fix bug #72719 2025-01-24 18:10:29 +00:00
45b26554b2 Merge pull request 'Fix bug #72175' (#191) from fix/bug72175 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/191
2025-01-24 16:19:30 +00:00
09c4df8e05 Fix remove AP when transform 2025-01-24 17:53:23 +03:00
85533a6553 fix bug #72768 2025-01-24 17:35:53 +03:00
65898a94ad Merge pull request 'Fix hwp bugs' (#187) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/187
2025-01-24 11:31:39 +00:00
86009ff6fa Fix bug #72175 2025-01-24 12:46:02 +03:00
b91dfb075e Fix bug #72657 2025-01-24 13:42:37 +06:00
f057a16bc1 Fix bug #72700 2025-01-24 04:32:32 +03:00
bd76adc97f Fix bug #72714 2025-01-23 23:36:47 +03:00
27b5dbf15e Fix bad conversion hwp to ooxml 2025-01-23 23:08:52 +03:00
58a7c7cd9d Merge branch 'release/v8.3.0' of git.onlyoffice.com:ONLYOFFICE/core into release/v8.3.0 2025-01-23 15:12:51 +03:00
18fa4639b0 fix convert to ooxml 2025-01-23 15:12:43 +03:00
389e5314df Fix bug #72692 2025-01-23 15:03:17 +03:00
42636a8ab1 Merge pull request 'Fix bug #72173' (#185) from fix/bug72173 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/185
2025-01-23 11:45:45 +00:00
a3c87e7119 Fix crash with fonts with symbol > 0x10FFFF and wirh \n in name 2025-01-23 14:41:39 +03:00
2115371c0c Fix bug #72173 2025-01-23 13:17:46 +03:00
bd95478d77 Fix build 2025-01-22 19:40:15 +03:00
965680de23 Fix build 2025-01-22 19:32:31 +03:00
ad44ddf682 Fix build 2025-01-22 18:55:57 +03:00
06386d5458 Fix build 2025-01-22 18:25:41 +03:00
ffda83848d Fix bug 70819 2025-01-22 15:48:26 +03:00
55dc0b789f Merge remote-tracking branch 'origin/feature/hwpx' into release/v8.3.0 2025-01-22 14:28:50 +03:00
53e3f8c561 Merge pull request 'feature/docx-renderer' (#183) from feature/docx-renderer into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/183
2025-01-22 11:25:17 +00:00
731a7addee Comment logic 2025-01-22 12:57:21 +03:00
36b82c1ef9 add default font size on odf math 2025-01-22 12:42:46 +03:00
229a8f9dad . 2025-01-22 12:14:08 +03:00
5f5d74df92 . 2025-01-22 12:13:15 +03:00
66ea88bf14 fix bug #72043 2025-01-22 12:08:39 +03:00
3953044063 Add clearing 2025-01-22 11:36:13 +03:00
9a4a1546cb Fix bug #72655 2025-01-21 23:19:08 +03:00
4085ee5002 Merge pull request 'Fix bug #69572' (#180) from fix/bug69572 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/180
2025-01-21 15:03:02 +00:00
f6ef582658 Merge pull request 'Fix bug#72187' (#176) from fix/bug72187 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/176
2025-01-21 15:02:15 +00:00
7b62295149 Fix bug 72544 2025-01-21 17:38:05 +03:00
421dcd780d Fix bug #69572 2025-01-21 20:17:24 +06:00
b9e7a3143c Fix bug 72595 2025-01-21 15:57:35 +03:00
6026841c00 Refactoring 2025-01-21 13:01:02 +03:00
1e6d0a9f25 fix text entry 2025-01-21 12:14:13 +03:00
adad3a05ba Fix build 2025-01-21 11:51:14 +03:00
99fa27e693 Merge branch 'release/v8.3.0' into feature/hwpx 2025-01-21 11:50:09 +03:00
6b66c8fb50 Merge pull request 'Fix bug#72189' (#177) from fix/bug72189 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/177
2025-01-21 07:49:05 +00:00
9faa7fb69d Added hwpx format to ASCConverter 2025-01-21 02:49:51 +03:00
84042360ab Fixed bugs in hwpx conversion 2025-01-21 02:49:10 +03:00
8a8a6e78eb fix bug #72578 2025-01-20 21:49:25 +03:00
8bd655dd17 fix bug #72611 2025-01-20 21:22:45 +03:00
34ecf84835 Merge pull request 'Fix bug #72414' (#161) from fix/bug72414 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/161
2025-01-20 18:05:36 +00:00
4cf79c985d Merge pull request 'Fix bug #72432' (#162) from fix/bug72432 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/162
2025-01-20 18:05:05 +00:00
18e359c1a6 Merge pull request 'Fix bug #72375' (#163) from fix/bug72375 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/163
2025-01-20 18:04:21 +00:00
dc777f43d9 Merge pull request 'Fix bug #72264' (#164) from fix/bug72264 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/164
2025-01-20 18:03:52 +00:00
8cd7ca9731 Merge pull request 'Fix bug #72039' (#165) from fix/bug72039 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/165
2025-01-20 18:03:13 +00:00
8f91c47178 Merge pull request 'Fix bug #69238' (#166) from fix/bug69238 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/166
2025-01-20 18:02:44 +00:00
fdac954df5 Add main logic of tables (in developing) 2025-01-20 16:14:28 +03:00
70c98eb9f3 Fix build 2025-01-20 15:42:37 +03:00
024efd2e35 Fix bug #72535 2025-01-20 11:12:14 +00:00
da252bfa5e Fix bug #72589 2025-01-20 11:05:28 +00:00
c9ce68eab3 Improved work with external style files in html 2025-01-20 11:05:28 +00:00
3af549a158 Fix bug #72586 2025-01-20 11:05:28 +00:00
34627ff1c5 Fix bug #72519 2025-01-20 11:05:28 +00:00
0c2b49af11 Fix build for win XP 2025-01-20 10:53:51 +03:00
4324ea847c Reafactoring and fixed bugs in hwp conversion 2025-01-19 20:06:41 +03:00
df76ff3778 Fix bug 72537 2025-01-17 20:11:47 +03:00
172bb09305 Fix bug 72484 2025-01-17 20:07:45 +03:00
aa0ba83d32 Fix bug#72189 2025-01-17 18:44:27 +03:00
fb934ef527 Fix bug #72558 2025-01-17 15:18:52 +03:00
a2b817bbc2 Merge pull request 'for bug #72486' (#169) from fix/bug72486 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/169
2025-01-17 09:29:25 +00:00
ecd80408e2 for bug #72486 2025-01-17 15:23:28 +06:00
b78e2cb33c Adding parsing of hwpx format elements 2025-01-17 02:42:21 +03:00
f0c52d2e81 Merge pull request 'Fixed html bugs' (#168) from fix/html into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/168
2025-01-16 12:24:11 +00:00
23ac269339 Fix bug #72533 2025-01-16 15:02:32 +03:00
8239d6f51d Fix bug 72529 2025-01-16 10:42:07 +03:00
3adf336384 For bug #72519 2025-01-15 22:42:28 +03:00
8e1810697f Fix bug #72519 2025-01-15 20:34:02 +03:00
7c2105b613 Fix bug #72365 2025-01-15 22:13:04 +05:00
2027defafb Fix bug #69238
Merge remote-tracking branch 'origin/release/v8.3.0' into fix/bug69238
2025-01-15 21:11:24 +05:00
2ea586ec6f Fix bug #72414 2025-01-15 20:13:21 +05:00
a6940c42ac Obtain builder's version from INTVER 2025-01-15 13:16:59 +00:00
6ed1cb60d6 Merge pull request 'Fixed bugs in hwp format' (#159) from fix/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/159
2025-01-15 12:55:20 +00:00
2c9e58280b Fixed the bug of missing bmp images in hwp format 2025-01-15 15:09:24 +03:00
f18b50cd4f Fix typo 2025-01-15 14:37:45 +03:00
aa2af5d280 [android] Add new formats 2025-01-15 14:29:38 +03:00
dde69ba65f Fix typo 2025-01-15 13:09:45 +03:00
f51b58c927 [android] Add HWPFile 2025-01-15 09:36:16 +03:00
43f1ac0596 Adding parsing of hwpx format elements 2025-01-15 01:28:37 +03:00
321e0de9f3 Merge pull request 'Fix bug 72489' (#158) from fix/bug-72489 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/158
2025-01-14 14:33:32 +00:00
ca77113e79 . 2025-01-14 17:21:16 +03:00
2098c72a35 Fix bug 72489 2025-01-14 17:11:23 +03:00
06e34fc303 Merge pull request 'Fix bug 71493' (#154) from fix/bug-71493 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/154
2025-01-14 14:09:00 +00:00
7b56d56c0e [android] Add new formats 2025-01-14 15:17:17 +03:00
aa90104b18 Fix build 2025-01-14 13:03:28 +03:00
98b285ab64 Merge pull request 'Added HWP format' (#155) from feature/hwp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/155
2025-01-14 09:43:21 +00:00
cbd7e8ee7b Refactoring 2025-01-14 09:40:42 +00:00
b76235d4fc For bug #72413 2025-01-14 09:40:42 +00:00
b9e1d77038 Fix bug #72353 2025-01-14 09:40:42 +00:00
8f448d3842 For bug #72318 2025-01-14 09:40:42 +00:00
89d7242d21 Fix bug #72386 2025-01-14 09:39:27 +00:00
9aaa241523 fix bug #72328 2025-01-14 11:01:03 +03:00
02bd5c4b0b Fix bug#72187 2025-01-14 10:17:09 +03:00
4003a39ef9 Fix typo 2025-01-14 01:42:46 +03:00
a5fed4af70 Fix build and refactoring 2025-01-14 01:41:13 +03:00
a9d8cbbc57 Fix bug 71493
Also fix bug 57854, 55429
2025-01-13 17:27:54 +03:00
6c79ab37fa Fix bug 72193 2025-01-13 17:16:52 +03:00
17762b71db Unused files have been deleted 2025-01-13 16:53:14 +03:00
be2f142fd3 Fix build 2025-01-13 16:52:45 +03:00
fdcb2cf7ba Fix bug #72432 2025-01-13 18:19:42 +05:00
07bf7a44aa Fix bug #72375 2025-01-13 17:08:46 +05:00
a2bfbd8368 Adding parsing of hwpx format elements 2025-01-13 01:12:37 +03:00
25553904df Adding parsing of hwpx format elements 2025-01-12 17:25:13 +03:00
954ef08975 Adding parsing of hwpx format elements 2025-01-12 00:34:45 +03:00
aea8b7873c Refactoring and fix bugs 2025-01-11 01:18:41 +03:00
a7774a6bc3 fix bug #72395 2025-01-10 17:10:46 +03:00
4d15b5c19d Improved conversion of shapes properties в hwp format 2025-01-10 00:50:11 +03:00
e230fa1d43 fix bug #53173 2025-01-09 14:02:46 +03:00
3d30144ebb Merge pull request 'Fix scientific numbers csv reading' (#153) from fix/scientific-scv-reading into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/153
2025-01-09 09:54:03 +00:00
3365ca15d6 Fix scientific numbers csv reading 2025-01-09 15:47:22 +06:00
c0debdfe39 Improved conversion of shape styles, fix bugs, refactoring in hwp format 2025-01-09 01:27:30 +03:00
f7d55d48fe Remove depends to CSvgFile from CConverter2OOXML in hwp format 2025-01-08 23:16:37 +03:00
f2510a9410 Merge branch 'release/v8.3.0' into feature/hwp 2025-01-08 23:09:44 +03:00
f2a8a9878b Added partial web video conversion in hwp format 2025-01-08 23:05:19 +03:00
39adc06921 Fixed the merge obstacle 2025-01-08 22:59:00 +03:00
64af642c40 Added AutoNumber conversion in hwp conversion 2025-01-08 01:12:03 +03:00
ef26ac732e Added columns conversion in hwp format 2025-01-08 00:19:57 +03:00
8bbaaf4cef Added header and footer conversion in hwp format, fix bugs and refactoring 2025-01-07 23:14:04 +03:00
de821b73c8 Added endnotes conversion in hwp format and fixed bugs 2025-01-05 23:44:46 +03:00
a7d5fe3994 Added footnotes conversion in hwp format 2025-01-05 23:13:24 +03:00
7deeefbcf4 Added chart conversion in hwp format 2025-01-05 01:48:16 +03:00
3666bdf6fc Fixed bugs in the parse and improved shapes conversion 2025-01-04 16:49:45 +03:00
eaa7bb30db Added rectangle conversion in hwp format 2025-01-03 23:04:36 +03:00
d4619c5786 Added hwp format to x2t 2025-01-03 21:16:03 +03:00
0f3852ab1e Refactoring 2025-01-03 21:14:30 +03:00
fb5b1c5a6e Added conversion of a numbered list in hwp format 2025-01-02 23:20:43 +03:00
cef8ac9fd9 Remove depends to CSvgFile from HtmlFile2. Add initialize fontsfor svg. 2025-01-02 22:36:18 +03:00
45aa5df267 Fix build 2025-01-02 21:50:30 +03:00
e8c94aa103 Improved text conversion in hwp format 2024-12-31 13:48:26 +03:00
aa5b7e1276 Improved conversion of styles in hwp format 2024-12-31 01:08:15 +03:00
dd98d0c11d Merge pull request 'Fix bug 72344' (#149) from fix/bug-72344 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/149
2024-12-28 11:00:20 +00:00
08971025bd Added support for conversion of HWP tables, fixed bugs 2024-12-27 23:58:06 +03:00
00f6a823d6 Fix bug 72344 2024-12-27 20:13:44 +03:00
b4f4da26d6 Mark files as debug 2024-12-27 17:54:45 +03:00
1c9f7ac597 . 2024-12-27 16:16:42 +03:00
673139f5a9 Merge pull request 'Fix Metafile conversion' (#148) from fix/Metafile into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/148
2024-12-27 11:57:39 +00:00
4bf0cee034 Added image conversion to hwp, bug fixes, and refactoring 2024-12-26 20:51:15 +03:00
00abbab370 Fix bug #72264 2024-12-26 17:52:59 +05:00
3125a7a928 fix bug #72263 2024-12-25 20:23:53 +03:00
f20c944c72 Merge pull request 'Fix bug 72273' (#146) from fix/bug-72273 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/146
2024-12-25 08:28:41 +00:00
6d7dc6517b fix bug #70653 2024-12-24 18:28:53 +03:00
6fd84c6c8c [android] Enable minify and update agp 2024-12-24 14:16:53 +03:00
d37f31208c Merge pull request 'Update branch' (#147) from release/v8.3.0 into fix/Metafile
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/147
2024-12-24 10:18:44 +00:00
c472b19e0d Fix bug#72243 2024-12-24 13:07:45 +03:00
7b03bcde89 Writing the HWP format conversion 2024-12-24 11:22:56 +03:00
03a7eb0fd4 Fix bug 72273 2024-12-24 10:45:29 +03:00
c0a779727e Merge pull request 'Fix bug #72173' (#145) from fix/bug72173 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/145
2024-12-24 07:20:13 +00:00
52d3f0bc19 Merge pull request 'Fix bug #72187' (#144) from fix/bug72187 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/144
2024-12-24 07:19:52 +00:00
c17497e304 Merge pull request 'Fix bug #72048' (#143) from fix/bug72048 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/143
2024-12-24 07:19:10 +00:00
6bc4ecbc73 Fix bug #72173 2024-12-24 10:10:08 +03:00
2246077589 Fix bug #72187 2024-12-24 09:57:00 +03:00
91eb74773b Merge branch 'fix/bug72039' of git.onlyoffice.com:ONLYOFFICE/core into fix/bug72039
# Conflicts:
#	OdfFile/Reader/Format/draw_shapes_docx.cpp
2024-12-23 20:31:41 +05:00
5b8d2660aa Fix bug #72039 2024-12-23 20:24:05 +05:00
60ad1c10fd fix bug #72196 2024-12-23 17:29:40 +03:00
36b0cc524e Fix bug #72039 2024-12-23 17:33:13 +05:00
bb33e70b3e The writing code for converting hwp format and fixed bugs 2024-12-23 15:15:24 +03:00
5f2d7b2f5a Add base xml for tables 2024-12-20 19:27:23 +03:00
02aeaa6a64 Fix bug with ascent/descent 2024-12-20 17:38:56 +03:00
7696541430 fix bug #72151 2024-12-20 17:33:11 +03:00
614156f575 fix bug #72170 2024-12-19 13:19:03 +03:00
397abd51a5 Fix bug 72159 2024-12-19 11:32:58 +03:00
d311090ced fix write empty custom 2024-12-18 19:44:06 +03:00
4a110d68c1 Fixed bugs in reading hwp format and added test example 2024-12-18 15:13:43 +03:00
505a3c6224 Merge pull request 'Fix bug 63154' (#140) from fix/bug-63154 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/140
2024-12-18 10:28:36 +00:00
75a21ee162 Fix bug 63154 2024-12-18 13:18:04 +03:00
440cf968d5 Fix bug 70708 2024-12-18 07:39:25 +00:00
3daa374a51 Compute text lines 2024-12-18 07:39:25 +00:00
5d83d912fc Fix bug 72142 2024-12-17 15:41:21 +00:00
695fd3ba1c Merge pull request 'Fix bug #69851' (#139) from fix/bug69851 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/139
2024-12-17 15:32:52 +00:00
75f68904f2 Merge branch 'release/v8.3.0' of git.onlyoffice.com:ONLYOFFICE/core into release/v8.3.0 2024-12-17 18:32:11 +03:00
b99badda9f fix bug #72057 2024-12-17 18:32:06 +03:00
48d86cb7ce Add base classes 2024-12-17 15:39:50 +03:00
9991cc8c03 Rewrite split lines logic 2024-12-17 15:13:53 +03:00
36a3b693d5 Update paragraph logic for enums 2024-12-17 13:44:31 +03:00
dbd6be9520 Fix bug #69851 2024-12-17 15:48:38 +06:00
42ef948fcc Merge pull request 'Create Stamp Annot' (#131) from feature/pdf-new-stamp into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/131
2024-12-17 09:23:32 +00:00
69f4ac3ed7 fix bug #71799 2024-12-17 10:14:47 +03:00
328e379ec2 The writing code for converting hwp format 2024-12-16 21:05:10 +03:00
7d65d4b11a Fix bug #72048 2024-12-16 16:30:44 +03:00
57ba4355f9 fix bug #72062 2024-12-16 15:22:04 +03:00
2eea44bc8c Merge pull request 'Fix int to double conversion' (#136) from fix/bug72062 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/136
2024-12-16 11:04:49 +00:00
cb982a1ad4 Fix int to double conversion 2024-12-16 15:28:15 +06:00
0aca0a0a5a fix bug #71977 2024-12-15 12:47:27 +03:00
0c1df859e2 The writing code for converting hwp format 2024-12-14 16:36:33 +03:00
7a153285c8 fix bug #72063 2024-12-14 12:56:00 +03:00
c2d00ee819 Merge pull request 'Fix bug #54422' (#135) from fix/bug54422 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/135
2024-12-14 09:01:38 +00:00
3603787df8 Merge pull request 'Fix bug #71477' (#134) from fix/bug71477 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/134
2024-12-14 08:58:29 +00:00
d58424d089 Fix build 2024-12-14 11:38:11 +03:00
fe2ca8c566 Delete unused headers & add new files 2024-12-14 11:33:47 +03:00
20d2ff7954 Refactoring 2024-12-14 11:18:42 +03:00
b125c19d02 Remove useless call 2024-12-14 07:13:48 +03:00
2f2d11a5f6 Fix bug with recalc size of space 2024-12-14 06:51:59 +03:00
de4897fdef Add HorVerLinesCollector 2024-12-13 16:54:16 +03:00
f9952d0f94 Refactoring for future tables 2024-12-13 15:50:32 +03:00
5483a8d36b Merge pull request 'Fix bug #72067' (#133) from fix/bug72067 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/133
2024-12-13 12:16:42 +00:00
80ac89f16b fix bug #72065 2024-12-13 15:12:49 +03:00
fcf9830aa6 Fix bug #72067 2024-12-13 17:53:06 +06:00
d7b435a446 Delete unused file 2024-12-13 12:28:13 +03:00
887d963d8d Fix bug 72045 2024-12-12 15:29:31 +03:00
bc4c39b7aa The writing code for converting hwp format 2024-12-11 21:34:46 +03:00
8d89026d19 Change path for pdf.bin 2024-12-11 17:44:48 +03:00
4e6e3ce5f0 Fix rotate double 2024-12-11 14:46:18 +03:00
3d7eced836 Fix Rotate 2024-12-11 14:34:26 +03:00
7130b1be34 [x2t] Rename draw->visio; For bug 72002 2024-12-11 12:25:47 +03:00
a5917c389f The writing code for converting hwp format 2024-12-10 22:19:37 +03:00
eee80b0f87 [x2t] Rename draw->visio; For bug 72002 2024-12-10 19:28:04 +03:00
35dff37820 Create Stamp Annot 2024-12-10 15:07:11 +03:00
2f45a87669 Remove HtmlRenderer library 2024-12-10 14:24:41 +03:00
185b3d54eb Merge pull request 'feature/docx-renderer' (#130) from feature/docx-renderer into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/130
2024-12-10 09:05:54 +00:00
f7f059b6c0 Merge pull request 'Feature pdf text' (#119) from feature/pdf-text into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/119
2024-12-10 09:04:32 +00:00
2a9044d066 No changes HtmlRenderer 2024-12-10 11:20:09 +03:00
a93f00d0af The writing code for converting hwp format 2024-12-09 22:18:04 +03:00
9a1abe9819 Fix bug 71495 2024-12-09 17:50:01 +03:00
f8f9d55ab8 Merge branch hotfix/v8.2.2 into release/v8.3.0 2024-12-09 12:00:06 +00:00
99b777a5eb Merge pull request 'Fix bug #71944' (#121) from fix/bug71944 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/121
2024-12-09 10:19:07 +00:00
d1506ec9fa Merge pull request 'Fix bug #71943' (#122) from fix/bug71943 into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/122
2024-12-09 10:17:14 +00:00
9fc74159ff Fix bug #71927 2024-12-09 12:57:55 +03:00
ec14915925 fix bug 2024-12-09 11:07:11 +03:00
f9f4efc383 Fix statistics 2024-12-09 10:31:50 +03:00
12ad4e604b Add indents logic with bullets 2024-12-09 09:02:07 +03:00
e0ad062380 Add origin font 2024-12-09 08:00:17 +03:00
b72f678c1d Fix drop caps 2024-12-09 07:53:41 +03:00
7b67dfa57c fix bug #71976 2024-12-07 15:48:54 +03:00
5153ac069b fix bug #71974 2024-12-07 12:52:47 +03:00
a08b614bce refactoring convert ods formula 2024-12-07 11:49:52 +03:00
59f41bcdec Fix bug 70699 2024-12-07 06:15:37 +03:00
e8aa709d4e Fix bug #54422 2024-12-07 01:35:12 +05:00
c4515aca3a Problem 2024-12-06 18:01:05 +03:00
3fde7b3f92 fix bug 2024-12-06 15:43:49 +03:00
b776b7b63f The writing code for converting hwp format 2024-12-06 15:18:32 +03:00
d69601c2d2 fix bug #71946 2024-12-06 13:04:37 +03:00
912482beee Merge pull request 'Fix pdf accuracy' (#118) from fix/pdf-precision into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/118
2024-12-06 07:56:22 +00:00
c0ca4189d3 Fix pdf accuracy 2024-12-06 10:48:07 +03:00
134a214a0b Refactoring 2024-12-06 10:45:06 +03:00
95f604ec68 Merge remote-tracking branch 'origin/release/v8.3.0' into feature/pdf-text 2024-12-06 10:33:37 +03:00
ecd71dd92a The writing code for converting hwp format 2024-12-05 21:27:21 +03:00
d8bd9ef845 Fix size of Line 2024-12-05 18:59:43 +03:00
d3a317ed4b Merge pull request 'Fix number format csv reading' (#117) from fix/number-formats-csv-reading into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/117
2024-12-05 09:50:00 +00:00
37141b6ba3 Fix number format csv reading 2024-12-05 15:26:19 +06:00
bd3cabd236 Return to typed arrays 2024-12-04 18:45:59 +03:00
c2403aa0b7 fix 2024-12-04 17:54:08 +03:00
bdf70dd99e Merge pull request 'feature/add-lcid-to-csv' (#116) from feature/add-lcid-to-csv into release/v8.3.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/116
2024-12-04 14:33:37 +00:00
9f18cbce01 Fix bug 71930 2024-12-04 12:38:45 +03:00
05a6f6afaf Fix build android version 2024-12-04 12:03:34 +03:00
7e11af5553 The writing code for converting hwp format 2024-12-03 20:12:50 +03:00
3275182013 Add local using to default date formats 2024-12-03 19:54:23 +06:00
ca2b6d78aa Fix iso date parsing 2024-12-03 15:26:18 +06:00
6a24fd149a Fix bug 71908 2024-12-03 11:56:00 +03:00
168dc1ddb8 Merge remote-tracking branch 'origin/develop' into fix/bug69238 2024-12-03 13:27:22 +05:00
8918b7fae0 Fix formula conversion order 2024-12-03 13:26:51 +05:00
4501adbc61 Update iwork 2024-12-03 08:01:08 +00:00
0c1864a136 Fixed a bug with the termination of recording when converting iwork formats on Linux 2024-12-03 08:01:08 +00:00
3e2373687c Add standart date reading 2024-12-03 13:32:09 +06:00
779af49e0d Add local info inicialization on request 2024-12-02 19:21:53 +06:00
cb2f1c5577 Add more locales support 2024-12-02 18:42:22 +06:00
446a0f9524 Fix bug 70337 2024-12-02 15:20:15 +03:00
1c839e6c62 Add more locales support 2024-12-02 15:39:44 +06:00
f7d7dc8c6b Fix bug 71899 2024-12-02 11:11:06 +03:00
6d789e966a Merge branch 'develop' into feature/add-lcid-to-csv 2024-12-02 13:18:12 +06:00
d20d1af154 The writing code for converting hwp format 2024-11-29 21:46:53 +03:00
925ffa09e2 Merge remote-tracking branch 'origin/develop' into fix/bug69238 2024-11-29 19:33:13 +05:00
dd0ed96e5a fix bug #71885 2024-11-29 16:43:26 +03:00
25b30981ce Add more locales support 2024-11-29 19:33:30 +06:00
ebfee2376f fix opacity 2024-11-29 15:34:57 +03:00
fa33af2304 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-29 17:45:21 +06:00
6b9fc964b9 Fix isSpace 2024-11-28 17:28:33 +03:00
9242ab9743 Merge remote-tracking branch 'origin/develop' into feature/pdf-text 2024-11-28 16:58:46 +03:00
e14cc2d5c5 HtmlRenderer to serialize 2024-11-28 12:29:24 +03:00
cd73a4d9e3 Merge pull request 'feature/docx-renderer' (#107) from feature/docx-renderer into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/107
2024-11-28 09:06:38 +00:00
1b39b9f416 Fix bug 70795 2024-11-28 08:12:16 +00:00
4e57fda1f6 . 2024-11-28 08:12:16 +00:00
f3d65cb04c . 2024-11-28 08:12:16 +00:00
4ba288978d Add method for get document type 2024-11-28 08:12:16 +00:00
c862d58966 fix perm 2024-11-28 08:12:16 +00:00
c6effb6de2 fix bug #71868 2024-11-27 22:49:31 +03:00
295dbbbb86 The writing code for converting hwp format 2024-11-27 20:45:00 +03:00
96b34ee008 fix bug #52238 2024-11-27 20:41:19 +03:00
265db0216b Fix new word 2024-11-27 17:32:14 +03:00
76f2d81655 Add more locales 2024-11-27 17:46:56 +06:00
10ff332f4d Merge remote-tracking branch 'origin/develop' into fix/bug69238 2024-11-27 15:45:33 +05:00
f57179911f The beginning of writing code for converting hwp format 2024-11-26 20:52:11 +03:00
863144596c Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-26 21:43:46 +06:00
a82a8977c3 Add more locales to localinfo 2024-11-26 21:41:35 +06:00
0109c69e38 Merge pull request 'fix build' (#105) from fix/OOXml2Odf-build into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/105
2024-11-26 13:16:15 +00:00
92ce5d81ad fix build 2024-11-26 15:43:48 +03:00
482da0dab3 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-26 18:08:14 +06:00
32afe4f24e Merge pull request 'feature/binary-reading-optimisation' (#104) from feature/binary-reading-optimisation into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/104
2024-11-26 12:05:17 +00:00
182dd9e072 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-26 16:26:13 +06:00
2ba281a5ee Fix empty 2024-11-25 17:31:25 +03:00
b3a30cf2ea Fix row compression 2024-11-25 15:15:25 +06:00
c321783b44 Merge pull request 'fix OOXml2Odf' (#101) from fix/OOXml2Odf into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/101
2024-11-25 09:07:03 +00:00
182cd8d74a Fix bug 70795 2024-11-25 07:59:02 +00:00
98a1988d9a test editing 2024-11-25 10:39:54 +03:00
acd9219b16 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-25 12:58:53 +06:00
0cbcaa209c Add pcrRecord reading 2024-11-22 21:45:18 +06:00
a53e46be24 Add restriction for MS compiler 2024-11-22 17:50:42 +03:00
ab8070aa56 Fix build 2024-11-22 17:38:14 +03:00
6a930c5aa4 Merge pull request 'Fix build for linux' (#100) from fix/iwork-build into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/100
2024-11-22 13:44:43 +00:00
6c0715cc66 Fix build for linux 2024-11-22 15:46:52 +03:00
ce0f8251d3 Fix bug #69238 2024-11-22 17:32:40 +05:00
f019dfbb07 Words with X and Width 2024-11-22 15:09:21 +03:00
fefcef7da4 Add pivot cache records fast reading 2024-11-22 17:07:04 +06:00
361bc70fe3 Merge branch hotfix/v8.2.1 into hotfix/v8.2.2 2024-11-22 10:46:56 +00:00
09b4ab5092 Merge branch hotfix/v8.2.1 into develop 2024-11-22 10:46:55 +00:00
e1fcf17b34 Merge pull request 'feture/iwork-build' (#99) from feture/iwork-build into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/99
2024-11-22 07:34:59 +00:00
c83a8a3a54 Serialization 2024-11-21 17:54:33 +03:00
54f0635500 Optimise PCDIDT records loading 2024-11-21 18:56:29 +06:00
bb48b57af9 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-21 13:13:29 +06:00
8a000efb7f fill stretch 2024-11-20 18:59:09 +03:00
1c362612e3 Refactoring HtmlRendererText 2024-11-20 18:52:06 +03:00
78404c4ffe fix bug #45121 2024-11-20 17:44:22 +03:00
3a49869ce0 change sheet data conversion cicle condition 2024-11-20 19:39:43 +06:00
a1a6e6c9a0 Refactoring 2024-11-20 16:06:24 +03:00
4199716550 Add xlsx->xlsb empty cells compression 2024-11-20 15:36:03 +06:00
6d68d7aee5 . 2024-11-19 23:58:51 +03:00
cf346bd535 CMetafile to NSWasm::CData 2024-11-19 17:41:32 +03:00
61e6b54710 . 2024-11-19 16:44:39 +03:00
536dac5fc9 getSelectionQuads..
The function is called very often, and returns an array of borders for drawing the text selection. Therefore, frequent memory allocation for serialization of the result, frequent reading and freeing of memory. You will have to cache on JS
2024-11-19 15:17:57 +03:00
65ba8ffd3b Add method for get document type 2024-11-19 15:08:16 +03:00
c6467d67c5 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-19 17:46:57 +06:00
5a9812887b Add empty strings compression 2024-11-19 17:29:14 +06:00
e637b47d68 Removed the mandatory dependency on gperf when building iWork 2024-11-19 14:03:25 +03:00
0078a2e19b Move empty cells compression to individual method 2024-11-19 16:14:17 +06:00
d2713d0cfd fix perm 2024-11-19 11:24:16 +03:00
4bf363f458 Merge pull request 'COfficeDrawingPageParams' (#98) from feature/pdf-params into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/98
2024-11-18 16:14:00 +00:00
c1b01029df COfficeDrawingPageParams 2024-11-18 18:59:23 +03:00
4b299fedd7 Fix empty cell compression 2024-11-18 21:18:01 +06:00
dc4074299c change CHtmlRendererText 2024-11-18 18:13:29 +03:00
2d161f1341 edit attributes 2024-11-18 16:54:57 +03:00
fea872d779 Fixed the build of iWork on linux 2024-11-18 16:48:53 +03:00
6c614051d9 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-18 17:46:16 +06:00
2517316e2b Add empty rows compressing 2024-11-18 15:41:23 +06:00
c83e50d164 fix bug #59349 2024-11-16 19:32:40 +03:00
66bc0223cb fix bug #57207 2024-11-16 17:03:17 +03:00
9ea09f95f8 fix bug #17798 2024-11-16 15:01:57 +03:00
d66d95d4c6 Fix bullet paragraph
for simple cases (no paragraph style)
2024-11-15 17:02:45 +03:00
024c288e12 iWork formats are built into x2t 2024-11-15 16:47:05 +03:00
caac75fcc1 Create struct for text 2024-11-15 16:36:59 +03:00
eb88373ec5 Refactoring 2024-11-15 16:00:45 +03:00
4e86a9a08a add cellBlank compression to xlsb->xlsx conversion 2024-11-15 18:07:47 +06:00
099ebc3de9 Enable JS error logs in release mode 2024-11-15 13:57:43 +03:00
4c3b9411b4 Fix bug 70699 2024-11-15 13:17:05 +03:00
555b91e385 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-15 13:12:59 +06:00
9713138f4f Fix other currecyes csv reading 2024-11-14 21:02:02 +06:00
0934c2cda4 Add rtl csv reading for some currencyes 2024-11-14 19:44:47 +06:00
bb204098a1 Fix PDFCoordsToMM 2024-11-14 16:24:14 +03:00
c65e8d4a04 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-14 12:58:50 +06:00
a0cecd357f External libraries have been moved to 3dParty 2024-11-13 21:26:21 +03:00
6a4f30d6fa fix bug #59772 2024-11-13 20:30:11 +03:00
cfde4aa357 Add other currencyes 2024-11-13 19:05:11 +06:00
2a2f33fd6f Fix build 2024-11-13 10:34:59 +03:00
8ad76e4e1f Fix bug 68072 2024-11-13 01:33:43 +03:00
b0b3d6b280 Fix linux build 2024-11-12 20:33:49 +06:00
029e6c6df7 Merge branch hotfix/v8.2.1 into master 2024-11-12 12:49:59 +00:00
e8257896d4 Add loc date format csv writing 2024-11-12 17:45:41 +06:00
1e9a63083b Read CHTMLRenderer 2024-11-11 17:28:58 +03:00
2f525c1e4f Remove using iterator after remove it from list 2024-11-11 14:32:26 +03:00
40a1e15033 Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-11 17:01:53 +06:00
6c93c8b16c Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-11 13:07:37 +06:00
8813f8bb19 Merge remote-tracking branch 'origin/hotfix/v8.2.1' into develop 2024-11-10 20:47:25 +03:00
e979defdee Add param for disable own xml wrappers 2024-11-09 00:21:05 +03:00
cc585185dd Fix bug 71045 2024-11-08 23:03:58 +03:00
9a5240cbba For bug 70996 2024-11-08 19:58:09 +03:00
8e498c8299 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-08 20:59:58 +06:00
706a2252fa for bug #71510 2024-11-08 17:39:13 +03:00
d423549ae4 Add frtRecord skiping in rows and cols 2024-11-08 17:05:10 +06:00
cef0adda0a Add array formula reading 2024-11-08 16:23:53 +06:00
ab2ab7a407 Merge pull request 'Fix bug 71505' (#95) from fix/bug-71505 into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/95
2024-11-08 09:07:45 +00:00
62c401ae5b Refactoring 2024-11-08 11:51:12 +03:00
d73d682cbc Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-08 13:07:38 +06:00
c470363ec0 Fix template parameter redefines default argument 2024-11-08 10:01:50 +03:00
25be50f058 Fix unresolved external symbol, delete include 2024-11-07 22:55:12 +03:00
10931f937a implementation moved to cpp 2024-11-07 21:49:12 +03:00
647c8a3cde Without template 2024-11-07 18:39:20 +03:00
1d4f9b5c41 Reduce _CSoftMask 2024-11-07 18:21:41 +03:00
3de464a31e for bug #71527 2024-11-07 18:01:24 +03:00
3429e8b345 Fix bug 71505 2024-11-07 17:05:16 +03:00
b3f5d84a51 Fix bug #71477 2024-11-07 18:26:12 +05:00
23c2ecfe54 Add shared formula reading 2024-11-07 19:08:42 +06:00
485dcb5272 Fix write int in StringBuilder 2024-11-07 14:27:22 +03:00
1c9a9f53e3 fix bug #52676 2024-11-07 12:35:40 +03:00
62ad5bf127 Add cell metadata conversion from bin 2024-11-07 14:21:22 +06:00
ecc1e974ae fix bug #53487 2024-11-07 11:06:27 +03:00
ef61b90242 Remove unused sheet data params from conversion 2024-11-07 14:01:31 +06:00
00bdf67b8a Merge branch 'develop' into feature/binary-reading-optimisation 2024-11-07 13:03:31 +06:00
ee83f6c826 Merge remote-tracking branch 'origin/hotfix/v8.2.1' into develop 2024-11-07 09:56:08 +03:00
ec50e77695 HtmlRenderer research 2024-11-06 16:22:19 +03:00
72fbe98925 fixing bugs with indices and brackets 2024-11-06 15:48:23 +03:00
4ef62b88cb Revert "Add quick binary reading method"
This reverts commit ac7614c4e6.
2024-11-06 18:37:57 +06:00
3e8d5926ba Revert "Add string conversion optimisation"
This reverts commit cf66adea28.
2024-11-06 18:34:45 +06:00
0284c8df70 Add table cell conversion 2024-11-06 18:31:50 +06:00
3d4faa267e add normal formula conversion 2024-11-06 16:11:35 +06:00
edc0ae2b8d Fix switch-case-break 2024-11-06 10:58:50 +03:00
ebaf0eb43a Fix bug with patch transform & unused memory 2024-11-06 07:35:46 +00:00
eab40d6bb2 fix bug #71478 2024-11-05 18:31:23 +03:00
e7d081aefb Add other cell value types conversion 2024-11-05 21:26:35 +06:00
cc2867e292 Fixed calculation of the conversion matrix in media file conversion 2024-11-05 18:05:09 +03:00
8e51f9bdbb for bug #71449 2024-11-05 18:01:01 +03:00
92b0f4e654 Updated calculation of line width in metafile conversion 2024-11-05 17:09:20 +03:00
46d4d76f26 Add datacell conversion 2024-11-05 18:41:42 +06:00
53593c96af Add direct from bin reading sheet data method 2024-11-05 17:11:06 +06:00
21f75547fb Remove unused code 2024-11-05 14:32:27 +06:00
ac8c99415f fix bug #71415 2024-11-02 19:26:45 +03:00
0daee49007 Add eny delimeter date reading 2024-11-02 19:16:53 +06:00
5a6a2f800f Fix bug 65824 2024-11-02 15:21:53 +03:00
8e3df35232 Add short months reading and writing 2024-11-02 17:49:39 +06:00
521d7c1ee8 Add short month names 2024-11-02 16:31:27 +06:00
f1e80adb9c Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-02 14:22:08 +06:00
3503eee5b6 Create GetGlyphs for PdfFile 2024-11-02 10:00:44 +03:00
1041802214 Fix build 2024-11-02 09:31:07 +03:00
cebc04b852 Unused functionality has been removed 2024-11-02 00:11:02 +03:00
dbfdffd0c5 Fixed missing text in the specified font in the metafile 2024-11-01 23:28:42 +03:00
b8d2cba3ae Refactoring 2024-11-01 22:15:03 +03:00
b56d62442d Added the ability to set shape-rendering in metafile to svg conversion 2024-11-01 21:21:44 +03:00
5d70f47ebc Add lcid long month writing 2024-11-01 21:37:12 +06:00
859351a8d1 Add 14 format csv local writing 2024-11-01 20:36:36 +06:00
fbd408ec6d Add lcid using to csvwriter 2024-11-01 19:32:49 +06:00
c631b62e51 Merge branch 'develop' into feature/add-lcid-to-csv 2024-11-01 17:23:04 +06:00
1286dbaaaf Fix bug with numeric limits 2024-11-01 10:13:57 +00:00
1dbeea42b8 Fix build 2024-11-01 11:18:11 +03:00
0dc65baa25 Merge remote-tracking branch 'origin/hotfix/v8.2.1' into develop 2024-11-01 10:51:12 +03:00
50fec65617 Added support for custom markers in metafile to svg conversion 2024-11-01 10:48:36 +03:00
a5ea301e3e fix bug #71334 2024-11-01 10:22:21 +03:00
fb40437d21 fix bug #53148 2024-11-01 09:37:20 +03:00
cf66adea28 Add string conversion optimisation 2024-10-31 20:47:43 +06:00
42466cf648 Fix atan2 custom shape formula conversion 2024-10-31 18:08:36 +05:00
2b00698810 Add support iwork formats 2024-10-31 15:06:46 +03:00
b00fbeff53 Fix bug #69024 2024-10-31 09:42:40 +00:00
819d1fad17 fix bug #71349 2024-10-31 11:24:20 +03:00
97f0958f09 Merge branch 'develop' into feature/binary-reading-optimisation 2024-10-31 14:00:28 +06:00
ce88c4ca95 Fix pattern bbox offset 2024-10-30 17:58:01 +03:00
ac7614c4e6 Add quick binary reading method 2024-10-30 19:06:23 +06:00
a69a992a0d Fix bug 71330 2024-10-30 16:04:57 +03:00
b4bb20bea7 Fixed a bug with dotted lines in metafiles 2024-10-30 14:53:25 +03:00
949aed7bb4 Fix bug 71045 2024-10-30 14:17:48 +03:00
2ce37e34c4 Fixed a bug with incorrect positioning in EmfPlus 2024-10-30 14:06:12 +03:00
6ec4191483 Fix bug 71308 2024-10-30 12:30:33 +03:00
3401c2b02e Fix bug 70986 2024-10-29 15:05:49 +03:00
0dd0ad0023 Fix unbalanced text operator 2024-10-29 14:50:06 +03:00
8cf7809359 Fix unbalanced text operator 2024-10-29 14:45:27 +03:00
277dd4a464 Merge branch 'hotfix/v8.2.1' into develop 2024-10-29 14:37:45 +03:00
cb8466de27 Fix merge 2024-10-29 14:18:38 +03:00
1c2501eeb1 Merge pull request 'release/v8.2.0' (#85) from release/v8.2.0 into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/85
2024-10-29 10:50:11 +00:00
0d443743a8 Merge pull request 'fix/docx-renderer' (#79) from fix/docx-renderer into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/79
2024-10-29 10:49:29 +00:00
8c7a22b726 fix bug #70715 2024-10-29 13:39:55 +03:00
c8b8462d31 Support for embedded WMFs in emf is disabled 2024-10-29 12:15:50 +03:00
a14b3eb8e2 Fix bug 70952 2024-10-29 11:40:09 +03:00
6eaf590844 For bug #71100 2024-10-29 07:43:06 +00:00
fac279ba81 Fix bug #71100 2024-10-29 07:43:06 +00:00
571a7ee2d1 fix bug #71047 2024-10-29 10:13:34 +03:00
adb6d7bbc2 Remove debug logs by default 2024-10-28 21:22:40 +03:00
f7fa638591 Fix bug 69828 2024-10-28 19:11:56 +03:00
edfa558a38 Merge pull request 'Fix pdf widget AP' (#84) from fix/pdf-widget into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/84
2024-10-28 15:11:26 +00:00
b80ada4b4e Fix old server 2024-10-28 18:06:04 +03:00
492b821472 Fix old server 2024-10-28 17:44:50 +03:00
d75a3a5587 Merge branch 'develop' into feature/add-lcid-to-csv 2024-10-28 19:48:07 +06:00
a8ce7eaad3 Fix crash on v8 engine 2024-10-28 15:49:28 +03:00
8cf78b9e58 Fix write listbox 2024-10-28 15:40:28 +03:00
28bcfafcc6 Fix change font 2024-10-28 15:40:28 +03:00
e527db9515 Write Text Widget AP 2024-10-28 15:40:27 +03:00
db2660a1a3 Text Widget write 2024-10-28 15:40:26 +03:00
77b5ffb56d Fix write listbox 2024-10-28 15:19:04 +03:00
ca70de93a4 Removed memory leak 2024-10-28 15:09:37 +06:00
04565bbdd4 Fix change font 2024-10-28 11:55:01 +03:00
4266857c6e Merge branch 'develop' into feature/binary-reading-optimisation 2024-10-28 14:03:16 +06:00
8e6e510cd6 fix bug #71238 2024-10-26 18:11:29 +03:00
03919dcb33 fix bug #71238 2024-10-26 18:10:52 +03:00
46588b05b1 Merge pull request 'fix/nativeDraw' (#82) from fix/nativeDraw into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/82
2024-10-26 13:32:02 +00:00
dc0ea6a7f3 Add fromJS functionality for Images 2024-10-26 16:28:48 +03:00
a84c8cc471 Add support Images in nativeEditors 2024-10-26 15:06:09 +03:00
986d0f0d95 Write Text Widget AP 2024-10-25 17:26:12 +03:00
cd1bb3b658 Merge pull request 'release/v8.2.0' (#81) from release/v8.2.0 into fix/nativeDraw
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/81
2024-10-25 13:44:43 +00:00
cd71bc0672 Fix build 2024-10-25 14:52:55 +03:00
6caf517fe5 Merge branch 'develop' into feature/binary-reading-optimisation 2024-10-25 17:11:07 +06:00
d65d37476e Fix csv date reading 2024-10-25 17:10:03 +06:00
14c9896773 Merge pull request 'Fix bug #71134' (#78) from fix/bug-71134 into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/78
2024-10-25 10:01:12 +00:00
19694bf32d Adjusted the definition of the possibility of obtaining a local image in html 2024-10-25 12:54:11 +03:00
ffe85bd64f fix bug ooxml->odf. writing tests 2024-10-25 12:31:12 +03:00
d4c4b804c7 Text Widget write 2024-10-25 10:44:39 +03:00
1de2807051 fix bug odf->ooxml(empty row in matrix) 2024-10-25 09:06:27 +03:00
96e1280082 fix bug #71076 2024-10-25 08:41:33 +03:00
ce41e42851 . 2024-10-25 07:38:01 +03:00
b414fb961e Develop native drawer 2024-10-25 00:57:02 +03:00
0370948e98 Merge pull request 'feature/cvalue-image' (#77) from feature/cvalue-image into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/77
2024-10-24 17:57:51 +00:00
ccbd9da871 Add externalize method to Image 2024-10-24 20:56:21 +03:00
cec8402adc Add tests 2024-10-24 20:57:34 +04:00
fd90f73c19 Add functionality 2024-10-24 20:57:29 +04:00
6447aeafa5 . 2024-10-24 15:03:37 +03:00
aa3e0759d7 Fix bug 71025 2024-10-24 11:40:47 +03:00
3db4bdc93f Fix bug 71169 2024-10-24 11:09:52 +03:00
3003c66eba Merge branch 'develop' into feature/binary-reading-optimisation 2024-10-24 13:09:40 +06:00
cc4c0dd68e Fix comment 2024-10-24 10:01:45 +03:00
5692bee77a Fix gradients in xps 2024-10-23 19:12:27 +03:00
e25a952279 Add reading acording record type 2024-10-23 22:12:07 +06:00
d6864e044a Fix curves intersection 2024-10-23 18:31:43 +03:00
ad69100d3f fix bug #70790 2024-10-23 17:28:22 +03:00
b05a95d54e Merge pull request 'Fixed bugs in metafile conversion' (#74) from fix/Metafile into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/74
2024-10-23 12:00:38 +00:00
87a09faefb Fix bug #71134 2024-10-23 14:39:51 +03:00
5e35517d71 Merge pull request 'Fix hlinx binary reading' (#75) from fix/bug71042 into hotfix/v8.2.1
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/75
2024-10-23 11:30:53 +00:00
ca94882699 Fix hlinx binary reading 2024-10-23 17:27:21 +06:00
894f78d143 Get Stamp stream AP 2024-10-22 13:25:02 +03:00
eeac44a1ab Add word months parsing 2024-10-22 15:56:19 +06:00
77ece713ee fix bug #71042 2024-10-22 10:50:04 +03:00
a8e3dd2ef5 Fix FreeText generate AP 2024-10-21 18:32:53 +03:00
20a2aa1ef1 Draw Stamp 2024-10-21 18:32:36 +03:00
7d10e1e995 Add space separeted date conversion 2024-10-21 21:14:40 +06:00
c3531cb19c Add month names to local info 2024-10-21 19:05:49 +06:00
ba6de346dc Merge branch 'develop' into feature/add-lcid-to-csv 2024-10-21 13:31:43 +06:00
5b44611560 write alternative in binary 2024-10-20 20:27:27 +03:00
f2aa34b5ce Fix bug 70835 2024-10-18 17:42:19 +03:00
d43a724ee6 Fix drop cap logic 2024-10-18 16:20:07 +03:00
cba68e2d2a Add am-pm parsing 2024-10-18 19:14:19 +06:00
f8dd9fb085 Merge remote-tracking branch 'origin/fix/pfg-bugs' into develop 2024-10-18 14:04:47 +03:00
39e95e8b49 Merge remote-tracking branch 'origin/develop' into fix/pfg-bugs 2024-10-18 14:02:28 +03:00
b98922dbfd Fix style PdfAnnot 2024-10-18 13:59:26 +03:00
f57af6ecc1 Refactoring 2024-10-18 13:56:13 +03:00
af77bf3f77 Fix bug 70795 2024-10-18 13:42:51 +03:00
4578731001 Merge branch 'fix/fix-bugs-8.2.1' into hotfix/v8.2.1 2024-10-18 13:33:19 +03:00
72566e8064 Fix bug #70873 2024-10-18 13:32:37 +03:00
346f0e9dd0 Fixed a problem with writing the font name in metafile to svg conversion 2024-10-18 13:25:42 +03:00
e32bd8fd96 Fixed calcalate final transform 2024-10-18 13:25:30 +03:00
de51108ba7 Fixed unnecessary insertion of xml in an html document 2024-10-18 13:24:32 +03:00
83a6e52df2 Fix clip reset 2024-10-18 12:21:32 +03:00
b2e807ec33 Merge branch 'develop' into feature/add-lcid-to-csv 2024-10-18 13:29:46 +06:00
1eba4aefa8 Stamp Rotate 2024-10-18 10:03:11 +03:00
956508f994 Add date with time parsing 2024-10-17 21:16:22 +06:00
4eb761eec3 fix bug #71000 2024-10-17 16:48:29 +03:00
e27415bb84 Merge remote-tracking branch 'origin/release/v8.2.0' into develop 2024-10-17 15:32:17 +03:00
2afbd3c429 Add local datetimeParsing 2024-10-17 17:44:31 +06:00
baf9fb4a93 Merge branch release/v8.2.0 into master 2024-10-17 11:10:05 +00:00
0b8e833e77 fix bug #69488 2024-10-17 10:06:45 +03:00
94bb0f5306 Fix bug 70987 2024-10-16 17:23:50 +03:00
8cadb329b9 Fix for Stamp 2024-10-16 17:18:21 +03:00
af7cb378ac Merge branch 'develop' into feature/add-lcid-to-csv 2024-10-16 13:12:11 +06:00
81e075e715 . 2024-10-15 18:36:45 +03:00
f7607e1c92 Add short date format building 2024-10-15 20:35:31 +06:00
1022d29fe8 Merge remote-tracking branch 'origin/release/v8.2.0' into fix/pfg-bugs 2024-10-15 16:29:36 +03:00
fc3ce62ec7 fix bug #70698 2024-10-15 08:50:11 +00:00
3fac5441cb Merge branch 'release/v8.2.0' into fix/fix-bugs-8.2.1 2024-10-15 11:09:22 +03:00
32bd8166d7 for bug #60796 2024-10-15 11:07:47 +03:00
4acdd6dd20 Fix bug 70888 2024-10-14 22:18:52 +03:00
518a4ddb2b Fix bug 70840 2024-10-14 15:06:44 +00:00
895082cc93 Fix bug 70823 2024-10-14 15:06:44 +00:00
f16fa656e9 Fix types 2024-10-14 14:46:46 +00:00
f16318aebb Add check ooxml limits 2024-10-14 14:46:46 +00:00
d8d540bd02 Add local info class 2024-10-14 20:35:01 +06:00
a5c28b72bb for bug #70894 2024-10-14 17:04:27 +03:00
290d50ebcc Fix empty contents 2024-10-14 15:11:25 +03:00
3de1152a3f Fix bug 70813 2024-10-14 13:43:07 +03:00
93900a0be8 Fix Helvetica for empty Contents in FreeText 2024-10-14 13:40:24 +03:00
9ba32e031d Added Lcid using in csv conversion 2024-10-14 15:51:50 +06:00
109c891c1b Improve used memory 2024-10-14 10:34:46 +03:00
1b2d803976 For bug 70792. Improve memory usage in the AddCurveIntersection method 2024-10-14 09:46:00 +03:00
9f4613b15c Fix bug 70578 2024-10-13 11:09:35 +03:00
d69e4ca0ba . 2024-10-11 21:35:36 +03:00
ab7e8a07be Fixed bugs with clipping images in metafile conversion 2024-10-11 20:23:53 +03:00
7603aceee1 Optimization of image reflection in metafiles 2024-10-11 20:14:13 +03:00
7ea66d0bee For bug #70825 2024-10-11 20:14:02 +03:00
0e8230cc7f Fix inverseTransform in metafile conversion 2024-10-11 20:13:35 +03:00
ef2963242a Fix OShapes ID after editing 2024-10-11 17:39:42 +03:00
0229d928ab Fix bug 70825 2024-10-11 16:54:25 +03:00
cbfc2d5052 For FreeText read, fix test 2024-10-11 11:52:42 +03:00
1a979fe30a Fix Byte to Guchar 2024-10-11 11:48:21 +03:00
ff2146b671 Create read/write Stamp annot 2024-10-11 11:47:29 +03:00
4bdea2d154 fix bug #70717 2024-10-11 11:14:10 +03:00
d1d5a46896 writing tests 2024-10-11 10:17:21 +03:00
751a5d4d7d Fix bug 69723 2024-10-10 23:02:33 +03:00
dcc4342483 Merge pull request 'feature add pivot hierarchies' (#64) from feature/add-pivot-hierarchies into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/64
2024-10-10 14:41:45 +00:00
ef5e71e941 Merge pull request 'Fix bug #69169' (#63) from fix/bug69169 into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/63
2024-10-10 14:41:28 +00:00
5c1b611b88 Fix bug #69169 2024-10-10 20:07:39 +06:00
4b1bd2fb70 fix bug #70790 2024-10-10 15:28:26 +03:00
cbbf650c56 Fix bug #69036 2024-10-10 09:50:29 +00:00
b55cd751d1 Merge branch 'release/v8.2.0' of git.onlyoffice.com:ONLYOFFICE/core into release/v8.2.0 2024-10-10 12:22:01 +03:00
c7d5b60637 Fix ios build 2024-10-10 12:21:55 +03:00
666f5c2f9e fix bug #70778 2024-10-10 10:34:51 +03:00
42b432b4de Add engine for base32 2024-10-10 02:59:18 +03:00
c6e15b7526 Fix bug 61203 2024-10-09 17:44:25 +03:00
08ca60091c Fix bug 70130 2024-10-09 16:10:00 +03:00
88d9827d3f Fix bug 70129 2024-10-09 16:06:42 +03:00
bae672f718 Fix bug 68986 2024-10-09 15:51:19 +03:00
00344df9ad Fix for -D with brackets 2024-10-09 11:27:54 +03:00
d9902ba6f9 returned exconnections15 conversion 2024-10-09 14:27:38 +06:00
cfb060e142 Fix build 2024-10-09 11:05:28 +03:00
633af32919 Fix condfmt number conversion 2024-10-09 13:51:42 +06:00
0565e6164b Add data for hard update hunspell module 2024-10-09 10:47:24 +03:00
306cc3f985 For bug 70578 2024-10-08 23:31:46 +03:00
2739dd3abd Fix bug 69154 2024-10-08 22:54:19 +03:00
70e6df5aae fix bug #70440 2024-10-08 22:00:45 +03:00
40d3cd1a85 Fix hierarchies reading with pcdh15 2024-10-08 18:41:59 +06:00
96030aa322 Set timelimits of dictionaries tester bigger 2024-10-08 15:18:40 +03:00
fee801eeeb Merge pull request 'Add custom timelimits logic in dictionariestester' (#59) from fix/dictionariestester into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/59
2024-10-08 11:55:37 +00:00
750273b526 Change timelimits 2024-10-08 14:51:48 +03:00
cfdb541c28 Add custom timelimits logic in dictionariestester 2024-10-08 14:36:30 +03:00
11121961d9 Fix typo 2024-10-08 08:47:12 +00:00
45828709ee Merge pull request 'Fix bug #70515' (#57) from fix/bug70515 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/57
2024-10-08 08:15:23 +00:00
40916e5ccc Merge pull request 'Fix bug 60796' (#56) from fix/bug60796 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/56
2024-10-08 08:07:18 +00:00
319610c58d Fix bug 60796 2024-10-08 10:22:32 +03:00
1837a2737e Fix RefTo id 2024-10-07 15:17:03 +00:00
686fc60860 For bug 61203 2024-10-07 15:17:03 +00:00
51216f27f4 Fix bug 70466 2024-10-07 17:47:12 +03:00
2eb33ddd22 Merge pull request 'Fix bug #70484' (#30) from fix/bug70484 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/30
2024-10-07 14:05:10 +00:00
58c80b052b Merge pull request 'Fix bug #70492' (#34) from fix/bug70492 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/34
2024-10-07 14:04:42 +00:00
5eee408eeb Merge pull request 'Fix bug #70617' (#54) from fix/bug70617 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/54
2024-10-07 14:04:20 +00:00
32103b8b9f Add slicercachePivotCache ids binary reading 2024-10-07 19:38:07 +06:00
b6ae1f272c Fix bug #70617 2024-10-07 15:41:28 +05:00
045f23d921 Fix bug 68091 2024-10-07 02:46:38 +03:00
d06b52988c Fix bug 70352 2024-10-06 18:56:06 +00:00
4717b47388 Fix bug in metafile conversion 2024-10-06 17:11:32 +00:00
31ce9f6a18 Fix bug #66337 2024-10-06 17:11:32 +00:00
e44c9fa4c9 Fix bug #31062 2024-10-06 17:11:32 +00:00
3c59ba7a13 fixed a bug with the location of the embedded metafile 2024-10-06 17:11:32 +00:00
42e84249e8 For bug #68708 2024-10-06 17:11:32 +00:00
e2dbde8722 fix bug #70163 2024-10-06 11:43:33 +03:00
36c67d79d5 fix bug #70717 2024-10-06 11:17:16 +03:00
cdc14d22f0 fix bug #70684 2024-10-04 22:22:16 +03:00
baed05236b fix bug #70368 2024-10-04 20:41:18 +03:00
c644f94c0b fix bug #69104 2024-10-04 20:23:36 +03:00
1244ba5fe5 Fix pivot cache from bin conversion 2024-10-04 20:12:56 +06:00
087e4433f2 For bug 69977 2024-10-04 13:31:36 +00:00
bc11a5cf5f Fix bug 70574 2024-10-04 16:28:30 +03:00
d86303e290 Fix bug 69704 2024-10-03 15:44:14 +00:00
51f1faa51a Fix uncheckedsqrfx conversion to xlsx
(cherry picked from commit 9f62108376)
2024-10-03 18:12:10 +03:00
6775dccc2c Fix font tables 2024-10-03 13:29:46 +00:00
ee3b4c612d Merge pull request 'Fix bug 70563' (#45) from fix/bug-70563 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/45
2024-10-03 12:37:44 +00:00
1144bb166c Remove using bitcode on ios 2024-10-03 14:19:08 +03:00
a9752208f6 Fix bug #70515 2024-10-03 15:43:45 +05:00
84016cf8cf Fix bug 70563 2024-10-03 13:00:18 +03:00
cb7edc373c Disable bitcode for ios builds with xcode 16+ 2024-10-03 12:11:31 +03:00
d1e43d68dc Fix getOriginPage 2024-10-03 11:47:04 +03:00
b5ab5f9b2b Fix bug 70559 2024-10-03 11:31:39 +03:00
761c5bec53 Fix detect allfonts path for builder 2024-10-03 00:11:28 +03:00
8cc7034c22 For bug 70566 2024-10-02 15:48:33 +00:00
ee1c385b54 Fix Bug 70566 2024-10-02 15:48:33 +00:00
ded640825b Fix alpha 2024-10-02 15:48:33 +00:00
84301531c8 . 2024-10-02 17:54:59 +03:00
66231b65c1 Add pivot cache other elements binari reading 2024-10-02 20:52:50 +06:00
7aa2d36d85 Add pivot hierarchies binary reading 2024-10-02 20:00:58 +06:00
310cd6d8fd Add full GetContext function 2024-10-02 13:51:43 +00:00
2d37cf634a Add new dependent libraries 2024-10-02 13:51:43 +00:00
04880b4e1d Merge pull request 'Fix bug 70590' (#41) from fix/bug-70590 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/41
2024-10-02 13:38:15 +00:00
1000b5d5bd Merge pull request 'Add full GetContext function to docbuilder python wrapper' (#40) from feature/docbuilder-wrappers-getcontext into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/40
2024-10-02 12:56:45 +00:00
c324b4a11c Add to python wrapper 2024-10-02 16:02:23 +04:00
982d2d1872 edit start of conversion 2024-10-02 12:09:58 +03:00
a51fe4134c fix bug #68406 2024-10-01 19:37:56 +03:00
985d258bc1 Fix bug with rotated crop 2024-10-01 17:22:30 +03:00
71b1e4fbf3 Add pivot cache hierarchies binary reading 2024-10-01 18:39:57 +06:00
fee5c112b4 Merge pull request 'fix bug70534' (#37) from fix/bug70534 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/37
2024-10-01 12:23:24 +00:00
9b50f9fbc2 Fix bug 68091 2024-10-01 14:43:27 +03:00
10f770fdbc Fix bug 70566 2024-10-01 13:10:52 +03:00
eb53c40135 fix 2024-10-01 12:32:29 +03:00
ded1655a04 Fix bug 70561 2024-10-01 12:20:54 +03:00
20c11889aa Fix bug 70590 2024-10-01 11:49:33 +03:00
910c2418d6 fix chartEx 2024-10-01 08:33:39 +03:00
e6ffdc0ae8 Merge remote-tracking branch 'origin/for-bug#68406' into release/v8.2.0 2024-09-30 19:27:52 +03:00
0335d330b8 Merge pull request 'Fix bug 69602' (#33) from fix/pdf-bugs into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/33
2024-09-30 14:55:14 +00:00
1a1ec927e2 Fix pivot cache conversion 2024-09-30 20:25:06 +06:00
af2e86e777 Fix name OUserID 2024-09-30 17:16:30 +03:00
bcf7d08c51 Fix bug 69602 2024-09-30 16:26:03 +03:00
11886dcdf7 Add user-id for annots 2024-09-30 15:05:39 +03:00
615d0b682c formula size calculation 2024-09-30 12:50:46 +03:00
535028fa0e For bug 70559 2024-09-30 12:44:09 +03:00
c421936857 Add pivot cache dimensions, measure groups and measure group maps binary conversion 2024-09-30 14:56:57 +06:00
3580e84184 Add measure groups and Dimension maps 2024-09-27 21:14:48 +06:00
5a6386e08b Fix bug #70492 2024-09-27 20:07:14 +05:00
1538997b63 Add pivot cache dimensions 2024-09-27 20:25:37 +06:00
7ca8b22160 fix bug #70518 2024-09-27 16:59:57 +03:00
ec16e247e9 Fix build 2024-09-27 13:39:27 +00:00
9a76575082 Fix bug 2024-09-27 13:39:27 +00:00
c1a586cb56 Fix bug 69974 2024-09-27 16:14:24 +03:00
7707aeb914 Fix NULL borderStyle in FreeText 2024-09-27 15:56:16 +03:00
50a8540f75 Fix build 2024-09-27 15:45:06 +03:00
bdb902128d Add slicerCache Pivot table part to xlsb writing 2024-09-27 17:37:27 +06:00
bb41c8b85f Merge branch 'develop' into feature/add-pivot-hierarchies 2024-09-27 13:33:06 +06:00
fbee170e87 fix build 2024-09-27 09:36:06 +03:00
cc2e755bca Fix bug 2024-09-26 15:18:30 +00:00
9c1efdeac2 Fix bug with text 2024-09-26 15:18:30 +00:00
ea1538bc11 Fix bug in xps 2024-09-26 15:18:30 +00:00
c0d0fb6f5c Critical fix 2024-09-26 15:18:30 +00:00
5e5e07b406 Fix bug 67321 2024-09-26 15:18:30 +00:00
9b5f762420 Fix bug #70484 2024-09-26 17:35:25 +05:00
7020548f06 Merge pull request 'Fix bug 69009' (#28) from fix/docx-renderer into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/28
2024-09-26 10:43:03 +00:00
2d2e15671a Fix bug 69009 2024-09-26 13:36:28 +03:00
115917b9e5 fix build 2024-09-26 12:39:21 +03:00
00ad32d420 Merge pull request 'For bug #70040' (#27) from fix/bug70040 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/27
2024-09-26 08:23:58 +00:00
c67b78508e Merge branch 'develop' into feature/add-pivot-hierarchies 2024-09-26 13:53:16 +06:00
ba2cf66c31 Fix build 2024-09-26 10:44:12 +03:00
57ed9d0c32 Fix build 2024-09-26 06:15:42 +00:00
40d82f3287 Fix 2024-09-26 06:15:42 +00:00
9bdcbf0d89 Rollback std::vector 2024-09-26 06:15:42 +00:00
c1774219ec Fix pdf editor build 2024-09-26 06:15:42 +00:00
2a6f0bb1b6 Close any clip-path fix 2024-09-26 06:15:42 +00:00
a23ce22950 Add unit-tests 2024-09-26 06:15:42 +00:00
b4f0d32b6d Fix bugs 2024-09-26 06:15:42 +00:00
83db7f2165 Remove STL from export 2024-09-26 06:15:42 +00:00
3ce03d897d Fix bug 2024-09-26 06:15:42 +00:00
be12237042 Fix bug 2024-09-26 06:15:42 +00:00
cf7252b92d Fix bounds 2024-09-26 06:15:42 +00:00
523f3f24f9 Fix wrong bounds 2024-09-26 06:15:42 +00:00
0196a4bb57 Fix one inters 2024-09-26 06:15:42 +00:00
9ee9192cd4 Refactoring 2024-09-26 06:15:42 +00:00
5df63a58b7 Add more bullets 2024-09-26 06:15:42 +00:00
d107bd5df2 Fix unused font names in PDF 2024-09-26 06:15:42 +00:00
f51c1fced2 Fix bug 69109 2024-09-26 06:15:42 +00:00
86cba0bdcd Fix bug 70340 2024-09-26 06:15:42 +00:00
cceec83568 Transition from pointers to smart pointers 2024-09-26 06:15:42 +00:00
f733543b44 Fix memory leak 2024-09-26 06:15:42 +00:00
bb9d777c14 Refactoring 2024-09-26 06:15:42 +00:00
694dd852d0 Fix bug 2024-09-26 06:15:42 +00:00
18a18eaa40 Fix linux build 2024-09-26 06:15:42 +00:00
fb021b33ec Add limits 2024-09-26 06:15:42 +00:00
95ecd8468a Refactoring 2024-09-26 06:15:42 +00:00
fbb57d7009 Fix memory leak 2024-09-26 06:15:42 +00:00
22e9873208 Done gradients support 2024-09-26 06:15:42 +00:00
2581e9235d Develop rtl support 2024-09-26 06:15:42 +00:00
270fd0601f Fix close path 2024-09-26 06:15:42 +00:00
5f69b4f8e6 Fix bug with gradient 2024-09-26 06:15:42 +00:00
bdaf9fa10b Fix bug 2024-09-26 06:15:42 +00:00
77e64af80c Fix bug with gradient 2024-09-26 06:15:42 +00:00
6e3beac6bf Fix one point inters and refactoring 2024-09-26 06:15:42 +00:00
641297ac48 Fix bug with non-closed-paths 2024-09-26 06:15:42 +00:00
dcca1f06f4 Developing gradients 2024-09-26 06:15:42 +00:00
22d7cfb240 Fix bug 2024-09-26 06:15:42 +00:00
fa51ea21b4 Developing gradient support 2024-09-26 06:15:42 +00:00
7632be9f2f Fix stack overflow 2024-09-26 06:15:42 +00:00
cbf40d36f5 Develop gradient support (in porgress) 2024-09-26 06:15:42 +00:00
2b8e70e67f Add compound paths 2024-09-26 06:15:42 +00:00
4b05eb9a50 Indents fix + gitignore 2024-09-26 06:15:42 +00:00
3221e41e89 Add subtraction for all overlap 2024-09-26 06:15:42 +00:00
58cc6cf6e8 Fix epsilon 2024-09-26 06:15:42 +00:00
c86a8edd30 Fix 2024-09-26 06:15:42 +00:00
db1d6a935f Add metainfo in ToXmlPptx (CContText)
+ fix main in test
2024-09-26 06:15:42 +00:00
cb9589f6b4 Fix curve for pdf 2024-09-26 06:15:42 +00:00
cbad285a9f FIx curve conversion 2024-09-26 06:15:42 +00:00
82a3fa6132 Fix 2024-09-26 06:15:42 +00:00
0821eefbd3 Add figure "Cross" to test 2024-09-26 06:15:42 +00:00
38a9dfcd14 Fix subtract 2024-09-26 06:15:42 +00:00
0f222c15e9 Fix all overlap 2024-09-26 06:15:42 +00:00
d0a554c701 Fix overlap paths 2024-09-26 06:15:42 +00:00
acfec0ceb1 Rollback 2024-09-26 06:15:42 +00:00
899b27d697 Fix bug with stride for adobe 2024-09-26 06:15:42 +00:00
5a5db3e8c6 Fix bug with close 2024-09-26 06:15:42 +00:00
57fdf7eed5 Add test for negative vertices 2024-09-26 06:15:42 +00:00
7f13020f2f Fix bug with no clear clip vector 2024-09-26 06:15:42 +00:00
020298b023 Update clip logic
crop
2024-09-26 06:15:42 +00:00
8eb249056b Fix negative vertices 2024-09-26 06:15:42 +00:00
2ed7e803ca Fix 2024-09-26 06:15:42 +00:00
b9230ef5ff Develop clip + tile images 2024-09-26 06:15:42 +00:00
3907110e44 Fix + refactoring 2024-09-26 06:15:42 +00:00
787575a53f Fix including paths 2024-09-26 06:15:42 +00:00
b58554a3da Refactorting
in progress
2024-09-26 06:15:42 +00:00
9e8c0dfb16 Add clip logic
clip on clip is not working for now
2024-09-26 06:15:42 +00:00
6831820dd4 Fix 2024-09-26 06:15:42 +00:00
cac79cb66e Refactor includes + fix build dll 2024-09-26 06:15:42 +00:00
323213a63d Refacoring 2024-09-26 06:15:42 +00:00
473ef17be3 Fix 2024-09-26 06:15:42 +00:00
5e56d26a06 Fix bugs 2024-09-26 06:15:42 +00:00
a390c1ee18 Fix 2024-09-26 06:15:42 +00:00
4158ebcd98 FIx 2024-09-26 06:15:42 +00:00
7fc65a84ab Fix 2024-09-26 06:15:42 +00:00
69ffd656af Fix 2024-09-26 06:15:42 +00:00
cb929fc5c5 Fix 2024-09-26 06:15:42 +00:00
7cd7c9f98f Refactoring Winding 2024-09-26 06:15:42 +00:00
015c10495c Refactoring 2024-09-26 06:15:42 +00:00
e973c8f70b Refactoring test 2024-09-26 06:15:42 +00:00
a77987488b Refactoring 2024-09-26 06:15:42 +00:00
1cfd17e2f3 Fix and Refactoring 2024-09-26 06:15:42 +00:00
b4c6f69cee Add Test for Clip 2024-09-26 06:15:42 +00:00
67194499a8 Fix 2024-09-26 06:15:42 +00:00
9ec6489083 Fix 2024-09-26 06:15:42 +00:00
3971400c78 Fix 2024-09-26 06:15:42 +00:00
e21ed47019 Finish CGraphicsPathClip 2024-09-26 06:15:42 +00:00
2cf83df7d0 add new methods for clip 2024-09-26 06:15:42 +00:00
7f96336e75 add mathematical functions for clip 2024-09-26 06:15:42 +00:00
99da1e3b8c Move CPathForClip methods to CGraphicsPath 2024-09-26 06:15:42 +00:00
6d152880bd Add Clip lib for GraphicsPath 2024-09-26 06:15:42 +00:00
dd9fca2a5c Fix hor/ver shape trough logic 2024-09-26 06:15:42 +00:00
67043cf718 Fix & add logic 2024-09-26 06:15:42 +00:00
ba239f139d Images -> shapes 2024-09-26 06:15:42 +00:00
a99733c5a1 Fix bug 70119 2024-09-25 23:42:03 +03:00
a60bc542c7 Fix bug 70043 2024-09-25 14:36:12 +00:00
97d36fa1cd Fix multiline Text Widget indentation 2024-09-25 14:36:12 +00:00
87fa0f93be Fix bug 69972 2024-09-25 14:36:12 +00:00
29a48da730 Fix bug 69976 2024-09-25 14:36:12 +00:00
3d38fdd005 refactoring math 2024-09-25 17:14:45 +03:00
e0352541be Fix bug 69990 2024-09-25 16:53:33 +03:00
2e26a3697d For bug #70040 2024-09-25 18:23:21 +05:00
cd124d5112 Fix page sizes on build pdf file 2024-09-25 15:28:08 +03:00
296dba3a4e Add hierarhcies usage binary conversion 2024-09-25 17:43:28 +06:00
38457c0115 Merge remote-tracking branch 'origin/release/v8.2.0' into develop 2024-09-25 14:27:11 +03:00
40789fbd24 Merge pull request 'Add OOXml2Odf' (#24) from feature/OOXml2Odf into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/24
2024-09-25 11:25:03 +00:00
4adc16620b Add hierarchies usage 2024-09-25 16:58:46 +06:00
0bfe049e84 bug fix 2024-09-25 13:04:23 +03:00
4242d32d95 Fix release build 2024-09-25 12:18:18 +03:00
a6b5e7e010 Merge remote-tracking branch 'origin/release/v8.2.0' into release/v8.2.0 2024-09-24 22:05:25 +03:00
57800ec8dd fix bug #33177 2024-09-24 21:46:58 +03:00
0f3de35eb4 Fix bug 69927 2024-09-24 21:44:52 +03:00
8c83b18216 fix bug #70440 2024-09-24 21:23:16 +03:00
e1c2bf19d9 Fix build 2024-09-24 18:08:40 +03:00
a6d8deedcd editing parse and converting text string 2024-09-24 17:30:39 +03:00
26b69e8612 Fix hierarchy members 2024-09-24 19:49:27 +06:00
9fa00c8609 Add pivot hierarchies binary conversion 2024-09-24 18:30:09 +06:00
f38767ccbb Merge pull request 'Fix bug #69036' (#22) from fix/bug-69036 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/22
2024-09-24 11:25:57 +00:00
fc94de8549 Refactoring and improving the debug mod 2024-09-24 11:48:59 +03:00
812fae8f6c Fix bug #69036 2024-09-24 11:46:34 +03:00
c938e2756e Merge pull request 'Fix bug #44363' (#20) from fix/bug44363 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/20
2024-09-24 07:23:22 +00:00
5679a7902f Merge pull request 'Fix placeholder styles conversion' (#19) from fix/placeholder_conversion into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/19
2024-09-24 07:22:22 +00:00
056bfb84ce Fix typo 2024-09-23 22:40:21 +03:00
2d745de7e2 Merge branch 'feature/pdf-font' into release/v8.2.0 2024-09-23 22:02:48 +03:00
a5c73127fd Fix pdf bugs (add build with embedded fonts in changes) 2024-09-23 21:59:36 +03:00
f0f4e39f5c Fix bug 70042 2024-09-23 19:08:27 +03:00
59bb3035bb Add xml hierarchies writing 2024-09-23 20:25:46 +06:00
b536d6eb41 Create test GetEmbeddedFont 2024-09-23 15:43:48 +03:00
dbb757a954 Add pivot table hierarchies xml reading 2024-09-23 18:28:50 +06:00
0af65b1137 Convert odp placeholder styles to pptx 2024-09-23 16:44:16 +05:00
5c3a697880 Fix for drawingfile 2024-09-23 13:31:55 +03:00
1b8c59ff87 Separate GetFontPath 2024-09-23 13:15:39 +03:00
6b4b645180 Create GetEmbeddedFontPath 2024-09-23 13:09:05 +03:00
55a2fb1b00 Add pivot table hierarchies structures 2024-09-23 16:07:49 +06:00
30868b81bc Fix bug #70339 2024-09-21 16:16:53 +03:00
4c44edc9c9 Merge branch 'fix/bug70318' into fix/placeholder_conversion 2024-09-21 00:07:59 +05:00
e9c200e455 Add xml writing of hierarchies 2024-09-20 17:40:03 +06:00
60f9021bdd Merge pull request 'Fix bug #70318' (#15) from fix/bug70318 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/15
2024-09-19 14:57:52 +00:00
887898fe58 Add group levels bin conversion 2024-09-19 17:21:21 +06:00
fd90fbae21 Fix bug #70318 2024-09-19 13:01:07 +05:00
c4979075aa Merge pull request 'Fix bug #70320' (#14) from fix/bug-70320 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/14
2024-09-19 05:16:16 +00:00
6c067ba6ee Merge pull request 'Fix SVG conversion' (#13) from fix/SVG into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/13
2024-09-19 05:16:01 +00:00
2456501f1d Fixes for txt/csv 2024-09-19 08:03:30 +03:00
07c0c58375 Fix bug #70320 2024-09-18 20:50:33 +03:00
db28751875 Fix placeholder conversion 2024-09-18 22:02:54 +05:00
627d02b006 Add group levels xml reading 2024-09-18 21:24:40 +06:00
c9fad9a83f Add group levels 2024-09-18 18:51:28 +06:00
81c9ae120f Fix bug 70293 2024-09-18 14:45:20 +03:00
9b05fa38ea Add remained fields to pivotHierarchy 2024-09-18 17:14:52 +06:00
830c5ec12c fix bug #46132 2024-09-18 10:52:04 +03:00
375f79cdac fix bug #69904 2024-09-17 21:22:24 +03:00
33627ab79c Added support for marker orientation in svg conversion 2024-09-17 19:45:13 +03:00
7062a26561 Add binari conversion of pivot hierarchies 2024-09-17 21:25:02 +06:00
9f81e37196 fox bug #70227 2024-09-17 18:11:18 +03:00
32a409bb13 Merge pull request 'Enter new contexts by default' (#10) from feature/scoped-context into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/10
2024-09-17 14:27:31 +00:00
b53a1b3cd6 Merge pull request 'Add static CreateObject function to builder' (#11) from fix/bug70010 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/11
2024-09-17 14:27:12 +00:00
f5f0630b2d Redesigned the drawing of markers in svg conversion 2024-09-16 22:02:10 +03:00
19e5a2db2d fix bug #70240 2024-09-16 19:06:11 +03:00
311d35f332 Add pivot cache Hierarchies 2024-09-16 20:02:52 +06:00
a7fb914f5e Merge pull request 'fix xlsb conversion errors' (#12) from fix/xlsb-conversion-errors into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/12
2024-09-16 13:48:15 +00:00
8ad7b123aa Fix build pdf files 2024-09-16 14:39:43 +03:00
c068fd2ee0 Fix richStr conversion 2024-09-13 21:01:42 +06:00
cfbb7d1216 index conversion, correction of brackets and fraction conversion 2024-09-13 17:47:23 +03:00
312a95d9e1 Fix bug #70010 2024-09-13 16:08:42 +04:00
0ac882b207 Merge branch hotfix/v8.1.3 into release/v8.2.0 2024-09-13 10:37:31 +00:00
abd2421cc1 Merge branch hotfix/v8.1.3 into develop 2024-09-13 10:37:28 +00:00
4378becd0b Enter new contexts by default 2024-09-13 14:30:53 +04:00
8c62dc448a Fixed bug width text position in svg conversion 2024-09-12 20:04:22 +03:00
7f7e89babf fix bug #69781 2024-09-12 18:07:19 +03:00
592fbfccbb Fix cfvo formula conversion 2024-09-12 18:12:52 +06:00
d89d63e0db fix bug #70136 2024-09-12 14:50:41 +03:00
42a4fe53dd fix bug #70160 2024-09-12 11:01:32 +03:00
f738aa95ad . 2024-09-12 10:38:26 +03:00
a68b7e7354 fix bug #70134 2024-09-11 17:38:40 +03:00
cf51a10da9 Fix pivot table conversion 2024-09-11 19:22:03 +06:00
3c16ba01f0 Fix max font size in svg conversion 2024-09-11 13:23:36 +03:00
106f448042 Fix build for xp 2024-09-11 12:15:46 +04:00
81d90420dd Normalize JSON in tests 2024-09-10 22:27:54 +00:00
2673b15835 Implement objects parsing in FromJSON 2024-09-10 22:27:54 +00:00
436d9ecdb7 Implement arrays parsing in FromJSON 2024-09-10 22:27:54 +00:00
150079e2f6 Implement FromJSON for primitives 2024-09-10 22:27:54 +00:00
ad18d65f7c Implement toJSON 2024-09-10 22:27:54 +00:00
56551c3745 Add IsBool function to Java wrapper
+ Add functionality of generating JNI headers
2024-09-10 22:25:25 +00:00
71342eb03d Add IsBool function to NET wrapper 2024-09-10 22:25:25 +00:00
f811822364 Fix bug #70046 2024-09-10 22:25:25 +00:00
765c27bdab Remove creation of empty string by default 2024-09-10 22:24:06 +00:00
f90022c50c Fix bug #70086 2024-09-10 22:24:06 +00:00
e345eff63a Fix build pdf files 2024-09-11 01:09:50 +03:00
0b16086ff5 Fix bugs in svg conversion and optimization 2024-09-10 21:08:12 +03:00
5904bb3507 Fix bug #69865 2024-09-10 21:07:39 +03:00
5f2c00a017 Fix databar conversion 2024-09-10 21:46:11 +06:00
8917390185 binary mrun 2024-09-10 16:25:23 +03:00
6a2d3838ae Fix bug #70044 2024-09-10 03:24:57 +05:00
bb7b63c86e Add conditional formattings14 conversion 2024-09-09 18:46:47 +06:00
493cec92c6 Move methods from graphics renderer to base interface 2024-09-09 15:03:59 +03:00
f21d92ee92 Enable drawing file in doctrenderer 2024-09-09 14:23:54 +03:00
d1dd3b4791 Merge pull request 'fix bug70020' (#5) from fix/bug70020 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/5
2024-09-09 08:24:43 +00:00
b79c173f59 Add dependencies for doctrenderer 2024-09-09 07:48:27 +03:00
5a7909a901 Fix pivot cache definition conversion 2024-09-06 15:46:26 +06:00
47ec9ab80d Fix bugs and refactoring 2024-09-05 10:23:31 +00:00
8a56072454 Fix bugs and refactoring 2024-09-05 10:23:31 +00:00
b6593c89a3 Merge pull request 'Fix bug #69988' (#2) from fix/bug69988 into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/2
2024-09-05 08:59:29 +00:00
978ec43047 printPr 2024-09-04 20:01:10 +03:00
f6c48c1edb Fix bug #70039 2024-09-04 20:48:28 +05:00
386bce9b68 Fix bug #70020 2024-09-04 20:22:34 +06:00
ceeaff9585 Fixes for pdf 2024-09-04 14:51:31 +03:00
20a8de9440 Fix bug #69988 2024-09-04 16:32:52 +05:00
1cf1d16cf5 Merge pull request 'Fix non-existing dicts bug' (#1) from fix/dictionariestester into release/v8.2.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/1
2024-09-04 09:29:28 +00:00
ae98f0551a Delete src/dst dictionariestester 2024-09-04 12:27:52 +03:00
eddfd2abe4 Fix non-existing dicts bug 2024-09-04 12:25:02 +03:00
00ccd7f7a0 Fix colors conversion for sparklines 2024-09-03 18:30:22 +06:00
4c9c79628f Fix bug #69957 2024-09-03 13:20:36 +05:00
3604ca9450 Fix row & col limits 2024-09-02 20:42:45 +06:00
7625183fe3 Merge pull request #1636 from ONLYOFFICE/fix/office-utils
Fix Bug 69900
2024-09-02 06:08:59 -07:00
0567de6d9f . 2024-09-02 11:49:18 +03:00
7f23f77866 fix bug #69770 2024-09-02 10:31:01 +03:00
01428dc78a Add data position check 2024-08-30 18:59:17 +06:00
8ae7e577f0 Test 2024-08-30 13:14:26 +03:00
d7922089ea Merge branch 'develop' into fix/xlsb-conversion-errors 2024-08-30 15:28:52 +06:00
3231593049 Fix number format code conversion 2024-08-30 15:27:14 +06:00
b3ce882885 Merge pull request #1635 from ONLYOFFICE/fix/bug69889
Fix bug #69889
2024-08-29 18:42:18 +03:00
2685f2807c fix bug #69947 2024-08-29 18:11:58 +03:00
a748b08143 for bug #69781 2024-08-29 18:08:37 +03:00
a14e684528 Fix Bug 69900 2024-08-29 18:00:26 +03:00
58c35139ea Merge branch 'fix/bug44363' of https://github.com/ONLYOFFICE/core into fix/bug44363
# Conflicts:
#	OdfFile/Reader/Format/text_elements.cpp
2024-08-29 19:41:23 +05:00
7d804f1c70 Fix bug #44363 2024-08-29 19:39:34 +05:00
41dcf2eac4 Fix SORTCOND conversion 2024-08-29 20:12:02 +06:00
ddf33fb441 Fix bug #69889 2024-08-29 18:07:35 +06:00
64dfeee050 Merge pull request #1634 from ONLYOFFICE/fix/docbuilder-snapshots
Some small fixes in snapshot related code
2024-08-29 04:27:53 -07:00
ea58d59b68 Remove static functions from editors.h 2024-08-29 14:12:22 +04:00
a73c9cc659 Some defines and typo fixes 2024-08-29 13:52:51 +04:00
58b927edb6 Merge pull request #1633 from ONLYOFFICE/fix/bug-69862
Fix bugs 69862, 69863
2024-08-29 01:51:28 -07:00
c7b72698a8 Fix ctm for write 2024-08-29 10:52:13 +03:00
b00c2eb773 Fix bug 69862 2024-08-29 10:45:55 +03:00
13088c6ed4 fix bug #69892 2024-08-28 16:45:32 +03:00
3b47ce04b4 Disable embedded drawing file 2024-08-28 16:07:31 +03:00
c9117df33d Fix work with snapshots 2024-08-28 15:57:05 +03:00
1771ce2354 Fix typo 2024-08-28 13:30:07 +03:00
e9248fe046 Merge pull request #1632 from ONLYOFFICE/feature/pdfBuild
Feature/pdf build
2024-08-28 03:08:50 -07:00
447e1f5ccc Fix for snapshots 2024-08-28 13:08:06 +03:00
94a67ed007 Fix build 2024-08-28 10:45:16 +03:00
06ee659edc Fixwork with replaceAll function 2024-08-27 23:07:25 +03:00
fe35178e26 Add support snapshots 2024-08-27 22:52:05 +03:00
9f62108376 Fix uncheckedsqrfx conversion to xlsx 2024-08-27 16:06:40 +06:00
13590d4c2e Refactoring work with cache 2024-08-27 13:04:20 +03:00
2ce1ee6b33 Merge pull request #1630 from ONLYOFFICE/fix/bug-69855
Fix bug 69855
2024-08-27 03:00:37 -07:00
ea77177077 Fix bug 69855 2024-08-27 12:30:31 +03:00
0eedb80d36 Fix worksheet vew after xlsb2xlsx conversion 2024-08-26 21:10:44 +06:00
8daa8dd509 Fix table conversion to xlsx 2024-08-26 19:18:39 +06:00
39c03bb5be Merge pull request #1628 from ONLYOFFICE/fix/bug56747
Fix bug #56747
2024-08-26 15:17:28 +03:00
5bbff01782 Merge remote-tracking branch 'origin/fix/bug57197' into release/v8.2.0 2024-08-26 15:14:52 +03:00
9cee5480b6 Merge remote-tracking branch 'origin/fix/bug61364' into release/v8.2.0 2024-08-26 15:13:38 +03:00
5debf76cda Merge remote-tracking branch 'origin/fix/bug59708' into release/v8.2.0 2024-08-26 15:13:11 +03:00
d5ebbf0542 Merge pull request #1627 from ONLYOFFICE/fix/bug63952
Fix bug #63952
2024-08-26 15:11:11 +03:00
84fc9f876e Add flag for fonts generation 2024-08-26 13:56:36 +03:00
7d118102a5 fix bug #69846 2024-08-25 18:43:19 +03:00
c87a043bd0 fix bug #69847 2024-08-25 18:34:30 +03:00
a72fcb705b fix bug #69850 2024-08-25 18:12:50 +03:00
dbd8344e6d Fix bug #63952 2024-08-24 19:37:44 +05:00
8b82e48562 matrix conversion 2024-08-23 17:06:24 +03:00
2425a40d36 Fix other functions argument types 2024-08-23 17:33:14 +06:00
4384ca2274 Fix number value check 2024-08-23 15:12:25 +06:00
8b56f22d76 Fix bug #59708 2024-08-22 22:58:17 +05:00
5efb325394 Merge pull request #1626 from ONLYOFFICE/fix/bug-58084
Fix bug 58084
2024-08-22 07:12:32 -07:00
d61fe20d12 Merge pull request #1625 from ONLYOFFICE/fix/bug-65310
Fix bug 65310
2024-08-22 07:11:07 -07:00
1ac4ec3b0d Fix bug 58084 2024-08-22 15:16:55 +03:00
6ebccd7f4a Add DjVu test 2024-08-22 14:25:37 +03:00
685f8d2442 Fix bug 65310 2024-08-22 14:25:06 +03:00
5564e397ca Fix bug #61364 2024-08-22 14:13:50 +05:00
12e1f1f992 Fix bug #61364 2024-08-22 14:12:40 +05:00
e8cf13e89d Merge pull request #1624 from ONLYOFFICE/fix/bug66675
Fix bug #66675
2024-08-22 10:35:03 +03:00
ec3d6fa05b Fix bug #61364 2024-08-22 02:00:42 +05:00
c0f4ce46f0 Fix undefined values in conversion 2024-08-21 20:43:00 +06:00
e91c72a265 Fix bug #57197 2024-08-21 16:40:13 +05:00
c4530caac1 Merge pull request #1623 from ONLYOFFICE/release/v8.2.0
Release/v8.2.0
2024-08-21 04:17:49 -07:00
c018d57081 fix bug #69634 2024-08-21 12:52:16 +03:00
43f49b7a9d fix bug #69775 2024-08-21 12:14:48 +03:00
f8e19a7f0b Merge pull request #1620 from ONLYOFFICE/fix/bug-69767
Fix bug #69767
2024-08-20 05:39:52 -07:00
f245985bbd fix bug #69774 2024-08-20 11:29:57 +03:00
68171df991 Merge branch 'release/v8.2.0' of https://github.com/ONLYOFFICE/core into release/v8.2.0 2024-08-20 11:27:58 +03:00
bbf4003ec7 Refactoring 2024-08-20 11:00:12 +03:00
75cc7d8457 Fix bug #69767 2024-08-20 10:59:32 +03:00
7018402a58 Merge pull request #1619 from ONLYOFFICE/fix/pdf-bugs
Fix pdf bugs
2024-08-20 00:04:03 -07:00
6ce30ccaad Fix test 2024-08-20 09:23:10 +03:00
670677c23b Fix pdf clip 2024-08-20 09:22:39 +03:00
208f6efcc5 fix bug #69781 2024-08-20 08:39:42 +03:00
685165d270 fix bug #69780 2024-08-20 08:39:02 +03:00
b18bdcc0a0 Fix bug #56747 2024-08-20 04:29:45 +05:00
f18eb2ef5b Developing 2024-08-20 00:23:59 +03:00
facdff46fe Refactoring 2024-08-19 18:24:06 +03:00
feb3f4cdf0 Fix bug #66675 2024-08-19 19:35:23 +06:00
8843c3dd36 Merge pull request #1617 from ONLYOFFICE/feature/docbuilder-java
Add JAVA_HOME environment variable support when compiling docbuilder Java-wrapper
2024-08-19 04:50:27 -07:00
2708479152 Add class for embed pdf object 2024-08-19 13:57:26 +03:00
f3facfa8e8 Fix for some JDK versions 2024-08-19 14:13:19 +04:00
1e26e1723a For buf 59297 2024-08-19 12:57:30 +03:00
6d9242e1dd Add building support for JDK > 8 2024-08-19 13:49:43 +04:00
e8de8dc03b fix bug #60796 2024-08-16 17:39:11 +03:00
b3590d66f0 xml2odf test 2024-08-16 17:28:48 +03:00
57447f757f Merge pull request #1618 from ONLYOFFICE/fix/pdf-time
Fix pdf clip
2024-08-16 04:24:27 -07:00
46d6eaa793 Fix test Save/Restore graphics 2024-08-16 13:35:03 +03:00
837ad1d8f7 Merge remote-tracking branch 'origin/release/v8.2.0' into develop 2024-08-16 09:33:59 +03:00
def502c7eb Refactoring drawingfile (native realization support) 2024-08-15 22:00:37 +03:00
1e5e43cbe5 Fix clip 2024-08-15 16:59:00 +03:00
60a888fc19 Fix PdfFile test 2024-08-15 16:58:39 +03:00
01ca25d798 Fix test 2024-08-15 16:58:20 +03:00
6812ebaa42 fix bug #68293 2024-08-15 10:46:06 +03:00
aacb2842f7 Fix typo 2024-08-14 16:39:41 +04:00
27a2a47cbe Fixes 2024-08-14 16:35:22 +04:00
02f8178c01 Merge pull request #1616 from ONLYOFFICE/fix/bug65304
Fix bug 65304
2024-08-14 01:55:26 -07:00
7dda21d1e1 Merge remote-tracking branch 'origin/release/v8.2.0' into develop 2024-08-14 11:28:37 +03:00
a0e2384409 fix bug #69490 2024-08-13 21:33:51 +03:00
56088e9eff Add support for JAVA_HOME environment variable 2024-08-13 20:44:46 +04:00
1d6b895496 Refactoring 2024-08-13 16:32:41 +03:00
fa4b8c8d76 Fix build 2024-08-13 11:40:51 +03:00
2db2b98c8f Fix bug 65304 2024-08-13 10:54:23 +03:00
f45fb3c6be for bug #69599 2024-08-13 09:40:06 +03:00
6f60d75863 Fix build 2024-08-13 00:24:51 +03:00
d1acdf35d8 Refactoring 2024-08-13 00:16:51 +03:00
a1bf6a76ed fix bug #69658 2024-08-12 19:25:27 +03:00
3634d59ece Merge branch 'release/v8.2.0' of https://github.com/ONLYOFFICE/core into release/v8.2.0 2024-08-12 19:07:54 +03:00
1b21e8f136 fix bug #69647 2024-08-12 19:07:07 +03:00
554ca5ec7c Merge pull request #1615 from ONLYOFFICE/fix/docbuilder-script-cache
Fix script caching on Windows
2024-08-12 08:15:16 -07:00
dc2e0edf80 fix bug #25787 2024-08-12 18:13:52 +03:00
e38fa336d2 Fix script caching with v8_89 2024-08-12 17:32:14 +04:00
357450f242 Merge pull request #1614 from ONLYOFFICE/fix/html
Fix html to ooxml conversion
2024-08-12 03:20:37 -07:00
4ed9925aff Merge pull request #1610 from ONLYOFFICE/feature/MetafileSize
The size setting of metafiles has been changed
2024-08-12 03:20:17 -07:00
14a8a4d8bb the algorithm for converting an array of strings 2024-08-09 18:07:32 +03:00
796537565b Fixed unnecessary use of standard styles in html to ooxml conversion 2024-08-09 15:43:55 +03:00
fcf8e28ae8 Added tabs to the text in html to ooxml conversion 2024-08-09 15:27:29 +03:00
de949afbb6 fix bug #69618 2024-08-09 12:33:40 +03:00
fb7bb041c1 Merge pull request #1613 from ONLYOFFICE/fix/pdf-leaks
Fix pdf leaks, clip and read jpeg
2024-08-09 02:03:52 -07:00
8d6e15627b Refactoring RenderOutputDev and test diff 2024-08-08 18:42:43 +03:00
0583cbb5cc Merge branch 'release/v8.2.0' of https://github.com/ONLYOFFICE/core into release/v8.2.0 2024-08-08 17:31:35 +03:00
a68bec86df Improved html to ooxml conversion 2024-08-08 16:05:19 +03:00
6554185ec7 Refacroting DrawImage 2024-08-07 18:07:12 +03:00
22bbde155d fix bug #44738 2024-08-07 12:03:23 +03:00
4a123d33ea fix bug #69552 2024-08-07 08:18:32 +03:00
c7d0f27f6b Fix ReadImage 2024-08-06 18:59:28 +03:00
f1ddd51164 Add support /* comments in script files 2024-08-06 18:08:47 +03:00
1d636b717f [x2t] Fix bug 69574 2024-08-06 15:53:40 +03:00
c026f33aa7 Improved html to ooxml conversion 2024-08-06 15:47:58 +03:00
29e5769d6d fix bug #30042 2024-08-06 10:54:09 +03:00
6ba96b0ae8 Merge remote-tracking branch 'origin/release/v8.2.0' into develop 2024-08-06 09:38:42 +03:00
9d750ad3d4 . 2024-08-06 08:53:05 +03:00
5b156d72c0 Fix bug #44363 2024-08-06 01:19:19 +03:00
85a7c82aa7 . 2024-08-05 22:48:25 +03:00
6586fc39ee Merge pull request #1612 from ONLYOFFICE/feature/gradients
Feature/gradients
2024-08-05 11:50:27 -07:00
8a4b1672c9 . 2024-08-05 20:31:01 +03:00
0d71f1c158 . 2024-08-05 19:15:36 +03:00
394582df7a fix build 2024-08-05 18:50:23 +03:00
e8c7a4f670 Fix ReadDCT 2024-08-05 18:14:56 +03:00
ead6b305b2 Create ReadDCT for jpeg image in pdf 2024-08-05 16:36:50 +03:00
2de6a6d199 Merge pull request #1611 from ONLYOFFICE/feature/docbuilder-java
Feature/docbuilder java
2024-08-05 05:38:52 -07:00
c6ca99994b Fix build into JAR on mac and linux 2024-08-02 19:35:13 +04:00
b707510c88 Remove explicit workDirectory setting 2024-08-02 18:38:40 +04:00
7171dcb9f0 Set library path at runtime
Now there is no need to pass `-D...` parameter to run java program
2024-08-02 18:26:15 +04:00
49dedc7a6d fix bug #69392 2024-08-02 16:43:20 +03:00
431fa060c4 fix bug #69488 2024-08-02 16:10:50 +03:00
0fc5133d98 Fix for building test example 2024-08-02 16:05:08 +04:00
8d5fc7d6ca Fix build for JDK 8 and force build into JAR 2024-08-02 15:58:13 +04:00
3221d20d81 Remove docbuilder_jni_utils helper library 2024-08-02 12:36:17 +04:00
9fdb81554a fix bug #69518 2024-08-02 10:58:01 +03:00
95a1983e75 Refactoring RendererOutputDev 2024-08-01 18:59:19 +03:00
bef68d03c9 Merge pull request #1609 from ONLYOFFICE/feature/add-future-functions-conversion
Feature/add future functions conversion
2024-08-01 17:05:53 +03:00
a1100f0091 Fix copiright dates 2024-08-01 17:04:10 +06:00
15b18adf90 Fix copyright dates 2024-08-01 17:01:45 +06:00
c27aa4d807 Improved html to ooxml conversion 2024-08-01 13:54:07 +03:00
c4f8c524b5 Merge remote-tracking branch 'origin/release/v8.2.0' into fix/pdf-leaks 2024-08-01 12:32:12 +03:00
1a0a63c8dd Merge branch 'develop' into feature/add-future-functions-conversion 2024-08-01 15:23:44 +06:00
9010dcc220 Add initialization checks and default values in xslx 2 xlsb conversion 2024-08-01 15:22:57 +06:00
f7d55c08d8 fix bug #69474 2024-07-31 21:56:23 +03:00
4cfb8cc97a fix bug #69104 2024-07-31 21:51:15 +03:00
a41ecb0715 for bug #69405 2024-07-31 21:32:50 +03:00
faa9e5e640 Merge pull request #1608 from ONLYOFFICE/fix/bug-65822
For bug 65822
2024-07-31 05:40:58 -07:00
ac2ee1b56d Save line AP 2024-07-31 14:01:34 +03:00
b722238d21 Draw AP for markup annots 2024-07-31 14:00:24 +03:00
dca5f4f7c5 Add prefix check for future functions names 2024-07-31 16:55:05 +06:00
9875aed0a0 Add default values to style conversion 2024-07-31 15:17:47 +06:00
83e20057f4 Merge pull request #1607 from ONLYOFFICE/feature/docx-renderer
Feature/docx renderer
2024-07-30 10:34:35 -07:00
373786fca6 Update Clip 2024-07-30 18:35:57 +03:00
0fa1b4feec Add return 0/1 for builder external scripts 2024-07-30 11:47:13 +03:00
6a6204ae33 Fix add to conts & highlights 2024-07-30 11:35:39 +03:00
f02147b97c Fix jar build 2024-07-30 12:25:54 +04:00
88b1660735 Add another way to load native libraries 2024-07-30 11:36:47 +04:00
f5f7cb1aec . 2024-07-29 22:13:28 +03:00
af01306997 . 2024-07-29 21:58:34 +03:00
ef30a30e00 Fix first word width in splitted lines 2024-07-29 20:33:20 +03:00
16ae48ef4e Fix memory leaks 2024-07-29 17:56:48 +03:00
ab4fa069d1 Add xlsb buffer size reset after writing file 2024-07-29 20:41:52 +06:00
d00919e139 Fix fonts bls 2024-07-29 20:38:48 +06:00
0eb8c93cf9 Merge pull request #1606 from ONLYOFFICE/fix/bug66692
Fix bug #66692
2024-07-29 14:50:16 +03:00
c98285ffef Merge pull request #1605 from ONLYOFFICE/fix/bug66675
Fix bug #66675
2024-07-29 14:50:03 +03:00
7a9549633b conversion of indexes, operators and limits 2024-07-29 12:58:22 +03:00
4b99c4179b Fixed inaccuracies when converting html to ooxml elements big and small 2024-07-29 12:39:51 +03:00
e98dec952f Fix build 2024-07-26 21:43:43 +03:00
8b2d7035c1 Add build to JAR 2024-07-26 19:42:37 +04:00
234def9cd7 Autowrap function arguments
+ Add constructor from Java arrays
2024-07-26 19:10:32 +04:00
ce92766ef6 Fix paths 2024-07-26 17:16:06 +03:00
59c95c5039 Merge pull request #1597 from ONLYOFFICE/feature/pdf-layer
Feature pdf layer
2024-07-26 07:05:38 -07:00
a23002225a Merge pull request #1598 from ONLYOFFICE/fix/bug-59297
Feature pdf headings
2024-07-26 07:03:52 -07:00
cb64a5a266 Fix bug #66675 2024-07-26 16:51:24 +06:00
65483d0460 fix bug #69395 2024-07-26 13:31:16 +03:00
41758f0552 Merge pull request #1604 from ONLYOFFICE/feature/docx-renderer
Fix bug with spacing
2024-07-26 02:30:17 -07:00
bfd790ba11 Fix bug with spacing 2024-07-26 12:26:59 +03:00
81d9e3cfd7 Merge pull request #1603 from ONLYOFFICE/feature/docx_renderer
Feature/docx renderer
2024-07-26 01:42:31 -07:00
2920527898 Reformat code 2024-07-26 11:40:01 +03:00
7013fdcb8d Merge branch hotfix/v8.1.1 into release/v8.2.0 2024-07-26 08:05:06 +00:00
feda29eb77 Merge branch hotfix/v8.1.1 into develop 2024-07-26 08:05:02 +00:00
caf90eb3a3 Merge branch hotfix/v8.1.1 into master 2024-07-26 08:04:53 +00:00
0d84e22e79 Fix spaces more 2024-07-25 19:13:29 +03:00
f2acef6bb2 Add docbuilder.utils.Utils class to edit PATH on Windows 2024-07-25 20:06:11 +04:00
84b8850a52 Fix bug with spaces 2024-07-25 16:12:40 +03:00
b2a3de852a Fix bug #66692 2024-07-25 17:51:20 +06:00
a8fa59d64d Added ruby support and bug fixes 2024-07-25 14:44:20 +03:00
59b84f26ee Merge remote-tracking branch 'origin/fix/bug68344' into release/v8.2.0 2024-07-25 10:44:47 +03:00
5b17009fb9 Merge remote-tracking branch 'origin/fix/bug68540' into release/v8.2.0 2024-07-25 10:41:50 +03:00
a5827f187c Merge remote-tracking branch 'origin/fix/bug68585' into release/v8.2.0 2024-07-25 10:41:09 +03:00
6ae25ca4c4 Merge remote-tracking branch 'origin/fix/bug69238' into release/v8.2.0 2024-07-25 10:39:58 +03:00
ff4425e977 fix grad 2024-07-24 18:36:10 +03:00
06edc93c7b Fix bug #69238 2024-07-24 18:16:50 +03:00
8f9b35d94a Fix inline destination 2024-07-24 16:35:14 +03:00
14c06e4e7b Fix x coord Outlines 2024-07-24 15:16:21 +03:00
abaaa54bc2 Fix SetByIndex and test example
(now it does work)
2024-07-24 14:05:29 +04:00
7d0683e338 Update test example
(it doesn't work yet)
2024-07-23 20:32:44 +04:00
f9d6b49a05 Rename Call() to call() 2024-07-23 20:31:43 +04:00
01916b7de6 Add file type constants 2024-07-23 19:49:14 +04:00
666d62239e Add class CDocBuilderContext to Java and JNI 2024-07-23 19:36:49 +04:00
2e25f5dc64 Get previous array on return 2024-07-23 18:36:27 +03:00
cc61536a90 Fix function naming for CDocBuilderContextScope 2024-07-23 19:36:01 +04:00
58b5417ab4 Add class CDocBuilderContextScope to Java and JNI 2024-07-23 19:10:08 +04:00
c056c14303 Add hint how to run compiled Java example 2024-07-23 18:15:39 +04:00
1b975c7048 Get headings as an array
Get headings as an array with levels and convert to tree
2024-07-23 17:07:04 +03:00
3fd5b5612b Add test Java example 2024-07-23 17:32:51 +04:00
b8a8d36b8b Improved html to ooxml conversion 2024-07-23 14:55:38 +03:00
ccbeb28f8a fix bug #69325 2024-07-23 14:23:35 +03:00
6ab0d9d106 Fixes in Java code 2024-07-22 21:31:27 +04:00
79309d3f02 Add Java code for CDocBuilder
+ Change private members to package-private
2024-07-22 17:09:48 +04:00
c8c4edf592 Add JNI code for CDocBuilder 2024-07-22 16:37:17 +04:00
eac73b31b3 Add cell metadata conversion 2024-07-22 18:17:49 +06:00
64afe55078 Add Java code for CDocBuilderValue
+ Changed all JNI functions to static
2024-07-22 15:28:15 +04:00
383375ade2 Add metadata mdx binary reading 2024-07-22 15:54:10 +06:00
16324b7bf1 Add future metadata bynary reading 2024-07-22 14:16:52 +06:00
62b96623a0 Add missed files 2024-07-22 11:04:18 +03:00
d48e3ab6e0 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-22 13:12:00 +06:00
46f30b980f Add JNI code for CDocBuilderValue 2024-07-19 20:35:42 +04:00
ac4f15b999 Improved html to ooxml conversion 2024-07-19 16:59:58 +03:00
a28f12e170 Add metadata blocks conversion from bin 2024-07-19 17:09:59 +06:00
43e506cff1 Add metadata types conversion from bin 2024-07-19 16:17:45 +06:00
21cf3df902 Add esstr conversion from bin 2024-07-19 15:39:55 +06:00
47961709ad Fix docbuilder.c ToString function 2024-07-19 13:13:34 +04:00
91d63bc49f Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-19 13:38:57 +06:00
bc65bf962e Fix metadata conversion to xlsb 2024-07-18 16:00:51 +06:00
4abc5b6bcc Add mdx metadata conversion 2024-07-18 14:38:16 +06:00
7b8aa38c37 Fix bug 45813 2024-07-17 17:40:11 +03:00
5c87955ae2 Fix bug 56118 2024-07-17 16:12:53 +03:00
c37aa9d9dc Fix bug 55429 2024-07-17 16:11:02 +03:00
d699c30bda Fix bug 48721 2024-07-17 16:09:42 +03:00
4af9055ade Add future metadata conversion 2024-07-17 15:19:43 +06:00
9db017b9f4 Fix bug 69136 2024-07-17 12:16:44 +03:00
70fe676300 Improved colgroup support in html to ooxml conversion 2024-07-16 18:36:09 +03:00
e73d4455c2 Fix bug 55995
Support pTransferFunc for setSoftMask
2024-07-16 17:57:52 +03:00
96d994dc65 Add metadata blocks conversion to bin 2024-07-16 20:51:47 +06:00
87f7be4bc6 Add binary writing ESSTR and ESMDT 2024-07-16 19:40:20 +06:00
3158e830ff Indetns fix 2024-07-16 13:56:17 +03:00
33daee696c Delete unused 2024-07-16 13:13:28 +03:00
305492ec7b Fix flip SoftMask 2024-07-15 18:22:06 +03:00
e9f8045568 Add metadata records reading 2024-07-15 18:00:30 +06:00
90d46b55d8 Merge branch hotfix/v8.1.1 into master 2024-07-15 11:40:21 +00:00
8507c8d4d9 Adding text conversion, binary operators, and parentheses. 2024-07-12 21:14:07 +03:00
2d213df8af Create CSoftMask 2024-07-12 18:25:11 +03:00
4bb3953171 Added colgroup implementation for tables in html to ooxml conversion 2024-07-12 18:03:18 +03:00
02c54d90c6 Add binary record reading 2024-07-12 20:45:53 +06:00
ce69cf40d2 Add mdxSet bin records 2024-07-12 19:39:03 +06:00
013ab00f06 Add Mdx Tuple binary records 2024-07-12 18:31:23 +06:00
2ef1e8f820 Add bmrIstr binary record 2024-07-12 16:47:16 +06:00
db980db306 Add mdxKpi binary struct 2024-07-12 16:24:55 +06:00
45a7827b1b Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-12 13:49:11 +06:00
f8e894af67 Testing agg::scanline_u8_am 2024-07-11 18:27:49 +03:00
f1d932c084 Add Mdxmbrprop bin structs 2024-07-11 19:22:48 +06:00
a452a20049 Add Mdx bin structures 2024-07-11 18:53:39 +06:00
d69b861ff7 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-11 18:20:28 +06:00
4305ececd3 Add Esmdx bin structs 2024-07-11 18:20:18 +06:00
12adcfc8f1 Add ESMBD bin structures 2024-07-11 16:43:49 +06:00
176290adaf Fix bug + refactoring 2024-07-10 19:34:01 +03:00
32a46c6859 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-10 20:06:27 +06:00
c89de96a1b Add Esstr bin records 2024-07-10 20:04:45 +06:00
f30aba8bf1 Added support for the rules attribute for tables in html to ooxml conversion 2024-07-10 15:23:05 +03:00
fb209c6c8a Fix bugs 2024-07-09 19:49:21 +03:00
d4af1308c0 Merge pull request #1591 from ONLYOFFICE/feature/svg-font
Added custom SVG font
2024-07-09 18:48:00 +03:00
824d9c59cf Fix shapes merging 2024-07-09 16:56:43 +03:00
d4f3cd3801 Fix bugs in html to ooxml conversion 2024-07-09 16:44:50 +03:00
c7fc2bc3a7 The blockquote tag implementation has been added to the html to ooxml conversion 2024-07-09 16:44:32 +03:00
a8c815d7bd Fix bugs
Fix paragpraph bug
Fix bug with lines in tables
2024-07-09 16:25:32 +03:00
4559d53a97 Change CContText logic 2024-07-09 15:01:34 +03:00
8cecbf1fb1 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-09 16:27:37 +06:00
56f2b18184 Add metadata info and future metadata bin structures 2024-07-08 21:31:44 +06:00
712d603ff2 Add metadata conversion structures 2024-07-08 01:24:16 +06:00
74d7bbca7c Improvement in html to xml conversion of image size calculation 2024-07-04 18:00:32 +03:00
6eba82f433 Improvement in html to ooxml conversion of multi-level lists 2024-07-04 18:00:06 +03:00
1e2535f6e1 Remove metadata xlsb conversion 2024-07-04 16:52:19 +06:00
ce6f6ea256 Add custom functions conversion 2024-07-03 19:05:39 +06:00
a391316529 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-02 16:41:30 +06:00
06a60b2846 Add other future function names 2024-07-01 21:18:40 +06:00
75b22f6e19 Merge branch 'develop' into feature/add-future-functions-conversion 2024-07-01 13:13:33 +06:00
efa4433195 Added rendering of custom fonts in svg 2024-06-28 21:18:00 +03:00
d2724ac712 Add static constructor 2024-06-28 20:51:59 +06:00
e4e35ab579 Add future function parser 2024-06-28 15:01:57 +06:00
bc56b97ce0 Merge branch release/v8.1.0 into master 2024-06-26 10:42:10 +00:00
78c47b2007 Merge branch 'develop' into feature/add-future-functions-conversion 2024-06-26 14:58:21 +06:00
6ae6c37ef1 Added reading of custom fonts in svg 2024-06-25 15:51:04 +03:00
54468d21d5 Merge branch 'develop' into feature/add-future-functions-conversion 2024-06-25 13:32:05 +06:00
b60a956b84 Add future function conversion 2024-06-21 20:17:39 +06:00
59b3862d89 Fix bug #68585 2024-06-18 17:18:41 +05:00
a72b42bd6d Fix placeholder index attribute 2024-06-14 15:58:56 +05:00
32464cb685 The size setting of metafiles has been changed 2024-06-13 17:22:09 +03:00
af9a69d0f2 Update logic & fix bugs 2024-06-11 08:00:48 +03:00
29115060b4 Merge pull request #1540 from ONLYOFFICE/release/v8.1.0
Release/v8.1.0
2024-06-06 23:03:36 +03:00
f665afc1ad Fix bug #68344 2024-06-05 14:31:48 +05:00
e18fc06c7b Fix bug in first word splitting 2024-06-04 11:12:18 +03:00
4cd6e99531 Merge pull request #1527 from ONLYOFFICE/release/v8.1.0
Release/v8.1.0
2024-06-03 20:10:54 +03:00
56a08867db refactoring 2024-05-31 21:45:44 +03:00
f86548c873 Refactoring 2024-05-30 16:27:00 +03:00
be64e3e624 Fix spacing 2024-05-28 11:05:59 +03:00
2f6a542d02 Fix tatPlainParagraph type 2024-05-28 05:48:49 +03:00
f69b52e232 Fix bug 68004 2024-05-28 04:57:26 +03:00
ce15265d5a Fix split logic (in progress) 2024-05-27 23:28:05 +03:00
370e317b79 Updated split logic (in progress) 2024-05-27 22:21:28 +03:00
3bf80a74fe Add split logic in paragraph 2024-05-21 12:13:43 +03:00
de31b16f91 Add Split logic 2024-05-21 09:27:54 +03:00
f4ec536794 Fix bug 67809 2024-05-14 10:40:54 +03:00
fb12bfa57f Add MovablePoints on Label 2024-05-13 11:17:30 +03:00
63c9185fd2 Add choice of colors for non parametric gradients 2024-04-29 22:08:28 +03:00
51c6fe496b Add parametrs input 2024-04-26 19:40:08 +03:00
283f21de86 Add class Custom label for handle click 2024-04-19 20:13:30 +03:00
0700038802 Refactoring 2024-04-10 19:12:01 +03:00
3e4c531538 Add default parametrs and new gradient types 2024-04-10 01:18:40 +03:00
29afb2aed9 Add Triangle gradient 2024-04-05 19:34:20 +03:00
86b53b7ede Refactoring 2024-04-04 10:22:35 +03:00
21e3293895 fix image size from pixels to millimeters 2024-04-03 15:31:07 +03:00
cd86a8a3c7 fix image size and GenerateImg method 2024-04-02 00:47:50 +03:00
9e1e641218 Add test for Linear and Radial gradients 2024-03-29 12:37:31 +03:00
1229 changed files with 85142 additions and 53929 deletions

2
.gitignore vendored
View File

@ -46,3 +46,5 @@ DesktopEditor/fontengine/js/common/freetype-2.10.4
.qtc_clangd
Common/3dParty/openssl/openssl/
msvc_make.bat

141
Apple/IWork.cpp Normal file
View File

@ -0,0 +1,141 @@
#include "IWork.h"
#include "../DesktopEditor/common/File.h"
#include "../DesktopEditor/common/Directory.h"
#include <libetonyek/libetonyek.h>
#include <libodfgen/OdtGenerator.hxx>
#include <libodfgen/OdsGenerator.hxx>
#include <libodfgen/OdpGenerator.hxx>
#include <libodfgen/test/StringDocumentHandler.hxx>
#include <memory>
#include <fstream>
class CIWorkFile_Private
{
public:
std::wstring m_sTempDirectory;
public:
CIWorkFile_Private()
{
}
~CIWorkFile_Private()
{
}
};
CIWorkFile::CIWorkFile()
{
m_internal = new CIWorkFile_Private();
}
CIWorkFile::~CIWorkFile()
{
delete m_internal;
}
#if !defined(_WIN32) && !defined(_WIN64)
#define DATA_TYPE_INPUTFILE std::string
#else
#define DATA_TYPE_INPUTFILE std::wstring
#endif
bool GetRVNGInputStream(const DATA_TYPE_INPUTFILE& sFile, std::shared_ptr<librevenge::RVNGInputStream>& oRVNGInputStream, libetonyek::EtonyekDocument::Type& oDocumentType)
{
oRVNGInputStream.reset(new librevenge::RVNGFileStream(sFile.c_str()));
oDocumentType = libetonyek::EtonyekDocument::TYPE_UNKNOWN;
const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported(oRVNGInputStream.get(), &oDocumentType);
return libetonyek::EtonyekDocument::CONFIDENCE_NONE != confidence;
}
IWorkFileType CIWorkFile::GetType(const std::wstring& sFile) const
{
//TODO:: так как на данный момент мы работает только напрямую с файлом, то работа с директорией нам пока не нужна
if (NSDirectory::PathIsDirectory(sFile))
return IWorkFileType::None;
std::shared_ptr<librevenge::RVNGInputStream> input;
libetonyek::EtonyekDocument::Type oDocumentType;
#if !defined(_WIN32) && !defined(_WIN64)
std::string sFileA = U_TO_UTF8(sFile);
if (!GetRVNGInputStream(sFileA, input, oDocumentType))
return IWorkFileType::None;
#else
if (!GetRVNGInputStream(sFile, input, oDocumentType))
return IWorkFileType::None;
#endif
switch (oDocumentType)
{
case libetonyek::EtonyekDocument::TYPE_PAGES:
return IWorkFileType::Pages;
case libetonyek::EtonyekDocument::TYPE_NUMBERS:
return IWorkFileType::Numbers;
case libetonyek::EtonyekDocument::TYPE_KEYNOTE:
return IWorkFileType::Keynote;
default:
break;
}
return IWorkFileType::None;
}
template<class Generator>
int Convert(const std::wstring& wsOutputFile, std::shared_ptr<librevenge::RVNGInputStream>& ptrInput, const std::wstring& wsPassword = L"", const std::wstring& wsTempDirectory = L"")
{
StringDocumentHandler content;
Generator generator;
generator.addDocumentHandler(&content, ODF_FLAT_XML);
bool bRes = libetonyek::EtonyekDocument::parse(ptrInput.get(), &generator);
if (!bRes)
return 1;
const std::string sOutputFileA = U_TO_UTF8(wsOutputFile);
std::ofstream output(sOutputFileA.c_str());
output << content.cstr();
if (output.bad())
return -1;
return 0;
}
int CIWorkFile::Convert2Odf(const std::wstring& sFile, const std::wstring& sOutputFile) const
{
//TODO:: так как на данный момент мы работает только напрямую с файлом, то работа с директорией нам пока не нужна
if (NSDirectory::PathIsDirectory(sFile))
return -1;
std::shared_ptr<librevenge::RVNGInputStream> input;
libetonyek::EtonyekDocument::Type oDocumentType;
#if !defined(_WIN32) && !defined(_WIN64)
std::string sFileA = U_TO_UTF8(sFile);
if (!GetRVNGInputStream(sFileA, input, oDocumentType))
return -1;
#else
if (!GetRVNGInputStream(sFile, input, oDocumentType))
return -1;
#endif
switch (oDocumentType)
{
case libetonyek::EtonyekDocument::TYPE_PAGES: return Convert<OdtGenerator>(sOutputFile, input);
case libetonyek::EtonyekDocument::TYPE_NUMBERS: return Convert<OdsGenerator>(sOutputFile, input);
case libetonyek::EtonyekDocument::TYPE_KEYNOTE: return Convert<OdpGenerator>(sOutputFile, input);
default:
break;
}
return -1;
}
void CIWorkFile::SetTmpDirectory(const std::wstring& sFolder)
{
m_internal->m_sTempDirectory = sFolder;
}

36
Apple/IWork.h Normal file
View File

@ -0,0 +1,36 @@
#ifndef _IWORKFILE_IWORKFILE_H
#define _IWORKFILE_IWORKFILE_H
#include <string>
#ifndef IWORK_USE_DYNAMIC_LIBRARY
#define IWORK_FILE_DECL_EXPORT
#else
#include "../DesktopEditor/common/base_export.h"
#define IWORK_FILE_DECL_EXPORT Q_DECL_EXPORT
#endif
enum class IWorkFileType
{
Pages = 0,
Numbers = 1,
Keynote = 2,
None = 255
};
class CIWorkFile_Private;
class IWORK_FILE_DECL_EXPORT CIWorkFile
{
private:
CIWorkFile_Private* m_internal;
public:
CIWorkFile();
~CIWorkFile();
IWorkFileType GetType(const std::wstring& sFile) const;
int Convert2Odf(const std::wstring& sFile, const std::wstring& sOutputFile) const;
void SetTmpDirectory(const std::wstring& sFolder);
};
#endif // _IWORKFILE_IWORKFILE_H

46
Apple/IWork.pro Normal file
View File

@ -0,0 +1,46 @@
QT -= core
QT -= gui
VERSION = 0.0.0.1
TARGET = IWorkFile
TEMPLATE = lib
CONFIG += shared
CONFIG += plugin
DEFINES += IWORK_USE_DYNAMIC_LIBRARY
CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD
include($$CORE_ROOT_DIR/Common/base.pri)
ADD_DEPENDENCY(kernel, UnicodeConverter)
INCLUDEPATH += \
$$PWD
core_android:DEFINES += NOT_USE_PTHREAD_CANCEL USE_FILE32API
# BOOST
CONFIG += core_boost_regex
include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)
# ZLIB
CONFIG += build_all_zlib build_zlib_as_sources
include($$PWD/../OfficeUtils/OfficeUtils.pri)
# LIBXML
CONFIG += core_static_link_xml_full
CONFIG += core_only_libxml
include($$PWD/../DesktopEditor/xml/build/qt/libxml2.pri)
#
include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri)
# TEST
HEADERS += $$ODF_LIB_ROOT/test/StringDocumentHandler.h
SOURCES += $$ODF_LIB_ROOT/test/StringDocumentHandler.cxx
SOURCES += IWork.cpp
HEADERS += IWork.h

View File

45
Apple/test/main.cpp Normal file
View File

@ -0,0 +1,45 @@
/*
* (c) Copyright Ascensio System SIA 2010-2023
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include "../IWork.h"
#include "../../DesktopEditor/common/File.h"
int main(int argc, char *argv[])
{
CIWorkFile oFile;
std::wstring sExamplesDir = NSFile::GetProcessDirectory() + L"/../examples";
oFile.Convert2Odf(sExamplesDir + L"/new.pages", sExamplesDir + L"/out_new.odt");
oFile.Convert2Odf(sExamplesDir + L"/old.pages", sExamplesDir + L"/out_old.odt");
return 0;
}

20
Apple/test/test.pro Normal file
View File

@ -0,0 +1,20 @@
CONFIG -= qt
QT -= core gui
TARGET = test
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
CORE_ROOT_DIR = $$PWD/../..
PWD_ROOT_DIR = $$PWD
include($$CORE_ROOT_DIR/Common/base.pri)
ADD_DEPENDENCY(UnicodeConverter, kernel, IWorkFile)
core_linux:include($$PWD/../../Common/3dParty/icu/icu.pri)
core_windows:LIBS += -lgdi32 -ladvapi32 -luser32 -lshell32
SOURCES += main.cpp
DESTDIR = $$PWD/build

8
Common/3dParty/apple/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# Ignore everything in this directory
glm
mdds
librevenge
libodfgen
libetonyek
# Except this file
!.gitignore

View File

@ -0,0 +1,36 @@
INCLUDEPATH += $$PWD
# LIBREVENGE
REVENGE_LIB_ROOT = $$PWD/librevenge
INCLUDEPATH += \
$$REVENGE_LIB_ROOT/inc
HEADERS += $$files($$REVENGE_LIB_ROOT/inc/*.h, true)
HEADERS += $$files($$REVENGE_LIB_ROOT/src/lib/*.h, true)
SOURCES += $$files($$REVENGE_LIB_ROOT/src/lib/*.cpp, true)
# LIBODFGEN
ODF_LIB_ROOT = $$PWD/libodfgen
INCLUDEPATH += \
$$ODF_LIB_ROOT/inc
HEADERS += $$files($$ODF_LIB_ROOT/inc/libodfgen/*.hxx, true)
HEADERS += $$files($$ODF_LIB_ROOT/src/*.hxx, true)
SOURCES += $$files($$ODF_LIB_ROOT/src/*.cxx, true)
# LIBETONYEK
ETONYEK_LIB_ROOT = $$PWD/libetonyek
INCLUDEPATH += \
$$ETONYEK_LIB_ROOT/inc \
$$ETONYEK_LIB_ROOT/src/lib \
$$ETONYEK_LIB_ROOT/src/lib/contexts \
$$PWD/mdds/include \
$$PWD/glm
HEADERS += $$files($$ETONYEK_LIB_ROOT/inc/libetonyek/*.h, true)
HEADERS += $$files($$ETONYEK_LIB_ROOT/src/lib/*.h, true)
SOURCES += $$files($$ETONYEK_LIB_ROOT/src/lib/*.cpp, true)

View File

@ -0,0 +1,121 @@
import sys
sys.path.append('../../../../build_tools/scripts')
import base
import os
if not base.is_dir("glm"):
base.cmd("git", ["clone", "https://github.com/g-truc/glm.git"])
base.cmd_in_dir("glm", "git", ["checkout", "33b4a621a697a305bc3a7610d290677b96beb181", "--quiet"])
if not base.is_dir("mdds"):
base.cmd("git", ["clone", "https://github.com/kohei-us/mdds.git"])
base.cmd_in_dir("mdds", "git", ["checkout", "0783158939c6ce4b0b1b89e345ab983ccb0f0ad0"], "--quiet")
fix_cpp_version = "#if __cplusplus < 201402L\n"
fix_cpp_version += "#ifndef _MSC_VER\n"
fix_cpp_version += "namespace std {\n"
fix_cpp_version += " template<bool __v>\n"
fix_cpp_version += " using bool_constant = integral_constant<bool, __v>;\n\n"
fix_cpp_version += " template <class... _Types>\n"
fix_cpp_version += " using void_t = void;\n"
fix_cpp_version += "}\n#endif\n"
fix_cpp_version += "#endif\n\n"
fix_cpp_version += "namespace mdds {"
base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", fix_cpp_version)
if not base.is_dir("librevenge"):
base.cmd("git", ["clone", "https://github.com/Distrotech/librevenge.git"])
base.cmd_in_dir("librevenge", "git", ["checkout", "becd044b519ab83893ad6398e3cbb499a7f0aaf4", "--quiet"])
stat_windows = ""
stat_windows += "#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)\n"
stat_windows += "#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)\n"
stat_windows += "#endif\n"
stat_windows += "#if !defined(S_ISDIR) && defined(S_IFMT) && defined(S_IFDIR)\n"
stat_windows += "#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)\n"
stat_windows += "#endif\n"
base.replaceInFile("./librevenge/src/lib/RVNGDirectoryStream.cpp", "#include <librevenge-stream/librevenge-stream.h>",
"#include <librevenge-stream/librevenge-stream.h>\n\n" + stat_windows)
fix_RVNG_H = "explicit RVNGFileStream(const char *filename);\n"
fix_RVNG_H += " #if defined(_WIN32) || defined(_WIN64)\n"
fix_RVNG_H += " explicit RVNGFileStream(const wchar_t *filename);\n"
fix_RVNG_H += " #endif\n"
base.replaceInFile("./librevenge/inc/librevenge-stream/RVNGStreamImplementation.h", "explicit RVNGFileStream(const char *filename);", fix_RVNG_H)
fix_RVNG_CPP_include = "#if defined(_WIN32) || defined(_WIN64)\n"
fix_RVNG_CPP_include += "#include <sys/stat.h>\n\n"
fix_RVNG_CPP_include += "static __inline int wstat(wchar_t const* const _FileName, struct stat* const _Stat)\n"
fix_RVNG_CPP_include += "{\n"
fix_RVNG_CPP_include += " _STATIC_ASSERT(sizeof(struct stat) == sizeof(struct _stat64i32));\n";
fix_RVNG_CPP_include += " return _wstat64i32(_FileName, (struct _stat64i32*)_Stat);\n";
fix_RVNG_CPP_include += "}\n"
fix_RVNG_CPP_include += "#endif\n\n"
fix_RVNG_CPP_include += "namespace librevenge"
base.replaceInFile("./librevenge/src/lib/RVNGStreamImplementation.cpp", "namespace librevenge", fix_RVNG_CPP_include)
fix_RVNG_CPP = "#if defined(_WIN32) || defined(_WIN64)\n"
fix_RVNG_CPP += "RVNGFileStream::RVNGFileStream(const wchar_t *filename) :\n"
fix_RVNG_CPP += " RVNGInputStream(),\n"
fix_RVNG_CPP += " d(new RVNGFileStreamPrivate())\n"
fix_RVNG_CPP += "{\n"
fix_RVNG_CPP += " d->file = _wfopen(filename, L\"rb\");\n"
fix_RVNG_CPP += " if (!d->file || ferror(d->file))\n"
fix_RVNG_CPP += " {\n"
fix_RVNG_CPP += " delete d;\n"
fix_RVNG_CPP += " d = 0;\n"
fix_RVNG_CPP += " return;\n"
fix_RVNG_CPP += " }\n\n"
fix_RVNG_CPP += " struct stat status;\n"
fix_RVNG_CPP += " const int retval = wstat(filename, &status);\n"
fix_RVNG_CPP += " if ((0 != retval) || !S_ISREG(status.st_mode))\n"
fix_RVNG_CPP += " {\n"
fix_RVNG_CPP += " delete d;\n"
fix_RVNG_CPP += " d = 0;\n"
fix_RVNG_CPP += " return;\n"
fix_RVNG_CPP += " }\n\n"
fix_RVNG_CPP += " fseek(d->file, 0, SEEK_END);\n\n"
fix_RVNG_CPP += " d->streamSize = (unsigned long) ftell(d->file);\n"
fix_RVNG_CPP += " if (d->streamSize == (unsigned long)-1)\n"
fix_RVNG_CPP += " d->streamSize = 0;\n"
fix_RVNG_CPP += " if (d->streamSize > (std::numeric_limits<unsigned long>::max)() / 2)\n"
fix_RVNG_CPP += " d->streamSize = (std::numeric_limits<unsigned long>::max)() / 2;\n"
fix_RVNG_CPP += " fseek(d->file, 0, SEEK_SET);\n"
fix_RVNG_CPP += "}\n"
fix_RVNG_CPP += "#endif\n\n"
fix_RVNG_CPP += "RVNGFileStream::~RVNGFileStream()"
base.replaceInFile("./librevenge/src/lib/RVNGStreamImplementation.cpp", "RVNGFileStream::~RVNGFileStream()", fix_RVNG_CPP)
if not base.is_dir("libodfgen"):
base.cmd("git", ["clone", "https://github.com/Distrotech/libodfgen.git"])
base.cmd_in_dir("libodfgen", "git", ["checkout", "8ef8c171ebe3c5daebdce80ee422cf7bb96aa3bc", "--quiet"])
if not base.is_dir("libetonyek"):
base.cmd("git", ["clone", "https://github.com/LibreOffice/libetonyek.git"])
base.cmd_in_dir("libetonyek", "git", ["checkout", "cb396b4a9453a457469b62a740d8fb933c9442c3", "--quiet"])
base.replaceInFile("./libetonyek/src/lib/IWORKTable.cpp", "is_tree_valid", "valid_tree")
cmd_args = sys.argv[1:]
use_gperf = False
for arg in cmd_args:
if '--gperf' == arg:
use_gperf = True
if use_gperf:
base_gperf_args = ["--compare-strncmp", "--enum", "--null-strings", "--readonly-tables", "--language", "C++"]
base_gperf_files = ["IWORKToken.gperf", "KEY1Token.gperf", "KEY2Token.gperf", "NUM1Token.gperf", "PAG1Token.gperf"]
for file in base_gperf_files:
base.cmd_in_dir("./libetonyek/src/lib", "gperf", base_gperf_args + [file, "--output-file", file[0:file.find(".")] + ".inc"])
else:
base.copy_dir_content("./headers", "./libetonyek/src/lib")

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,727 @@
/* C++ code produced by gperf version 3.0.1 */
/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file KEY1Token.inc KEY1Token.gperf */
/* Computed positions: -k'1,3,6,9,14,$' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 10 "KEY1Token.gperf"
#if defined __GNUC__
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
using namespace KEY1Token;
#line 18 "KEY1Token.gperf"
struct Token
{
const char *name;
int id;
};
#include <string.h>
/* maximum key range = 602, duplicates = 0 */
class Perfect_Hash
{
private:
static inline unsigned int hash (const char *str, unsigned int len);
public:
static const struct Token *in_word_set (const char *str, unsigned int len);
};
inline unsigned int
Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 220, 612, 0, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 0, 0, 0, 0,
0, 0, 10, 612, 612, 612, 0, 612, 30, 15,
55, 612, 5, 60, 5, 612, 10, 612, 612, 612,
612, 612, 612, 612, 612, 0, 612, 20, 165, 115,
65, 0, 105, 135, 175, 60, 0, 0, 30, 145,
10, 5, 155, 10, 5, 30, 5, 200, 15, 20,
0, 190, 0, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
612, 612, 612, 612, 612, 612
};
register int hval = len;
switch (hval)
{
default:
hval += asso_values[(unsigned char)str[13]];
/*FALLTHROUGH*/
case 13:
case 12:
case 11:
case 10:
case 9:
hval += asso_values[(unsigned char)str[8]];
/*FALLTHROUGH*/
case 8:
case 7:
case 6:
hval += asso_values[(unsigned char)str[5]];
/*FALLTHROUGH*/
case 5:
case 4:
case 3:
hval += asso_values[(unsigned char)str[2]];
/*FALLTHROUGH*/
case 2:
case 1:
hval += asso_values[(unsigned char)str[0]];
break;
}
return hval + asso_values[(unsigned char)str[len - 1]];
}
const struct Token *
Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
enum
{
TOTAL_KEYWORDS = 203,
MIN_WORD_LENGTH = 1,
MAX_WORD_LENGTH = 39,
MIN_HASH_VALUE = 10,
MAX_HASH_VALUE = 611
};
static const struct Token wordlist[] =
{
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 199 "KEY1Token.gperf"
{"theme",theme},
{(char*)0},
#line 211 "KEY1Token.gperf"
{"tr",tr},
{(char*)0},
#line 196 "KEY1Token.gperf"
{"text",text},
#line 207 "KEY1Token.gperf"
{"title",title},
{(char*)0},
#line 198 "KEY1Token.gperf"
{"textbox",textbox},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 65 "KEY1Token.gperf"
{"element",element},
{(char*)0},
#line 132 "KEY1Token.gperf"
{"none",none},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
#line 175 "KEY1Token.gperf"
{"size",size},
{(char*)0}, {(char*)0},
#line 209 "KEY1Token.gperf"
{"tl",tl},
{(char*)0},
#line 206 "KEY1Token.gperf"
{"tile",tile},
#line 168 "KEY1Token.gperf"
{"serie",serie},
{(char*)0},
#line 221 "KEY1Token.gperf"
{"version",version},
{(char*)0},
#line 112 "KEY1Token.gperf"
{"line",line},
{(char*)0}, {(char*)0}, {(char*)0},
#line 174 "KEY1Token.gperf"
{"showZero",showZero},
{(char*)0},
#line 133 "KEY1Token.gperf"
{"notes",notes},
{(char*)0},
#line 188 "KEY1Token.gperf"
{"stroke-style",stroke_style},
{(char*)0},
#line 32 "KEY1Token.gperf"
{"axes",axes},
#line 172 "KEY1Token.gperf"
{"shape",shape},
{(char*)0},
#line 187 "KEY1Token.gperf"
{"stroke-color",stroke_color},
#line 166 "KEY1Token.gperf"
{"sequence",sequence},
{(char*)0},
#line 183 "KEY1Token.gperf"
{"start",start},
{(char*)0}, {(char*)0}, {(char*)0},
#line 182 "KEY1Token.gperf"
{"span",span},
#line 185 "KEY1Token.gperf"
{"steps",steps},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 93 "KEY1Token.gperf"
{"ident",ident},
{(char*)0}, {(char*)0}, {(char*)0},
#line 134 "KEY1Token.gperf"
{"null",null},
#line 197 "KEY1Token.gperf"
{"text-attributes",text_attributes},
{(char*)0},
#line 130 "KEY1Token.gperf"
{"natural-size",natural_size},
{(char*)0},
#line 131 "KEY1Token.gperf"
{"node",node},
#line 111 "KEY1Token.gperf"
{"level",level},
{(char*)0},
#line 225 "KEY1Token.gperf"
{"visible",visible},
{(char*)0}, {(char*)0},
#line 95 "KEY1Token.gperf"
{"image",image},
{(char*)0},
#line 171 "KEY1Token.gperf"
{"shadow-style",shadow_style},
{(char*)0},
#line 67 "KEY1Token.gperf"
{"end-color",end_color},
{(char*)0}, {(char*)0},
#line 208 "KEY1Token.gperf"
{"titleVisible",titleVisible},
#line 212 "KEY1Token.gperf"
{"tracks-master",tracks_master},
#line 53 "KEY1Token.gperf"
{"data",data},
#line 177 "KEY1Token.gperf"
{"slide",slide},
{(char*)0}, {(char*)0},
#line 62 "KEY1Token.gperf"
{"div",div},
#line 195 "KEY1Token.gperf"
{"tail",tail},
#line 170 "KEY1Token.gperf"
{"seriesDirection",seriesDirection},
#line 169 "KEY1Token.gperf"
{"series",series},
{(char*)0},
#line 162 "KEY1Token.gperf"
{"relative",relative},
#line 60 "KEY1Token.gperf"
{"direction",direction},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 27 "KEY1Token.gperf"
{"altLineVisible",altLineVisible},
{(char*)0}, {(char*)0}, {(char*)0},
#line 173 "KEY1Token.gperf"
{"showGrid",showGrid},
#line 33 "KEY1Token.gperf"
{"axis",axis},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 161 "KEY1Token.gperf"
{"reference",reference},
#line 114 "KEY1Token.gperf"
{"line-tail-style",line_tail_style},
{(char*)0}, {(char*)0}, {(char*)0},
#line 73 "KEY1Token.gperf"
{"font",font},
{(char*)0},
#line 137 "KEY1Token.gperf"
{"offset",offset},
#line 92 "KEY1Token.gperf"
{"id",id},
{(char*)0},
#line 160 "KEY1Token.gperf"
{"rect",rect},
#line 180 "KEY1Token.gperf"
{"solid",solid},
{(char*)0}, {(char*)0},
#line 66 "KEY1Token.gperf"
{"end",end},
#line 77 "KEY1Token.gperf"
{"font-name",font_name},
{(char*)0},
#line 159 "KEY1Token.gperf"
{"radius",radius},
#line 61 "KEY1Token.gperf"
{"display-name",display_name},
{(char*)0},
#line 68 "KEY1Token.gperf"
{"file",file},
{(char*)0},
#line 45 "KEY1Token.gperf"
{"center",center},
{(char*)0}, {(char*)0},
#line 109 "KEY1Token.gperf"
{"left",left},
{(char*)0}, {(char*)0},
#line 51 "KEY1Token.gperf"
{"content",content},
#line 64 "KEY1Token.gperf"
{"duration",duration},
#line 71 "KEY1Token.gperf"
{"fill-type",fill_type},
#line 163 "KEY1Token.gperf"
{"right",right},
#line 139 "KEY1Token.gperf"
{"orientation",orientation},
{(char*)0}, {(char*)0},
#line 78 "KEY1Token.gperf"
{"font-size",font_size},
#line 50 "KEY1Token.gperf"
{"color",color},
{(char*)0}, {(char*)0}, {(char*)0},
#line 129 "KEY1Token.gperf"
{"name",name},
#line 28 "KEY1Token.gperf"
{"angle",angle},
{(char*)0}, {(char*)0}, {(char*)0},
#line 215 "KEY1Token.gperf"
{"type",type},
#line 52 "KEY1Token.gperf"
{"dash-style",dash_style},
{(char*)0}, {(char*)0},
#line 82 "KEY1Token.gperf"
{"gradient",gradient},
#line 56 "KEY1Token.gperf"
{"dataFormatterPrefix",dataFormatterPrefix},
#line 54 "KEY1Token.gperf"
{"dataFormatterHasThousandsSeparators",dataFormatterHasThousandsSeparators},
#line 135 "KEY1Token.gperf"
{"number",number},
#line 38 "KEY1Token.gperf"
{"br",br},
#line 222 "KEY1Token.gperf"
{"vertical",vertical},
#line 57 "KEY1Token.gperf"
{"dataFormatterSuffix",dataFormatterSuffix},
#line 193 "KEY1Token.gperf"
{"table",table},
{(char*)0}, {(char*)0}, {(char*)0},
#line 24 "KEY1Token.gperf"
{"DefaultLegendRelativePosition",DefaultLegendRelativePosition},
{(char*)0}, {(char*)0},
#line 146 "KEY1Token.gperf"
{"pattern",pattern},
{(char*)0},
#line 55 "KEY1Token.gperf"
{"dataFormatterNumberOfDecimals",dataFormatterNumberOfDecimals},
{(char*)0}, {(char*)0},
#line 165 "KEY1Token.gperf"
{"segment",segment},
{(char*)0},
#line 59 "KEY1Token.gperf"
{"dict",dict},
{(char*)0}, {(char*)0},
#line 153 "KEY1Token.gperf"
{"presentation",presentation},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 35 "KEY1Token.gperf"
{"bl",bl},
#line 126 "KEY1Token.gperf"
{"metadata",metadata},
{(char*)0},
#line 86 "KEY1Token.gperf"
{"guide",guide},
{(char*)0},
#line 181 "KEY1Token.gperf"
{"spacing",spacing},
#line 120 "KEY1Token.gperf"
{"majorTickPositions",majorTickPositions},
{(char*)0},
#line 70 "KEY1Token.gperf"
{"fill-style",fill_style},
{(char*)0},
#line 118 "KEY1Token.gperf"
{"lock-aspect-ratio",lock_aspect_ratio},
{(char*)0},
#line 44 "KEY1Token.gperf"
{"byte-size",byte_size},
{(char*)0},
#line 40 "KEY1Token.gperf"
{"bullet",bullet},
#line 25 "KEY1Token.gperf"
{"DefaultLegendSize",DefaultLegendSize},
#line 128 "KEY1Token.gperf"
{"minorTickPositions",minorTickPositions},
{(char*)0},
#line 202 "KEY1Token.gperf"
{"tickLabelsAngle",tickLabelsAngle},
#line 127 "KEY1Token.gperf"
{"middle",middle},
{(char*)0},
#line 152 "KEY1Token.gperf"
{"pos",pos},
#line 155 "KEY1Token.gperf"
{"prototype-data",prototype_data},
#line 31 "KEY1Token.gperf"
{"array",array},
{(char*)0},
#line 122 "KEY1Token.gperf"
{"master-slide",master_slide},
#line 117 "KEY1Token.gperf"
{"location",location},
#line 176 "KEY1Token.gperf"
{"size-technique",size_technique},
{(char*)0},
#line 79 "KEY1Token.gperf"
{"font-superscript",font_superscript},
#line 138 "KEY1Token.gperf"
{"opacity",opacity},
{(char*)0}, {(char*)0}, {(char*)0},
#line 100 "KEY1Token.gperf"
{"interBarGap",interBarGap},
{(char*)0}, {(char*)0},
#line 156 "KEY1Token.gperf"
{"prototype-drawables",prototype_drawables},
{(char*)0},
#line 58 "KEY1Token.gperf"
{"description",description},
#line 43 "KEY1Token.gperf"
{"bullets",bullets},
{(char*)0},
#line 76 "KEY1Token.gperf"
{"font-ligatures",font_ligatures},
{(char*)0},
#line 191 "KEY1Token.gperf"
{"symbol",symbol},
#line 154 "KEY1Token.gperf"
{"prototype-bullets",prototype_bullets},
{(char*)0},
#line 194 "KEY1Token.gperf"
{"tab-stops",tab_stops},
#line 90 "KEY1Token.gperf"
{"horizontal",horizontal},
{(char*)0},
#line 204 "KEY1Token.gperf"
{"tickLabelsVisible",tickLabelsVisible},
{(char*)0},
#line 192 "KEY1Token.gperf"
{"symbolFillMode",symbolFillMode},
#line 74 "KEY1Token.gperf"
{"font-color",font_color},
{(char*)0}, {(char*)0},
#line 124 "KEY1Token.gperf"
{"master-slides",master_slides},
#line 147 "KEY1Token.gperf"
{"pieSliceOffset",pieSliceOffset},
{(char*)0}, {(char*)0}, {(char*)0},
#line 42 "KEY1Token.gperf"
{"bullet-indentation",bullet_indentation},
{(char*)0}, {(char*)0},
#line 87 "KEY1Token.gperf"
{"guides",guides},
{(char*)0}, {(char*)0},
#line 88 "KEY1Token.gperf"
{"head",head},
#line 226 "KEY1Token.gperf"
{"width",width},
#line 89 "KEY1Token.gperf"
{"hidden",hidden},
{(char*)0}, {(char*)0},
#line 46 "KEY1Token.gperf"
{"character",character},
#line 69 "KEY1Token.gperf"
{"fill-color",fill_color},
#line 81 "KEY1Token.gperf"
{"g",g},
#line 75 "KEY1Token.gperf"
{"font-kerning",font_kerning},
{(char*)0},
#line 103 "KEY1Token.gperf"
{"justified",justified},
{(char*)0},
#line 116 "KEY1Token.gperf"
{"lineVisible",lineVisible},
#line 107 "KEY1Token.gperf"
{"labelVisible",labelVisible},
{(char*)0}, {(char*)0}, {(char*)0},
#line 119 "KEY1Token.gperf"
{"locked",locked},
#line 189 "KEY1Token.gperf"
{"stroke-width",stroke_width},
{(char*)0},
#line 200 "KEY1Token.gperf"
{"thumbnail",thumbnail},
#line 201 "KEY1Token.gperf"
{"thumbnails",thumbnails},
#line 190 "KEY1Token.gperf"
{"styles",styles},
{(char*)0}, {(char*)0},
#line 136 "KEY1Token.gperf"
{"numberOfPoints",numberOfPoints},
#line 49 "KEY1Token.gperf"
{"chartFrame",chartFrame},
#line 167 "KEY1Token.gperf"
{"sequence-bullet-style",sequence_bullet_style},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 214 "KEY1Token.gperf"
{"transition-style",transition_style},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 110 "KEY1Token.gperf"
{"legend",legend},
#line 148 "KEY1Token.gperf"
{"pieSlicePercentVisible",pieSlicePercentVisible},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 47 "KEY1Token.gperf"
{"character-bullet-style",character_bullet_style},
{(char*)0},
#line 213 "KEY1Token.gperf"
{"transformation",transformation},
#line 224 "KEY1Token.gperf"
{"visibility",visibility},
#line 186 "KEY1Token.gperf"
{"string",string},
{(char*)0},
#line 39 "KEY1Token.gperf"
{"buildChunkingStyle",buildChunkingStyle},
{(char*)0}, {(char*)0},
#line 184 "KEY1Token.gperf"
{"start-color",start_color},
{(char*)0},
#line 210 "KEY1Token.gperf"
{"top",top},
#line 63 "KEY1Token.gperf"
{"drawables",drawables},
#line 179 "KEY1Token.gperf"
{"slide-size",slide_size},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 113 "KEY1Token.gperf"
{"line-head-style",line_head_style},
#line 157 "KEY1Token.gperf"
{"prototype-plugin",prototype_plugin},
{(char*)0}, {(char*)0},
#line 80 "KEY1Token.gperf"
{"font-underline",font_underline},
{(char*)0},
#line 97 "KEY1Token.gperf"
{"image-scale",image_scale},
{(char*)0},
#line 106 "KEY1Token.gperf"
{"labelPosition",labelPosition},
{(char*)0},
#line 96 "KEY1Token.gperf"
{"image-data",image_data},
{(char*)0}, {(char*)0}, {(char*)0},
#line 145 "KEY1Token.gperf"
{"path",path},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 34 "KEY1Token.gperf"
{"background-fill-style",background_fill_style},
#line 158 "KEY1Token.gperf"
{"prototype-plugins",prototype_plugins},
{(char*)0}, {(char*)0},
#line 123 "KEY1Token.gperf"
{"master-slide-id",master_slide_id},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 178 "KEY1Token.gperf"
{"slide-list",slide_list},
#line 121 "KEY1Token.gperf"
{"marker-type",marker_type},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
#line 91 "KEY1Token.gperf"
{"http://developer.apple.com/schemas/APXL",NS_URI_KEY},
{(char*)0}, {(char*)0}, {(char*)0},
#line 98 "KEY1Token.gperf"
{"image-bullet-style",image_bullet_style},
#line 30 "KEY1Token.gperf"
{"application-version",application_version},
{(char*)0},
#line 149 "KEY1Token.gperf"
{"plugin",plugin},
#line 151 "KEY1Token.gperf"
{"point_at_top",point_at_top},
#line 104 "KEY1Token.gperf"
{"key",key},
{(char*)0}, {(char*)0},
#line 29 "KEY1Token.gperf"
{"application-name",application_name},
{(char*)0},
#line 223 "KEY1Token.gperf"
{"vertical-alignment",vertical_alignment},
#line 83 "KEY1Token.gperf"
{"gradient-angle",gradient_angle},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 144 "KEY1Token.gperf"
{"paragraph-tail-indent",paragraph_tail_indent},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
#line 142 "KEY1Token.gperf"
{"paragraph-first-line-indent",paragraph_first_line_indent},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 72 "KEY1Token.gperf"
{"floating-content",floating_content},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 150 "KEY1Token.gperf"
{"plugin-data",plugin_data},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 36 "KEY1Token.gperf"
{"body",body},
{(char*)0}, {(char*)0},
#line 41 "KEY1Token.gperf"
{"bullet-characters",bullet_characters},
{(char*)0}, {(char*)0}, {(char*)0},
#line 143 "KEY1Token.gperf"
{"paragraph-head-indent",paragraph_head_indent},
{(char*)0}, {(char*)0},
#line 99 "KEY1Token.gperf"
{"inherited",inherited},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 125 "KEY1Token.gperf"
{"match-point",match_point},
{(char*)0},
#line 216 "KEY1Token.gperf"
{"ui-state",ui_state},
#line 102 "KEY1Token.gperf"
{"is-filled",is_filled},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 115 "KEY1Token.gperf"
{"lineOpacity",lineOpacity},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
#line 37 "KEY1Token.gperf"
{"bottom",bottom},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 140 "KEY1Token.gperf"
{"page-number",page_number},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 205 "KEY1Token.gperf"
{"time-stamp",time_stamp},
{(char*)0},
#line 203 "KEY1Token.gperf"
{"tickLabelsOpacity",tickLabelsOpacity},
{(char*)0}, {(char*)0}, {(char*)0},
#line 94 "KEY1Token.gperf"
{"id-ref",id_ref},
{(char*)0}, {(char*)0},
#line 141 "KEY1Token.gperf"
{"paragraph-alignment",paragraph_alignment},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 164 "KEY1Token.gperf"
{"scale-to-fit",scale_to_fit},
{(char*)0},
#line 101 "KEY1Token.gperf"
{"interSeriesGap",interSeriesGap},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 219 "KEY1Token.gperf"
{"userMaximum",userMaximum},
{(char*)0}, {(char*)0},
#line 217 "KEY1Token.gperf"
{"useUserMaximum",useUserMaximum},
#line 108 "KEY1Token.gperf"
{"layerElementsForShadowing",layerElementsForShadowing},
{(char*)0},
#line 105 "KEY1Token.gperf"
{"labelOpacity",labelOpacity},
{(char*)0}, {(char*)0},
#line 48 "KEY1Token.gperf"
{"chart-prototype",chart_prototype},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 220 "KEY1Token.gperf"
{"userMinimum",userMinimum},
{(char*)0}, {(char*)0},
#line 218 "KEY1Token.gperf"
{"useUserMinimum",useUserMinimum},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 26 "KEY1Token.gperf"
{"altLineOpacity",altLineOpacity},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0},
#line 85 "KEY1Token.gperf"
{"grow-horizontally",grow_horizontally},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 84 "KEY1Token.gperf"
{"gridOpacity",gridOpacity}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
register int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
register const char *s = wordlist[key].name;
if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key];
}
}
return 0;
}
#line 227 "KEY1Token.gperf"

View File

@ -0,0 +1,300 @@
/* C++ code produced by gperf version 3.0.1 */
/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file KEY2Token.inc KEY2Token.gperf */
/* Computed positions: -k'1,4,$' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 10 "KEY2Token.gperf"
#if defined __GNUC__
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
using namespace KEY2Token;
#line 18 "KEY2Token.gperf"
struct Token
{
const char *name;
int id;
};
#include <string.h>
/* maximum key range = 140, duplicates = 0 */
class Perfect_Hash
{
private:
static inline unsigned int hash (const char *str, unsigned int len);
public:
static const struct Token *in_word_set (const char *str, unsigned int len);
};
inline unsigned int
Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
{
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 5, 65,
0, 141, 35, 0, 141, 5, 141, 0, 141, 141,
141, 141, 141, 141, 141, 141, 0, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 0, 25, 0,
15, 0, 55, 10, 10, 5, 141, 15, 20, 0,
10, 25, 40, 141, 25, 25, 5, 0, 30, 5,
141, 40, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
141, 141, 141, 141, 141, 141
};
register int hval = len;
switch (hval)
{
default:
hval += asso_values[(unsigned char)str[3]];
/*FALLTHROUGH*/
case 3:
case 2:
case 1:
hval += asso_values[(unsigned char)str[0]];
break;
}
return hval + asso_values[(unsigned char)str[len - 1]];
}
const struct Token *
Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
enum
{
TOTAL_KEYWORDS = 67,
MIN_WORD_LENGTH = 1,
MAX_WORD_LENGTH = 46,
MIN_HASH_VALUE = 1,
MAX_HASH_VALUE = 140
};
static const struct Token wordlist[] =
{
{(char*)0},
#line 49 "KEY2Token.gperf"
{"c",c},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0},
#line 65 "KEY2Token.gperf"
{"metadata",metadata},
#line 89 "KEY2Token.gperf"
{"type",type},
#line 84 "KEY2Token.gperf"
{"theme",theme},
#line 58 "KEY2Token.gperf"
{"i",i},
#line 50 "KEY2Token.gperf"
{"comment",comment},
#line 41 "KEY2Token.gperf"
{"animationType",animationType},
#line 66 "KEY2Token.gperf"
{"name",name},
#line 26 "KEY2Token.gperf"
{"2005112100",VERSION_STR_3},
{(char*)0},
#line 62 "KEY2Token.gperf"
{"master-slide",master_slide},
{(char*)0},
#line 83 "KEY2Token.gperf"
{"text",text},
#line 85 "KEY2Token.gperf"
{"theme-list",theme_list},
#line 28 "KEY2Token.gperf"
{"92008102400",VERSION_STR_5},
{(char*)0},
#line 36 "KEY2Token.gperf"
{"animationEndOffset",animationEndOffset},
{(char*)0},
#line 39 "KEY2Token.gperf"
{"animationStartOffset",animationStartOffset},
#line 27 "KEY2Token.gperf"
{"72007061400",VERSION_STR_4},
#line 35 "KEY2Token.gperf"
{"animationDuration",animationDuration},
#line 40 "KEY2Token.gperf"
{"animationTimingReferent",animationTimingReferent},
#line 73 "KEY2Token.gperf"
{"size",size},
#line 86 "KEY2Token.gperf"
{"title",title},
{(char*)0}, {(char*)0},
#line 55 "KEY2Token.gperf"
{"headline",headline},
#line 53 "KEY2Token.gperf"
{"direction",direction},
#line 52 "KEY2Token.gperf"
{"depth",depth},
#line 78 "KEY2Token.gperf"
{"sticky-note",sticky_note},
#line 34 "KEY2Token.gperf"
{"animationDelayAutomaticWith",animationDelayAutomaticWith},
#line 30 "KEY2Token.gperf"
{"animationAuto",animationAuto},
{(char*)0},
#line 67 "KEY2Token.gperf"
{"notes",notes},
#line 54 "KEY2Token.gperf"
{"events",events},
#line 42 "KEY2Token.gperf"
{"authors",authors},
#line 63 "KEY2Token.gperf"
{"master-slides",master_slides},
#line 70 "KEY2Token.gperf"
{"page",page},
#line 74 "KEY2Token.gperf"
{"slide",slide},
#line 80 "KEY2Token.gperf"
{"string",string},
#line 56 "KEY2Token.gperf"
{"headlineParagraphStyle",headlineParagraphStyle},
#line 37 "KEY2Token.gperf"
{"animationInterchunkAuto",animationInterchunkAuto},
{(char*)0},
#line 24 "KEY2Token.gperf"
{"2004102100",VERSION_STR_2},
#line 77 "KEY2Token.gperf"
{"slide-style",slide_style},
#line 33 "KEY2Token.gperf"
{"animationDelayAutmaticAfter",animationDelayAutomaticAfter},
#line 61 "KEY2Token.gperf"
{"keywords",keywords},
#line 32 "KEY2Token.gperf"
{"animationDelay",animationDelay},
#line 75 "KEY2Token.gperf"
{"slide-list",slide_list},
{(char*)0},
#line 31 "KEY2Token.gperf"
{"animationAutoPlay",animationAutoPlay},
#line 60 "KEY2Token.gperf"
{"key",key},
#line 51 "KEY2Token.gperf"
{"decimal-number",number},
#line 82 "KEY2Token.gperf"
{"stylesheet",stylesheet},
{(char*)0},
#line 79 "KEY2Token.gperf"
{"sticky-notes",sticky_notes},
#line 29 "KEY2Token.gperf"
{"BGBuildDurationProperty",BGBuildDurationProperty},
#line 38 "KEY2Token.gperf"
{"animationInterchunkDelay",animationInterchunkDelay},
#line 45 "KEY2Token.gperf"
{"build",build},
#line 68 "KEY2Token.gperf"
{"number",number},
#line 87 "KEY2Token.gperf"
{"title-placeholder",title_placeholder},
#line 69 "KEY2Token.gperf"
{"object-placeholder",object_placeholder},
{(char*)0},
#line 64 "KEY2Token.gperf"
{"master-ref",master_ref},
#line 46 "KEY2Token.gperf"
{"build-chunk",build_chunk},
#line 90 "KEY2Token.gperf"
{"version",version},
{(char*)0}, {(char*)0},
#line 25 "KEY2Token.gperf"
{"2005092101",COMPATIBLE_VERSION_STR_3,},
{(char*)0},
#line 48 "KEY2Token.gperf"
{"bullets",bullets},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 47 "KEY2Token.gperf"
{"build-chunks",build_chunks},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 72 "KEY2Token.gperf"
{"presentation",presentation},
{(char*)0},
#line 76 "KEY2Token.gperf"
{"slide-number-placeholder",slide_number_placeholder},
{(char*)0}, {(char*)0}, {(char*)0},
#line 59 "KEY2Token.gperf"
{"info-ref",info_ref},
{(char*)0}, {(char*)0},
#line 57 "KEY2Token.gperf"
{"http://developer.apple.com/namespaces/keynote2",NS_URI_KEY},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 88 "KEY2Token.gperf"
{"title-placeholder-ref",title_placeholder_ref},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 43 "KEY2Token.gperf"
{"body-placeholder",body_placeholder},
{(char*)0}, {(char*)0},
#line 81 "KEY2Token.gperf"
{"style-ref",style_ref},
{(char*)0},
#line 71 "KEY2Token.gperf"
{"parent-build-ref",parent_build_ref},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 44 "KEY2Token.gperf"
{"body-placeholder-ref",body_placeholder_ref}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
register int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
register const char *s = wordlist[key].name;
if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key];
}
}
return 0;
}
#line 91 "KEY2Token.gperf"

View File

@ -0,0 +1,151 @@
/* C++ code produced by gperf version 3.0.1 */
/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file NUM1Token.inc NUM1Token.gperf */
/* Computed positions: -k'$' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 10 "NUM1Token.gperf"
#if defined __GNUC__
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
using namespace NUM1Token;
#line 18 "NUM1Token.gperf"
struct Token
{
const char *name;
int id;
};
#include <string.h>
/* maximum key range = 34, duplicates = 0 */
class Perfect_Hash
{
private:
static inline unsigned int hash (const char *str, unsigned int len);
public:
static const struct Token *in_word_set (const char *str, unsigned int len);
};
inline unsigned int
Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
{
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 0, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 0, 41, 41, 41, 41, 41, 41, 41, 41,
0, 10, 41, 41, 41, 0, 0, 41, 41, 41,
41, 5, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 41, 41
};
return len + asso_values[(unsigned char)str[len - 1]];
}
const struct Token *
Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
enum
{
TOTAL_KEYWORDS = 10,
MIN_WORD_LENGTH = 7,
MAX_WORD_LENGTH = 40,
MIN_HASH_VALUE = 7,
MAX_HASH_VALUE = 40
};
static const struct Token wordlist[] =
{
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 29 "NUM1Token.gperf"
{"version",version},
#line 25 "NUM1Token.gperf"
{"document",document},
#line 30 "NUM1Token.gperf"
{"workspace",workspace},
#line 28 "NUM1Token.gperf"
{"stylesheet",stylesheet},
#line 24 "NUM1Token.gperf"
{"92008102400",VERSION_STR_2},
{(char*)0}, {(char*)0},
#line 32 "NUM1Token.gperf"
{"workspace-name",workspace_name},
#line 33 "NUM1Token.gperf"
{"workspace-style",workspace_style},
{(char*)0}, {(char*)0}, {(char*)0},
#line 27 "NUM1Token.gperf"
{"page-info",page_info},
#line 31 "NUM1Token.gperf"
{"workspace-array",workspace_array},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0},
#line 26 "NUM1Token.gperf"
{"http://developer.apple.com/namespaces/ls",NS_URI_LS}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
register int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
register const char *s = wordlist[key].name;
if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key];
}
}
return 0;
}
#line 34 "NUM1Token.gperf"

View File

@ -0,0 +1,209 @@
/* C++ code produced by gperf version 3.0.1 */
/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file PAG1Token.inc PAG1Token.gperf */
/* Computed positions: -k'1,6' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
/* The character set is not based on ISO-646. */
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
#line 10 "PAG1Token.gperf"
#if defined __GNUC__
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
using namespace PAG1Token;
#line 18 "PAG1Token.gperf"
struct Token
{
const char *name;
int id;
};
#include <string.h>
/* maximum key range = 51, duplicates = 0 */
class Perfect_Hash
{
private:
static inline unsigned int hash (const char *str, unsigned int len);
public:
static const struct Token *in_word_set (const char *str, unsigned int len);
};
inline unsigned int
Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
{
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 25, 55, 0, 55, 10,
55, 55, 55, 55, 55, 55, 55, 10, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
5, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 5, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 5, 25, 15,
20, 0, 20, 15, 5, 55, 55, 5, 10, 55,
0, 15, 5, 55, 0, 0, 0, 55, 5, 10,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
55, 55, 55, 55, 55, 55
};
register int hval = len;
switch (hval)
{
default:
hval += asso_values[(unsigned char)str[5]];
/*FALLTHROUGH*/
case 5:
case 4:
case 3:
case 2:
case 1:
hval += asso_values[(unsigned char)str[0]];
break;
}
return hval;
}
const struct Token *
Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
enum
{
TOTAL_KEYWORDS = 31,
MIN_WORD_LENGTH = 4,
MAX_WORD_LENGTH = 40,
MIN_HASH_VALUE = 4,
MAX_HASH_VALUE = 54
};
static const struct Token wordlist[] =
{
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 38 "PAG1Token.gperf"
{"note",note},
#line 49 "PAG1Token.gperf"
{"rpage",rpage},
#line 39 "PAG1Token.gperf"
{"number",number},
{(char*)0}, {(char*)0},
#line 41 "PAG1Token.gperf"
{"page",page},
#line 52 "PAG1Token.gperf"
{"stylesheet",stylesheet},
#line 33 "PAG1Token.gperf"
{"header",header},
#line 51 "PAG1Token.gperf"
{"slprint-info",slprint_info},
{(char*)0},
#line 47 "PAG1Token.gperf"
{"prototype",prototype},
#line 44 "PAG1Token.gperf"
{"page-scale",page_scale},
#line 37 "PAG1Token.gperf"
{"layout",layout},
{(char*)0}, {(char*)0},
#line 27 "PAG1Token.gperf"
{"cell",cell},
#line 40 "PAG1Token.gperf"
{"order",order},
#line 43 "PAG1Token.gperf"
{"page-height",page_height},
#line 53 "PAG1Token.gperf"
{"textbox",textbox},
{(char*)0},
#line 28 "PAG1Token.gperf"
{"date",date},
#line 45 "PAG1Token.gperf"
{"page-width",page_width},
#line 31 "PAG1Token.gperf"
{"footer",footer},
#line 54 "PAG1Token.gperf"
{"version",version},
#line 29 "PAG1Token.gperf"
{"document",document},
#line 26 "PAG1Token.gperf"
{"body",body},
#line 42 "PAG1Token.gperf"
{"page-group",page_group},
#line 24 "PAG1Token.gperf"
{"92008102400",VERSION_STR_4},
#line 25 "PAG1Token.gperf"
{"SLCreationDateProperty",SLCreationDateProperty},
#line 50 "PAG1Token.gperf"
{"section-prototypes",section_prototypes},
#line 35 "PAG1Token.gperf"
{"kSFWPFootnoteGapProperty",kSFWPFootnoteGapProperty},
#line 36 "PAG1Token.gperf"
{"kSFWPFootnoteKindProperty",kSFWPFootnoteKindProperty},
#line 48 "PAG1Token.gperf"
{"publication-info",publication_info},
{(char*)0}, {(char*)0}, {(char*)0},
#line 46 "PAG1Token.gperf"
{"print-info",print_info},
{(char*)0}, {(char*)0},
#line 32 "PAG1Token.gperf"
{"footnote",footnote},
{(char*)0},
#line 34 "PAG1Token.gperf"
{"http://developer.apple.com/namespaces/sl",NS_URI_SL},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
{(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
#line 30 "PAG1Token.gperf"
{"drawables",drawables}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
register int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
register const char *s = wordlist[key].name;
if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key];
}
}
return 0;
}
#line 55 "PAG1Token.gperf"

View File

@ -27,7 +27,7 @@ CLEAN=
BOOST_VERSION=1.72.0
BOOST_VERSION2=1_72_0
MIN_IOS_VERSION=8.0
IOS_SDK_VERSION=`xcodebuild BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE="YES" OTHER_CFLAGS="-fembed-bitcode" -showsdks | grep iphoneos | \
IOS_SDK_VERSION=`xcodebuild BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE="NO" -showsdks | grep iphoneos | \
egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`
OSX_SDK_VERSION=`xcodebuild BITCODE_GENERATION_MODE="bitcode" ENABLE_BITCODE="YES" OTHER_CFLAGS="-fembed-bitcode" -showsdks | grep macosx | \
egrep "[[:digit:]]+\.[[:digit:]]+" -o | tail -1`
@ -42,7 +42,7 @@ XCODE_ROOT=`xcode-select -print-path`
#
# Should perhaps also consider/use instead: -BOOST_SP_USE_PTHREADS
EXTRA_CPPFLAGS="-DBOOST_AC_USE_PTHREADS -DBOOST_SP_USE_PTHREADS -g -DNDEBUG \
-std=c++11 -stdlib=libc++ -fvisibility=hidden -fvisibility-inlines-hidden -fembed-bitcode"
-std=c++11 -stdlib=libc++ -fvisibility=hidden -fvisibility-inlines-hidden"
EXTRA_IOS_CPPFLAGS="$EXTRA_CPPFLAGS -mios-version-min=$MIN_IOS_VERSION"
EXTRA_OSX_CPPFLAGS="$EXTRA_CPPFLAGS"
@ -259,20 +259,17 @@ buildBoost()
echo Building Boost for iPhone
# Install this one so we can copy the headers for the frameworks...
./b2 -j16 --build-dir=iphone-build --stagedir=iphone-build/stage \
cxxflags="-fembed-bitcode" \
--prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone \
macosx-version=iphone-${IOS_SDK_VERSION} define=_LITTLE_ENDIAN \
link=static stage
./b2 -j16 --build-dir=iphone-build --stagedir=iphone-build/stage \
--prefix=$PREFIXDIR toolset=darwin architecture=arm \
cxxflags="-fembed-bitcode" \
target-os=iphone macosx-version=iphone-${IOS_SDK_VERSION} \
define=_LITTLE_ENDIAN link=static install
doneSection
echo Building Boost for iPhoneSimulator
./b2 -j16 --build-dir=iphonesim-build --stagedir=iphonesim-build/stage \
cxxflags="-fembed-bitcode" \
toolset=darwin-${IOS_SDK_VERSION}~iphonesim architecture=x86 \
target-os=iphone macosx-version=iphonesim-${IOS_SDK_VERSION} \
link=static stage

View File

@ -78,24 +78,24 @@ function set_ios_cpu_feature() {
armv7)
export CC="xcrun -sdk iphoneos clang -arch armv7"
export CXX="xcrun -sdk iphoneos clang++ -arch armv7"
export CFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export CFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch armv7 -target armv7-ios-darwin -march=armv7 -isysroot ${sysroot} -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch armv7 -target armv7-ios-darwin -march=armv7 -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstrict-aliasing -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
;;
arm64)
export CC="xcrun -sdk iphoneos clang -arch arm64"
export CXX="xcrun -sdk iphoneos clang++ -arch arm64"
export CFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export CFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -Wno-unused-function -fstrict-aliasing -Oz -Wno-ignored-optimization-argument -DIOS -isysroot ${sysroot} -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch arm64 -target aarch64-ios-darwin -march=armv8 -isysroot ${sysroot} -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch arm64 -target aarch64-ios-darwin -march=armv8 -mcpu=generic -fstrict-aliasing -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
;;
arm64e)
# -march=armv8.3 ???
export CC="xcrun -sdk iphoneos clang -arch arm64e"
export CXX="xcrun -sdk iphoneos clang++ -arch arm64e"
export CFLAGS="-arch arm64e -target aarch64-ios-darwin -Wno-unused-function -fstrict-aliasing -DIOS -isysroot ${sysroot} -fembed-bitcode -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch arm64e -target aarch64-ios-darwin -isysroot ${sysroot} -fembed-bitcode -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch arm64e -target aarch64-ios-darwin -fstrict-aliasing -fembed-bitcode -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export CFLAGS="-arch arm64e -target aarch64-ios-darwin -Wno-unused-function -fstrict-aliasing -DIOS -isysroot ${sysroot} -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
export LDFLAGS="-arch arm64e -target aarch64-ios-darwin -isysroot ${sysroot} -L${sysroot}/usr/lib "
export CXXFLAGS="-std=c++11 -arch arm64e -target aarch64-ios-darwin -fstrict-aliasing -DIOS -miphoneos-version-min=${ios_min_target} -I${sysroot}/usr/include"
;;
i386)
export CC="xcrun -sdk iphonesimulator clang -arch i386"

View File

@ -18,14 +18,14 @@ namespace NSCSS
{
typedef std::map<std::wstring, std::wstring>::const_iterator styles_iterator;
CCompiledStyle::CCompiledStyle() : m_nDpi(96), m_UnitMeasure(Point)
CCompiledStyle::CCompiledStyle() : m_nDpi(96), m_UnitMeasure(Point), m_dCoreFontSize(DEFAULT_FONT_SIZE)
{}
CCompiledStyle::CCompiledStyle(const CCompiledStyle& oStyle) :
m_arParentsStyles(oStyle.m_arParentsStyles), m_sId(oStyle.m_sId),
m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure),
m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure), m_dCoreFontSize(oStyle.m_dCoreFontSize),
m_oFont(oStyle.m_oFont), m_oMargin(oStyle.m_oMargin), m_oPadding(oStyle.m_oPadding), m_oBackground(oStyle.m_oBackground),
m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay){}
m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay), m_oTransform(oStyle.m_oTransform){}
CCompiledStyle::~CCompiledStyle()
{
@ -34,6 +34,9 @@ namespace NSCSS
CCompiledStyle& CCompiledStyle::operator+= (const CCompiledStyle &oElement)
{
if (oElement.Empty())
return *this;
m_oBackground += oElement.m_oBackground;
m_oBorder += oElement.m_oBorder;
m_oFont += oElement.m_oFont;
@ -41,6 +44,10 @@ namespace NSCSS
m_oPadding += oElement.m_oPadding;
m_oText += oElement.m_oText;
m_oDisplay += oElement.m_oDisplay;
m_oTransform += oElement.m_oTransform;
if (!oElement.m_sId.empty())
m_sId += L'+' + oElement.m_sId;
return *this;
}
@ -60,6 +67,7 @@ namespace NSCSS
m_oPadding = oElement.m_oPadding;
m_oText = oElement.m_oText;
m_oDisplay = oElement.m_oDisplay;
m_oTransform = oElement.m_oTransform;
return *this;
}
@ -72,7 +80,8 @@ namespace NSCSS
m_oMargin == oStyle.m_oMargin &&
m_oPadding == oStyle.m_oPadding &&
m_oText == oStyle.m_oText &&
m_oDisplay == oStyle.m_oDisplay;
m_oDisplay == oStyle.m_oDisplay &&
m_oTransform == oStyle.m_oTransform;
}
void CCompiledStyle::StyleEquation(CCompiledStyle &oFirstStyle, CCompiledStyle &oSecondStyle)
@ -84,6 +93,7 @@ namespace NSCSS
NSProperties::CText ::Equation(oFirstStyle.m_oText, oSecondStyle.m_oText);
NSProperties::CBorder ::Equation(oFirstStyle.m_oBorder, oSecondStyle.m_oBorder);
NSProperties::CDisplay ::Equation(oFirstStyle.m_oDisplay, oSecondStyle.m_oDisplay);
NSProperties::CTransform ::Equation(oFirstStyle.m_oTransform, oSecondStyle.m_oTransform);
}
void CCompiledStyle::SetDpi(const unsigned short &uiDpi)
@ -110,7 +120,10 @@ namespace NSCSS
void CCompiledStyle::AddStyle(const std::map<std::wstring, std::wstring>& mStyle, const unsigned int unLevel, const bool& bHardMode)
{
const bool bIsThereBorder = (m_oBorder.Empty()) ? false : true;
const double dFontSize = (!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Point) : DEFAULT_FONT_SIZE;
const double dParentFontSize = (!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Point) : DEFAULT_FONT_SIZE;
if (0 == unLevel)
m_dCoreFontSize = dParentFontSize;
for (std::pair<std::wstring, std::wstring> pPropertie : mStyle)
{
@ -122,15 +135,15 @@ namespace NSCSS
CASE(L"font"):
{
m_oFont.SetValue(pPropertie.second, unLevel, bHardMode);
m_oFont.UpdateSize(dFontSize);
m_oFont.UpdateLineHeight(dFontSize);
m_oFont.UpdateSize(dParentFontSize, m_dCoreFontSize);
m_oFont.UpdateLineHeight(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"font-size"):
CASE(L"font-size-adjust"):
{
m_oFont.SetSize(pPropertie.second, unLevel, bHardMode);
m_oFont.UpdateSize(dFontSize);
m_oFont.UpdateSize(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"font-stretch"):
@ -170,7 +183,7 @@ namespace NSCSS
break;
m_oMargin.SetValues(pPropertie.second, unLevel, bHardMode);
m_oMargin.UpdateAll(dFontSize);
m_oMargin.UpdateAll(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"margin-top"):
@ -190,7 +203,7 @@ namespace NSCSS
break;
m_oMargin.SetRight(pPropertie.second, unLevel, bHardMode);
m_oMargin.UpdateRight(dFontSize);
m_oMargin.UpdateRight(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"margin-bottom"):
@ -200,7 +213,7 @@ namespace NSCSS
break;
m_oMargin.SetBottom(pPropertie.second, unLevel, bHardMode);
m_oMargin.UpdateBottom(dFontSize);
m_oMargin.UpdateBottom(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"margin-left"):
@ -211,7 +224,7 @@ namespace NSCSS
break;
m_oMargin.SetLeft(pPropertie.second, unLevel, bHardMode);
m_oMargin.UpdateLeft(dFontSize);
m_oMargin.UpdateLeft(dParentFontSize, m_dCoreFontSize);
break;
}
//PADDING
@ -219,35 +232,35 @@ namespace NSCSS
CASE(L"mso-padding-alt"):
{
m_oPadding.SetValues(pPropertie.second, unLevel, bHardMode);
m_oPadding.UpdateAll(dFontSize);
m_oPadding.UpdateAll(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"padding-top"):
CASE(L"mso-padding-top-alt"):
{
m_oPadding.SetTop(pPropertie.second, unLevel, bHardMode);
m_oPadding.UpdateTop(dFontSize);
m_oPadding.UpdateTop(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"padding-right"):
CASE(L"mso-padding-right-alt"):
{
m_oPadding.SetRight(pPropertie.second, unLevel, bHardMode);
m_oPadding.UpdateRight(dFontSize);
m_oPadding.UpdateRight(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"padding-bottom"):
CASE(L"mso-padding-bottom-alt"):
{
m_oPadding.SetBottom(pPropertie.second, unLevel, bHardMode);
m_oPadding.UpdateBottom(dFontSize);
m_oPadding.UpdateBottom(dParentFontSize, m_dCoreFontSize);
break;
}
CASE(L"padding-left"):
CASE(L"mso-padding-left-alt"):
{
m_oPadding.SetLeft(pPropertie.second, unLevel, bHardMode);
m_oPadding.UpdateLeft(dFontSize);
m_oPadding.UpdateLeft(dParentFontSize, m_dCoreFontSize);
break;
}
// TEXT
@ -422,6 +435,12 @@ namespace NSCSS
m_oDisplay.SetVAlign(pPropertie.second, unLevel, bHardMode);
break;
}
//TRANSFORM
CASE(L"transform"):
{
m_oTransform.SetMatrix(pPropertie.second, unLevel, bHardMode);
break;
}
default: AddOtherStyle(pPropertie, unLevel, bHardMode);
}
}

View File

@ -22,6 +22,7 @@ namespace NSCSS
unsigned short int m_nDpi;
UnitMeasure m_UnitMeasure;
double m_dCoreFontSize;
public:
NSProperties::CFont m_oFont;
NSProperties::CIndent m_oMargin;
@ -30,11 +31,12 @@ namespace NSCSS
NSProperties::CText m_oText;
NSProperties::CBorder m_oBorder;
NSProperties::CDisplay m_oDisplay;
NSProperties::CTransform m_oTransform;
CCompiledStyle();
CCompiledStyle(const CCompiledStyle& oStyle);
~CCompiledStyle();
virtual ~CCompiledStyle();
void SetDpi(const unsigned short& uiDpi);
void SetUnitMeasure(const UnitMeasure& enUnitMeasure);

View File

@ -13,14 +13,19 @@ namespace NSCSS
delete m_pInternal;
}
CCompiledStyle CCssCalculator::GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings, const UnitMeasure& unitMeasure) const
CCompiledStyle CCssCalculator::GetCompiledStyle(const std::vector<CNode> &arSelectors) const
{
return m_pInternal->GetCompiledStyle(arSelectors, bIsSettings, unitMeasure);
return m_pInternal->GetCompiledStyle(arSelectors);
}
bool CCssCalculator::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors, const bool &bIsSettings, const UnitMeasure &unitMeasure) const
bool CCssCalculator::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors) const
{
return m_pInternal->GetCompiledStyle(oStyle, arSelectors, bIsSettings, unitMeasure);
return m_pInternal->GetCompiledStyle(oStyle, arSelectors);
}
std::wstring CCssCalculator::CalculateStyleId(const CNode& oNode)
{
return m_pInternal->CalculateStyleId(oNode);
}
bool CCssCalculator::CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors)
@ -43,26 +48,11 @@ namespace NSCSS
m_pInternal->AddStylesFromFile(wsFileName);
}
void CCssCalculator::SetUnitMeasure(const UnitMeasure& nType)
{
m_pInternal->SetUnitMeasure(nType);
}
void CCssCalculator::SetDpi(const unsigned short int& nValue)
{
m_pInternal->SetDpi(nValue);
}
void CCssCalculator::SetBodyTree(const CTree &oTree)
{
m_pInternal->SetBodyTree(oTree);
}
UnitMeasure CCssCalculator::GetUnitMeasure() const
{
return m_pInternal->GetUnitMeasure();
}
std::wstring CCssCalculator::GetEncoding() const
{
return m_pInternal->GetEncoding();
@ -73,6 +63,26 @@ namespace NSCSS
return m_pInternal->GetDpi();
}
void CCssCalculator::ClearPageData()
{
m_pInternal->ClearPageData();
}
void CCssCalculator::ClearEmbeddedStyles()
{
m_pInternal->ClearEmbeddedStyles();
}
void CCssCalculator::ClearAllowedStyleFiles()
{
m_pInternal->ClearAllowedStyleFiles();
}
void CCssCalculator::ClearStylesFromFile(const std::wstring& wsFilePath)
{
m_pInternal->ClearStylesFromFile(wsFilePath);
}
void CCssCalculator::Clear()
{
m_pInternal->Clear();

View File

@ -19,9 +19,10 @@ namespace NSCSS
CCssCalculator();
~CCssCalculator();
CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point) const;
bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point) const;
CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors) const;
bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors) const;
std::wstring CalculateStyleId(const CNode& oNode);
bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
// void AddStyle(const std::vector<std::string>& sSelectors, const std::string& sStyle);
@ -29,14 +30,15 @@ namespace NSCSS
void AddStyles (const std::wstring& wsStyle);
void AddStylesFromFile(const std::wstring& wsFileName);
void SetUnitMeasure(const UnitMeasure& nType);
void SetDpi(const unsigned short int& nValue);
void SetBodyTree(const CTree &oTree);
UnitMeasure GetUnitMeasure() const;
std::wstring GetEncoding() const;
unsigned short int GetDpi() const;
void ClearPageData();
void ClearEmbeddedStyles();
void ClearAllowedStyleFiles();
void ClearStylesFromFile(const std::wstring& wsFilePath);
void Clear();
};
}

View File

@ -5,12 +5,9 @@
#include <fstream>
#include <cmath>
#include <algorithm>
#include <iostream>
#include <numeric>
#include "../../katana-parser/src/selector.h"
#include "../../../../../UnicodeConverter/UnicodeConverter.h"
#include "ConstValues.h"
#include "../../../../../DesktopEditor/common/File.h"
#include "StaticFunctions.h"
@ -41,61 +38,120 @@ bool operator<(const std::vector<NSCSS::CNode> &arLeftSelectors, const std::vect
namespace NSCSS
{
CCssCalculator_Private::CCssCalculator_Private() : m_nDpi(96), m_nCountNodes(0), m_UnitMeasure(Point), m_mStatictics(NULL), m_sEncoding(L"UTF-8"){}
CStyleStorage::CStyleStorage()
{}
CCssCalculator_Private::~CCssCalculator_Private()
CStyleStorage::~CStyleStorage()
{
m_arFiles.clear();
for (std::map<std::wstring, CElement*>::iterator oIter = m_mData.begin(); oIter != m_mData.end(); ++oIter)
if (oIter->second != NULL)
delete oIter->second;
m_mData.clear();
if (NULL != m_mStatictics)
delete m_mStatictics;
Clear();
}
inline void CCssCalculator_Private::GetOutputData(KatanaOutput *oOutput)
void CStyleStorage::Clear()
{
if ( NULL == oOutput )
return;
for (TStyleFileData* pStyleFileData : m_arStyleFiles)
{
if (nullptr == pStyleFileData)
continue;
switch (oOutput->mode) {
case KatanaParserModeStylesheet:
GetStylesheet(oOutput->stylesheet);
break;
case KatanaParserModeRule:
GetRule(oOutput->rule);
break;
case KatanaParserModeKeyframeRule:
case KatanaParserModeKeyframeKeyList:
case KatanaParserModeMediaList:
case KatanaParserModeValue:
case KatanaParserModeSelector:
case KatanaParserModeDeclarationList:
break;
for (std::map<std::wstring, CElement*>::iterator oIter = pStyleFileData->m_mStyleData.begin(); oIter != pStyleFileData->m_mStyleData.end(); ++oIter)
if (oIter->second != nullptr)
delete oIter->second;
delete pStyleFileData;
}
m_arStyleFiles.clear();
m_arEmptyStyleFiles.clear();
ClearEmbeddedStyles();
ClearAllowedStyleFiles();
#ifdef CSS_CALCULATOR_WITH_XHTML
ClearPageData();
#endif
}
void CStyleStorage::AddStyles(const std::string& sStyle)
{
if (sStyle.empty())
return;
KatanaOutput *output = katana_parse(sStyle.c_str(), sStyle.length(), KatanaParserModeStylesheet);
this->GetOutputData(output, m_mEmbeddedStyleData);
katana_destroy_output(output);
}
void CStyleStorage::AddStyles(const std::wstring& wsStyle)
{
if (wsStyle.empty())
return;
#ifdef CSS_CALCULATOR_WITH_XHTML
std::wregex oRegex(L"@page\\s*([^{]*)(\\{[^}]*\\})");
std::wsmatch oMatch;
std::wstring::const_iterator oSearchStart(wsStyle.cbegin());
while (std::regex_search(oSearchStart, wsStyle.cend(), oMatch, oRegex))
{
AddPageData(oMatch[1].str(), oMatch[2].str());
oSearchStart = oMatch.suffix().first;
}
#endif
AddStyles(U_TO_UTF8(wsStyle));
}
void CStyleStorage::AddStylesFromFile(const std::wstring& wsFileName)
{
std::set<std::wstring>::const_iterator itEmptyFileFound = m_arEmptyStyleFiles.find(wsFileName);
if (m_arEmptyStyleFiles.cend() != itEmptyFileFound)
return;
std::vector<TStyleFileData*>::const_iterator itFound = std::find_if(m_arStyleFiles.cbegin(), m_arStyleFiles.cend(),
[wsFileName](const TStyleFileData* pStyleFileData)
{ return wsFileName == pStyleFileData->m_wsStyleFilepath; });
m_arAllowedStyleFiles.insert(wsFileName);
if (m_arStyleFiles.cend() != itFound)
return;
TStyleFileData *pStyleFileData = new TStyleFileData();
pStyleFileData->m_wsStyleFilepath = wsFileName;
AddStyles(NS_STATIC_FUNCTIONS::GetContentAsUTF8(wsFileName), pStyleFileData->m_mStyleData);
if (!pStyleFileData->m_mStyleData.empty())
m_arStyleFiles.push_back(pStyleFileData);
else
{
m_arEmptyStyleFiles.insert(wsFileName);
delete pStyleFileData;
}
}
void CStyleStorage::ClearStylesFromFile(const std::wstring& wsFileName)
{
std::vector<TStyleFileData*>::const_iterator itFound = std::find_if(m_arStyleFiles.cbegin(), m_arStyleFiles.cend(),
[wsFileName](const TStyleFileData* pStyleFileData)
{ return wsFileName == pStyleFileData->m_wsStyleFilepath; });
if (m_arStyleFiles.cend() != itFound)
{
m_arStyleFiles.erase(itFound);
delete *itFound;
}
}
#ifdef CSS_CALCULATOR_WITH_XHTML
std::map<std::wstring, std::wstring> CCssCalculator_Private::GetPageData(const std::wstring &wsPageName)
void CStyleStorage::AddPageData(const std::wstring& wsPageName, const std::wstring& wsStyles)
{
if (m_arPageDatas.empty())
return {};
for (const TPageData& oPageData : m_arPageDatas)
{
if (std::find(oPageData.m_wsNames.begin(), oPageData.m_wsNames.end(), wsPageName) != oPageData.m_wsNames.end())
return oPageData.m_mData;
}
return {};
m_arPageDatas.push_back({NS_STATIC_FUNCTIONS::GetWordsW(wsPageName), NS_STATIC_FUNCTIONS::GetRules(wsStyles)});
}
void CCssCalculator_Private::SetPageData(NSProperties::CPage &oPage, const std::map<std::wstring, std::wstring> &mData, unsigned int unLevel, bool bHardMode)
void CStyleStorage::SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode)
{
for (const std::pair<std::wstring, std::wstring> &oData : mData)
{
@ -110,156 +166,84 @@ namespace NSCSS
}
}
std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors)
std::map<std::wstring, std::wstring> CStyleStorage::GetPageData(const std::wstring& wsPageName)
{
std::vector<std::wstring> arNodes;
for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin(); oNode != arSelectors.rend(); ++oNode)
if (m_arPageDatas.empty())
return {};
for (const TPageData& oPageData : m_arPageDatas)
{
if (!oNode->m_wsName.empty())
arNodes.push_back(oNode->m_wsName);
if (!oNode->m_wsClass.empty())
{
if (oNode->m_wsClass.find(L' ') != std::wstring::npos)
{
std::vector<std::wstring> arClasses = NS_STATIC_FUNCTIONS::GetWordsW(oNode->m_wsClass, false, L" ");
arNodes.push_back(std::accumulate(arClasses.begin(), arClasses.end(), std::wstring(),
[](std::wstring sRes, const std::wstring& sClass)
{return sRes += L'.' + sClass + L' ';}));
}
else
arNodes.push_back(L'.' + oNode->m_wsClass);
}
if (!oNode->m_wsId.empty())
arNodes.push_back(L'#' + oNode->m_wsId);
if (std::find(oPageData.m_wsNames.begin(), oPageData.m_wsNames.end(), wsPageName) != oPageData.m_wsNames.end())
return oPageData.m_mData;
}
return arNodes;
return {};
}
void CCssCalculator_Private::FindPrevAndKindElements(const CElement *pElement, const std::vector<std::wstring> &arNextNodes, std::vector<CElement*>& arFindedElements, const std::wstring &wsName, const std::vector<std::wstring> &arClasses)
void CStyleStorage::ClearPageData()
{
if (arNextNodes.empty())
return;
const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.crbegin() + 1, arNextNodes.crend());
const std::vector<CElement*> arTempKins = pElement->GetNextOfKin(wsName, arClasses);
if (!arTempPrev.empty())
arFindedElements.insert(arFindedElements.end(), arTempPrev.begin(), arTempPrev.end());
if (!arTempKins.empty())
arFindedElements.insert(arFindedElements.end(), arTempKins.begin(), arTempKins.end());
}
std::vector<CElement*> CCssCalculator_Private::FindElements(std::vector<std::wstring> &arNodes, std::vector<std::wstring> &arNextNodes, bool bIsSettings)
{
std::vector<CElement*> arFindedElements;
std::wstring wsName, wsId;
std::vector<std::wstring> arClasses;
if (arNodes.back()[0] == L'#')
{
wsId = arNodes.back();
arNodes.pop_back();
arNextNodes.push_back(wsId);
}
if (arNodes.back()[0] == L'.')
{
arClasses = NS_STATIC_FUNCTIONS::GetWordsW(arNodes.back(), false, L" ");
arNextNodes.push_back(arNodes.back());
arNodes.pop_back();
}
wsName = arNodes.back();
arNodes.pop_back();
arNextNodes.push_back(wsName);
const std::map<std::wstring, CElement*>::const_iterator oFindName = m_mData.find(wsName);
std::map<std::wstring, CElement*>::const_iterator oFindId;
if (!wsId.empty())
{
oFindId = m_mData.find(wsId);
if (oFindId != m_mData.end() && NULL != m_mStatictics)
{
std::map<StatistickElement, unsigned int>::const_iterator oFindCountId = m_mStatictics->find(StatistickElement{StatistickElement::IsId, wsId});
if ((m_mStatictics->end() != oFindCountId) &&
(((bIsSettings && oFindCountId->second < MaxNumberRepetitions) ||
(!bIsSettings && oFindCountId->second >= MaxNumberRepetitions))))
{
if (!oFindId->second->Empty())
arFindedElements.push_back(oFindId->second);
}
FindPrevAndKindElements(oFindId->second, arNextNodes, arFindedElements, wsName);
}
}
if (!arClasses.empty())
{
if (!bIsSettings)
{
for (std::vector<std::wstring>::const_reverse_iterator iClass = arClasses.rbegin(); iClass != arClasses.rend(); ++iClass)
{
const std::map<std::wstring, CElement*>::const_iterator oFindClass = m_mData.find(*iClass);
if (oFindClass != m_mData.end())
{
if (!oFindClass->second->Empty())
arFindedElements.push_back(oFindClass->second);
FindPrevAndKindElements(oFindClass->second, arNextNodes, arFindedElements, wsName);
}
}
}
}
if (oFindName != m_mData.end())
{
if (!bIsSettings)
{
if (!oFindName->second->Empty())
arFindedElements.push_back(oFindName->second);
FindPrevAndKindElements(oFindName->second, arNextNodes, arFindedElements, wsName, arClasses);
}
}
if (arFindedElements.size() > 1)
{
std::sort(arFindedElements.rbegin(), arFindedElements.rend(),
[](CElement* oFirstElement, CElement* oSecondElement)
{
return oFirstElement->GetWeight() > oSecondElement->GetWeight();
});
}
return arFindedElements;
m_arPageDatas.clear();
}
#endif
void CCssCalculator_Private::AddPageData(const std::wstring &wsPageNames, const std::wstring &wsStyles)
const CElement* CStyleStorage::FindElement(const std::wstring& wsSelector)
{
m_arPageDatas.push_back({NS_STATIC_FUNCTIONS::GetWordsW(wsPageNames), NS_STATIC_FUNCTIONS::GetRules(wsStyles)});
if (wsSelector.empty())
return nullptr;
const CElement* pFoundElement = FindSelectorFromStyleData(wsSelector, m_mEmbeddedStyleData);
if (nullptr != pFoundElement)
return pFoundElement;
for (std::vector<TStyleFileData*>::const_reverse_iterator itIter = m_arStyleFiles.crbegin(); itIter < m_arStyleFiles.crend(); ++itIter)
{
if (m_arAllowedStyleFiles.cend() == std::find(m_arAllowedStyleFiles.cbegin(), m_arAllowedStyleFiles.cend(), (*itIter)->m_wsStyleFilepath))
continue;
pFoundElement = FindSelectorFromStyleData(wsSelector, (*itIter)->m_mStyleData);
if (nullptr != pFoundElement)
return pFoundElement;
}
return nullptr;
}
inline void CCssCalculator_Private::GetStylesheet(const KatanaStylesheet *oStylesheet)
void CStyleStorage::AddStyles(const std::string& sStyle, std::map<std::wstring, CElement*>& mStyleData)
{
if (sStyle.empty())
return;
KatanaOutput *output = katana_parse(sStyle.c_str(), sStyle.length(), KatanaParserModeStylesheet);
this->GetOutputData(output, mStyleData);
katana_destroy_output(output);
}
void CStyleStorage::ClearEmbeddedStyles()
{
for (std::map<std::wstring, CElement*>::iterator oIter = m_mEmbeddedStyleData.begin(); oIter != m_mEmbeddedStyleData.end(); ++oIter)
if (oIter->second != nullptr)
delete oIter->second;
m_mEmbeddedStyleData.clear();
}
void CStyleStorage::ClearAllowedStyleFiles()
{
m_arAllowedStyleFiles.clear();
}
void CStyleStorage::GetStylesheet(const KatanaStylesheet* oStylesheet, std::map<std::wstring, CElement*>& mStyleData)
{
for (size_t i = 0; i < oStylesheet->imports.length; ++i)
GetRule((KatanaRule*)oStylesheet->imports.data[i]);
GetRule((KatanaRule*)oStylesheet->imports.data[i], mStyleData);
for (size_t i = 0; i < oStylesheet->rules.length; ++i)
GetRule((KatanaRule*)oStylesheet->rules.data[i]);
GetRule((KatanaRule*)oStylesheet->rules.data[i], mStyleData);
}
inline void CCssCalculator_Private::GetRule(const KatanaRule *oRule)
void CStyleStorage::GetRule(const KatanaRule* oRule, std::map<std::wstring, CElement*>& mStyleData)
{
if ( NULL == oRule )
return;
@ -267,7 +251,7 @@ namespace NSCSS
switch (oRule->type) {
case KatanaRuleStyle:
{
GetStyleRule((KatanaStyleRule*)oRule);
GetStyleRule((KatanaStyleRule*)oRule, mStyleData);
break;
}
default:
@ -275,7 +259,7 @@ namespace NSCSS
}
}
inline void CCssCalculator_Private::GetStyleRule(const KatanaStyleRule *oRule)
void CStyleStorage::GetStyleRule(const KatanaStyleRule* oRule, std::map<std::wstring, CElement*>& mStyleData)
{
if (oRule->declarations->length == 0)
return;
@ -291,7 +275,7 @@ namespace NSCSS
for (std::vector<std::wstring>::reverse_iterator oWord = arWords.rbegin(); oWord != arWords.rend(); ++oWord)
{
const size_t posPoint = oWord->find(L'.');
const size_t posPoint = oWord->find(L'.');
const size_t posLattice = oWord->find(L'#');
const std::wstring sName = (posPoint != std::wstring::npos) ? oWord->substr(0, posPoint) : (posLattice != std::wstring::npos) ? oWord->substr(0, posLattice) : *oWord;
@ -307,8 +291,8 @@ namespace NSCSS
{
if (NULL == oFirstElement && bCreateFirst)
{
const std::map<std::wstring, CElement*>::const_iterator& oFindId = m_mData.find(sId);
if (oFindId != m_mData.end())
const std::map<std::wstring, CElement*>::const_iterator& oFindId = mStyleData.find(sId);
if (oFindId != mStyleData.end())
{
oIdElement = oFindId->second;
bCreateFirst = false;
@ -336,8 +320,8 @@ namespace NSCSS
{
if (NULL == oFirstElement && bCreateFirst)
{
const std::map<std::wstring, CElement*>::const_iterator& oFindClass = m_mData.find(sClass);
if (oFindClass != m_mData.end())
const std::map<std::wstring, CElement*>::const_iterator& oFindClass = mStyleData.find(sClass);
if (oFindClass != mStyleData.end())
{
oClassElement = oFindClass->second;
bCreateFirst = false;
@ -369,8 +353,8 @@ namespace NSCSS
{
if (NULL == oFirstElement && bCreateFirst)
{
const std::map<std::wstring, CElement*>::const_iterator& oFindName = m_mData.find(sName);
if (oFindName != m_mData.end())
const std::map<std::wstring, CElement*>::const_iterator& oFindName = mStyleData.find(sName);
if (oFindName != mStyleData.end())
{
oNameElement = oFindName->second;
bCreateFirst = false;
@ -402,11 +386,16 @@ namespace NSCSS
oLastElement->AddProperties(mStyle);
if (NULL != oFirstElement)
m_mData[oFirstElement->GetSelector()] = oFirstElement;
mStyleData[oFirstElement->GetSelector()] = oFirstElement;
}
}
inline std::vector<std::wstring> CCssCalculator_Private::GetSelectorList(const KatanaArray* oSelectors) const
std::wstring CStyleStorage::GetValueList(const KatanaArray* oValues)
{
return StringifyValueList(oValues);
}
std::vector<std::wstring> CStyleStorage::GetSelectorList(const KatanaArray* oSelectors) const
{
if (oSelectors->length == 0)
return std::vector<std::wstring>();
@ -419,7 +408,7 @@ namespace NSCSS
return arSelectors;
}
inline std::wstring CCssCalculator_Private::GetSelector(const KatanaSelector *oSelector) const
std::wstring CStyleStorage::GetSelector(const KatanaSelector* oSelector) const
{
KatanaParser oParser;
oParser.options = &kKatanaDefaultOptions;
@ -438,7 +427,7 @@ namespace NSCSS
return wsText;
}
inline std::map<std::wstring, std::wstring> CCssCalculator_Private::GetDeclarationList(const KatanaArray* oDeclarations) const
std::map<std::wstring, std::wstring> CStyleStorage::GetDeclarationList(const KatanaArray* oDeclarations) const
{
if(oDeclarations->length == 0)
return std::map<std::wstring, std::wstring>();
@ -451,7 +440,7 @@ namespace NSCSS
return arDeclarations;
}
inline std::pair<std::wstring, std::wstring> CCssCalculator_Private::GetDeclaration(const KatanaDeclaration* oDecl) const
std::pair<std::wstring, std::wstring> CStyleStorage::GetDeclaration(const KatanaDeclaration* oDecl) const
{
std::wstring sValueList = StringifyValueList(oDecl->values);
@ -461,52 +450,213 @@ namespace NSCSS
return std::make_pair(UTF8_TO_U(std::string(oDecl->property)), sValueList);
}
inline std::wstring CCssCalculator_Private::GetValueList(const KatanaArray *oValues)
void CStyleStorage::GetOutputData(KatanaOutput* oOutput, std::map<std::wstring, CElement*>& mStyleData)
{
return StringifyValueList(oValues);
if ( NULL == oOutput )
return;
switch (oOutput->mode) {
case KatanaParserModeStylesheet:
GetStylesheet(oOutput->stylesheet, mStyleData);
break;
case KatanaParserModeRule:
GetRule(oOutput->rule, mStyleData);
break;
case KatanaParserModeKeyframeRule:
case KatanaParserModeKeyframeKeyList:
case KatanaParserModeMediaList:
case KatanaParserModeValue:
case KatanaParserModeSelector:
case KatanaParserModeDeclarationList:
break;
}
}
const CElement* CStyleStorage::FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData)
{
std::map<std::wstring, CElement*>::const_iterator itFound = mStyleData.find(wsSelector);
if (mStyleData.cend() != itFound)
return itFound->second;
return nullptr;
}
CCssCalculator_Private::CCssCalculator_Private() : m_nDpi(96), m_nCountNodes(0), m_sEncoding(L"UTF-8"){}
CCssCalculator_Private::~CCssCalculator_Private()
{}
#ifdef CSS_CALCULATOR_WITH_XHTML
void CCssCalculator_Private::SetPageData(NSProperties::CPage &oPage, const std::map<std::wstring, std::wstring> &mData, unsigned int unLevel, bool bHardMode)
{
//TODO:: пересмотреть данный метод
m_oStyleStorage.SetPageData(oPage, mData, unLevel, bHardMode);
}
std::map<std::wstring, std::wstring> CCssCalculator_Private::GetPageData(const std::wstring &wsPageName)
{
return m_oStyleStorage.GetPageData(wsPageName);
}
void CCssCalculator_Private::ClearPageData()
{
m_oStyleStorage.ClearPageData();
}
#endif
std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors)
{
std::vector<std::wstring> arNodes;
for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin(); oNode != arSelectors.rend(); ++oNode)
{
if (!oNode->m_wsName.empty())
arNodes.push_back(oNode->m_wsName);
if (!oNode->m_wsClass.empty())
{
if (oNode->m_wsClass.find(L' ') != std::wstring::npos)
{
std::vector<std::wstring> arClasses = NS_STATIC_FUNCTIONS::GetWordsW(oNode->m_wsClass, false, L" ");
arNodes.push_back(std::accumulate(arClasses.begin(), arClasses.end(), std::wstring(),
[](std::wstring sRes, const std::wstring& sClass)
{return sRes += L'.' + sClass + L' ';}));
}
else
arNodes.push_back(L'.' + oNode->m_wsClass);
}
if (!oNode->m_wsId.empty())
arNodes.push_back(L'#' + oNode->m_wsId);
}
return arNodes;
}
void CCssCalculator_Private::FindPrevAndKindElements(const CElement *pElement, const std::vector<std::wstring> &arNextNodes, std::vector<const CElement*>& arFindedElements, const std::wstring &wsName, const std::vector<std::wstring> &arClasses)
{
if (arNextNodes.empty())
return;
const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.crbegin() + 1, arNextNodes.crend());
const std::vector<CElement*> arTempKins = pElement->GetNextOfKin(wsName, arClasses);
if (!arTempPrev.empty())
arFindedElements.insert(arFindedElements.end(), arTempPrev.begin(), arTempPrev.end());
if (!arTempKins.empty())
arFindedElements.insert(arFindedElements.end(), arTempKins.begin(), arTempKins.end());
}
std::vector<const CElement*> CCssCalculator_Private::FindElements(std::vector<std::wstring> &arNodes, std::vector<std::wstring> &arNextNodes)
{
if (arNodes.empty())
return {};
std::vector<const CElement*> arFindedElements;
std::wstring wsName, wsId;
std::vector<std::wstring> arClasses;
if (!arNodes.empty() && arNodes.back()[0] == L'#')
{
wsId = arNodes.back();
arNodes.pop_back();
arNextNodes.push_back(wsId);
}
if (!arNodes.empty() && arNodes.back()[0] == L'.')
{
arClasses = NS_STATIC_FUNCTIONS::GetWordsW(arNodes.back(), false, L" ");
arNextNodes.push_back(arNodes.back());
arNodes.pop_back();
}
if (!arNodes.empty())
{
wsName = arNodes.back();
arNodes.pop_back();
arNextNodes.push_back(wsName);
}
if (!wsId.empty())
{
const CElement* pFoundId = m_oStyleStorage.FindElement(wsId);
if(nullptr != pFoundId)
{
if (!pFoundId->Empty())
arFindedElements.push_back(pFoundId);
FindPrevAndKindElements(pFoundId, arNextNodes, arFindedElements, wsName);
}
}
if (!arClasses.empty())
{
for (std::vector<std::wstring>::const_reverse_iterator iClass = arClasses.rbegin(); iClass != arClasses.rend(); ++iClass)
{
const CElement* pFoundClass = m_oStyleStorage.FindElement(*iClass);
if (nullptr != pFoundClass)
{
if (!pFoundClass->Empty())
arFindedElements.push_back(pFoundClass);
FindPrevAndKindElements(pFoundClass, arNextNodes, arFindedElements, wsName);
}
}
}
const CElement* pFoundName = m_oStyleStorage.FindElement(wsName);
if (nullptr != pFoundName)
{
if (!pFoundName->Empty())
arFindedElements.push_back(pFoundName);
FindPrevAndKindElements(pFoundName, arNextNodes, arFindedElements, wsName, arClasses);
}
if (arFindedElements.size() > 1)
{
std::sort(arFindedElements.rbegin(), arFindedElements.rend(),
[](const CElement* oFirstElement, const CElement* oSecondElement)
{ return oFirstElement->GetWeight() > oSecondElement->GetWeight(); });
}
return arFindedElements;
}
#ifdef CSS_CALCULATOR_WITH_XHTML
CCompiledStyle CCssCalculator_Private::GetCompiledStyle(const std::vector<CNode>& arSelectors, const bool& bIsSettings, const UnitMeasure& unitMeasure)
CCompiledStyle CCssCalculator_Private::GetCompiledStyle(const std::vector<CNode>& arSelectors)
{
if (arSelectors.empty())
return CCompiledStyle();
CCompiledStyle oStyle;
GetCompiledStyle(oStyle, arSelectors, bIsSettings, unitMeasure);
GetCompiledStyle(oStyle, arSelectors);
return oStyle;
}
bool CCssCalculator_Private::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors, const bool &bIsSettings, const UnitMeasure &unitMeasure)
bool CCssCalculator_Private::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors)
{
if (arSelectors.empty())
return false;
SetUnitMeasure(unitMeasure);
const std::map<std::vector<CNode>, CCompiledStyle>::iterator oItem = m_mUsedStyles.find(arSelectors);
if (!bIsSettings)
if (oItem != m_mUsedStyles.end())
{
const std::map<std::vector<CNode>, CCompiledStyle>::iterator oItem = m_mUsedStyles.find(arSelectors);
if (oItem != m_mUsedStyles.end())
{
oStyle = oItem->second;
return true;
}
}
else if (NULL == m_mStatictics || m_mStatictics->empty())
{
oStyle.SetDpi(m_nDpi);
oStyle.SetUnitMeasure(m_UnitMeasure);
oStyle.SetID(arSelectors.back().m_wsName + ((!arSelectors.back().m_wsClass.empty()) ? L'.' + arSelectors.back().m_wsClass : L"") + ((arSelectors.back().m_wsId.empty()) ? L"" : L'#' + arSelectors.back().m_wsId) + L'-' + std::to_wstring(++m_nCountNodes));
return false;
oStyle = oItem->second;
return true;
}
oStyle.SetDpi(m_nDpi);
oStyle.SetUnitMeasure(m_UnitMeasure);
std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors);
std::vector<std::wstring> arPrevNodes;
@ -529,25 +679,10 @@ namespace NSCSS
oTempStyle.AddStyle(arSelectors[i].m_mAttributes, i + 1);
for (const CElement* oElement : FindElements(arNodes, arPrevNodes, bIsSettings))
for (const CElement* oElement : FindElements(arNodes, arPrevNodes))
oTempStyle.AddStyle(oElement->GetStyle(), i + 1);
if (NULL != m_mStatictics)
{
std::map<StatistickElement, unsigned int>::const_iterator oFindCountStyle = m_mStatictics->find(StatistickElement{StatistickElement::IsStyle, arSelectors[i].m_wsStyle});
if (oFindCountStyle != m_mStatictics->end())
{
if ((bIsSettings && oFindCountStyle->second < MaxNumberRepetitions) ||
(!bIsSettings && oFindCountStyle->second >= MaxNumberRepetitions))
oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
else if (!bIsSettings)
oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
}
else /*if (bIsSettings)*/
oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
}
else
if (!arSelectors[i].m_wsStyle.empty())
oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
oStyle += oTempStyle;
@ -561,14 +696,19 @@ namespace NSCSS
}
}
oStyle.SetID(arSelectors.back().m_wsName + ((!arSelectors.back().m_wsClass.empty()) ? L'.' + arSelectors.back().m_wsClass : L"") + ((arSelectors.back().m_wsId.empty()) ? L"" : L'#' + arSelectors.back().m_wsId) + L'-' + std::to_wstring(++m_nCountNodes));
oStyle.SetID(CalculateStyleId(arSelectors.back()));
if (!bIsSettings && !oStyle.Empty())
if (!oStyle.Empty())
m_mUsedStyles[arSelectors] = oStyle;
return true;
}
std::wstring CCssCalculator_Private::CalculateStyleId(const CNode& oNode)
{
return oNode.m_wsName + ((!oNode.m_wsClass.empty()) ? L'.' + oNode.m_wsClass : L"") + ((oNode.m_wsId.empty()) ? L"" : L'#' + oNode.m_wsId) + L'-' + std::to_wstring(++m_nCountNodes);
}
bool CCssCalculator_Private::CalculatePageStyle(NSProperties::CPage &oPageData, const std::vector<CNode> &arSelectors)
{
if (arSelectors.empty())
@ -586,7 +726,7 @@ namespace NSCSS
SetPageData(oPageData, GetPageData(mRules[L"page"]), i + 1, true);
}
for (const CElement* oElement : FindElements(arNodes, arNextNodes, false))
for (const CElement* oElement : FindElements(arNodes, arNextNodes))
{
std::map<std::wstring, std::wstring> mRules = oElement->GetStyle();
if (mRules.end() != mRules.find(L"page"))
@ -600,42 +740,20 @@ namespace NSCSS
return true;
}
#endif
void CCssCalculator_Private::AddStyles(const std::string &sStyle)
{
if (sStyle.empty())
return;
KatanaOutput *output = katana_parse(sStyle.c_str(), sStyle.length(), KatanaParserModeStylesheet);
this->GetOutputData(output);
katana_destroy_output(output);
void CCssCalculator_Private::AddStyles(const std::string& sStyle)
{
m_oStyleStorage.AddStyles(sStyle);
}
void CCssCalculator_Private::AddStyles(const std::wstring &wsStyle)
void CCssCalculator_Private::AddStyles(const std::wstring& wsStyle)
{
if (wsStyle.empty())
return;
std::wregex oRegex(L"@page\\s*([^{]*)(\\{[^}]*\\})");
std::wsmatch oMatch;
std::wstring::const_iterator oSearchStart(wsStyle.cbegin());
while (std::regex_search(oSearchStart, wsStyle.cend(), oMatch, oRegex))
{
AddPageData(oMatch[1].str(), oMatch[2].str());
oSearchStart = oMatch.suffix().first;
}
AddStyles(U_TO_UTF8(wsStyle));
m_oStyleStorage.AddStyles(wsStyle);
}
void CCssCalculator_Private::AddStylesFromFile(const std::wstring& wsFileName)
{
if (std::find(m_arFiles.begin(), m_arFiles.end(), wsFileName) != m_arFiles.end())
return;
m_arFiles.push_back(wsFileName);
AddStyles(NS_STATIC_FUNCTIONS::GetContentAsUTF8(wsFileName));
m_oStyleStorage.AddStylesFromFile(wsFileName);
}
void CCssCalculator_Private::SetDpi(unsigned short int nValue)
@ -643,32 +761,28 @@ namespace NSCSS
m_nDpi = nValue;
}
void CCssCalculator_Private::SetBodyTree(const CTree &oTree)
{
if (NULL == m_mStatictics)
m_mStatictics = new std::map<StatistickElement, unsigned int>();
CTree::CountingNumberRepetitions(oTree, *m_mStatictics);
}
void CCssCalculator_Private::SetUnitMeasure(const UnitMeasure& nType)
{
m_UnitMeasure = nType;
}
unsigned short int CCssCalculator_Private::GetDpi() const
{
return m_nDpi;
}
const std::map<std::wstring, CElement *> *CCssCalculator_Private::GetData() const
void CCssCalculator_Private::ClearEmbeddedStyles()
{
return &m_mData;
m_oStyleStorage.ClearEmbeddedStyles();
#ifdef CSS_CALCULATOR_WITH_XHTML
m_mUsedStyles.clear();
#endif
}
UnitMeasure CCssCalculator_Private::GetUnitMeasure() const
void CCssCalculator_Private::ClearAllowedStyleFiles()
{
return m_UnitMeasure;
m_oStyleStorage.ClearAllowedStyleFiles();
}
void CCssCalculator_Private::ClearStylesFromFile(const std::wstring& wsFilePath)
{
m_oStyleStorage.ClearStylesFromFile(wsFilePath);
}
std::wstring CCssCalculator_Private::GetEncoding() const
@ -680,12 +794,22 @@ namespace NSCSS
{
m_sEncoding = L"UTF-8";
m_nDpi = 96;
m_UnitMeasure = Point;
m_mData.clear();
m_arFiles.clear();
m_oStyleStorage.Clear();
#ifdef CSS_CALCULATOR_WITH_XHTML
m_mUsedStyles.clear();
#endif
}
bool IsTableElement(const std::wstring& wsNameTag)
{
return L"td" == wsNameTag || L"tr" == wsNameTag || L"table" == wsNameTag ||
L"tbody" == wsNameTag || L"thead" == wsNameTag || L"tfoot" == wsNameTag ||
L"th" == wsNameTag;
}
}
inline static std::wstring StringifyValueList(const KatanaArray* oValues)
{
if (NULL == oValues)
@ -786,11 +910,4 @@ inline static std::wstring StringifyValue(const KatanaValue* oValue)
return str;
}
inline static bool IsTableElement(const std::wstring& wsNameTag)
{
return L"td" == wsNameTag || L"tr" == wsNameTag || L"table" == wsNameTag ||
L"tbody" == wsNameTag || L"thead" == wsNameTag || L"tfoot" == wsNameTag ||
L"th" == wsNameTag;
}

View File

@ -3,11 +3,9 @@
#include <vector>
#include <map>
#include <list>
#include <functional>
#include <set>
#include "CElement.h"
#include "ConstValues.h"
#include "CUnitMeasureConverter.h"
#include "StyleProperties.h"
#include "../../katana-parser/src/katana.h"
#ifdef CSS_CALCULATOR_WITH_XHTML
@ -16,16 +14,43 @@
namespace NSCSS
{
class CCssCalculator_Private
class CStyleStorage
{
unsigned short int m_nDpi;
unsigned short int m_nCountNodes;
UnitMeasure m_UnitMeasure;
public:
CStyleStorage();
~CStyleStorage();
std::list<std::wstring> m_arFiles;
void Clear();
std::map<std::wstring, CElement*> m_mData;
void AddStyles(const std::string& sStyle);
void AddStyles(const std::wstring& wsStyle);
void AddStylesFromFile(const std::wstring& wsFileName);
void ClearEmbeddedStyles();
void ClearAllowedStyleFiles();
void ClearStylesFromFile(const std::wstring& wsFileName);
#ifdef CSS_CALCULATOR_WITH_XHTML
void AddPageData(const std::wstring& wsPageName, const std::wstring& wsStyles);
void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
std::map<std::wstring, std::wstring> GetPageData(const std::wstring& wsPageName);
void ClearPageData();
#endif
const CElement* FindElement(const std::wstring& wsSelector);
private:
typedef struct
{
std::wstring m_wsStyleFilepath;
std::map<std::wstring, CElement*> m_mStyleData;
} TStyleFileData;
std::set<std::wstring> m_arEmptyStyleFiles;
std::set<std::wstring> m_arAllowedStyleFiles;
std::vector<TStyleFileData*> m_arStyleFiles;
std::map<std::wstring, CElement*> m_mEmbeddedStyleData;
#ifdef CSS_CALCULATOR_WITH_XHTML
typedef struct
{
std::vector<std::wstring> m_wsNames;
@ -33,29 +58,14 @@ namespace NSCSS
} TPageData;
std::vector<TPageData> m_arPageDatas;
std::map<StatistickElement, unsigned int> *m_mStatictics; // Количество повторений свойств id и style у селекторов
#ifdef CSS_CALCULATOR_WITH_XHTML
std::map<std::vector<CNode>, CCompiledStyle> m_mUsedStyles;
std::map<std::wstring, std::wstring> GetPageData(const std::wstring& wsPageName);
void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors);
void FindPrevAndKindElements(const CElement* pElement, const std::vector<std::wstring>& arNextNodes, std::vector<CElement*>& arFindedElements, const std::wstring& wsName, const std::vector<std::wstring>& arClasses = {});
std::vector<CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes, bool bIsSettings);
#endif
private:
void AddStyles(const std::string& sStyle, std::map<std::wstring, CElement*>& mStyleData);
std::wstring m_sEncoding;
void GetStylesheet(const KatanaStylesheet* oStylesheet, std::map<std::wstring, CElement*>& mStyleData);
void GetRule(const KatanaRule* oRule, std::map<std::wstring, CElement*>& mStyleData);
void AddPageData(const std::wstring& wsPageName, const std::wstring& wsStyles);
void GetStylesheet(const KatanaStylesheet* oStylesheet);
void GetRule(const KatanaRule* oRule);
void GetStyleRule(const KatanaStyleRule* oRule);
void GetStyleRule(const KatanaStyleRule* oRule, std::map<std::wstring, CElement*>& mStyleData);
std::wstring GetValueList(const KatanaArray* oValues);
@ -65,35 +75,60 @@ namespace NSCSS
std::map<std::wstring, std::wstring> GetDeclarationList(const KatanaArray* oDeclarations) const;
std::pair<std::wstring, std::wstring> GetDeclaration(const KatanaDeclaration* oDecl) const;
void GetOutputData(KatanaOutput* oOutput);
void GetOutputData(KatanaOutput* oOutput, std::map<std::wstring, CElement*>& mStyleData);
const CElement* FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData);
};
class CCssCalculator_Private
{
unsigned short int m_nDpi;
unsigned short int m_nCountNodes;
CStyleStorage m_oStyleStorage;
#ifdef CSS_CALCULATOR_WITH_XHTML
std::map<std::vector<CNode>, CCompiledStyle> m_mUsedStyles;
void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
std::map<std::wstring, std::wstring> GetPageData(const std::wstring &wsPageName);
#endif
void FindPrevAndKindElements(const CElement* pElement, const std::vector<std::wstring>& arNextNodes, std::vector<const CElement*>& arFindedElements, const std::wstring& wsName, const std::vector<std::wstring>& arClasses = {});
std::wstring m_sEncoding;
public:
CCssCalculator_Private();
~CCssCalculator_Private();
#ifdef CSS_CALCULATOR_WITH_XHTML
CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point);
bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point);
CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors);
bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors);
std::wstring CalculateStyleId(const CNode& oNode);
bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
void ClearPageData();
#endif
std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors);
std::vector<const CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes);
void AddStyles(const std::string& sStyle);
void AddStyles(const std::wstring& wsStyle);
void AddStylesFromFile(const std::wstring& wsFileName);
void SetUnitMeasure(const UnitMeasure& nType);
void SetDpi(unsigned short int nValue);
void SetBodyTree(const CTree &oTree);
UnitMeasure GetUnitMeasure() const;
std::wstring GetEncoding() const;
unsigned short int GetDpi() const;
const std::map<std::wstring, CElement*>* GetData() const;
void ClearEmbeddedStyles();
void ClearAllowedStyleFiles();
void ClearStylesFromFile(const std::wstring& wsFilePath);
void Clear();
};
inline bool IsTableElement(const std::wstring& wsNameTag);
}
#endif // CCSSCALCULATOR_PRIVATE_H

View File

@ -40,6 +40,7 @@ namespace NSCSS
{
m_sSelector = sSelector;
m_sFullSelector = m_sSelector;
UpdateWeight();
}
void NSCSS::CElement::AddPropertie(const std::wstring &sName, const std::wstring& sValue)
@ -67,6 +68,7 @@ namespace NSCSS
m_arPrevElements.push_back(oPrevElement);
oPrevElement->m_sFullSelector += L' ' + m_sFullSelector;
UpdateWeight();
}
void CElement::AddKinElement(CElement *oKinElement)
@ -76,6 +78,7 @@ namespace NSCSS
m_arKinElements.push_back(oKinElement);
oKinElement->m_sFullSelector += m_sFullSelector;
oKinElement->UpdateWeight();
}
std::map<std::wstring, std::wstring> CElement::GetStyle() const
@ -230,11 +233,14 @@ namespace NSCSS
return NULL;
}
std::vector<unsigned short> CElement::GetWeight()
void CElement::UpdateWeight()
{
if (m_arWeight.empty())
m_arWeight = NS_STATIC_FUNCTIONS::GetWeightSelector(m_sFullSelector);
}
std::vector<unsigned short> CElement::GetWeight() const
{
return m_arWeight;
}

View File

@ -44,7 +44,8 @@ namespace NSCSS
CElement *FindPrevElement(const std::wstring& sSelector) const;
std::vector<unsigned short int> GetWeight();
void UpdateWeight();
std::vector<unsigned short int> GetWeight() const;
void IncreasedWeight();
};
}

View File

@ -5,7 +5,7 @@ namespace NSCSS
CNode::CNode()
{}
CNode::CNode(std::wstring wsName, std::wstring wsClass, std::wstring wsId)
CNode::CNode(const std::wstring& wsName, const std::wstring& wsClass, const std::wstring& wsId)
: m_wsName(wsName), m_wsClass(wsClass), m_wsId(wsId)
{}
@ -14,6 +14,15 @@ namespace NSCSS
return m_wsName.empty() && m_wsClass.empty() && m_wsId.empty() && m_wsStyle.empty();
}
void CNode::Clear()
{
m_wsName .clear();
m_wsClass .clear();
m_wsId .clear();
m_wsStyle .clear();
m_mAttributes.clear();
}
std::vector<std::wstring> CNode::GetData() const
{
std::vector<std::wstring> arValues;

View File

@ -18,10 +18,12 @@ namespace NSCSS
public:
CNode();
CNode(std::wstring wsName, std::wstring wsClass, std::wstring wsId);
CNode(const std::wstring& wsName, const std::wstring& wsClass, const std::wstring& wsId);
bool Empty() const;
void Clear();
std::vector<std::wstring> GetData() const;
bool operator< (const CNode& oNode) const;
bool operator== (const CNode& oNode) const;

View File

@ -2,23 +2,6 @@
namespace NSCSS
{
bool StatistickElement::operator<(const StatistickElement &oStatistickElement) const
{
return sValue < oStatistickElement.sValue;
}
void CTree::CountingNumberRepetitions(const CTree &oTree, std::map<StatistickElement, unsigned int> &mStatictics)
{
if (!oTree.m_oNode.m_wsId.empty())
++mStatictics[StatistickElement{StatistickElement::IsId, L'#' + oTree.m_oNode.m_wsId}];
if (!oTree.m_oNode.m_wsStyle.empty())
++mStatictics[StatistickElement{StatistickElement::IsStyle, oTree.m_oNode.m_wsStyle}];
if (!oTree.m_arrChild.empty())
for (const CTree& oChildren : oTree.m_arrChild)
CountingNumberRepetitions(oChildren, mStatictics);
}
namespace NSConstValues
{
const std::map<std::wstring, std::wstring> COLORS
@ -82,7 +65,7 @@ namespace NSCSS
{L"gainsboro", L"DCDCDC"}, {L"lightgray", L"D3D3D3"}, {L"silver", L"C0C0C0"},
{L"darkgray", L"A9A9A9"}, {L"gray", L"808080"}, {L"dimgray", L"696969"},
{L"lightslategray", L"778899"}, {L"slategray", L"708090"}, {L"darkslategray", L"2F4F4F"},
{L"black", L"000000"},
{L"black", L"000000"}, {L"grey", L"808080"},
/* Outdated */
{L"windowtext", L"000000"}, {L"transparent", L"000000"}
};

View File

@ -16,26 +16,6 @@ namespace NSCSS
ScalingDirectionY = 2
} ScalingDirection;
struct StatistickElement
{
enum TypeElement
{
IsStyle = 0,
IsId
} m_enType;
std::wstring sValue;
bool operator<(const StatistickElement& oStatistickElement) const;
};
struct CTree
{
NSCSS::CNode m_oNode;
std::vector<CTree> m_arrChild;
static void CountingNumberRepetitions(const CTree &oTree, std::map<StatistickElement, unsigned int> &mStatictics);
};
namespace NSConstValues
{
extern const std::map<std::wstring, std::wstring> COLORS;

View File

@ -48,7 +48,6 @@ namespace NS_STATIC_FUNCTIONS
if (sEncoding.empty())
sEncoding = "utf-8";
if (!sEncoding.empty() && sEncoding != "utf-8" && sEncoding != "UTF-8")
{
NSUnicodeConverter::CUnicodeConverter oConverter;
@ -141,7 +140,9 @@ namespace NS_STATIC_FUNCTIONS
while (std::wstring::npos != unEnd)
{
arWords.emplace_back(wsLine.data() + unStart, unEnd - unStart + ((bWithSigns) ? 1 : 0));
if (unStart != unEnd)
arWords.emplace_back(wsLine.data() + unStart, unEnd - unStart + ((bWithSigns) ? 1 : 0));
unStart = wsLine.find_first_not_of(wsDelimiters, unEnd);
unEnd = wsLine.find_first_of(wsDelimiters, unStart);
}

File diff suppressed because it is too large Load Diff

View File

@ -13,6 +13,8 @@ namespace NSCSS
{
namespace NSProperties
{
#define NEXT_LEVEL UINT_MAX, true
template<typename T>
class CValue
{
@ -21,6 +23,7 @@ namespace NSCSS
friend class CDigit;
friend class CColor;
friend class CEnum;
friend class CURL;
T m_oValue;
unsigned int m_unLevel;
@ -74,13 +77,13 @@ namespace NSCSS
return *this;
}
CValue& operator =(const T& oValue)
virtual CValue& operator =(const T& oValue)
{
//m_oValue = oValue.m_oValue;
return *this;
}
CValue& operator+=(const CValue& oValue)
virtual CValue& operator+=(const CValue& oValue)
{
if (m_unLevel > oValue.m_unLevel || (m_bImportant && !oValue.m_bImportant) || oValue.Empty())
return *this;
@ -92,10 +95,15 @@ namespace NSCSS
return *this;
}
bool operator==(const CValue& oValue) const
virtual bool operator==(const CValue& oValue) const
{
return m_oValue == oValue.m_oValue;
}
virtual bool operator!=(const CValue& oValue) const
{
return m_oValue != oValue.m_oValue;
}
};
class CString : public CValue<std::wstring>
@ -130,6 +138,7 @@ namespace NSCSS
bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
bool SetValue(const CDigit& oValue);
bool SetValue(const double& dValue, unsigned int unLevel, bool bHardMode);
bool Empty() const override;
bool Zero() const;
@ -178,52 +187,45 @@ namespace NSCSS
bool Empty() const;
bool operator==(const TRGB& oRGB) const;
bool operator!=(const TRGB& oRGB) const;
};
class CURL
{
public:
CURL();
bool Empty() const;
bool LinkToId() const;
void Clear();
bool SetValue(const std::wstring& wsValue);
std::wstring GetValue() const;
bool operator==(const CURL& oValue) const;
bool operator!=(const CURL& oValue) const;
private:
std::wstring m_wsValue;
};
typedef enum
{
ColorEmpty,
ColorNone,
ColorRGB,
ColorHEX,
ColorUrl
ColorUrl,
ColorContextStroke,
ColorContextFill
} ColorType;
class Q_DECL_EXPORT CColorValue
class CColor : public CValue<void*>
{
public:
CColorValue();
CColorValue(const CColorValue& oColorValue);
~CColorValue();
void SetRGB(unsigned char uchR, unsigned char uchG, unsigned char uchB);
void SetRGB(const TRGB& oRGB);
void SetHEX(const std::wstring& wsValue);
void SetUrl(const std::wstring& wsValue);
void SetNone();
void Clear();
bool Empty() const;
ColorType m_enType;
void* m_pColor = NULL;
std::wstring GetColor() const;
bool operator==(const CColorValue& oColorValue) const;
CColorValue& operator= (const CColorValue& oColorValue);
};
class CColor : public CValue<CColorValue>
{
CDigit m_oOpacity;
static TRGB ConvertHEXtoRGB(const std::wstring& wsValue);
static std::wstring ConvertRGBtoHEX(const TRGB& oValue);
static std::wstring CutURL(const std::wstring& wsValue);
void SetEmpty(unsigned int unLevel = 0);
public:
CColor();
CColor(const CColor& oColor);
~CColor();
bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
bool SetOpacity(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true);
@ -240,8 +242,28 @@ namespace NSCSS
int ToInt() const override;
double ToDouble() const override;
std::wstring ToWString() const override;
std::wstring ToHEX() const;
std::wstring EquateToColor(const std::vector<std::pair<TRGB, std::wstring>>& arColors) const;
TRGB ToRGB() const;
static TRGB ConvertHEXtoRGB(const std::wstring& wsValue);
static std::wstring ConvertRGBtoHEX(const TRGB& oValue);
bool operator==(const CColor& oColor) const;
bool operator!=(const CColor& oColor) const;
CColor& operator =(const CColor& oColor);
CColor& operator+=(const CColor& oColor);
private:
CDigit m_oOpacity;
ColorType m_enType;
void SetEmpty(unsigned int unLevel = 0);
void SetRGB(unsigned char uchR, unsigned char uchG, unsigned char uchB);
void SetRGB(const TRGB& oRGB);
void SetHEX(const std::wstring& wsValue);
void SetUrl(const std::wstring& wsValue);
void SetNone();
};
typedef enum
@ -427,6 +449,7 @@ namespace NSCSS
{
public:
CBorderSide();
CBorderSide(const CBorderSide& oBorderSide);
void Clear();
@ -434,9 +457,12 @@ namespace NSCSS
bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidth(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyle(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColor(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
void SetNone(unsigned int unLevel, bool bHardMode);
void Block();
void Unblock();
@ -452,6 +478,7 @@ namespace NSCSS
CBorderSide& operator+=(const CBorderSide& oBorderSide);
bool operator==(const CBorderSide& oBorderSide) const;
bool operator!=(const CBorderSide& oBorderSide) const;
CBorderSide& operator =(const CBorderSide& oBorderSide);
private:
CDigit m_oWidth;
@ -473,39 +500,50 @@ namespace NSCSS
CBorder();
void Clear();
void ClearLeftSide();
void ClearTopSide();
void ClearRightSide();
void ClearBottomSide();
static void Equation(CBorder &oFirstBorder, CBorder &oSecondBorder);
bool SetSides(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidth(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyle(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColor(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetSides(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidth(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyle(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColor(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetCollapse(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
//Left Side
bool SetLeftSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthLeftSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthLeftSide (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyleLeftSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColorLeftSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
//Top Side
bool SetTopSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthTopSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthTopSide (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyleTopSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColorTopSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
//Right Side
bool SetRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthRightSide (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyleRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColorRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
//Bottom Side
bool SetBottomSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWidthBottomSide(const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetStyleBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColorBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
void SetNone(unsigned int unLevel, bool bHardMode = false);
void Block();
void Unblock();
@ -522,7 +560,7 @@ namespace NSCSS
CBorder& operator+=(const CBorder& oBorder);
bool operator==(const CBorder& oBorder) const;
bool operator!=(const CBorder& oBorder) const;
CBorder& operator =(const CBorder& oBorder);
private:
CBorderSide m_oLeft;
@ -574,11 +612,13 @@ namespace NSCSS
bool SetAlign (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetDecoration(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetColor (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetHighlight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
const CDigit& GetIndent() const;
const CString& GetAlign() const;
const TTextDecoration& GetDecoration() const;
const CColor& GetColor() const;
const CColor& GetHighlight() const;
bool Empty() const;
@ -593,6 +633,7 @@ namespace NSCSS
CDigit m_oIndent;
CString m_oAlign;
CColor m_oColor;
CColor m_oHighlight;
};
class CIndent
@ -610,15 +651,19 @@ namespace NSCSS
bool SetValues (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetTop (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetTop (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetRight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetRight (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetBottom (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetBottom (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetLeft (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetLeft (const double& dValue, unsigned int unLevel, bool bHardMode = false);
void UpdateAll (double dFontSize);
void UpdateTop (double dFontSize);
void UpdateRight (double dFontSize);
void UpdateBottom(double dFontSize);
void UpdateLeft (double dFontSize);
void UpdateAll (const double& dParentFontSize, const double& dCoreFontSize);
void UpdateTop (const double& dParentFontSize, const double& dCoreFontSize);
void UpdateRight (const double& dParentFontSize, const double& dCoreFontSize);
void UpdateBottom(const double& dParentFontSize, const double& dCoreFontSize);
void UpdateLeft (const double& dParentFontSize, const double& dCoreFontSize);
const CDigit& GetTop () const;
const CDigit& GetRight () const;
@ -633,7 +678,7 @@ namespace NSCSS
bool operator!=(const CIndent& oIndent) const;
private:
bool SetValues(const std::wstring& wsTopValue, const std::wstring& wsRightValue, const std::wstring& wsBottomValue, const std::wstring& wsLeftValue, unsigned int unLevel, bool bHardMode = false);
void UpdateSide(CDigit& oSide, double dFontSize);
void UpdateSide(CDigit& oSide, const double& dParentFontSize, const double& dCoreFontSize);
CDigit m_oLeft;
CDigit m_oTop;
@ -652,6 +697,7 @@ namespace NSCSS
bool SetValue (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetSize (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetSize (const double& dValue, unsigned int unLevel, bool bHardMode = false);
bool SetLineHeight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetFamily (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetStretch (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
@ -659,8 +705,8 @@ namespace NSCSS
bool SetVariant (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
bool SetWeight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
void UpdateSize(double dFontSize);
void UpdateLineHeight(double dFontSize);
void UpdateSize(const double& dParentFontSize, const double& dCoreFontSize);
void UpdateLineHeight(const double& dParentFontSize, const double& dCoreFontSize);
void Clear();

View File

@ -316,7 +316,7 @@ namespace NSCSS
std::wstring wsTextAlign{oStyle.m_oText.GetAlign().ToWString()};
if (wsTextAlign.empty() && bInTable)
if (wsTextAlign.empty())
wsTextAlign = oStyle.m_oDisplay.GetHAlign().ToWString();
oXmlElement.AddPropertiesInP(PProperties::P_Jc, wsTextAlign);
@ -341,12 +341,14 @@ namespace NSCSS
sSpacingValue.reserve(128);
if (!oStyle.m_oMargin.GetTop().Empty() && !oStyle.m_oMargin.GetTop().Zero())
sSpacingValue += L"w:before=\"" + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips)) + L"\" w:beforeAutospacing=\"0\" ";
sSpacingValue += L"w:before=\"" + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips)) + L"\" w:beforeAutospacing=\"0\"";
else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
sSpacingValue += L"w:before=\"0\" w:beforeAutospacing=\"0\"";
if (!oStyle.m_oMargin.GetBottom().Empty() && !oStyle.m_oMargin.GetBottom().Zero())
sSpacingValue += L"w:after=\"" + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"0\" ";
sSpacingValue += L" w:after=\"" + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"0\"";
else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
sSpacingValue += L"w:after=\"0\" ";
sSpacingValue += L" w:after=\"0\" w:afterAutospacing=\"0\"";
if (!oStyle.m_oFont.GetLineHeight().Empty() && !oStyle.m_oFont.GetLineHeight().Zero())
{
@ -356,7 +358,7 @@ namespace NSCSS
sSpacingValue += L" w:line=\"" + wsLine + L"\" w:lineRule=\"" + wsLineRule + L"\"";
}
else if (oStyle.m_oFont.GetLineHeight().Zero() || bInTable)
sSpacingValue += L"w:lineRule=\"auto\" w:line=\"240\"";
sSpacingValue += L" w:lineRule=\"auto\" w:line=\"240\"";
if (!sSpacingValue.empty())
oXmlElement.AddPropertiesInP(PProperties::P_Spacing, sSpacingValue);
@ -483,7 +485,7 @@ namespace NSCSS
return;
if (!oStyle.m_oFont.GetSize().Empty())
oXmlElement.AddPropertiesInR(RProperties::R_Sz, std::to_wstring(static_cast<int>(oStyle.m_oFont.GetSize().ToDouble(NSCSS::Point) * 2. + 0.5))); // Значения шрифта увеличивает на 2
oXmlElement.AddPropertiesInR(RProperties::R_Sz, std::to_wstring(static_cast<int>(oStyle.m_oFont.GetSize().ToDouble(NSCSS::Point) * 2. * oStyle.m_oTransform.GetMatrix().GetFinalValue().sy() + 0.5))); // Значения шрифта увеличивает на 2
if (oStyle.m_oText.GetDecoration().m_oLine.Underline())
oXmlElement.AddPropertiesInR(RProperties::R_U, (!oStyle.m_oText.GetDecoration().m_oStyle.Empty()) ? oStyle.m_oText.GetDecoration().m_oStyle.ToWString() : L"single");
@ -491,17 +493,15 @@ namespace NSCSS
if (!oStyle.m_oBackground.GetColor().Empty() && !oStyle.m_oBackground.GetColor().None() && !oStyle.m_oBackground.GetColor().Url())
oXmlElement.AddPropertiesInR(RProperties::R_Shd, oStyle.m_oBackground.GetColor().ToWString());
/*
const std::wstring wsHighlight{oStyle.m_oBackground.GetColor().EquateToColor({{{0, 0, 0}, L"black"}, {{0, 0, 255}, L"blue"}, {{0, 255, 255}, L"cyan"},
{{0, 255, 0}, L"green"}, {{255, 0, 255}, L"magenta"}, {{255, 0, 0}, L"red"},
{{255, 255, 0}, L"yellow"}, {{255, 255, 255}, L"white"}, {{0, 0, 139}, L"darkBlue"},
{{0, 139, 139}, L"darkCyan"}, {{0, 100, 0}, L"darkGreen"}, {{139, 0, 139}, L"darkMagenta"},
{{139, 0, 0}, L"darkRed"}, {{128, 128, 0}, L"darkYellow"},{{169, 169, 169}, L"darkGray"},
{{211, 211, 211}, L"lightGray"}})};
const std::wstring wsHighlight{oStyle.m_oText.GetHighlight().EquateToColor({{{0, 0, 0}, L"black"}, {{0, 0, 255}, L"blue"}, {{0, 255, 255}, L"cyan"},
{{0, 255, 0}, L"green"}, {{255, 0, 255}, L"magenta"}, {{255, 0, 0}, L"red"},
{{255, 255, 0}, L"yellow"}, {{255, 255, 255}, L"white"}, {{0, 0, 139}, L"darkBlue"},
{{0, 139, 139}, L"darkCyan"}, {{0, 100, 0}, L"darkGreen"}, {{139, 0, 139}, L"darkMagenta"},
{{139, 0, 0}, L"darkRed"}, {{128, 128, 0}, L"darkYellow"},{{169, 169, 169}, L"darkGray"},
{{211, 211, 211}, L"lightGray"}})};
if (L"none" != wsHighlight)
oXmlElement.AddPropertiesInR(RProperties::R_Highlight, wsHighlight);
*/
oXmlElement.AddPropertiesInR(RProperties::R_Color, oStyle.m_oText.GetColor().ToWString());
@ -523,10 +523,7 @@ namespace NSCSS
Clear();
if(oStyle.GetId().empty())
{
m_sId = L"normal";
return false;
}
CStyleUsed structStyle(oStyle, false);
@ -589,10 +586,7 @@ namespace NSCSS
Clear();
if(oStyle.GetId().empty())
{
m_sId = L"normal";
return true;
}
return false;
CStyleUsed structStyle(oStyle, true);
std::vector<CStyleUsed>::iterator oItem = std::find(m_arStyleUsed.begin(), m_arStyleUsed.end(), structStyle);

View File

@ -27,7 +27,7 @@ CXmlElement::CXmlElement(const std::wstring& sNameDefaultElement)
bool CXmlElement::Empty() const
{
return m_mPStyleValues.empty() && m_mRStyleValues.empty() && m_mBasicValues.find(CSSProperties::BasicProperties::B_BasedOn) == m_mBasicValues.end();
return m_mPStyleValues.empty() && m_mRStyleValues.empty() && GetBasedOn().empty();
}
void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
@ -35,7 +35,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
if (!Empty())
Clear();
if (sNameDefaultElement == L"p")
/* if (sNameDefaultElement == L"p")
{
AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"paragraph");
AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"p");
@ -47,7 +47,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
// AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
}
else if (sNameDefaultElement == L"li")
else */if (sNameDefaultElement == L"li")
{
AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"paragraph");
AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"li");
@ -203,7 +203,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddPropertiesInR(CSSProperties::RunnerProperties::R_Sz, L"15");
AddPropertiesInR(CSSProperties::RunnerProperties::R_B, L"bold");
}
else if (sNameDefaultElement == L"div-c")
/*else if (sNameDefaultElement == L"div-c")
{
AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"div-c");
@ -219,7 +219,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Div paragraph");
AddBasicProperties(CSSProperties::BasicProperties::B_BasedOn, L"normal");
AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"div-c");
}
}*/
else if (sNameDefaultElement == L"a-c")
{
AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");

View File

@ -55,6 +55,11 @@ static void replace_all(std::string& s, const std::string& s1, const std::string
}
}
static bool NodeIsUnprocessed(const std::string& wsTagName)
{
return "xml" == wsTagName;
}
static bool IsUnckeckedNodes(const std::string& sValue)
{
return unchecked_nodes_new.end() != std::find(unchecked_nodes_new.begin(), unchecked_nodes_new.end(), sValue);
@ -592,6 +597,9 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
std::string tagname = get_tag_name(node);
if (NodeIsUnprocessed(tagname))
return;
if (bCheckValidNode)
bCheckValidNode = !IsUnckeckedNodes(tagname);

View File

@ -2,3 +2,4 @@ emsdk/
hunspell/
deploy/
o
hunspell.data

View File

@ -14,6 +14,12 @@ def get_hunspell(stable_commit):
base.replaceInFile("./src/hunspell/csutil.cxx", "void free_utf_tbl() {", "void free_utf_tbl() { \n return;\n")
# bug fix, we need to keep this utf table
# free_utf_tbl doesnt delete anything so we can destroy hunspell object
# replace & add defines to easy control of time limits (CUSTOM_LIMIT)
default_tl_defines = "#define TIMELIMIT_GLOBAL (CLOCKS_PER_SEC / 4)\n#define TIMELIMIT_SUGGESTION (CLOCKS_PER_SEC / 10)\n#define TIMELIMIT (CLOCKS_PER_SEC / 20)\n"
custom_tl_defines_tl = "#define TIMELIMIT_GLOBAL CUSTOM_TIMELIMIT_GLOBAL\n#define TIMELIMIT_SUGGESTION CUSTOM_TIMELIMIT_SUGGESTION\n#define TIMELIMIT CUSTOM_TIMELIMIT\n"
tl_defines = "#ifndef CUSTOM_TIMELIMITS\n" + default_tl_defines + "#else\n" + custom_tl_defines_tl + "#endif\n"
base.replaceInFile("./src/hunspell/atypes.hxx", default_tl_defines, tl_defines)
os.chdir("../")

View File

@ -1,213 +0,0 @@
A [Ü, Ha, Ağ, Ac, Ad, Da, Fa, Ah, Ka, Al, An, Na, Qa]
qocalmaq [almayacaq, almamaq]
Alderaan'ın [Federasiyanın]
hamısı
həmçinin
cavab
dir
incəsənət
kimi
da
uzaq
körpə
zirzəmi [zəmində]
ol
olub
doğuldu [doğulduğu, doğurduğu]
bulvar [bunlar]
fasilə
nəsllər [nəsillər, nəsnələri, nəslə, nələrlə, səslər]
gəlin
lakin
al
ilə
Kaliforniya [Kanalizasiya]
Kalifornikasiya [Kommunikasiya]
bilər
kartlar
şans
Çin
çənə [dənə, çəkə, mənə, nənə, sənə, tənə, çənəyə]
klublar
Cobain []
bürc [borc, gürcü]
nəzarət
qiymət
edə bilməzdim [bilməzdim]
yaratmaq
lənət
rəqs
saziş
sövdələşmələr [məsləhətləşmələr]
dağıdıcı
almazlar [almanlar, almaz lar, almaz-lar, almaları, marallar, mallara]
etməz
etməyərik [etmərik, etmədikləri]
arzu
xülyalar [yalanlar]
Şərq
kənar
kənarları [kənar ları, kənar-ları, kənarına, kənarında, kəlamları, aparılarkən]
məmnunluq
hamının
uzaq
peri [şeri, geri, meri, yeri]
solğun [dolğun]
üz
son
tap
ilk
üçün
-dan [-dam, -da, -an, -dana, -adan, -nda, -daş, -dən, -dağ, -can, -dad, -din, -lan, -don, -qan, adan, andan]
sərhəd
qız
qızın
yaxşı
gitara [artaraq]
əl
hardcore [hardadır]
var
yoxdur
o [od, ol, on, ot, ov, ox, ü, ı]
eşitmək
ürək
O'nun [Onun, Oyununu]
ona
gizli
yüksək
ona
onun
Hollivud [Holland]
Mən
Mənəm
əgər
içində
məlumat
içində
dir
bu
jack [janra]
sadəcə
kral
qohum
bilmək
qoyulmuş
qanun
yerləşdirilmək [yerləşdirilməsi, yerləşdirilmiş, yerləşdirilib, yerləşdirildiyini]
qurğuşun [quruluşunun]
aparmaq
yerləşdirilmə [yerləşdirilməsi, yerləşdirilmiş, yerləşdirilib, yerləşdirildiyini]
məkan
sevmək
şans
edilmiş
adam
çox
Evlənmək
maska [masa, marka]
o bilər [bilərlər, bilər]
bəlkə də [bəlkə]
mənası
mən
meditasiya [dissertasiya]
xatirə
ılın
pul
mənim
heç vaxt [vaxtsa]
deyil
heç nə [heçə]
nömrələr [nömrələri, nömrə lər, nömrə-lər, nömrəli, nömrə]
of [od, əf, ol, on, ot, ov, ox, ofis]
of [od, əf, ol, on, ot, ov, ox, ofis]
üstündə
bir
yalnız
və ya [vəla]
nəticə
öz
Ödə [Də, Ədə, Adə, Edə, Idə, Öndə, Ölə, Önə]
Şəftəli [Həftəlik]
yerlər
oynayır
oynamaq
əhali
porno [sponsor]
tərifləmək [təriflər, təklifləri, təkliflərlə, təkliflərə]
ehtimal ki [ehtimal]
ehtimal
psixik [psixi, psixoloji]
kraliça [kralı]
qaldırmaq
qalan
hörmət
qalxmaq
yol
xam
müqəddəs
Xilas et [Xilası]
elmi
çığırmaq [çağırmaq, çıxarmaq]
satılır
şəkil
xəstələnmək [xəstələnməyi, dəstəklənməsi]
gümüşçü [gümüş]
dəri
əsgər
bir şey [şeydir]
Mahnı
mahnılar
qılınclar [qılınc lar, qılınc-lar, qılıncı]
büyü [böyüyü]
casuslar [ruslar]
ulduz
Stansiya
oğurlamaq [vurğulamaq]
daşlar
günəş
şübhəli
İsveç
qılınclar [qılınc lar, qılınc-lar, qılıncı]
yeniyetmə
test
dandan [andan, candan, qandan, yandan, danışanda, adından, yanından, canından]
bu ki [builki]
bu ki [builki]
bu
onların
bu
onlar
düşünmək
bu
onlar
gel-git [get-gedə]
üçün
deyilmişəm [deyilmiş əm, deyilmiş-əm, deyilmişdi, deyilmiş, deyilmi, deyiləm]
çox
cəhd et [cəhdlər]
başa düşdüm []
qilin [ilin, bilin, dilin]
titrəmək [itirməmək, itirmək]
mübarizə aparır? []
istəyirəm
müharibə
idi
dalğalar [qadağalar, dağlarda, adalar, dağlar]
geymək [getmək, getməmək]
silahlar
yaxşı
idarə olunan [olunanlardan]
Qərbi [Hərbi, Qəbri, Qərb, Qərbin, Qəbir, Qərbə, Qəlbi]
arasında
qalib gəlmək [qaliblərin]
qalib gəlir [qalibləri]
ilə
qadın
dünya
səhv
siz
sizə
sənsən [səndən, sən sən, sən-sən, nədənsə, mənsə, sənə, səslənən]
sənin

View File

@ -1,212 +0,0 @@
A [А, Е, О, И, В, С, Я, У]
остаряване
Алдераан [Дерайлиран]
всичко
също
и
отговор
са
изкуство
като
в
далеч
бебе
мазе
бъда
било
роден
булевард
почивка
породи
невеста
но
купувам
от
Калифорния
Калифорникация [Калифорнийския, Калифорнийка, Калифорния]
може
карти
шанс
Китай
брадичка
клубове
Кобейн [Кобен]
съзвездие
контрол
цена
не можех [можехме]
създаване
проклятие
танц
сделка
сделки
унищожение
диаманти
не прави [неправи, неуправии, неправдиви]
не правим [непоправим]
мечта
мечти
Изток
ръб
ръбове
екстаз
всеки
далеч
приказка
избледнява
лица
краен
намирам
първи
за
от
предел
момиче
момичето
добре
китара
ръка
хардкор [хардуер]
има
няма
той
чуя
сърце
той е [той]
нейни
скрит
висок
него
негов
Холивуд
аз
аз съм [разсъмна]
ако
в
информация
вътре
е
това е [товарен]
вале
просто
крал
родственик
знам
определен
закон
поставям
водя
води
местоположение
обичам
късмет
направен
човек
много
Ожени се [Брожение]
маска
май
може би [можещи]
означава
аз
медитация
спомен
ума
пари
моя
никога
не
нищо
числа
от
изключен
на
един
само
или
изход
свой
Плати
праскова
места
играе
играя
население
порно [бурно, орно, порено, опорно, спорно, упорно, порна, парно, порне, поено, порни, потно, торно, морно, горно]
похвала
вероятно
вероятен
психичен
кралица
въздигам
останал
почит
възход
път
груб
светия
Спасявам
наука
крясък
продава
форма
по-болен
златар
кожа
войник
някаква
Песен
песни
пикове
заклинание
шпиони
звезда
стация [станция, стария, статия, стадия, атестация, стагнация]
крада
камъни
слънце
подозрителен
Швеция
мечове
тийнейджър [тинейджър, пейджър]
тест
отколкото
това
това е [товарен]
на
техни
тези
те с [тесте]
мисли
този
той
прилив
до
каза
също
опитайте
разбрано
еднорог [едно рог, еднороден]
вибрация
водене? [водене, неводен, воден]
искам
война
беше
вълни
носете
оръжия
Ами
бяха
Западна
какво
докато
победа
победи
със
жена
свят
грешка
ти
ти би [табиети]
ти си [тифуси]
вашият

View File

@ -1,112 +0,0 @@
amor
llum
lluum [lluu, llum, lluus, lluïm, lluu m]
esperança
espirança [esperança, espirant, espinçadora, espinça, espira]
llibertat
força
forrça [forra, força, forçar]
pau
somni
llibre
mar
amistat
cançó
flor
cel
estrella
temps
camí
vent
muntanya
mumntanya [muntanya, muntanyà, muntant]
riu
soroll
silenci
viatge
foc
gel
paraula
vida
dia
nit
tarda
matí
lluna
sol
llac
marbre
ferro
sal
mel
sucre
peix
ocell
oceoll [ocell]
joc
ritme
melodia
pintura
pentura [puntera, entura, pintura, puntura, ventura, penetrant, apertura, parapent]
teatre
dansa
poema
història
llegenda
mitologia
festa
música
vi
cervesa
cervessa [cervesa, cer vessa, cer-vessa, cerves sa, cerves-sa, cervesera, cerveseria, cerveser, cessava]
formatge
pa
ciutat
poble
natura
camp
bosc
platja
sorra
sorrà
pedra
ànima
cos
ment
cor
somriure
somriàre [somriure, somrient]
abraçada
bes
parla
oida [oidà, oïda, ioda, odia, aido, oia, oda, oiada, oxida, aida, sida, onda, mida, dida, vida]
vista
tacte
gust
olfacte
color
forma
número
lletra
sistema
regla
escola
universitat
univversitat [universitat, universitari, universalitat, universalitzat, universalista]
mestre
estudiant
sabiduria [sabuderia]
lliçó
pregunta
resposta
risposta [resposta, disposta, ris posta, ris-posta, risp osta, risp-osta, trasposta, posteritat, riosta, polvorista]
dubte
certesa
veritat
mentida
promesa
secret
descoberta
descaberta [descoberta, desca berta, desca-berta, descabestrat, descartable, descabota, descarta]
aventura
destinació

View File

@ -1,212 +0,0 @@
A
envellir
Alderaan [Aldebaran, Aldebrand, Aldeana, Anedera]
tot
també
I
resposta
és
art
com
a
lluny
nadó
celler
ser
ha estat [hastat]
nat
bulevard
pausa
generacions
núvia
però
comprar
amb
Califòrnia
Californication [Californiana, Californita]
pot
cartes
oportunitat
Xina
mentó
clubs
Cobain [Cobai, Cobais, Cobrin, Cob ain, Cob-ain, Cobalamina]
signe del zodíac [signé del zodíac, signè del zodíac, sígne del zodíac, sïgne del zodíac, signE del zodíac, Signe del zodíac, sIgne del zodíac, sigNe del zodíac, siGne del zodíac]
control
preu
no podria [nodriria, podriria, nodria]
crear
maleït
ballar
acord
negocis
destructiu
diamants
no fer [noosfera]
no fem [nomenem]
desitjar
somnis
Est
vora
voreres
satisfacció
tots
llunyà
fada
pallid [pallis, palli, pallin, pali]
cara
final
trobar
primer
per
de
frontera
noia
la noia [la noïa, la Noia]
guitarra
hardcore [recordar]
hi ha [hifa]
no hi ha [nó hi ha, nò hi ha, nO hi ha, No hi ha]
ell
sentir
cor
ell és [estellés]
seva
secret
alt
ell
seu
Hollywood
jo
sóc
si
en
informació
interior
és
és
jack
només
rei
parent
saber
fixat
llei
col·locar
plom
portar
col·locació
lloc
estimar
oportunitat
fet
home
molts
casar-se
màscara
podria
potser
sentit
jo
meditació
memòria
ment
diners
meu
mai
no
res
números
de
fora
sobre
un
només
o
resultat
seu
pagar
préssec
llocs
jugar
joc
població
porno
elogiar
probablement
probable
psíquic
reina
elevar
restant
respecte
pujar
camí
cru
sant
salvar
ciència
crit
vendres [vendre's, vendre]
figura
malalt
joier
pell
soldat
alguna cosa [glucosamina]
cançó
cançons
cims
encanteri
espies
estrella
estació
robar
pedres
sol
sospitós
Suècia
espases
adolescent
prova
que
que
això
seu
aqueixos
ells
pensar
aqueix
ells
marees
per
no he estat [nó he estat, nò he estat, nO he estat, No he estat]
molt
intentar
entendre
fer
tremolar
lluitar
desitjar
guerra
va ser [vaser, serva]
ones
portar
armes
administrat
Oest
què
entre
guanyar
guanya
amb
dona
món
equivocat
tu
vostè
tu ets [tubets]
teu

View File

@ -1,206 +0,0 @@
pomaliý [pomalý, pomaličku]
šťstný [šťastný]
smuutný [smutný, smutnu]
horcký [horký, horácký, horecký, horský, hornický, horňácký]
studiený [studený, studie]
záludnast [záludnost, záludný]
náhodillost [nahodilost, náhodnost]
úpěnlevý [úpěnlivý, úpletový]
rozspačitý [rozpačitý, rozpačitěný]
svéhllavý [svéhlavý, svéhlavička]
jablko
slunce
voda
dům
pták
káva
chleba
květina
kniha
pes
kočka
město
zelený
modrý
červený
bílý
černý
velký
malý
rychlý
pomalý
šťastný
smutný
horký
studený
nový
starý
hezký
ošklivý
dobrý
špatný
zdravý
nemocný
silný
slabý
chytrý
hloupý
pracovat
jíst
pít
spát
číst
psát
mluvit
smát se [smát]
plakat
zpívat
hrát
tančit
učit se [učitele]
nakupovat
vařit
telefonovat
dívat se [sedívat]
poslouchat
chodit
běžet
létat
plavat
psát
učit se [učitele]
dělat
mít
být
jít
přijít
odejít
dát
vzít
říct
vidět
slyšet
cítit
myslet
chtít
moct
muset
rád
nerad
ano
ne
prosím
děkuji
na shledanou [shledanou, dohledanou, shledávanou, ohledanou]
omlouvám se [omlouvání]
sbohem
ahoj
čau
hej
jo
fakt
super
blbost
paráda
no jo [nojo]
jasně
takže
vlastně
třeba
snad
leštěnka
pochmurný
živelný
ponaučení
záhada
pochybnost
nádhera
soucit
záludnost
náhodilost [nahodilost, náhodnost]
úpěnlivý
rozpačitý
svéhlavý
marnivost
blahodar [blaho dar, blaho-dar, lahoda]
rozčarování
odchylka
přelud
vytrvalost
neústupnost
lehkost
souznění
rozmarnost
roztržitost
úskočnost
rozkoš
marasmus
rozpolcenost
neúprosnost
ztřeštěnost
chmurnost
okouzlení
zářivost
vyrovnanost
neochvějnost
neúcta
bizarnost
rozmařilost
nepochopení
nevýslovný
pomíjivost
beznaděj
úzkost
odtažitost
rozerv [rozerve, rozervi, rozervu, rezerv, rozervat]
rozervanost
vyčerpanost
bezcitnost
záludnost
nezdolnost
rozkošátnost [rozkošnost, rozkošatěnost, rozkošnickost, rozkoktanost]
nezdolatelnost
rozmarnost
živelnost
bezútěšnost
záhadnost
neposkvrnitelnost [nepotiskovatelnost, nepopisovatelnost, nepřemostitelnost, nezvratitelnost]
rozkošnělost [rozkošatělost, rozkošnost, rozkošnickost, rozkošatěnost]
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
ztracenost
bezbřehost
rozervanost
opojení
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
ztracenost
bezbřehost
opojení
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
bezbřehost

View File

@ -1,129 +0,0 @@
Hej
Goddag
Tak
Ja
Nej
Måske
Mad
Vand
Hus
Bil
Tog
Cykel
Skole
Børn
Far
Mor
Søster
Bror
Hund
Kat
Fisk
Fugl
Træ
Blomst
Græs
Sol
Måne
Himmel
Regn
Sne
Sommer
Vinter
Forår
Efterår
Aften
Nat
Dag
Uge
Måned
År
Læse
Skrive
Tale
Lære [Lære, Læres, Lærer, Læren, Læreø, Læreå, læreå]
Arbejde
Sove
Vågne
Løbe
Sidde
Stå
Lytte
Se
Høre [Høre, Høres, Hører, Høreø, Høreå, høreå]
Spise
Drikke
Kød
Frugt
Grøntsager
Ost
Brød
Vand
Juice
Kaffe
Te
Mælk
Smør [Smør, Smøre, Smørs, Smør']
Æg
Salt
Peber
Sukker
Bolle
Smørrebrød
Køkken
Stue
Soveværelse
Badeværelse
Toilet
Bord
Stol
Sofa
Lampe
Vindue
Dør
Gulv
Loft
Væg
Sofa
Pude
Tæppe
Badekar
Håndvask
Spejl
Håndklæde
Seng
Dyne
Dynee [Dynes, Dyner, Dyne, Dynen, Dynge, Dynees, Dynete, Dyneel, Dynele, Dyneed, Dyneeg, Dyneem, Dynefe, Dyneve]
Pude
Pudee [Pudene, Pudre, Puder, Pude, Pudes, Pudse, Puden, Pudet, Pudel]
Alarm
Alarmm [Alarm, Alarms]
Skrivebord
Stol
Hus
Hund
Kat
Katt [Kett, Katy, Katty, Kate, Kitt, Kata, Kato, Matt, Watt, Kat, Kast, Kats, Takt, Kart, Katte]
Bil
Skole
Skolee [Skolie, Skolede, Skoler, Skole, Skoles, Skolen, Skolet, Skolde]
Sol
Soll [Sol, Sole, Sols, Soli, Sola, Sall, Sold, Solo, Soul]
Vand
Vandd [Vanda, Vandy, Vandt, Vand, Vands, Vande, Vandr]
Mad
Madd [Mads, Maud, Mad, Made, Mand]
By
Barn
Barnn [Barni, Baran, Barny, Barn, Baren, Barns, Baron]
Tørklæde
Skæbne
Uafhængighed
Kærlighed
Kærligheed [Kærlighed, Ærlighed, Hæderlighed, Herlighed, Liderlighed]
overbelastning
Modstandsbevægelsen
Uafhængighedserklæringen
Forårssommertemperaturen
Stabiliseringsperioden

View File

@ -1,131 +0,0 @@
Ägyptologie
Ährenamt [Ährensamt, Ährenast, Ährenart, Ährenact, Ährenabt, Ährenakt, Ährenaxt, Ehrenamt, Ohrenamt, -ährenamt, Ährenartig]
Ängstlichkeit
Äquatoria
Abarbeiten
Abbild
Abbilden
Abbildungs [Abbildung, Abbildungs-, Bildungsnah, Unbildung]
Abbreviatur
Abbrüche
Abfassen
Abfertigen
Abfolge
Abfuhr
Ableugnen
Ablichten
Ablöse
Absätze
Abschnitts
Abwechseln
Abwehren
Aktiv
Britannia
Browserfenster
Budgetieren
Bugpartie
Bukarester
Burgundersoße
Butterkrem
Button
Cabriolet
Campanile
Canapé
Caprice
Celsius
Chamäleon
Charakteristik
Chronometer
Chronometrie
Cölln
Connectzustände
Cursorspur
Däne
Dachs
Dahindämmern
Darbringen
Daten
Datenbankserver
Desktopsystem
Detektivfilm
Dichtertum
Dinosaurier
Direktion
Diskantgambe
Diskothek
Druckereicode
Kapsel
Karausche
Katzen
Klinge
Klinke
Kohlrabi
Koinzidenz
Kolleg
Komplott
Meereis
Mehrphasigkeit
Memorieren
Messen
Methode
Metrowaggon
Meute
Migräne
Milieuforschung
Mindern
Mineralien
Mitternacht
Mobiliar
Mohrrübe
Mühelosigkeit
Normativität
Notifikation
Ökonomie
Orangeton
Osten
Subjekt
Subsidiarität
Subsumieren
Tagfalter
Speicher
Spielzeugsammlung
Zahler
Сложные слова []
Zurückgezogenheit
Äquipotentialfläche
Äußerungsbedeutung
Abfassungszeitraum
Abgeschlossenheits [Abgeschlossenheit, Abgeschlossenheits-, Unabgeschlossenheit, Aufgeschlossenheit, Abgeschlagenheit, Geschlossenheit]
Adjunktionsbeseitigung
Anknüpfungsgrundsätze
Chiffrierschlüssel
Knochenmarktransplantation
Bundeskaderathlet
Carbonsäurechlorid
Cardiazoltherapie
Chancenungleichheit
Charakterisierungsmöglichkeit
Chlorophyllkonzentration
Computerspielemarkt
Deindustrialisieren
Dekodierungsmöglichkeit
Kartoffelschälmesser
Kernspinresonanztomographie
Merkmalskombination
Nachbarschaftszentren
Opportunitätsprinzip
Tiefenstaffelung
Tourismusfachmann
Sequenzbetrachtung
Слова с ошибками []
Dechifrierprogramm [Dechiffrierprogramm, Liederprogramm]
Administratorkenwort [Administratorkennwort, Administratorkonto, Administratorrecht, Distriktadministrator, Distriktsadministrator]
Spigeln [Spiegeln]
Tätigkeite [Tätigkeit, Tätigkeiten, Untätigkeit, Nagetätigkeit, Mildtätigkeit, Regietätigkeit]
Draufgangertum [Draufgängertum, Draufgänger]
Abschnit [Abschnitt, Abschritt]
Komunikation [Kommunikation, Exkommunikation, Kommunikativ, Kommunikator, Komplikation]
Drackereicode [Druckereicode, Dreidecker]
Bumeln [Baumeln, Bummeln, Blumen, Brummeln, Bummel]

View File

@ -1,116 +0,0 @@
Alpinist
Alteration
Alternative
Alumne
Amateurfilmer
Ambulanz
Amtmänner
Analogie
Analytik
Ananas
Angabe
Ankünfte
Dynastie
Ebenbürtigkeit
Echtheitszertifikat
Editionspläne
Editor
Ehrenamtlichkeit
Eigentümerschaft
Einbau
Eindringling
Eingabequittungsbetrieb
Einhüllen
Einkommen
Einloggen
Einschließen [Einschliessen, Einschliefen]
Einsortier [Einsortier-, Einsorter, Eintortier, Einportier, Einvortier, Einsortiere, Einsortiert, Unsortierter, Unsortiert, Einzusortieren, Sortieren]
Elaboration
Elementar
Entertainer
Entkuppeln
Entschädigungs [Entschädigung, Entschädigungs-, Entschädigungslos, Entschädigens, Entschädigen]
Enumerator
Erbringen
Erdichten
Erfahrenheit
Erhalt
Erleichtern
Ersparnis
Erstatten
Erzählliteratur
Helikopter
Helpdesk
Herunterladen
Hindeuten
Hinterlassenschaft
Hiob
Landesprache [Landessprache, Landesrache, Landsprache, Ladesprache, -landesprache]
flexibilität [Flexibilität, -flexibilität, flexibilisiert]
floristisch
flugbillet [Flugbillet, -flugbillet, flugbereit]
heroben
herrichten
herstellen
herübereilen
herunterzubücken
hie
hieraus
hilfe [Hilfe, hilf, hilfe-, -hilfe, helfe, hilft, hälfe]
himbeere [Himbeere, -himbeere, himbeer-, himbeerrot]
justiz [Justiz, justiz-, -justiz, justiziell]
kältebeständig
kärtchen [Kärtchen, -kärtchen, Gärtchen, Bärtchen, kärglichen]
känguru [Känguru, -känguru]
kaktusgewächs [Kaktusgewächs, -kaktusgewächs, ausgewechselt]
kalligrafie [Kalligrafie, -kalligrafie, kalligrafiere, kalligrafische, kalligrafisch]
kamel [Kamel, kamel-, -kamel, kamen, rammel]
kampagnendirektor [Kampagnendirektor, -kampagnendirektor, kampagnenartig]
kapazitär
kapitalist [Kapitalist, -kapitalist, kapital ist, kapital-ist, kapitalistisch, kapitalisierst, kapitalisiert, kapitalstark]
karamell [Karamell, karamell-, -karamell, lamellar]
kardieren
karpfen [Karpfen, -karpfen, krampfen]
katalogdaten [Katalogdaten, -katalogdaten, katalogartigen]
lyzeum [Lyzeum, -lyzeum]
mahagonirot
makkaroni [Makkaroni, -makkaroni, marokkanisch]
malerausbildung [Malerausbildung, -malerausbildung, ausbildungsreif]
management [Management, -management, managen, gemanagt, angemahnt]
mangel
maniküre
manneskraft [Manneskraft, -manneskraft, maskenhaft]
mansarde [Mansarde, -mansarde, ansparende]
mark [Mark, -mark, merk, park, Sark, Park, Bark, markig]
marketingpraktiker [Marketingpraktiker, -marketingpraktiker, marketingorientiert, marketingwirksamer]
maschinell
massage [Massage, massage-, -massage, massige, Passage, Gassage, passagere]
massengutschifffahrt [Massengutschifffahrt, -massengutschifffahrt, maschinenschriftlich]
materie [Materie, -materie, materiell, materiefrei, maturiere, mattier]
medaille [Medaille, -medaille, medaillenlos]
medizinalshampoo [Medizinalshampoo, -medizinalshampoo, sozialmedizinisch]
meeresfrüchte [Meeresfrüchte, -meeresfrüchte, Heeresfrüchte, meeresfeuchte, meeresfeucht, früchtereiche, früchtereich]
quotient [Quotient, -quotient, quotiert, quotieren, quotiere, quotisieren]
salonwagen [Salonwagen, -salonwagen, lossagen]
satzeinleitend
trilateral
tristesse [Tristesse, -tristesse, tristeste, trist esse, trist-esse, triste, rissfeste, stresse, rissfest]
tropen [Tropen, tropfen, tropen-, -tropen, trogen, tropenfest]
vereisen
verfahren
verfügungs [verfügungs-, verfügen]
verhindern
verkäufer [Verkäufer, -verkäufer, verkämpfe, verkaufe, verkupfer]
Слова с ошибками []
Anbindungsystem [Anbindungssystem]
Anglistikdocent [Anglistikdozent, Anglistikstudent, Linguistikdozent]
Ecco [Echo, Codec]
Economclass [Economyclass, Economyklasse]
Einverstandnis [Einverständnis, Einverstandanis, Einverstandnils, Einverstandeis, Einverstandnil, Einverstanden, Seinsverständnis, Koranverständnis, Unverständnis]
Electrik [Elektrik, Electrabel]
Historique [Historisiere, Historie]
herüberzurucken [herüberzugucken, herüberzurücken, herüberzulocken, herüberzustrecken, herüberzublicken, herüberzuschicken]
kartofel [kartoniere]
salade [malade, lade]
sanddornbere [versandbereite]

View File

@ -1,211 +0,0 @@
Hallo
Guten Morgen [Morgenläuten, Morgenröten]
Danke
Bitte
Ja
Nein
Entschuldigung
Tschüss
Liebe
Freund
Familie
Glück
Gesundheit
Schule
Arbeit
Essen
Trinken
Wasser
Brot
Käse
Fleisch
Gemüse
Obst
Kaffee
Tee
Milch
Zucker
Salz
Pfeffer
Haus
Wohnung
Bett
Stuhl
Tisch
Sofa
Fernseher
Telefon
Computer
Buch
Zeitung
Schreiben
Lesen
Hören
Sehen
Fühlen
Laufen
Springen
Schwimmen
Tanzen
Singen
Lachen
Weinen
Freude
Trauer
Angst
Mut
Liebe
Hass
Freundschaft
Beziehung
Familie
Eltern
Kinder
Geschwister
Großeltern
Onkel
Tante
Cousin
Cousine
Ehemann
Ehefrau
Verlobung
Hochzeit
Scheidung
Geburt
Tod
Krankheit
Arzt
Krankenhaus
Medikament
Apotheke
Gesundheit
Wohlbefinden
Fitness
Diät
Schlaf
Ruhe
Entspannung
Sport
Fußball
Tennis
Schwimmen
Laufen
Radfahren
Wandern
Reisen
Urlaub
Strand
Sonne
Meer
Komplementär
Perspektive
Konsens
Integrität
Konsequenz
Authentizität
Korrelation
Charakteristik
Akzeptanz
Flexibilität
Assoziation
Dekomposition
Komplexität
Positivismus
Universalität
Stabilität
Individualität
Konsistenz
Konformität
Dezentralisierung
Kollaboration
Partizipation
Präzision
Transformation
Konkurrenz
Paradoxie
Redundanz
Regeneration
Integration
Isolation
Asymmetrie
Aggregation
Disziplin
Resilienz
Relevanz
Konfusion
Komplikation
Koordination
Harmonie
Ineffizienz
Konstruktion
Konversion
Kollusion
Gerontologie
Differenzierung
Dimensionalität
Inferenz
Fluktuation
Kontraktion
Rezession
Inflation
Dekontamination
Exzellenz
Innovation
Isomorphie
Konnotation
Insuffizienz
Konversion
Kompensation
Koalition
Inkongruenz
Inkontinenz
Kontrahent
Konfiskation
Konjunktur
Aggression
Konfrontation
Kompatibilität
Prognose
Akzeleration
Konstruktion
Diversifikation
Prävention
Sanktion
Indikation
Reduktion
Konkurrenz
Konfiguration
Konnotation
Rezession
Transformation
Interaktion
Kooperation
Innovation
Kollision
Proklamation
Konnotation
Konfrontation
Disposition
Konkordanz
Deklamation
Kollaboration
Isolation
Inflation
Diversifikation
Konnotation
Kompensation
Diffusion
Dekadenz
Konserve
Deklomotion [Deklamation, Deklination, Deletionsklon]
Kolaboration [Kollaboration, Kollaborativ, Elaboration, Korporation, Inkorporation]
Isollation [Isolation, Installation, Kollation, Solmisation, Spallation]
Infllation [Inflation, Inflationär, Inflammation, Inflationiere, Installation]
Divirsifikation [Diversifikation, Ossifikation, Kodifikation, Ratifikation]
Konotation [Konnotation, Korotation, Kinotation, Kontotation, Ökonotation, Konnotativ, Annotation, Notation, Konfrontation]
Kompenssation [Kompensation]
Difusion [Diffusion, Gasdiffusion, Infusion, Diskussion, Fusion]
Dekadens [Dekaden, Dekadenz, Dekadent, Dekade, Dekans, Dekagons, Dekkans]
Kanzerve [Verwanze]

View File

@ -1,123 +0,0 @@
Αβαντάζ
Αβασταγά
Αβγάτισες
αβέβαιο
αβέλτερο
αβέλτεροι
αβίαστους
άβλαβοι
αβοκάντο
αβράδιαστης
άβραστη
αβράχυντου
άβρεχτα
αβρή
αβρότης
άβυσσον
αγαθόν
αγαθούς
αγάλακτο
αγγούρι
αγελαδινού
αγέρα
αγεωμέτρητων
αγίνωτοι
άγκυρες
αγορεύσεις
αγόρευσή
αγορίνα
Αγοριού
Αγροληψία
Αρμόνια
βγαίνοντας
βεβαιώσεων
διάθεση
διαίρεση
Διαιρέσου
Διαιτολογίου
διαψεύσουν
διδασκάλισσας
ενασκήσεις
ενασχόληση
ενασχόλησή
ενδείξεις
ενδεχόμενον
ενδιαμέσου
Επιστήθιες
Επιστημο [Επιστημοσύνη]
Επιστολές
Επιστολή
εύπορους
ευρέα
ευρημάτων
ευρύτητά
ευσταθών
εύστροφα
ευσυνειδησία
εύτακτε
ευτελείς
ευτελίζουν
ιδρυτικό
ιεροψάλτες
Ιζόλα
Ιθαγένειάς
ικανότατος
ιλαρότης
κεφαλής
κεφαλιάτικες
κεφαλωτές
κήπε
κήπευση
Κήρυξής
Λεξικογραφιών
Λεξιλογικός
λεοντή
λεοντής
ολιγοχρόνιου
ολικέ
ολικές
ολική
πελαγώνω
πελατών
πελάων
προστατεύει
προστασίας
σούρουπου
σουρούπωμα
σούρτης
Σούρωνα
Σπαγέτα
Σφάλμα
Σφάλματά
σφικτά
σφικτέ
σφοδρότητας
σφοδρού
σφραγίσω
σχεδιάζουμε
σχεδιάζουν
σχηματίσου
σχηματίσουμε
σχολιάζεσαι
Σχολιάζεστε
Ενδιαφέροντα
Слова с ошибками []
Αβασiλευτου [Αβασίλευτου, Αβασίλευτο, Αβόλευτου]
αγαπούσαv [αγαπούσα, αγαπούσαν, αγαπούσε]
βeβαιωμένοι [βεβαιωμένοι, βεβαιωμένο]
εvασxόλησης [ενασχόλησης]
επιολικέ [επιστολικέ, επιστολικό]
ιδιωτικοποιήσειc [ιδιωτικοποιήσει, ιδιωτικοποιήσεις, ιδιωτικοποιήσετε, ιδιωτικοποιήσεως, ιδιωτικοποιήσεων, ιδιωτικοποιήστε]
λεπταίσθnτη [λεπταίσθητη, λεπταίσθητα, λεπταίσθητε, λεπταίσθητο]
πρoστιμάρισμα [προστιμάρισμα, στιμάρισμα]
σφάλμαtα [σφάλματα, σφάλμα]
προστάτεuε [προστάτευε, προστάτεψε, προστάτευσε, προστάτες, προστάτευα, προστάτευσα]
κεxριμπαριού [κεχριμπαριού, κεχριμπαρένιο]
διαισθnτικότητες [διαισθητικότητες, διαισθητικότητας, διαισθητικότητα, διαισθητικότης, αισθητικότητες]
αγκιστpώσουv [αγκιστρώσουν]
αγαθoεργiας [αγαθοεργίας]
αβεβαιoτητά [αβεβαιότητά, βεβαιότητά]
αγέρεc [αγέρες]
διδαούμε [διδαχθούμε, διδαχτούμε]
εuσταθειώv [ευσταθειών]

View File

@ -1,116 +0,0 @@
Acknowledge
acrophobia
adventurousness
aeronautics
algal
Alligator
allegation
alphabetise
Analogy
appropriable
assembly
attempt
Average
barbecue
bathtub
begun
belongingness
Better
binary
blackberry
boatswain
bow-tie
brambly
bright-eyed
bubble
Calender
cancellous
cantankerousness
carefree
categorized [categorised, categorise, categorisation, category, decorticated, cauterised, avant-grist]
cellular
chaos
cheerfulise
childlike
circumstance
close-mouthed
Cocoa
coherent
co-located
Colours
controversial
cottage
creditworthiness
cut-down
dedicated
deep-freeze
Definitive
Designs
digital
distensible
dollar
dyslexia
Egyptian
effectively
etiquette
excess
exotica
fairly
feedback
features
figure's
fjord
forty-seven
government
haematomata
helpless
homologous
implant
Indemnify
inexpert
interior
localises
loquaciousness
maelstrom
mechanizable
melodious
mezzo-soprano
mozzie
municipalisation
mystifier
Neoclassicism
newsletter
non-professional
officiation
orientalisation
palaeoanthropography
parrot
pickpocket
pioneer
cryptanalytic
simplifying
sommelier
spicy
steward
subcontinental
swimwear
Technical
trajectory
wholesomeness
Advantageously
interindustry
red-eye
sub-group
Слова с ошибками []
Acredited [Credited, A credited, Accredited, Accredit, Accreted, Creditable, Discredit, Acridity, Aegritude]
agressive [aggressive, regressive, digressive, progressive, transgressive, aggressor, expressive]
appreciativiness [appreciativeness, appreciatively, appreciative, appreciation, apprehensiveness, operativeness, provocativeness]
aritmetical [arithmetical, arithmetica, arithmetic, hermetical, antithetical, paramedical, grammatical]
biosyntesized [biosynthesized, nonsynthesised, synthesised, amniocenteses, amniocentesis]
lisense [license, senilise, linenise, sensualise, sensise, licence, licensable]
paranoa [paranoia, paranoid, paranormal, paragon, panorama, Paringa, parental]
fotoelectronic [photoelectronic]
semi transparent [semitransparent, transparentise, non-transparent, transparency, semi-permanent, transpiration, superintendence]
synonymus [synonyms, synonymous, synonym's, synonym us, synonym-us, synonym, anonymous, synchronous, synoecious, anonymise, unanimous]
wordprocessing [word-processing]

View File

@ -1,125 +0,0 @@
admire
admittance
aggrandizement
Airmen
Albatross
amateur
angling
apparatus
Architecture
assessment
attempt's
awakening
backgrounder
Balance's
barometric
bashfulness
beautiful
belletristic
blatancy
bonbon
border
Bottom
bountifulness
breakpoints
bulkiness
businesslike
can't
cash
castle
Casual
cauliflower
celebrity
childish
chokecherry
choreographically
chronological
classification
clearheaded
coalesce
Coexistence
collaborative
coloured's
concentration
draconian
drainpipe
demonstrativeness
dependence
dependency
dream
duplication
epidemiological
equitable
Essence
Exemption
exonerate
fainthearted
falsification
ferromagnetic
flammable
fraternization
French
frontier
gadget
galleria
Gallery
gateaux
geocache
ginger
glace
glacier
globalization
hockey
holiday
housemate
intensifier
joystick
Language
leaseholder
non-breakable
northerly
o'clock
oeuvre
openhandedness
oscillation
outface
outlaw
overladen
package
palazzo
panama
Paragraphs
Parliament
particular
pasteurization
pathogen
perception
phenomena
philanthropically
physical
populations
repugnance
request
resplendence
retroactive
rigidity
schedule's
School
scintillation
sensibility
settlement
taxiway
bereft
Слова с ошибками []
acomplishment [accomplishment, accomplish, compliment]
anihilate [annihilate, annihilator, annihilation]
caprise [caprice, cap rise, cap-rise, apprise]
chambre [chamber, chambray]
etnographically [ethnographically, pornographically, photographically, typographically, topographically]
horsmanship [horsemanship, sportsmanship, swordsmanship, marksmanship, showmanship]
innundation [inundation, foundation, annunciation, insinuation, intimidation]
lemongras [lemongrass, lemonades]
omelete [omelette, telemeter]
retorical [rhetorical, oratorical, categorical, theoretical, reportorial]
shepishness [sheepishness, snappishness, waspishness, impishness, foppishness]

View File

@ -1,122 +0,0 @@
Abbreviation
Acceptability
acquirable
Addressee
afterthought
airworthiness
all-powerful
amateurishness
amorphousness
anthology
Auspiciousness
Bibliographer
Bilberry
birthday
bodyguard
broadleaved
brontosaurus
bumptiousness
Cabaret
Californian
calumny
cancellation
cantonal
capitalize
careful
carry-on
casino
clown
co-ordinate
cockleshell
decennial
deckchair
decryption
deep-freeze
Democracy
financial
fish-plate
Flamenco
housing
Hybrid
hydroelectricity
iceboat
ichthyology
idiomatic
ill-humoured
imperatrix
individuality
interocular
intrasectoral
ironwoods
Jolliness
Jurisprudent
knowledgable
kopeks
labour-intensive
laboratory
lake
language
larynx
latching
leakiness
License
licensed
licensee
life-threatening
linguistics
long-lived
machinable
mainsheet
Major
malleability
man-hour
Mango
ninety-five
nobody
non-blocking
non-judicial
nonconforming
north-Western
nutritiousness
quasi-synchronous
question
racoon [raccoon, racoon's, contra]
radish
Railway
Rarity
saucer
Save
Saying
supplely
tallish
target
Taxi
teach-in
technician
ultramodern
umbrae
uncertainness
unconstitutionality
washing
wasn't
waxen
weather
well-formed
what's-his-name
whereupon
Wi-Fi
Wikipedia
Слова с ошибками []
Abstractnes [Abstractness, Abstractedness, Abstracter, Abstraction, Abstracted]
advantageusness [advantageousness, advantageous]
arhythmical [rhythmical, arrhythmical, a rhythmical, arrhythmic, arrhythmia]
autosuggestibility [auto-suggestibility]
kaptor [captor]
coldshouldering [cold-shouldering]
humaneneses [humaneness, humanenesses, humannesses, humanness, humanises, humblenesses]
imaginativness [imaginativeness, imaginative, imaginableness, imitativeness]
knight-erantry [knight-errantry, straight-eight]
magasine [magazine, magnesia, imagine]
night-wachman [night-watchman, nightmarish]
qualifidly [qualifiedly, qualified, squalidly]

View File

@ -1,218 +0,0 @@
apple
banana
cat
dog
egg
fish
gold
house
ice
juice
kite
lion
mouse
night
orange
pencil
queen
rabbit
sun
tea
umbrella
vase
watch
xylophone
yellow
zebra
arrow
book
cake
car
day
elephant
flower
hat
island
jelly
king
lamp
moon
nose
owl
pink
quilt
radio
sunflower
tree
unicorn
violin
water
xylophone
yellow
zoo
apple juice [applesauce]
blue
calculator
desk
elephant
fire
goat
hat
ice cream [creamer]
jacket
key
lemon
map
notebook
owl
pear
quilt
rose
soccer
table
umbrella
vegetable
whale
xylophone
yellow
zebra
apple pie [pineapple]
beach
computer
drum
elephant
goat cheese [headcheese]
hat
ice skate [cheapskate]
juice box [jukebox]
kite festival [quite festival]
lemonade
mountain
notebook paper []
orange juice [orangeade]
pizza
queen bee [quin bee, queen bi, keen bee, ween bee]
rainbow
snow
turtle
umbrella hat [umbrella]
valley
Aberration
Absolution
Acquiesce
Adumbrate
Aesthete
Altruistic
Ambivalent
Anomalous
Antediluvian
Antipathy
Aphorism
Apocryphal
Apostasy
Apparition
Arduous
Assiduous
Audacious
Austere
Autonomy
Avaricious
Axiomatic
Baleful
Bellicose
Belligerent
Bereft
Bilious
Bombastic
Cacophony
Capricious
Cartography
Castigate
Clandestine
Coalesce
Cogent
Cognizant
Colloquy
Concomitant
Confabulate
Congenial
Conundrum
Copious
Corpulent
Coven
Credulous
Culpable
Dearth
Debilitate
Deleterious
Denigrate
Despondent
Diatribe
Dilapidated
Disparage
Dissemble
Dissonance
Duplicity
Ebullient
Egregious
Ephemeral
Equanimity
Esoteric
Euphemism
Evanescent
Exacerbate
Exhort
Expatriate
Extol
Facetious
Fatuous
Feckless
Felicitous
Feral
Fervent
Fetter
Flummox
Fractious
Garrulous
Hegemony
Iconoclast
Idiosyncrasy
Ignominious
Impecunious
Ineffable
Inexorable
Inscrutable
Insidious
Intrepid
Intransigent
Invective
Irascible
Juxtapose
Kowtow
Languid
Lassitude
Lurid
Malinger
Maudlin
Mawkish
Mendacious
Metaphysical
Antransigent [Intransigent, Intransigence, Transient, Intransitive, Transcendent]
Inwective [Infective, Invective, Ineffective, Instinctive, Inactive]
Iracible [Irascible, Acquirable]
Juxtopose [Juxtapose, Juxtaposition]
Kovtow [Kowtow, Kowloon]
Langued [Languid, Languished]
Lasitude [Lassitude, Latitude]
Larid [Arid, L arid, La rid, La-rid, Laird, Lard, Laid, Lurid]
Mallinger [Malinger, Salinger, Lingering, Lingerer, Germinal]
Haudlin [Maudlin, Handling]
Mavkish [Mawkish, Mavis]
Mendocious [Mendacious, Mendocino]
Mitaphysical [Metaphysical, Physicality, Physical]
timeline [time line, time-line, timberline]
rollout [roll out, roll-out, rollover]
workshopped [work shopped, work-shopped, works hopped, works-hopped, workshop]
deliverables [deliverable, deliverable s, deliverers, deliberative, desirable]

View File

@ -1,114 +0,0 @@
Acceptably
Achievement
administrate
all-day
amount
average
bilayer
blasé
boutique
breezy
byers
cabdriver
carefree
categorised
Chameleon
cheerful
chronology
cliché
cooling-off
courage
crudités
decorates
dooryard
débâcle
electromotive
equalled
Exotica
fellow-traveller
forests
full-timer
graded
habitué
haven't
hide-and-seek
home-building
interaxial
kingdom
largeness
long-distance
Majority
manoeuvre
Matrix
metier
mightn't
multidisciplinary
night-time
officio
old-style
organize
overaggressive
packing
parenthesis
pince-nez
Plaint
play-act
policy-making
Preheat
prohibit
puzzle
queue
quite
re-enact
reason
ready-made
renewal
resize
rooihout
scampi
schoolteacher
sea-green
shop-boy
sidebar
skyscraper
soundless
spelling
stakeout
synchronizing
take-off
Thereof
Trademark
transportable
treatment
tweeness
under-age
unmake
Variate
Visitant
volume
webmaster
well-prepared
window
yesteryear
first-aid
Hydrant
inconstant
network
northernmost
nowhere
souvenir
telecommunicate
Слова с ошибками []
afordable [fordable, affordable, a fordable, formidable, recordable, foreseeable, adorable, avoidable, avoidably]
anthropologie [anthropology, anthropologies]
bagage [baggage, bag age, bag-age, Babbage, garbage, bagged, bagel, bakgat, ribcage]
comparatif [comparative, comparator, compatriot, comparable, comparability, comparably]
flammeble [flammable, flamelike, lamentable, blameless, flamed, flammability, flamboyance]
indivizible [indivisible, individualize, indiscernible, divisible, invincible, indefeasible, inadvisability]
jetlag [jet-lag]
lettrebox [letterbox, treble, storybook, legislature]
panoramma [panorama, Panorama, panoramic, paranormal, Panamanian, pentagram, paramagnet]
posessor [possessor, possess, assessor, processor, professor, poses, posses]
selfdoubt [self-doubt]
abandonner [abandoner, abandon, bandoleer, Ndondondwane, Bannerman, abundance, abundant]

View File

@ -1,208 +0,0 @@
nosotros
vosotros
ellos
ellas
aquí
allí
ahora
antes
después
siempre
nunca
también
solamente
verdad
mentira
bien
mal
grande
pequeño
rápido
lento
nuevo
viejo
bueno
malo
feliz
triste
bonito
feo
caliente
frío
dulce
amargo
fuerte
débil
cerca
lejos
fácil
difícil
cierto
falso
caro
barato
limpio
sucio
fuerte
débil
alto
bajo
claro
oscuro
abierto
cerrado
joven
viejo
corto
largo
alegre
tranquilo
nervioso
amable
grosero
conocido
desconocido
cortés
rudo
agradable
desagradable
sabroso
insípido
difícil
fácil
cansado
descansado
moderno
antiguo
último
primero
posible
imposible
rápido
lento
sencillo
complicado
propio
ajeno
abierto
cerrado
amable
desagradable
seguro
inseguro
correcto
incorrecto
dulce
amargo
Anacoreta
Sobrentender
Embriaguez
Inquebrantable
Empedernido
Derramamiento
Despotricar
Escafandra
Aletargamiento
Estancamiento
Descarado
Exégesis [Génesis]
Contrariedad
Espeluznante
Conspiración
Impedimenta
Deglutir
Engreído
Enmascarado
Exterminio
Embelesar
Permutación [Permutan]
Desesperanza
Impenetrable
Enarbolamiento [Enarbola miento, Enarbola-miento, Enrollamiento, Arrollamiento, Encarcelamiento, Eslabonamiento]
Errabundo
Deslinde
Inefable
Soliviantar
Embriaguez
Perdurable
Opulencia
Trémulo
Desembolso
Empedernido
Anquilosar
Enigmático
Inquebrantable
Contrincante
Desmesurado
Vanagloriar
Exasperar
Desvanecer
Perpetuidad
Desbaratar
Ineficaz
Zozobra
Elucubración
Ineludible
Desgarramiento
Atestiguar
Encascarar [Encascara, Encascaran, Encascaras, Enmascarar, Encascar, Encascar ar, Encascar-ar, Encascabelar, Encascotar, Enmascaran, Enmascara]
Desembozar
Irreverente
Soslayar
Despiadado
Embaucar
Moflete
Endilgar
Desfalco
Embelesamiento
Desestimar
Enajenación
Desavenencia
Inexorable
Atolladero
Egrégoro [Negror]
Desafiar
Afable
Enervar
Belicoso
Enervar
Descacharrante
Entramado
Inigualable
Perplejidad
Descabellado
Diligencia
Enaltecimiento
Desvergonzado
Arrebato
Empatía [Empata, Empate]
Endiosar
Peripecia
Desidia
Subversión
Desfachatado
Desfalco
Desvirtuar
Errático
Desahuciar
Envilecimiento
Empecinado
Estolidez
Despropósito
Engatusar
Culminante
Sobrentender
Enseñorear
Desacato
segguro [seguro, seg guro, seg-guro, seguiros, segur]
insseguro [inseguro, insegura]
correcto
incarrecto [incorrecto, insurrecto]
dalce [salce, dale, alce, dance, calce, dalle, dulce, d alce, cendal, cebadal, celda]
amergo [amero, mergo, amargo, amelgo, a mergo, amorgone]
Anasoreta [Anacoreta, Masoreta, Trasfretana, Asotanas, Asotanara]
Sobrententter [Sobrestante, Soberanamente, Sobriamente, Soberbiamente]
Embreagues [Embregues, Embragues, Embriagues, Embriaguemos, Embragares, Embrague, Embriague]
Inquebranttable [Inquebrantable, Quebrantable, Infranqueable, Intransitable]
Empidernedo [Empedernido, Empedernecer, Empedernir]

View File

@ -1,132 +0,0 @@
Abantza
ñabar
abasto
abegikortasun
aberaskeria
aberetzar
abezedario
abialdi
Abiatzaile
abizari
Aboli
abonatu
absenta
absolutibo
accelerando
adabegitsu
adberbio
adiaka
adierazle
adierazkizun
adikuntza
adin
adinaro
adineratu
adin-txikitasun
administratzaile
adoleszentzia
adopzio
adostu
aerolabangailu
Aeroplano
afalordu
agente
agertezin
agiantza
agoran
arradatze
arrakasta
Batata
baterakuntza
baterakor
Bateri
batuar
baud-abiadura
batzuenganako
batzuengandik
batzuengan
batzuengatik
batzuen
baxera
berezi
berezikeria
beritzete
beroa
Beroate
beroatza
berorri
berrabiatu
berra
berresgarri
berripaper
chap
dabilzkidake
dabilzkie
dagitza
dagokik
dagozkieke
erdiondu
galdera
galtzada
garaitiar
garantia
Garaztaketa
garbitasun
gastronomiko
Gaurgero
gaurgoitik
legizkie
legokizue
legozkidake
lehenbizi
nindoakio
publikotasun
publizitate
subsidiario
substantibo
sugestio
superbalorazio
taidun
taldeburu
Talent
Teknografia
xantxa
xerbitor
xerokopia
zabaldura
Zabalkor
Zabaltza
zabilzkieken
zabilzkio
zaharkote
zeneritzeketen
zenerra
zenezagu
zengozkigute
zeniharduke
zenioke
zenioketez
zeniraute
zenizkien
zenizkiguke
Zintut
Zintuzkedan
isiltasun
Слова с ошибками []
abriсot [abrikot, abrigo]
absenzia [absentzia]
addikzio [adikzio, dikzio, adukzio, adizio]
administraziozerbizu [administrazio-zerbitzu, administrazio-zuzenbide, administraziopean]
bat-bates [bat-batez]
bermagari [bermagarri, bermagailuari, bermagailuri, armagaberi, bermaguneari]
cataluniar [kataluniar, catalunyar, kataluniera]
dakarza [dakartza, dakarna, dakarzu]
erdemin [erremin, erdimin, iminerdi]
garatienetarikoa [garatuenetarikoa, ugarienetarikoa, gogoratuenetarikoa, argienetarikoa, aberatsenetarikoa]
ishil [isil, istil]
nindezaguane [nindezaguena, nindezaguan, nindezaguanez, nindezaguanek, nindezaguanen, nindezaguanei, nindezaguana, nindezagunan, nindezagutean, nindezagutenan, nindezaguzue]
nintzainaken [nintzainanek, nintzainake, nintzainakeen, nintzainanen, nintzaiakeenen, nintzaiakeen, nintzakenanen, nintzaiekenan]
summa [suma, susma, sumoa]
technologiko [teknologikoko, teknologiko, terminologiko, etnologikoko]
charmant [charmat, xarmant]

View File

@ -1,211 +0,0 @@
Bonjour
Merci
Oui
Non
S'il
Excusez-moi
Pardon
Bien
Mal
Grosse
Petit
Beau
Moche
Fort
Faible
Chaud
Froid
Vite
Lent
Haut
Bas
Loin
Près
Heureux
Triste
Facile
Difficile
Simple
Compliqué
Bon
Mauvais
Nouveau
Vieux
Jeune
Âgé
Bienvenue
Amitié
Amour
Famille
Travail
Maison
Voiture
Manger
Boire
Courir
Marcher
Nager
Chanter
Dormir
Jouer
Parler
Écouter
Regarder
Lire
Écrire
Acheter
Vendre
Aller
Venir
Faire
Dire
Voir
Savoir
Apprendre
Aimer
Détester
Partir
Rester
Arriver
Revenir
Partager
Aider
Aimer
Ouvrir
Fermer
Manger
Boire
Avoir
Être
Pouvoir
Vouloir
Devoir
Parler
Écouter
Rire
Pleurer
Danse
Étudier
Travailler
Voyager
Vivre
Connaître
Reconnaître
Voyager
Exister
Choisir
Donner
Recevoir
Aimer
Oser
Phénoménologie
Électroencéphalographie
Parallélépipède
Anticonstitutionnellement
Transsubstantiation
Éclectisme
Anachronisme
Catéchuménat
Démagogie
Fructueux
Ineffable
Hypothèque
Propriété
Procrastination
Complaisance
Réminiscence
Éthique
Équinoxe
Exponentiel
Hétérogénéité
Imbroglio
Incorrigible
Maelström
Métaphysique
Protagoniste
Subliminal
Verrouillage
Volumétrique
Énigmatique
Époustouflant
Immatériel
Infini
Polyglotte
Recrudescence
Prophylactique
Symbiotique
Vestibulaire
Épistémologie
Faramineux
Géopolitique
Hypnotique
Inamovible
Intemporel
Labyrinthe
Pacifiste
Quémandeur
Soporifique
Ubuesque
Volumineux
Effervescence
Électrophorèse
Paradoxe
Prorata
Quadrupède
Sarcophage
Trigonométrie
Vaccinologie [Carcinologie, Actinologie, Vaccinogène, Accidentologie]
Xenophobe [Xénophobe, Technophobe]
Zéphyr
Génétique
Labyrintique [Labyrinthique]
Mégalo
Nostalgie
Omniprésent
Pangramme
Périlleux
Quinquennat
Rémunération
Scolopendre
Tautologique
Utopiste
Vexatoire
Wolof
Xanthine
Yacht
Zanzibar
Axiomatique
Chronométrer
Dilettante
Énervement
Facétieux
Générique
Harmonique
Illusoire
Juridique
Kabbaliste
Longetivité [Longévité]
Médiane
Néologisme
Oxygène
Patronymique
Quotidien
Rétorique [Rétorque, Rhétorique, Rotorique, Ré torique, Ré-torique, Météorique, Torique, Théorétique, Théorique]
Sémantique
Tautologie
Utopique
Vaccinologie [Carcinologie, Actinologie, Vaccinogène, Accidentologie]
Xénophobie
Yachting
Zoroastrisme
Voager [Viager, Voyager, Ouvrager]
Exisster [Exister]
Chaiser [Chaires, Chaise, Chaisier, Chaises, Chasser, Chaise r, Chamoiser, Tchadiser]
Doner [Toner, Zoner, Donner, Drone, Doser, Doter, Dorer, Douer, Doler, Doper, Dîner]
Resevoir [Redevoir, Recevoir, Revoir, Reversoir, Ivoire, Voire]
Aimmer [Aimer]
Osero [Oser, Osera, Oser o, Rosser, Roeser, Rose]
Phénoménollogie [Phénoménologie]
Électraencéphallographie []
Parallélépepède [Parallélépipède]

View File

@ -1,120 +0,0 @@
ola
tipo
Si
non
nonnr [nono]
comida
comidaa [comídaa, comidas, comida, comidan]
auga
augaa [áugaa, augas, auga, augaba, augada, augala, augara, augar]
casa
coche
cochee [coches, coche, chochee, cachee, checo]
un tren [oin tren]
bicicleta
escola
escolaa [escóraa, escoala, escolas, escola, escálaa, escolla, escolma, escolar, escolta]
niños
pai
paii [paio, pai, pii, aii, pali, pais]
nai
naii [nai, nii, aii, naif, nais, nazi]
irmá
irmán
cachorro
gato
gatoo [gato, atoo, gateo, gatos]
peixe
peixee [peidee, peixes, peixe, peitee]
aves
avess [aveas, avesa, aves, avesas, avesos, vesas, aveso, aveces, escave]
árbore
flor
herba
o sol [ou sol]
lúa
o ceo [ou ceo, o ceou]
chuvia
neve
vexa
inverno
primavera
outono
noite
noite
día
unha semana [semanalmente]
mes
ano
para ler [parable]
escribir
fala
ensinar
traballo
durmir
durmir
correr
vai
senta
estado
para escoitar [parasitario]
vexa
escoita
hai
beber
carne
furtas
verduras
queixo
pan
auga
zume
café
leite
aceite
ovo
sal
impacienta
azucre
un bocadillo [oin bocadillo]
cociña
sala de estar [sala dei estar]
dormitorio
baño
batela
sofá
lámpada
fiestra
a porta [aporta, portara, portador, porta]
piso
teito
parede
sofá
alfombra
baño
afundir
espello
toalla
cama
manta
almofada
reloxo de alarma [riloxo de alarma, ríloxo de alarma, reiloxo de alarma, reloxo dei alarma, relouxo de alarma, reloxou de alarma, relollo de alarma]
escritorio
cadeira
marabilloso
adverbio
obviamente
Dominante
residenciais
convidado
perigo
cuestión
deporte
mina
cordeiro
cabeza
tratar
avogado
intelixente
guapo

View File

@ -1,215 +0,0 @@
boliestan [bolestan, obijestan]
jyak [jak]
slaby [slabu, slab, slaba, slabe, slabi, slabo]
pameetan [pametan, pametna, napamet]
gllup [glup]
bezuspješhno [bezuspješno, bezuspješnih, bezuspješan, bezuspješna]
besimeni [besi meni, besi-meni, bezimeni, besanim]
bezuzban [bezuman, bezuba]
blagastanje [blagostanje, blaga stanje, blaga-stanje, blagostanja, blistanje, oblaganje]
bljeskovica [bljeskovima, bljeskovi, bljeskova, bljeskalica, bljeskavi]
jabuka
sunce
voda
kuća
ptica
kava
kruh
cvijet
knjiga
pas
mačka
grad
zelen
plav
crven
bijel
crn
velik
malen
brz
spor
sretan
tužan
vruć
hladan
nov
star
lijep
ružan
dobar
loš
zdrav
bolestan
jak
slab
pametan
glup
raditi
jesti
piti
spavati
čitati
pisati
govoriti
smijati se [smijati]
plakati
pjevati
igrati
plesati
učiti se [učiti]
kupovati
kuhati
telefonirati
gledati
slušati
hodati
trčati
letjeti
plivati
čitati
pisati
raditi
imati
biti
ići
doći
otići
dati
uzeti
reći
vidjeti
čuti
osjetiti
misliti
htjeti
moći
morati
rado
nerado
da
ne
molim
hvala
doviđenja
oprosti
zbogom
zdravo
čau [ča, ču, čađu, čaju, čamu, času, čađ, čaj, čak, čar, čas, ča u]
ej
da
baš
super
glupost
fantastično
jasno
tako
zapravo
možda
lako
teško
prozračnost
usplahirenost
neoblomivost [neslomivom]
prezir
proigranost [prostranost, programiranosti, razigranosti, pristranost]
uznemirenost
besprijekornost
besprizornost [besprizornom, besprizornoj, besprijekornost, besprizorni]
nepredvidivost
beznadnost
promašenost [promašenosti, promašen, osiromašenom, raspršenost]
protivljenje
neizreciv
bezizlaznost
neuspjelost [neuspjeloj, neuspješnost, neuspjelog, neuspjelom]
zbunjenost
neodlučnost
protivština
nepovratnost [nepovratnoj, nepovratnom, nepovratna, nepovratnima]
bezduhovitost [bez duhovitost, bez-duhovitost, duhovitostu, duhovitosti, duhovitosta, duhovitost]
ravnodušnost
prolaznost
neobaveznost [neobaveznosti, neobaveznom, neobaveznoj, neobavezna, neobavezni]
bezbrižnost
nepovratnost [nepovratnoj, nepovratnom, nepovratna, nepovratnima]
promašenost [promašenosti, promašen, osiromašenom, raspršenost]
neprepoznatljivost [neprepoznatljivosti, ne prepoznatljivost, ne-prepoznatljivost, prepoznatljivosti, prepoznatljivost, neprepoznatljiva, neraspoznatljivosti]
neukrotivost [neukrotivog, neukrotiv, neučtivost, neotuđivosti]
bezobzirnost
nevinost
nestalnost
nepostojanost
bezizlaznost
nepovratnost [nepovratnoj, nepovratnom, nepovratna, nepovratnima]
prolaznost
neodgovornost
bezbrižnost
nevolja
nezadovoljstvo
prolaznost
bezuspješno
bezimeni
bezuzdan [bez uzdan, bez-uzdan, bezdan, bezdušan, beznadan]
blagostanje
bljeskavica [bljeskalica, bljeskavima, bljeska vica, bljeska-vica, bljeskavi, bljeskalici, bljeskava, bljeskalicu]
boren [borne, obrne, bore, oboren, borbena]
carovnija [otrovnija, darovnica]
crpeža [crteža]
dostojanstvo
duhovitost
egzaltacija
gorkoća [gorkoga, gorkošću]
histerija
idila
ironija
izdaja
janjetina
kajanje
kavana
krhotina
ljepljivost
lukavstvo
magnutizam [zategnutima, zamahnutima, izdignutima, vagnutima]
melankolija
misticizam
naivnost
nelagoda
neraspoloženje
obmana
okrutnost
opojenost [opojnost, obojenost, opojenoj, popunjenost, podvojenost, opčinjenost]
prezir
propast
ravnodušnost
sjenka
skitnica
spletka
stid
sudbina
susret
sudbina
šapat
tišina
trepet
utopija
uzaludnost
veličanstvo
zaborav
zanesenost
zanos
zavjera
zbunjenost
zluradost [zluradosti, zlu radost, zlu-radost, zlurad]
zloslutnost [zloslutnoj, zloslutnom, zloslutnu, zloslutna]
žargon
žártva [žrtva]
šaptanje
čarobnost
dileme
hodočasće [hodočaste, hodočašće]
lebdjeti
iznimka
preobilje [preobilne, preoblikuje]
probuditi se [probuditi]
surov

View File

@ -1,114 +0,0 @@
Szorzótábla
Réges-régen
normálméret
nemeslelkűség
mindegyik
milliós
Mikroflóra
Mezőgazdaságigép
meséskönyv
mennyiség
Memória
kártya
kuráre
Kurzor
jégkorong
jellemesség
Javak
irányzás
iromány
Inkluzíve
hűtőedény
hőmérséklet
hír
hétszázas
hátrány
háromszáz
Hintó
generátor
gavallérság
explozíva
eső
esdeklés
epilógus
Energia
Előélet
előterjesztés
előnézet
elvonás
elszigetelés
ellátmány
Elevátor
egynémelykor
egyenlőség
eddzenek
dzsungel
ananász
akvárium
Szépül
Sztorizik
szobroz
szimbolizál
szemlélődik
sugdolózik
majmol
Macskáz
Létesít
Lokalizálódik
litografál
levelesedik
lepet
közömbösít
kételkedik
kivirágoz
kerekez
kedvez
járkál
jegyzőkönyvez
iskolázik
individualizál
csendesít
borsoz
billentet
bajmolódik
anyagozik
alkonyodik
Aktualizál
színes
szemelt
lassú
hatékony
hasznos
gyúlékony
gyári
abszurd
örökjog
öregkor
ömlő
Zászlaj [Zászlajú, Zászlaja, Zászlai, Zászlóalj]
Zseblámpa
regényirodalom
realitás
raktárhelyiség
pötty
pótlék
pótdíj
pályafutás
Promóció
Processzus
poloska
pernye
pediáter
parancsnoklás
Слова с ошибками []
sponzorálás [szponzorálás, szponzorál, zongorálás]
mihamarábiak [mihamarábbiak, mihamarabbiak, mihamarábbi, hamarábbiak, mihamarább]
idohatár [időhatár]
hypnotizmus [hipnotizmus, nepotizmus]
departement [département]
légiesul [légiesül, légiósul]
kutagat [kutatgat, kutazgat, kutasat, kutakat, kutadat, kutamat, kútagát, kútágat, kútágát, kutat]
költségtakkarékos [költségtakarékos, költségtakarékkos, költséghatékony]
redukzió [redukció, redukáló]
pilanatfelvétel [pillanatfelvétel, pialantfelvétel, adatfelvétel]

View File

@ -1,121 +0,0 @@
acang-acang
Adiksi
Adventisius
Advokat
afirmatif
agroindustry [agroindustri, nonindustri]
agrisilvikultur
akhir-akhir
akomodatif
aksi
aljabar
anggul
anotasi
antusiasme
apoteker
bahagia
bakat
bangkang
Bankir
Barikade
bebaru
belar
beleid
bencana
bentangur
beritawan
besuk
bilingualisme
Cecak
Celempong
cencawan
cengkar
ceremai
cermin
cudang
Dampal
dampan
dansa
datung
debitur
defensi
defisit
demper
dendang
Derivasi
Desember
deskripsi
diskotek
diskusi
distansi
dragon
dramatisasi
Eksamen
Eksistensi
eksperimen
ekstensifikasi
ekuitas
elektron
gelut
Geofisikawan
Gerbang
gerempang
influenza
Informasi
Inisiator
insekta
institusional
instruksional
jelajah
Kamrad
Kapilaritas
kapster
kardiovaskular
karismatik
keranjingan
komunal
Limitatif
Linguistik
lintang
masabodoh [masa bodoh, masa-bodoh, mastodon]
matematikus
medisinal
Melankolia
Memorabilia
nasional
nasionisme
Panen
pangkek
peranti
perian
persekusi
perunjung
regenerasi
reglementer
robotika
runjang
Sabtu
Simbang
simpati
tebing
topi
Unggal
unsuri
urbanisasi
variabel
wahana
warganegara [warga negara, warga-negara, negarawan, antarnegara, mancanegara, waranggana]
Слова с ошибками []
Abonement [Abonemen, Bombardemen]
Abcente [Absente, Centet]
ambivalan [ambivalen, ambilan, ambalan]
bakteriostatic [bakteriostatik, bakteriolisis]
cekaw [cekat, cekak, cekau, cekam, cekal, cekah, kacek]
darmavisata [darmawisata, darmatirta, mandataris]
declarasi [deklarasi, deflagrasi]
duplex [dupleks]
ecozona [ekozona, eco zona, eco-zona]
gempur-mengempur [gempur-menggempur, gempul-gempul]
jejengok [jejengkok, jengkeng]
transitive [transitif, transvetisme, transit, transisi]

View File

@ -1,200 +0,0 @@
Ciao
Ciaoo [Ciao, Ciano, Ciao o, Ciocia]
Buongiorno
Buonasera
Buonassera [Buonasera, Buon assera, Buon-assera, Buonalbergo]
Grazie
Prego
Arrivederci
Buonanotte
Scusa
Per favore [Favorevole]
Amore
Amico
Famiglia
Casa
Città
Strada
Montagna
Montaga [Montagna, Montata, Montana, Montala, Montava, Montaggi, Montaguto, Montano, Montato]
Mare
Sole
Luna
Stelle
Giorno
Notte
Colazione
Clazione [Colazione, Coazione, Cl azione, Cl-azione, Clonazione, Collazione, Clorazione, Chelazione]
Pranzo
Cena
Acqua
Vino
Caffè
Pane
Formaggio
Pasta
Pizza
Gelato
Dolce
Salato
Frutta
Verdura
Carne
Pesce
Pollo
Uovo
Sale
Pepe
Olio
Burro
Zucchero
Latte
Yogurt
Insalata
Zuppa
Bistecca
Prosciutto
Parmigiano
Biscotti
Cioccolato
Spagggrhetti [Spaghetti, Spaghetteria]
Spaghetti
Lasagne
Risotto
Gnocchi
Penne
Ravioli
Cannelloni
Pesto
Caprese
Limoncello
Espresso
Cappuccino
Tiramisù
Panna cotta [Panbiscotto]
Cannoli
Panettone
Brioche
Focaccia
Foacdccia [Focaccia]
Crostini
Arancini
Antipasto
Primo piatto [Rimpiattato, Primariato, Rimpiatto, Rimpatriato]
Secondo piatto [Attosecondo]
Contorno
Pane tostato [Tostapane]
Marmellata
Accoglienza
Affascinante
Aggressività
Alleviare
Appassionato
Armonioso
Autonomia
Autovfnomia [Autonomia, Autotomia]
Barbarie
Beneficiare
Bizzarro
Burocrazia
Cambiamento
Capriccioso
Cautela
Commemorare
Comportamento
Conseguenza
Controverso
Coraggioso
Debolezza
Decisivo
Delizioso
Desiderare
Destrezza
Determinato
Determin [Determina, Determini, Determino, Determinò, Termine]
Difficoltà
Disponibilità
Divertimento
Eccentrico
Efficienza
Elettrizzante
Emergere
Empatia
Energia
Equilibrio
Esperienza
Fantastico
Fenomenale
Generosità
Gratitudine
Immaginazione
Impressionante
Impressiante [Impressi ante, Impressi-ante, Impressionante, Impressionate, Imprestante, Impressioniste]
Indipendenza
Ingenuità
Innovazione
Intelligenza
Intensità
Intrigante
Ispirazione
Instabilità
Irresistibile
Leggenda
Libertà
Luminoso
Magistrale
Malinconia
Meraviglioso
Metamorfosi
Miracolo
Misterioso
Nostalgia
Opportunità
Originalità
Passione
Pericoloso
Prestigioso
Prodigioso
Prospettiva
Raffinato
Rafinato [Raffinato, Rapinato, Affinato, Trainato, Raffrenato, Raffilato]
Ricchezza
Rispettoso
Sensibilità
Sorprendente
Spontaneità
Spontaneita [Spontaneità, Spontaneista]
Stravagante
Suggestivo
Surreale
Tenerezza
Trasformazione
Unicità
Vibrante
Vittoria
Volontà
Amicizia
Avventura
Bellezza
Calma
Danza
Eleganza
Felicità
Gioia
Incanto
Magia
Natura
Odore
Passatempo
Quotidiano
Relax
Serenità
Tesoro
Umorismo
Vacanza
Zelo
Avventuriero
Speranza
Risate
Armonia
Incanto

View File

@ -1,209 +0,0 @@
сөз
адам
қала
тау
ауа
су
аспан
жер
бала
ата
ана
тамақ
кітап
ұстаз
оқу
тұтыну
тыныш
тұз
ауру
денсаулық
топ
маусым
төс
көз
жүрек
сарғыш
көп
аз
ертең
түн
түс
жас
қара
ақ
көк
қызыл
шай
салт
ыстық
суық
қазақ
жеті
он
жүз
мың
бір
екі
үш
төрт
бес
алты
жеті
сегіз
тоғыз
он
бақша
бұлақ
қиыр
досым
ақша
патша
таң
кеш
тауар
күн
апат
риза
ауырсыну
орман
жаңбыр
бауыр
жел
тұман
үй
бұлақ
көше
айнала
шайыр
тағам
сусын
топ
бас
әрекет
тіл
кеме
сиыр
қой
ешкі
шөп
ит
тұқым
қарындаш
апа
ана
әке
дала
тарлау
дәуір
таңдай
жыл
басқарушылар
басқарушшылар [басқарушылар, басқарушы, басқармасылар, басқаруғалар, бақылаушыларлар]
жауапкер
ерекшеліктерімендерге
тұмылдырықтатқыздан
білімділігінге
білімдарды
алалықсыздар
айырмашылықтарын
тұрақтандырып
сылтауратқандарыңызды
қолдар
байланысқадан
жетілдірілген
зарарсыздандырады
ескеріп
ескеріпп [ескеріп, ескеріпі, ескеріле]
міндеттемелеріндерге
кезеңдердің
себепсіздік
біреудейлер
беделілерің
кездестіріңіз
шектердің
көңіл
көңл [көң, көл, көңіл, көңі]
мол
алайда
мәселе
мәселеу [мәселе, мәселең, мәселен, мәселес, мәпелеу, мәуелеу, мәселем, мә селеу, селеу]
сендің
келер
келерр [келер, керлер, келері, кереле, еркеле, кермеле, келекеле]
кәне
көпір
күндіз
сана
белгілер
дайын
ез
қайшы
саф
рең
шақ
үміткер
бақыт
бақытт [бақыт, бақытта, бақытты, бақырт, бақыты]
республика
консервациялау
мемлекеттік
тағатсыздан
адамда
бәрі
бең
беңр [бең, бер]
жасағанда
жасағоанда [жасағанда, жасалғанда, жасасқанда, жасаманда, жасақанда]
жабайылық
заманда
көшірдік
мерейі
Мерейій [Мерейі, Мерейің, Мерейім, Мерейлі, Мерей, Мейір]
мөлшерсіздікк [мөлшерсіздік, өлшемсіздік, мөлшерсіз, өлшеусіздік]
мөлшерсіздік
пенді
тылда
мәртебесімен
аппаратпен
тегінді
кездеме
ересектік
көңілсіздік
тәуекелсіздік
қанағатсыздық
ғаділетсіздік
сайдақы
басым
тәжікеден
тұрғын
қонақ
қауіпсіздік
қадірсіздік
білгішсінбейсіңдер
талқандас
кешікті
қоздырғышы
бас
емдейсіңдер
құқылы
тақылет
әдемі
көткеншектейсіңдер
әжет
қайтар
белсену
түсінбеймін
жағымсыздық
сыздар
мәртебесі
тұрғыны
мезгіл
әлбетте
барысын
оқылған
безге
жаса
аламаңдайсыңдар
кереметті
епетейсіздік

View File

@ -1,157 +0,0 @@
안녕하세요
감사합니다
사랑해요
미안합니다
음식
친구
가방
학교
컴퓨터
바다
날씨
노래
치킨
반찬
숙제
가족
아이
게임
영화
생일
시간
동물
여행
쇼핑
추천
대화
전화
사진
운동
병원
음료수
능력
주말
전자기기
고양이
강아지
바나나
가을
겨울
여름
신발
지하철
택시
버스
비행기
샴푸
브러시
삼계탕
국수
불고기
된장
김치
먹다
마시다
보다
듣다
놀다
하다
가다
오다
서다
늦다
일어나다
자다
빨갛다
파랗다
노랗다
녹색
보라색
맛있다
시원하다
덥다
추운
기분
슬프다
즐겁다
정신이
바쁘다
참새
나비
병아리
물고기
향신료
시장
기차
공원
해변
지갑
병원
대학
교통
공항
천재
연구
일본
중국
사업
지식
성격
자금
기술
정부
전략
협력
혁신
경제
철학
신체
영감
현상
역사
태양
설명
사회
환경
자연
현실
존경
정확
장애
낙관
발전
절망
일상
소멸
도전
반복
포기
파괴
혁혹 [현혹, 혈족]
소외 [쇠오, 소아, 시외, 소오, 소에, 소의, 소와, 소요, 소유, 소위, 소야, 소되, 소뇌, 소 외, 소외감]
식민지
혐오
출산
행복
불평
판매
위험
안녕하ㅎ요 [안녕하다]
감사합ㅅ다 [감사하다, 감사하여가다, 감사해가다]
사랑ㄱ해요 [사랑해요, 사랑해내요]
미안ㅎ합니다 [미안합니다, 미안한체합니다, 미안할만합니다, 미안해갑니다, 미안하여갑니다]
친ㅔ구 [친구]
가ㅎ방 [가방, 감방]

View File

@ -1,118 +0,0 @@
Aarbecht
Aarbechtszäitorganisatioun
Aartgenoss
Abenteuer
abrëll [Abrëll, brëll]
absence [Absence]
Abusives
Abzebillercher
Acquéreur
Adjointeë
Affischéiertes
Airbussen
Alldeegleches
Angschtzoustä
Basketballspiller
Baufirme
bauren [Bauren, bauen, brauen]
bekanntes
Beleg
Berodung
Bewältegung
Datentransfer
Dateschutz
Decisives
Donneschden
Drangsaléiertes
Dränk
Giischtgen
Grondlag
grondreegel [Grondreegel, grondleeënd]
Géies
Handelsdag
hausaufgab [Hausaufgab, ausbaufäheg]
hierschtdag [Hierschtdag, hierarchescht]
Häerzi
Industriell
Infrastrukturelles
Interessi
Internetfore
Intervall
Kamell
Kantoner
Karamell
Klenges
Nopeschhaus
Motors
Muer
Muerenter
Musek
Nettoverméige
niess [miess, Niess, iess, giess, Siess, Fiess]
Protektioun
Prouf
Provisioun
Prozessor
Präis
Präsens
Sanitäres
Schauspiller
Schema
Taxatioun
Telefonsgespréich
termingrë [Termingrë, verminnte]
terrass [Terrass, zerrass]
Textdatei
Textsprooch
Titulaire
Titel
erausféieren
erausjoe
gëeicht
onglécklecherweis
unzesammelen
unzespille
Approvisionnement
Сложные слова []
Aktiegesellschaft
Aktivitéitsdéclaratioun
Alarmstëmmung
Allgemengverständleches
Bankenoperatioun
Bensinsreserven
Besteierungsofkommes
Diskriminéierungsmoossnam
Dokumentatiounsaarbecht
Haaptrecommandatioun
Héchstgeschwindegkeet
Héichproblematesches
Hëllefsdéngscht
Integratiounsméisseges
Iwwersetzungsprogramm
Kapitaliséierungsdimensioun
Museksinstrument
Publicitéitsmarché
Transportproblem
Слова с ошибками []
Abonnnement [Abonnement, Joresabonnement, Abonnenti, Abonnent, Agebonnent]
Accomodéiertes [Accommodéiertes, Accommodéiert, Accordéiertes, Accommodéiers]
Agrarcenter [Agrarzenter, Agrozenter]
Begrennung [Begrënnung, Begrenzung, Benennung, Verbrennung, Begrenzen, Trennung]
Berodunszentren [Berodungszentren, Berodungszentre, Berodungszentr, Berodungszenter]
Deeluung [Deelung, Andeelung, Opdeelung, Verdeelung, Zelldeelung]
Dialogue [Dialoge, Dialog]
Dictaten [Diktaten, Dichten]
Inspektor
Iwereileges [Iwwereileges, Iwwereilegtes, Iwwereileg, Iwwerfälleges]
Pedagogik
Televisionschaîn [Televisiounschaîn, Televisiounsgeschäft]
Bechäftegungsméiglechkeet [Beschäftegungsméiglechkeet]
Gläicheetspolitik [Gläichheetspolitik, Sécherheetspolitik, Gesondheetspolitik, Geschäftspolitik, Dechetspolitik]
Musekheichschoul [Musekhéichschoul, Museksschoul]
Satelliten [Satellitten, Satellitte, Satellit]
Addressbichelchen [Adressbichelchen, Reklammbichelchen]
Aarbechtsfield [Aarbechtsfeld, Aarbechtsgefier, Aarbechtsblieder, Aarbechtsatelier, Aarbechtsalldag]

View File

@ -1,127 +0,0 @@
Abstraktus
šachmatai
žadintoja
agurkas
Aikštė
Akinukai
akmuo
šakoti
aktualinti
aktorius
šalinis
šaltinis
bernystė
beskuo
būgnelis
Bilietas
bilingvizmas
daržavietė
Darbadienis
Darbas
darbuotoja
dargi
daržinė
daugintoja
Daugiaveiksmis
delnė
įdelnis
detalizuoti
šerdelė
erdvėti
šeriškas
šeštadienis
etiketas
Evoliucija
fabrikantė
Fantastika
Fenomenas
fikusas
gaudinėti
gausėja
gūbrinti
geležis
geležtė
gelsvis
geranoris
Gertys
gerviukas
giesmininkė
Gikas
Goža
griaustinis
grįžinys
gėrioja
griozdas
grizijo
gryčia
grožėja
grįžti
grupė
gąstauti
Jaukas
jodinėjo
jodyti
keturnagis
Kiaušina
Kiaurymė
kiausta
kietakaktis
ūkiškas
kilimėlis
kilometrinis
ūkininkaitė
ūkinis
krykti
lapuotis
laukas
laupti
laužtė
Maudulys
Maumedis
mažutėlis
mazgotuvė
mechanikė
medeinė
medikamentinis
meduolinis
Nūdien
nebrendėlė
Negu
neiginys
parudenys
pasakotojas
pasausė
pasieninis
paskyriui
paslapčiom
Pasodas
Pat
Pataikūniškas
patarška
patentinis
proskyna
protekiniais
provizoriškas
rėkčioti
rūmas
rodyklinis
Romanistas
Skylmatis
Skyriklis
skolininkas
skraidžioja
skruzdėda
skėtrus
Слова с ошибками []
Abbreviatūra [Abreviatūra, Klaviatūra]
alpinismas [alpinsimas, alpinimas, alpinistas, alpinizmas, alpinistinis, alpinistini, alpinamas, alpinariumas]
amortizacia [amortizacija, amortizacini, amortizavo, amortizuoti]
daugiamžis [daugiaamžis, daugiaamži, daugiamatis, daugiametis, daugiažiedis]
deziderativinis [dezideratyvinis, dezideratyvini, prezidentinis, rezidentinis]
generazija [generacija, energija]
keturiasdešimtūkstantas [keturiasdešimttūkstantas, keturiasdešimttūkstanta, aštuoniasdešimttūkstantas, šešiasdešimttūkstantas, aštuoniasdešimttūkstanta]
krivuluoja [krivuliuoja, kreivuliuoja, kultivuoja]
Šnaukstai [Šnaukštai, Niaukstai, Šniauktai, Šniaukštai, Auksintai]
pazintinis [pažintinis, parazitinis, pantinis, patentinis, panteistinis]
progresa [progresai, progresas, progreso, progrese, progresu, progresą, progresų, progresavo, progresija]

View File

@ -1,205 +0,0 @@
Sveiks
Sveikks [Sveiks, Sveikas, Sveikās, Sveikts, Sveikus, Sveikos, Sveikt, Saveiks, Ieveiks, Veiks]
Labrīt
Lbrīt [Larīt, Lorīt, Labrīt]
Paldies
Paldiess [Paldies, Paliess, Palaidies]
Lūdzu
Luzu [Lizu, Ludzu, Auzu, Zuzu, Guzu, Lauzu, Lupu, Lubu, Lugu, Lūzu, Luču]
Atvainojiet
Atvainvfojiet [Atvaimanājiet]
Prieks
Perieks [Peries, Prieks, Persiks]
Draugs
Dravfugs [Draugs]
Ģimene
Gimene [Ķimene, Ģimene]
Māja
Maja [Maija, Paja, Raja, Laja, Maža, Maka, Mija, Mana, Masa, Māja, Mata, Maša, Maza, Mala]
Pilsēta
Pilseta [Pilsēta, Pil seta, Pil-seta, Piebilsta]
Ceļš
Ceļšs [Ceļš, Ceļošs, Ceļas, Ceļus, Ceļos]
Kalns
Jūra
Sauls [Auls, Kauls, Rauls, Pauls, Salus, Sauks, Sals, Saules, Sakuls, Saulēs, Saguls, Sulas, Salsu, Sauli, Sauss]
Mēness
Zvaigznes
Diena
Nakts
Brokastis
Pusdienas
Vakariņas
Vīns
Kafija
Maize
Siers
Makaroni
Pica
Saldējums
Deserts
Sāļš
Augļi
Dārzeņi
Gaļa
Zivis
Vistas
Ola
Sāls
Pipari
Eļļa
Sviests
Cukurs
Piens
Jogurts
Salāti
Zupa
Salds
Šokolāde
Spageti
Rīsi
Kakao
Biezpiens
Kūka
Tēja
Karalis
Zelts
Ezis
Tulpe
Lācis
Kaķis
Suns
Putns
Vārna
Zaķis
Pele
Ābols
Aita
Zirgs
Lauva
Pūķis
Lasis
Vilks
Vējš
Uguns
Ūdens
Zeme
Debesis
Saule
Rūpniecība
Aizkustinošs
Izdzīvošana
Nepieciešamība
Atbildība
Lieliski
Apmierināts
Neparasts
Izglītība
Sarežģīts
Atsevišķs
Pamatots
Organizācija
Sadarbība
Efektīvs
Daudzveidīgs
Novērtēt
Pārsteidzošs
Inovatīvs
Vērtība
Aizraujošs
Nopietns
Komunikācija
Māksla
Dzīvība
Ekskluzīvs
Tehnoloģijas
Rezultāts
Atbalsts
Nodrošinātība
Pārbaudīt
Radošs
Sociāls
Izteiksmīgs
Brīvība
Pieredze
Ietekme
Pārmaiņas
Drosmīgs
Racionāls
Empātija
Izpratne
Risinājums
Iespējas
Atklāts
Vadošais
Eksperimentāls
Neatkarība
Tīrība
Samierināšanās
Motivācija
Harmonija
Dinamisks
Iedvesma
Izglītojošs
Komplicēts
Pieejamība
Sadarbība
Tūlītējs
Saprotams
Neizsakāms
Lieliskums
Inovācijas
Aizrautība
Pārdomas
Sapratne
Rezultatīvs
Iespējams
Pārbaude
Sociālais
Izteiksme
Brīvība
Pieredzējis
Ietekmīgs
Pārmaiņu
Racionāla
Izpratni
Risinājumi
Iespējams
Atklāta
Vadošā
Eksperimentāla
Neatkarība
Tīra
Motivējošs
Harmonisks
Dinamika
Iedvesmojošs
Spēks
Mīlestība
Pasaule
Daba
Skaistums
Miers
Sapnis
Prieks
Rītausma
Brīnums
Izcils
Saikne
Dzirksts
Pārmaiņas
Atbalsts
Izcilība
Satriecošs
Dzīvīgums
Pārveidošana
Uzdrīkstēšanās
Uzticamība
Ieguldījums
Vērtība
Līdzsvars
Saskaņa
Izsmalcinātība
Pateicība
Atzinība
Pārsteigums

View File

@ -1,103 +0,0 @@
Баатар
Багаа
Базар
Барра
Бат-Очир
Баттуул
Батхэсэн
Баярмаа
Билгэх
Бор
Бөөнцагаан
Бүрэнхайрхан
Бямбагар
Бэх
Гарам
Гантиг
Гурвантэс
Гүр
Гэрэлтуяа
Давст
Дангаа
Дансран
Дарь-Эх
Дөргөн
Дундбүрд
Дэмүүл
Дэлгэрцэцэг
Жавзан
Жарантай
Заглул
Зүүнхөвөө
Кир
Корона
Лүн
Лха
Лхаваан
Майхан
Манлай
Мөндөөхөө
Мөнхөт
Мөрөн
Мөнххаан
Мөст
Мэгэд
Мухар
Найдалмаа
Найтингейл
Налайх
Нарантуул
Намтай
Насантогтох
Номин
Нямсамбуу
Нэүдэй
Орог
Очир
Өнөржаргал
Өөдөс
Өргөн
Паган
Пас
Пүрэвдорж
Пүрэвхүү
Сайнаа
Сайхандулаан
Сундуй
Сэлх
Сүүж
Сээр
Тайван
Тарав
Тогтуун
Төрболд
Төхөм
Төмөр
Түргэн
Түшиг
Түгтөмөр
Түшиг
Удвал
Улиастай
Улаандэл
гүедэцгээчих
дэвхэрлүүлсхийчих
дэвхэлцгээчих
дэвшигдүүлгэчих
дэвшилцчих
дэвээ
дэггүйчүүд
наламгардуулалц
налбаруулзна
Слова с ошибками []
Батарчулуун [Баатарчулуун, Батар чулуун, Батарч улуун]
Баруунхарааа [Баруунхарааг, Баруунхараа, Баруунхараагаа, Баруунхараад]
Даважаргал [Даваажаргал]
Дөрволжин [Дөрвөлжин]
Мягмараран [Мягмараар, Мягмарнаран]
Оюунтулхуур [Унтуурхуул]
оторчилсхилгэ [оторчилсхийлгэ, оторчилсхийчих, оторчилсхий, отогчилсхийлгэ, хорчилсхийлгэ]
Асрамжлулгацгаачих [Асрамжлуулгацгаачих]
гүентүүлгэцгэээ [гүентүүлгэцгээе, гүентүүлгэцгээ, гүентүүлгэцгээгээ, гүентүүлгэцгээж, гүентүүлгэцгээн, гүентүүлгэцгээнэ, гүентүүлгэцгээв, гүентүүлгэцгээг, гүентүүлгэцгээх, гүентүүлгэцгээм]
наладаадуулга [налдаадуулга, наадалдуулгаа, наадалдуулга, налдаадуулцгаа, наадамдуулгаа]

View File

@ -1,113 +0,0 @@
Bahamasøyene
Festarrangement
Festarrangemang [Festarrangement, Festarrangør, Fellesarrangement, Storarrangementa]
Festival
festligheta
festnummer
forhandlernett
forgylle
fotballstyre
Fotgå
fotoamatørene
Fotogalleri
fotokopiere
generalkostnadene
generaltabbe
generøs
Generell
genmodifisertst
handlingsresymeet
hardhet
Harmfull
hastighetsregulering
havbanke
havforskningsundersøkelsene
informasjonsutveksling
Infrarødest
kaffeautomat
kaldslig
kalenderåra
kjekk
kjendisstoffa
kjærlighetslyrikk
kjøkken
Kontantautomat
kontantlån
kontrahere
kontraheringsplikt
Låskasse
læregutt
læreprosess
Museums
museumssamling
musikkorps
myggstikka
myndighetsaldere
omløpstider
omregn
områdeplan
omriss
omsetningsgjeld
omsjaltning
omsetningsvolumer
omslutning
omslyngning
omsonst
omstendeligheta
Omstart
Omstreifende
Omsyn
omtåketheta
oppdagelse
oppbygning
oppebære
oppfølgingsapparat
oppgjørsbank
oppgjørsblankett
opphøringene
partisipere
randverdi
rapportskriver
rasjonalisering
Rate
selsak
selskapsinntekt
selskapsoverskudd
selvbetjeningene
snabbingene
Snadderene
Sytti
søkekriterium
søkemulighetene
søkeargumenter
søkingen
søkne
sølvlaga
sørlandsk
søtningene
tabellrad
Tabellkolonne
Takhalm
taksene
takseringssystema
tal
trolsk
trosinnholdene
utfoldelsesmuligheta
Utformingsmetode
Utgift
vekstfaktor
vekstforhold
Слова с ошибками []
Arbeidstagerorganisasion [Arbeidstagerorganisasjon, Arbeidstakerorganisasjon, Arbeidsgiverorganisasjon, Sosialarbeiderorganisasjon, Arbeiderorganisasjon]
festsprel [festsprell, festsprek, festsprelt, festspell, feltprest, fengselsprest]
forhandlingsdirektor [forhandlingsdirektør, forhandlingssekretær, forhandlingstekniskere, forhandlingstaktiskere, forhandlingskontor]
handlingforløpa [handlingsforløpa, handling forløpa, handling-forløpa, handlingsforløp, lønnsforhandlinga, lønnsforhandling, forhandlingspart]
kjempeflinktt [kjempeflinkt, kjempeflinkest, kjempeflink, kjempeflott, kjempefint]
lanetilbud [lånetilbud, langetilbud, landetilbud, linetilbud, laketilbud, langtilbud, lagetilbud, landtilbud, danetilbud, lunetilbud, vanetilbud, fanetilbud, banetilbud, hanetilbud, kantinetilbud]
omraming [omramming, omringing, omringning, ramming, omring]
omsvøpssfull [omsvøpsfull, omsvøpslaus]
raportmateriale [rapportmateriale, kartmaterialer, kartmateriale, programmateriale, skrapmateriale]
serstilt [særstilt, ser stilt, ser-stilt, seerstilt, tverrstilt, storstilt, lederstil, stiliser]
taksamst [takksamst, takksamt, takksam, samletakst, samstav]

View File

@ -1,115 +0,0 @@
Advertentie
Advocate
affirmatie
afgevaardigd
afneemster
allerbekendst
alternatieveling
annulering
anticycloon
Backtrackroute [Jacktrackroute, Backtrackrouten, Baktrackroute, Backtrackroute-, Backtrack-route, Back-trackroute, Backtrackroutes]
Bearbeiden
becijfer
bediening
bedrag
beduiden
beïnvloeding
benadeling
bepaaldelijk
Catalogiseer
Catering
cellulair
classificator
collaboreren
collectiviteit
comfortabel
complimenteus
contractant
correctionaliseren
daaraanvolgend
dagelijks
deelgenoot
degelijkheid
demarqueren
Denotative [Denotatie, Denominatieve]
deposant
dergelijken
detail
deugen
diakritisch
Directioneel
dusgenaamd
eendrachtigheid
Eenzaamheid
eersteklascoupé
Eigenschap
felicitatietelegram
centerkanaal [centerkabaal, enterkanaal, centerkanaal-, center-kanaal, callcenter]
Chargeer
filiaal
klare
Klassikaal
kleinhandel
evolutie
exemplaar
exequiën
familiaal
fauteuil
luister
magistratelijk
perelaar
Permitteren
Perseveratie
persoonlijk
pictogram
pixel
sloten
sluimer
sneltoets
Soldij
Solliciteren
zegepraal
zelfbeeld
zevendaags
aangeslotene
meermaals
expedieert
jaargetijden
kaderleden
Kapitelen
Сложные слова []
avontuurlijkheid
bedrijfsmaatschappelijk
begrotingstechnisch
belangstellingssfeer
concurrentievoordeel
conferentieganger
democratisch-liberaal
discontoverhoging
doctoraatsverhandeling
dubbeldeksbus
economisch-financieel
energiezuinig
erkentelijkheid
evenwichtigheid
klimaatsverandering
koffiezetmachine
koopmansgebruik
maatschapsovereenkomst
personeelsconsulent
sociaalwetenschappelijk
zelfverzekerdheid
fondsenwervende
Слова с ошибками []
afficher [affiche, afficheer, affiche-, affiches]
algorithme [algoritme, algoritmiek]
beeindiging [beëindiging]
client [cliënt]
consnteren [consenteren, contesteren, constateren, consulteren, confronteren]
deactivieren [deactiveren, deactiveerde, reactiveren, deactiveert, geactiveerden]
deblockering [deblokkering]
electrisch [elektrisch]
certificat [certificaat, certificatie, certificeert, certificeer, certificeren]
sovereiniteit [soevereiniteit, suzereiniteit, sereniteit, universiteit]

View File

@ -1,116 +0,0 @@
Ankeret
Anleggsbedrift
Annandag
annonseavis
annuell
ansats
ansvarsmedviten
Antibiotikai
apal
apoteki
apparattavlor
appetitt
Aprikos
arbeidsdokument
arbeidsmarknad
barndom
bastematte
bautingi
Bedriftsleiar
befolkningi
begynnarkurs
Beheld
belastningi
beredskapsnivå
beredskapsperiode
berglandskapi
berrfrost
beskjedi
beskrivingi
betalingsoppdrag
betalingsplikt
bevismateriale
bildeband
bildebruki
bildespråki
bildeteksti
bilingval
billettlukone
binær
bione
bjørkegreini
bjørnebæri
blenge
blokkeringi
blomsterbordi
blyerts
bogen
bokstavrekningi
bokstavteikni
Borddisk
effektevaluering
elgkalv
Elone
emballer
faktainformasjon
familiebedrifti
familieterapeut
fastbuande
Februar
feili
fisketom
hengelåsi
istandsetjingi
Item
jaguar
jamlig
janen
jarnbanestasjon
kjende
kjentfolki
kjæleri
kjøledisk
kjørety
midli
Mideftnar
midtstrek
multiplikasjonstabell
museumsdirektør
onsdag
operasjon
operasjonskode
opinionsskapingi
opningi
Personalkonsulent
Personligdom
persontryggleik
petroleumspris
redningsaksjon
reduksjon
refusnik
seinst
sekretær
seljande
sendeferd
Standpunkt
støyisolering
støytvis
terminoppgåve
tidløysone
tidsfølgjone
Tilbakebetalingstid
uprofesjonell
upåklageleg
Слова с ошибками []
Anlegsarbeid [Anleggsarbeid, Tvangsarbeid, Grunnlagsarbeid, Føregangsarbeid, Bergingsarbeid]
anonse [annonse, nonsens, anse]
ansversproblematikk [ansvarsproblematikk, vurderingsproblematikk, ventelisteproblematikk, valdsproblematikk, drivhusproblematikk]
barneforteling [barneforteljing, barnefordeling, barneforsking, barnefarforelegg, barnebefolkning, barnebortføring]
besoksliste [besøksliste, sortsliste]
bilophoggingi [bilopphoggingi, bilopphogging, opphogging]
effektivitetskontrol [effektivitetskontroll, effektivitetsforskjell, effektivitetsproblem, effektivitetsnøytral, effektivitetsforbetring]
fakturaerklering [fakturaerklæring, faktureringsliste, overfakturering]
miljøbyrad [miljøbyråd, miljøby rad, miljøby-rad, miljøbragd]
selskapskat [selskap skat, selskap-skat, selskaps kat, selskaps-kat, selskapsskatt, selskapskapital, selskapsrett, selskapstype]
cement [sement, dement, centime, cent]

View File

@ -1,108 +0,0 @@
Ajustaira
alaguiar
alausièr
alberguèri
alcaloïdic
alègrament
alenament
algorisme
Alimentacion
allergologia
alpèstra
amaisament
amorteirar
analista
analogic
atucament
Audicion
auquièr
auscultacion
auscultar
ausèri
autenticament
brilhant
brumós
Burgada
cabelièira
cadeçar
Caducèu
çaicontra
calcièrs
Calmar
camarilha
cambièra
canalhariá
casse
cedar
cendrós
cèrca
cèrtes
cestòdes
chantièr
chartrós
Chassís
dimensionar
diptèrs
dirèctament
discrecionària
discriminar
Distraire
dòler
Enòrme
enqueriái
espicifòrme
esquelèt
Esquèrra
estetic
innocéncia
innocentàs
Maniquèu
mantelejar
Nauchièr
natièr
oxigèn
pacanariá
pagés
pagesiá
Primièirament
requereguèri
requisitòria
saumelèri
S'autodeterminar
sautarèl
scientament
scientologia
secador
secretèri
sècta
sectorial
s'efarcimar
s'endeven
s'engarrar
sentimental
s'entrepausar
shampó
sextant
sòli
Solidament
soquèla [soquèla, roquèla]
subrejornada
suedés
utilitària
Utilizaire
vacàs
vaisselèri
valiái
validament
Слова с ошибками []
albatros [albatròs]
amistanza [amistança, amistat, animista]
brunonièr [brunhonièr, prunhonièr]
carpentier [carpentièr]
centrifugation [centrifugacion, centrifugadoira, centrifugador, centrifugar, centrifuga]
estelhad [estelhas, estelha, estelhada, estelhar, estelhan, estelhat, estelham, estrelhada, estervelhada, estenalhada, estendalha]
primaria [primariá, primària, primarai, primaris, primari, primariam, primacia, primarga]
s'embractar [s'embracetar, s'embraceta, s'embodracar, s'embarrassar, embracetar]
sosembrançament [sosembrancament, embraçament, asombrament]
vascularisacion [vascularizacion, secularizacion, cardiovascular]

View File

@ -1,225 +0,0 @@
dom
pies
kot
auto
drzewo
książka
szkoła
przyjaciel
mama
tata
dziecko
jabłko
czekolada
kawa
herbata
telefon
telewizor
komputer
muzyka
sport
zdrowie
piękno
praca
miłość
szczęście
czas
pieniądze
język
kraj
miasto
zima
lato
jesień
wiosna
morze
góry
jezioro
rzeka
park
zwierzę
ptak
ryba
drewno
złoto
srebro
metal
szkło
buty
sukienka
spodnie
koszula
czapka
płaszcz
ręka
noga
oko
ucho
nos
usta
ząb
głowa
serce
mózg
król
królowa
książę
księżniczka
chłopak
dziewczyna
mężczyzna
kobieta
staruszek
staruszka
lekarz
pielęgniarka
nauczyciel
uczennica
student
studentka
kucharz
kelner
wojna
pokój
mapa
flaga
śmiech
płacz
sen
marzenie
praca
nauka
sztuka
teatr
kino
muzeum
kaplica
kościół
zamek
most
droga
Сложные слова на польском языке []
1. konstantynopolitańczykowianeczka [nicejsko-konstantynopolitańskiego]
2. niezadogłębienieńskujący []
3. antykontraatakujący [finansująco-kontraktujący]
4. supersamoobsługiwalnymi [kancelaryjno-archiwalnymi]
5. rozpierduchlanoculka [nieporozpierdzielanie]
6. nieodezwawiałobyś [nieodprzedmiotawiany]
7. przystawieniowy [przedstawieniowy, nieprzystawienie, niepoprzystawianie, nieprzystawianie]
8. nieprzeżyciowakościami [nieprzewartościowywaniami, nieprzewartościowaniami]
9. nieprzekazywających [nieprzekrzywiających, nieprzejednywających, nieprzywdziewających, nieprzepoczwarzających]
10. przeciwzakwaszeniowych [zatokowo-przedsionkowych]
11. nieszczęściodrapańskiego [ogrodniczo-pszczelarskiego]
12. społeczno-wychowawczyniami [socjalizacyjno-wychowawczymi]
13. seledynowo-fioletowymi [mięśniowo-szkieletowymi]
14. przeciwdeszczową [przeciwdeszczową, przeciwdeszczowy]
15. mikroelektroniczno-kwalitacyjną [reumatologiczno-rehabilitacyjną]
16. nieokreślonościowo-losowo-obiektywnie []
17. zagubieniecioburakowatej []
18. antyneuroleptyzanckim []
19. nieupubliczniającymi [nieuwieloznaczniającymi]
20. splądrowałbyś [wyeksplorowałbyś]
21. konserwowano-spożywczymi [konserwiarsko-zamrażalniczymi]
22. ożelośćiowo-miłosnej []
23. nieprzyzwoitolicjią [nieprzypieczętowującą]
24. nieodporowościę [nieodpoliturowanie]
25. rzeszołkofiołkowatymi []
26. niezakapiactwuja [niezakatrupiająca]
27. nieoszczędniewczelnianków [oszczędnościowo-rozliczeniowa]
28. przekształconowaczkołępów []
29. rozwińczywianiu [nieporozwiązywaniu]
30. nieprzeskakiwalnościami [nieprzewartościowywaniami]
31. modernizująco-rewolucyjnego [reumatologiczno-rehabilitacyjnego]
32. nadzwyczajnieuzdolnionymi []
33. przemocno-wsparciański [warciańsko-odrzańskiemu]
34. przepyszno-peltzerowskiego [faszystowsko-hitlerowskiego]
35. kwestionowano-wzmocnieniami []
36. nieodczynieństwującą [nieodrzeczywistniającą]
37. niezasłużonowypasionego []
38. likwidującego/zarządzającego [odchudzająco-oczyszczającego]
39. szeszcześtoplutowanych [nieprzeinstrumentowanych]
40. niewpadkowościowi [wielonarodowościowi]
41. antynazizhownemu [niebizantynizowanemu]
42. nieuchronnieprzekroczeniowym [oszczędnościowo-rozliczeniowym]
43. niezatrawialnieprzyjemnego []
44. kardiopulmonologiczno-angiologów [endokrynologiczno-ginekologicznemu]
45. gorączkowointensywnościowego [wydolnościowo-sprawnościowego]
46. antykonstytucyjnorozpadowego [konstytucyjno-monarchicznego]
47. nieobawiamysię/źródleni []
48. prerewolucyjnolphillipsowi []
49. szóstkaniewygranych [niewykrystalizowywanych]
50. nieupadkokogeneracyjnymi [korekcyjno-kompensacyjnymi]
51. społeczno-humanitarnarządzaniami []
52. nieodziewowiędzy [nieumiędzynarodowienie]
53. przemocnochamować []
54. społecznosensacyjnosądowym [kompensacyjno-wyrównawczymi]
55. przerażającorzymskiego [kobylińsko-borzymskiego]
56. nieprzemontowanych/zamuzowych []
57. referendumkonstytucyjno-reformujące []
58. niezniesłowiałszymi [niezesłowiańszczonymi]
59. niebohaterystycznymi [charakterystyczniejszymi]
60. produktodenarodowomenopauzalem []
61. odrywającopierdolca [niedopierdzielająca]
62. niegotowożywione [żywieniowo-noclegowi]
63. niepostronnynarodzonemu [kilkudziesięciostronicowemu]
64. przedniaautochtonicznym [urbanistyczno-architektonicznym]
65. nadciągniono-wchodzących []
66. promocjostworczym [czteromocarstwowym]
67. niezapowiadającychkoalicji []
68. bezgłupinczłapie []
69. wyomjaził []
70. wagotonizacyjno-radiofonizowanego []
71. gospodarczo-zasadotwórczej [organizacyjno-gospodarczej]
72. skrupulatno-rzeźniczobardziej []
73. samokiedy-konstytucyjnej [konstytucyjno-monarchicznej]
74. niedomętnością [nieumiejętnością]
75. nieoszustamiwykorzystana []
76. przeprowadzonoświeckie [nieprzeprojektowywanie]
77. nieuniknionaobowiązkowo-plastycznej []
78. poduszkowo-nicościowych [porządkowo-czystościowych]
79. niepowodzeńbutmizeryjewego []
80. skojarzeniowocolorowymi [wypoczynkowo-szkoleniowymi]
81. przytułkamiwciągarkowych []
82. wchodziłoprzeciwniepowszechny []
83. karaublicznociągana [publiczno-prywatnego]
84. przedpolitycznilubelskim [hemolityczno-mocznicowemu]
85. niezapowiedziano-date-expanded []
86. licznościłodziennej [termiczno-wilgotnościowej]
87. niezawinieniomatołek []
88. pakujączwobilardowego []
89. rewersdopisek []
90. przeprosinoworadosną [nieprzeprojektowywaną]
91. nieakceptacyjnoprospekcyjnymi [adaptacyjno-rehabilitacyjnymi]
92. jedniżużytym [nienadużytymi]
93. ainikopciksemilitechnikowany []
94. motszynopiszącym [niewspółtowarzyszącym]
95. nieprzerejestrowanasezonowanie []
96. słupotartackimoblikiem []
97. nieodbieraniemniedostępności []
98. dorozwinięcówkobiet []
99. szybopojabytesłowickiego []
100. przystępnoracjmujacych []
Слова с ошибками []
jedniiżużytym [nienadużytymi]
wiomjaził [jaziowy]
niezzniesłoowiałszymi [niezesłowiańszczonymi, niezesłowiańszczanymi, niezesłowiańszczającymi, najniesłowniejszymi]
superrsammoobsługiwalnymi [muzealno-archiwalnymi]
przemoocnochamować [przeprogramować]
staruszzka [staruszka, staruszeczka, staruszek, staroruska, starszaka]
tiatr [tiar, titr, tatr, teatr, wiatr, otiatra, otiatria, tristia]
woina [wpina, wona, wina, wozina, dwoina, wolina, wonna, wcina, toina, wodna, doina, wolna, wojna, wgina, woźna]
teleffon [telefon, telef fon, telef-fon, telefoto]
zołoto [złoto, gołoto, hołoto, Gołoto, Hołoto, zołotnik]

View File

@ -1,108 +0,0 @@
que
eu
não
de
você
para
ele
se
é
um
sim
por
isso
em
uma
uuma [u uma, uma, usma, suma, numa, ruma, duma, puma, fuma, juma]
está
como
com
bem
na
me
mas
do
era
quando
então
tudo
tydo [tudo, tido, todo]
aqui
disse
estava
esâtava [estava, tavares]
fazer
vai
sobre
vamos
homem
hollmem [homem-gol]
bom
ok [o k, o, k, oó, os, oi, oc, ou, om, oh]
agora
coisa
coissa [coisca, coiça, coisas, coisa, cossa, comissa, cisosa, cissoa, cossai]
quero
foi
meu
seu
eles
as
posso
pocso [posso, poco, poso, psoco, poiso, pouso, pocho]
estou
mais
mim
certo
dizer
dizdizerr [dizer]
os
no
sei
ela
vocês
sua
todos
sabe
minha
alguma
algyyma [amalgama]
casa
muito
oh
quallquer [qualquer, alquerque, malquerer, alqueria, alquermes]
qualquer
da
estamos
até
onde
onede [enode, onde, monede, neode, onere, olede, nedendo]
ao
tenho
nós
tem
tinha
tiinha [tinão ha, tiazinha, toinha, tinha, tirinha, tidinha, tipinha, tianha, tainha]
quê
ir
ou
pode
quer
vou
seus
dia
estão
nos
cabeça
quem
anos
depois
sou
vez
fez
irmão
câmera
câmeara [cameara, cameará, câmera, câmara, acâmera, comeara]

View File

@ -1,135 +0,0 @@
pan [pana, pane, pano, pen, par, pai, pau, paz, San, Van, Dan, pança]
manteiga
menteiga [manteiga, antigamente]
queijo
salchichón [salsicha]
saуlchichón []
óleo
pimenta
pimmenta [pimenta, pigmenta, pimenteira, pavimenta, implementa, impiamente]
sal
baga
mel
geléia [geleia]
cogumelo
cebola
cóbola [cebola]
banana
cenoura
pêra [pera, para, pira, pura]
beterraba
frutas
melão
melancia
bolo
chocolate
carne
batatas
salada
salóda [salda, salada, salsada]
tomate
pepino
pipino [pepino, pi pino, pi-pino, pipi no, pipi-no, filipino, pino]
col [cola, cole, colo, coa, cal, coe, cor, rol, sol, coo, com]
mingau [mingua, mingai, minga, mingar, mingas, mingou, mingam]
sopa
sanduíche
refrigerante
refrigarante [refrigerante, refrigerar, intrigante]
água
café
chá
leite
suco
scuco [suco, cuco, cucos]
maçã
uvas
laranja
abacaxi
adacaxi [abacaxi, cacada]
damasco
demasco [damasco, demarco, remasco, de masco, de-masco, descasco]
açucar [açúcar, açucara, açucare, açucaro, açudar]
arroz
macarrão
res [rés, ser, ares, reis, ires, ores, dres, rei, ris, ses, rãs, rês]
porco
frango
costeleta
cãsteleta [costeleta, chapeleta]
limão
ervilha
pão
peixe
caramelo
sorvete
nogueira
ovo
pêssego
xícara
xíícara [xícara, caraíba]
vidro
prato
colher
garfo
faca
pires
garrafa
guardanapo
café da manhã [ssafé da manhã]
almoço
jantar
avião
carro
bonde
ônibus [ónibus]
trem
bicicleta
janeiro
fevereiro
fevíreiro [fevereiro, ferreiro]
março
abril
maio
junho
julho
agosto
setembro
setembra [setembro, seteara]
outubro
novembro
dezembro
desembro [desmembro, dezembro, deslumbro, setembro, desdobro]
caneta
livro
xadrez
telefone
relógio
pente
televisão
ferro
sabão
rádio
bolsa
cartão
mala
presente
câmera [câmara, comera]
computador
camputador [computador, captador]
filme
flor
vaso
quadro
lenço
bola
balão
brinquedo
brinqueedo [brinquedo, branqueado]
conta
sobre
papel
pepel [papel, repele, pele]
jornal
letra
bilhete

View File

@ -1,210 +0,0 @@
casă
copil
carte
masă
școală
lumină
apă
munte
soare
lună
pâine
fruct
floare
stradă
mașină
aer
timp
zi
noapte
nor
vânt
ochi
gură
nas
mână
picior
inimă
sânge
cap
ureche
voce
melodie
culoare
formă
linie
cerc
dreptunghi
cercetare
știință
limbă
frază
literă
cifră
număr
sunet
zgomot
telefon
internet
computer
program
ecran
tastatură
mouse
joc
sport
muzică
artă
film
televizor
radio
planetă
stea
univers
galaxie
atom
moleculă
substanță
energie
lumină
căldură
frig
aparat
instrument
mașinărie
unelte
hrană
băutură
haine
pantofi
păr
piele
ochelari
ceas
bijuterie
pământ
apă
aer
foc
metal
lemn
piatră
hârtie
cerneală
pix
carte
cadru
tablou
sculptură
model
formă
anticonstituționalitate [anti constituționalitate, anti-constituționalitate, anticonstituționali tate, anticonstituționali-tate, anticonstituționale, neconstituționalitate, anticonstituțională, constituționalitate]
dezvoltare
inexpugnabil
nefast
concomitent
antiseptic
recalcitrant
perseverență
extravagant
inexorabil
colosal
plauzibil
efervescent
perspicacitate
superfluu [superfluă, superfulger]
subversiv
incoruptibil
inefabil
hiperbolic
indefectibil [indestructibil, indefinibil]
peremptoriu
ambivalent
paradoxal
heterogen [eterogen, heterogonie]
indiferent
periferic
subliminal
ultraviolet
indeferent [indiferent, interferent, deferent, inaderent, independent]
conglomerație
circumstanțial
contraproducător [contra producător, contra-producător, contraproductivă, contraproductiv, neproducător]
conglomerat
insurmontabil
intransigent
insidios
inerent
consternant
ambiguitate
inerție
inconsolabil
oniric
remarcabil
repudiat
subiectiv
periculos
infatigabil
abnegare
exuberant
facet [face, falet, facem]
represiune
implacabil
indiferent
infatigabil
insolit
intempestiv
incandescent
letargic
magistral
magnanim [magnaliu]
nefast
oblivial [bolivian]
oportun
periculos
plutitor
propice
reprobabil
risipitor
robust
salutar
simetric
solicitant
stringent
sufocant
superficial
tranzitoriu
tributar
trivial
umilitor
unic
vehement
vernal
vicios
victorios
vindicativ
virtuos
vizibil
volatil
vorace
vulnerabil
xenofob
xerofil
yonder [pondere]
yang
yodel [model]
zonal
zodiac
zoon [ozon, zono, zoom, zoo, zon, zobon, zovon, zvon, zoo n]
zoomorf
zurbagiu
Caaă [Casă, Cară, Cată, Cală, Cană, Cauă, Camă, Capă, Cadă, Cață, Cază, Cavă, Cașă]
Soaare [Soare, Sotare, Solare, Sonare, Somare, Soțioare]
Cartr [Carte, Cart, Carter, Carta, Carto, Cartu, Cartă]
Appă [Papă, Apă, Arpă, Aptă]
Coopil [Copil, Copilo, Copiilor]
Frumoss [Frumos, Frumos s, Frumoasă]
Feriсire [Fericire, Rereferire, Ferire]
Prietenn [Prieten, Prieteni, Prietena, Prietene, Prieteno, Prietenu, Prietenă, Prieten n, Prietinie, Prietin, Pretenție]
Muziică [Muzică, Muzic, Muică]
Exeplu [Exemplu]

View File

@ -1,197 +0,0 @@
должен
доллжен [должен, доложен]
наш
думаю
думмаю [думаю]
свою
сам
всем
ни
нас
пока
этом
этой
ваша
всеми
возьми
моей
сама
вся
день
само
всей
бывает
себе
пойду
куда
ими
твоей
всю
своего
твой
пусть
ним
про
точно
иметь
которые
тогда
сюда
наше
самой
взять
наверное
домой
совсем
те
тобой
наверно
что-то
будто
твои
пути
дома
такие
тех
такое
его
самой
вашей
наверное
мои
например
типа
значит
люблю
минут
пор
случае
искусство
лучше
того
такому
ждать
видеть
мною
ждал
имя
важно
чего-то
самому
обычно
представляет
мечтать
стало
помните
взять
моих
самим
своим
вообще
самими
здесь
обратно
сразу
таким
ежели
наоборот
куда
таков
мечтает
значит
покажи
такими
кстати
почти
всякий
научит
вдоль
тогдашний
толком
занимает
Аквапланирование
Барокамера
Библиографирование
Биосинтез
Взаимодействующий
Вибраторный
Виртуальность
Вооруженность
Господствующий
Десантно-штурмовой
Диагностировать
Дипломатический
Дисгармония
Дискриминационный
Достопримечательный
Жизнеустройство
Интернациональный
Инфицированный
Кальцинировать
Ключичный
Коннотация
Лиловатый
Люминесцентный
Метрополитен
Многоплановый
Модернизировать
Наивысший
Наименее
Неопределенный
Нераскрытый
Неоднократный
Неохотно
Непостижимый
Неусыпный
Обезьяноподобный
Обзавестись
Оптический
Оптимизировать
Осуществиться
Очистительный
Парафинировать
Переключатель
Пограничный
Подготовительный
Подрядчик
Полиморфный
Почитать
Преисполниться
Преподаватель
Преследователь
Прирожденный
Проектирование
Профанация
Разграничительный
Распоряжающийся
Реконструктивный
Революционный
Рентгенологический
Рискованный
Роскошествовать
Самоунижение
Сверхъестественный
Светочувствительный
Семантика
Сингулярность
Совершенствовать
Соединительный
Сосуществование
Спорообразующий
Стационарный
Столовая
Сторицей
Сцепной
Трансформирующий
Триумвират
Укротитель
Универсальный
Федеративный
Хронометраж
Целостность
Криумвират [Триумвират]
Укратитель [Укротитель]
Универссальный [Универсальный]
Фидиративный []
Хранометраж [Хронометраж]
Целосность [Целостность]

View File

@ -1,205 +0,0 @@
hiša [šiša, Riša, Miša, hi ša, hi-ša]
pes
mačka
avto [atto, asto, auto, zavito]
drevo
knjiga [kvadriga]
šola [šila, šoka, šla, švola, škola, šosa, vola, šora, rola, kola, mola, dola, šopa, pola, hola]
prijatelj [prijatej, prijate, prijatie]
mama
oče [očne, otče, toče, očke, koče, moče, očeš, oči, one, ose, oke, oje, obe, očí, očú]
otrok
jabolko [jablko]
čokolada [čokoláda]
kava
čaj
telefon [telefón, telefot]
televizija [televízia]
računalnik [račianski]
glasba [glasnosť]
šport
zdravje [zdravej, zdravie, zdravte, zdravme, zdrav je, zdrav-je]
lepota [pelota, slepota, lopota, lehota, klepotať, epoleta, poleptať]
delo
ljubezen [lezeniu]
sreča [srnča, skeča, smeča]
čas
denar [denár, nedar]
jezik [veziko]
država [držiava, držala, dŕžava, dĺžava]
mesto
zima
poletje [polejte, poleje, poletuje, polje]
jesen [jeseň, jesne, nesej, jeden, jesene, jeseni, jesení]
pomlad [omlad, poklad, p omlad, pomlka]
morje [morke, more, moje, morte, morme, mor je, mor-je, morčej]
gore [hore, gofre, nore, kore, more, zore, bore, šore, Nore, Tore, Lore, Zore, gágore]
jezero [jazero, je zero, je-zero, zero]
reka [areka, rieka, rekta, repka, rezka, raka, roka, rekt, seka, reva, veka, deka, repa, reku, ruka]
park
žival [žuval, živa, živel, živil, rival, ži val, ži-val, živ al, živ-al, živa l, žičieval]
ptica [pica, pätica, psica, štica]
riba [rabi, roba, ria, iba, raba, ribi, ryba, rúba, róba, Tiba, r iba, babri]
les
zlato
srebro [rebro, s rebro, striebro]
kovina [okovina, krovina, ovinka, konina, novina, korina, rovina, kozina, košina, kofina, rakovina, kávovina]
steklo [šteklo, seklo, stekalo, stieklo, stenklo, streklo, stoklo, steblo, stĺklo]
čevlji [nevlhči]
obleka
hlače [hláče, tlače, hlase, hlave, hlade, plače]
srajca [rajca, krajca, s rajca]
kapa
plašč [plaš, plač, plaší, plaš č]
roka
noga [noha, nota, nosa, nova, nora, loga, koga, doga, joga, noža, noša, noxa, Toga, neogab]
oko
uho [ujo, ho, tuho, uhor, uhol, uhlo, ucho, uhoľ, uňho, hou, oho, uto, uhm, cho, uhú]
nos
ustnice [ustrice, kapustnice]
zob
glava [hlava, Ilava, Slava]
srce [drce, srnce, srdce, srne, srde, síce, súce]
možgani [moganie]
kralj [kraj, kraal]
kraljica [kraslica]
princ
princesa
fant
dekle [deke, dele, pekle, de kle, de-kle, debakle]
moški [košmi, kamoši]
ženska [ženská, ženiska, žensky, ženskí, ženský, ženskú, ženské]
starec
starka [starká, straka, statka, starla, stara, ostarka, staríka, starca, starkí, starký, starkú, starké]
zdravnik [zdrav nik, zdrav-nik, zdravenia]
medicinska sestra [medicínska sestra]
učitelj [učitelík]
učenka [učeníka, učenia, učenca, utečenka]
študent
študentka
kuhar [kurare]
natakar [katakana, katarakta, katarakt]
vojna
mir [mri, mor, mi, mira, mire, mier, emir, miri, miru, mar, air, mer, min, sir, mil]
zemljevid [zemediel]
zastava [zástava, zastáva, zastav, zastavia, zastaval, zastavaj, zastavať, zostava, zastala, zastaví]
smeh [sneh, smej, sme, steh, smer, smel, smeč, smeť, sme h]
jok [koj, kok, joj, jol, ojok, jak, jot, tok, sok, vok, rok, lok, mok, dok, job]
spanje [spanie]
sanje [sane, saje, sanuje, banje]
delo
učenje [učenej, učene, učenie]
umetnost [etnosti]
gledališče [nepojedali]
kino
muzej [mušej, muzeálnej]
kapela
cerkev
grad [grád, gard, hrad, graf, rad, grand, gram, gray, úrad, Arad]
most
cesta
Сложные слова []
1. Neparlamentarna [parlamentarizmus]
2. Samozadosten [rozradostene]
3. Nepristranski [protistranícki]
4. Pretirano [pretrénovanosti]
5. Nepredušno [nepriedušnosť]
6. Nesreča []
7. Razpršeno [zhoršenou]
8. Nesprejemljiv [nesprejazdňujeme]
9. Prekomeren [rekompenzovať]
10. Prostovoljstvo [sprostredkovateľstvo]
11. Izolirati []
12. Trmast []
13. Brezpogojno []
14. Neodvisnost [neodôvodnenosti]
15. Skupnost [ústupnosti]
16. Neizvedljiv []
17. Nelegitimen [nelegitimizuje]
18. Nevzdržen []
19. Preobremenjenost []
20. Ogrevalni sistem []
21. Preoblikovati [aplikovateľnosti]
22. Nezaslišano [nezasluhujúci]
23. Neugoden []
24. Prezasedenost [prezamestnanosť]
25. Nesreča []
26. Neupravičeno [nenapraviteľnosť]
27. Mednaroden [mŕtvonarodeným]
28. Kompatibilnost [najkompatibilnejšom]
29. Neuspeh [neusporte]
30. Neobvladljiv []
31. Neskončen [neskončenej]
32. Neprimeren [neprimeranie]
33. Amortizacija [amortizovaných]
34. Koncentracija [dekoncentrácia]
35. Cirkulacija [recirkulácia]
36. Obremenitev [odbremenenie]
37. Gromozanski []
38. Simbol []
39. Vinjeta []
40. Digitalizacija [digitalizovaný]
41. Funkcionalnost [funkcionalistické]
42. Rentabilnost [nerentabilnosti]
43. Ekshibicionizem [exhibicionizmus]
44. Frustracija [frustrujúci]
45. Neprilagodljiv []
46. Severnoameriški []
47. Ekskluzivnost []
48. Preverjanje [preverovanej]
49. Celoživljenjsko []
50. Privlačnost [neprivlastňovala]
51. Periferija [periferický]
52. Sokrivda [dokrivkať]
53. Kompromis [kompromisník]
54. Strpnost [ostrovtipnosť]
55. Racionalizacija [zracionalizovania]
56. Birokracija [gerontokracia]
57. Odraslost [odrastenými]
58. Stabilnost [nestabilnosti]
59. Nepredvidljivost [najnepredstaviteľnejšou]
60. Razkošje []
61. Smrtnost [úmrtnostným]
62. Obveščenost [presvedčenosti]
63. Produktivnost [neproduktívnosti]
64. Neugodje []
65. Zapletenost [zakrpatenosti]
66. Hegemonija []
67. Umetnost [menostatikum]
68. Tranzicija [tranzitivita]
69. Individualnost [individualisticky]
70. Kontaminacija [kontaminantmi]
71. Inkubacija []
72. Prikrito [prikrátko]
73. Etnični [Letničie]
74. Sovražnost [samovražednosť]
75. Atraktivnost [abstraktnosti]
76. Nestrpnost [nepriestupnosti]
77. Divergenca [divergencia]
78. Digitalna pismenost []
79. Stabilizacija [autostabilizácia]
80. Raznolikost []
Слова с ошибками []
Kontamenacija [Kontaminácia]
Grommozanski [Grobianski]
Neobvladlliv [Neobkradli]
Neparlametarna [Neparlamentný, Parlamentárnej, Parlamentne]
Nevrzdržen [Združene, Zdražene]
voina [vonia, vina, vojna, voľna, voština]
muzei [muzeálni]
ryba
serebro [se rebro, se-rebro, rebro]
televiziia [televízia]

View File

@ -1,210 +0,0 @@
Hiša
Sonce
Miza
Stol
Ptica
Trava
Drevo
Noč
Luna
Morje
Gora
Cvet
Riba
Rdeča
Modra
Zelena
Rumena
Bela
Črna
Kamen
Pes
Mačka
Roka
Noga
Glava
Oči
Uho
Nos
Usta
Jabolko
Hruška
Sliva
Jagoda
Malina
Lubenica
Kruh
Mleko
Sir
Mesnica
Sadje
Zelenjava
Voda
Zrak
Ogenj
Sneg
Dež
Oblak
Veter
Zima
Poletje
Jesen
Pomlad
Zajec
Lisica
Volk
Medved
Lev
Tigrica
Slon
Konj
Krava
Ovca
Piščanec
Jajce
Mleko
Kava
Čaj
Sok
Vino
Pivo
Hrana
Pecivo
Testo
Marmelada
Kruh
Sir
Olje
Sol
Poper
Sladkor
Kava
Čaj
Vino
Pivo
Šola
Učitelj
Učenec
Knjiga
Pisarna
Računalnik
Telefon
Glasba
Slika
Film
Gledališče
Mesto
Vas
Trg
Cesta
Reka
Avtomatizacija
Razvoj
Komunikacija
Kompjuter [Juterškov]
Programiranje
Elektronski
Inženiring
Elektrifikacija
Kombinacija
Sistem
Informacija
Univerza
Biblioteka
Univerzitetni
Laboratorij
Raziskava
Razvojna
Inovacija
Intelektualni
Integriteta
Izobraževanje
Izvajanje
Preverjanje
Tehnologija
Implementacija
Program
Sodelovanje
Proizvodnja
Industrija
Organizacija
Administracija
Proaktivnost [Retroaktivnost, Produktivnosti, Produktivnost, Provokativnost]
Kreativnost
Projektni
Razumevanje
Kvaliteta
Upravljanje
Ocenjevanje
Statistika
Kompetentnost
Konsolidacija
Realizacija
Kapaciteta
Distribucija
Kompatibilnost
Konceptualizacija [Konceptualizem]
Povezava
Posodobitev
Fleksibilnost
Ekonomija
Organiziranje
Konkurenca
Stabilnost
Ekologija
Osebnost
Zavzetost
Entuziazem [Entuziast]
Motivacija
Avtorizacija
Kreacija
Akumulacija
Monotonija
Diferenciacija
Transformacija
Koncentracija
Inovativnost
Aktivnost
Vzpostavljanje
Reorganizacija
Kategorizacija
Partikularnost
Homogenost
Izjemenost [Izjemnost, Izjemen ost, Izjemen-ost, Zmenjenosti, Izrojenost, Izmišljenost, Izrinjenost]
Generalizacija
Hierarhija
Koordinacija
Inspiracija
Evaluacija
Ustvarjalnost
Oblikovanje
Kompatibilnost
Konkretizacija
Proaktivnost [Retroaktivnost, Produktivnosti, Produktivnost, Provokativnost]
Identifikacija
Kapaciteta
Intervencija
Konsolidacija
Realizacija
Eksplozivnost
Abstrakcija
Individualnost
Integracija
Segmentacija [Sedimentacija, Sedimentacij, Argumentacija, Alimentacija]
Asimilacija
Artikulacija [Artikuliranja, Artikulirala, Cirkulacija, Kalkulacija]
Kolaboracija
Asociacija
Stabilizacija
Kooperacija
Transformacija
Hšza [Hrza]
Kmojnikacija [Komunikacija]
Progrramiranjee [Programiranje, Reprogramiranj, Programiranega, Programiranj]
Elektornkski [Elektorski, Elektorkin, Elektronski, Elektorki]
Inženeirrng [Inženiring]
Izzobraževanjee [Izobraževanje, Izobraževanj, Izobraževanega, Izobraževane]
Infomracija [Informacija, Informacij, Rafinacijam]
Razvoojnaa [Razvojen]
Proizvdonja [Proizvodnja, Proizvajanja, Proizvajanj, Proizvaja]
Akitvnostt [Aktivnost]

View File

@ -1,227 +0,0 @@
кућа
пас
мачка
аутомобил
дрво
књига
школа
пријатељ
мама
тата
дете
јабука
чоколада
кафа
чај
телефон
телевизија
рачунар
музика
спорт
здравље
лепота
посао
љубав
срећа
време
новац
језик
земља
град
зима
лето
јесен
пролеће
море
планине
језеро
река
парк
животиња
птица
риба
дрво
злато
сребро
метал
стакло
ципеле
одећа
панталоне
кошуља
капа
капут
рука
нога
око
уво
нос
усне
зуб
глава
срце
мозак
краљ
краљица
принц
принцеза
дечак
девојчица
мушкарац
жена
старац
старица
доктор
медицинска сестра [војномедицинска]
наставник
ученик
студент
студенткиња
кувар
конобар
рат
мир
мапа
застава
смех
плач
сан
сањарење
посао
учење
уметност
позориште
биоскоп
музеј
црква
дворац
мост
улица
пут
Сложные слова [Словенства]
Конечно! Вот сто сложных слов на сербском языке на кириллице: []
1. Контраст [контрастира, контраста, контрастно, контрастна]
2. Компликација [компликацијама, компликација, компликације]
3. Конструкција [реконструкција, конструкцијама, конструкција, конструкцију]
4. Диспропорција [пропорцијалном]
5. Корелација [корелацијама, корелација]
6. Колаборација [колаборација]
7. Консервативан [конзервативан]
8. Диференцијација [диференцијације, диференцијацијом, диференцијална, диференцијални]
9. Експерименталан [експерименталним, експериментална, експериментални, експерименталне]
10. Инвалидитет [инвалидитет]
11. Легитиман [нелегитиман]
12. Оптимизација [аклиматизација]
13. Компетентан [некомпетентан, компетентан]
14. Документација [документација, документацијом, документацију, документације]
15. Персистентан [асистенткиња]
16. Апроксимација [апроксимације]
17. Екстраваганција [екстравагантност]
18. Катастрафалан [катастрофалан]
19. Резервација [резервација]
20. Прогресиван [прогресиван]
21. Идентификација [идентификација, идентификације]
22. Генерација [регенерација, генерација]
23. Криминалистички [криминалистички, криминалистичка, криминалистичке]
24. Дестабилизација [индустријализација]
25. Корумпиран [корумпирана, корумпиран]
26. Конфронтација [контаминација]
27. Експлозиван [експлозиван]
28. Функционалан [функционалности]
29. Релевантан [релевантан]
30. Квалификација [квалификацијама, дисквалификација, квалификација]
31. Акредитација [рехабилитација]
32. Петиција [петицијама]
33. Каустичан [аутистичан]
34. Периодичан [периодичан]
35. Контроверзан [контроверзна]
36. Гигантски [гигантских]
37. Принципијалан [беспринципијелан]
38. Управоливост [расположивости]
39. Имунизација [имунизација]
40. Магнетичан [магнетично]
41. Оперативан [оперативан]
42. Десант [десантне]
43. Хиерархија [хијерархија]
44. Феминистички [феминистичког]
45. Сегментација [сегментацијом]
46. Колоритан [колорисан]
47. Деградација [деградација]
48. Диверзификација [диверсификацију]
49. Казуистички [карикатуристички]
50. Реципрочан [реципрочан]
51. Манипулативан [манипулативна]
52. Екстензиван [екстензивна]
53. Колективни [колективни]
54. Каузалитет [локалитету]
55. Синхронизација [синхронизација]
56. Кампања [кампањама]
57. Товарни [товарника]
58. Хируршки [хируршких]
59. Шампионат [шампионати]
60. Геостационаран [револуционарност]
61. Опустошан [опустошености]
62. Клема []
63. Стационарни [стационарна]
64. Секуларни [секуларних]
65. Исегментација [сегментацијом]
66. Дебелина [дебелића]
67. Прецизан [непрецизан]
68. Рафиниран [рафинирани]
69. Психолошки [психолошких, психолошки]
70. Турбулентан [корпулентан]
71. Интегритет [интегритет]
72. Идеолошки [идеолошких]
73. Манифестација [манифестација]
74. Имплицитан [имплицитан]
75. Хомогеност [хомогеност]
76. Изолација [хидроизолација]
77. Хетерогеност []
78. Спекулативан [спекулативна]
79. Вагу [превагу]
80. Математички [математичким, математички]
81. Гематолошки [стоматолошки]
82. Психијатријски [психијатријске]
83. Блокада [блокадама]
84. Заплена [заплетена]
85. Монопол [монополом]
86. Дисидент [дисидентски]
87. Екстрадиција [екстрадиција]
88. Ревизија [ревизијама]
89. Ваидан []
90. Колонизација [колонизација]
91. Мотивација [мотивација]
92. Просек [просектор]
93. Ресурс [ресурсу]
94. Хуманизам [хуманизам]
95. Дравски [Подравских]
96. Коалиција [коалиција]
97. Картеля [картелима]
98. Резолуција [резолуција]
99. Менталитет [менталитет]
100. Епидемиологија [дијалектологија]
С ошибками []
Колонизакаија [Колонизација, Колонизацији, Колонијализам, Колонијализма]
Епидемиогија [Епидемија, Епидемијом, Демагогија]
Казуистикаки [Казуистика, Казуистике, Статистика]
Хуманкзам [Хуманизам, Хуманизма]
Манитулативан [Манипулативна, Ултимативан, Ултимативни]
сањваење [сањање]
утење [хтење, утање, стење, умење, утеше, утече, учење, утехе, утеже, уђење, утезање]
автомобил [аутомобил, обилатом]
мекицинска сестра [војномедицинска]
стукло [стукли, тукло, стукла, стакло, стекло, свукло]

View File

@ -1,173 +0,0 @@
ananas
anarhistički
antidepresiv [depresivan, depresivna, represivan, depresivne]
Anđeo
avion
banana
banka
belina
bespomoćnost
bibliotekar
bibliaoteikar [bibliotekarka, bibliotekar, biblioteka]
brod
citat
crkva
cvet
cveće
demokratija
demackratija [demokratija, demokratizacija, demokratiji, demokratije]
demokratizacija
Dobrota
dom
Dragi
ekran
eksperimentalni
eksplozija
epidemiologija [epistemologija, ideologija]
farmakologija
filantropija
flaša
frizura
fudbal [fudbal, fudbala, fudbalu]
garaža
generalitet
geografski
globalizam
gnezdo
grad
građanstvo
grlo
hamburger
Harmonija
himalaji [Himalaji, malajski]
hiperbola
hipotermija [hidroterapija]
hleb
Hrabrost
hrana [hrana]
Hvala
igra
igračka
individualnost
infrastruktura
internet
inmternet [internet, interne]
jabuka
jahač
jastuk
jednakost
jubilej
jurisprudencija
kafa
krevet
kriminalisticki [kriminalistički, kriminalistika, kriminalistička, kriminalistiku, kriminalističke]
kriminalistika
kuća
kvantitativni
lampa
latiaratura [mlatarati, rasturati, maturirala, landarati]
Lepota
lingvistika
literatura
ljubav
Ljubavi
ljubavnica
Ljubazan
Ljubim
lubenica
majica
majka
mašina
mikroorganizama
mikroskopija [mikroskop ija, mikroskop-ija, mikroskopi ja, mikroskopi-ja, mikroskopi, mikroskopska, mikroskopa, mikroskopski]
Milost
Mir
Mirno
nacionalizam
nedopustiv
neurologija
novčanik
noć
nož
oktobar
okultizam
optimističan [optimistička, optimistički, optimističke, optimističku]
optimističnost [optimistički, optimističke, optimistička, optimističku]
ormar
Osoba
oči
pas
peškir
planina [planina, planinar, planinac, planinčina, planini, planinčini, planin]
poniženje
Porodica
Prijatelj
psihologija
psihoterapija
Radost
računar
reka
rekonvalescencija
reumatologija [dermatologija, hematologija, stomatologija]
revolucija
sendvič
Slatko
Sloboda
Slobodan
Snaga
socijalizacija [socijalizam, specijalizacija, specijalizacijom, socijalizma]
socijalizam
Spreman
Sreća
Srećan
Srećno
sunce
superiornost
Svetlost
tata
tehnologija
telefon
telekomunikacije
top
tradicionalni
ulica
univerzalnost
univerzitet
univirzdalnost [univerzalnost]
Usmena
Znanje
usta
Vedar
vegetarijanstvo
velikodušnost
voda
voz
Zabava
zavisnost
Zdravlje
zemlja
Zima
zjmlja [zemlja]
zločinački
zoološki
Zvezda
ćilim
čarapa
čarobnjak
časopis
čizme
đak
đevrek
đumbir
šešir
šišmiš
škola
šljiva
šuma
žaba
ženskara
žirafa
život
životinjski
žurka

View File

@ -1,210 +0,0 @@
Hus
Sol
Mjölk
Vatten
Fisk
Stol
Grön
Blomma
Träd
Katt
Hund
Bok
Cykel
Kaffe
Frukt
Kött
Fönster
Dörr
Säng
Lampa
Bord
Hår
Ögon
Hand
Fötter
Näsa
Mun
Öra
Huvud
Arm
Ben
Kläder
Hatt
Skor
Väska
Papper
Penna
Skrivbord
Telefon
Radio
Musik
Film
Teater
Konst
Sport
Spel
Resa
Bil
Tåg
Buss
Flygplan
Båt
Stad
Land
Hav
Sjö
Flod
Berg
Dal
Park
Skog
Sjukhus
Apotek
Skola
Universitet
Affär
Restaurang
Café
Hotell
Turist
Vän
Familj
Mamma
Pappa
Bror
Syster
Barn
Morfar
Mormor
Vänster
Höger
Framåt
Bakåt
Upp
Ner
Snäll
Osnäll [Snäll, Osäll]
Glad
Ledsen
Trött
Stark
Svag
Tyst
Bullrig
Ren
Smutsig
Vacker
Ful
Liten
Stor
Komplexitet
Oproportionerlig
Ovillkorlig
Efterklokhet
Komplicerad
Desorientering
Konstellation
Otillgänglighet
Irreversibel
Förlåtelse
Overksamhet
Indifferent
Hierarki
Kombinatorik [Kombinatorisk, Kombination]
Inkompatibilitet
Absorption
Konsekvens
Verklighetsfrånvänd
Retrospektiv
Förändringsbarhet [Förändringsbarnet, Förhandlingsbart, Förhandlingsbar]
Ambivalens
Besvikenhet [Besviken, Besviket]
Ineffektivitet
Intrikat
Dilemma
Hesitation
Absurditet
Kompromisslös
Konsolidering
Föresats
Tillfredsställelse
Delegering
Rekommendation
Detaljrikedom
Oanvändbar
Stagnation
Nostalgi
Hemlighetsfull
Avsaknad
Perseverans [Perseverera, Reverseras, Reversera]
Existentialism
Repetitivitet [Repetitivt, Receptivitet, Repetitiv, Representativitet]
Intolerans
Anonymitet
Obetydlig
Paradox
Förvirring
Juxtaposition
Reflektion
Självständighet
Kollision
Kreativitet
Djupgående
Abstraktion
Eufori
Autentisk
Insinuation
Omöjlig
Pessimism
Inkonsekvens
Revisionism
Sensationell
Obeveklig
Subjektivitet
Universalitet
Entropi
Omvälvande
Infiltration
Konservativ
Atypisk
Provokation
Konfrontation
Anarki
Konkurrenskraft
Defensivitet [Defensivt, Sensitivitet, Defensiv, Densitet]
Nihilism
Konklusion
Apori [Apor, Apors, Porig]
Korrespondens
Prioritering
Exponentiell
Fragmentering
Aversion
Harmoni
Vanmakt
Signifikans
Katalysator
Förlust
Enhällighet
Ambition
Tendens
Alienation
Artificiell
Uppfyllelse
Psykosomatisk
Virtuos
Egensinnig
Anpassning
Hållbarhet
Konstitution
Kompleksitet [Komplexitet, Komplementet]
Oproporsjonerlig [Oproportionerlig, Proportionerlig]
Uvilkorlig [Villkorlig]
Etterklokhed [Efterklok]
Komplisert [Komplicerat]
Desorientering
Konstelasjon [Konstellation]
Utilgjengelighet [Tillgänglighet]
Irreversibel
Forlatelse [Förlåtelse]

View File

@ -1,205 +0,0 @@
Akşam
Almak
Altın
Anahtar
Anlamak
Araba
Atmak
Ayakkabı
Açmak
Ağaç
Bahçe
Bakır
Bakkal
Bakmak
Balık
Beyaz
Bilgisayar
Bilmek
Binmek
Bulmak
Ceket
Cevaplamak
Deniz
Dinlemek
Doktor
Duyurulmamış
Düzenleştirme
Düşmek
Düşünmek
Ekmek
Elbise
Eldiven
Elma
Erkek
Etek
Etmek
Ev
Eşarp
Gelgit
Geliştiricilikle
Geliştirilebilir
Geliştirme
Gerçekleştirme
Gezmek
Geçmek
Gitar
Gitmek
Giymek
Gri
Gömlek
Görülebilirlik
Görünümlü
Görünüşlü
Gözlük
Gümüş
Günaydın
Hareketlendi
Hareketlilik
Hava
Hayalperest
Hüzün
Kahve
Kahverengi
Kalabalıklar
Kalem
Kalkmak
Kalmak
Kapatmak
Kararlılık
Kararlılıkla
Kararsızlık
Kararsızlıkla
Karpuz
Kedi
Kemer
Kemdkcer [Kemerler]
Kırmızı
Kitap
Kız
Kızgınmak [Kızgın]
Koklamak
Koalye [Kolye, Kavalye]
Kolye
Konservatuvar
Konuşmak
Korkmak
Koymak
Koşmak
Kravat
Kullanılabilir
Kullanılmış
Kullanılmışlık
Kullanışlılık
Kurumsallaşma
Köpek
Küpe
Kütüphane
Mavi
Mazbut
Melankoli
Merdiven
Merhaba
Merhabalar
Meurhaba [Merhaba, Murabaha]
Meydan
Meyhane
Meyve
Mor
Muhafazakar
Muhteşem
Mukadderatlarınızdanmışçasına []
Muvaffak
Muzaffer
Muzafferiyet
Muzip
Mükemmeldik
Münasebet
Münzevi
Müsrif
Mütevazi
Müteessir
Mütercim
Mütereddit
Mütevazı
Müzmin
Okul
Okumak
Otobüs
Otoriterlik
Oynamak
Pantolon
Pasta
Pembe
Pembei [Pembe, Pembeyi, Pembeli, Pembeci, Pembe i, Pembesi, Pemben]
Plaj
Platin
Saat
Sandalye
Sarı
Satmak
Sevinmek
Sevmek
Sıcak
Sıradaymışız
Siyah
Sormak
Soymak
Soğuk
Su
Sükûnet [Sükunet, Sünnet]
Sürrealist
Süt
Tabak
Tadına bakmak [Alınamamaktadır]
Tatlı
Tavuk
Telefoncu
Televizyon
Temizlemek
Teşekkürler
Türkuaz
Tuirkuazu [Türkuaz]
Turuncu
Tutmak
Ulaştırılabilir
Uygulanabilir
Uyumak
Uçak
Yapmak
Yatak
Yazmak
Yemek
Yeşil
Yıkanmak
Yıldız
Yol
Yöneltilmezken
Yüzme
Yüzük
Zenginleştirmek
Çalışamamıştı
Çalışmak
Çalışmamıştır
Çanta
Çay
Çıkarmak
Çiçek
Çorap
Özelleştirilmiş
Özelleştirme
Özgürleştirme
Üzülmek
İnmek
İsteksizlik
İsteksizlikle
İstikrarlı
İstikrarlılık
İstisnai
İslamiyetle
İzlemek
İçmek
İşbirliği
İşitmek
Şapka
Şemsiye

View File

@ -1,210 +0,0 @@
абдукція
абіогенез
амбівалентнасть [амбівалентність, амбівалентний, бівалентність, біоеквівалентність, внівалентність]
амбівалентність
анахранізм [анахронізм, брахманізм, анархізм, нанізм]
анахронізм
антропогенез
антропологія
антропоморфізм
апатія
археологія
архетип
аскетизм
астрономія
афект
бачити
бігти
білий
біллий [білий, збілілий]
біологія
бувай
будинок
будь ласка [будь ласку]
бути
важко
велиикий [великий, великоокий]
великий
веселка
взяти
вибачте
відчувати
вода
волюнтаризм
втаємниченість
вчитися
гарний
гарячий
гегемонія
географія
герменевтика
герменевтика
гештальт [штатгальтер]
говорити
гойдалка
готувати
грати
дати
дедукція
деконструктивізм [де конструктивізм, де-конструктивізм, конструктивізм, неконструктивно]
деконструкція
демаркація
детермінізм
дзвіночок
дивитися
дисгарммонія [дисгармонія, дисгармоніям, дисгармонійний, фісгармонія]
дисгармонія
дисфункція
дисфункця [дисфункція, дистинкція]
дихотомія
до побачення [побачення]
добрий
доктрина
думати
дурний
дурня
дякую
евфемізм
езотерика
ей
екзистенціалізм
екзистенціалізм
екзистенцілізм [екзистенціалізм, екзистенціаліст, екзистенція]
екзистенція
економіка
емерджентність
ентелехія
епістемологія
ефемерність
ефемерність
занепадництво
звісно
здоровий
зелений
йти
ілюзорність
ілюзорність
імплікація
інвектива
індукція
інтроспекціїя [інтроспекції, інтроспекція, інтроспекції я, ретроспекція]
їсти
історія
каблучка
кава
казус
калюжа
катарсис
каченя
каштани
квітка
кішка
класно
книга
когнітивістика [когнітивність, когнітивна]
комаха
консенсус
космогенез [номогенез, екогенез]
купувати
легко
лінгвістика
літати
маленький
марнослів'я
математика
мати
метаморфоза
метелик
метелиця
містифікація
місто
могти
можливо
мусити
насправді
не радий [нерадий, незрадний]
незворушність
ні
нігілізм
новий
нонсенс
ностальгія
павучок
парадокс
пес
писати
пити
піти
плавати
плакати
повільний
поганий
політологія
постмодернізм
потворний
працювати
привіт
прийти
психоаналіз
птах
радий
ремінісценція
рефлексія
робити
розбурхання [розбухання, розбурханий, розпухання, бурхання]
розумний
сильний
сингулярність
синестезія [кінестезія, анестезія]
синій
синішй [синій, синішай, синішати]
синкретизм
сказати
скатертина
слабкий
слухати
сміятися
сніг
соліпсизм
соломинка
сонечко
сонце
соціологія
спати
співати
справді
старий
структуралізм
сумний
так
так
танцювати
телефонувати
тож
трансцендентність
фантастично
фаталізм
фемінізм
феномен
феноменологія
фізика
філософія
фрактал
хворий
хімія
хліб
хліб
ходити
холодний
хотіти
чао [чадо, чан, чат, чар, час, чад, дао, чаш, чай, чаї, чаю]
червонй [червоний, червоній, червоно, червона, червоні, червону, червоне, червоню, червонявий]
червоний
черевики
читати
чорнй [чорний, чорній, чорно, чорна, чорни, чорні, чорну, чорне, чорню]
чорний
чути
швидкий
щасливий
яблуко

View File

@ -1,262 +0,0 @@
Mарт [Арт, Ғарт, Қарт, Карт, Шарт, Фарт, Варт, Парт, Сарт, Март]
Ёз
Ём
Ёхуд
Август
Адвакат [Адвокат, Адэкват]
Адреси
айтган-лирангиз
айқин
амалга
анча
Апрел
арзонроқ
аҳамият [аҳамият, аҳамияти, ҳамият, ҳамжамият]
аҳднома
бажарилади
бажарилди
баланд
ихтисослан
банкрот
баҳона
Баҳор
бераман
берасизми
беринг
бериш
бешинчи
биз
Бизга
Бизнинг
билан [билан, биланг, билани]
Бирор
Бозорнинг
бор
бошқа
Бу
Бугун
будингиз
бунга
бундай
Бухгалтерлик
бўлади
бўладими
бўлиши
бўлмаган
бўлса
бўш
бўшайди
бўшатасиз
вазифасига
вазият
вариант
вақт
газетадаги
газетадан
даромад
Декабрь
Душанба
Эрталаб
Етказиб
Жисмоний
Жуда
Жума
зарур
зиёфат
Ижара
ижарага
икки
Илтимос
Индинга
информатизациялари
Иситгич
иши
ишлатсак
Ишхона
Июль
Июнь
Йўқ
йил
йилдан
кам
Шинамгина
кампанияси
келдим
келишимдан
келмоқчи
келсам
келтириш
керак
керакдир
керакми
кета-ди [кетади, кетарди, кета-чи, кета-кета, дискета]
кеч
Кеча
кечага
Кечаси
Кечир
Кечирдинг
кирла
кирадими
кондиционер
коррупциядир
кран
Куз
Кун
куни
кўрмоқчи
кўчиб
лойиҳа
Май
маълумоти
маълумотларни
Маъмурият
маъруза
Мен
музлатгич
мумкин
муфмкин [мумкин]
мутахассис
мушовир
муҳим
нарса
нархи
Нархини
нақд
ўшанақасини
неча
Номардлик
Ноябри
интернетдаги
ойнаси
ойнинг
Октябри
олдин
олдиндан
олмаймиз
олмоқчи
орқали
шоти
шорти [шоти, орти, ортиш, шотир, корти, форти, шарти, порти, сорти, ширти, торти, борти, шомурти]
Оқшом
пайдо
Панжшанба
пулини
Раҳмат
резюме
реклама
Салом
Сармоядор
Сентябрь
Сешанба
Сиз
сизга
сизда
Сизнинг
синган
сифатида
совуқ
софвуқ [совуқ]
Солиқларни
Статистик
сўм
тажрибали
тайёргарлик
тайёрладик
тайёрладингизми
таклиф
талафот
талафоти
таъминловчилардан
танишинг
таржимон
тарржимон [таржимон, тарраксимон]
тахминан
ташкил
Телефонни
технология
Безантирани
тозалан
тозалигига [тозалигига, газтозалагич]
Тонгда
топширишимиз
топшириқ
турли
турмоқчи
тутсак
Тушлик
ўладиганингиз
тўлай
тўлаймиз
тилдиришинг
тўлиқ
уйингиз
уйни
уч
учун
ўқидим
фақат
Феврал
хабар
Хайрли кун [Хайрли кўн]
Мотамхонаси
хонлик
Чек
Чоршанба
Шанба
шарт-номани
шартини
шартлар
шартлари
шартни
шартнома
шахс
шовқин
Шом
Шу
эди
Эртага
Эртадан сўнг [Эртасиганг]
Эшитишимга
эълон
эълонингиз
эълонингизни
эътироф
Юклаш
Якшанба
Январи
Ярим кеча [Яримкеча, Яримчиликча]
яхши
қабул
қаерда
Қанақа
қаноатманда
қанча
қачон
қизиқарлидир
қиламиз
қилганим [қилганим, қилганими, қилгандайин]
қилдим
қилинг
қилинди
қилишди
қиммат
қиммати
Қимматидан
қирқ
Қиш
қувонарлими
қўнғироқ
Қўшимча
ҳайвонини
ҳам
ҳамза
Ҳар
ҳафтага
ҳақиқатан
ҳисоблаб
Ҳозир
ҳужжатни
Ўтган кун [Ўтган кўн]

View File

@ -1,200 +0,0 @@
Salom
Sallom [Slalom, Salom, Musallo, Alloma, Salo]
Rahmat
Rhmat [Rahmat, Marhamat]
Iltimos
Iltimo [Iltimos, Tilsimot, Timol]
Kattalar
Kattalarvf [Kattalashtir]
Yaxshi
Yashi [Ayshi, Tashi, Yash, Yasashi, Yarashish, Yalashish, Yaxshi]
Kelajak
Keljajak [Kelajak]
Oilaviy
Oilaaviy [Oilaviy, Hosilaviy]
Qarindosh
Qarinndosh [Qarindosh, Qayindoshlar, Oqarinish]
Shahar
Shaha [Shah, Shalha]
Dengiz
Dengizzz [Dengiz]
Quyosh
Quyyosh [Quyosh, Quysh]
Yulduz
Oyim
Kechqurun
Tushun
Suvchi
Sharob
Choyxona
Nonushta
Tushlik
Muzqaymoq
Desert
Tuzluq
Mevalar
Sabzavot
Baliq
Tuxumli
Sabza
Sariq
Salatlar
Shirinlik
Shokolad
Rishta
Kakao
Pishloq
Tort
Qaymoq
Sutli
Qatiq
Salomatlik
Temir
Zahar
Oqimli
Shamol
Olov
Yer
Osmon
Shanba
Dushanba
Seshanba
Chorshanba
Payshanba
Juma
Yakshanba
Oltin
Tong
Bomdod
Asr
Shom
Kun
Oqsoqol
Shoshqaloq
Kulgili
Muxlislilar
Tavsiflash
Tuzilishga
Mustaqillik
Tushuntirish
Boshqarish
Mashhurlik
Tarkibiy
Tahlil
Ishchi
Xalqaro
Tarjima
Mustahkamlik
Chaqaloq
Istiqbol
Tasvir
Taklif
Tasavvur
Jiddiy
Majburiyat
Asosiy
Tahdid
Tushunmovchilik
Ishonch
Maqomi
Ijodkor
Tadbirkor
Hayotiy
Mashhur
Bemorlik
Tadbir
Jismoniy
Madaniyat
Xavfsizlik
Sifatli
Suvli
Sotuvchi
Chetel
Tashqi
Sotuv
Tarbiyalanish
Murabbo
Sariqcha
Qovun
Shaharlik
Muhimlik
Tarbiyachilik
Xatolik
Balandlik
Yuzaki
Kuyov
Qiziquvchan
Orzular
Mashq
Qalampir
Muammo
Sadoqatli
Yovuzlik
Fikr-mulohaza
Boylik
Tushuncha
Zanjir
Eslatma
Tabassum
Ishonuvchi
Chidamlilik
Ilova
Birodarlik
Oqilona
Ijodiyot
Tayanch
Hurmat
Baxtli
Tajriba
Samimiylik
Shifokor
Ishrat
Baho
Namoyish
Qiyinchilik
Bolalar
Ishonchli
Taqdir
Shovqinli
Xalqaro
Baxt
Fursat
Hurmatli
Qulaylik
Zamonaviy
Sadoqat
Sabr
Nikoh
Jasorat
Barkamollik
Dunyoqarash
Omadli
Foydali
Yorqin
Mehribonlik
Fazilatli
Kutubxona
Istiqomatli
Fido
Bahor
Shafqatsizlik
Tafakkur
Fazilat
Qochish
Laziz
Uzoq
Ilhom
Omad
Hurmatli
Tandir
Sherzod
Bahoriy
Dilshod
Baxtli
Shonli
Nurli
Shafqatsizlik
Oqqush
Boylik
Toza
Sabrli

View File

@ -1,128 +0,0 @@
Bánh
Bang
bênh
bướng
bậy
Chanh
chum
chuyện
chép
Chùng
chắp
chệnh
chới
chữ
công
cạc
cột
cứu
Doanh
duyên
dùng
dể
dọng
gia
giày
giêng
Giảng
giềng
hon
Hoẳn
Hài
hôm
hước
hấu
hớt
hữu
Khiển
Khoào
khuya
khuyến
khách
khén
khẩn
khắp
khựng
kẻo
lang
liền
Loàng
Luỗng
lình
lương
lấp
lệnh
lịnh
lốn
lời
lựng
Muộn
Mãnh
mại
mạn
mổ
mởn
nghiễm
nghều
Ngoáy
Nguyên
ngóp
người
ngỏ
ngớp
ngụa
ngửng
nhiếp
nhu
nhà
nhân
Nhóm
nhưỡng
nhắm
nhổn
nhứt
ninh
noi
nãy
nạn
nốt
ong
pao
phiên
phiêu
Phên
Phương tiện []
phẩm chất []
phố đi bộ [phố đì bộ, phố đĩ bộ]
quan trọng [quàn trọng, quản trọng, quán trọng, quăn trọng, quằn trọng, quắn trọng, quặn trọng, quân trọng, quần trọng, quẩn trọng, quẫn trọng, quấn trọng, quận trọng]
quyền lợi [quyền]
quán cà phê [qùán cà phê, qủán cà phê, qũán cà phê, qúán cà phê, qụán cà phê, qưán cà phê, qừán cà phê, qửán cà phê, qữán cà phê, qứán cà phê, qựán cà phê]
quảng cáo [quảng]
Quốc
Quốc tế [Quốc]
riêng biệt [triêng]
rưỡi
Rải
Rẻng
rộng rãi [rộng]
siễn
sum
Sõng
Sưu
sưu tập []
sử dụng [sử đụng]
Thiệt thòi []
Thuộc về [Thuộc]
thuộc tính []
Слова с ошибками []
thiệte [thiệt, thiệt e, thiện]
quốq tế []
nguên [nguyên, nguồn]
khoao [khoào, khoai, khoa, khao, khoeo, khoèo, khoan]
chenh [chênh, chềnh, chểnh, chễnh, chếnh, chệnh, cheng, chen, chanh, chành, chảnh, chánh, chạnh, chinh, chình]
chhùng [chùng, chùn, hùng]
man
doah [doa, doanh, doan, doa h]
khien [khiên, khiền, khiển, khiến, khin, khen]
ngoay

View File

@ -33,6 +33,7 @@
#include "../../../../Common/3dParty/hunspell/hunspell/src/hunspell/hunspell.h"
#include "../../../../DesktopEditor/common/StringExt.h"
#include "../../../../DesktopEditor/common/Directory.h"
#include <iostream>
bool CheckCaret(std::vector<std::wstring>& words)
{
@ -85,11 +86,36 @@ std::wstring CheckWord(Hunhandle* pDic, const std::wstring& sWord, const bool& b
return sResult;
}
#if defined(_WIN32) || defined(_WIN64)
#define USE_WCHAR_ARGC
#endif
#ifdef USE_WCHAR_ARGC
std::wstring GetParam(wchar_t* arg)
{
return std::wstring(arg);
}
#else
std::wstring GetParam(char* arg)
{
return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE *)arg, (LONG)strlen(arg));
}
#endif
#ifdef USE_WCHAR_ARGC
int wmain(int argc, wchar_t *argv[])
#else
int main(int argc, char *argv[])
#endif
{
std::wstring sSrcDir = NSFile::GetProcessDirectory() + L"/../src";
std::wstring sDstDir = NSFile::GetProcessDirectory() + L"/../dst";
std::wstring sDictionariesDir = NSFile::GetProcessDirectory() + L"/../../../../../../dictionaries";
if (argc > 1) sSrcDir = GetParam(argv[1]);
if (argc > 2) sDstDir = GetParam(argv[2]);
if (argc > 3) sDictionariesDir = GetParam(argv[3]);
std::vector<std::wstring> arSrcFiles = NSDirectory::GetFiles(sSrcDir);
for (int i = 0, len = (int)arSrcFiles.size(); i < len; ++i)
@ -109,6 +135,10 @@ int main(int argc, char *argv[])
std::wstring sAff = sDictionariesDir + L"/" + sName + L"/" + sName + L".aff";
std::wstring sDic = sDictionariesDir + L"/" + sName + L"/" + sName + L".dic";
// skip check diffs if dictionary is not exists
if (!NSFile::CFileBinary::Exists(sAff) || !NSFile::CFileBinary::Exists(sDic))
continue;
std::string sAffA = U_TO_UTF8(sAff);
std::string sDicA = U_TO_UTF8(sDic);
@ -125,6 +155,8 @@ int main(int argc, char *argv[])
Hunspell_destroy(pDictionary);
NSFile::CFileBinary::SaveToFile(sFileDst, sResult, true);
std::cout << "[" << (i + 1) << " of " << (int)arSrcFiles.size() << "] " << U_TO_UTF8(sName) << std::endl;
}
return 0;

View File

@ -1,213 +0,0 @@
A
qocalmaq
Alderaan'ın
hamısı
həmçinin
cavab
dir
incəsənət
kimi
da
uzaq
körpə
zirzəmi
ol
olub
doğuldu
bulvar
fasilə
nəsllər
gəlin
lakin
al
ilə
Kaliforniya
Kalifornikasiya
bilər
kartlar
şans
Çin
çənə
klublar
Cobain
bürc
nəzarət
qiymət
edə bilməzdim
yaratmaq
lənət
rəqs
saziş
sövdələşmələr
dağıdıcı
almazlar
etməz
etməyərik
arzu
xülyalar
Şərq
kənar
kənarları
məmnunluq
hamının
uzaq
peri
solğun
üz
son
tap
ilk
üçün
-dan
sərhəd
qız
qızın
yaxşı
gitara
əl
hardcore
var
yoxdur
o
eşitmək
ürək
O'nun
ona
gizli
yüksək
ona
onun
Hollivud
Mən
Mənəm
əgər
içində
məlumat
içində
dir
bu
jack
sadəcə
kral
qohum
bilmək
qoyulmuş
qanun
yerləşdirilmək
qurğuşun
aparmaq
yerləşdirilmə
məkan
sevmək
şans
edilmiş
adam
çox
Evlənmək
maska
o bilər
bəlkə də
mənası
mən
meditasiya
xatirə
ılın
pul
mənim
heç vaxt
deyil
heç nə
nömrələr
of
of
üstündə
bir
yalnız
və ya
nəticə
öz
Ödə
Şəftəli
yerlər
oynayır
oynamaq
əhali
porno
tərifləmək
ehtimal ki
ehtimal
psixik
kraliça
qaldırmaq
qalan
hörmət
qalxmaq
yol
xam
müqəddəs
Xilas et
elmi
çığırmaq
satılır
şəkil
xəstələnmək
gümüşçü
dəri
əsgər
bir şey
Mahnı
mahnılar
qılınclar
büyü
casuslar
ulduz
Stansiya
oğurlamaq
daşlar
günəş
şübhəli
İsveç
qılınclar
yeniyetmə
test
dandan
bu ki
bu ki
bu
onların
bu
onlar
düşünmək
bu
onlar
gel-git
üçün
deyilmişəm
çox
cəhd et
başa düşdüm
qilin
titrəmək
mübarizə aparır?
istəyirəm
müharibə
idi
dalğalar
geymək
silahlar
yaxşı
idarə olunan
Qərbi
arasında
qalib gəlmək
qalib gəlir
ilə
qadın
dünya
səhv
siz
sizə
sənsən
sənin

View File

@ -1,212 +0,0 @@
A
остаряване
Алдераан
всичко
също
и
отговор
са
изкуство
като
в
далеч
бебе
мазе
бъда
било
роден
булевард
почивка
породи
невеста
но
купувам
от
Калифорния
Калифорникация
може
карти
шанс
Китай
брадичка
клубове
Кобейн
съзвездие
контрол
цена
не можех
създаване
проклятие
танц
сделка
сделки
унищожение
диаманти
не прави
не правим
мечта
мечти
Изток
ръб
ръбове
екстаз
всеки
далеч
приказка
избледнява
лица
краен
намирам
първи
за
от
предел
момиче
момичето
добре
китара
ръка
хардкор
има
няма
той
чуя
сърце
той е
нейни
скрит
висок
него
негов
Холивуд
аз
аз съм
ако
в
информация
вътре
е
това е
вале
просто
крал
родственик
знам
определен
закон
поставям
водя
води
местоположение
обичам
късмет
направен
човек
много
Ожени се
маска
май
може би
означава
аз
медитация
спомен
ума
пари
моя
никога
не
нищо
числа
от
изключен
на
един
само
или
изход
свой
Плати
праскова
места
играе
играя
население
порно
похвала
вероятно
вероятен
психичен
кралица
въздигам
останал
почит
възход
път
груб
светия
Спасявам
наука
крясък
продава
форма
по-болен
златар
кожа
войник
някаква
Песен
песни
пикове
заклинание
шпиони
звезда
стация
крада
камъни
слънце
подозрителен
Швеция
мечове
тийнейджър
тест
отколкото
това
това е
на
техни
тези
те с
мисли
този
той
прилив
до
каза
също
опитайте
разбрано
еднорог
вибрация
водене?
искам
война
беше
вълни
носете
оръжия
Ами
бяха
Западна
какво
докато
победа
победи
със
жена
свят
грешка
ти
ти би
ти си
вашият

View File

@ -1,112 +0,0 @@
amor
llum
lluum
esperança
espirança
llibertat
força
forrça
pau
somni
llibre
mar
amistat
cançó
flor
cel
estrella
temps
camí
vent
muntanya
mumntanya
riu
soroll
silenci
viatge
foc
gel
paraula
vida
dia
nit
tarda
matí
lluna
sol
llac
marbre
ferro
sal
mel
sucre
peix
ocell
oceoll
joc
ritme
melodia
pintura
pentura
teatre
dansa
poema
història
llegenda
mitologia
festa
música
vi
cervesa
cervessa
formatge
pa
ciutat
poble
natura
camp
bosc
platja
sorra
sorrà
pedra
ànima
cos
ment
cor
somriure
somriàre
abraçada
bes
parla
oida
vista
tacte
gust
olfacte
color
forma
número
lletra
sistema
regla
escola
universitat
univversitat
mestre
estudiant
sabiduria
lliçó
pregunta
resposta
risposta
dubte
certesa
veritat
mentida
promesa
secret
descoberta
descaberta
aventura
destinació

View File

@ -1,212 +0,0 @@
A
envellir
Alderaan
tot
també
I
resposta
és
art
com
a
lluny
nadó
celler
ser
ha estat
nat
bulevard
pausa
generacions
núvia
però
comprar
amb
Califòrnia
Californication
pot
cartes
oportunitat
Xina
mentó
clubs
Cobain
signe del zodíac
control
preu
no podria
crear
maleït
ballar
acord
negocis
destructiu
diamants
no fer
no fem
desitjar
somnis
Est
vora
voreres
satisfacció
tots
llunyà
fada
pallid
cara
final
trobar
primer
per
de
frontera
noia
la noia
guitarra
hardcore
hi ha
no hi ha
ell
sentir
cor
ell és
seva
secret
alt
ell
seu
Hollywood
jo
sóc
si
en
informació
interior
és
és
jack
només
rei
parent
saber
fixat
llei
col·locar
plom
portar
col·locació
lloc
estimar
oportunitat
fet
home
molts
casar-se
màscara
podria
potser
sentit
jo
meditació
memòria
ment
diners
meu
mai
no
res
números
de
fora
sobre
un
només
o
resultat
seu
pagar
préssec
llocs
jugar
joc
població
porno
elogiar
probablement
probable
psíquic
reina
elevar
restant
respecte
pujar
camí
cru
sant
salvar
ciència
crit
vendres
figura
malalt
joier
pell
soldat
alguna cosa
cançó
cançons
cims
encanteri
espies
estrella
estació
robar
pedres
sol
sospitós
Suècia
espases
adolescent
prova
que
que
això
seu
aqueixos
ells
pensar
aqueix
ells
marees
per
no he estat
molt
intentar
entendre
fer
tremolar
lluitar
desitjar
guerra
va ser
ones
portar
armes
administrat
Oest
què
entre
guanyar
guanya
amb
dona
món
equivocat
tu
vostè
tu ets
teu

View File

@ -1,206 +0,0 @@
pomaliý
šťstný
smuutný
horcký
studiený
záludnast
náhodillost
úpěnlevý
rozspačitý
svéhllavý
jablko
slunce
voda
dům
pták
káva
chleba
květina
kniha
pes
kočka
město
zelený
modrý
červený
bílý
černý
velký
malý
rychlý
pomalý
šťastný
smutný
horký
studený
nový
starý
hezký
ošklivý
dobrý
špatný
zdravý
nemocný
silný
slabý
chytrý
hloupý
pracovat
jíst
pít
spát
číst
psát
mluvit
smát se
plakat
zpívat
hrát
tančit
učit se
nakupovat
vařit
telefonovat
dívat se
poslouchat
chodit
běžet
létat
plavat
psát
učit se
dělat
mít
být
jít
přijít
odejít
dát
vzít
říct
vidět
slyšet
cítit
myslet
chtít
moct
muset
rád
nerad
ano
ne
prosím
děkuji
na shledanou
omlouvám se
sbohem
ahoj
čau
hej
jo
fakt
super
blbost
paráda
no jo
jasně
takže
vlastně
třeba
snad
leštěnka
pochmurný
živelný
ponaučení
záhada
pochybnost
nádhera
soucit
záludnost
náhodilost
úpěnlivý
rozpačitý
svéhlavý
marnivost
blahodar
rozčarování
odchylka
přelud
vytrvalost
neústupnost
lehkost
souznění
rozmarnost
roztržitost
úskočnost
rozkoš
marasmus
rozpolcenost
neúprosnost
ztřeštěnost
chmurnost
okouzlení
zářivost
vyrovnanost
neochvějnost
neúcta
bizarnost
rozmařilost
nepochopení
nevýslovný
pomíjivost
beznaděj
úzkost
odtažitost
rozerv
rozervanost
vyčerpanost
bezcitnost
záludnost
nezdolnost
rozkošátnost
nezdolatelnost
rozmarnost
živelnost
bezútěšnost
záhadnost
neposkvrnitelnost
rozkošnělost
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
ztracenost
bezbřehost
rozervanost
opojení
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
ztracenost
bezbřehost
opojení
bezradnost
neuchopitelnost
pošetilost
opojení
rozervanost
marnost
bezstarostnost
nevinnost
náladovost
vyrovnanost
bezbřehost

View File

@ -1,129 +0,0 @@
Hej
Goddag
Tak
Ja
Nej
Måske
Mad
Vand
Hus
Bil
Tog
Cykel
Skole
Børn
Far
Mor
Søster
Bror
Hund
Kat
Fisk
Fugl
Træ
Blomst
Græs
Sol
Måne
Himmel
Regn
Sne
Sommer
Vinter
Forår
Efterår
Aften
Nat
Dag
Uge
Måned
År
Læse
Skrive
Tale
Lære
Arbejde
Sove
Vågne
Løbe
Sidde
Stå
Lytte
Se
Høre
Spise
Drikke
Kød
Frugt
Grøntsager
Ost
Brød
Vand
Juice
Kaffe
Te
Mælk
Smør
Æg
Salt
Peber
Sukker
Bolle
Smørrebrød
Køkken
Stue
Soveværelse
Badeværelse
Toilet
Bord
Stol
Sofa
Lampe
Vindue
Dør
Gulv
Loft
Væg
Sofa
Pude
Tæppe
Badekar
Håndvask
Spejl
Håndklæde
Seng
Dyne
Dynee
Pude
Pudee
Alarm
Alarmm
Skrivebord
Stol
Hus
Hund
Kat
Katt
Bil
Skole
Skolee
Sol
Soll
Vand
Vandd
Mad
Madd
By
Barn
Barnn
Tørklæde
Skæbne
Uafhængighed
Kærlighed
Kærligheed
overbelastning
Modstandsbevægelsen
Uafhængighedserklæringen
Forårssommertemperaturen
Stabiliseringsperioden

View File

@ -1,131 +0,0 @@
Ägyptologie
Ährenamt
Ängstlichkeit
Äquatoria
Abarbeiten
Abbild
Abbilden
Abbildungs
Abbreviatur
Abbrüche
Abfassen
Abfertigen
Abfolge
Abfuhr
Ableugnen
Ablichten
Ablöse
Absätze
Abschnitts
Abwechseln
Abwehren
Aktiv
Britannia
Browserfenster
Budgetieren
Bugpartie
Bukarester
Burgundersoße
Butterkrem
Button
Cabriolet
Campanile
Canapé
Caprice
Celsius
Chamäleon
Charakteristik
Chronometer
Chronometrie
Cölln
Connectzustände
Cursorspur
Däne
Dachs
Dahindämmern
Darbringen
Daten
Datenbankserver
Desktopsystem
Detektivfilm
Dichtertum
Dinosaurier
Direktion
Diskantgambe
Diskothek
Druckereicode
Kapsel
Karausche
Katzen
Klinge
Klinke
Kohlrabi
Koinzidenz
Kolleg
Komplott
Meereis
Mehrphasigkeit
Memorieren
Messen
Methode
Metrowaggon
Meute
Migräne
Milieuforschung
Mindern
Mineralien
Mitternacht
Mobiliar
Mohrrübe
Mühelosigkeit
Normativität
Notifikation
Ökonomie
Orangeton
Osten
Subjekt
Subsidiarität
Subsumieren
Tagfalter
Speicher
Spielzeugsammlung
Zahler
Сложные слова
Zurückgezogenheit
Äquipotentialfläche
Äußerungsbedeutung
Abfassungszeitraum
Abgeschlossenheits
Adjunktionsbeseitigung
Anknüpfungsgrundsätze
Chiffrierschlüssel
Knochenmarktransplantation
Bundeskaderathlet
Carbonsäurechlorid
Cardiazoltherapie
Chancenungleichheit
Charakterisierungsmöglichkeit
Chlorophyllkonzentration
Computerspielemarkt
Deindustrialisieren
Dekodierungsmöglichkeit
Kartoffelschälmesser
Kernspinresonanztomographie
Merkmalskombination
Nachbarschaftszentren
Opportunitätsprinzip
Tiefenstaffelung
Tourismusfachmann
Sequenzbetrachtung
Слова с ошибками
Dechifrierprogramm
Administratorkenwort
Spigeln
Tätigkeite
Draufgangertum
Abschnit
Komunikation
Drackereicode
Bumeln

View File

@ -1,116 +0,0 @@
Alpinist
Alteration
Alternative
Alumne
Amateurfilmer
Ambulanz
Amtmänner
Analogie
Analytik
Ananas
Angabe
Ankünfte
Dynastie
Ebenbürtigkeit
Echtheitszertifikat
Editionspläne
Editor
Ehrenamtlichkeit
Eigentümerschaft
Einbau
Eindringling
Eingabequittungsbetrieb
Einhüllen
Einkommen
Einloggen
Einschließen
Einsortier
Elaboration
Elementar
Entertainer
Entkuppeln
Entschädigungs
Enumerator
Erbringen
Erdichten
Erfahrenheit
Erhalt
Erleichtern
Ersparnis
Erstatten
Erzählliteratur
Helikopter
Helpdesk
Herunterladen
Hindeuten
Hinterlassenschaft
Hiob
Landesprache
flexibilität
floristisch
flugbillet
heroben
herrichten
herstellen
herübereilen
herunterzubücken
hie
hieraus
hilfe
himbeere
justiz
kältebeständig
kärtchen
känguru
kaktusgewächs
kalligrafie
kamel
kampagnendirektor
kapazitär
kapitalist
karamell
kardieren
karpfen
katalogdaten
lyzeum
mahagonirot
makkaroni
malerausbildung
management
mangel
maniküre
manneskraft
mansarde
mark
marketingpraktiker
maschinell
massage
massengutschifffahrt
materie
medaille
medizinalshampoo
meeresfrüchte
quotient
salonwagen
satzeinleitend
trilateral
tristesse
tropen
vereisen
verfahren
verfügungs
verhindern
verkäufer
Слова с ошибками
Anbindungsystem
Anglistikdocent
Ecco
Economclass
Einverstandnis
Electrik
Historique
herüberzurucken
kartofel
salade
sanddornbere

View File

@ -1,211 +0,0 @@
Hallo
Guten Morgen
Danke
Bitte
Ja
Nein
Entschuldigung
Tschüss
Liebe
Freund
Familie
Glück
Gesundheit
Schule
Arbeit
Essen
Trinken
Wasser
Brot
Käse
Fleisch
Gemüse
Obst
Kaffee
Tee
Milch
Zucker
Salz
Pfeffer
Haus
Wohnung
Bett
Stuhl
Tisch
Sofa
Fernseher
Telefon
Computer
Buch
Zeitung
Schreiben
Lesen
Hören
Sehen
Fühlen
Laufen
Springen
Schwimmen
Tanzen
Singen
Lachen
Weinen
Freude
Trauer
Angst
Mut
Liebe
Hass
Freundschaft
Beziehung
Familie
Eltern
Kinder
Geschwister
Großeltern
Onkel
Tante
Cousin
Cousine
Ehemann
Ehefrau
Verlobung
Hochzeit
Scheidung
Geburt
Tod
Krankheit
Arzt
Krankenhaus
Medikament
Apotheke
Gesundheit
Wohlbefinden
Fitness
Diät
Schlaf
Ruhe
Entspannung
Sport
Fußball
Tennis
Schwimmen
Laufen
Radfahren
Wandern
Reisen
Urlaub
Strand
Sonne
Meer
Komplementär
Perspektive
Konsens
Integrität
Konsequenz
Authentizität
Korrelation
Charakteristik
Akzeptanz
Flexibilität
Assoziation
Dekomposition
Komplexität
Positivismus
Universalität
Stabilität
Individualität
Konsistenz
Konformität
Dezentralisierung
Kollaboration
Partizipation
Präzision
Transformation
Konkurrenz
Paradoxie
Redundanz
Regeneration
Integration
Isolation
Asymmetrie
Aggregation
Disziplin
Resilienz
Relevanz
Konfusion
Komplikation
Koordination
Harmonie
Ineffizienz
Konstruktion
Konversion
Kollusion
Gerontologie
Differenzierung
Dimensionalität
Inferenz
Fluktuation
Kontraktion
Rezession
Inflation
Dekontamination
Exzellenz
Innovation
Isomorphie
Konnotation
Insuffizienz
Konversion
Kompensation
Koalition
Inkongruenz
Inkontinenz
Kontrahent
Konfiskation
Konjunktur
Aggression
Konfrontation
Kompatibilität
Prognose
Akzeleration
Konstruktion
Diversifikation
Prävention
Sanktion
Indikation
Reduktion
Konkurrenz
Konfiguration
Konnotation
Rezession
Transformation
Interaktion
Kooperation
Innovation
Kollision
Proklamation
Konnotation
Konfrontation
Disposition
Konkordanz
Deklamation
Kollaboration
Isolation
Inflation
Diversifikation
Konnotation
Kompensation
Diffusion
Dekadenz
Konserve
Deklomotion
Kolaboration
Isollation
Infllation
Divirsifikation
Konotation
Kompenssation
Difusion
Dekadens
Kanzerve

View File

@ -1,123 +0,0 @@
Αβαντάζ
Αβασταγά
Αβγάτισες
αβέβαιο
αβέλτερο
αβέλτεροι
αβίαστους
άβλαβοι
αβοκάντο
αβράδιαστης
άβραστη
αβράχυντου
άβρεχτα
αβρή
αβρότης
άβυσσον
αγαθόν
αγαθούς
αγάλακτο
αγγούρι
αγελαδινού
αγέρα
αγεωμέτρητων
αγίνωτοι
άγκυρες
αγορεύσεις
αγόρευσή
αγορίνα
Αγοριού
Αγροληψία
Αρμόνια
βγαίνοντας
βεβαιώσεων
διάθεση
διαίρεση
Διαιρέσου
Διαιτολογίου
διαψεύσουν
διδασκάλισσας
ενασκήσεις
ενασχόληση
ενασχόλησή
ενδείξεις
ενδεχόμενον
ενδιαμέσου
Επιστήθιες
Επιστημο
Επιστολές
Επιστολή
εύπορους
ευρέα
ευρημάτων
ευρύτητά
ευσταθών
εύστροφα
ευσυνειδησία
εύτακτε
ευτελείς
ευτελίζουν
ιδρυτικό
ιεροψάλτες
Ιζόλα
Ιθαγένειάς
ικανότατος
ιλαρότης
κεφαλής
κεφαλιάτικες
κεφαλωτές
κήπε
κήπευση
Κήρυξής
Λεξικογραφιών
Λεξιλογικός
λεοντή
λεοντής
ολιγοχρόνιου
ολικέ
ολικές
ολική
πελαγώνω
πελατών
πελάων
προστατεύει
προστασίας
σούρουπου
σουρούπωμα
σούρτης
Σούρωνα
Σπαγέτα
Σφάλμα
Σφάλματά
σφικτά
σφικτέ
σφοδρότητας
σφοδρού
σφραγίσω
σχεδιάζουμε
σχεδιάζουν
σχηματίσου
σχηματίσουμε
σχολιάζεσαι
Σχολιάζεστε
Ενδιαφέροντα
Слова с ошибками
Αβασiλευτου
αγαπούσαv
βeβαιωμένοι
εvασxόλησης
επιολικέ
ιδιωτικοποιήσειc
λεπταίσθnτη
πρoστιμάρισμα
σφάλμαtα
προστάτεuε
κεxριμπαριού
διαισθnτικότητες
αγκιστpώσουv
αγαθoεργiας
αβεβαιoτητά
αγέρεc
διδαούμε
εuσταθειώv

View File

@ -1,116 +0,0 @@
Acknowledge
acrophobia
adventurousness
aeronautics
algal
Alligator
allegation
alphabetise
Analogy
appropriable
assembly
attempt
Average
barbecue
bathtub
begun
belongingness
Better
binary
blackberry
boatswain
bow-tie
brambly
bright-eyed
bubble
Calender
cancellous
cantankerousness
carefree
categorized
cellular
chaos
cheerfulise
childlike
circumstance
close-mouthed
Cocoa
coherent
co-located
Colours
controversial
cottage
creditworthiness
cut-down
dedicated
deep-freeze
Definitive
Designs
digital
distensible
dollar
dyslexia
Egyptian
effectively
etiquette
excess
exotica
fairly
feedback
features
figure's
fjord
forty-seven
government
haematomata
helpless
homologous
implant
Indemnify
inexpert
interior
localises
loquaciousness
maelstrom
mechanizable
melodious
mezzo-soprano
mozzie
municipalisation
mystifier
Neoclassicism
newsletter
non-professional
officiation
orientalisation
palaeoanthropography
parrot
pickpocket
pioneer
cryptanalytic
simplifying
sommelier
spicy
steward
subcontinental
swimwear
Technical
trajectory
wholesomeness
Advantageously
interindustry
red-eye
sub-group
Слова с ошибками
Acredited
agressive
appreciativiness
aritmetical
biosyntesized
lisense
paranoa
fotoelectronic
semi transparent
synonymus
wordprocessing

View File

@ -1,125 +0,0 @@
admire
admittance
aggrandizement
Airmen
Albatross
amateur
angling
apparatus
Architecture
assessment
attempt's
awakening
backgrounder
Balance's
barometric
bashfulness
beautiful
belletristic
blatancy
bonbon
border
Bottom
bountifulness
breakpoints
bulkiness
businesslike
can't
cash
castle
Casual
cauliflower
celebrity
childish
chokecherry
choreographically
chronological
classification
clearheaded
coalesce
Coexistence
collaborative
coloured's
concentration
draconian
drainpipe
demonstrativeness
dependence
dependency
dream
duplication
epidemiological
equitable
Essence
Exemption
exonerate
fainthearted
falsification
ferromagnetic
flammable
fraternization
French
frontier
gadget
galleria
Gallery
gateaux
geocache
ginger
glace
glacier
globalization
hockey
holiday
housemate
intensifier
joystick
Language
leaseholder
non-breakable
northerly
o'clock
oeuvre
openhandedness
oscillation
outface
outlaw
overladen
package
palazzo
panama
Paragraphs
Parliament
particular
pasteurization
pathogen
perception
phenomena
philanthropically
physical
populations
repugnance
request
resplendence
retroactive
rigidity
schedule's
School
scintillation
sensibility
settlement
taxiway
bereft
Слова с ошибками
acomplishment
anihilate
caprise
chambre
etnographically
horsmanship
innundation
lemongras
omelete
retorical
shepishness

View File

@ -1,122 +0,0 @@
Abbreviation
Acceptability
acquirable
Addressee
afterthought
airworthiness
all-powerful
amateurishness
amorphousness
anthology
Auspiciousness
Bibliographer
Bilberry
birthday
bodyguard
broadleaved
brontosaurus
bumptiousness
Cabaret
Californian
calumny
cancellation
cantonal
capitalize
careful
carry-on
casino
clown
co-ordinate
cockleshell
decennial
deckchair
decryption
deep-freeze
Democracy
financial
fish-plate
Flamenco
housing
Hybrid
hydroelectricity
iceboat
ichthyology
idiomatic
ill-humoured
imperatrix
individuality
interocular
intrasectoral
ironwoods
Jolliness
Jurisprudent
knowledgable
kopeks
labour-intensive
laboratory
lake
language
larynx
latching
leakiness
License
licensed
licensee
life-threatening
linguistics
long-lived
machinable
mainsheet
Major
malleability
man-hour
Mango
ninety-five
nobody
non-blocking
non-judicial
nonconforming
north-Western
nutritiousness
quasi-synchronous
question
racoon
radish
Railway
Rarity
saucer
Save
Saying
supplely
tallish
target
Taxi
teach-in
technician
ultramodern
umbrae
uncertainness
unconstitutionality
washing
wasn't
waxen
weather
well-formed
what's-his-name
whereupon
Wi-Fi
Wikipedia
Слова с ошибками
Abstractnes
advantageusness
arhythmical
autosuggestibility
kaptor
coldshouldering
humaneneses
imaginativness
knight-erantry
magasine
night-wachman
qualifidly

View File

@ -1,216 +0,0 @@
apple
banana
cat
dog
egg
fish
gold
house
ice
juice
kite
lion
mouse
night
orange
pencil
queen
rabbit
sun
tea
umbrella
vase
watch
xylophone
yellow
zebra
arrow
book
cake
car
day
elephant
flower
hat
island
jelly
king
lamp
moon
nose
owl
pink
quilt
radio
sunflower
tree
unicorn
violin
water
xylophone
yellow
zoo
apple juice
blue
calculator
desk
elephant
fire
goat
hat
ice cream
jacket
key
lemon
map
notebook
owl
pear
quilt
rose
soccer
table
umbrella
vegetable
whale
xylophone
yellow
zebra
apple pie
beach
computer
drum
elephant
goat cheese
hat
ice skate
juice box
kite festival
lemonade
mountain
notebook paper
orange juice
pizza
queen bee
rainbow
snow
turtle
umbrella hat
valley
Aberration
Absolution
Acquiesce
Adumbrate
Aesthete
Altruistic
Ambivalent
Anomalous
Antediluvian
Antipathy
Aphorism
Apocryphal
Apostasy
Apparition
Arduous
Assiduous
Audacious
Austere
Autonomy
Avaricious
Axiomatic
Baleful
Bellicose
Belligerent
Bereft
Bilious
Bombastic
Cacophony
Capricious
Cartography
Castigate
Clandestine
Coalesce
Cogent
Cognizant
Colloquy
Concomitant
Confabulate
Congenial
Conundrum
Copious
Corpulent
Coven
Credulous
Culpable
Dearth
Debilitate
Deleterious
Denigrate
Despondent
Diatribe
Dilapidated
Disparage
Dissemble
Dissonance
Duplicity
Ebullient
Egregious
Ephemeral
Equanimity
Esoteric
Euphemism
Evanescent
Exacerbate
Exhort
Expatriate
Extol
Facetious
Fatuous
Feckless
Felicitous
Feral
Fervent
Fetter
Flummox
Fractious
Garrulous
Hegemony
Iconoclast
Idiosyncrasy
Ignominious
Impecunious
Ineffable
Inexorable
Inscrutable
Insidious
Intrepid
Intransigent
Invective
Irascible
Juxtapose
Kowtow
Languid
Lassitude
Lurid
Malinger
Maudlin
Mawkish
Mendacious
Metaphysical
Antransigent
Inwective
Iracible
Juxtopose
Kovtow
Langued
Lasitude
Larid
Mallinger
Haudlin
Mavkish
Mendocious
Mitaphysical
timeline
rollout
workshopped
deliverables

Some files were not shown because too many files have changed in this diff Show More