From d7c9c70e4c5a983d323b23bdd3595582135e839f Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Sat, 8 Feb 2020 17:15:21 +0800 Subject: [PATCH] Get ptch 27 (ScriptMgrExtensions) building --- patchset/Cube-E/2-build-system.patch | 32 +- patchset/Cube-E/3-amphibian-dna.patch | 946 -------------------------- patchset/Cube-E/6-source.patch | 344 ++++++++++ 3 files changed, 371 insertions(+), 951 deletions(-) diff --git a/patchset/Cube-E/2-build-system.patch b/patchset/Cube-E/2-build-system.patch index 455d836..43e2020 100644 --- a/patchset/Cube-E/2-build-system.patch +++ b/patchset/Cube-E/2-build-system.patch @@ -2811,10 +2811,24 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make "{ObjDir}ScriptMgrUtilDate.a.o" ∂ "{ObjDir}ScriptMgrUtilText.a.o" ∂ "{ObjDir}ScriptMgrUtilNum.a.o" ∂ -@@ -32,6 +34,34 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ +@@ -32,6 +34,48 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ "{ObjDir}ScriptMgrDispatch.a.o" ∂ ++ScriptMgrExtObjects = "{ObjDir}ScriptMgrExtHead.a.o" ∂ ++ "{ObjDir}ScriptMgrFindWord.c.o" ∂ ++ "{ObjDir}ScriptMgrTruncRepl.a.o" ∂ ++ "{ObjDir}RomanNewJust.a.o" ∂ ++ "{ObjDir}ScriptMgrKbdMenu.a.o" ∂ ++ "{ObjDir}ScriptMgrSysMenuPatch.a.o" ∂ ++ "{ObjDir}DblByteCompat.a.o" ∂ ++ "{ObjDir}ScriptMgrDispatch.a.o" ∂ ++ "{ObjDir}ScriptMgrKeyGetSet.a.o" ∂ ++ "{ObjDir}ScriptMgrExtensions.a.o" ∂ ++ "{ObjDir}ScriptMgrInit.a.o" ∂ ++ "{ObjDir}ScriptMgrExtTail.a.o" ∂ ++ ++ +"{RsrcDir}International.rsrc" ƒ "{ScriptMgrDir}International.r" + Rez {StdROpts} -o "{Targ}" "{ScriptMgrDir}International.r" + @@ -2823,8 +2837,8 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make + Link {StdLOpts} {StdAlign} -o "{Targ}" -rt RSRC=0 "{LibDir}ScriptMgr.lib" + + -+"{RsrcDir}ScriptMgrExtensions.rsrc" ƒ "{ObjDir}ScriptMgrExtensions.a.o" -+ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt RSRC=0 "{ObjDir}ScriptMgrExtensions.a.o" ++"{RsrcDir}ScriptMgrExtensions.rsrc" ƒ {ScriptMgrExtObjects} ++ Link {StdLOpts} {StdAlign} -o "{Targ}" -rt RSRC=0 {ScriptMgrExtObjects} + + +"{RsrcDir}InternationalPACK.a.rsrc" ƒ "{ObjDir}InternationalPACK.a.o" @@ -2846,7 +2860,7 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make "{LibDir}ScriptMgr.lib" ƒ {ScriptMgrObjects} Lib {StdLibOpts} -o "{Targ}" {ScriptMgrObjects} -@@ -92,6 +122,14 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ +@@ -92,6 +136,14 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}RomanNewJust.a" @@ -2861,7 +2875,7 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make "{ObjDir}ScriptMgrUtilDate.a.o" ƒ "{IntAIncludes}ScriptPriv.a" ∂ "{ObjDir}StandardEqu.d" ∂ "{AIncludes}Packages.a" ∂ -@@ -159,5 +197,21 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ +@@ -159,5 +211,29 @@ ScriptMgrObjects = "{ObjDir}ScriptMgrHeader.a.o" ∂ Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrUtilNum.a" @@ -2881,6 +2895,14 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgr.make b/Toolbox/ScriptMgr/ScriptMgr.make + Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}itl4Roman.a" + + ++"{ObjDir}ScriptMgrExtHead.a.o" ƒ "{ScriptMgrDir}ScriptMgrExtHead.a" ++ Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrExtHead.a" ++ ++ ++"{ObjDir}ScriptMgrExtTail.a.o" ƒ "{ScriptMgrDir}ScriptMgrExtTail.a" ++ Asm {StdAOpts} -o "{Targ}" "{ScriptMgrDir}ScriptMgrExtTail.a" ++ ++ diff --git a/Toolbox/SoundMgr/SoundMgr.make b/Toolbox/SoundMgr/SoundMgr.make diff --git a/patchset/Cube-E/3-amphibian-dna.patch b/patchset/Cube-E/3-amphibian-dna.patch index 3dc8fbf..dfe71ec 100644 --- a/patchset/Cube-E/3-amphibian-dna.patch +++ b/patchset/Cube-E/3-amphibian-dna.patch @@ -1875,952 +1875,6 @@ new file mode 100644 + $"6606 A055 2E80 4ED1 C0B8 031A 2E80 4ED1" /* f..U..N.......N. */ +}; + -diff --git a/AmphibianDNA/ScriptMgrExtensions.rsrc b/AmphibianDNA/ScriptMgrExtensions.rsrc -new file mode 100644 -diff --git a/AmphibianDNA/ScriptMgrExtensions.rsrc.rdump b/AmphibianDNA/ScriptMgrExtensions.rsrc.rdump -new file mode 100644 ---- /dev/null -+++ b/AmphibianDNA/ScriptMgrExtensions.rsrc.rdump -@@ -0,0 +1,939 @@ -+data 'RSRC' (0, "Main", purgeable) { -+ $"6000 377E 7074 6368 001B 0710 4E56 FFD6" /* `.7~ptch....NV.. */ -+ $"48E7 0F18 3A2E 0018 3C2E 0016 286E 0010" /* H...:...<...(n.. */ -+ $"4A2C 0001 56C0 0240 0001 48C0 1D40 FFFF" /* J,..V..@..H..@.. */ -+ $"4A2E 0014 6602 5346 4A46 6F1E 4A2E FFFF" /* J...f.SFJFo.J... */ -+ $"6718 558F 2F2E 001A 3F06 2F3C 8206 0010" /* g.U./...?./<.... */ -+ $"A8B5 7001 B05F 6602 5346 266E 001A D6C5" /* ..p.._f.SF&n.... */ -+ $"4A46 6C10 2D6E 001A FFDA 2D6E 001A FFD6" /* JFl.-n....-n.... */ -+ $"6000 022E BA46 6E0C 2D4B FFDA 2D4B FFD6" /* `....Fn.-K..-K.. */ -+ $"6000 021E 2A0C 302C 0004 48C0 D085 2D40" /* `...*.0,..H...-@ */ -+ $"FFEA 302C 0006 48C0 D085 2D40 FFF6 302C" /* ..0,..H...-@..0, */ -+ $"0008 48C0 D085 2D40 FFEE 302C 000A 48C0" /* ..H...-@..0,..H. */ -+ $"D085 2D40 FFF2 48C6 2006 D0AE 001A 2D40" /* ..-@..H. .....-@ */ -+ $"FFE2 206E FFF6 3A10 6C0E 48C5 2005 4480" /* .. n..:.l.H. .D. */ -+ $"D0AE FFF6 2D40 FFFA BC6C 000C 6C0A 2D6E" /* ....-@...l..l.-n */ -+ $"001A FFD6 6000 00DE 286E FFE2 7C02 6000" /* ....`...(n..|.`. */ -+ $"00C0 7000 1014 D0AE FFEA 2040 1010 4880" /* ..p....... @..H. */ -+ $"3E00 6C5A 200B 5380 B08C 6350 48C7 2007" /* >.lZ .S...cPH. . */ -+ $"4480 3E00 7001 C047 7200 3200 4A81 6624" /* D.>.p..Gr.2.J.f$ */ -+ $"282E FFF6 48C7 2004 D087 2040 7000 3010" /* (...H. ... @p.0. */ -+ $"D084 7200 122C 0001 D280 2041 1010 4880" /* ..r..,.... A..H. */ -+ $"3E00 601A 4A45 6D04 3E05 6012 48C7 2007" /* >.`.JEm.>.`.H. . */ -+ $"5380 D0AE FFFA 2040 3E10 6002 4247 48C6" /* S..... @>.`.BGH. */ -+ $"2006 D0AE FFEE 2040 7000 3010 D0AE FFEE" /* ..... @p.0..... */ -+ $"48C7 D087 2040 1010 4880 3C00 6C08 2D4C" /* H... @..H.<.l.-L */ -+ $"FFD6 0246 007F 4A46 672E 534C 4A2E FFFF" /* ...F..JFg.SLJ... */ -+ $"671E 558F 2F2E 001A 200C 906E 001C 3F00" /* g.U./... ..n..?. */ -+ $"2F3C 8206 0010 A8B5 7001 B05F 6602 534C" /* /<......p.._f.SL */ -+ $"B9EE 001A 6200 FF3C B9EE 001A 6206 2D6E" /* ....b..<....b.-n */ -+ $"001A FFD6 286E FFD6 7C02 6000 00CE 2D4C" /* ....(n..|.`...-L */ -+ $"FFE6 7000 101C D0AE FFEA 2040 1010 4880" /* ..p....... @..H. */ -+ $"3E00 B7CC 6402 4247 4A47 6C56 B7CC 6350" /* >...d.BGJGlV..cP */ -+ $"48C7 2007 4480 3E00 7001 C047 7200 3200" /* H. .D.>.p..Gr.2. */ -+ $"4A81 6622 282E FFF6 48C7 2004 D087 2040" /* J.f"(...H. ... @ */ -+ $"7000 3010 D084 7200 121C D280 2041 1010" /* p.0...r..... A.. */ -+ $"4880 3E00 601C 4A45 6D04 3E05 600E 48C7" /* H.>.`.JEm.>.`.H. */ -+ $"2007 5380 D0AE FFFA 2040 3E10 524C 6002" /* .S..... @>.RL`. */ -+ $"4247 48C6 2006 D0AE FFF2 2040 7000 3010" /* BGH. ..... @p.0. */ -+ $"D0AE FFF2 48C7 D087 2040 1010 4880 3C00" /* ....H... @..H.<. */ -+ $"6C0A 2D6E FFE6 FFDE 0246 007F 4A46 661E" /* l.-n.....F..JFf. */ -+ $"202E FFDE B0AE FFE2 620C 286E FFDE 2D4C" /* .......b.(n..-L */ -+ $"FFD6 7C02 6014 2D6E FFDE FFDA 6012 B7CC" /* ..|.`.-n....`... */ -+ $"6408 2D6E FFDE FFDA 6006 B7CC 6400 FF30" /* d.-n....`...d..0 */ -+ $"302E FFD8 906E 001C 206E 000C 3080 302E" /* 0....n.. n..0.0. */ -+ $"FFDC 906E 001C 206E 000C 3140 0002 206E" /* ...n.. n..1@.. n */ -+ $"000C 4268 0004 206E 000C 4268 0006 206E" /* ..Bh.. n..Bh.. n */ -+ $"000C 4268 0008 206E 000C 4268 000A 4CEE" /* ..Bh.. n..Bh..L. */ -+ $"18F0 FFBE 4E5E 205F 4FEF 0016 4ED0 4E56" /* ....N^ _O...N.NV */ -+ $"FFD4 48E7 0F18 282E 0010 266E 0008 2A0B" /* ..H...(...&n..*. */ -+ $"302B 0006 48C0 D085 2D40 FFE8 302B 0008" /* 0+..H...-@..0+.. */ -+ $"48C0 D085 2D40 FFEC 302B 000A 48C0 D085" /* H...-@..0+..H... */ -+ $"2D40 FFF4 302B 000C 48C0 D085 2D40 FFF8" /* -@..0+..H...-@.. */ -+ $"206E FFEC 3A10 6C0E 48C5 2005 4480 D0AE" /* n..:.l.H. .D... */ -+ $"FFEC 2D40 FFF0 4A84 6F04 2004 6002 7000" /* ..-@..J.o. .`.p. */ -+ $"2640 D7EE 0014 286E 0014 4244 6000 00D8" /* &@....(n..BD`... */ -+ $"2D4C FFE4 B7CC 6312 7000 101C D0AE FFE8" /* -L....c.p....... */ -+ $"2040 1010 4880 3E00 6002 4247 4A47 6C5C" /* @..H.>.`.BGJGl\ */ -+ $"B7CC 6356 48C7 2007 4480 3E00 7001 C047" /* ..cVH. .D.>.p..G */ -+ $"7200 3200 4A81 6628 2D6E FFEC FFD4 48C7" /* r.2.J.f(-n....H. */ -+ $"2007 D0AE FFD4 2040 7000 3010 D0AE FFD4" /* ..... @p.0..... */ -+ $"7200 121C D280 2041 1010 4880 3E00 601C" /* r..... A..H.>.`. */ -+ $"4A45 6D04 3E05 600E 48C7 2007 5380 D0AE" /* JEm.>.`.H. .S... */ -+ $"FFF0 2040 3E10 524C 6002 4247 2D6E FFF4" /* .. @>.RL`.BG-n.. */ -+ $"FFD8 48C4 2004 D0AE FFD8 2040 7000 3010" /* ..H. ..... @p.0. */ -+ $"D0AE FFD8 48C7 D087 2040 1C10 6C06 2D6E" /* ....H... @..l.-n */ -+ $"FFE4 FFE0 4886 48C6 2006 E388 1C00 6C22" /* ....H.H. .....l" */ -+ $"707F C006 7200 1200 3001 3D40 FFFE 48C0" /* p...r...0.=@..H. */ -+ $"D0AE FFF8 2040 3D50 FFFC 2D6E FFE0 FFDC" /* .... @=P..-n.... */ -+ $"600A 4886 3806 B7CC 6400 FF26 302E FFDE" /* `.H.8...d..&0... */ -+ $"906E 0016 48C0 206E 000C 2080 3D6E FFFC" /* .n..H. n.. .=n.. */ -+ $"0018 4CEE 18F0 FFBC 4E5E 205F 4FEF 0010" /* ..L.....N^ _O... */ -+ $"4ED0 202F 0004 0C80 8208 FFE0 670A 221F" /* N. /........g.". */ -+ $"588F 4267 2F00 2F01 4E56 FFFE 206E 000E" /* X.Bg/./.NV.. n.. */ -+ $"4240 1018 3D40 FFFE 554F 3F2E 0012 2F08" /* B@..=@..UO?.../. */ -+ $"486E FFFE 3F2E 000C 2F3C 820C FFDE 612C" /* Hn..?.../<....a, */ -+ $"3D5F 0014 302E FFFE 206E 000E 1080 303C" /* =_..0... n....0< */ -+ $"000C 6000 2E70 202F 0004 0C80 820C FFDE" /* ..`..p /........ */ -+ $"670A 221F 588F 4267 2F00 2F01 4E56 FFFC" /* g.".X.Bg/./.NV.. */ -+ $"48E7 1F38 426E 0018 246E 0012 286E 000E" /* H..8Bn..$n..(n.. */ -+ $"3614 554F 2F0A 4267 3F03 A886 301F B06E" /* 6.UO/.Bg?...0..n */ -+ $"0016 6F00 0136 3D7C FF40 0018 2678 0BA0" /* ..o..6=|.@..&x.. */ -+ $"1F2B 0007 422B 0007 42A7 3F3C 0004 3F3C" /* .+..B+..B.?<..?< */ -+ $"0006 A9ED 205F 175F 0007 2008 6700 010C" /* .... _._.. .g... */ -+ $"2050 2028 0020 6700 0102 D1C0 0C68 004D" /* P (. g......h.M */ -+ $"0002 6D00 00F6 D0E8 009E 3D7C FFFF 0018" /* ..m.......=|.... */ -+ $"4254 7E00 1E18 3C03 9C47 6D00 00DE 3807" /* BT~...<..Gm...8. */ -+ $"5244 0244 FFFE 9EC4 264F 224B 3007 6708" /* RD.D....&O"K0.g. */ -+ $"5340 12D8 51C8 FFFC 3A2E 0016 554F 2F0B" /* S@..Q...:...UO/. */ -+ $"4267 3F07 A886 9A5F 6B00 00AE 4A6E 000C" /* Bg?...._k...Jn.. */ -+ $"6626 5246 5346 6100 00AE 6100 00D8 BA40" /* f&RFSFa...a....@ */ -+ $"6DF2 43F2 6000 3007 6708 5340 12DB 51C8" /* m.C.`.0.g.S@..Q. */ -+ $"FFFC DC47 3886 607A E24E 6100 008A 264A" /* ...G8.`z.Na...&J */ -+ $"D6C6 D6C7 9646 9647 6100 0092 6100 00A6" /* .....F.Ga...a... */ -+ $"3D40 FFFE 6100 00AC 3D40 FFFC 6024 B646" /* =@..a...=@..`$.F */ -+ $"6C10 5346 6100 0060 6100 008A 3D40 FFFE" /* l.SFa..`a...=@.. */ -+ $"6010 5343 524B 6100 0064 6100 0086 3D40" /* `.SCRKa..da...=@ */ -+ $"FFFC 302E FFFE D06E FFFC BA40 6DD0 204F" /* ..0....n...@m. O */ -+ $"43F2 6000 3007 6708 5340 12D8 51C8 FFFC" /* C.`.0.g.S@..Q... */ -+ $"3003 6708 5340 12DB 51C8 FFFC DC47 DC43" /* 0.g.S@..Q....G.C */ -+ $"3886 3D7C 0001 0018 DEC4 4CDF 1CF8 303C" /* 8.=|......L...0< */ -+ $"0010 6000 2CF0 554F 2F0A 3F06 2F3C 8206" /* ..`.,.UO/.?./<.. */ -+ $"0010 A8B5 4A5F 6F02 5346 4E75 554F 2F0B" /* ....J_o.SFNuUO/. */ -+ $"3F03 2F3C 8206 0010 A8B5 4A5F 6F04 524B" /* ?./<......J_o.RK */ -+ $"5243 4E75 554F 2F0A 4267 3F06 A886 301F" /* RCNuUO/.Bg?...0. */ -+ $"4E75 554F 2F0B 4267 3F03 A886 301F 4E75" /* NuUO/.Bg?...0.Nu */ -+ $"4E56 0000 48E7 1F38 4240 246E 000C 7A00" /* NV..H..8B@$n..z. */ -+ $"1A1A 6700 0122 286E 0014 204C A025 4A80" /* ..g.."(n.. L.%J. */ -+ $"6B00 0114 2E00 2854 266E 0010 204B A025" /* k.....(T&n.. K.% */ -+ $"4A80 6B00 0102 2C00 2653 9C45 7800 7600" /* J.k...,.&S.Ex.v. */ -+ $"7200 3407 9445 5345 601E 5241 48A7 6000" /* r.4..ESE`.RAH.`. */ -+ $"554F 2F0C 3F01 2F3C 8206 0010 A8B5 4A5F" /* UO/.?./<......J_ */ -+ $"4C9F 0006 6F02 5241 B242 6E1E 41F4 1000" /* L...o.RA.Bn.A... */ -+ $"224A 3005 B308 56C8 FFFC 4A40 6ACC 3F01" /* "J0...V...J@j.?. */ -+ $"5243 D846 D245 5241 60DE 5245 4A43 6700" /* RC.F.ERA`.REJCg. */ -+ $"00A0 4A46 6E4C 244F D4C3 D4C3 220C D287" /* ..JFnL$O...."... */ -+ $"DC45 240C D8E2 224C 600C B28C 6320 B1CC" /* .E$..."L`...c .. */ -+ $"6704 12DC 60F4 204B 3006 6002 12D8 51C8" /* g...`. K0.`...Q. */ -+ $"FFFC D8C5 B5CF 63E2 2042 D0E2 60DC 4A44" /* ......c. B..`.JD */ -+ $"675E 206E 0014 3004 48C0 D087 A024 6B52" /* g^ n..0.H....$kR */ -+ $"604E 286E 0014 204C 3004 48C0 D087 A024" /* `N(n.. L0.H....$ */ -+ $"6B40 2854 266E 0010 2653 244F 204C D8C7" /* k@(T&n..&S$O L.. */ -+ $"DC45 224C D2C4 D6C6 D0C5 2408 D0DA 3203" /* .E"L......$...2. */ -+ $"B1CC 6704 1324 60F8 204B 3006 6002 1320" /* ..g..$`. K0.`.. */ -+ $"51C8 FFFC 5341 6F08 2042 D0DA 98C5 60E0" /* Q...SAo. B....`. */ -+ $"3003 D643 DEC3 3D40 0018 4CDF 1CF8 303C" /* 0..C..=@..L...0< */ -+ $"0010 6000 2B60 205F 225F 4267 203C 0001" /* ..`.+` _"_Bg <.. */ -+ $"0001 2F00 2F00 2F09 2F08 4E56 FFCC 2F2E" /* .././././.NV../. */ -+ $"0010 2F2E 000C 486E FFCC 6100 050C 2F2E" /* ../...Hn..a.../. */ -+ $"001A 2F2E 0016 3F2E 0014 486E FFCC 6100" /* ../...?...Hn..a. */ -+ $"05CA 242E FFDC 2055 2050 3028 004A 660A" /* ..$... U P0(.Jf. */ -+ $"3038 0BA8 6604 303C 000C EA8A 4840 4240" /* 08..f.0<....H@B@ */ -+ $"594F 2F02 2F00 A868 4A2E FFF9 6708 2F17" /* YO/./..hJ...g./. */ -+ $"2F2E FFCC A868 2D5F 001E 303C 0016 6000" /* /....h-_..0<..`. */ -+ $"2AE4 205F 225F 301F 4267 4840 4240 2F00" /* *. _"_0.BgH@B@/. */ -+ $"4267 203C 0001 0001 2F00 2F00 2F09 2F08" /* Bg <...././././. */ -+ $"4E56 FF78 48E7 1020 2F2E 0010 2F2E 000C" /* NV.xH.. /.../... */ -+ $"486E FFCC 6100 0482 2F2E 001E 2F2E 001A" /* Hn..a.../.../... */ -+ $"2F2E 0016 3F2E 0014 2F2E 0010 2F2E 000C" /* /...?.../.../... */ -+ $"486E FFCC 6100 05BC 486E FFCC 6100 0666" /* Hn..a...Hn..a..f */ -+ $"3F2E 001C 2F2E 001E 2F2E 0010 2F2E 000C" /* ?.../.../.../... */ -+ $"2055 2050 2028 0068 6708 2040 2050 4E90" /* U P (.hg. @ PN. */ -+ $"6002 A882 486E FFCC 6100 0678 4CDF 0408" /* `...Hn..a..xL... */ -+ $"303C 001A 6000 2A4E 2055 2250 3229 0032" /* 0<..`.*N U"P2).2 */ -+ $"4841 4A69 0006 6A0C 3229 000E D280 3341" /* HAJi..j.2)....3A */ -+ $"000E 600A 3228 FF4A D280 3141 FF4A 4841" /* ..`.2(.J..1A.JHA */ -+ $"3341 0032 4E75 205F 221F 225F 301F 4267" /* 3A.2Nu _"."_0.Bg */ -+ $"4840 4240 2F00 2F09 4267 203C 0001 0001" /* H@B@/./.Bg <.... */ -+ $"2F00 2F00 2F01 2F08 4E56 FFB6 48E7 1F38" /* /./././.NV..H..8 */ -+ $"246E 0016 425A 2E2E 001E 6700 00FE 266E" /* $n..BZ....g...&n */ -+ $"0022 2F2E 0010 2F2E 000C 486E FFCC 6100" /* ."/.../...Hn..a. */ -+ $"03A8 2F0B 2F07 2F2E 001A 3F2E 0014 2F2E" /* ../././...?.../. */ -+ $"0010 2F2E 000C 486E FFCC 6100 04E6 486E" /* ../...Hn..a...Hn */ -+ $"FFCC 6100 0590 7C00 7A00 283C 0000 8000" /* ..a...|.z.(<.... */ -+ $"2F05 6100 0642 4A40 674A 2848 5246 2D6E" /* /.a..BJ@gJ(HRF-n */ -+ $"0010 FFC2 2D6E 000C FFBE 554F 3F06 2F0B" /* ....-n....UO?./. */ -+ $"486E FFC2 486E FFBE 486E FFB6 4E94 301F" /* Hn..Hn..Hn..N.0. */ -+ $"4840 4240 4A2E FFFA 670C 594F 2F00 2F2E" /* H@B@J...g.YO/./. */ -+ $"FFD0 A868 201F D084 BC47 6C00 0060 4840" /* ...h ....Gl..`H@ */ -+ $"34C0 60B8 2F2E 0010 2F2E 000C 486E FFCC" /* 4.`./.../...Hn.. */ -+ $"6100 03DA 2878 0B2A 2854 2604 6100 057C" /* a...(x.*(T&.a..| */ -+ $"2802 D8AE FFEC 7A00 5246 1A1B 3005 E548" /* (.....z.RF..0..H */ -+ $"2034 0000 4A2E FFFA 670C 594F 2F00 2F2E" /* 4..J...g.YO/./. */ -+ $"FFD0 A868 201F 0C05 0020 6702 D084 D680" /* ...h .... g..... */ -+ $"2003 BC47 6C06 4840 34C0 60CC 909F 4840" /* ..Gl.H@4.`...H@ */ -+ $"3480 486E FFCC 6100 050A 4CDF 1CF8 303C" /* 4.Hn..a...L...0< */ -+ $"001E 6000 28E0 205F 225F 341F 7000 301F" /* ..`.(. _"_4.p.0. */ -+ $"2200 301F 4840 4267 2F00 2F01 3F02 4267" /* ".0.H@Bg/./.?.Bg */ -+ $"203C 0001 0001 2F00 2F00 2F09 2F08 4E56" /* <...././././.NV */ -+ $"FFC4 2F2E 0010 2F2E 000C 486E FFCC 6100" /* ../.../...Hn..a. */ -+ $"0278 2F2E 0024 2F2E 0020 2F2E 001C 3F2E" /* .x/..$/.. /...?. */ -+ $"0014 2F2E 0010 2F2E 000C 486E FFCC 6100" /* ../.../...Hn..a. */ -+ $"03B2 486E FFCC 6100 045C 302E 001A 6A02" /* ..Hn..a..\0...j. */ -+ $"7000 B06E 0022 6F04 302E 0022 554F 3F00" /* p..n."o.0.."UO?. */ -+ $"2F2E 0024 486E 0010 486E 000C 486E FFC4" /* /..$Hn..Hn..Hn.. */ -+ $"2055 2050 2028 0068 670C 2040 2068 0028" /* U P (.hg. @ h.( */ -+ $"4E90 4267 600A A8ED 2055 2428 FF54 3F02" /* N.Bg`... U$(.T?. */ -+ $"486E FFCC 6100 044C 241F 7000 322E 001A" /* Hn..a..L$.p.2... */ -+ $"6F1A 4842 2002 4A2E FFFA 670C 594F 2F00" /* o.HB .J...g.YO/. */ -+ $"2F2E FFD0 A868 201F 6100 0494 3D40 0028" /* /....h .a...=@.( */ -+ $"303C 0020 6000 27FE 205F 241F 225F 301F" /* 0<. `.'. _$."_0. */ -+ $"4840 4240 321F 4841 4241 4267 2F01 2F00" /* H@B@2.HABABg/./. */ -+ $"2F09 42A7 4267 203C 0001 0001 2F00 2F00" /* /.B.Bg <...././. */ -+ $"2F02 2F08 4E56 FFB2 48E7 1F38 202E 0016" /* /./.NV..H..8 ... */ -+ $"6708 2040 20BC FFFF 0000 246E 001A 266E" /* g. @ .....$n..&n */ -+ $"002A 262E 001E 6F00 0144 2F2E 0010 2F2E" /* .*&...o..D/.../. */ -+ $"000C 486E FFCC 6100 0170 2F0B 2F2E 0026" /* ..Hn..a..p/./..& */ -+ $"2F2E 0022 3F2E 0014 2F2E 0010 2F2E 000C" /* /.."?.../.../... */ -+ $"486E FFCC 6100 02AC 486E FFCC 6100 0356" /* Hn..a...Hn..a..V */ -+ $"202E FFEC 2D40 FFBA 4A2E FFFA 6720 594F" /* ...-@..J...g YO */ -+ $"2F03 2F2E FFD0 A84D 261F 202E FFBA 670E" /* /./....M&. ...g. */ -+ $"594F 2F00 2F2E FFD0 A84D 2D5F FFBA 6100" /* YO/./....M-_..a. */ -+ $"03E6 3D40 FFBE 2D48 FFC0 7800 7A00 7C00" /* ..=@..-H..x.z.|. */ -+ $"3E2E 0028 6F00 00D8 4A6E FFBE 673C 286E" /* >..(o...Jn..g<(n */ -+ $"FFC0 5244 2C05 2D6E 0010 FFB6 2D6E 000C" /* ..RD,.-n....-n.. */ -+ $"FFB2 554F 3F04 2F0B 486E FFB6 486E FFB2" /* ..UO?./.Hn..Hn.. */ -+ $"486E FFC4 4E94 3A1F 4845 4245 B847 6C00" /* Hn..N.:.HEBE.Gl. */ -+ $"005C BA83 6DCC 6000 005E 2F2E 0010 2F2E" /* .\..m.`..^/.../. */ -+ $"000C 486E FFCC 6100 0174 6100 031E D4AE" /* ..Hn..a..ta..... */ -+ $"FFEC 4A2E FFFA 670C 594F 2F02 2F2E FFD0" /* ..J...g.YO/./... */ -+ $"A84D 241F 2278 0B2A 2251 7200 5244 2C05" /* .M$."x.*"Qr.RD,. */ -+ $"121B 3001 E548 DAB1 0000 0C01 0020 6702" /* ..0..H....... g. */ -+ $"DA82 B847 6C06 BA83 6DE2 600A 9AAE FFBA" /* ...Gl...m.`..... */ -+ $"BA83 6D00 003A 51D2 D683 DC85 B686 6204" /* ..m..:Q.......b. */ -+ $"50D2 5344 486E FFCC 6100 0298 3D44 002E" /* P.SDHn..a...=D.. */ -+ $"4CDF 1CF8 303C 0026 6000 266A 426E 002E" /* L...0<.&`.&jBn.. */ -+ $"14B8 0BAC 67EA 3D6E 0028 002E 60E2 4A38" /* ....g.=n.(..`.J8 */ -+ $"0BAC 57D2 6702 7800 222E 0016 67C6 2841" /* ..W.g.x."...g.(A */ -+ $"9685 4A2E FFFA 670C 594F 2F03 2F2E FFD0" /* ..J...g.YO/./... */ -+ $"A868 261F 2883 60AC 4E56 FFF0 226E 0008" /* .h&.(.`.NV.."n.. */ -+ $"22BC 0001 0000 51E9 002D 322E 0012 342E" /* ".....Q..-2...4. */ -+ $"000E 6716 B441 6712 594F 3F01 3F02 A869" /* ..g..Ag.YO?.?..i */ -+ $"226E 0008 229F 50E9 002D 6166 226E 0008" /* "n..".P..-af"n.. */ -+ $"237C 0001 0000 0004 51E9 002E 3228 0014" /* #|......Q...2(.. */ -+ $"3428 0018 6718 B441 6714 594F 3F01 3F02" /* 4(..g..Ag.YO?.?. */ -+ $"A869 226E 0008 235F 0004 50E9 002E 51E9" /* .i"n..#_..P...Q. */ -+ $"002C 2038 0BC2 6716 2040 2050 2028 0018" /* ., 8..g. @ P (.. */ -+ $"670C 3030 0800 0800 000A 56E9 002C 51E9" /* g.00......V..,Q. */ -+ $"002F 51E9 0030 51E9 0031 303C 000C 6000" /* ./Q..0Q..10<..`. */ -+ $"2594 43EE FFF0 594F 2F09 2055 2050 32E8" /* %.C...YO/. U P2. */ -+ $"0044 32E8 004A 12E8 0046 51D9 32D0 22EE" /* .D2..J...FQ.2.". */ -+ $"0010 22AE 000C A901 205F 4E75 4E56 FFF0" /* .."..... _NuNV.. */ -+ $"61D0 303C 000C 6000 255C 4E56 0000 48E7" /* a.0<..`.%\NV..H. */ -+ $"1800 7600 283C 0000 1000 206E 0012 202E" /* ..v.(<.... n.. . */ -+ $"000E 2248 7400 600E 1218 0C01 0020 6604" /* .."Ht.`...... f. */ -+ $"D484 6002 D483 5380 6CEE 206E 0008 51E8" /* ..`...S.l. n..Q. */ -+ $"002F 51E8 0030 D482 672A 302E 000C 0800" /* ./Q..0..g*0..... */ -+ $"0000 660C 0C01 0020 6706 9483 50E8 0030" /* ..f.... g...P..0 */ -+ $"0800 0001 660E 1211 0C01 0020 6706 9483" /* ....f...... g... */ -+ $"50E8 002F E78A 2142 0010 E98B 2143 0008" /* P../..!B....!C.. */ -+ $"E98C 2144 000C 4CDF 0018 303C 000E 6000" /* ..!D..L...0<..`. */ -+ $"24D4 4E56 0000 48E7 1810 266E 0008 42AB" /* $.NV..H...&n..B. */ -+ $"0018 42AB 001C 42AB 0020 42AB 0024 276E" /* ..B...B.. B..$'n */ -+ $"0016 0014 6700 0082 4A2B 0031 6616 2F2E" /* ....g...J+.1f./. */ -+ $"001E 2F2E 001A 3F2E 0014 2F0B 6100 FF3C" /* ../...?.../.a..< */ -+ $"50EB 0031 4AAB 0010 6700 005E 2055 2050" /* P..1J...g..^ U P */ -+ $"6100 00F0 4840 4240 4A2B 002D 670A 594F" /* a...H@B@J+.-g.YO */ -+ $"2F00 2F13 A868 201F E480 4480 2800 594F" /* /./..h ...D.(.YO */ -+ $"2F2B 0014 2F2B 0010 A84D 201F 2740 0018" /* /+../+...M .'@.. */ -+ $"2740 001C B084 6C08 2744 0018 2744 001C" /* '@....l.'D..'D.. */ -+ $"4A2B 002D 6712 202B 0018 670C 594F 2F00" /* J+.-g. +..g.YO/. */ -+ $"2F13 A84D 275F 001C 4CDF 0818 303C 001A" /* /..M'_..L...0<.. */ -+ $"6000 2422 4E56 0000 226E 0008 51E9 0032" /* `.$"NV.."n..Q..2 */ -+ $"2055 42A8 FF42 2169 0014 FF46 671C 2050" /* UB..B!i...Fg. P */ -+ $"2029 001C 6714 2228 004C 2341 0028 50E9" /* )..g."(.L#A.(P. */ -+ $"0032 D280 5281 2141 004C 303C 0004 6000" /* .2..R.!A.L0<..`. */ -+ $"23E4 4E56 0000 2055 42A8 FF42 42A8 FF46" /* #.NV.. UB..BB..F */ -+ $"226E 0008 4A29 0032 6708 2050 2169 0028" /* "n..J).2g. P!i.( */ -+ $"004C 303C 0004 6000 23BC 2055 2050 7400" /* .L0<..`.#. U Pt. */ -+ $"4A68 0006 6A1C 3428 000C 6716 48C2 E982" /* Jh..j.4(..g.H... */ -+ $"6100 0010 4840 4240 594F 2F00 2F02 A868" /* a...H@B@YO/./..h */ -+ $"241F 3028 004A 6614 4A68 0044 6606 3038" /* $.0(.Jf.Jh.Df.08 */ -+ $"0BA8 6608 1038 0987 6602 700C 4E75 4A80" /* ..f..8..f.p.NuJ. */ -+ $"6B0A 0680 0000 8000 4840 4E75 0480 0000" /* k.......H@Nu.... */ -+ $"8000 4840 4E75 303C A8ED A146 7000 2255" /* ..H@Nu0<...Fp."U */ -+ $"2251 2229 0068 670E 2241 2229 0028 B288" /* "Q").hg."A").(.. */ -+ $"6704 2041 70FF 4E75 6B63 7323 6963 7323" /* g. Ap.Nukcs#ics# */ -+ $"6B63 7334 6963 7334 6B63 7338 6963 7338" /* kcs4ics4kcs8ics8 */ -+ $"4E56 FEC0 426E 000C 48E7 3838 2478 0BA0" /* NV..Bn..H.88$x.. */ -+ $"50EA 006A 0C2A 0001 0004 6212 202A 000A" /* P..j.*....b. *.. */ -+ $"0800 001F 6608 51EA 006A 42AE FFF2 1D6A" /* ....f.Q..jB....j */ -+ $"0004 FFDD 554F A994 4267 A998 1F38 0A5E" /* ....UO..Bg...8.^ */ -+ $"11FC 00FF 0A5E 426E FFDE 486E FED4 3F3C" /* .....^Bn..Hn..?< */ -+ $"BF91 3F3C 0001 6100 091A 4238 0A5E 4A2E" /* ..?<..a...B8.^J. */ -+ $"FED4 6700 0008 1D6E FED5 FFDF 51EE FFFF" /* ..g....n....Q... */ -+ $"2F38 0A1C 21F8 0286 0A1C 594F 3F3C BF95" /* /8..!.....YO?<.. */ -+ $"A949 2D5F FFF2 21DF 0A1C 4AAE FFF2 6704" /* .I-_..!...J...g. */ -+ $"50EE FFFF 6100 01C8 2004 C0FC 010E A71E" /* P...a... ....... */ -+ $"2D48 FFEA 2848 6100 032A 6100 027A 11FC" /* -H..(Ha..*a..z.. */ -+ $"00FF 0A5E 6100 0710 4238 0A5E 3004 D02E" /* ...^a...B8.^0... */ -+ $"FFDD 5440 C0FC 000E A71E 2D48 FFE2 2278" /* ..T@......-H.."x */ -+ $"0BA0 2348 0066 2448 45EA 000E 3D7C 0001" /* ..#H.f$HE...=|.. */ -+ $"FFE0 4A29 006A 6700 0054 4A2E FFFF 6610" /* ..J).jg..TJ...f. */ -+ $"594F 3F3C BF95 487A 0874 A931 2D5F FFF2" /* YO?<..Hz.t.1-_.. */ -+ $"11FC 00FF 0A5E 486E FED4 3F3C BF91 3F3C" /* .....^Hn..?<..?< */ -+ $"0002 6100 085E 4238 0A5E 4A2E FED4 6700" /* ..a..^B8.^J...g. */ -+ $"001C 2F2E FFF2 486E FED4 3F2E FFE0 A826" /* ../...Hn..?....& */ -+ $"526E FFE0 45EA 000E 6100 0674 286E FFEA" /* Rn..E...a..t(n.. */ -+ $"266E FFE6 301B D8C0 532E FFDD 7A00 362C" /* &n..0...S...z.6, */ -+ $"0006 2078 0BA0 3003 E548 2070 0072 4A28" /* .. x..0..H p.rJ( */ -+ $"0004 6700 004A 156C 000C 0004 671E 0C2C" /* ..g..J.l....g.., */ -+ $"0001 000C 6608 256C 0008 000A 6008 34AC" /* ....f.%l....`.4. */ -+ $"0004 42AA 000A 6100 0412 601E 34AC 0004" /* ..B...a...`.4... */ -+ $"48E7 3000 3412 363C BF95 51EE FFDC 6100" /* H.0.4.6<..Q...a. */ -+ $"0384 4CDF 000C 42AA 000A 6100 0482 5344" /* ..L...B...a...SD */ -+ $"6700 002C 45EA 000E 286E FFEA 301B D8C0" /* g..,E...(n..0... */ -+ $"302C 0006 B043 6796 4A2E FFDD 6710 4A28" /* 0,...Cg.J...g.J( */ -+ $"0004 6700 FF74 6100 05D6 6000 FF6C 2678" /* ..g..ta...`..l&x */ -+ $"0BA0 4A2B 006A 6700 003C 206E FFF2 2050" /* ..J+.jg..< n.. P */ -+ $"317C 0501 000E 226E FFE2 302B 0026 E548" /* 1|...."n..0+.&.H */ -+ $"2673 0072 4240 102B 0060 C0FC 000E D2C0" /* &s.rB@.+.`...... */ -+ $"2169 0006 0010 4A2E FFFF 6608 2F2E FFF2" /* !i....J...f./... */ -+ $"4267 A935 11DF 0A5E A998 206E FFEA A01F" /* Bg.5...^.. n.... */ -+ $"4A6E 000C 661C 4A40 6718 3D40 000C 206E" /* Jn..f.J@g.=@.. n */ -+ $"FFE6 A01F 4A6E 000C 6608 4A40 6704 3D40" /* ....Jn..f.J@g.=@ */ -+ $"000C 4CDF 1C1C 303C 0004 6000 20C8 7800" /* ..L...0<..`. .x. */ -+ $"422E FFFC 2D44 FFF6 554F 2F3C 4B43 4852" /* B...-D..UO/.4. */ -+ $"363C BF94 50EE FFDC 7800 3C04 1A38 0A5E" /* 6<..P...x.<..8.^ */ -+ $"0C2A 0002 0004 6752 51EE FFDC 426E 000C" /* .*....gRQ...Bn.. */ -+ $"558F A994 3C1F 554F 2F2A 000A 7015 A82A" /* U...<.UO/*..p..* */ -+ $"381F 6F32 342C 0006 5342 E14A D442 0642" /* 8.o24,..SB.J.B.B */ -+ $"4000 594F 2F3C 6B63 7323 3F02 A81F 201F" /* @.YO/`...2..k */ -+ $"001C 6600 0030 1743 0060 2278 0BA0 4A29" /* ..f..0.C.`"x..J) */ -+ $"006A 6720 2F2E FFF2 3F03 3F2E FFDE A944" /* .jg /...?.?....D */ -+ $"B86C 0006 6600 000E 2F2E FFF2 3F03 3F3C" /* .l..f.../...?.?< */ -+ $"0012 A944 526E FFE0 4CDF 1D18 4E75 2F2E" /* ...DRn..L...Nu/. */ -+ $"FFF2 487A 01B4 3F2E FFE0 A826 526E FFE0" /* ..Hz..?....&Rn.. */ -+ $"45EA 000E 4E75 286E FFEA 48E7 1F10 7000" /* E...Nu(n..H...p. */ -+ $"3004 D040 A71E 2D48 FFE6 4240 3204 6006" /* 0..@..-H..B@2.`. */ -+ $"30C0 0640 010E 51C9 FFF8 0C44 0001 6F00" /* 0..@..Q....D..o. */ -+ $"00AC 266E FFE6 244C 4240 3E04 5347 3400" /* ..&n..$LB@>.SG4. */ -+ $"3600 D643 3200 5241 246E FFEA 3A01 DA45" /* 6..C2.RA$n..:..E */ -+ $"3A33 5000 D4C5 48E7 E000 7A00 1A2C 000E" /* :3P...H...z..,.. */ -+ $"7C00 1C2A 000E 554F 486C 000F 486A 000F" /* |..*..UOHl..Hj.. */ -+ $"3F05 3F06 3F2C 0006 3F2A 0006 3F3C FFF9" /* ?.?.?,..?*..?<.. */ -+ $"3F3C FFF9 3F3C 0030 A9ED 301F 4CDF 0007" /* ?<..?<.0..0.L... */ -+ $"6F08 3401 3602 D643 284A 5241 246E FFEA" /* o.4.6..C(JRA$n.. */ -+ $"3A01 DA45 3A33 5000 D4C5 B841 62A8 3A00" /* :..E:3P....Ab.:. */ -+ $"DA45 3C02 DC46 3633 3000 37B3 5000 6000" /* .E<..F630.7.P.`. */ -+ $"3783 5000 5240 286E FFEA 3A00 DA45 3A33" /* 7.P.R@(n..:..E:3 */ -+ $"5000 D8C5 244C BE40 6200 FF64 4CDF 08F8" /* P...$L.@b..dL... */ -+ $"4E75 2D40 FECC 594F 486E FEC0 7003 A82A" /* Nu-@..YOHn..p..* */ -+ $"201F 670A 05EE FFFC D880 D1AE FFF6 4E75" /* .g...........Nu */ -+ $"4E56 FFFC 426E 000C 48E7 1020 2078 0BA0" /* NV..Bn..H.. x.. */ -+ $"5268 0002 2468 0066 4A28 006A 660C 2068" /* Rh..$h.fJ(.jf. h */ -+ $"0072 7600 1628 0061 6032 2F38 0A1C 21F8" /* .rv..(.a`2/8..!. */ -+ $"0286 0A1C 5D4F 3F3C BF95 A949 4A97 6756" /* ....]O?<...IJ.gV */ -+ $"2D57 FFFC A950 361F 21DF 0A1C 3F03 2F2E" /* -W...P6.!...?./. */ -+ $"FFFC 3F03 A952 51CB FFF6 361F 4AAA 0006" /* ..?..RQ...6.J... */ -+ $"6710 554F 2F2A 0006 4267 303C 0302 ABC9" /* g.UO/*..Bg0<.... */ -+ $"4A5F 45EA 000E 51CB FFE4 2078 0BA0 2068" /* J_E...Q... x.. h */ -+ $"0066 A01F 3D40 000C 554F 2F3C 8200 FFD8" /* .f..=@..UO/<.... */ -+ $"A8B5 544F 6006 5C4F 21DF 0A1C 4CDF 0408" /* ..TO`.\O!...L... */ -+ $"303C 0004 6000 19BE 0228 2D00 0553 7573" /* 0<..`....(-..Sus */ -+ $"616E 4E56 0000 2F02 594F 2F3C 5354 5223" /* anNV../.YO/8&./8..!..... */ -+ $"594F 3F03 A949 201F 6700 01A8 2D40 FFFC" /* YO?..I .g...-@.. */ -+ $"21DF 0A1C 4843 0C43 0001 6600 001C 2478" /* !...HC.C..f...$x */ -+ $"0BA0 286A 0066 3003 C0FC 000E 0CB4 0000" /* ..(j.f0......... */ -+ $"0000 0006 6700 0188 2478 0BA0 342A 002A" /* ....g...$x..4*.* */ -+ $"3542 0028 286A 0066 3003 C0FC 000E D8C0" /* 5B.((j.f0....... */ -+ $"E54A 2072 2072 7A00 1A28 0060 266A 0066" /* .J r rz..(.`&j.f */ -+ $"3005 C0FC 000E D6C0 B9CB 6700 014A 242A" /* 0.........g..J$* */ -+ $"0066 264C 4EBA 0CEE 4A42 6600 013A 4A2C" /* .f&LN...JBf..:J, */ -+ $"0004 6708 322A 002A 6000 0026 3014 7200" /* ..g.2*.*`..&0.r. */ -+ $"0440 4000 6B0A 323C 0009 E260 5240 3200" /* .@@.k.2<...`R@2. */ -+ $"3541 002A 3001 E548 2072 0072 3154 001C" /* 5A.*0..H r.r1T.. */ -+ $"3F01 206A 01F8 4E90 321F B26A 0028 6748" /* ?. j..N.2..j.(gH */ -+ $"6100 0E64 6042 2078 0BA0 2068 01A8 4ED0" /* a..d`B x.. h..N. */ -+ $"2238 0A1C 6700 00E6 5281 6700 00E0 4E56" /* "8..g...R.g...NV */ -+ $"FDE0 48E7 3E38 2600 2F38 0A1C 21F8 0286" /* ..H.>8&./8..!... */ -+ $"0A1C 594F 3F03 A949 201F 6700 00B6 2D40" /* ..YO?..I .g...-@ */ -+ $"FFFC 21DF 0A1C 4843 2478 0BA0 342A 0028" /* ..!...HC$x..4*.( */ -+ $"E54A 2672 2072 7A00 1A2B 0060 2F2E FFFC" /* .J&r rz..+.`/... */ -+ $"3F05 4267 554F A994 4267 A998 1F38 0A5E" /* ?.BgUO..Bg...8.^ */ -+ $"11FC 00FF 0A5E 486E FEE0 3F3C BF91 3F3C" /* .....^Hn..?<..?< */ -+ $"0001 6100 FE2E 11DF 0A5E A998 4A2E FEE0" /* ..a......^..J... */ -+ $"6700 0008 1F6E FEE1 0001 A944 342A 002A" /* g....n.....D4*.* */ -+ $"E54A 2672 2072 7A00 1A2B 0060 2F2E FFFC" /* .J&r rz..+.`/... */ -+ $"3F05 4267 A945 2F2E FFFC 3F03 3F3C FFFF" /* ?.Bg.E/...?.?<.. */ -+ $"A945 1743 0060 286A 0066 3003 C0FC 000E" /* .E.C.`(j.f0..... */ -+ $"D8C0 4A6C 0004 6604 3754 001C 206E FFFC" /* ..Jl..f.7T.. n.. */ -+ $"2050 317C 0501 000E 216C 0006 0010 A81D" /* P1|....!l...... */ -+ $"6004 21DF 0A1C 4CDF 1C7C 4E5E 4E75 554F" /* `.!...L..|N^NuUO */ -+ $"A994 4267 A998 1F38 0A5E 11FC 00FF 0A5E" /* ..Bg...8.^.....^ */ -+ $"383C BF92 2678 0BA0 0C2B 0001 0004 6204" /* 8<..&x...+....b. */ -+ $"5444 6016 594F 3F3C 0024 2F3C 8402 0008" /* TD`.YO?<.$/<.... */ -+ $"A8B5 201F 4A00 6702 5244 42AE FDE0 486E" /* .. .J.g.RDB...Hn */ -+ $"FEE0 3F04 3F3C 0001 6100 FD68 0C44 BF94" /* ..?.?<..a..h.D.. */ -+ $"670E 486E FDE0 3F04 3F3C 0002 6100 FD54" /* g.Hn..?.?<..a..T */ -+ $"486E FEE0 486E FDE0 42A7 42A7 A98B 594F" /* Hn..Hn..B.B...YO */ -+ $"2F3C 4449 544C 3F04 A9A0 201F 4A80 6700" /* /. */ -+ $"3F3B 0058 2F08 6010 0880 001E 670A 205F" /* ?;.X/.`.....g. _ */ -+ $"584F 341F 2F00 2F08 0C40 001A 6700 005E" /* XO4././..@..g..^ */ -+ $"0C40 0026 6700 00A2 2078 0BA0 B068 0058" /* .@.&g... x...h.X */ -+ $"6E00 00D6 B068 0056 6D00 0106 D040 2068" /* n....h.Vm....@ h */ -+ $"0052 2070 0000 4ED0 1012 1416 181A 1C1E" /* .R p..N......... */ -+ $"200C 0E08 0A00 0204 0600 0200 0200 0002" /* ............... */ -+ $"0202 0402 0206 0404 0208 0206 0206 020E" /* ................ */ -+ $"020C 020E 0012 000E 0008 000C 206F 000C" /* ............ o.. */ -+ $"2008 6704 5240 6634 3F02 42A7 3F3C 0002" /* .g.R@f4?.B.?<.. */ -+ $"3F02 4267 3F3C 0032 A9ED 205F 341F 2008" /* ?.Bg?<.2.. _4. . */ -+ $"6766 2050 0828 0000 0009 675C 3028 0016" /* gf P.(....g\0(.. */ -+ $"4AAF 000C 6704 3028 0018 D0C0 4A10 6A48" /* J...g.0(....J.jH */ -+ $"2F48 000C 4EFA E076 3F02 594F 3F3C 0002" /* /H..N..v?.YO?<.. */ -+ $"3F02 3F3C FFFF 3F3C 0032 A9ED 225F 341F" /* ?.?<..?<.2.."_4. */ -+ $"2009 6724 2251 3029 003C 671C 4A69 003E" /* .g$"Q0). */ -+ $"6716 D2C0 4A29 0001 6A0E 2F49 0004 4EFA" /* g...J)..j./I..N. */ -+ $"E31E 2E9F 4EFA E318 0C42 FFFF 6D24 2278" /* ....N....B..m$"x */ -+ $"0BA0 6E04 3429 0026 3202 E549 2231 1072" /* ..n.4).&2..I"1.r */ -+ $"6708 2041 4A28 0004 660E 2069 0072 7400" /* g. AJ(..f. i.rt. */ -+ $"6006 5D4F 6128 341F 4842 2268 0024 4ED1" /* `.]Oa(4.HB"h.$N. */ -+ $"205F 201F 4840 7200 1200 E048 0240 007F" /* _ .H@r....H.@.. */ -+ $"DEC1 224F 6002 4219 51C8 FFFC 4ED0 4A38" /* .."O`.B.Q...N.J8 */ -+ $"08F3 6704 7000 600C 2015 6FF8 2040 2050" /* ..g.p.`. .o. @ P */ -+ $"3028 0044 2278 0BA0 7200 1229 0006 241F" /* 0(.D"x..r..)..$. */ -+ $"588F 603C 4A38 08F3 6704 7000 600C 2015" /* X.`."BN."_X.2.`. */ -+ $"225F 588F 4A38 08F3 6626 2215 6F22 2041" /* "_X.J8..f&".o" A */ -+ $"2050 3228 0044 0C41 0001 6314 7000 0441" /* P2(.D.A..c.p..A */ -+ $"4000 6B08 7009 E069 5241 3001 3E80 4ED1" /* @.k.p..iRA0.>.N. */ -+ $"2078 0BA0 3EA8 0026 4ED1 4E56 0000 302E" /* x..>..&N.NV..0. */ -+ $"000C 6A16 5240 6B0A 2078 0BA0 3028 0026" /* ..j.R@k. x..0(.& */ -+ $"6008 5D4F 6100 FEB8 301F 4A40 6712 5340" /* `.]Oa...0.J@g.S@ */ -+ $"7209 E368 0640 4000 3200 0641 01FF 6004" /* r..h.@@.2..A..`. */ -+ $"323C 3FFF 4840 3001 2D40 000E 4E5E 225F" /* 2 x.. (.. */ -+ $"60EA 2078 02B6 2068 0178 2208 67DE 5281" /* `. x.. h.x".g.R. */ -+ $"67DA 2050 1028 0020 60D2 4E56 0000 3D7C" /* g. P.(. `.NV..=| */ -+ $"FFFF 0012 2278 0BA0 342E 0010 0C42 002A" /* ...."x..4....B.* */ -+ $"6232 5269 0002 0C42 0026 6730 41FA 003A" /* b2Ri...B.&g0A..: */ -+ $"7200 D0C2 1218 43F1 1000 1210 202E 000C" /* r.....C..... ... */ -+ $"5541 6B06 6708 2280 6006 1280 6002 3280" /* UAk.g.".`...`.2. */ -+ $"426E 0012 303C 000A 6000 08CA 2078 02B6" /* Bn..0<..`... x.. */ -+ $"216E 000C 000E 60E8 0002 0202 0401 0501" /* !n....`......... */ -+ $"0601 0701 0801 0901 1604 2602 2802 2A02" /* ..........&.(.*. */ -+ $"3402 3C04 3604 0A04 0E04 3A02 5A01 6E04" /* 4.<.6.....:.Z.n. */ -+ $"5C02 5B01 4E56 0000 302E 000E 6100 010E" /* \.[.NV..0...a... */ -+ $"674C 342E 000C 6C0E 2049 2268 0024 4E5E" /* gL4...l. I"h.$N^ */ -+ $"4ED1 7000 6038 0C42 002E 6D10 0C42 004C" /* N.p.`8.B..m..B.L */ -+ $"6FE6 0C42 005C 62EA 0442 0020 41FA 00A0" /* o..B.\b..B. A... */ -+ $"7200 D0C2 1218 43F1 1000 1210 7000 5541" /* r.....C.....p.UA */ -+ $"6B06 6708 2011 6006 1011 6002 3011 2D40" /* k.g. .`...`.0.-@ */ -+ $"0010 303C 0008 6000 082C 4E56 0000 302E" /* ..0<..`..,NV..0. */ -+ $"0012 6100 00A8 675C 342E 0010 6C0A 2049" /* ..a...g\4...l. I */ -+ $"2268 0024 4E5E 4ED1 0C42 002E 6D10 0C42" /* "h.$N^N..B..m..B */ -+ $"004C 6FEA 0C42 005C 6240 0442 0020 5269" /* .Lo..B.\b@.B. Ri */ -+ $"0002 41FA 003A 7200 D0C2 1218 43F1 1000" /* ..A..:r.....C... */ -+ $"1210 202E 000C 5541 6B06 6708 2280 6006" /* .. ...UAk.g.".`. */ -+ $"1280 6002 3280 7000 3D40 0014 303C 000C" /* ..`.2.p.=@..0<.. */ -+ $"6000 07C2 303C FFFE 60EE 70FF 60EA 0002" /* `...0<..`.p.`... */ -+ $"0202 0401 0501 0601 0701 0802 0A02 0C02" /* ................ */ -+ $"0E02 1002 1202 1402 1602 1802 1A02 1C02" /* ................ */ -+ $"1E02 2004 2404 2804 2C04 3004 4804 4C04" /* .. .$.(.,.0.H.L. */ -+ $"5004 5404 5804 5C04 6201 6301 4A40 6A1E" /* P.T.X.\.b.c.J@j. */ -+ $"5240 660A 2078 0BA0 3028 0026 6010 5240" /* R@f. x..0(.&`.R@ */ -+ $"6626 554F 2F3C 8200 0000 A8B5 301F 0C40" /* f&UO/<......0..@ */ -+ $"0040 6214 2078 0BA0 E548 2030 0072 6708" /* .@b. x...H 0.rg. */ -+ $"2240 4A29 0004 6602 7000 4E75 4E56 0000" /* "@J)..f.p.NuNV.. */ -+ $"202E 000C 2D7C FFFF EA51 0010 43FA 002A" /* ...-|...Q..C..* */ -+ $"2219 671C 3419 B280 66F6 42A7 3F02 2F3C" /* ".g.4...f.B.?./< */ -+ $"8402 0008 A8B5 206E 0008 209F 426E 0010" /* ...... n.. .Bn.. */ -+ $"303C 0008 6000 06FE 7363 7269 0000 7363" /* 0<..`...scri..sc */ -+ $"7223 0004 0000 0000 48E7 FFFE 2878 0BA0" /* r#......H...(x.. */ -+ $"49EC 0072 383C 0041 6020 261C 671C 2643" /* I..r8<.A` &.g.&C */ -+ $"4A2B 0004 6714 262B 0020 670E 204B 2643" /* J+..g.&+. g. K&C */ -+ $"48E7 F808 4E93 4CDF 101F 51CC FFDE 4CDF" /* H...N.L...Q...L. */ -+ $"7FFF 4E75 4E56 0000 426E 0018 222E 0010" /* ..NuNV..Bn.."... */ -+ $"6A02 7200 206E 000C 2081 206E 0008 7000" /* j.r. n.. . n..p. */ -+ $"1028 0065 6700 006C 1D40 0018 4A81 6700" /* .(.eg..l.@..J.g. */ -+ $"0062 594F 3F3C 0002 3F00 3F3C FFFF 3F3C" /* .bYO?<..?.?<..?< */ -+ $"0032 A9ED 201F 674A 2240 2251 3029 003C" /* .2.. .gJ"@"Q0).< */ -+ $"6740 4A69 003E 673A D2C0 2F0A 202E 0010" /* g@Ji.>g:../. ... */ -+ $"2449 206E 0014 1218 6002 5249 B219 62FA" /* $I n....`.RI..b. */ -+ $"1411 1D42 0018 5380 6710 224A 1218 6002" /* ...B..S.g."J..`. */ -+ $"5249 B219 62FA B411 67EC 206E 000C 9190" /* RI..b...g. n.... */ -+ $"245F 4E5E 225F 4FEF 0010 4ED1 4E56 0000" /* $_N^"_O...N.NV.. */ -+ $"3D7C 0100 0010 206E 000C 303C 00FF 4218" /* =|.... n..0<..B. */ -+ $"51C8 FFFC 303C 0008 6000 05FA 4E56 FFFC" /* Q...0<..`...NV.. */ -+ $"48E7 1F38 2878 0BA0 598F 2F3C 4B53 5750" /* H..8(x..Y./.`8<.0..H */ -+ $"2473 0072 302A 0010 38C0 429C 302A 0014" /* $s.r0*..8.B.0*.. */ -+ $"38C0 429C 202A 0068 6706 2040 3F06 4E90" /* 8.B. *.hg. @?.N. */ -+ $"4A2A 0007 670C 6A06 50EB 0005 6004 50EB" /* J*..g.j.P...`.P. */ -+ $"005A 51CF FFC6 7000 3D40 000C 4CDF 1CF8" /* .ZQ...p.=@..L... */ -+ $"303C 0004 6000 025E 3038 0A60 66EA 303C" /* 0<..`..^08.`f.0< */ -+ $"FF40 60E4 3C00 2047 A02A 3006 60DA 3005" /* .@`.<. G.*0.`.0. */ -+ $"5440 E548 A71E 6622 2488 3619 3819 30C5" /* T@.H..f"$.6.8.0. */ -+ $"30C3 2448 3405 4240 323C 1000 1200 30C1" /* 0.$H4.B@2<....0. */ -+ $"30C3 5240 51CA FFF6 7000 4E75 48E7 0020" /* 0.R@Q...p.NuH.. */ -+ $"2448 594F 2F3C 464F 4E44 3F12 A9A0 4A9F" /* $HYO/$R.*....g4"J */ -+ $"7400 342A 000E D3C2 E049 0241 0006 323B" /* t.4*.....I.A..2; */ -+ $"1028 3432 1000 D5C2 7200 600C 1210 1231" /* .(42....r.`....1 */ -+ $"1000 1232 1000 D318 51C8 FFF2 7000 245F" /* ...2....Q...p.$_ */ -+ $"4E75 303C FF40 60F6 0012 001A 0010 0014" /* Nu0<.@`......... */ -+ $"2E9F 426F 0006 7200 2038 0174 660E 7220" /* ..Bo..r. 8.tf.r */ -+ $"2038 0178 0280 FFFF 7F80 674E 4E56 0000" /* 8.x......gNNV.. */ -+ $"48E7 1820 382E 0008 761F 0700 56CB FFFC" /* H.. 8...v...V... */ -+ $"3003 0243 0007 0240 00F8 0643 0018 9640" /* 0..C...@...C...@ */ -+ $"D641 0043 0080 2078 02B6 2468 000E 50EE" /* .A.C.. x..$h..P. */ -+ $"000A 6100 FD80 670C 0043 0100 6100 FD76" /* ..a...g..C..a..v */ -+ $"57EE 000A 4CDF 0418 4E5E 205F 548F 4ED0" /* W...L...N^ _T.N. */ -+ $"205F 504F 4297 4ED0 205F 4FEF 000C 3EBC" /* _POB.N. _O...>. */ -+ $"FFFF 4ED0 206F 0004 7400 1428 0065 42A7" /* ..N. o..t..(.eB. */ -+ $"3F3C 0002 2F02 3F3C 0032 A9ED 201F 205F" /* ?<../.?<.2.. . _ */ -+ $"241F 321F 225F 48E7 0030 4A80 6758 2440" /* $.2."_H..0J.gX$@ */ -+ $"7000 2452 082A 0000 0009 674A 264A 302A" /* p.$R.*....gJ&J0* */ -+ $"000E D5C0 302B 000C D7C0 7000 1031 1000" /* ....0+....p..1.. */ -+ $"1032 0000 1033 0000 7200 1200 6A04 08C0" /* .2...3..r...j... */ -+ $"000E 0200 000F 2242 4A29 0005 6710 0801" /* ......"BJ)..g... */ -+ $"0006 670A 08C0 000D 0201 0030 6004 0201" /* ..g........0`... */ -+ $"0070 E949 8041 4CDF 0C00 3E80 4ED0 4E56" /* .p.I.AL...>.N.NV */ -+ $"FFEA 48E7 0E30 266E 0010 2A2E 0024 DAAE" /* ..H..0&n..*..$.. */ -+ $"001C 3D78 0BAC FFF0 4278 0BAC 4267 2F3C" /* ..=x....Bx..Bg/< */ -+ $"8200 0000 A8B5 301F E548 2478 0BA0 2472" /* ......0..H$x..$r */ -+ $"0072 1D6A 0012 FFEE 08AA 000F 0012 282E" /* .r.j..........(. */ -+ $"0018 98AE 001C 6F00 00BE 4A93 6B00 00FC" /* ......o...J.k... */ -+ $"2045 3004 6100 014C 1D40 FFF2 3801 2D53" /* E0.a..L.@..8.-S */ -+ $"FFEA 4267 2F05 2F04 42A7 2F13 486E FFF3" /* ..Bg/./.B./.Hn.. */ -+ $"2F0B 4267 203C 0001 0001 2F00 2F00 2F3C" /* /.Bg <..../././< */ -+ $"8222 002E A8B5 7C00 3C1F 4AAE FFEA 6604" /* ."....|.<.J...f. */ -+ $"50EE FFF3 2006 DCAE 001C B084 6D12 4A2E" /* P... .......m.J. */ -+ $"FFF3 670C 4A2E FFF2 675C 2206 6000 00CC" /* ..g.J...g\".`... */ -+ $"2F2E 0024 3F2E 0022 3F06 1F2E FFF3 2F38" /* /..$?.."?...../8 */ -+ $"0A06 486E FFF4 2F3C 8012 001A A8B5 4267" /* ..Hn../<......Bg */ -+ $"2F2E 0024 3F2E FFF4 2F3C 8206 0012 A8B5" /* /..$?.../<...... */ -+ $"301F 7200 322E FFF4 0240 0F0F 0C40 0300" /* 0.r.2....@...@.. */ -+ $"661C 082E 000F FFEE 56C0 B02E FFF1 660E" /* f.......V.....f. */ -+ $"322E FFF6 6074 2C2E 0018 7002 6072 4A81" /* 2...`t,...p.`rJ. */ -+ $"6668 206E 000C 4A90 6760 4A2E FFF3 6624" /* fh n..J.g`J...f$ */ -+ $"5386 082A 0001 0013 661A 4267 2F05 2006" /* S..*....f.Bg/. . */ -+ $"90AE 001C 3F00 2F3C 8206 0010 A8B5 4A5F" /* ....?./<......J_ */ -+ $"6F02 5386 4A86 6E2E 600C 206E 000C 4A90" /* o.S.J.n.`. n..J. */ -+ $"6604 7200 6024 7C01 082A 0001 0013 6616" /* f.r.`$|..*....f. */ -+ $"4267 2F05 3F3C 0001 2F3C 8206 0010 A8B5" /* Bg/.?<../<...... */ -+ $"4A5F 6F02 5286 7001 6006 7C00 3C01 7000" /* J_o.R.p.`.|.<.p. */ -+ $"206E 000C 2086 1D40 0028 156E FFEE 0012" /* n.. ..@.(.n.... */ -+ $"31EE FFF0 0BAC 4CDF 0C70 303C 0020 6000" /* 1.....L..p0<. `. */ -+ $"FBC4 3200 143C 000D 6002 B418 57C8 FFFC" /* ..2..<..`...W... */ -+ $"6704 51C0 6004 9240 50C0 4E75 0000 0000" /* g.Q.`..@P.Nu.... */ -+ $"48E7 1038 2878 0BA0 266C 0052 322C 0056" /* H..8(x..&l.R2,.V */ -+ $"0C41 FFB0 6F40 7000 302C 0058 D040 2400" /* .A..o@p.0,.X.@$. */ -+ $"0440 FF5C A71E 6600 01F2 45E8 00A0 D241" /* .@.\..f...E....A */ -+ $"41F3 1000 2648 43F2 1000 2002 9041 5840" /* A...&HC... ..AX@ */ -+ $"A02E 6600 01D6 204B A01F 264A 294B 0052" /* ..f... K..&J)K.R */ -+ $"397C FFB0 0056 43FA 01E8 45FA C824 2019" /* 9|...VC...E..$ . */ -+ $"670E 41F2 0000 4840 D040 2788 0000 60EE" /* g.A...H@.@'...`. */ -+ $"202C 0072 6770 2840 266C 0040 322C 0046" /* ,.rgp(@&l.@2,.F */ -+ $"0C41 0036 6C3C 7000 303C 0038 906C 0044" /* .A.6l<20> + emScriptMapPtr ds.l 1 ; pointer to script mapping/sorting data <8> + emLangMapPtr ds.l 1 ; pointer to language mapping/sorting data <8> + +- ds.l 1 ; was emNumer (obsolete), now unused <11><84> +- ds.l 1 ; was emDenom (obsolete), now unused <11><84> ++emNumer ds.l 1 ; used for scaling hi-level QD routines ++emDenom ds.l 1 ; used for scaling hi-level QD routines + emIconCluts ds.l 1 ; Ptr to global icon info <13> + emScriptAppGlobals ds.l 1 ; Handle to application-specific script globals <16><20><21> + emAppleEventsGlobal ds.l 1 ; Apple Events/Apple Scripts global pointer (not switched) <22> @@ -388,7 +326,7 @@ emPrintingGlobals ds.l 1 ; Tsunami Printing Manager non-swapped printing gl emCursorGlobals ds.l 1 ; Ptr to CursorDev globals <46> @@ -30791,6 +30802,78 @@ diff --git a/Toolbox/ScriptMgr/International.r b/Toolbox/ScriptMgr/International } } }; +diff --git a/Toolbox/ScriptMgr/RomanNewJust.a b/Toolbox/ScriptMgr/RomanNewJust.a +--- a/Toolbox/ScriptMgr/RomanNewJust.a ++++ b/Toolbox/ScriptMgr/RomanNewJust.a +@@ -10,9 +10,6 @@ + ; + ; Change History (most recent first): + ; +-; 9/17/92 kc Fix bug in PortChExtra. The rts was missing, and it was falling +-; through to the next procedure. This was benign until we added a +-; vector to the end of the procedure. + ; <24> 7/8/92 HA #1035313 : In NChar2Pixel, when we call StdTxMeas, we use + ; the fixed value that is returned in field fontAdj field of QD + ; globals . This would make NC2P more accurate and consistent with +@@ -2682,8 +2679,6 @@ GetPortChExtra + move.l (sp)+,d2 ; get real chExtra for our size + @donePortChExtra ; + +- rts +- + endproc + + ; ----------------------------------------------------------------------------- +diff --git a/Toolbox/ScriptMgr/ScriptMgrExtensions.a b/Toolbox/ScriptMgr/ScriptMgrExtensions.a +--- a/Toolbox/ScriptMgr/ScriptMgrExtensions.a ++++ b/Toolbox/ScriptMgr/ScriptMgrExtensions.a +@@ -12,12 +12,7 @@ + ; + ; Change History (most recent first): + ; +-; 5/21/93 CSS Update fixes from Reality per P. Edberg's review: +-; <12> 4/2/93 ngk Fix bug with gestalt routine. It was returning a long instead of +-; a short. This is bad with Pascal calling conventions. +-; 11/19/92 RB When looking for the standard Chicago font, look in ROM first. + ; 11/6/92 SWC Changed PackMacs.a->Packages.a. +-; 10/27/92 CSS Changed short branch to word branch. + ; <10> 7/6/92 HA ##1034403 : Fixed bug in StyledLineBreak, now I made sure + ; to return the correct offset when the (text buffer ends with a + ; carriage return) AND (textStart parameter is > 0 ) AND the whole +@@ -100,7 +95,7 @@ gestaltScriptMgr + + ; initialize loop, set up default return values + move.l gestaltSelector(a6),d0 ; selector value +- move.w #gestaltUndefSelectorErr,result(a6) ; assume unknown selector <12> ++ move.l #gestaltUndefSelectorErr,result(a6) ; assume unknown selector + lea gestaltSMgrTable,a1 + + ; loop to find Gestalt selector in table +@@ -599,7 +594,6 @@ MacPlusISOOptSp equ $1004 ; bits set for Opt & Space on Mac+ ISO <7> + subq #4,sp ; space for return value + move.l #'FOND',-(sp) ; push type + move.w d4,-(sp) ; push next id in range +- MOVE.W #MapTrue,RomMapInsert ; look in ROM first rb + _GetResource + tst.l (sp)+ ; was it there? + bne.s @popRetnAndSetSysFondId ; if yes, go reset +@@ -1033,7 +1027,6 @@ FixFond + subq #4,sp ; return room + move.l #'FOND',-(sp) ; see if this FOND exists + move.w (a2),-(sp) ; id, get the id from a2 pointer <47> +- MOVE.W #MapTrue,RomMapInsert ; look in ROM first rb + _GetResource + tst.l (sp)+ ; was it there? + bne.s @fixFondDone ; yes, ok +@@ -1689,7 +1682,7 @@ haveValidScript ; <38> + move.l d0,sourceLen(a6) ; save length + _PtrToHand ; make new handle containing copy of text + move.w d0,errCode(a6) ; save err code +- bne lwrTrUnlk ; if error in PtrToHand, quit CSS ++ bne.s lwrTrUnlk ; if error in PtrToHand, quit + move.l a0,sourceHndl(a6) ; save new source handle + move.l sourceLen(a6),d0 ; get length again + _NewHandle ; make new handle with random contents diff --git a/Toolbox/ScriptMgr/ScriptMgrInit.a b/Toolbox/ScriptMgr/ScriptMgrInit.a --- a/Toolbox/ScriptMgr/ScriptMgrInit.a +++ b/Toolbox/ScriptMgr/ScriptMgrInit.a @@ -31032,6 +31115,267 @@ diff --git a/Toolbox/ScriptMgr/ScriptMgrInit.a b/Toolbox/ScriptMgr/ScriptMgrInit dc.w CharByte - romanDispTable ; CharByte (16) dc.w CharType - romanDispTable ; CharType (18) <26> dc.w Pixel2Char - romanDispTable ; Pixel2Char (20) +diff --git a/Toolbox/ScriptMgr/ScriptMgrKbdMenu.a b/Toolbox/ScriptMgr/ScriptMgrKbdMenu.a +--- a/Toolbox/ScriptMgr/ScriptMgrKbdMenu.a ++++ b/Toolbox/ScriptMgr/ScriptMgrKbdMenu.a +@@ -9,9 +9,6 @@ + ; + ; Change History (most recent first): + ; +-; <43> 4/2/93 YK Initialize D0 to zero before getting a length byte into the +-; lowest byte. +-; <42> 3/27/93 YK Use system script font for ‘About Keyboards…’ menu item. + ; <41> 1/19/93 PKE Update include file names: PackMacs.a->Packages.a. No effect on + ; objects. + ; <40> 6/26/92 SMB #1033660,: When we realized that Simplified Chinese +@@ -290,7 +287,7 @@ InitKeybdMenu + _UseResFile ; <14> + + move.b ResLoad,-(sp) ; <14> +- st ResLoad ; set to true <14> ++ move.b #$FF,ResLoad ; set to true <14> + + ; setup defaultMark for the menu + move.w #KeybdDefaultMrk,defaultMark(a6) ; initialize to empty, 0x00 +@@ -299,10 +296,10 @@ InitKeybdMenu + move.w #DefMarkIndex,-(sp) ; string index <34> + import localGetIndString ; <34> + bsr localGetIndString ; making a pString (rather than a ptr to text) <34> +- sf ResLoad ; reset to F <14> ++ clr.b ResLoad ; reset to F <14> + + tst.b NextItemString(a6) ; do we have a string? <34> +- beq.s @useDefMarker ; if empty, use default marker <32> ++ beq @useDefMarker ; if empty, use default marker <32> + ; fetch the localized character + move.b NextItemString+1(a6),defaultMark+1(a6) ; write out the default marker byte (skip length) <34> + @useDefMarker +@@ -341,9 +338,9 @@ InitKeybdMenu + bsr BuildIMTable ; Init the ItemInstalledRec table for input methods <21> + bsr BuildKCHRTable ; Init the ItemInstalledRec table for KCHRs <21> + ;----------------------------------------------------------------------------------- +- st ResLoad ; must be T for _IUTextOrderSys <14> ++ move.b #$FF,ResLoad ; must be T for _IUTextOrderSys <14> + bsr SortItems ; sort the Items <10> +- sf ResLoad ; reset to F <14> ++ clr.b ResLoad ; reset to F <14> + ;------------------------------------------- + + ; Allocate AuxKeyboardMenuInfo record for IconSuite handles for MF and other info for SystemMenu patch +@@ -375,7 +372,7 @@ InitKeybdMenu + ; equivalent, cmd-opt-space bar (to switch between keybds. in a script) works. <15> + move.w #1,menuItem(a6) ; initialize earlier for bra <15> + tst.b smgrKbdMenuAvail(a1) ; do we want to display a menu? <15> +- beq.s @BuildMenuRec ; <15> ++ beq @BuildMenuRec ; <15> + ; Do we already have a menu? (are we called from RebuildKeybdMenu?) + tst.b rebuildFlag(a6) ; do we already have a menu? <21> + bne.s @GotMenuH ; bra if so <21> +@@ -389,29 +386,21 @@ InitKeybdMenu + @GotMenuH + + ; Add the About Keyboards… menuitem followed by a disabled line <10> +- st ResLoad ; set to true <35> <14> ++ move.b #$FF,ResLoad ; set to true <35> <14> + pea NextItemString(a6) ; ptr to Str255 <34> + move.w #kKeyboardMenuItemsID,-(sp) ; strListID <34><38> + move.w #AboutKybdsIndex,-(sp) ; string index <34> + import localGetIndString ; <34> + bsr localGetIndString ; <34> +- sf ResLoad ; reset to false <35> ++ clr.b ResLoad ; reset to false <35> + tst.b NextItemString(a6) ; do we have the string <34> +- beq.s @BuildMenuRec ; no, don't add AboutKeyboards… <34> ++ beq @BuildMenuRec ; no, don't add AboutKeyboards… <34> + + ; name the menu item + move.l menuH(a6),-(sp) + pea NextItemString(a6) ; name of this KCHR: pString + move.w menuItem(a6),-(sp) ; insert ‘after’ this menuItem + _InsMenuItem +- move.l menuH(a6),-(sp) +- move.w #1,-(sp) ; the first item has a script code. <42> +- move.w #$1C,-(sp) +- _SetItemCmd +- move.l menuH(a6),-(sp) +- move.w #1,-(SP) +- move.w #smSystemScript,-(sp) ; the script code is the sytem script <42> +- _SetItmIcon + add.w #1,menuItem(a6) + add.w #AuxMenuInfoSize,a2 ; point past 1st menuItem now + bsr AddDisabledLine ; separate scripts by a disabled line <8> +@@ -457,7 +446,7 @@ InitKeybdMenu + @ScriptItemsLoop + ; if script not enabled, loop for next input. (a0 set above) + tst.b scriptEnabled(a0) ; script enabled? +- beq.s @NextInput ; bra to fetch next input item if not a valid script ++ beq @NextInput ; bra to fetch next input item if not a valid script + + ; find out the type of input to build the iconsuite + move.b itemInpuType(a4), itemType(a2) ; type of input <25> +@@ -496,7 +485,7 @@ InitKeybdMenu + ; Get next input! + sub.w #1,d4 ; are we out of inputs/menuItems to add? + IF NOT DoCmdKeyEquivalents THEN ; bra if done <8> +- beq.s @SetTitle ; <3>;temporary<6> ++ beq @SetTitle ; <3>;temporary<6> + ELSE + beq @SetCmdKeyEquiv ; add Next Keyboard and Next Script <3>;temporary<6> + ENDIF +@@ -535,7 +524,7 @@ InitKeybdMenu + @SetTitle + GetSmgrCore a3 ; get script manager core. <15> + tst.b smgrKbdMenuAvail(a3) ; do we want to display a menu? <15> +- beq.s @Cleanup ; <15> ++ beq @Cleanup ; <15> + move.l menuH(a6),a0 + move.l (a0),a0 ; deref + ; stuff the length (5 bytes) and special byte into the name: 01 indicates a handle is following +@@ -619,7 +608,7 @@ CountMenuContents + bz.s @GetNewIMs ; No handle, so assume no old input method. Go find some new ones. <26> + move.l d0,a0 ; <26> + tst.b scriptEnabled(a0) ; script enabled? <25> +- beq.s @GetNewIMs ; no Japanese script so get only new IMs now <25> ++ beq @GetNewIMs ; no Japanese script so get only new IMs now <25> + ; get handle to table of input methods + move.l intfArray(a0),a0 ; load table handle <25> + move.l (a0),a0 ; load table pointer <25> +@@ -857,7 +846,7 @@ BuildIMTable + move.l (sp), itemInfo(a4) ; component identifier: use as input on next call + move.l (sp)+, compID(a6) ; need for next FindNextComponent call + cmp.l #0, itemInfo(a4) ; 0 => no more matching components +- beq.s @DoOldIMs ; <25> ++ beq @DoOldIMs ; <25> + + @GetIMInfo + ; must create a handle for the name +@@ -883,9 +872,9 @@ BuildIMTable + move.l itemHandle(a4),a0 ; double deref handle + move.l (a0),a0 ; pointer to name + lea itemName(a4),a1 ; ptr to name space on stack +- moveq #0,D0 ; clear high bytes for BlockMove +- move.b (a0)+,d0 ; get the length of this string ++ move.b (a0),d0 ; get the length of this string + move.b d0,(a1)+ ; store the length in the string (make a pString!) ++ add.w #1,a0 + move.w d0,d1 ; save the length + _BlockMove ; copy it into theString + clr.b 0(a1,d1) ; set terminator byte +@@ -910,7 +899,7 @@ BuildIMTable + @DoOldIMs + ; now get old input methods + btst.b #HaveOldJapanIMbit,CJKcount(a6) ; optimized: is there an old JIM <34> +- beq.s @NoMoreIMs ; no, so done <32> ++ beq @NoMoreIMs ; no, so done <32> + GetSMgrCore a1 ; get Script Mgr core <25> + move.l smgrEntry+(smJapanese*4)(a1),a1 ; get handle to the Japanese system globals <25> <26><34> + +@@ -927,7 +916,7 @@ BuildIMTable + move.l (a2)+,a0 ; input method source + ; check if this input method is "ready" before installing it <38> + btst.b #intfFReady-8,intfFlags(a0) ; is the IM ready? <38> +- bne.s @InstallIM ; yes, install it <38> ++ bne @InstallIM ; yes, install it <38> + add #1,d5 ; no, so be sure to decrement totals <38> + bra.s @GetNextIM ; fetch the next one <38> + +@@ -938,8 +927,9 @@ BuildIMTable + lea intfName(a0),a0 ; changed from intfFile to intfName <38> + lea itemName(a4),a1 ; ptr to name space on stack + clr.l d0 ; clear this space! <27> +- move.b (a0)+,d0 ; get the length of this string ++ move.b (a0),d0 ; get the length of this string + move.b d0,(a1)+ ; store the length in the string (make a pString!) ++ add.w #1,a0 + move.w d0,d1 ; save the length + _BlockMove ; copy it into theString + clr.b 0(a1,d1) ; set terminator byte +@@ -996,7 +986,7 @@ iconSuiteRegs reg a0/a3/d6 + _NewIconSuite + move.w (sp)+,d0 + move.w d0,result(a6) ; save (shouldn't affect CCs) +- bne.s @Done ; error exit really <23> ++ bne @Done ; error exit really <23> + + ; get a handle to each script’s small icon resource (‘kcs#’,‘kcs4’,‘kcs8’) and stuff in the icon suite + lea kcsTable,a3 +@@ -1124,7 +1114,7 @@ IMiconSuiteRegs reg d2-d6/a0 + beq.s @noResource ; no + + ; if we are loading from component's resfile, better set resload to true ... +- st ResLoad ; set to true ++ move.b #1,ResLoad ; set to true + bra.s @doIt ; yes, use common code + + ; if we can't load the resource, then close the resfile and use the generic small +@@ -1294,7 +1284,7 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + move.l #UsingOldStyleIM,-(sp) ; TRUE <34> + _SetScript + tst.w (sp)+ ; ignore OSErr <34> +- bra.s @SaveItemNum ; and save the item num ++ bra @SaveItemNum ; and save the item num + + ;------------------------------------------------------------------------------------------ + @oldDefIM ; default is old-style IM +@@ -1303,7 +1293,7 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + + move.w compID+sidFEPID(a6),d0 ; saved in low word of long + cmp.w itemRsrcID(a2),d0 ; is this item the default component for this script? +- bne.s @done ; no ++ bne @done ; no + + ; this is the default old-style IM so use it + Import GetKanjiUserIDIntf ; call local version of UserIDIntf +@@ -1313,7 +1303,7 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + move.l smgrEntry+(smJapanese*4)(a1),a1 ; load doubleTalkRecord for Japanese. + ; if an error occured, didn't active old-style IM so don't make secret SetScript call. + tst.w ScriptSystemGlobals.FISError(a1) ; bad index? +- bne.s @done ; yes -> bail. ++ bne @done ; yes -> bail. + + ; we have a problem here. If the old default IM is not in the system ...... + ;; what to do if we failed ???? how could it get registered as the default if +@@ -1330,17 +1320,17 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + move.l #UsingOldStyleIM,-(sp) ; TRUE + _SetScript + tst.w (sp)+ ; result OSErr +- bne.s @done +- bra.s @SaveItemNum ; ++ bne @done ++ bra @SaveItemNum ; + + ;------------------------------------------------------------------------------------------ + @newDefIM ; default is TSM-style IM + cmp.b #TSMIMitem, itemType(a2) ; is this new? +- bne.s @done ; no, ++ bne @done ; no, + move.l auxItemInfo(a2),d0 ; compare to the default + cmp.l compID(a6),d0 ; is this item the default component for this script? +- bne.s @done ; no +- bra.s @SaveItemNum ; ++ bne @done ; no ++ bra @SaveItemNum ; + + ; < End new #29 > + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@@ -1351,7 +1341,7 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + @KCHRinput + move.w itemRsrcID(a2),d1 ; get the first KCHR ID + cmp.w scriptBundle.itlbKeys(a3),d1 +- bne.s @done ++ bne @done + ;------------------------------------------------------------------------------------------ <21> + + @SaveItemNum +@@ -1369,7 +1359,7 @@ AddMenuRegs reg d3/d4/a0/a2-a4 ; save a0, too <23> + + ; Add ‘√’mark to the system KCHR + cmp.w itemScript(a4),d4 ; is this the system KCHR? +- bne.s @done ++ bne @done + ; system KCHR gets ‘√’ mark and its icon gets put into menu name + move.l menuH(a6),-(sp) + move.w d3,-(sp) diff --git a/Toolbox/ScriptMgr/ScriptMgrMisc.a b/Toolbox/ScriptMgr/ScriptMgrMisc.a --- a/Toolbox/ScriptMgr/ScriptMgrMisc.a +++ b/Toolbox/ScriptMgr/ScriptMgrMisc.a