mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-19 22:04:01 -06:00
T++ - insert before logic
git-svn-id: svn://ultimatepp.org/upp/trunk@615 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
27d1b254ae
commit
90cd86424e
10 changed files with 66 additions and 31 deletions
|
|
@ -312,8 +312,4 @@ and ][%-* cy][%- equal to the square of ][%-*@3 a][%-* .cy].&]
|
|||
[s5;:`:`:Size`_`:`:Length`(`:`:Size`_`):%- [@(0.0.255) friend][@(64) _][@(0.0.255) double][@(64) _
|
||||
]Length[@(64) (]Size`_[@(64) _][@3 a][@(64) )]&]
|
||||
[s2; Returns the hypotenuse of the triangle described by [%-*@3 a].&]
|
||||
[s0; &]
|
||||
[s4;%- &]
|
||||
[s0; &]
|
||||
[s0; &]
|
||||
[s0; ]
|
||||
[s3; ]
|
||||
13
uppsrc/Core/src.tpp/Size$en-us.tppi
Normal file
13
uppsrc/Core/src.tpp/Size$en-us.tppi
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
TITLE("Size")
|
||||
COMPRESSED
|
||||
120,156,205,91,105,115,219,56,18,253,43,152,202,56,107,43,146,205,91,151,199,149,218,100,50,147,218,73,54,53,214,230,139,138,150,32,10,178,48,75,145,26,18,178,173,164,146,223,190,141,131,226,161,195,148,68,123,19,167,116,144,104,224,189,215,141,6,154,164,250,6,250,249,103,173,174,189,208,30,249,215,121,75,38,120,225,51,183,79,45,171,213,197,134,221,253,239,191,254,221,238,114,123,29,236,205,166,110,182,108,83,183,12,7,94,116,83,55,108,195,180,244,150,209,182,90,166,217,210,58,158,143,227,216,237,251,70,171,37,140,12,48,50,154,182,161,55,173,150,213,210,205,102,203,0,91,67,211,12,173,105,216,186,101,182,12,187,51,38,177,231,246,53,104,110,66,243,182,99,182,53,93,211,154,186,174,153,70,83,51,109,75,215,77,3,186,48,154,134,174,217,29,18,140,221,254,239,78,151,27,88,156,148,237,0,116,7,122,179,44,13,122,231,102,150,169,155,154,97,218,122,219,118,58,35,114,75,131,77,148,236,71,41,53,181,14,101,100,166,24,97,171,91,123,109,119,
|
||||
117,48,117,234,206,139,38,12,107,217,48,88,155,51,50,193,204,48,28,187,173,219,22,64,178,52,163,19,145,191,23,52,34,51,18,48,213,3,213,117,67,239,142,244,102,23,32,124,255,254,253,92,183,52,169,84,19,176,232,26,224,54,116,56,6,60,154,186,221,214,218,118,75,111,105,102,211,50,236,38,80,159,227,8,207,20,147,145,101,116,21,143,86,189,245,194,209,29,80,84,107,1,126,187,13,29,104,64,2,222,65,72,27,254,155,173,14,83,198,220,142,27,181,235,237,23,32,146,105,107,205,182,214,180,154,182,5,76,12,221,209,65,72,141,243,7,55,116,130,48,154,97,223,237,127,29,124,59,249,245,99,227,63,215,168,31,107,93,212,175,189,54,187,22,186,166,95,200,112,224,190,116,249,65,56,132,248,39,189,203,173,200,164,115,210,64,253,215,167,218,185,118,14,144,206,76,4,58,206,125,204,136,219,55,209,224,210,205,157,83,113,3,39,92,232,219,234,154,168,151,111,112,229,170,190,229,152,195,206,176,19,179,104,225,177,194,48,72,30,117,7,253,90,2,111,208,
|
||||
25,100,27,204,23,35,159,122,188,1,0,254,16,222,17,60,242,73,118,48,116,153,181,206,159,224,224,242,208,0,217,224,106,32,37,0,40,242,3,74,237,17,141,17,70,183,36,32,17,245,20,186,69,68,16,155,98,134,120,228,71,116,68,120,19,118,31,162,49,133,88,137,105,24,96,31,197,96,143,194,209,95,196,99,231,168,55,37,104,26,70,244,75,24,48,56,183,106,199,123,143,200,60,34,49,196,24,25,163,209,146,251,230,20,66,16,224,105,103,200,123,224,88,87,95,145,139,131,49,12,77,208,29,137,24,245,160,171,48,32,235,86,75,247,28,253,51,100,211,204,64,24,48,135,19,196,150,115,130,148,10,231,202,223,9,233,94,8,60,25,80,137,231,196,163,216,7,2,99,62,144,176,7,219,84,148,58,90,196,68,12,205,187,4,56,147,208,247,195,123,26,220,118,84,95,178,103,16,148,91,240,47,182,114,61,56,158,99,24,175,5,24,82,135,193,121,131,27,57,206,205,70,39,210,128,93,173,60,44,194,202,232,170,134,232,158,2,105,241,2,231,161,161,155,42,16,
|
||||
159,243,166,166,132,102,21,16,234,78,6,163,238,84,128,210,133,243,0,64,119,110,144,120,43,198,156,194,15,39,118,51,40,88,34,119,27,161,108,0,172,194,153,119,234,88,25,110,142,85,29,55,199,18,220,28,107,11,55,56,177,155,91,193,178,60,183,149,223,38,25,106,147,10,152,141,67,200,46,36,165,48,217,197,64,54,222,77,33,157,93,240,134,190,126,213,249,50,253,238,84,55,90,103,191,137,215,215,122,146,146,209,27,48,18,249,37,140,208,91,194,48,245,93,247,219,183,92,106,178,179,9,84,125,58,29,158,9,186,171,217,121,122,166,64,191,137,8,228,107,72,78,1,90,4,52,160,44,153,212,105,219,13,147,98,227,24,30,199,134,62,99,127,65,134,47,215,6,204,74,32,90,10,161,69,235,27,105,148,83,105,248,82,165,239,56,242,220,4,172,218,186,128,253,124,41,59,145,82,228,17,238,210,161,55,172,247,214,161,201,92,39,199,131,116,90,71,249,35,75,119,77,173,108,246,151,9,156,43,152,234,23,35,202,134,255,136,55,39,116,25,28,39,13,57,28,
|
||||
114,225,35,226,73,91,154,172,210,118,193,192,77,192,148,103,43,61,162,190,241,164,56,188,42,233,153,205,107,35,79,171,169,99,190,148,148,101,92,208,69,210,89,181,117,81,210,221,161,196,98,80,249,88,106,162,143,234,201,65,106,62,154,158,204,33,71,242,83,89,171,114,130,147,227,249,137,44,127,36,189,221,203,77,73,214,200,45,203,26,6,72,38,240,1,196,63,133,124,42,2,243,94,105,214,131,27,101,116,147,88,151,216,181,174,104,207,217,241,180,197,176,199,176,254,184,240,125,18,149,230,43,155,223,40,179,226,218,112,12,29,104,201,59,117,247,94,124,63,137,178,2,189,163,196,31,163,63,40,0,221,185,246,122,15,114,139,161,86,18,190,178,40,212,108,203,86,255,81,69,189,101,161,203,101,182,203,245,149,35,101,248,8,181,15,132,77,195,50,164,222,248,4,71,171,253,68,198,41,119,33,29,11,76,162,69,186,193,184,38,44,70,163,124,161,193,66,164,61,182,171,120,31,255,58,155,179,37,31,74,4,69,113,188,81,24,250,98,60,213,16,70,28,172,71,146,
|
||||
2,241,39,129,130,44,136,57,83,216,50,192,146,67,39,8,106,51,64,10,129,201,107,148,92,181,165,241,13,0,154,96,63,134,150,128,156,68,247,52,38,37,226,157,48,30,88,59,213,81,109,82,125,254,36,217,24,229,110,84,225,11,34,229,34,117,231,208,239,99,222,240,61,80,198,129,71,202,136,150,109,191,83,187,207,80,213,78,40,159,63,19,89,176,210,120,11,176,117,88,191,17,246,59,142,167,114,79,184,13,212,2,132,191,13,136,212,39,107,81,202,165,98,46,129,5,186,227,38,73,177,201,129,62,174,90,47,188,102,17,84,164,121,104,176,253,23,71,97,251,47,222,5,174,164,105,105,76,220,215,210,34,173,222,49,83,101,114,121,136,225,156,68,24,182,184,195,87,195,95,134,167,234,248,89,130,115,123,153,34,115,63,202,154,67,166,93,51,81,235,195,42,159,190,15,60,200,168,49,17,46,134,132,149,100,76,209,104,235,134,150,103,90,153,141,214,218,175,231,164,125,57,247,14,167,155,221,197,179,13,28,11,105,73,96,23,174,193,51,162,226,73,217,238,1,186,
|
||||
113,156,163,26,229,28,245,150,228,28,133,220,253,28,181,222,254,40,71,53,14,118,84,99,135,163,82,142,79,226,168,218,113,142,170,149,115,212,7,40,88,233,220,167,63,136,167,106,7,123,170,182,195,83,25,146,79,226,170,139,163,92,117,81,114,74,209,59,58,254,65,220,116,113,168,155,46,118,205,39,69,240,73,92,116,9,127,128,153,215,38,251,163,190,188,20,176,51,13,120,177,161,106,182,233,138,192,245,148,78,88,1,126,12,187,56,126,112,137,146,214,123,128,190,130,191,131,65,95,93,29,1,58,162,183,211,67,81,191,130,191,211,195,86,197,87,233,198,83,44,131,252,190,85,49,32,226,189,18,127,227,48,40,96,152,66,17,137,254,72,40,104,195,38,51,29,111,80,126,67,137,249,225,204,45,141,100,175,166,54,228,178,163,50,197,64,36,55,245,144,184,24,44,99,179,85,229,187,185,44,80,173,101,162,18,6,98,255,73,248,253,188,141,215,69,211,0,75,108,227,28,86,204,239,68,129,185,188,239,99,233,231,150,193,175,141,199,123,215,189,175,13,244,46,162,36,
|
||||
40,150,135,9,231,76,169,159,143,210,211,204,153,53,234,19,209,37,231,230,88,103,104,224,202,118,171,175,105,55,234,208,105,177,69,95,136,160,190,158,173,121,145,95,207,158,133,99,94,186,140,165,38,201,165,139,45,85,203,22,26,141,106,104,52,14,164,129,2,114,139,217,113,20,242,158,168,63,185,87,112,98,95,71,155,78,143,242,108,75,227,238,61,3,220,126,114,21,45,61,205,246,128,219,171,90,221,93,120,74,169,91,168,74,161,14,229,55,80,84,90,195,227,49,93,149,164,247,97,114,1,77,108,1,98,4,57,21,231,110,106,197,80,205,250,106,135,112,196,28,170,68,162,157,243,169,170,0,108,84,22,128,165,225,30,19,128,141,202,2,176,241,76,1,24,47,70,44,194,222,115,196,96,173,250,24,172,61,71,12,214,42,139,193,210,112,55,248,124,31,184,21,197,96,109,87,12,238,167,238,206,24,156,169,218,213,195,207,17,134,23,149,135,225,197,115,68,225,69,85,81,88,26,237,227,65,184,211,171,99,168,117,227,103,240,39,47,123,115,210,164,181,228,254,226,92,
|
||||
94,150,87,39,95,117,230,183,147,211,146,66,137,202,57,230,245,41,208,151,149,40,118,183,23,165,143,72,193,139,233,202,164,184,186,122,94,41,100,61,94,153,22,191,240,203,10,135,78,244,236,57,113,199,102,61,57,66,255,213,77,251,245,27,100,200,165,19,165,129,124,158,80,124,30,33,119,138,239,248,115,141,132,70,92,187,57,129,165,251,46,123,247,140,252,189,192,126,122,251,12,185,91,110,159,61,34,223,79,79,43,223,79,255,79,245,86,247,29,69,137,42,4,75,5,60,88,186,25,13,42,91,89,160,175,42,229,225,131,159,156,100,74,90,23,190,166,143,113,192,41,153,131,229,227,79,133,88,226,147,81,172,210,52,160,179,197,44,73,239,27,131,111,68,216,61,33,129,122,82,10,11,52,194,1,98,12,121,116,148,204,99,117,205,38,123,241,166,160,40,126,168,78,81,252,240,227,41,138,31,158,72,209,205,122,126,188,243,43,211,19,250,122,154,9,44,175,175,140,196,3,2,234,11,22,207,119,243,219,221,245,204,161,189,38,231,181,135,125,28,125,138,194,241,194,99,
|
||||
199,36,182,220,150,40,215,235,147,200,33,74,52,49,10,154,203,97,86,17,145,42,33,18,92,162,91,25,53,62,19,254,204,102,213,106,228,122,125,50,53,238,196,40,20,82,118,133,130,92,195,180,140,200,120,191,11,141,197,96,144,125,148,34,190,225,42,99,230,201,191,228,25,41,126,247,95,174,78,44,148,145,32,134,16,79,249,39,92,249,7,116,206,127,129,0,104,5,113,121,200,91,202,35,91,236,221,98,7,197,135,90,55,235,244,7,9,110,217,116,95,153,210,115,233,195,216,242,156,236,239,48,201,196,99,39,203,121,200,72,32,126,231,32,147,40,131,208,16,133,68,242,171,15,249,115,141,132,109,66,210,253,31,179,24,86,71,
|
||||
|
||||
13
uppsrc/Core/src.tpp/algo$en-us.tppi
Normal file
13
uppsrc/Core/src.tpp/algo$en-us.tppi
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
TITLE("Algorithms")
|
||||
COMPRESSED
|
||||
120,156,237,156,121,111,218,72,20,192,191,202,72,221,173,72,4,172,79,108,160,90,181,37,155,46,74,218,172,66,154,127,144,21,12,30,18,171,198,102,61,38,105,182,180,159,125,223,140,15,108,176,29,206,112,36,85,69,26,123,230,205,59,126,239,205,195,71,219,2,250,237,55,174,200,189,225,158,248,83,59,193,125,125,100,121,90,219,148,36,181,174,11,114,253,219,217,69,181,78,231,243,48,95,84,120,81,149,69,94,18,42,240,193,139,188,32,11,162,196,171,66,85,82,69,81,229,106,61,75,39,68,107,91,130,170,178,73,2,76,18,20,89,224,21,73,149,84,94,84,84,1,230,10,28,39,112,138,32,243,146,168,10,114,205,192,164,167,181,57,24,46,194,240,106,69,172,114,60,199,41,60,207,137,130,194,137,178,196,243,162,0,34,4,69,224,57,185,134,109,67,107,255,93,169,211,9,18,53,74,174,128,234,21,144,38,73,28,72,167,211,36,145,23,57,65,148,249,170,92,169,117,241,173,105,167,153,36,63,105,146,194,213,76,15,15,2,139,116,169,126,252,94,174,243,48,
|
||||
181,82,172,188,81,96,89,73,134,197,170,212,34,17,166,9,66,69,174,242,178,4,42,73,156,80,115,241,191,35,211,197,3,108,123,129,4,147,231,5,190,222,229,149,58,168,240,235,215,175,50,47,113,190,167,20,208,133,231,64,111,129,135,99,96,135,194,203,85,174,42,171,188,202,137,138,36,200,10,152,62,212,93,125,16,88,210,149,132,122,96,135,90,84,223,84,248,10,120,148,83,65,127,185,10,2,56,48,2,126,130,35,101,248,43,170,53,47,152,76,231,209,73,213,98,245,13,56,73,148,57,165,202,41,146,34,75,96,137,192,87,120,112,36,71,237,135,48,212,108,199,29,232,150,214,254,113,243,243,247,191,190,148,190,182,80,155,112,117,212,62,150,209,7,235,214,113,77,239,110,64,180,183,26,59,10,63,208,143,31,60,5,233,180,192,11,234,209,39,246,249,158,15,39,161,79,150,211,213,45,116,58,178,123,158,233,216,68,211,126,254,164,147,165,250,223,92,253,247,18,149,64,228,122,173,245,160,15,59,133,171,206,219,78,145,126,28,213,224,84,251,125,129,43,115,101,
|
||||
176,238,8,65,68,134,150,238,97,237,230,93,252,176,15,223,77,251,248,189,132,174,180,248,153,63,225,104,236,215,123,199,52,232,56,68,23,210,10,41,19,58,111,153,28,17,233,90,17,229,157,239,106,71,84,105,161,206,100,17,116,175,91,35,76,202,168,53,196,61,179,111,246,144,247,56,196,4,13,204,219,59,15,17,122,80,183,204,255,48,10,23,71,15,224,66,52,112,92,140,112,191,143,193,45,247,24,132,184,166,110,123,164,76,69,87,234,232,10,13,70,196,67,119,58,156,195,48,30,187,200,192,120,136,122,206,240,17,57,67,236,234,158,227,34,248,59,52,123,223,162,3,108,182,66,253,222,96,250,151,198,87,160,11,114,250,161,146,177,243,212,208,210,248,212,116,97,25,118,22,121,14,34,160,96,114,80,23,6,181,112,207,177,141,148,81,98,24,65,41,22,202,166,135,93,63,156,205,78,177,185,84,40,155,115,133,50,92,40,8,103,115,58,126,205,220,128,161,161,99,218,30,54,168,65,221,71,4,57,207,92,56,95,32,163,165,231,10,38,29,233,199,179,139,33,140,
|
||||
125,211,134,101,251,16,60,186,192,148,30,205,100,12,155,224,254,102,160,26,27,62,27,194,232,52,19,100,218,183,84,82,127,18,215,217,120,166,206,32,177,32,151,209,247,239,175,241,125,81,241,13,163,123,106,218,198,185,243,128,221,143,206,200,54,58,5,152,4,11,53,104,97,6,89,193,135,127,144,85,107,255,159,231,75,214,236,6,141,101,102,61,207,62,119,158,7,16,168,200,248,73,154,2,20,197,133,81,181,35,37,82,235,252,253,212,250,129,88,56,51,116,72,230,185,30,172,229,77,107,30,91,44,99,83,129,176,228,76,58,79,159,100,97,112,72,200,62,181,150,4,92,128,130,38,221,109,65,47,228,234,246,45,219,2,64,160,167,3,154,46,34,142,75,129,4,26,193,75,76,8,26,186,216,48,123,16,44,244,0,123,13,203,1,170,18,234,233,54,133,218,180,9,102,115,104,58,56,35,0,221,197,250,55,70,214,29,8,119,13,236,194,47,73,180,27,177,237,39,90,251,137,29,42,201,242,61,156,110,164,205,244,67,80,26,127,164,109,158,77,213,0,1,204,208,228,
|
||||
40,63,24,165,241,151,209,160,11,118,195,32,108,177,222,140,68,158,153,90,17,108,46,141,175,195,141,14,50,217,72,14,96,222,42,141,47,2,139,39,126,155,12,251,3,93,98,111,228,218,190,69,48,248,159,88,52,146,142,72,173,175,57,25,248,34,243,110,171,217,115,0,169,178,55,76,175,31,228,157,133,117,17,236,254,136,218,251,119,7,6,223,58,168,250,58,28,30,74,175,50,49,229,101,244,42,224,163,215,86,101,239,91,149,140,4,124,145,105,183,205,228,57,128,76,217,27,164,183,214,169,60,63,171,11,80,247,218,168,228,65,245,209,180,117,247,49,171,70,78,247,43,59,91,45,125,51,182,83,41,215,211,213,204,95,99,35,208,39,187,177,127,61,144,248,87,16,113,120,77,28,40,208,23,237,94,202,168,217,71,182,131,200,168,119,23,73,199,223,77,226,145,34,72,179,241,173,30,92,108,100,43,16,228,50,4,177,241,218,186,60,79,74,190,38,226,154,91,150,69,210,137,238,2,135,147,71,123,1,252,214,154,154,231,37,121,19,76,166,119,62,123,79,230,170,200,
|
||||
125,128,110,213,54,90,204,81,157,66,12,183,198,102,235,235,108,13,205,194,8,197,85,12,238,51,102,224,102,96,146,215,85,100,204,34,110,111,197,218,249,25,187,183,152,0,110,35,183,135,209,151,171,243,24,131,16,49,170,22,228,15,139,74,226,100,25,125,116,128,227,232,119,18,221,161,12,200,165,77,11,233,129,245,108,103,167,149,167,140,62,244,61,42,150,182,224,12,104,144,90,76,44,49,89,219,36,217,130,144,110,27,225,208,232,126,108,223,117,6,168,155,212,169,140,78,70,67,203,255,158,16,12,211,225,203,2,164,16,124,61,184,135,76,64,179,37,145,174,108,96,208,115,192,238,179,198,54,133,5,243,38,136,105,105,124,146,102,96,114,36,141,99,105,220,242,131,144,49,102,153,34,158,190,116,187,17,165,192,59,6,54,210,66,155,224,212,159,218,114,25,183,92,154,237,84,42,5,73,65,31,163,170,86,95,147,35,66,45,37,37,226,123,210,22,19,99,211,196,127,181,65,208,78,111,49,49,13,95,252,14,195,216,15,88,14,7,143,108,243,95,250,72,202,70,210,
|
||||
203,23,158,159,101,121,89,116,96,27,203,82,105,180,225,125,227,25,242,99,138,116,202,88,22,237,244,220,139,38,126,191,246,141,76,160,47,241,192,185,199,59,189,49,196,85,204,39,159,70,113,113,242,31,238,244,85,175,131,250,42,146,201,5,61,8,61,153,138,153,207,88,42,182,107,206,151,13,20,106,230,217,185,128,101,222,220,129,74,157,11,246,134,75,245,179,16,187,127,236,173,84,50,215,72,224,170,104,53,109,176,139,224,158,23,210,117,50,161,171,181,122,217,60,201,41,155,173,133,75,234,73,26,160,83,22,4,140,166,13,125,186,159,104,109,170,223,158,1,59,27,98,104,14,116,143,125,235,179,29,47,58,108,248,119,94,167,48,216,110,173,61,137,145,158,158,143,137,225,173,216,240,25,75,54,223,74,175,57,49,214,159,13,187,70,252,193,176,155,93,171,247,128,224,85,11,60,101,36,120,203,46,40,229,144,14,75,191,110,151,83,177,105,150,229,220,253,153,188,141,7,10,229,191,141,151,91,108,167,151,73,175,183,116,17,18,135,109,206,218,86,169,71,239,1,165,
|
||||
190,221,115,213,169,213,194,87,109,178,239,199,100,132,186,151,125,79,38,191,137,124,34,176,27,124,115,114,142,88,45,229,242,153,148,20,168,39,248,5,156,175,173,238,253,140,186,111,224,239,190,111,207,88,167,125,221,88,75,238,156,229,125,131,188,206,253,122,57,111,102,69,170,7,33,59,203,104,185,191,225,71,18,190,80,119,157,117,167,149,149,217,117,37,226,80,55,221,68,104,72,70,249,103,47,191,18,125,0,27,72,244,100,9,125,53,27,198,95,98,50,178,188,201,102,48,67,21,189,168,2,94,96,214,45,145,250,17,75,103,241,14,158,74,203,218,14,174,227,3,211,222,182,101,170,196,168,11,5,206,220,143,165,174,158,26,151,38,111,137,42,145,142,243,38,0,222,18,161,123,2,90,118,15,178,10,110,89,181,110,77,224,165,18,245,9,179,190,147,25,155,242,88,201,10,37,114,209,34,120,13,45,176,227,198,15,190,51,109,143,181,206,40,174,229,194,143,153,68,94,93,189,254,53,92,12,70,147,153,86,118,18,194,196,115,21,155,184,222,53,177,102,19,151,178,252,
|
||||
32,208,229,195,231,106,210,175,218,76,30,28,246,111,173,46,204,215,90,174,115,61,3,50,155,136,252,74,87,155,230,139,255,230,3,123,106,98,203,184,196,22,251,234,210,41,92,116,10,157,227,206,81,88,55,46,151,12,241,197,146,15,93,94,78,163,145,80,175,97,145,4,36,218,100,173,72,112,170,20,246,124,91,76,80,176,209,93,104,55,5,218,190,38,216,57,214,24,58,3,76,55,32,237,40,187,214,92,166,51,231,134,107,76,35,231,204,36,48,235,159,65,183,43,13,117,117,66,99,229,63,219,230,63,135,6,97,245,149,240,255,155,131,174,69,15,193,104,24,158,253,37,39,184,28,144,100,45,176,165,52,254,60,35,15,93,37,135,70,218,199,10,78,120,44,84,55,16,151,67,233,34,189,208,103,236,221,57,41,4,22,118,136,194,164,142,89,24,166,194,116,84,56,154,7,207,228,10,115,241,73,39,4,226,183,68,104,248,152,36,45,135,54,196,174,228,135,203,87,141,194,197,102,46,12,43,51,140,194,26,138,89,148,209,89,237,124,161,155,39,150,57,224,64,176,189,
|
||||
153,197,106,195,36,167,175,184,3,112,31,28,215,92,29,105,255,3,199,88,87,29,
|
||||
|
||||
|
|
@ -10,3 +10,11 @@ TOPIC("String1$en-us")
|
|||
#include "String1$en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
TOPIC("Size$en-us")
|
||||
#include "Size$en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
TOPIC("algo$en-us")
|
||||
#include "algo$en-us.tppi"
|
||||
END_TOPIC
|
||||
|
||||
|
|
|
|||
|
|
@ -121,10 +121,10 @@ void AssistEditor::SyncAnnotationPopup()
|
|||
annotation_popup.Ctrl::PopUp(this, false, false, true);
|
||||
}
|
||||
|
||||
void AssistEditor::OpenTopic(String topic, String create)
|
||||
void AssistEditor::OpenTopic(String topic, String create, bool before)
|
||||
{
|
||||
if(theide)
|
||||
theide->OpenTopic(topic, create);
|
||||
theide->OpenTopic(topic, create, before);
|
||||
}
|
||||
|
||||
void AssistEditor::NewTopic(String group, String coderef)
|
||||
|
|
@ -155,12 +155,12 @@ void AssistEditor::EditAnnotation(bool fastedit)
|
|||
if(tl.GetCount() > 1) {
|
||||
MenuBar bar;
|
||||
for(int i = 0; i < tl.GetCount(); i++)
|
||||
bar.Add(tl[i], THISBACK2(OpenTopic, tl[i] + '#' + coderef, String()));
|
||||
bar.Add(tl[i], THISBACK3(OpenTopic, tl[i] + '#' + coderef, String(), false));
|
||||
bar.Execute();
|
||||
return;
|
||||
}
|
||||
if(tl.GetCount()) {
|
||||
OpenTopic(tl[0] + '#' + coderef, String());
|
||||
OpenTopic(tl[0] + '#' + coderef, String(), false);
|
||||
return;
|
||||
}
|
||||
String scope, item;
|
||||
|
|
@ -168,7 +168,8 @@ void AssistEditor::EditAnnotation(bool fastedit)
|
|||
const CppItem *m = GetCodeRefItem(coderef);
|
||||
int access = m ? m->access : 0;
|
||||
VectorMap<String, String> tpp;
|
||||
for(int pass = 0; pass < 2; pass++)
|
||||
int backi = 0;
|
||||
for(int pass = 0; pass < 2; pass++) {
|
||||
for(int i = GetCursorLine(); pass ? i < GetLineCount() : i >= 0; pass ? i++ : i--) {
|
||||
String coderef2;
|
||||
if(GetAnnotationRefs(tl, coderef2, i) && tl.GetCount()) {
|
||||
|
|
@ -176,7 +177,7 @@ void AssistEditor::EditAnnotation(bool fastedit)
|
|||
SplitCodeRef(coderef2, scope2, item2);
|
||||
m = GetCodeRefItem(coderef2);
|
||||
if(scope2 == scope && m && m->access == access && tl.GetCount() == 1 && fastedit) {
|
||||
OpenTopic(tl[0] + '#' + coderef2, coderef);
|
||||
OpenTopic(tl[0] + '#' + coderef2, coderef, false);
|
||||
return;
|
||||
}
|
||||
for(int j = 0; j < tl.GetCount(); j++)
|
||||
|
|
@ -184,11 +185,14 @@ void AssistEditor::EditAnnotation(bool fastedit)
|
|||
tpp.Add(tl[j], coderef2);
|
||||
}
|
||||
}
|
||||
if(pass = 0)
|
||||
backi = tpp.GetCount();
|
||||
}
|
||||
MenuBar bar;
|
||||
if(tpp.GetCount()) {
|
||||
for(int i = 0; i < tpp.GetCount(); i++) {
|
||||
String l = tpp.GetKey(i);
|
||||
bar.Add(l, THISBACK2(OpenTopic, l + '#' + tpp[i], coderef));
|
||||
bar.Add(l, THISBACK3(OpenTopic, l + '#' + tpp[i], coderef, i >= backi));
|
||||
}
|
||||
bar.Separator();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ public:
|
|||
void ShowEditor(bool b) { editor.Show(b); }
|
||||
bool NewTopicEx(const String& name, const String& create);
|
||||
void Open(const String& grouppath);
|
||||
void GoTo(const String& topic, const String& link, const String& create);
|
||||
void GoTo(const String& topic, const String& link, const String& create, bool before);
|
||||
|
||||
static int GetSerial();
|
||||
|
||||
|
|
|
|||
|
|
@ -339,22 +339,23 @@ void TopicEditor::InsertNew(const String& coderef)
|
|||
editor.PrevPara();
|
||||
}
|
||||
|
||||
void TopicEditor::GoTo(const String& _topic, const String& link, const String& create)
|
||||
void TopicEditor::GoTo(const String& _topic, const String& link, const String& create, bool before)
|
||||
{
|
||||
if(topic.FindSetCursor(_topic) && !IsNull(link)) {
|
||||
editor.Select(editor.GetLength(), 0);
|
||||
editor.GotoLabel(link);
|
||||
if(!IsNull(create)) {
|
||||
for(bool firstpass = true; firstpass; firstpass = false)
|
||||
for(;;) {
|
||||
int c = editor.GetCursor();
|
||||
RichText::FormatInfo f = editor.GetFormatInfo();
|
||||
if(f.styleid == BeginUuid() || (IsNull(f.label) || f.label == "noref") && !firstpass)
|
||||
break;
|
||||
editor.NextPara();
|
||||
if(editor.GetCursor() == c)
|
||||
break;
|
||||
}
|
||||
if(!before)
|
||||
for(bool firstpass = true; firstpass; firstpass = false)
|
||||
for(;;) {
|
||||
int c = editor.GetCursor();
|
||||
RichText::FormatInfo f = editor.GetFormatInfo();
|
||||
if(f.styleid == BeginUuid() || (IsNull(f.label) || f.label == "noref") && !firstpass)
|
||||
break;
|
||||
editor.NextPara();
|
||||
if(editor.GetCursor() == c)
|
||||
break;
|
||||
}
|
||||
InsertNew(create);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -465,7 +465,7 @@ struct AssistEditor : CodeEditor {
|
|||
void SyncAnnotationPopup();
|
||||
void EditAnnotation(bool fastedit);
|
||||
void Annotate(const String& filename);
|
||||
void OpenTopic(String topic, String create);
|
||||
void OpenTopic(String topic, String create, bool before);
|
||||
void NewTopic(String group, String coderef);
|
||||
|
||||
void SerializeNavigator(Stream& s);
|
||||
|
|
@ -945,7 +945,7 @@ public:
|
|||
void RescanCode();
|
||||
void QueryId();
|
||||
void About();
|
||||
void OpenTopic(const String& topic, const String& createafter);
|
||||
void OpenTopic(const String& topic, const String& createafter, bool before);
|
||||
void OpenTopic(const String& topic);
|
||||
void OpenATopic();
|
||||
void ToggleNavigator(int nav);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ void Ide::RescanCode()
|
|||
//*/
|
||||
}
|
||||
|
||||
void Ide::OpenTopic(const String& topic, const String& createafter)
|
||||
void Ide::OpenTopic(const String& topic, const String& createafter, bool before)
|
||||
{
|
||||
TopicLink tl = ParseTopicLink(topic);
|
||||
if(tl) {
|
||||
|
|
@ -84,14 +84,14 @@ void Ide::OpenTopic(const String& topic, const String& createafter)
|
|||
if(designer) {
|
||||
TopicEditor *te = dynamic_cast<TopicEditor *>(&designer->DesignerCtrl());
|
||||
if(te)
|
||||
te->GoTo(tl.topic, tl.label, createafter);
|
||||
te->GoTo(tl.topic, tl.label, createafter, before);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Ide::OpenTopic(const String& topic)
|
||||
{
|
||||
OpenTopic(topic, String());
|
||||
OpenTopic(topic, String(), false);
|
||||
}
|
||||
|
||||
void Ide::OpenATopic()
|
||||
|
|
@ -113,7 +113,7 @@ void Ide::IdeOpenTopicFile(const String& file)
|
|||
if(designer) {
|
||||
TopicEditor *te = dynamic_cast<TopicEditor *>(&designer->DesignerCtrl());
|
||||
if(te)
|
||||
te->GoTo(GetFileTitle(file), "", "");
|
||||
te->GoTo(GetFileTitle(file), "", "", false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#define IDE_VERSION "811.r169"
|
||||
#define IDE_VERSION "811.r170"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue