From 108d40beb99ca900e4117db126120e930f720531 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 24 Sep 2008 21:01:33 +0000 Subject: [PATCH] Fix of Ctrl+F vs HelpWindow problem git-svn-id: svn://ultimatepp.org/upp/trunk@480 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/src.tpp/Size$en-us.tpp | 3 +- uppsrc/Core/src.tpp/Thread$en-us.tpp | 58 ++- uppsrc/RichText/ParseQtf.cpp | 2 +- uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp | 566 ++++++++++++----------- uppsrc/ide/Assist.cpp | 20 +- uppsrc/ide/Help.cpp | 2 + uppsrc/ide/app.tpp/Blitz$en-us.tpp | 99 +++- uppsrc/ide/app.tpp/Blitz$en-us.tppi | 18 +- uppsrc/ide/app.tpp/Sponsor$en-us.tpp | 3 +- 9 files changed, 457 insertions(+), 314 deletions(-) diff --git a/uppsrc/Core/src.tpp/Size$en-us.tpp b/uppsrc/Core/src.tpp/Size$en-us.tpp index 032e75031..1ad4d7414 100644 --- a/uppsrc/Core/src.tpp/Size$en-us.tpp +++ b/uppsrc/Core/src.tpp/Size$en-us.tpp @@ -1,4 +1,5 @@ -topic "Size";[ $$0,0#00000000000000000000000000000000:Default] +topic "Size"; +[ $$0,0#00000000000000000000000000000000:Default] [i448;a25;kKO9;*@(64) $$1,0#37138531426314131252341829483380:class] [l288;b25;2 $$2,0#27521748481378242620020725143825:desc] [i450;kKO9;*@(64)2 $$3,0#37138531426314131252341829483370:item] diff --git a/uppsrc/Core/src.tpp/Thread$en-us.tpp b/uppsrc/Core/src.tpp/Thread$en-us.tpp index 7c2aff14e..ddb74d823 100644 --- a/uppsrc/Core/src.tpp/Thread$en-us.tpp +++ b/uppsrc/Core/src.tpp/Thread$en-us.tpp @@ -1,7 +1,51 @@ -TITLE("class Thread") -COMPRESSED -120,156,181,85,107,111,219,54,20,253,43,68,210,14,118,230,24,124,74,148,252,37,64,27,12,67,183,22,168,51,236,131,225,86,180,77,39,92,101,202,16,169,100,193,176,252,246,93,202,150,26,215,178,157,173,152,13,88,52,197,123,238,185,231,62,56,161,232,213,43,60,192,231,248,196,39,125,171,151,170,202,253,116,98,56,151,35,69,197,232,203,187,15,201,232,226,170,23,241,126,64,33,128,194,98,194,164,96,132,211,8,126,8,35,84,80,198,137,164,9,151,140,73,156,206,115,229,220,116,146,83,41,71,193,136,14,232,57,141,5,37,49,151,92,18,22,75,10,182,20,99,138,99,42,8,103,146,138,116,161,221,124,58,81,146,141,46,62,70,96,196,130,39,0,199,36,162,60,230,20,51,76,57,184,34,82,114,18,11,201,146,40,74,231,106,237,77,97,183,190,12,33,148,140,102,36,30,1,231,167,167,167,33,225,120,195,128,3,24,193,28,168,18,216,195,156,198,68,36,56,17,146,72,204,0,92,196,88,164,107,85,170,213,225,208,197,201,208,99,156,26,175,1,226,226,71, -66,98,48,137,6,209,57,225,49,4,42,25,23,50,198,224,156,82,202,24,37,140,38,9,21,145,136,211,59,173,22,186,132,16,56,137,106,178,241,32,62,23,66,112,56,207,185,136,37,167,12,114,195,25,7,41,56,73,4,79,4,77,173,118,94,47,178,203,141,108,155,240,91,226,129,119,64,146,3,121,30,241,40,33,160,62,79,98,142,147,136,196,44,136,71,64,246,136,113,154,136,22,105,155,181,191,62,255,253,250,250,253,229,111,99,52,113,100,244,46,205,224,123,115,87,2,201,176,170,15,165,87,24,77,94,99,124,137,241,85,15,15,241,144,10,209,71,91,251,102,31,84,67,159,155,191,104,131,48,253,97,58,113,116,132,174,45,36,206,85,185,10,201,67,197,18,249,250,245,16,161,112,0,143,234,135,216,115,254,177,178,89,47,44,222,168,60,159,169,249,151,172,159,118,16,153,21,69,222,58,110,41,0,103,176,111,247,123,205,234,211,115,192,79,168,89,117,0,48,52,159,181,219,253,38,150,177,87,165,119,72,33,171,31,154,56,142,70,241,187,50,30,194,232,164,110, -172,239,100,30,108,190,82,111,125,135,109,135,150,69,137,92,96,161,23,91,2,200,23,104,105,172,113,119,67,212,203,206,254,40,140,205,206,250,199,105,253,236,62,172,117,208,183,63,47,172,243,233,51,86,141,227,231,194,126,147,96,224,184,1,216,125,223,235,127,45,129,26,182,97,190,241,139,74,189,46,181,211,182,22,176,172,172,53,246,246,69,34,214,170,31,44,134,32,135,55,115,52,221,87,248,190,48,139,78,137,107,196,255,177,60,182,153,81,54,68,237,171,210,58,100,86,43,189,48,202,235,252,17,245,30,139,10,205,149,181,133,175,211,90,103,213,223,233,189,140,66,141,192,158,113,112,216,233,19,57,29,231,90,175,179,30,84,213,247,138,19,128,246,197,57,89,185,12,173,92,135,38,1,173,14,80,161,91,115,175,45,178,213,106,166,203,48,9,86,38,207,141,211,80,44,11,119,170,96,199,55,59,125,116,36,176,131,35,33,128,116,52,214,77,89,105,4,26,219,162,209,255,65,185,182,201,30,181,63,78,237,39,237,223,20,149,245,47,165,119,168,237,27,156,14,134, -239,91,197,118,219,230,132,104,227,187,202,47,138,7,187,217,113,47,37,120,184,48,118,241,58,136,142,53,148,127,40,228,236,172,57,156,157,161,101,174,110,81,97,79,102,248,191,209,61,150,238,147,132,55,185,95,126,27,90,93,1,115,104,127,125,98,52,101,79,207,254,239,16,206,158,158,81,217,222,136,251,254,223,194,125,92,86,115,95,148,195,102,76,66,55,120,99,43,237,218,100,247,194,28,129,41,97,194,20,89,23,206,153,89,174,195,144,104,103,199,102,90,236,12,136,221,71,115,185,255,90,121,253,231,247,220,237,53,64,195,190,243,10,111,93,92,91,175,203,67,151,223,193,34,171,173,58,148,58,238,235,23,173,238,245,191,246,85,91,157,242,5,143,233,63,157,88,44,124, - +topic "class Thread"; +[2 $$0,0#00000000000000000000000000000000:Default] +[i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483380:class] +[l288;2 $$2,2#27521748481378242620020725143825:desc] +[a83;*R6 $$3,0#31310162474203024125188417583966:caption] +[l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param] +[i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item] +[*+117 $$6,6#14700283458701402223321329925657:header] +[l416;2 $$7,7#55548704457842300043401641954952:nested`-desc] +[l288;i448;a25;kO9;*2 $$8,8#64691275497409617375831514634295:nested`-class] +[{_}%EN-US +[s1;K:`:`:Thread`:`:class:%- [@0 Thread]&] +[s2; Encapsulation of thread.&] +[s0; &] +[s5;K:`:`:Thread`:`:Run`(`:`:Callback`):%- [@(0.0.255) bool]_[@0 Run]([^`:`:Callback^ Callb +ack]_[@3 cb])&] +[s2; Starts a new thread.&] +[s0; &] +[s5;K:`:`:Thread`:`:Wait`(`):%- [@(0.0.255) int]_[@0 Wait]()&] +[s2; Waits for started thread to finish. (`"join`").&] +[s0; &] +[s5;K:`:`:Thread`:`:IsOpen`(`)const:%- [@(0.0.255) bool]_[@0 IsOpen]()_[@(0.0.255) const]&] +[s2; Thread represents a running thread.&] +[s0; &] +[s5;K:`:`:Thread`:`:Start`(`:`:Callback`):%- static [@(0.0.255) void]_[@0 Start]([^`:`:Callback^ C +allback]_[@3 cb])&] +[s2; Starts a thread and returns immediately (you cannot Wait for +the thread to finish in this case).&] +[s0; &] +[s5;K:`:`:Thread`:`:Sleep`(int`):%- static [@(0.0.255) void]_[@0 Sleep]([@(0.0.255) int]_[@3 m +s])&] +[s2; Sleep for a given number of milliseconds.&] +[s0; &] +[s5;K:`:`:Thread`:`:IsST`(`):%- static [@(0.0.255) bool]_[@0 IsST]()&] +[s2; True is no thread was started yet.&] +[s0; &] +[s5;K:`:`:Thread`:`:GetCount`(`):%- static [@(0.0.255) int]_[@0 GetCount]()&] +[s2; Number of running threads.&] +[s0; &] +[s5;K:`:`:Thread`:`:ShutdownThreads`(`):%- static [@(0.0.255) void]_[@0 ShutdownThreads]( +)&] +[s2; Sets the `"Shutdown`" flag on.&] +[s0; &] +[s5;K:`:`:Thread`:`:IsShutdownThreads`(`):%- static [@(0.0.255) bool]_[@0 IsShutdownThrea +ds]()&] +[s2; True if ShutdownThreads was called.&] +[s0; &] +[s5;K:`:`:Thread`:`:`~`:`:Thread`(`):%- `~[@0 Thread]()&] +[s2; Destructor. Thread continues running (and it is impossible to +Wait for finish).&] +[s0; ] \ No newline at end of file diff --git a/uppsrc/RichText/ParseQtf.cpp b/uppsrc/RichText/ParseQtf.cpp index 9a28cb819..551a9992e 100644 --- a/uppsrc/RichText/ParseQtf.cpp +++ b/uppsrc/RichText/ParseQtf.cpp @@ -551,7 +551,7 @@ void RichQtfParser::Parse(const char *qtf, byte _accesskey) case '/': format.Italic(!format.IsItalic()); break; case '*': format.Bold(!format.IsBold()); break; case '_': format.Underline(!format.IsUnderline()); break; - case 't': format.NonAntiAliased(!format.IsNonAntiAliased()); break; + case 'T': format.NonAntiAliased(!format.IsNonAntiAliased()); break; case '-': format.Strikeout(!format.IsStrikeout()); break; case 'c': format.capitals = !format.capitals; break; case 'd': format.dashed = !format.dashed; break; diff --git a/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp index a28cd12ad..9a3a2d1f3 100644 --- a/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp +++ b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp @@ -1,9 +1,10 @@ -topic "QTF";[2 $$0,0#00000000000000000000000000000000:Default] +topic "QTF"; +[2 $$0,0#00000000000000000000000000000000:Default] [@(128.0.255)2 $$1,0#65874547464505293575048467215454:QTF Chr] [*/+117 $$2,0#07143242482611002448121871408047:title] [*C@3+75 $$3,3#36268203433472503231438721581057:code] [{_}%EN-US -[s0;=*8 QTF&] +[s0;= [*8 QTF]&] [s0; &] [s0; QTF is the native format of Ultimate`+`+ rich texts (formatted texts).&] @@ -14,7 +15,7 @@ Other are interpreted as characters or formatting commands.&] [s0; Letters ([@4 a]`-[@4 zA]`-[@4 Z]), numbers ([@4 0]`-[@4 9]), space (32) and characters&] [s0; &] -[s0;*@4 . , ; ! ? % ( ) / < > #&] +[s0; [*@4 . , ; ! ? % ( ) / < > #]&] [s0; &] [s0; and bytes greater than 127 are guaranteed to be never used as command characters (not even in future versions of QTF). Other @@ -32,16 +33,16 @@ of inch.&] [s0; Colors are described as either number [@(128.0.255) 0]`-[@(128.0.255) 9], with meaning&] [s0; &] -[ {{1000:1000:1000:1000:1000:1000:1000:1000:1000:1000<96;>96;f4; [s0;* [%00-00 0]] -:: [s0;* [%00-00 1]] -:: [s0;* [%00-00 2]] -:: [s0;* [%00-00 3]] -:: [s0;* [%00-00 4]] -:: [s0;* [%00-00 5]] -:: [s0;* [%00-00 6]] -:: [s0;* [%00-00 7]] -:: [s0;* [%00-00 8]] -:: [s0;* [%00-00 9]] +[ {{1000:1000:1000:1000:1000:1000:1000:1000:1000:1000<96;>96;f4; [s0;%- [* 0]] +:: [s0;%- [* 1]] +:: [s0;%- [* 2]] +:: [s0;%- [* 3]] +:: [s0;%- [* 4]] +:: [s0;%- [* 5]] +:: [s0;%- [* 6]] +:: [s0;%- [* 7]] +:: [s0;%- [* 8]] +:: [s0;%- [* 9]] ::l/0r/0t/0b/0@0 [s0; ] ::@1 [s0; ] ::@2 [s0; ] @@ -52,28 +53,28 @@ with meaning&] ::@7 [s0; ] ::@8 [s0; ] ::@9 [s0; ] -::l/25r/25t/15b/15@2 [s0;1 [%00-00 Black]] -:: [s0;1 LtGray] -:: [s0;1 White] -:: [s0;1 [%00-00 Red]] -:: [s0;1 [%00-00 Green]] -:: [s0;1 [%00-00 Blue]] -:: [s0;1 [%00-00 LtRed]] -:: [s0;1 [%00-00 WhiteGray]] -:: [s0;1 [%00-00 LtCyan]] -:: [s0;1 [%00-00 Yellow]]}}&] +::l/25r/25t/15b/15@2 [s0;%- [1 Black]] +:: [s0; [1 LtGray]] +:: [s0; [1 White]] +:: [s0;%- [1 Red]] +:: [s0;%- [1 Green]] +:: [s0;%- [1 Blue]] +:: [s0;%- [1 LtRed]] +:: [s0;%- [1 WhiteGray]] +:: [s0;%- [1 LtCyan]] +:: [s0;%- [1 Yellow]]}}&] [s0; &] [s0; or letters&] [s0; &] -[ {{1109:1109:1109:1109:1109:1109:1109:1109:1128<96;>96;f4; [s0;*C@(128.0.255) [%00-00 b]] -:: [s0;*C@(128.0.255) [%00-00 c]] -:: [s0;*C@(128.0.255) [%00-00 g]] -:: [s0;*C@(128.0.255) [%00-00 k]] -:: [s0;*C@(128.0.255) [%00-00 l]] -:: [s0;*C@(128.0.255) [%00-00 m]] -:: [s0;*C@(128.0.255) [%00-00 o]] -:: [s0;*C@(128.0.255) [%00-00 r]] -:: [s0;*C@(128.0.255) [%00-00 y]] +[ {{1109:1109:1109:1109:1109:1109:1109:1109:1128<96;>96;f4; [s0;%- [*C@(128.0.255) b]] +:: [s0;%- [*C@(128.0.255) c]] +:: [s0;%- [*C@(128.0.255) g]] +:: [s0;%- [*C@(128.0.255) k]] +:: [s0;%- [*C@(128.0.255) l]] +:: [s0;%- [*C@(128.0.255) m]] +:: [s0;%- [*C@(128.0.255) o]] +:: [s0;%- [*C@(128.0.255) r]] +:: [s0;%- [*C@(128.0.255) y]] ::l/0r/0t/0b/0@5 [s0; ] ::@(0.128.128) [s0; ] ::@4 [s0; ] @@ -83,25 +84,25 @@ with meaning&] ::@(128.128.0) [s0; ] ::@3 [s0; ] ::@9 [s0; ] -::l/25r/25t/15b/15@2 [s0;1 [%00-00 Blue]] -:: [s0;1 [%00-00 Cyan]] -:: [s0;1 [%00-00 Green]] -:: [s0;1 [%00-00 Black]] -:: [s0;1 [%00-00 LtGray]] -:: [s0;1 [%00-00 Magenta]] -:: [s0;1 [%00-00 Brown]] -:: [s0;1 [%00-00 Red]] -:: [s0;1 [%00-00 Yellow]]}}&] +::l/25r/25t/15b/15@2 [s0;%- [1 Blue]] +:: [s0;%- [1 Cyan]] +:: [s0;%- [1 Green]] +:: [s0;%- [1 Black]] +:: [s0;%- [1 LtGray]] +:: [s0;%- [1 Magenta]] +:: [s0;%- [1 Brown]] +:: [s0;%- [1 Red]] +:: [s0;%- [1 Yellow]]}}&] [s0; &] -[ {{1109:1109:1109:1109:1109:1109:1109:1109:1128<96;>96;f4; [s0;*@(128.0.255) [%00-00 B]] -:: [s0;*@(128.0.255) [%00-00 C]] -:: [s0;*@(128.0.255) [%00-00 G]] -:: [s0;*@(128.0.255) [%00-00 K]] -:: [s0;*@(128.0.255) [%00-00 L]] -:: [s0;*@(128.0.255) [%00-00 M]] -:: [s0;*@(128.0.255) [%00-00 W]] -:: [s0;*@(128.0.255) [%00-00 R]] -:: [s0;*@(128.0.255) [%00-00 Y]] +[ {{1109:1109:1109:1109:1109:1109:1109:1109:1128<96;>96;f4; [s0;%- [*@(128.0.255) B]] +:: [s0;%- [*@(128.0.255) C]] +:: [s0;%- [*@(128.0.255) G]] +:: [s0;%- [*@(128.0.255) K]] +:: [s0;%- [*@(128.0.255) L]] +:: [s0;%- [*@(128.0.255) M]] +:: [s0;%- [*@(128.0.255) W]] +:: [s0;%- [*@(128.0.255) R]] +:: [s0;%- [*@(128.0.255) Y]] ::l/0r/0t/0b/0@(0.0.255) [s0; ] ::@8 [s0; ] ::@(0.255.0) [s0; ] @@ -111,31 +112,32 @@ with meaning&] ::@2 [s0; ] ::@6 [s0; ] ::@(255.255.180) [s0; ] -::l/25r/25t/15b/15@2 [s0;1 [%00-00 LtBlue]] -:: [s0;1 [%00-00 LtCyan]] -:: [s0;1 [%00-00 LtGreen]] -:: [s0;1 [%00-00 Gray]] -:: [s0;1 [%00-00 WhiteGray]] -:: [s0;1 [%00-00 LtMagenta]] -:: [s0;1 [%00-00 White]] -:: [s0;1 [%00-00 LtRed]] -:: [s0;1 [%00-00 LtYellow]]}}&] +::l/25r/25t/15b/15@2 [s0;%- [1 LtBlue]] +:: [s0;%- [1 LtCyan]] +:: [s0;%- [1 LtGreen]] +:: [s0;%- [1 Gray]] +:: [s0;%- [1 WhiteGray]] +:: [s0;%- [1 LtMagenta]] +:: [s0;%- [1 White]] +:: [s0;%- [1 LtRed]] +:: [s0;%- [1 LtYellow]]}}&] [s0; &] [s0; or as the RGB value in form&] [s0; &] -[s0;@(128.0.255) ([/@(0.0.255) number].[/@(0.0.255) number].[/@(0.0.255) number])&] +[s0; [@(128.0.255) (][/@(0.0.255) number][@(128.0.255) .][/@(0.0.255) number][@(128.0.255) .][/@(0.0.255) n +umber][@(128.0.255) )]&] [s0;@(128.0.255) &] [s0; where [/@(0.0.255) number] is 0`-255.&] [s0; &] -[s0;/@(0.0.255) [/@0 Form with single ]number&] +[s0; Form with single [/@(0.0.255) number]&] [s0; &] -[s0;@(128.0.255) ([/@(0.0.255) number])&] +[s0; [@(128.0.255) (][/@(0.0.255) number][@(128.0.255) )]&] [s0;@(128.0.255) &] [s0; specifies grays.&] [s0; &] [s0; Letter&] [s0; &] -[s0;@(128.0.255) N&] +[s0; [@(128.0.255) N]&] [s0;@(128.0.255) &] [s0; used in place of color designates transparent color.&] [s0; &] @@ -143,13 +145,13 @@ with meaning&] [s2; Basic QTF codes&] [s0; &] [s0; &] -[ {{2003:7997<96;>96; [s0;C@(128.0.255) `_] +[ {{2003:7997<96;>96; [s0; [C@(128.0.255) `_]] :: [s0; Hard`-space `- space that cannot be divided at the end of line.] -:: [s0;C@(128.0.255) `&] +:: [s0; [C@(128.0.255) `&]] :: [s0; New paragraph.] -:: [s0;C@(128.0.255) `-`|] +:: [s0; [C@(128.0.255) `-`|]] :: [s0; Tabulator] -:: [s0;C@(128.0.255) `@`$[*@(0.0.255) hex][%00-00 ;]] +:: [s0;%- [%%C@(128.0.255) `@`$][%%*C@(0.0.255) hex][C@(128.0.255) ;]] :: [s0; Unicode character as hexadecimal number.]}}&] [s0; &] [s0; &] @@ -157,224 +159,226 @@ with meaning&] [s0; &] [s0; Character and paragraph formatting starts with&] [s0;@(128.0.255) &] -[s0;@(128.0.255) `[&] +[s0; [@(128.0.255) `[]&] [s0;@(128.0.255) &] [s0; character followed by [*/ character/paragraph formating][/ sequence] ended with single space character and applies to the text until matching&] [s0; &] -[s0;@(128.0.255) `]&] +[s0; [@(128.0.255) `]]&] [s0;@(128.0.255) &] [s0; is encountered.&] [s0; &] -[ {{1879:8121^@(229.229.248)-1 [s0;*/ Character/paragraph formating sequence] -::=@2 [s0; ] -::^ [s0;C@(128.0.255) [%00-00 /]] +[ {{1879:8121^@(229.229.248)-1 [s0; [*/ Character/paragraph formating sequence]] +::=@2 [s0;%- ] +::^ [s0;%- [C@(128.0.255) /]] ::= [s0; Italic.] -::^ [s0;C@(128.0.255) [%00-00 `*]] +::^ [s0;%- [C@(128.0.255) `*]] ::= [s0; Bold.] -::^ [s0;C@(128.0.255) [%00-00 `_]] +::^ [s0;%- [C@(128.0.255) `_]] ::= [s0; Underline.] -::^ [s0;C@(128.0.255) [%00-00 `-]] +::^ [s0;%- [C@(128.0.255) `-]] ::= [s0; Strikeout.] -::^ [s0;C@(128.0.255) [%00-00 c]] +::^ [s0;%- [C@(128.0.255) c]] ::= [s0; Capitals.] -::^ [s0;C@(128.0.255) [%00-00 ``]] +::^ [s0;%- [C@(128.0.255) ``]] ::= [s0; Superscript.] -::^ [s0;C@(128.0.255) [%00-00 ,]] +::^ [s0;%- [C@(128.0.255) ,]] ::= [s0; Subscript.] -::^ [s0;C@(128.0.255) [%00-00 d]] +::^ [s0;%- [C@(128.0.255) d]] ::= [s0; Dashed underline.] -::^ [s0;C@(128.0.255) [%00-00 t]] +::^ [s0;%- [C@(128.0.255) T]] ::= [s0; Non anti aliased font.] -::^ [s0;C@(128.0.255) [%00-00 `^][%00-00/@(0.0.255) text][%00-00 `^]] +::^ [s0;%- [C@(128.0.255) `^][/C@(0.0.255) text][C@(128.0.255) `^]] ::= [s0; Hyperlink.] -::^ [s0;C@(128.0.255) [%00-00 I][%00-00/@(0.0.255) text][%00-00 ;]] +::^ [s0;%- [C@(128.0.255) I][/C@(0.0.255) text][C@(128.0.255) ;]] ::= [s0; Index entry.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) `+][%00-00 number]] +::^ [s0;%- [C@(128.0.255) `+][/C@(0.0.255) number]] ::= [s0; Font height in dots.] -::^ [s0;C@(128.0.255) [%00-00 0]] +::^ [s0;%- [C@(128.0.255) 0]] ::= [s0; Font height 50 dots (6 points).] -::^ [s0;C@(128.0.255) [%00-00 1]] +::^ [s0;%- [C@(128.0.255) 1]] ::= [s0; Font height 67 dots (8 points).] -::^ [s0;C@(128.0.255) [%00-00 2]] +::^ [s0;%- [C@(128.0.255) 2]] ::= [s0; Font height 84 dots (10 points).] -::^ [s0;C@(128.0.255) [%00-00 3]] +::^ [s0;%- [C@(128.0.255) 3]] ::= [s0; Font height 100 dots (12 points).] -::^ [s0;C@(128.0.255) [%00-00 4]] +::^ [s0;%- [C@(128.0.255) 4]] ::= [s0; Font height 134 dots (16 points).] -::^ [s0;C@(128.0.255) [%00-00 5]] +::^ [s0;%- [C@(128.0.255) 5]] ::= [s0; Font height 167 dots (20 points).] -::^ [s0;C@(128.0.255) [%00-00 6]] +::^ [s0;%- [C@(128.0.255) 6]] ::= [s0; Font height 200 dots (24 points).] -::^ [s0;C@(128.0.255) [%00-00 7]] +::^ [s0;%- [C@(128.0.255) 7]] ::= [s0; Font height 234 dots (28 points).] -::^ [s0;C@(128.0.255) [%00-00 8]] +::^ [s0;%- [C@(128.0.255) 8]] ::= [s0; Font height 300 dots (36 points).] -::^ [s0;C@(128.0.255) [%00-00 9]] +::^ [s0;%- [C@(128.0.255) 9]] ::= [s0; Font height 400 dots (48 points).] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) `@][%00-00 color]] +::^ [s0;%- [C@(128.0.255) `@][/C@(0.0.255) color]] ::= [s0; Text color.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) `$][%00-00 color]] +::^ [s0;%- [C@(128.0.255) `$][/C@(0.0.255) color]] ::= [s0; Text background color.] -::^ [s0;C@(128.0.255) [%00-00 A]] +::^ [s0;%- [C@(128.0.255) A]] ::= [s0; Arial font.] -::^ [s0;C@(128.0.255) [%00-00 R]] +::^ [s0;%- [C@(128.0.255) R]] ::= [s0; Times New Roman font.] -::^ [s0;C@(128.0.255) [%00-00 C]] +::^ [s0;%- [C@(128.0.255) C]] ::= [s0; Courier font.] -::^ [s0;C@(128.0.255) [%00-00 G]] +::^ [s0;%- [C@(128.0.255) G]] ::= [s0; Standard GUI font.] -::^ [s0;C@(128.0.255) [%00-00 S]] +::^ [s0;%- [C@(128.0.255) S]] ::= [s0; Symbol font.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) .][%00-00 number]] +::^ [s0;%- [C@(128.0.255) .][/C@(0.0.255) number]] ::= [s0; Font with specified font [/@(0.0.255) number].] -::^ [s0;C@(128.0.255) [%00-00 !][%00-00/@(0.0.255) text][%00-00 !]] +::^ [s0;%- [C@(128.0.255) !][/C@(0.0.255) text][C@(128.0.255) !]] ::= [s0; Font with face name equal to [/@(0.0.255) text]. If such font does not exist on system, Arial is used.] -::^ [s1;C [%00-00 `{][%00-00/@(0.0.255) charset][%00-00 `}]&] +::^ [s1;%- [C `{][/C@(0.0.255) charset][C `}]&] [s0; ] ::= [s0; Character set. It can be defined as either single character&] [s0; &] -[ {{1840:8160<330;>1757;f4;h1; [s0;C@(128.0.255) `_] +[ {{1840:8160<330;>1757;f4;h1; [s0; [C@(128.0.255) `_]] :: [s0; utf`-8] -:: [s0;C@(128.0.255) 0] +:: [s0; [C@(128.0.255) 0]] :: [s0; windows`-1250] -:: [s0;C@(128.0.255) 1] +:: [s0; [C@(128.0.255) 1]] :: [s0; windows`-1251] -:: [s0;C@(128.0.255) 2] +:: [s0; [C@(128.0.255) 2]] :: [s0; windows`-1252] -:: [s0;C@(128.0.255) 3] +:: [s0; [C@(128.0.255) 3]] :: [s0; windows`-1253] -:: [s0;C@(128.0.255) 4] +:: [s0; [C@(128.0.255) 4]] :: [s0; windows`-1254] -:: [s0;C@(128.0.255) 5] +:: [s0; [C@(128.0.255) 5]] :: [s0; windows`-1255] -:: [s0;C@(128.0.255) 6] +:: [s0; [C@(128.0.255) 6]] :: [s0; windows`-1256] -:: [s0;C@(128.0.255) 7] +:: [s0; [C@(128.0.255) 7]] :: [s0; windows`-1257] -:: [s0;C@(128.0.255) A] +:: [s0; [C@(128.0.255) A]] :: [s0; iso`-8859`-1] -:: [s0;C@(128.0.255) B] +:: [s0; [C@(128.0.255) B]] :: [s0; iso`-8859`-2] -:: [s0;C@(128.0.255) C] +:: [s0; [C@(128.0.255) C]] :: [s0; iso`-8859`-3] -:: [s0;C@(128.0.255) D] +:: [s0; [C@(128.0.255) D]] :: [s0; iso`-8859`-4] -:: [s0;C@(128.0.255) E] +:: [s0; [C@(128.0.255) E]] :: [s0; iso`-8859`-5] -:: [s0;C@(128.0.255) F] +:: [s0; [C@(128.0.255) F]] :: [s0; iso`-8859`-6] -:: [s0;C@(128.0.255) G] +:: [s0; [C@(128.0.255) G]] :: [s0; iso`-8859`-7] -:: [s0;C@(128.0.255) H] +:: [s0; [C@(128.0.255) H]] :: [s0; iso`-8859`-8] -:: [s0;C@(128.0.255) I] +:: [s0; [C@(128.0.255) I]] :: [s0; iso`-8859`-9] -:: [s0;C@(128.0.255) J] +:: [s0; [C@(128.0.255) J]] :: [s0; iso`-8859`-10]}}&] [s0; &] [s0; or as the string designating character set (example: [*C@3 `"`[`{`_`}_...`]`"][* , ][*C@3 `"`[`{windows`-1250`}_...`]`"]).] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) %][%00-00 lang]] +::^ [s0;%- [C@(128.0.255) %][/C@(0.0.255) lang]] ::= [s0; Language. It is defined in form [@(0.0.255) XX]`-[@(0.0.255) YY], according to ISO 639 and ISO 3166 standards. (example: [*C@3 `"`[%EN`-US_...`]`"]). [*C@3 `"`[%00`-00_`"] represents `"none`" language. As special optimization, [*@(128.0.255) %`-] is equivalent to [@(128.0.255) %][@(0.0.255) 00`-00] (no language) and&] [s0; [@(128.0.255) %%] is equivalent to [@(128.0.255) %][@(0.0.255) EN`-US].] -::^ [s0;C@(128.0.255) [%00-00 :][%00-00/@(0.0.255) text][%00-00 :]] +::^ [s0;%- [C@(128.0.255) :][/C@(0.0.255) text][C@(128.0.255) :]] ::= [s0; Paragraph label.] -::^ [s0;C@(128.0.255) [%00-00 <]] +::^ [s0;%- [C@(128.0.255) <]] ::= [s0; Align paragraph left.] -::^ [s0;C@(128.0.255) [%00-00 `=]] +::^ [s0;%- [C@(128.0.255) `=]] ::= [s0; Center paragraph.] -::^ [s0;C@(128.0.255) [%00-00 >]] +::^ [s0;%- [C@(128.0.255) >]] ::= [s0; Align paragraph right.] -::^ [s0;C@(128.0.255) [%00-00 #]] +::^ [s0;%- [C@(128.0.255) #]] ::= [s0; Justify paragraph.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) l][%00-00 number]] +::^ [s0;%- [C@(128.0.255) l][/C@(0.0.255) number]] ::= [s0; Left margin in dots.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) r][%00-00 number]] +::^ [s0;%- [C@(128.0.255) r][/C@(0.0.255) number]] ::= [s0; Right margin in dots.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) i][%00-00 number]] +::^ [s0;%- [C@(128.0.255) i][/C@(0.0.255) number]] ::= [s0; Indent in dots.] -::^ [s0;C@(128.0.255) [%00-00 pn]] +::^ [s0;%- [C@(128.0.255) pn]] ::= [s0; Line spacing 1.0.] -::^ [s0;C@(128.0.255) [%00-00 ph]] +::^ [s0;%- [C@(128.0.255) ph]] ::= [s0; Line spacing 1.5.] -::^ [s0;C@(128.0.255) [%00-00 pd]] +::^ [s0;%- [C@(128.0.255) pd]] ::= [s0; Line spacing 2.0.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) H][%00-00 number]] +::^ [s0;%- [C@(128.0.255) H][/C@(0.0.255) number]] ::= [s0; Horizontal ruler height (if zero, there is no ruler).] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) h][%00-00 color]] +::^ [s0;%- [C@(128.0.255) h][/C@(0.0.255) color]] ::= [s0; Color of horizontal ruler (default is black).] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) b][%00-00 number]] +::^ [s0;%- [C@(128.0.255) b][/C@(0.0.255) number]] ::= [s0; Space before paragraph in dots.] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) a][%00-00 number]] +::^ [s0;%- [C@(128.0.255) a][/C@(0.0.255) number]] ::= [s0; Space after paragraph in dots.] -::^ [s0;C@(128.0.255) [%00-00 P]] +::^ [s0;%- [C@(128.0.255) P]] ::= [s0; Page break before paragraph.] -::^ [s0;C@(128.0.255) [%00-00 k]] +::^ [s0;%- [C@(128.0.255) k]] ::= [s0; Keep paragraph on single page.] -::^ [s0;C@(128.0.255) [%00-00 K]] +::^ [s0;%- [C@(128.0.255) K]] ::= [s0; Keep paragraph on same page as next one.] -::^ [s0;C@(128.0.255) [%00-00 Q]] +::^ [s0;%- [C@(128.0.255) Q]] ::= [s0; Orphan control.] -::^ [s0;C@(128.0.255) [%00-00 n][%00-00/@(0.0.255) text][%00-00 ;]] +::^ [s0;%- [C@(128.0.255) n][/C@(0.0.255) text][C@(128.0.255) ;]] ::= [s0; Text to insert before paragraph number.] -::^ [s0;C@(128.0.255) [%00-00 m][%00-00/@(0.0.255) text][%00-00 ;]] +::^ [s0;%- [C@(128.0.255) m][/C@(0.0.255) text][C@(128.0.255) ;]] ::= [s0; Text to insert after paragraph number.] -::^ [s0;C@(128.0.255) [%00-00 N]] +::^ [s0;%- [C@(128.0.255) N]] ::= [s0; Numbering. It is followed by up to 8 characters defining numbering style of each level&] [s0; &] -[ {{864:9136<342;>861;f4; [s0;C@(128.0.255) `-] +[ {{864:9136<342;>861;f4; [s0; [C@(128.0.255) `-]] :: [s0; Level is not used.] -:: [s0;C@(128.0.255) 1] +:: [s0; [C@(128.0.255) 1]] :: [s0; Numbers, starting with 1.] -:: [s0;C@(128.0.255) 0] +:: [s0; [C@(128.0.255) 0]] :: [s0; Numbers, starting with 0.] -:: [s0;C@(128.0.255) a] +:: [s0; [C@(128.0.255) a]] :: [s0; Lowercase letters, starting with a.] -:: [s0;C@(128.0.255) A] +:: [s0; [C@(128.0.255) A]] :: [s0; Uppercase letters, starting with A.] -:: [s0;C@(128.0.255) i] +:: [s0; [C@(128.0.255) i]] :: [s0; Lowercase roman numbers, starting with i.] -:: [s0;C@(128.0.255) I] +:: [s0; [C@(128.0.255) I]] :: [s0; Uppercase roman numbers, starting with I]}}&] [s0; ] -::^ [s0;C@(128.0.255) [%00-00 o]] +::^ [s0;%- [C@(128.0.255) o]] ::= [s0; Bullet style.] -::^ [s0;C@(128.0.255) [%00-00 O`_]] +::^ [s0;%- [C@(128.0.255) O`_]] ::= [s0; No bullet.] -::^ [s0;C@(128.0.255) [%00-00 O0]] +::^ [s0;%- [C@(128.0.255) O0]] ::= [s0; Bullet style.] -::^ [s0;C@(128.0.255) [%00-00 O1]] +::^ [s0;%- [C@(128.0.255) O1]] ::= [s0; Bullet style.] -::^ [s0;C@(128.0.255) [%00-00 O2]] +::^ [s0;%- [C@(128.0.255) O2]] ::= [s0; Bullet style.] -::^ [s0;C@(128.0.255) [%00-00 O3]] +::^ [s0;%- [C@(128.0.255) O3]] ::= [s0; Bullet style.] -::^ [s0;C@(128.0.255) [%00-00 O9]] +::^ [s0;%- [C@(128.0.255) O9]] ::= [s0; Text bullet style.] -::^ [s0;C@(128.0.255) [%00-00 `~]] +::^ [s0;%- [C@(128.0.255) t][/C@(0.0.255) number]] +::= [s0; Default tab size.] +::^ [s0;%- [C@(128.0.255) `~]] ::= [s0; Tabulator setting. Can be followed by character designating type of tabulation&] [s0; &] -[ {{864:9136<342;>861;f4; [s0;C@(128.0.255) >] +[ {{864:9136<342;>861;f4; [s0; [C@(128.0.255) >]] :: [s0; Normal tabulation.] -:: [s0;C@(128.0.255) <] +:: [s0; [C@(128.0.255) <]] :: [s0; Left tabulation.] -:: [s0;C@(128.0.255) `=] +:: [s0; [C@(128.0.255) `=]] :: [s0; Centered tabulation.]}}&] [s0; &] [s0; (default is normal) and by filler character &] [s0; &] -[ {{3312:3436:3252<342;>861;f4; [s0;C@(128.0.255) .] -:: [s0;C@(128.0.255) `-] -:: [s0;C@(128.0.255) `_]}}&] +[ {{3312:3436:3252<342;>861;f4; [s0; [C@(128.0.255) .]] +:: [s0; [C@(128.0.255) `-]] +:: [s0; [C@(128.0.255) `_]]}}&] [s0; &] [s0; and must be followed by number specifying tabulator position in dots.&] @@ -382,11 +386,11 @@ in dots.&] [s0; When followed by [C@(128.0.255) `~] ([*C@3 `"`~`~`"]), clears all current tab settings (including those inherited from paragraph style).] -::^ [s0;C@(128.0.255) [%00-00 ;]] -::= [s0;*C@3 [*A@0 NOP separator. In some cases it is needed to separate -command code. Example: ]`"`[l200;4 `"] -::^ [s1;/C@(0.0.255) [%00-00/@(128.0.255) s]number&] -[s0;/C@(0.0.255) [%00-00/@(128.0.255) s]`"text`"] +::^ [s0;%- [C@(128.0.255) ;]] +::= [s0; NOP separator. In some cases it is needed to separate command +code. Example: [*C@3 `"`[l200;4 `"]] +::^ [s1; [%-C s][/C@(0.0.255) number]&] +[s0; [%-C@(128.0.255) s][/C@(0.0.255) `"text`"]] :: [s0; Paragraph style, either defined by style number, or style name.]}}&] [s0;3 &] [s0;3 &] @@ -395,20 +399,20 @@ command code. Example: ]`"`[l200;4 `"] [s0; Paragraph styles are defined using normal character/paragraph formatting sequence with&] [s0; &] -[s0;@(0.0.255) [@(128.0.255) `$`$]number[@(128.0.255) ,]nnumber[@(128.0.255) #]uuid[@(128.0.255) : -]name&] +[s0; [@(128.0.255) `$`$][@(0.0.255) number][@(128.0.255) ,][@(0.0.255) nnumber][@(128.0.255) #][@(0.0.255) u +uid][@(128.0.255) :][@(0.0.255) name]&] [s0; &] [s0; instead of text, where&] [s0; &] -[ {{1879:8121^ [s0;@(0.0.255) [%00-00 number]] +[ {{1879:8121^ [s0;%- [@(0.0.255) number]] :: [s0; Number of style `- can be used with [@(128.0.255) s] paragraph format command code.] -:: [s0;@(0.0.255) [%00-00 nnumber]] +:: [s0;%- [@(0.0.255) nnumber]] :: [s0; Number of style of next paragraph `- used by RichText editor when inserting paragraphs.] -:: [s0;@(0.0.255) [%00-00 uuid]] +:: [s0;%- [@(0.0.255) uuid]] :: [s0; 32 digit unique hexadecimal identifier of style.] -:: [s0;@(0.0.255) [%00-00 name]] +:: [s0;%- [@(0.0.255) name]] :: [s0; Name of style, displayed by editors. Can also be used with [@(128.0.255) s] paragraph format command code.]}}&] [s0; &] @@ -417,7 +421,7 @@ paragraph format command code.]}}&] [s0; &] [s0; Example:&] [s0; &] -[s0;C@3 `"`[`*/`+117 `$`$2,0#07143242482611002448121871408047:title`]`"&] +[s0; [C@3 `"`[`*/`+117 `$`$2,0#07143242482611002448121871408047:title`]`"]&] [s0;@(0.0.255) &] [s0;@(0.0.255) &] [s2; Objects&] @@ -425,16 +429,17 @@ paragraph format command code.]}}&] [s0; Object plays the role of the single character and is displayed according to its type. It is started with a header in the form&] [s0; &] -[s0;@(0.0.255) [@(128.0.255) `@`@]format[@(128.0.255) :]cx[@(128.0.255) `&]cy&] +[s0; [@(128.0.255) `@`@][@(0.0.255) format][@(128.0.255) :][@(0.0.255) cx][@(128.0.255) `&][@(0.0.255) c +y]&] [s0;@(0.0.255) &] -[s0; [%00-00 where]&] +[s0;%- where&] [s0; &] -[ {{1879:8121^ [s0;@(0.0.255) format] +[ {{1879:8121^ [s0; [@(0.0.255) format]] :: [s0; Format of objects. This format must be recognized by the application. By default, RichText recognizes the PNG format.] -:: [s0;@(0.0.255) cx] +:: [s0; [@(0.0.255) cx]] :: [s0; Width of object in dots.] -:: [s0;@(0.0.255) cy] +:: [s0; [@(0.0.255) cy]] :: [s0; Height of object in dots.]}}&] [s0;@(0.0.255) &] [s0; Header is followed by binary data of object, encoded in 7 bit @@ -452,106 +457,106 @@ eight bit for first byte in block.&] [s0; &] [s0; Table definition starts with&] [s0;3 &] -[s0;@(128.0.255) `{`{&] +[s0; [@(128.0.255) `{`{]&] [s0;@(128.0.255) &] [s0; pair, followed by set of numbers separated with&] [s0; &] -[s0;@(128.0.255) :&] +[s0; [@(128.0.255) :]&] [s0;@(128.0.255) &] [s0; Numbers represent ratios of column widths; count of numbers is equivalent to count of columns. Next there is [/ table/cell formatting sequence] ended with single space character. Cells are separated with&] [s0; &] -[s0;@(128.0.255) `::&] +[s0; [@(128.0.255) `::]&] [s0;@(128.0.255) &] [s0; characters and another table/cell formating sequence (to setup format for each individual cell). Formating of cells is inherited from previous cells. Table ends with&] [s0; &] -[s0;@(128.0.255) `}`}&] +[s0; [@(128.0.255) `}`}]&] [s0;@(128.0.255) &] [s0; pair.&] [s0; &] -[ {{1993:8007^@(229.229.248)-1 [s0;*/ Table/cell formating sequence] -::=@2 [s0; ] -::^ [s0;/C@(0.0.255) [%00-00/@(128.0.255) <][%00-00 number]] +[ {{1993:8007^@(229.229.248)-1 [s0; [*/ Table/cell formating sequence]] +::=@2 [s0;%- ] +::^ [s0;%- [C@(128.0.255) <][/C@(0.0.255) number]] :: [s0; Left margin of table in dots.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) >][%00-00 number]] +:: [s0;%- [C@(128.0.255) >][/C@(0.0.255) number]] :: [s0; Right margin of table in dots.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) B][%00-00 number]] +:: [s0;%- [C@(128.0.255) B][/C@(0.0.255) number]] :: [s0; Space before table in dots.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) A][%00-00 number]] +:: [s0;%- [C@(128.0.255) A][/C@(0.0.255) number]] :: [s0; Space after table in dots.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) f][%00-00 number]] +:: [s0;%- [C@(128.0.255) f][/C@(0.0.255) number]] :: [s0; Frame thickness in dots. Frame is outer border of table. Default value is 10.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) F][%00-00 color]] +:: [s0;%- [C@(128.0.255) F][/C@(0.0.255) color]] :: [s0; Color of the frame.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) g]number] +:: [s0; [%-C@(128.0.255) g][/C@(0.0.255) number]] :: [s0; Grid thickness in dots. Grid are lines dividing cells inside table. Default value is 4.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) G][%00-00 color]] +:: [s0;%- [C@(128.0.255) G][/C@(0.0.255) color]] :: [s0; Color of the grid.] -:: [s0;C@(128.0.255) [%00-00 k]] +:: [s0;%- [C@(128.0.255) k]] :: [s0; Keep the cell on single page.] -:: [s0;C@(128.0.255) [%00-00 K]] +:: [s0;%- [C@(128.0.255) K]] :: [s0; Keep the table on single page.] -:: [s0;C@(128.0.255) [%00-00 `~]] +:: [s0;%- [C@(128.0.255) `~]] :: [s0; Sets grid and frame thickness to zero. Useful when using tables to organize text.] -:: [s0;/C@(0.0.255) [%00-00/@(128.0.255) h]number] +:: [s0; [%-C@(128.0.255) h][/C@(0.0.255) number]] :: [s0; Number of header rows. Header rows are repeated at the beginning of every page.] -:: [s0;C@(128.0.255) [%00-00 `^]] +:: [s0;%- [C@(128.0.255) `^]] :: [s0; Cell aligns to top. Default.] -:: [s0;C@(128.0.255) [%00-00 `=]] +:: [s0;%- [C@(128.0.255) `=]] :: [s0; Cell aligns to center (vertical).] -:: [s0;C@(128.0.255) [%00-00 v]] +:: [s0;%- [C@(128.0.255) v]] :: [s0; Cell aligns to bottom.] -:: [s1;/C@(0.0.255) [%00-00/@(128.0.255) l]number/number&] -[s0;/C@(0.0.255) [%00-00/@(128.0.255) l]number&] -[s0;/C@(0.0.255) [%00-00/@(128.0.255) l]/number] +:: [s1; [%-C l][/C@(0.0.255) number/number]&] +[s0; [%-C@(128.0.255) l][/C@(0.0.255) number]&] +[s0; [%-C@(128.0.255) l][/C@(0.0.255) /number]] :: [s0; Sets left cell border (first [/@(0.0.255) number]) and margin in dots. If any of numbers is missing, sets only the one present. Default is border: 0, margin: 25.] -:: [s1;/C@(0.0.255) [/@(128.0.255) r]number/number&] -[s0;/C@(0.0.255) [/@(128.0.255) r]number&] -[s0;/C@(0.0.255) [/@(128.0.255) r]/number] +:: [s1; [C r][/C@(0.0.255) number/number]&] +[s0; [C@(128.0.255) r][/C@(0.0.255) number]&] +[s0; [C@(128.0.255) r][/C@(0.0.255) /number]] :: [s0; Sets right cell border (first [/@(0.0.255) number]) and margin in dots. If any of numbers is missing, sets only the one present. Default is border: 0, margin: 25.] -:: [s1;/C@(0.0.255) [/@(128.0.255) t]number/number&] -[s0;/C@(0.0.255) [/@(128.0.255) t]number&] -[s0;/C@(0.0.255) [/@(128.0.255) t]/number] +:: [s1; [C t][/C@(0.0.255) number/number]&] +[s0; [C@(128.0.255) t][/C@(0.0.255) number]&] +[s0; [C@(128.0.255) t][/C@(0.0.255) /number]] :: [s0; Sets top cell border (first [/@(0.0.255) number]) and margin in dots. If any of numbers is missing, sets only the one present. Default is border: 0, margin: 15.] -:: [s1;/C@(0.0.255) [/@(128.0.255) b]number/number&] -[s0;/C@(0.0.255) [/@(128.0.255) b]number&] -[s0;/C@(0.0.255) [/@(128.0.255) b]/number] +:: [s1; [C b][/C@(0.0.255) number/number]&] +[s0; [C@(128.0.255) b][/C@(0.0.255) number]&] +[s0; [C@(128.0.255) b][/C@(0.0.255) /number]] :: [s0; Sets bottom cell border (first [/@(0.0.255) number]) and margin in dots. If any of numbers is missing, sets only the one present. Default is border: 0, margin: 15.] -:: [s1;/C@(0.0.255) [/@(128.0.255) a]number/number&] -[s0;/C@(0.0.255) [/@(128.0.255) a]number&] -[s0;/C@(0.0.255) [/@(128.0.255) a]/number] +:: [s1; [C a][/C@(0.0.255) number/number]&] +[s0; [C@(128.0.255) a][/C@(0.0.255) number]&] +[s0; [C@(128.0.255) a][/C@(0.0.255) /number]] :: [s0; Sets all cell borders (first [/@(0.0.255) number]) and margins in dots. If any of numbers is missing, sets only the one present.] -:: [s0;/C@(0.0.255) [/@(128.0.255) `@]color] +:: [s0; [C@(128.0.255) `@][/C@(0.0.255) color]] :: [s0; Cell background color. Default is White.] -:: [s0;/C@(0.0.255) [/@(128.0.255) R]color] +:: [s0; [C@(128.0.255) R][/C@(0.0.255) color]] :: [s0; Cell border color. Default is Black.] -:: [s0;C@(128.0.255) !] +:: [s0; [C@(128.0.255) !]] :: [s0; Resets cell formatting to default values.] -:: [s0;/C@(0.0.255) [/@(128.0.255) H]number] +:: [s0; [C@(128.0.255) H][/C@(0.0.255) number]] :: [s0; Sets the minimal height of cell (and therefore also of row) in dots.] -:: [s0;/C@(0.0.255) [/@(128.0.255) `-]number] +:: [s0; [C@(128.0.255) `-][/C@(0.0.255) number]] :: [s0; Horizontal cell span.] -:: [s0;/C@(0.0.255) [/@(128.0.255) `|]number] +:: [s0; [C@(128.0.255) `|][/C@(0.0.255) number]] :: [s0; Vertical cell span.] -:: [s0;C@(128.0.255) ;] +:: [s0; [C@(128.0.255) ;]] ::= [s0; NOP separator. In some cases it helps to separate command code.]}}&] [s0;3 &] [s0; Note: There is also legacy support for old table format (from @@ -560,137 +565,136 @@ as table start/stop and [@(128.0.255) `|`| `-`-] to divide cells/lines. &] [s0;3 &] [s0;3 &] -[s2;3 Examples&] +[s2; [3 Examples]&] [s0; &] -[ {{10000 [s0;*C@3;1 `"Normal `[`* bold`] `[/ italic`] `[`_ underline`] `[`` -superscript`] `[, subscript`]`"] -:: [s0;, [, Normal ][*, bold][, ][/, italic][, ][_, underline][, ][` superscript][, -]subscript]}}&] +[ {{10000 [s0; [*C@3;1 `"Normal `[`* bold`] `[/ italic`] `[`_ underline`] `[`` +superscript`] `[, subscript`]`"]] +:: [s0; Normal [* bold] [/ italic] [_ underline] [` superscript] [, subscript]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"```[ ```] `\1`[escaped`]`\1 `[`* bold`]`"] -:: [s0;* [* `[ `] `[escaped`] ]bold]}}&] +[ {{10000 [s0; [*C@3;1 `"```[ ```] `\1`[escaped`]`\1 `[`* bold`]`"]] +:: [s0; `[ `] `[escaped`] [* bold]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[A Arial (Sans`-Serif)`] `[R Times New Roman (Serif)`] -`[C Courier (Monospace)`]`"] -:: [s0;C [A Arial (Sans`-Serif) ][R Times New Roman (Serif)][A ]Courier (Monospace)]}}&] +[ {{10000 [s0; [*C@3;1 `"`[A Arial (Sans`-Serif)`] `[R Times New Roman (Serif)`] +`[C Courier (Monospace)`]`"]] +:: [s0; Arial (Sans`-Serif) [R Times New Roman (Serif)] [C Courier (Monospace)]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[0 6pt `]`[1 8pt `]`[2 10pt `]`[3 12pt `]`[4 16pt `]`[5 -20pt `]`[6 24pt `]`[7 28pt `]`[8 36pt `]`[9 48pt `]`"] -:: [s0;9 [0 6pt ][1 8pt ][2 10pt ][3 12pt][2 ][4 16pt ][5 20pt ][6 24pt ][7 28pt ][8 36pt -]48pt ]}}&] +[ {{10000 [s0; [*C@3;1 `"`[0 6pt `]`[1 8pt `]`[2 10pt `]`[3 12pt `]`[4 16pt `]`[5 +20pt `]`[6 24pt `]`[7 28pt `]`[8 36pt `]`[9 48pt `]`"]] +:: [s0; [0 6pt ][1 8pt ]10pt [3 12pt] [4 16pt ][5 20pt ][6 24pt ][7 28pt ][8 36pt ][9 48pt +]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[!Tahoma! Tahoma`]`"] +[ {{10000 [s0; [*C@3;1 `"`[!Tahoma! Tahoma`]`"]] :: [s0; Tahoma]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[`+500 500dots`]`"] -:: [s0;+500 500dots]}}&] +[ {{10000 [s0; [*C@3;1 `"`[`+500 500dots`]`"]] +:: [s0; [+500 500dots]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[`@4 Green text`] `[`$(255.220.200) Pink background`]`"] -:: [s0;$(255.220.200) [@4$N Green text][$N ]Pink background]}}&] +[ {{10000 [s0; [*C@3;1 `"`[`@4 Green text`] `[`$(255.220.200) Pink background`]`"]] +:: [s0; [@4 Green text] [$(255.220.200) Pink background]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[%EN`-US English language`] `[%CS`-CZ Czech language`]`"] -:: [s0; English language [%CS-CZ Czech language]]}}&] +[ {{10000 [s0; [*C@3;1 `"`[%EN`-US English language`] `[%CS`-CZ Czech language`]`"]] +:: [s0;%CS-CZ [%% English language ]Czech language]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[`^upp.sf.net`^ Hyperlink`] `[Icompiler, linker; Index -entry`]`"] -:: [s0;Icompiler`, linker; [^upp`.sf`.net^I; Hyperlink][I; ]Index entry]}}&] +[ {{10000 [s0; [*C@3;1 `"`[`^upp.sf.net`^ Hyperlink`] `[Icompiler, linker; Index +entry`]`"]] +:: [s0; [^upp`.sf`.net^ Hyperlink] [Icompiler`, linker; Index entry]]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[:label: Labeled paragraph`]`"] +[ {{10000 [s0; [*C@3;1 `"`[:label: Labeled paragraph`]`"]] :: [s0; Labeled paragraph]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[< Left paragraph alignment`]`"] +[ {{10000 [s0; [*C@3;1 `"`[< Left paragraph alignment`]`"]] :: [s0; Left paragraph alignment]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[`= Center paragraph alignment`]`"] +[ {{10000 [s0; [*C@3;1 `"`[`= Center paragraph alignment`]`"]] :: [s0; Center paragraph alignment]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[> Right paragraph alignment`]`"] +[ {{10000 [s0; [*C@3;1 `"`[> Right paragraph alignment`]`"]] :: [s0; Right paragraph alignment]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[# Justify alignment. Just some text to demosntrate +[ {{10000 [s0; [*C@3;1 `"`[# Justify alignment. Just some text to demosntrate it... Just some text to demonstrate it... Just some text to demonstrate -it...`]`"] +it...`]`"]] :: [s0; Justify alignment. Just some text to demosntrate it... Just some text to demonstrate it... Just some text to demonstrate it...]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[l1000 Left margin 1000dots`]`"] +[ {{10000 [s0; [*C@3;1 `"`[l1000 Left margin 1000dots`]`"]] :: [s0; Left margin 1000dots]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[i1000 Indent 1000 dots.Just some text to demonstrate -it... Just some text to demonstrate it...`]`"] +[ {{10000 [s0; [*C@3;1 `"`[i1000 Indent 1000 dots.Just some text to demonstrate +it... Just some text to demonstrate it...`]`"]] :: [s0; Indent 1000 dots.Just some text to demonstrate it... Just some text to demonstrate it...]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[r1000 Right margin 1000 dots.Just some text to demonstrate -it... Just some text to demonstrate it...`]`"] +[ {{10000 [s0; [*C@3;1 `"`[r1000 Right margin 1000 dots.Just some text to demonstrate +it... Just some text to demonstrate it...`]`"]] :: [s0; Right margin 1000 dots.Just some text to demonstrate it... Just some text to demonstrate it...]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"Paragraph`&`[b200 Before 200dots`]`"] +[ {{10000 [s0; [*C@3;1 `"Paragraph`&`[b200 Before 200dots`]`"]] :: [s0; Paragraph&] [s0; Before 200dots]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[a200 After 200dots`]`&Paragraph`"] +[ {{10000 [s0; [*C@3;1 `"`[a200 After 200dots`]`&Paragraph`"]] :: [s0;a200; After 200dots&] [s0; Paragraph]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[i200 `[O0 bullet`&`]`[O1 bullet`&`]`[O2 bullet`&`]`[O3 -bullet`]`]`"] +[ {{10000 [s0; [*C@3;1 `"`[i200 `[O0 bullet`&`]`[O1 bullet`&`]`[O2 bullet`&`]`[O3 +bullet`]`]`"]] :: [s0;i200;O0; bullet&] [s0;i200;O1; bullet&] [s0;i200;O2; bullet&] [s0; bullet]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[O9i500 text bullet`-`|Just some text to demonstrate +[ {{10000 [s0; [*C@3;1 `"`[O9i500 text bullet`-`|Just some text to demonstrate it... Just some text to demonstrate it...Just some text to demonstrate -it... Just some text to demonstrate it...`]`"] +it... Just some text to demonstrate it...`]`"]] :: [s0; text bullet-|Just some text to demonstrate it... Just some text to demonstrate it...Just some text to demonstrate it... Just some text to demonstrate it...]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[O9i200 `[N1m.; `-`|level 1`&`]`[N1a `-`|level 2`&`]`[N1a -`-`|level 2`&`]`[N1 `-`|level 1`&`]`[N1a `-`|level 2`]`]`"] +[ {{10000 [s0; [*C@3;1 `"`[O9i200 `[N1m.; `-`|level 1`&`]`[N1a `-`|level 2`&`]`[N1a +`-`|level 2`&`]`[N1 `-`|level 1`&`]`[N1a `-`|level 2`]`]`"]] :: [s0;i200;O9;m`.;N1; -|level 1&] [s0;i200;O9;N1a; -|level 2&] [s0;i200;O9;N1a; -|level 2&] [s0;i200;O9;N1; -|level 1&] [s0; -|level 2]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`[`~300`~`=.2000`~>`-3000 `-`|Normal tab`-`|Centered -tab`-`|Right tab`]`"] +[ {{10000 [s0; [*C@3;1 `"`[`~300`~`=.2000`~>`-3000 `-`|Normal tab`-`|Centered +tab`-`|Right tab`]`"]] :: [s0; -|Normal tab-|Centered tab-|Right tab]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`{`{1:2 A1] -:: [s0;*C@3;1 A2] -:: [s0;*C@3;1 B1] -:: [s0;*C@3;1 B2`}`}`"] +[ {{10000 [s0; [*C@3;1 `"`{`{1:2 A1]] +:: [s0; [*C@3;1 A2]] +:: [s0; [*C@3;1 B1]] +:: [s0; [*C@3;1 B2`}`}`"]] :: [ {{3333:6667 [s0; A1] :: [s0; A2] :: [s0; B1] :: [s0; B2]}}]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`{`{2:1G4g100F5f50 A1`:: A2`:: B1`:: B2`}`}`"] +[ {{10000 [s0; [*C@3;1 `"`{`{2:1G4g100F5f50 A1`:: A2`:: B1`:: B2`}`}`"]] :: [ {{6666:3334f50;F5g100;G4 [s0; A1] :: [s0; A2] :: [s0; B1] :: [s0; B2]}}]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`{`{1:2 A1`::l40/60R6`@3 A2`::! B1`:: B2`}`}`"] +[ {{10000 [s0; [*C@3;1 `"`{`{1:2 A1`::l40/60R6`@3 A2`::! B1`:: B2`}`}`"]] :: [ {{3333:6667 [s0; A1] ::l40/60@3R6 [s0; A2] ::l0/25@2R0 [s0; B1] :: [s0; B2]}}]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`{`{1:1:1`|2 A1`::`-2 A2`:: A3`:: B1`:: B2`:: B3`}`}`"] +[ {{10000 [s0; [*C@3;1 `"`{`{1:1:1`|2 A1`::`-2 A2`:: A3`:: B1`:: B2`:: B3`}`}`"]] :: [ {{3333:3333:3334|1 [s0; A1] ::-1 [s0; A2] -:: [s0; ] -:: [s0; ] +:: [s0;%- ] +:: [s0;%- ] :: [s0; B2] :: [s0; B3]}}]}}&] [s0; &] -[ {{10000 [s0;*C@3;1 `"`{`{1:2 A1`:: A2`:: B1`:: `{`{1:2 a1`:: a2`:: a1`:: a2`}`}`}`}`"] +[ {{10000 [s0; [*C@3;1 `"`{`{1:2 A1`:: A2`:: B1`:: `{`{1:2 a1`:: a2`:: a1`:: a2`}`}`}`}`"]] :: [ {{3333:6667 [s0; A1] :: [s0; A2] :: [s0; B1] diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp index 4e71ab898..5b6cf781e 100644 --- a/uppsrc/ide/Assist.cpp +++ b/uppsrc/ide/Assist.cpp @@ -853,7 +853,23 @@ void AssistEditor::DCopy() if(!GetSelection(l, h)) { int i = GetLine(GetCursor()); l = GetPos(i); - h = l + line[i].GetLength() + 1; + h = l; + while(h < GetLength() && h - l < 1000) { + int c = GetChar(h); + if(c == ';' || c == '{') + break; + h++; + if(c == '\"') { + while(h < GetLength()) { + int c = GetChar(h); + if(c == '\"' || c == '\n') + break; + h++; + if(c == '\\' && h < GetLength()) + h++; + } + } + } } Parser ctx; Context(ctx, l); @@ -874,7 +890,7 @@ void AssistEditor::DCopy() r << MakeDefinition(cls, m.natural) << "\n{\n}\n\n"; else { if(cpp.IsType(i)) - r << '\t'; + r << String('\t', Split(cpp.GetKey(i), ':').GetCount()); r << m.natural << ";\n"; } if(m.IsData()) diff --git a/uppsrc/ide/Help.cpp b/uppsrc/ide/Help.cpp index 1688da0a5..481e04056 100644 --- a/uppsrc/ide/Help.cpp +++ b/uppsrc/ide/Help.cpp @@ -532,6 +532,8 @@ struct HelpDes : public IdeDesigner { virtual void EditMenu(Bar& menu) {} virtual Ctrl& DesignerCtrl() { return *topic; } virtual void SetFocus() { topic->SetFocus(); } + + ~HelpDes() { topic->Remove(); } }; bool IsHelpName(const char *path) diff --git a/uppsrc/ide/app.tpp/Blitz$en-us.tpp b/uppsrc/ide/app.tpp/Blitz$en-us.tpp index 8d0b8c436..21abbb392 100644 --- a/uppsrc/ide/app.tpp/Blitz$en-us.tpp +++ b/uppsrc/ide/app.tpp/Blitz$en-us.tpp @@ -1,12 +1,87 @@ -TITLE("What is BLITZ") -COMPRESSED -120,156,149,87,105,115,219,200,17,253,43,83,75,39,37,217,16,141,185,112,144,95,214,150,157,90,85,214,71,173,229,84,18,21,87,24,2,67,114,34,16,160,113,72,214,186,236,223,158,215,3,80,7,85,149,67,42,73,4,136,238,126,253,222,235,30,234,66,176,103,207,194,32,156,132,255,229,107,246,198,174,76,95,118,139,139,82,36,201,220,113,46,194,185,225,241,252,67,58,255,241,227,199,148,171,48,153,83,50,142,100,60,84,146,11,142,123,161,18,49,215,105,152,234,132,39,161,140,149,208,113,168,103,59,211,152,237,226,194,36,114,254,252,183,8,81,34,208,19,201,37,15,121,36,20,158,10,101,40,20,23,154,39,137,226,177,78,100,26,69,179,220,236,58,87,87,139,139,37,197,41,132,73,132,133,113,18,41,142,32,165,133,140,181,66,176,82,128,39,81,56,142,226,120,214,185,174,180,139,11,71,184,129,246,148,80,170,32,154,0,157,136,17,169,132,138,148,76,132,228,137,16,81,42,85,170,0,155,139,153,235,44,64,46,149,152,27,252,80,152,70,61,165,21,151,96, -68,197,90,226,177,24,127,85,152,114,129,162,73,168,53,234,217,175,123,154,150,32,136,72,162,216,8,37,69,172,41,34,81,9,151,113,34,148,136,4,64,132,49,26,37,4,122,86,216,54,71,172,20,124,222,1,214,252,244,103,61,231,8,142,131,120,34,194,52,20,81,156,162,40,0,163,103,153,166,92,38,40,170,184,14,185,156,229,117,129,62,151,66,135,210,87,76,32,69,132,204,158,22,29,113,128,22,50,65,201,152,75,137,223,90,37,241,172,181,36,70,87,55,139,139,231,63,31,133,211,112,42,180,62,166,240,20,225,137,84,82,170,40,85,60,148,40,131,28,138,56,139,66,200,201,181,72,102,75,211,162,102,135,91,241,192,44,39,55,129,123,153,104,137,210,17,126,65,87,52,40,193,143,72,85,34,101,18,206,242,210,180,237,72,18,17,244,156,154,228,60,224,124,18,19,183,90,10,149,18,57,82,128,100,17,233,148,131,101,29,169,80,204,26,251,165,119,141,221,218,10,52,59,216,99,190,151,104,244,34,192,12,86,20,1,23,48,163,142,162,144,248,210,48,132,144, -26,132,135,60,81,64,132,111,200,220,141,110,92,222,247,32,3,46,39,169,80,18,72,82,165,192,0,18,240,148,115,30,38,248,70,103,224,197,251,131,143,198,26,203,15,225,42,224,106,18,195,198,80,42,85,84,62,149,196,159,0,253,34,10,53,116,16,67,184,32,214,197,51,240,206,69,66,63,158,121,174,3,142,121,0,68,174,53,250,150,160,90,36,232,93,131,123,233,45,206,227,100,246,222,222,180,111,76,103,71,195,60,63,125,54,56,141,71,1,143,38,33,197,235,36,133,128,92,17,127,82,169,84,164,82,106,145,106,25,133,224,177,29,6,154,130,105,164,252,56,222,37,137,3,30,99,184,208,171,214,232,222,135,161,243,152,19,20,145,164,17,177,48,38,201,78,74,87,17,14,56,99,62,152,225,249,233,11,206,99,74,148,96,104,146,36,10,101,10,50,192,65,168,225,116,44,132,4,66,67,103,129,49,160,141,144,95,153,181,205,78,198,105,245,16,200,129,90,234,132,124,139,72,64,7,8,228,73,195,48,194,157,36,193,52,205,214,102,247,200,128,34,12,68,8,23, -97,255,104,12,37,106,193,126,97,74,187,4,155,1,10,96,21,165,122,112,96,118,82,217,182,179,5,196,215,161,111,91,240,64,112,112,7,255,105,157,40,21,1,47,106,199,180,154,72,66,12,176,142,229,236,163,193,188,124,187,252,254,167,183,239,79,62,127,98,23,173,152,179,87,203,186,239,216,235,95,207,206,255,249,231,197,69,27,206,217,235,210,117,127,48,215,50,83,92,155,42,183,5,203,235,237,206,149,134,214,24,235,108,190,169,220,151,222,50,26,162,130,225,214,197,239,155,174,219,101,179,236,101,246,210,86,217,244,198,93,185,157,45,156,201,166,117,179,206,94,210,117,246,242,147,171,214,165,205,46,79,239,147,101,151,159,43,215,253,206,62,157,126,94,48,179,219,53,181,201,55,1,115,85,103,171,2,185,187,154,181,59,107,139,126,199,10,187,236,215,108,139,93,193,26,188,116,101,209,178,122,197,74,211,172,45,133,150,46,247,41,219,41,59,171,216,202,228,93,48,52,69,141,220,108,76,199,76,89,214,55,45,251,156,189,200,94,80,230,43,107,119,172,116,203,198, -52,206,182,40,202,218,186,111,114,188,92,213,205,118,202,254,81,247,44,55,21,154,175,90,87,216,102,76,103,192,75,223,213,91,56,184,240,79,18,250,233,72,221,35,6,209,14,178,181,72,56,218,164,101,71,85,221,177,110,99,129,168,46,45,61,177,198,16,31,179,236,132,89,180,190,127,208,215,221,152,107,116,198,90,79,27,187,120,201,150,148,53,59,89,150,117,126,181,96,71,254,146,249,43,70,77,2,198,241,1,142,15,85,121,203,166,249,110,135,238,242,178,47,144,138,173,92,9,32,55,174,219,12,55,91,18,117,221,155,6,132,30,77,220,170,176,43,246,254,213,187,183,217,229,47,108,130,11,76,200,221,245,20,95,108,2,109,220,234,216,99,252,210,155,210,173,110,137,206,37,218,49,77,71,162,28,98,157,178,199,176,94,149,157,109,42,200,117,109,203,219,128,221,142,68,131,204,220,62,0,181,188,125,16,22,207,217,100,215,152,245,214,12,58,100,151,175,62,126,252,237,195,223,222,62,78,125,100,202,182,102,55,117,115,229,101,100,27,107,32,221,49,195,75,251,245, -127,203,139,172,191,156,189,62,59,63,224,18,174,50,69,225,252,12,212,196,235,64,100,93,146,53,186,141,161,187,150,109,96,161,59,86,8,192,83,46,206,55,16,171,117,219,29,84,221,216,190,113,109,231,242,22,240,72,33,114,31,242,82,66,56,182,193,144,89,18,141,26,26,102,13,78,169,97,160,230,198,181,176,9,202,174,137,178,33,232,166,238,203,2,62,191,49,183,45,27,207,155,253,180,80,22,72,243,192,123,131,213,2,92,58,56,111,136,37,17,107,12,95,231,48,45,183,172,197,196,216,230,128,136,115,164,24,122,71,221,189,97,61,222,162,102,228,239,255,208,62,91,248,158,8,144,135,210,216,117,143,17,102,64,124,72,119,231,55,16,169,185,171,219,214,45,137,148,154,21,174,53,244,114,48,63,85,112,112,227,181,43,80,243,110,204,2,102,29,113,68,124,97,196,254,101,243,142,150,21,242,29,1,242,199,17,50,86,147,169,220,31,163,59,240,198,135,190,219,97,21,250,29,131,229,85,214,107,118,180,197,84,210,4,96,13,229,110,229,114,214,218,174,3,151,135, -147,246,151,61,33,79,230,148,26,110,97,239,106,88,23,204,84,183,251,185,10,136,3,200,72,143,244,213,112,15,250,173,58,239,168,129,229,233,211,140,206,23,162,21,135,245,224,133,95,219,202,54,126,33,97,117,214,172,30,26,41,32,127,142,143,72,183,131,58,195,10,176,180,7,71,250,252,198,189,38,92,30,189,169,10,100,234,218,113,221,251,108,56,102,76,49,26,103,11,250,188,42,149,217,226,205,236,153,207,66,235,229,126,134,243,141,133,202,4,254,9,8,106,190,176,157,113,101,123,200,222,184,89,73,236,17,101,235,167,9,193,29,208,55,142,114,214,94,195,220,27,211,239,242,49,236,225,225,4,160,119,187,118,176,228,176,192,218,14,239,231,236,26,171,158,236,51,180,208,222,159,96,4,152,62,11,176,170,223,46,193,62,233,222,212,44,187,204,46,127,61,123,255,150,254,30,79,217,167,195,44,36,28,57,254,218,13,6,69,207,116,84,248,116,15,97,245,56,229,88,79,155,220,191,85,225,212,128,93,135,49,24,79,137,0,151,29,102,209,86,227,131,190,185,0,110, -108,236,176,94,198,131,192,175,243,81,176,198,62,212,138,78,203,225,25,95,143,228,4,161,52,8,150,84,163,202,195,40,57,232,54,154,162,187,65,80,143,249,191,111,106,216,4,254,244,161,144,22,76,121,186,158,174,129,198,174,8,221,168,94,129,3,100,92,161,103,239,223,188,253,59,145,198,60,143,251,29,131,147,20,242,87,0,78,8,233,35,196,158,110,12,177,253,74,234,81,99,199,222,42,254,60,164,102,105,99,2,41,86,196,189,203,26,11,183,179,236,167,65,215,236,39,6,214,177,180,86,206,54,216,164,211,245,20,106,94,17,126,154,121,34,194,123,107,107,112,15,204,140,156,249,67,240,238,195,207,241,236,190,63,246,237,27,253,219,17,254,124,132,255,42,232,63,139,41,79,197,49,27,78,139,209,82,239,254,74,13,182,244,235,232,235,49,27,190,252,101,59,153,124,221,31,45,135,15,223,63,122,144,96,12,216,199,13,231,240,19,62,15,210,126,58,127,117,126,118,138,247,223,176,7,95,247,197,78,63,188,123,13,251,30,29,166,9,30,59,123,95,124,98,203,214, -254,159,37,30,37,186,203,67,159,16,22,223,191,63,118,204,226,223,107,2,201,152, - +topic "What is BLITZ"; +[2 $$0,0#00000000000000000000000000000000:Default] +[l288;i1120;a17;O9;~~~.1408;2 $$1,0#10431211400427159095818037425705:param] +[a83;*R6 $$2,5#31310162474203024125188417583966:caption] +[b83;*4 $$3,5#07864147445237544204411237157677:title] +[i288;O9;C2 $$4,6#40027414424643823182269349404212:item] +[b42;a42;2 $$5,5#45413000475342174754091244180557:text] +[l288;b17;a17;2 $$6,6#27521748481378242620020725143825:desc] +[l321;tC@5;1 $$7,7#20902679421464641399138805415013:code] +[b2503;2 $$8,0#65142375456100023862071332075487:separator] +[*@(0.0.255)2 $$9,0#83433469410354161042741608181528:base] +[tC2 $$10,0#37138531426314131251341829483380:class] +[l288;a17;*1 $$11,11#70004532496200323422659154056402:requirement] +[i417;b42;a42;O9;~~~.416;2 $$12,12#10566046415157235020018451313112:tparam] +[b167;C2 $$13,13#92430459443460461911108080531343:item1] +[i288;a42;O9;C2 $$14,14#77422149456609303542238260500223:item2] +[*@2$(0.128.128)2 $$15,15#34511555403152284025741354420178:NewsDate] +[l321;*C$7;2 $$16,16#03451589433145915344929335295360:result] +[l321;b83;a83;*C$7;2 $$17,17#07531550463529505371228428965313:result`-line] +[l160;*tC+117 $$18,5#88603949442205825958800053222425:package`-title] +[2 $$19,0#53580023442335529039900623488521:gap] +[tC2 $$20,20#70211524482531209251820423858195:class`-nested] +[b50;2 $$21,21#03324558446220344731010354752573:Par] +[{_}%EN-US +[s2; About BLITZ&] +[s0; Blitz is advanced compilation technique based on [^http`:`/`/en`.wikipedia`.org`/wiki`/Single`_Compilation`_Unit^ S +CU] approach, intended to speedup debug mode rebuilds of large +applications. In fact, BLITZ is what allows U`+`+ to keep libraries +in sources form. You can consider BLITZ as automated form SCU.&] +[s0; &] +[s0; Blitz processes packages (not the whole program) `- each package +can have a single [/ blitz`-block] (blitz block is SCU).&] +[s0; &] +[s0; Only .cpp including files with inclusion guards (#ifdef NAME`_H +#define NAME`_H .... #endif) can qualify to be part of [/ blitz`-block]. +&] +[s0; &] +[s0; Alternatively, you can force inclusion by&] +[s0; &] +[s7; #pragma BLITZ`_APPROVE&] +[s0; &] +[s0; (also works for header) or exlusion by&] +[s0; &] +[s7; #pragma BLITZ`_PROHIBIT.&] +[s0; &] +[s0; In addition only files older than one hour qualify for [/ blitz`-block]. +This simple heuristics excludes file that are being worked on +`- otherwise change in file would always require rebuilding of +the whole package, which would be potentially slower.&] +[s0; &] +[s0; The files in package that do not qualify for [/ blitz`-block ]are +build the regular way.&] +[s0; &] +[s0; It is also possible to disable blitz for individual packages, +either on project basis (in Package organizer) or in Output mode +dialog (machine specific setting).&] +[s0; &] +[s0; Files in [/ blitz`-block] are scanned for any #define, these are +undefined after the file. [/ blitz`-block] is in fact a file generated +into output directory that include all blitz approved files and +gets compiled instead of them (it is named `$blitz.cpp, you can +check the output directory for details).&] +[s0; &] +[s0; BLITZ also includes one dirty trick to basically allow BLITZ +compilation of packages that define static variables names based +on the line number (macro `_`_LINE`_`_). Static variables are +not visible outside the compilation unit using the normal build +process, but when using BLITZ, more than single .cpp files are +compiled into single unit and so there is the possibility that +two such variables would have the same name.&] +[s0; &] +[s0; Therefore BLITZ adds BLITZ`_INDEX`_`_ macro, which contains +a unique number (index of file) for each .cpp. That way you can +create `"static`" identifiers e.g. like this (and also make it +compile without BLITZ):&] +[s0; &] +[ {{10000@(255.255.192) [s7; #define MK`_`_s`_`_(x) s`_`_s##x&] +[s7; #define MK`_`_s`_(x) MK`_`_s`_`_(x)&] +[s7; &] +[s7; #ifdef BLITZ`_INDEX`_`_&] +[s7; #define STATIC`_ID MK`_`_s`_(COMBINE(BLITZ`_INDEX`_`_, +`_`_LINE`_`_))&] +[s7; #else&] +[s7; #define STATIC`_ID MK`_`_s`_(`_`_LINE`_`_)&] +[s0; [tC@5;1 -|#endif]]}}&] +[s0; &] +[s0; ] \ No newline at end of file diff --git a/uppsrc/ide/app.tpp/Blitz$en-us.tppi b/uppsrc/ide/app.tpp/Blitz$en-us.tppi index 3ac94bcd4..855dbab91 100644 --- a/uppsrc/ide/app.tpp/Blitz$en-us.tppi +++ b/uppsrc/ide/app.tpp/Blitz$en-us.tppi @@ -1,12 +1,12 @@ TITLE("What is BLITZ") COMPRESSED -120,156,149,87,105,115,219,200,17,253,43,83,75,39,37,217,16,141,185,112,144,95,214,150,157,90,85,214,71,173,229,84,18,21,87,24,2,67,114,34,16,160,113,72,214,186,236,223,158,215,3,80,7,85,149,67,42,73,4,136,238,126,253,222,235,30,234,66,176,103,207,194,32,156,132,255,229,107,246,198,174,76,95,118,139,139,82,36,201,220,113,46,194,185,225,241,252,67,58,255,241,227,199,148,171,48,153,83,50,142,100,60,84,146,11,142,123,161,18,49,215,105,152,234,132,39,161,140,149,208,113,168,103,59,211,152,237,226,194,36,114,254,252,183,8,81,34,208,19,201,37,15,121,36,20,158,10,101,40,20,23,154,39,137,226,177,78,100,26,69,179,220,236,58,87,87,139,139,37,197,41,132,73,132,133,113,18,41,142,32,165,133,140,181,66,176,82,128,39,81,56,142,226,120,214,185,174,180,139,11,71,184,129,246,148,80,170,32,154,0,157,136,17,169,132,138,148,76,132,228,137,16,81,42,85,170,0,155,139,153,235,44,64,46,149,152,27,252,80,152,70,61,165,21,151,96, -68,197,90,226,177,24,127,85,152,114,129,162,73,168,53,234,217,175,123,154,150,32,136,72,162,216,8,37,69,172,41,34,81,9,151,113,34,148,136,4,64,132,49,26,37,4,122,86,216,54,71,172,20,124,222,1,214,252,244,103,61,231,8,142,131,120,34,194,52,20,81,156,162,40,0,163,103,153,166,92,38,40,170,184,14,185,156,229,117,129,62,151,66,135,210,87,76,32,69,132,204,158,22,29,113,128,22,50,65,201,152,75,137,223,90,37,241,172,181,36,70,87,55,139,139,231,63,31,133,211,112,42,180,62,166,240,20,225,137,84,82,170,40,85,60,148,40,131,28,138,56,139,66,200,201,181,72,102,75,211,162,102,135,91,241,192,44,39,55,129,123,153,104,137,210,17,126,65,87,52,40,193,143,72,85,34,101,18,206,242,210,180,237,72,18,17,244,156,154,228,60,224,124,18,19,183,90,10,149,18,57,82,128,100,17,233,148,131,101,29,169,80,204,26,251,165,119,141,221,218,10,52,59,216,99,190,151,104,244,34,192,12,86,20,1,23,48,163,142,162,144,248,210,48,132,144, -26,132,135,60,81,64,132,111,200,220,141,110,92,222,247,32,3,46,39,169,80,18,72,82,165,192,0,18,240,148,115,30,38,248,70,103,224,197,251,131,143,198,26,203,15,225,42,224,106,18,195,198,80,42,85,84,62,149,196,159,0,253,34,10,53,116,16,67,184,32,214,197,51,240,206,69,66,63,158,121,174,3,142,121,0,68,174,53,250,150,160,90,36,232,93,131,123,233,45,206,227,100,246,222,222,180,111,76,103,71,195,60,63,125,54,56,141,71,1,143,38,33,197,235,36,133,128,92,17,127,82,169,84,164,82,106,145,106,25,133,224,177,29,6,154,130,105,164,252,56,222,37,137,3,30,99,184,208,171,214,232,222,135,161,243,152,19,20,145,164,17,177,48,38,201,78,74,87,17,14,56,99,62,152,225,249,233,11,206,99,74,148,96,104,146,36,10,101,10,50,192,65,168,225,116,44,132,4,66,67,103,129,49,160,141,144,95,153,181,205,78,198,105,245,16,200,129,90,234,132,124,139,72,64,7,8,228,73,195,48,194,157,36,193,52,205,214,102,247,200,128,34,12,68,8,23, -97,255,104,12,37,106,193,126,97,74,187,4,155,1,10,96,21,165,122,112,96,118,82,217,182,179,5,196,215,161,111,91,240,64,112,112,7,255,105,157,40,21,1,47,106,199,180,154,72,66,12,176,142,229,236,163,193,188,124,187,252,254,167,183,239,79,62,127,98,23,173,152,179,87,203,186,239,216,235,95,207,206,255,249,231,197,69,27,206,217,235,210,117,127,48,215,50,83,92,155,42,183,5,203,235,237,206,149,134,214,24,235,108,190,169,220,151,222,50,26,162,130,225,214,197,239,155,174,219,101,179,236,101,246,210,86,217,244,198,93,185,157,45,156,201,166,117,179,206,94,210,117,246,242,147,171,214,165,205,46,79,239,147,101,151,159,43,215,253,206,62,157,126,94,48,179,219,53,181,201,55,1,115,85,103,171,2,185,187,154,181,59,107,139,126,199,10,187,236,215,108,139,93,193,26,188,116,101,209,178,122,197,74,211,172,45,133,150,46,247,41,219,41,59,171,216,202,228,93,48,52,69,141,220,108,76,199,76,89,214,55,45,251,156,189,200,94,80,230,43,107,119,172,116,203,198, -52,206,182,40,202,218,186,111,114,188,92,213,205,118,202,254,81,247,44,55,21,154,175,90,87,216,102,76,103,192,75,223,213,91,56,184,240,79,18,250,233,72,221,35,6,209,14,178,181,72,56,218,164,101,71,85,221,177,110,99,129,168,46,45,61,177,198,16,31,179,236,132,89,180,190,127,208,215,221,152,107,116,198,90,79,27,187,120,201,150,148,53,59,89,150,117,126,181,96,71,254,146,249,43,70,77,2,198,241,1,142,15,85,121,203,166,249,110,135,238,242,178,47,144,138,173,92,9,32,55,174,219,12,55,91,18,117,221,155,6,132,30,77,220,170,176,43,246,254,213,187,183,217,229,47,108,130,11,76,200,221,245,20,95,108,2,109,220,234,216,99,252,210,155,210,173,110,137,206,37,218,49,77,71,162,28,98,157,178,199,176,94,149,157,109,42,200,117,109,203,219,128,221,142,68,131,204,220,62,0,181,188,125,16,22,207,217,100,215,152,245,214,12,58,100,151,175,62,126,252,237,195,223,222,62,78,125,100,202,182,102,55,117,115,229,101,100,27,107,32,221,49,195,75,251,245, -127,203,139,172,191,156,189,62,59,63,224,18,174,50,69,225,252,12,212,196,235,64,100,93,146,53,186,141,161,187,150,109,96,161,59,86,8,192,83,46,206,55,16,171,117,219,29,84,221,216,190,113,109,231,242,22,240,72,33,114,31,242,82,66,56,182,193,144,89,18,141,26,26,102,13,78,169,97,160,230,198,181,176,9,202,174,137,178,33,232,166,238,203,2,62,191,49,183,45,27,207,155,253,180,80,22,72,243,192,123,131,213,2,92,58,56,111,136,37,17,107,12,95,231,48,45,183,172,197,196,216,230,128,136,115,164,24,122,71,221,189,97,61,222,162,102,228,239,255,208,62,91,248,158,8,144,135,210,216,117,143,17,102,64,124,72,119,231,55,16,169,185,171,219,214,45,137,148,154,21,174,53,244,114,48,63,85,112,112,227,181,43,80,243,110,204,2,102,29,113,68,124,97,196,254,101,243,142,150,21,242,29,1,242,199,17,50,86,147,169,220,31,163,59,240,198,135,190,219,97,21,250,29,131,229,85,214,107,118,180,197,84,210,4,96,13,229,110,229,114,214,218,174,3,151,135, -147,246,151,61,33,79,230,148,26,110,97,239,106,88,23,204,84,183,251,185,10,136,3,200,72,143,244,213,112,15,250,173,58,239,168,129,229,233,211,140,206,23,162,21,135,245,224,133,95,219,202,54,126,33,97,117,214,172,30,26,41,32,127,142,143,72,183,131,58,195,10,176,180,7,71,250,252,198,189,38,92,30,189,169,10,100,234,218,113,221,251,108,56,102,76,49,26,103,11,250,188,42,149,217,226,205,236,153,207,66,235,229,126,134,243,141,133,202,4,254,9,8,106,190,176,157,113,101,123,200,222,184,89,73,236,17,101,235,167,9,193,29,208,55,142,114,214,94,195,220,27,211,239,242,49,236,225,225,4,160,119,187,118,176,228,176,192,218,14,239,231,236,26,171,158,236,51,180,208,222,159,96,4,152,62,11,176,170,223,46,193,62,233,222,212,44,187,204,46,127,61,123,255,150,254,30,79,217,167,195,44,36,28,57,254,218,13,6,69,207,116,84,248,116,15,97,245,56,229,88,79,155,220,191,85,225,212,128,93,135,49,24,79,137,0,151,29,102,209,86,227,131,190,185,0,110, -108,236,176,94,198,131,192,175,243,81,176,198,62,212,138,78,203,225,25,95,143,228,4,161,52,8,150,84,163,202,195,40,57,232,54,154,162,187,65,80,143,249,191,111,106,216,4,254,244,161,144,22,76,121,186,158,174,129,198,174,8,221,168,94,129,3,100,92,161,103,239,223,188,253,59,145,198,60,143,251,29,131,147,20,242,87,0,78,8,233,35,196,158,110,12,177,253,74,234,81,99,199,222,42,254,60,164,102,105,99,2,41,86,196,189,203,26,11,183,179,236,167,65,215,236,39,6,214,177,180,86,206,54,216,164,211,245,20,106,94,17,126,154,121,34,194,123,107,107,112,15,204,140,156,249,67,240,238,195,207,241,236,190,63,246,237,27,253,219,17,254,124,132,255,42,232,63,139,41,79,197,49,27,78,139,209,82,239,254,74,13,182,244,235,232,235,49,27,190,252,101,59,153,124,221,31,45,135,15,223,63,122,144,96,12,216,199,13,231,240,19,62,15,210,126,58,127,117,126,118,138,247,223,176,7,95,247,197,78,63,188,123,13,251,30,29,166,9,30,59,123,95,124,98,203,214, -254,159,37,30,37,186,203,67,159,16,22,223,191,63,118,204,226,223,107,2,201,152, +120,156,149,87,105,115,219,200,17,253,43,83,75,39,37,217,16,141,185,112,144,95,108,203,74,173,42,235,163,214,114,42,9,139,43,12,129,33,57,43,16,160,1,80,178,214,177,127,123,94,15,64,29,84,85,14,170,36,17,36,186,251,245,123,175,123,200,153,96,207,158,133,65,56,10,255,203,99,242,214,46,205,174,236,230,179,82,36,201,212,113,46,194,169,225,241,244,67,58,253,241,227,199,152,171,48,153,82,50,142,100,60,84,146,11,142,215,66,37,98,174,211,48,213,9,79,66,25,43,161,227,80,79,182,166,49,155,249,204,36,114,250,252,215,8,81,34,208,35,201,37,15,121,36,20,238,10,101,40,20,23,154,39,137,226,177,78,100,26,69,147,220,108,59,87,87,243,217,130,226,20,194,36,194,194,56,137,20,71,144,210,66,198,90,33,88,41,192,147,40,28,71,113,60,233,92,87,218,249,204,17,110,160,61,37,148,42,136,70,64,39,98,68,42,161,34,37,19,33,121,34,68,148,74,149,42,192,230,98,226,58,11,144,11,37,166,6,191,20,166,81,79,105,197,37,24, +81,177,150,184,45,198,127,21,166,92,160,104,18,106,141,122,246,235,158,166,5,8,34,146,40,54,66,73,17,107,138,72,84,194,101,156,8,37,34,1,16,97,140,70,9,129,158,20,182,205,17,43,5,159,118,167,175,244,148,35,48,14,226,145,8,211,80,68,113,138,130,0,139,126,101,154,114,153,160,160,226,58,228,114,146,215,5,122,92,8,29,74,95,45,129,12,17,178,122,74,116,196,1,88,200,4,229,98,46,37,254,106,149,196,147,214,146,16,93,221,204,103,207,95,29,133,227,112,44,180,62,166,240,20,225,137,84,82,170,40,85,60,148,40,131,28,138,248,138,66,72,201,181,72,38,11,211,162,102,231,9,229,100,34,80,46,19,45,81,53,194,31,200,137,190,36,104,17,169,74,164,76,194,73,94,154,182,29,184,33,94,158,83,127,156,7,156,143,98,162,84,75,161,82,226,68,10,112,43,34,157,114,144,171,35,21,138,73,99,191,236,92,99,55,182,2,187,14,174,152,238,149,25,44,8,104,189,3,69,192,5,60,168,163,40,36,170,52,124,32,164,6,207,33,79,20, +16,225,7,234,118,131,9,23,60,138,123,83,112,25,112,57,74,133,146,64,146,42,133,230,145,128,167,156,243,48,193,15,58,3,37,222,22,124,240,211,80,190,15,87,1,87,163,24,238,133,72,169,162,242,169,36,234,4,152,23,81,168,33,129,232,195,5,17,46,158,129,114,46,18,250,245,164,115,29,112,140,1,32,114,173,209,183,4,203,34,65,239,26,180,75,239,108,30,39,147,247,246,166,125,107,58,59,248,228,249,233,179,222,96,60,10,120,52,10,41,94,39,41,180,227,138,248,147,74,165,34,149,82,139,84,203,40,4,143,109,63,199,20,76,147,228,167,240,46,73,28,240,24,51,133,94,181,70,247,62,12,157,199,156,160,136,36,141,136,133,33,73,118,82,186,138,112,192,20,211,231,221,233,11,206,99,202,145,96,76,146,36,10,101,10,30,208,126,168,225,109,172,128,4,26,67,98,1,227,211,14,200,175,204,202,102,39,195,124,250,234,228,59,45,117,66,110,69,36,80,163,62,242,164,97,24,225,149,36,193,252,76,86,102,187,183,157,8,3,17,194,59,88,54,26,19, +136,50,48,93,152,210,226,192,26,0,239,216,59,169,238,125,151,157,84,182,237,108,1,201,117,232,155,21,60,16,28,140,193,117,90,39,74,69,128,138,178,49,237,33,18,14,211,170,99,57,249,104,48,32,223,46,191,255,233,236,253,201,231,79,108,214,138,41,123,189,168,119,29,123,243,203,249,197,63,255,60,159,181,225,148,189,41,93,247,7,115,45,51,197,181,169,114,91,176,188,222,108,93,105,104,103,177,206,230,235,202,125,217,89,70,83,83,48,188,52,251,109,221,117,219,108,146,189,204,94,218,42,27,223,184,43,183,181,133,51,217,184,110,86,217,75,186,206,94,126,114,213,170,180,217,229,233,125,178,236,242,115,229,186,223,216,167,211,207,115,102,182,219,166,54,249,58,96,174,234,108,85,32,119,87,179,118,107,109,177,219,178,194,46,118,43,182,193,114,96,13,158,186,178,104,89,189,100,165,105,86,150,66,75,151,251,148,237,152,157,87,108,105,242,46,232,155,162,70,110,214,166,99,166,44,235,155,150,125,206,94,100,47,40,243,149,181,91,86,186,69,99,26,103,91,20, +101,109,189,107,114,60,93,214,205,102,204,254,81,239,88,110,42,52,95,181,174,176,205,144,206,128,151,93,87,111,224,219,194,223,73,232,199,3,117,143,24,68,59,200,214,34,225,224,144,150,29,85,117,199,186,181,5,162,186,180,116,199,10,163,123,204,178,19,102,209,250,254,70,95,119,109,174,209,25,107,61,109,108,246,146,45,40,107,118,178,40,235,252,106,206,142,252,37,243,87,140,154,4,140,227,3,28,31,170,242,150,141,243,237,22,221,229,229,174,64,42,182,116,37,128,220,184,110,221,191,216,146,168,171,157,105,64,232,209,200,45,11,187,100,239,95,191,59,203,46,127,102,35,92,96,46,238,174,199,120,176,17,180,113,203,99,143,241,203,206,148,110,121,75,116,46,208,142,105,58,18,229,16,235,152,61,134,245,186,236,108,83,65,174,107,91,222,6,236,118,32,26,100,230,246,1,168,197,237,131,176,120,202,70,219,198,172,54,166,215,33,187,124,253,241,227,175,31,254,118,246,56,245,145,41,219,154,221,212,205,149,151,145,173,173,129,116,199,12,79,237,215,255,45,47,178, +254,124,254,230,252,226,128,75,184,202,20,133,243,51,80,19,175,61,145,117,73,214,232,214,134,94,181,108,13,11,221,177,66,0,158,114,113,177,134,88,173,219,108,161,234,218,238,26,215,118,46,111,1,143,20,34,247,33,47,37,132,99,27,12,153,37,209,168,161,126,214,224,148,26,6,106,110,92,11,155,160,236,138,40,235,131,110,234,93,89,192,231,55,230,182,101,195,41,179,159,22,202,2,105,30,120,175,183,90,128,75,7,231,245,177,36,98,141,225,235,28,166,229,150,181,152,24,219,28,16,113,129,20,125,239,168,187,55,172,199,91,212,140,252,253,31,218,103,115,223,19,1,242,80,26,187,218,97,132,25,16,31,210,221,249,13,68,106,110,235,182,117,11,34,165,102,133,107,13,61,237,205,79,21,28,220,120,237,10,212,188,27,179,128,89,71,28,17,95,24,177,223,109,222,209,178,66,190,35,64,254,56,64,198,106,50,149,251,99,112,7,222,248,176,235,182,88,133,126,199,96,121,149,245,138,29,109,48,149,52,1,88,67,185,91,186,156,181,182,235,192,229,225,164,253,101, +79,200,147,57,165,134,91,216,187,234,215,5,51,213,237,126,174,2,226,0,50,210,45,187,170,127,13,250,45,59,239,168,158,229,241,211,140,206,23,162,21,135,245,224,133,95,217,202,54,126,33,97,117,214,172,238,27,41,32,127,142,207,68,183,189,58,253,10,176,180,7,7,250,252,198,189,38,92,30,189,169,10,100,234,218,97,221,251,108,56,102,76,49,24,103,3,250,188,42,149,217,224,205,236,153,207,66,235,229,126,134,243,181,133,202,4,254,9,8,106,190,176,157,113,101,123,200,222,176,89,73,236,1,101,235,167,9,193,29,208,55,142,114,214,94,195,220,27,211,239,242,33,236,225,225,4,160,119,187,182,183,100,191,192,218,14,239,231,236,26,171,158,236,211,183,208,222,159,96,4,152,62,1,176,106,183,89,128,125,210,189,169,89,118,153,93,254,114,254,254,140,254,31,143,217,167,195,44,36,28,57,254,218,245,6,69,207,116,84,248,116,15,97,237,112,202,177,29,109,114,255,86,133,83,3,118,237,199,96,56,37,2,92,118,152,69,91,13,55,250,230,2,184,177,177,253, +122,25,14,2,191,206,7,193,26,251,80,43,58,45,251,123,124,61,146,19,132,210,32,88,82,141,42,247,163,228,160,219,96,138,238,6,65,59,204,255,125,83,253,38,240,167,15,133,180,96,202,211,245,116,13,52,118,73,232,6,245,10,28,32,195,10,61,127,255,246,236,239,68,26,243,60,238,119,12,78,82,200,95,1,56,33,164,143,16,123,186,49,196,246,43,169,71,141,29,123,171,248,243,144,154,165,141,9,164,88,17,247,46,107,44,220,206,178,159,122,93,179,159,24,88,199,210,90,58,219,96,147,142,87,99,168,121,69,248,105,230,137,8,239,173,141,193,107,96,102,224,204,31,130,119,31,126,142,39,247,253,177,111,223,232,123,70,248,234,8,95,35,232,171,196,152,167,226,152,245,167,197,96,169,119,127,165,6,91,250,115,244,245,152,245,15,127,217,142,70,95,247,71,203,225,205,247,183,30,36,24,2,246,113,253,57,252,132,207,131,180,159,46,94,95,156,159,226,253,183,236,193,227,190,216,233,135,119,111,96,223,163,195,52,193,99,103,239,139,143,108,217,218,255,179,196, +163,68,3,131,179,225,27,223,201,191,250,207,10,243,249,247,239,143,205,51,255,55,2,208,200,172, diff --git a/uppsrc/ide/app.tpp/Sponsor$en-us.tpp b/uppsrc/ide/app.tpp/Sponsor$en-us.tpp index 0daee8734..17578f1fb 100644 --- a/uppsrc/ide/app.tpp/Sponsor$en-us.tpp +++ b/uppsrc/ide/app.tpp/Sponsor$en-us.tpp @@ -1,4 +1,5 @@ -topic "This release was sponsored by ";[2 $$0,0#00000000000000000000000000000000:Default] +topic "This release was sponsored by "; +[2 $$0,0#00000000000000000000000000000000:Default] [l288;i1120;a17;O9;~~~.1408;2 $$1,0#10431211400427159095818037425705:param] [a83;*R6 $$2,5#31310162474203024125188417583966:caption] [b83;*4 $$3,5#07864147445237544204411237157677:title]