*db/read *db/chunkparsers

read:
 - ATASCII and a couple of its options added (gods I should stop it with the hacking in of things)
 - the more narrow side trianglies I used to be using for some reason are now proper side trianglies. I hate that Github is showing some of these characters on blue square background, they've been around since long before unicode existed...

chunkparsers:
 - Atari binary detection can now start from a user-specified offset. Obvious stuff...

Author: Kaens

db/chunkparsers

@@ -7,14 +7,16 @@ includeScript("read");
 
 /**
  * If it's an Amiga hunk file, parses it and tries to be strict in case of garbage past EoF.
+ * @param {Int} baseofs - base offset from which to start parsing
  * @returns {Array} [nTotalSize,aBlockInfo,c] where:
- *  - nTotalSize: -1 if the file is not an Atari DOS "binary save", otherwise the total expected size;
+ *  - nTotalSize: -1 if the file is not an Atari DOS "binary save", otherwise the total expected size (including baseofs);
  *  - aBlockInfo: an Array with separate block types, offsets, and sizes, its length reflecting the number of hunks
  */
-function parseAmigaHunks() {
+function parseAmigaHunks(baseofs) {
 	//TODO check types, check reslibs, break off if invalid
-	if(!X.c("000003F3")) return [-1, []]; //is it an Amiga hunk file?
-	var p = 4, x = sz = i = reslibs = 0, info = [], load = true;
+	if(typeof baseofs === "undefined") baseofs = 0;
+	if(!X.c("000003F3",baseofs)) return [-1, []]; //is it an Amiga hunk file?
+	var p = baseofs+4, x = sz = i = reslibs = 0, info = [], load = true;
 	//library strings:
 	while(p < X.Sz()) {
 		x = X.U32(4,_BE); p += 4; if(!reslibs && x) load = false; if(x) reslibs++; else break; p += 4*x
@@ -33,16 +35,18 @@ function parseAmigaHunks() {
 
 /**
  * If it's an Atari DOS block file, parses it and tries to be strict in case of garbage past EoF.
+ * @param {Int} baseofs - base offset from which to start parsing
  * @returns {Array} [nTotalSize,aBlockInfo] where:
- *  - nTotalSize: -1 if the file is not an Atari DOS "binary save", otherwise the total expected size;
+ *  - nTotalSize: -1 if the file is not an Atari DOS "binary save", otherwise the total expected size (including baseofs);
  *  - aBlockInfo: an Array of arrays with each block's offsets and sizes, its length reflecting the number of blocks
 */
-function parseAtariBinary() {
-	if(!X.c("FFFF") || X.Sz() < 6) return [-1, []];
+function parseAtariBinary(baseofs) {
+	if(typeof baseofs === "undefined") baseofs = 0;
+	if(!X.c("FFFF",baseofs) || X.Sz() < baseofs+6) return [-1, []];
 	var hksz = 0,
 		RAM = [],
 		hkinfo = [],
-		p = 2;
+		p = 2+baseofs;
 	while(p+4 <= X.Sz() && p < 65520) {
 		var ptr = X.U16(p);
 		if(!hkinfo.length && ptr == 0xFFFF) { p += 2; ptr = X.U16(p) } // the subsequent blocks don't have to have a sig

db/read

@@ -101,6 +101,15 @@ const CPRISCOS = "⌂"+
 	" ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿"+
 	"ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"+
 	"àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
+const CPATASCII = ['▶',
+	'🖤','├','▊','┘','┤','┐','╱','╲','◤','▛','◥','▙','▟','▆','￣',
+	'▜','♣','┌','─','┼','◘','▀','▐','┬','┴','▐','└','\n','↑','↓','←','→',
+	'█','！','”','＃','＄','％','＆','’','（','）','＊','＋','，','ー','．',
+	'/','𝟶','𝟷','𝟸','𝟹','𝟺','𝟻','𝟼','𝟽','𝟾','𝟿','：','；','＜','＝','＞','？',
+	'＠','𝙰','𝙱','𝙲','𝙳','𝙴','𝙵','𝙶','𝙷','𝙸','𝙹','𝙺','𝙻','𝙼','𝙽','𝙾',
+	'𝙿','𝚀','𝚁','𝚂','𝚃','𝚄','𝚅','𝚆','𝚇','𝚈','𝚉','【','\\','】','＾','＿',
+	'♦','𝚊','𝚋','𝚌','𝚍','𝚎','𝚏','𝚐','𝚑','𝚒','𝚓','𝚔','𝚕','𝚖','𝚗','𝚘',
+	'𝚙','𝚚','𝚛','𝚜','𝚝','𝚞','𝚟','𝚠','𝚡','𝚢','𝚣','♠','-','↰','◁','▷']; //arrow up then NW (🢰) not included for UTF limitations
 const CPAtariST = "⌂"+
 	"ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥ßƒ"+
 	"áíóúñѪº¿⌐¬½¼¡«»ãõØøœŒÀÃÕ¨´†¶©®™"+
@@ -115,11 +124,14 @@ const CPSpeccy = ['©', //too SPECIAL with all the tokens-for-characters, gotta
 	'𝙵𝙾𝚁𝙼𝙰𝚃 ','𝙼𝙾𝚅𝙴 ','𝙴𝚁𝙰𝚂𝙴 ','𝙾𝙿𝙴𝙽 # ','𝙲𝙻𝙾𝚂𝙴 # ','𝙼𝙴𝚁𝙶𝙴 ','𝚅𝙴𝚁𝙸𝙵𝚈 ', '𝙱𝙴𝙴𝙿 ','𝙲𝙸𝚁𝙲𝙻𝙴 ','𝙸𝙽𝙺 ','𝙿𝙰𝙿𝙴𝚁 ','𝙵𝙻𝙰𝚂𝙷 ','𝙱𝚁𝙸𝙶𝙷𝚃 ','𝙸𝙽𝚅𝙴𝚁𝚂𝙴 ','𝙾𝚅𝙴𝚁 ','𝙾𝚄𝚃 ', //D0~F
 	'𝙻𝙿𝚁𝙸𝙽𝚃 ','𝙻𝙻𝙸𝚂𝚃 ','𝚂𝚃𝙾𝙿 ','𝚁𝙴𝙰𝙳 ','𝙳𝙰𝚃𝙰 ','𝚁𝙴𝚂𝚃𝙾𝚁𝙴 ','𝙽𝙴𝚆 ', '𝙱𝙾𝚁𝙳𝙴𝚁 ','𝙲𝙾𝙽𝚃𝙸𝙽𝚄𝙴 ','𝙳𝙸𝙼 ','𝚁𝙴𝙼 ','𝙵𝙾𝚁 ','𝙶𝙾 𝚃𝙾 ','𝙶𝙾 𝚂𝚄𝙱 ','𝙸𝙽𝙿𝚄𝚃 ','𝙻𝙾𝙰𝙳 ', //E0~F
 	'𝙻𝙸𝚂𝚃 ','𝙻𝙴𝚃 ','𝙿𝙰𝚄𝚂𝙴 ','𝙽𝙴𝚇𝚃 ','𝙿𝙾𝙺𝙴 ','𝙿𝚁𝙸𝙽𝚃 ','𝙿𝙻𝙾𝚃 ', '𝚁𝚄𝙽 ','𝚂𝙰𝚅𝙴 ','𝚁𝙰𝙽𝙳𝙾𝙼𝙸𝚉𝙴 ','𝙸𝙵 ','𝙲𝙻𝚂','𝙳𝚁𝙰𝚆 ','𝙲𝙻𝙴𝙰𝚁 ','𝚁𝙴𝚃𝚄𝚁𝙽', '𝙲𝙾𝙿𝚈']; //F0~F
-const Chars0to1F = "・☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼"; //#0 is a small dot from Japanese
-const Chars0to1FLF = "・☺☻♥♦♣♠•◘○\x0A♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼";
-const Chars0to1FCRLF = "・☺☻♥♦♣♠•◘○\x0A♂♀\x0D♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼";
+const Chars0to1F = "・☺☻♥♦♣♠•◘○◙♂♀♪♫☼▶◀↕‼¶§▬↨↑↓→←∟↔▲▼"; //#0 is a small dot from Japanese
+const Chars0to1FLF = "・☺☻♥♦♣♠•◘○\x0A♂♀♪♫☼▶◀↕‼¶§▬↨↑↓→←∟↔▲▼";
+const Chars0to1FCRLF = "・☺☻♥♦♣♠•◘○\x0A♂♀\x0D♫☼▶◀↕‼¶§▬↨↑↓→←∟↔▲▼";
 const Chars0to1FSpeccy = "\0\1\2\3\4\5，📝⬅➡⬇⬆⌫\x0A№\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"; //not mixing...
-
+const Chars0to1FATASCII = "♥├◨┘┤┐／╲◢▗◣▝▘￣▂▖♣┌─┼•▄▎┬┴▌└␛↑↓←→";
+const Chars0to1FATASCII2 = "áùÑÉçôòì£ïüäöúóöÜâûîéèñêȧàȦ␛↑↓←→";
+const Chars0to1FATASCII_PL = "ŹąźćŚėöÖ£üߣłŃÓ√ĘśäÜĆĄŻÄż␛↑↓←→";
+const Chars0to1FAtariX = "áùÑÉçôòì£ïüäÖúóöÜâûîéèñêȧàȦË↑↓←→"
 
 // a replacement for the duration of the regression in File.readBytes:
 function readU8Array(offset,length,ztospace) {
@@ -149,16 +161,21 @@ function decEncoding(ansi, dectbl, zstop, tbl01F) {
 		else if(ansi[i] < 0x80)
 			switch(ansi[i]) { // 7-bit variation processing
 			case 0x0E: if(dectbl == JISX0201 || dectbl == KOI8R) bit8 = 0x80;
-				else s += tbl01F[0xE]; break;
+				else s += tbl01F[0xE];  break;
 			case 0x0F: if(dectbl == JISX0201 || dectbl == KOI8R) bit8 = 0;
-				else s += tbl01F[0xF]; break;
-			case 0x5C: if(dectbl == JISX0201) s += "¥"; else s += "\\"; break;
-			case 0x5E: if(dectbl == CPSpeccy) s += '↑'; else s += '^'; break;
-			case 0x60: if(dectbl == CPSpeccy) s += '£'; else s += '`'; break;
-			case 0x7E: if(dectbl == JISX0201) s += "‾"; else s += "~"; break;
+				else s += tbl01F[0xF];  break;
+			case 0x5C: if(dectbl == JISX0201) s += '¥'; else s += '\\';  break;
+			case 0x5E: if(dectbl == CPSpeccy) s += '↑'; else s += '^';  break;
+			case 0x60: if(dectbl == CPSpeccy) s += '£'; else s += '`';  break;
+			case 0x7B: if(dectbl == CPATASCII)
+				if(tbl01F == Chars0to1FATASCII2) s += 'Ä';
+				else if(tbl01F == Chars0to1FATASCII_PL) s += ' '; //the Poles didn't need the spades without the other 3 :D
+					else s += '♠';
+				else s += '{'; break;
+			case 0x7D: if(dectbl == CPATASCII) s += '↖'; else s += '}'; break; //arrow up then NW (🢰) not included for UTF limitations
+			case 0x7E: if(dectbl == JISX0201) s += '‾'; else if(dectbl == CPATASCII) s += '◀'; else s += '~';  break;
 			case 0x7F:
-				if(dectbl != JISX0201) s += dectbl[0];
-				else s += String.fromCharCode(bit8+ansi[i]); break;
+				if(dectbl != JISX0201) s += dectbl[0]; else s += String.fromCharCode(bit8+ansi[i]);  break;
 			default:
 				if(!bit8 && ansi[i] >= 0 && ansi[i] < 0x20) s += tbl01F[ansi[i]];
 				else s += String.fromCharCode(bit8+ansi[i]);