Tag version 0.5.3-alpha

Fix incorrect C8 and C14 bits on t42 exporing
Update copyright notices to 2022
2022-01-05 21:45:17 +00:00 · 2022-01-05 20:57:26 +00:00 · 2021-12-31 21:40:36 +00:00 · 2021-12-28 12:33:58 +00:00 · 2021-12-28 12:22:29 +00:00 · 2021-12-14 22:06:18 +00:00
37 changed files with 1069 additions and 262 deletions
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ Features
 - Load and save teletext pages in .tti format.
 - Rendering of teletext pages in Levels 1, 1.5, 2.5 and 3.5
 - Rendering of Local Objects and side panels.
+- Import and export of single pages in .t42 format.
 - Export PNG images of teletext pages.
 - Undo and redo of editing actions.
 - Interactive X/26 Local Enhancement Data triplet editor.
@@ -30,7 +31,7 @@ The following X/26 enhancement triplets are not rendered by the editor, although
 - Level 3.5 font style: bold, italic and proportional spacing.

 ## Using the X/26 triplet editor
-The X/26 triplet editor sorts all the triplet modes available into categories selected by the triplet *type* dropdown on the left. The categories are:
+The X/26 triplet editor sorts all the triplet modes available into categories, which are:
 - Set Active Position
 - Row triplet - full screen and full row colours, address row 0 and DRCS mode
 - Column triplet - non-spacing attributes and overwriting characters
@@ -38,9 +39,9 @@ The X/26 triplet editor sorts all the triplet modes available into categories se
 - Terminator
 - PDC/reserved

-Selecting "Set Active Position" or "Terminator" will change the triplet mode immediately, other selections will activate the triplet *mode* dropdown on the right which can be used to then change the triplet mode. Most triplet modes will present varying widgets below which can be used to alter the parameters of the currently selected triplet (e.g. colour or character).
+After selecting the triplet mode the Row and Column spinboxes can then be used to place the Active Position of the selected triplet, whether or not each spinbox can be altered depends on the mode of the selected triplet. As well as the explicit "Set Active Position" triplet that can set both the row and the column, all column triplets can simultaneously set the column of the Active Position. Additionally the Full Row Colour triplet can set the row of the Active Position, with the column always set to 0.

-Between the two dropdowns are the Row and Column spinboxes that are used to place the Active Position of the selected triplet, whether or not each spinbox can be altered depends on the mode of the selected triplet. As well as the explicit "Set Active Position" triplet that can set both the row and the column, all column triplets can simultaneously set the column of the Active Position. Additionally the Full Row Colour triplet can set the row of the Active Position, with the column always set to 0.
+Most triplet modes will present varying widgets below which can be used to alter the parameters of the currently selected triplet e.g. colour or character.

 By checking "raw values" it is also possible to view and edit the raw Address, Mode and Data numbers of the triplets. When editing triplets this way, remember that address values 0-39 select a column triplet which has one set of modes and address values 40-63 select a row triplet which has a different set of modes.

@@ -54,6 +55,4 @@ The Active Position, whether set explicitly by a "Set Active Position" triplet o
 If this rule is not followed then triplets in earlier screen addresses will be ignored. Triplets that break this rule will be highlighted red in the X/26 triplet editor.

 ### Objects
-Insert and deleting triplets from the list will upset the Object pointers on "Invoke" triplets and will need to be corrected afterwards. A future version of the editor may adjust these pointers automatically.
-
 "Invoke ... Object" triplets must point to a "Define ... Object" of the same type e.g. "Invoke *Active* Object" must point to a "Define *Active* Object", otherwise the Object won't appear.
--- a/document.cpp
+++ b/document.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -182,17 +182,12 @@ void TeletextDocument::unDeleteSubPageFromRecycle(int subPage)
 	m_recycleSubPages.pop_back();
 }

-void TeletextDocument::setPageNumber(QString pageNumberString)
+void TeletextDocument::setPageNumber(int pageNumber)
 {
-	bool pageNumberOk;
-	int pageNumberRead = pageNumberString.toInt(&pageNumberOk, 16);
-	if ((!pageNumberOk) || pageNumberRead < 0x100 || pageNumberRead > 0x8ff)
-		return;
-
 	// If the magazine number was changed, we need to update the relative magazine numbers in FastText
 	// and page enhancement links
 	int oldMagazine = (m_pageNumber & 0xf00);
-	int newMagazine = (pageNumberRead & 0xf00);
+	int newMagazine = (pageNumber & 0xf00);
 	// Fix magazine 0 to 8
 	if (oldMagazine == 0x800)
 		oldMagazine = 0x000;
@@ -200,7 +195,7 @@ void TeletextDocument::setPageNumber(QString pageNumberString)
 		newMagazine = 0x000;
 	int magazineFlip = oldMagazine ^ newMagazine;

-	m_pageNumber = pageNumberRead;
+	m_pageNumber = pageNumber;

 	for (auto &subPage : m_subPages)
 		if (magazineFlip) {
@@ -211,6 +206,17 @@ void TeletextDocument::setPageNumber(QString pageNumberString)
 	}
 }

+void TeletextDocument::setPageNumberFromString(QString pageNumberString)
+{
+	bool pageNumberOk;
+	int pageNumberRead = pageNumberString.toInt(&pageNumberOk, 16);
+
+	if ((!pageNumberOk) || pageNumberRead < 0x100 || pageNumberRead > 0x8ff)
+		return;
+
+	setPageNumber(pageNumberRead);
+}
+
 void TeletextDocument::setDescription(QString newDescription)
 {
 	m_description = newDescription;
--- a/document.h
+++ b/document.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -74,7 +74,8 @@ public:
 	void deleteSubPageToRecycle(int);
 	void unDeleteSubPageFromRecycle(int);
 	int pageNumber() const { return m_pageNumber; }
-	void setPageNumber(QString);
+	void setPageNumber(int);
+	void setPageNumberFromString(QString);
 	QString description() const { return m_description; }
 	void setDescription(QString);
 	void setFastTextLinkPageNumberOnAllSubPages(int, int);
--- a/hamming.h
+++ b/hamming.h
@@ -0,0 +1,262 @@
+#ifndef HAMMING_H
+#define HAMMING_H
+
+// Hamming 8/4 encoding table
+// encoded_value = hamming_8_4_encode[value_to_encode]
+const unsigned char hamming_8_4_encode[16] = {
+	0x15, 0x02, 0x49, 0x5e, 0x64, 0x73, 0x38, 0x2f,
+	0xd0, 0xc7, 0x8c, 0x9b, 0xa1, 0xb6, 0xfd, 0xea
+};
+
+// Hamming 8/4 decoding table
+// decoded_value = hamming_8_4_decode[encoded_value]
+// 0xff - double bit error that can't be corrected
+const unsigned char hamming_8_4_decode[256] = {
+	0x01, 0xff, 0x01, 0x01, 0xff, 0x00, 0x01, 0xff,
+	0xff, 0x02, 0x01, 0xff, 0x0a, 0xff, 0xff, 0x07,
+	0xff, 0x00, 0x01, 0xff, 0x00, 0x00, 0xff, 0x00,
+	0x06, 0xff, 0xff, 0x0b, 0xff, 0x00, 0x03, 0xff,
+	0xff, 0x0c, 0x01, 0xff, 0x04, 0xff, 0xff, 0x07,
+	0x06, 0xff, 0xff, 0x07, 0xff, 0x07, 0x07, 0x07,
+	0x06, 0xff, 0xff, 0x05, 0xff, 0x00, 0x0d, 0xff,
+	0x06, 0x06, 0x06, 0xff, 0x06, 0xff, 0xff, 0x07,
+	0xff, 0x02, 0x01, 0xff, 0x04, 0xff, 0xff, 0x09,
+	0x02, 0x02, 0xff, 0x02, 0xff, 0x02, 0x03, 0xff,
+	0x08, 0xff, 0xff, 0x05, 0xff, 0x00, 0x03, 0xff,
+	0xff, 0x02, 0x03, 0xff, 0x03, 0xff, 0x03, 0x03,
+	0x04, 0xff, 0xff, 0x05, 0x04, 0x04, 0x04, 0xff,
+	0xff, 0x02, 0x0f, 0xff, 0x04, 0xff, 0xff, 0x07,
+	0xff, 0x05, 0x05, 0x05, 0x04, 0xff, 0xff, 0x05,
+	0x06, 0xff, 0xff, 0x05, 0xff, 0x0e, 0x03, 0xff,
+	0xff, 0x0c, 0x01, 0xff, 0x0a, 0xff, 0xff, 0x09,
+	0x0a, 0xff, 0xff, 0x0b, 0x0a, 0x0a, 0x0a, 0xff,
+	0x08, 0xff, 0xff, 0x0b, 0xff, 0x00, 0x0d, 0xff,
+	0xff, 0x0b, 0x0b, 0x0b, 0x0a, 0xff, 0xff, 0x0b,
+	0x0c, 0x0c, 0xff, 0x0c, 0xff, 0x0c, 0x0d, 0xff,
+	0xff, 0x0c, 0x0f, 0xff, 0x0a, 0xff, 0xff, 0x07,
+	0xff, 0x0c, 0x0d, 0xff, 0x0d, 0xff, 0x0d, 0x0d,
+	0x06, 0xff, 0xff, 0x0b, 0xff, 0x0e, 0x0d, 0xff,
+	0x08, 0xff, 0xff, 0x09, 0xff, 0x09, 0x09, 0x09,
+	0xff, 0x02, 0x0f, 0xff, 0x0a, 0xff, 0xff, 0x09,
+	0x08, 0x08, 0x08, 0xff, 0x08, 0xff, 0xff, 0x09,
+	0x08, 0xff, 0xff, 0x0b, 0xff, 0x0e, 0x03, 0xff,
+	0xff, 0x0c, 0x0f, 0xff, 0x04, 0xff, 0xff, 0x09,
+	0x0f, 0xff, 0x0f, 0x0f, 0xff, 0x0e, 0x0f, 0xff,
+	0x08, 0xff, 0xff, 0x05, 0xff, 0x0e, 0x0d, 0xff,
+	0xff, 0x0e, 0x0f, 0xff, 0x0e, 0x0e, 0xff, 0x0e
+};
+
+const unsigned char hamming_24_18_forward[2][256] = {
+	{
+		0x8b, 0x8c, 0x92, 0x95, 0xa1, 0xa6, 0xb8, 0xbf,
+		0xc0, 0xc7, 0xd9, 0xde, 0xea, 0xed, 0xf3, 0xf4,
+		0x0a, 0x0d, 0x13, 0x14, 0x20, 0x27, 0x39, 0x3e,
+		0x41, 0x46, 0x58, 0x5f, 0x6b, 0x6c, 0x72, 0x75,
+		0x09, 0x0e, 0x10, 0x17, 0x23, 0x24, 0x3a, 0x3d,
+		0x42, 0x45, 0x5b, 0x5c, 0x68, 0x6f, 0x71, 0x76,
+		0x88, 0x8f, 0x91, 0x96, 0xa2, 0xa5, 0xbb, 0xbc,
+		0xc3, 0xc4, 0xda, 0xdd, 0xe9, 0xee, 0xf0, 0xf7,
+		0x08, 0x0f, 0x11, 0x16, 0x22, 0x25, 0x3b, 0x3c,
+		0x43, 0x44, 0x5a, 0x5d, 0x69, 0x6e, 0x70, 0x77,
+		0x89, 0x8e, 0x90, 0x97, 0xa3, 0xa4, 0xba, 0xbd,
+		0xc2, 0xc5, 0xdb, 0xdc, 0xe8, 0xef, 0xf1, 0xf6,
+		0x8a, 0x8d, 0x93, 0x94, 0xa0, 0xa7, 0xb9, 0xbe,
+		0xc1, 0xc6, 0xd8, 0xdf, 0xeb, 0xec, 0xf2, 0xf5,
+		0x0b, 0x0c, 0x12, 0x15, 0x21, 0x26, 0x38, 0x3f,
+		0x40, 0x47, 0x59, 0x5e, 0x6a, 0x6d, 0x73, 0x74,
+		0x03, 0x04, 0x1a, 0x1d, 0x29, 0x2e, 0x30, 0x37,
+		0x48, 0x4f, 0x51, 0x56, 0x62, 0x65, 0x7b, 0x7c,
+		0x82, 0x85, 0x9b, 0x9c, 0xa8, 0xaf, 0xb1, 0xb6,
+		0xc9, 0xce, 0xd0, 0xd7, 0xe3, 0xe4, 0xfa, 0xfd,
+		0x81, 0x86, 0x98, 0x9f, 0xab, 0xac, 0xb2, 0xb5,
+		0xca, 0xcd, 0xd3, 0xd4, 0xe0, 0xe7, 0xf9, 0xfe,
+		0x00, 0x07, 0x19, 0x1e, 0x2a, 0x2d, 0x33, 0x34,
+		0x4b, 0x4c, 0x52, 0x55, 0x61, 0x66, 0x78, 0x7f,
+		0x80, 0x87, 0x99, 0x9e, 0xaa, 0xad, 0xb3, 0xb4,
+		0xcb, 0xcc, 0xd2, 0xd5, 0xe1, 0xe6, 0xf8, 0xff,
+		0x01, 0x06, 0x18, 0x1f, 0x2b, 0x2c, 0x32, 0x35,
+		0x4a, 0x4d, 0x53, 0x54, 0x60, 0x67, 0x79, 0x7e,
+		0x02, 0x05, 0x1b, 0x1c, 0x28, 0x2f, 0x31, 0x36,
+		0x49, 0x4e, 0x50, 0x57, 0x63, 0x64, 0x7a, 0x7d,
+		0x83, 0x84, 0x9a, 0x9d, 0xa9, 0xae, 0xb0, 0xb7,
+		0xc8, 0xcf, 0xd1, 0xd6, 0xe2, 0xe5, 0xfb, 0xfc
+	},
+	{
+		0x00, 0x89, 0x8a, 0x03, 0x8b, 0x02, 0x01, 0x88,
+		0x01, 0x88, 0x8b, 0x02, 0x8a, 0x03, 0x00, 0x89,
+		0x02, 0x8b, 0x88, 0x01, 0x89, 0x00, 0x03, 0x8a,
+		0x03, 0x8a, 0x89, 0x00, 0x88, 0x01, 0x02, 0x8b,
+		0x03, 0x8a, 0x89, 0x00, 0x88, 0x01, 0x02, 0x8b,
+		0x02, 0x8b, 0x88, 0x01, 0x89, 0x00, 0x03, 0x8a,
+		0x01, 0x88, 0x8b, 0x02, 0x8a, 0x03, 0x00, 0x89,
+		0x00, 0x89, 0x8a, 0x03, 0x8b, 0x02, 0x01, 0x88,
+		0x08, 0x81, 0x82, 0x0b, 0x83, 0x0a, 0x09, 0x80,
+		0x09, 0x80, 0x83, 0x0a, 0x82, 0x0b, 0x08, 0x81,
+		0x0a, 0x83, 0x80, 0x09, 0x81, 0x08, 0x0b, 0x82,
+		0x0b, 0x82, 0x81, 0x08, 0x80, 0x09, 0x0a, 0x83,
+		0x0b, 0x82, 0x81, 0x08, 0x80, 0x09, 0x0a, 0x83,
+		0x0a, 0x83, 0x80, 0x09, 0x81, 0x08, 0x0b, 0x82,
+		0x09, 0x80, 0x83, 0x0a, 0x82, 0x0b, 0x08, 0x81,
+		0x08, 0x81, 0x82, 0x0b, 0x83, 0x0a, 0x09, 0x80,
+		0x09, 0x80, 0x83, 0x0a, 0x82, 0x0b, 0x08, 0x81,
+		0x08, 0x81, 0x82, 0x0b, 0x83, 0x0a, 0x09, 0x80,
+		0x0b, 0x82, 0x81, 0x08, 0x80, 0x09, 0x0a, 0x83,
+		0x0a, 0x83, 0x80, 0x09, 0x81, 0x08, 0x0b, 0x82,
+		0x0a, 0x83, 0x80, 0x09, 0x81, 0x08, 0x0b, 0x82,
+		0x0b, 0x82, 0x81, 0x08, 0x80, 0x09, 0x0a, 0x83,
+		0x08, 0x81, 0x82, 0x0b, 0x83, 0x0a, 0x09, 0x80,
+		0x09, 0x80, 0x83, 0x0a, 0x82, 0x0b, 0x08, 0x81,
+		0x01, 0x88, 0x8b, 0x02, 0x8a, 0x03, 0x00, 0x89,
+		0x00, 0x89, 0x8a, 0x03, 0x8b, 0x02, 0x01, 0x88,
+		0x03, 0x8a, 0x89, 0x00, 0x88, 0x01, 0x02, 0x8b,
+		0x02, 0x8b, 0x88, 0x01, 0x89, 0x00, 0x03, 0x8a,
+		0x02, 0x8b, 0x88, 0x01, 0x89, 0x00, 0x03, 0x8a,
+		0x03, 0x8a, 0x89, 0x00, 0x88, 0x01, 0x02, 0x8b,
+		0x00, 0x89, 0x8a, 0x03, 0x8b, 0x02, 0x01, 0x88,
+		0x01, 0x88, 0x8b, 0x02, 0x8a, 0x03, 0x00, 0x89
+	}
+};
+
+const unsigned char hamming_24_18_forward_2[4] = {
+	0x00, 0x0a, 0x0b, 0x01
+};
+
+
+const unsigned char hamming_24_18_parities[3][256] = {
+	{ // Parities of first byte
+		0x00, 0x21, 0x22, 0x03, 0x23, 0x02, 0x01, 0x20, 
+		0x24, 0x05, 0x06, 0x27, 0x07, 0x26, 0x25, 0x04, 
+		0x25, 0x04, 0x07, 0x26, 0x06, 0x27, 0x24, 0x05, 
+		0x01, 0x20, 0x23, 0x02, 0x22, 0x03, 0x00, 0x21, 
+		0x26, 0x07, 0x04, 0x25, 0x05, 0x24, 0x27, 0x06, 
+		0x02, 0x23, 0x20, 0x01, 0x21, 0x00, 0x03, 0x22, 
+		0x03, 0x22, 0x21, 0x00, 0x20, 0x01, 0x02, 0x23, 
+		0x27, 0x06, 0x05, 0x24, 0x04, 0x25, 0x26, 0x07, 
+		0x27, 0x06, 0x05, 0x24, 0x04, 0x25, 0x26, 0x07, 
+		0x03, 0x22, 0x21, 0x00, 0x20, 0x01, 0x02, 0x23, 
+		0x02, 0x23, 0x20, 0x01, 0x21, 0x00, 0x03, 0x22, 
+		0x26, 0x07, 0x04, 0x25, 0x05, 0x24, 0x27, 0x06, 
+		0x01, 0x20, 0x23, 0x02, 0x22, 0x03, 0x00, 0x21, 
+		0x25, 0x04, 0x07, 0x26, 0x06, 0x27, 0x24, 0x05, 
+		0x24, 0x05, 0x06, 0x27, 0x07, 0x26, 0x25, 0x04, 
+		0x00, 0x21, 0x22, 0x03, 0x23, 0x02, 0x01, 0x20, 
+		0x28, 0x09, 0x0a, 0x2b, 0x0b, 0x2a, 0x29, 0x08, 
+		0x0c, 0x2d, 0x2e, 0x0f, 0x2f, 0x0e, 0x0d, 0x2c, 
+		0x0d, 0x2c, 0x2f, 0x0e, 0x2e, 0x0f, 0x0c, 0x2d, 
+		0x29, 0x08, 0x0b, 0x2a, 0x0a, 0x2b, 0x28, 0x09, 
+		0x0e, 0x2f, 0x2c, 0x0d, 0x2d, 0x0c, 0x0f, 0x2e, 
+		0x2a, 0x0b, 0x08, 0x29, 0x09, 0x28, 0x2b, 0x0a, 
+		0x2b, 0x0a, 0x09, 0x28, 0x08, 0x29, 0x2a, 0x0b, 
+		0x0f, 0x2e, 0x2d, 0x0c, 0x2c, 0x0d, 0x0e, 0x2f, 
+		0x0f, 0x2e, 0x2d, 0x0c, 0x2c, 0x0d, 0x0e, 0x2f, 
+		0x2b, 0x0a, 0x09, 0x28, 0x08, 0x29, 0x2a, 0x0b, 
+		0x2a, 0x0b, 0x08, 0x29, 0x09, 0x28, 0x2b, 0x0a, 
+		0x0e, 0x2f, 0x2c, 0x0d, 0x2d, 0x0c, 0x0f, 0x2e, 
+		0x29, 0x08, 0x0b, 0x2a, 0x0a, 0x2b, 0x28, 0x09, 
+		0x0d, 0x2c, 0x2f, 0x0e, 0x2e, 0x0f, 0x0c, 0x2d, 
+		0x0c, 0x2d, 0x2e, 0x0f, 0x2f, 0x0e, 0x0d, 0x2c, 
+		0x28, 0x09, 0x0a, 0x2b, 0x0b, 0x2a, 0x29, 0x08
+	},
+	{ // Parities of second byte
+		0x00, 0x29, 0x2a, 0x03, 0x2b, 0x02, 0x01, 0x28, 
+		0x2c, 0x05, 0x06, 0x2f, 0x07, 0x2e, 0x2d, 0x04, 
+		0x2d, 0x04, 0x07, 0x2e, 0x06, 0x2f, 0x2c, 0x05, 
+		0x01, 0x28, 0x2b, 0x02, 0x2a, 0x03, 0x00, 0x29, 
+		0x2e, 0x07, 0x04, 0x2d, 0x05, 0x2c, 0x2f, 0x06, 
+		0x02, 0x2b, 0x28, 0x01, 0x29, 0x00, 0x03, 0x2a, 
+		0x03, 0x2a, 0x29, 0x00, 0x28, 0x01, 0x02, 0x2b, 
+		0x2f, 0x06, 0x05, 0x2c, 0x04, 0x2d, 0x2e, 0x07, 
+		0x2f, 0x06, 0x05, 0x2c, 0x04, 0x2d, 0x2e, 0x07, 
+		0x03, 0x2a, 0x29, 0x00, 0x28, 0x01, 0x02, 0x2b, 
+		0x02, 0x2b, 0x28, 0x01, 0x29, 0x00, 0x03, 0x2a, 
+		0x2e, 0x07, 0x04, 0x2d, 0x05, 0x2c, 0x2f, 0x06, 
+		0x01, 0x28, 0x2b, 0x02, 0x2a, 0x03, 0x00, 0x29, 
+		0x2d, 0x04, 0x07, 0x2e, 0x06, 0x2f, 0x2c, 0x05, 
+		0x2c, 0x05, 0x06, 0x2f, 0x07, 0x2e, 0x2d, 0x04, 
+		0x00, 0x29, 0x2a, 0x03, 0x2b, 0x02, 0x01, 0x28, 
+		0x30, 0x19, 0x1a, 0x33, 0x1b, 0x32, 0x31, 0x18, 
+		0x1c, 0x35, 0x36, 0x1f, 0x37, 0x1e, 0x1d, 0x34, 
+		0x1d, 0x34, 0x37, 0x1e, 0x36, 0x1f, 0x1c, 0x35, 
+		0x31, 0x18, 0x1b, 0x32, 0x1a, 0x33, 0x30, 0x19, 
+		0x1e, 0x37, 0x34, 0x1d, 0x35, 0x1c, 0x1f, 0x36, 
+		0x32, 0x1b, 0x18, 0x31, 0x19, 0x30, 0x33, 0x1a, 
+		0x33, 0x1a, 0x19, 0x30, 0x18, 0x31, 0x32, 0x1b, 
+		0x1f, 0x36, 0x35, 0x1c, 0x34, 0x1d, 0x1e, 0x37, 
+		0x1f, 0x36, 0x35, 0x1c, 0x34, 0x1d, 0x1e, 0x37, 
+		0x33, 0x1a, 0x19, 0x30, 0x18, 0x31, 0x32, 0x1b, 
+		0x32, 0x1b, 0x18, 0x31, 0x19, 0x30, 0x33, 0x1a, 
+		0x1e, 0x37, 0x34, 0x1d, 0x35, 0x1c, 0x1f, 0x36, 
+		0x31, 0x18, 0x1b, 0x32, 0x1a, 0x33, 0x30, 0x19, 
+		0x1d, 0x34, 0x37, 0x1e, 0x36, 0x1f, 0x1c, 0x35, 
+		0x1c, 0x35, 0x36, 0x1f, 0x37, 0x1e, 0x1d, 0x34, 
+		0x30, 0x19, 0x1a, 0x33, 0x1b, 0x32, 0x31, 0x18
+	},
+	{ // Parities of third byte
+		0x3f, 0x0e, 0x0d, 0x3c, 0x0c, 0x3d, 0x3e, 0x0f, 
+		0x0b, 0x3a, 0x39, 0x08, 0x38, 0x09, 0x0a, 0x3b, 
+		0x0a, 0x3b, 0x38, 0x09, 0x39, 0x08, 0x0b, 0x3a, 
+		0x3e, 0x0f, 0x0c, 0x3d, 0x0d, 0x3c, 0x3f, 0x0e, 
+		0x09, 0x38, 0x3b, 0x0a, 0x3a, 0x0b, 0x08, 0x39, 
+		0x3d, 0x0c, 0x0f, 0x3e, 0x0e, 0x3f, 0x3c, 0x0d, 
+		0x3c, 0x0d, 0x0e, 0x3f, 0x0f, 0x3e, 0x3d, 0x0c, 
+		0x08, 0x39, 0x3a, 0x0b, 0x3b, 0x0a, 0x09, 0x38, 
+		0x08, 0x39, 0x3a, 0x0b, 0x3b, 0x0a, 0x09, 0x38, 
+		0x3c, 0x0d, 0x0e, 0x3f, 0x0f, 0x3e, 0x3d, 0x0c, 
+		0x3d, 0x0c, 0x0f, 0x3e, 0x0e, 0x3f, 0x3c, 0x0d, 
+		0x09, 0x38, 0x3b, 0x0a, 0x3a, 0x0b, 0x08, 0x39, 
+		0x3e, 0x0f, 0x0c, 0x3d, 0x0d, 0x3c, 0x3f, 0x0e, 
+		0x0a, 0x3b, 0x38, 0x09, 0x39, 0x08, 0x0b, 0x3a, 
+		0x0b, 0x3a, 0x39, 0x08, 0x38, 0x09, 0x0a, 0x3b, 
+		0x3f, 0x0e, 0x0d, 0x3c, 0x0c, 0x3d, 0x3e, 0x0f, 
+		0x1f, 0x2e, 0x2d, 0x1c, 0x2c, 0x1d, 0x1e, 0x2f, 
+		0x2b, 0x1a, 0x19, 0x28, 0x18, 0x29, 0x2a, 0x1b, 
+		0x2a, 0x1b, 0x18, 0x29, 0x19, 0x28, 0x2b, 0x1a, 
+		0x1e, 0x2f, 0x2c, 0x1d, 0x2d, 0x1c, 0x1f, 0x2e, 
+		0x29, 0x18, 0x1b, 0x2a, 0x1a, 0x2b, 0x28, 0x19, 
+		0x1d, 0x2c, 0x2f, 0x1e, 0x2e, 0x1f, 0x1c, 0x2d, 
+		0x1c, 0x2d, 0x2e, 0x1f, 0x2f, 0x1e, 0x1d, 0x2c, 
+		0x28, 0x19, 0x1a, 0x2b, 0x1b, 0x2a, 0x29, 0x18, 
+		0x28, 0x19, 0x1a, 0x2b, 0x1b, 0x2a, 0x29, 0x18, 
+		0x1c, 0x2d, 0x2e, 0x1f, 0x2f, 0x1e, 0x1d, 0x2c, 
+		0x1d, 0x2c, 0x2f, 0x1e, 0x2e, 0x1f, 0x1c, 0x2d, 
+		0x29, 0x18, 0x1b, 0x2a, 0x1a, 0x2b, 0x28, 0x19, 
+		0x1e, 0x2f, 0x2c, 0x1d, 0x2d, 0x1c, 0x1f, 0x2e, 
+		0x2a, 0x1b, 0x18, 0x29, 0x19, 0x28, 0x2b, 0x1a, 
+		0x2b, 0x1a, 0x19, 0x28, 0x18, 0x29, 0x2a, 0x1b, 
+		0x1f, 0x2e, 0x2d, 0x1c, 0x2c, 0x1d, 0x1e, 0x2f
+	}
+};
+
+static const unsigned char hamming_24_18_decode_d1_d4[64] = {
+	0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 
+	0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 
+	0x08, 0x09, 0x08, 0x09, 0x0a, 0x0b, 0x0a, 0x0b, 
+	0x0c, 0x0d, 0x0c, 0x0d, 0x0e, 0x0f, 0x0e, 0x0f, 
+	0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 
+	0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 
+	0x08, 0x09, 0x08, 0x09, 0x0a, 0x0b, 0x0a, 0x0b, 
+	0x0c, 0x0d, 0x0c, 0x0d, 0x0e, 0x0f, 0x0e, 0x0f
+};
+
+// Mapping from parity checks in hamming_24_18_parities to incorrect bit
+// 0x80000000 - double bit error that can't be corrected
+static const unsigned int hamming_24_18_decode_correct[64] = {
+	0x00000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x00000000, 0x00000000, 0x00000000, 0x00000001, 
+	0x00000000, 0x00000002, 0x00000004, 0x00000008, 
+	0x00000000, 0x00000010, 0x00000020, 0x00000040, 
+	0x00000080, 0x00000100, 0x00000200, 0x00000400, 
+	0x00000000, 0x00000800, 0x00001000, 0x00002000, 
+	0x00004000, 0x00008000, 0x00010000, 0x00020000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000, 
+	0x80000000, 0x80000000, 0x80000000, 0x80000000
+};
+
+#endif
--- a/keymap.h
+++ b/keymap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonecommands.cpp
+++ b/levelonecommands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonecommands.h
+++ b/levelonecommands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/levelonepage.cpp
+++ b/levelonepage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -125,12 +125,12 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 			result[i*6+1] = m_fastTextLink[i].pageNumber & 0x00f;
 			result[i*6+2] = (m_fastTextLink[i].pageNumber & 0x0f0) >> 4;
 			result[i*6+3] = m_fastTextLink[i].subPageNumber & 0x000f;
-			result[i*6+4] = ((m_fastTextLink[i].subPageNumber & 0x0070) >> 4) | ((m_fastTextLink[i].pageNumber & 0x100) >> 8);
+			result[i*6+4] = ((m_fastTextLink[i].subPageNumber & 0x0070) >> 4) | ((m_fastTextLink[i].pageNumber & 0x100) >> 5);
 			result[i*6+5] = (m_fastTextLink[i].subPageNumber & 0x0f00) >> 8;
 			result[i*6+6] = ((m_fastTextLink[i].subPageNumber & 0x3000) >> 12) | ((m_fastTextLink[i].pageNumber & 0x600) >> 7);
 		}
-		result[43] = 0xf;
-		result[44] = result[45] = 0;
+		result[37] = 0xf;
+		result[38] = result[39] = 0;

 		return result;
 	}
--- a/levelonepage.h
+++ b/levelonepage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/loadsave.cpp
+++ b/loadsave.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -20,12 +20,14 @@
 #include "loadsave.h"

 #include <QByteArray>
+#include <QDataStream>
 #include <QFile>
 #include <QSaveFile>
 #include <QString>
 #include <QTextStream>

 #include "document.h"
+#include "hamming.h"
 #include "levelonepage.h"
 #include "pagebase.h"

@@ -52,7 +54,7 @@ void loadTTI(QFile *inFile, TeletextDocument *document)
 				document->insertSubPage(document->numberOfSubPages(), false);
 				loadingPage = document->subPage(document->numberOfSubPages()-1);
 			} else {
-				document->setPageNumber(inLine.mid(3,3));
+				document->setPageNumberFromString(inLine.mid(3,3));
 				firstSubPageAlreadyFound = true;
 			}
 		}
@@ -146,6 +148,12 @@ void loadTTI(QFile *inFile, TeletextDocument *document)
 					}
 					for (int i=1; i<=39; i++)
 						inLine[i] = inLine.at(i) & 0x3f;
+					// Import M/29 whole-magazine packets as X/28 per-page packets
+					if (lineNumber == 29) {
+						if ((document->pageNumber() & 0xff) != 0xff)
+							qDebug("M/29/%d packet found, but page number is not xFF!", designationCode);
+						lineNumber = 28;
+					}
 					loadingPage->setPacket(lineNumber, designationCode, inLine);
 				}
 			}
@@ -160,6 +168,198 @@ void loadTTI(QFile *inFile, TeletextDocument *document)
 		}
 }

+void importT42(QFile *inFile, TeletextDocument *document)
+{
+	unsigned char inLine[42];
+	int readMagazineNumber, readPacketNumber;
+	int foundMagazineNumber = -1;
+	int foundPageNumber = -1;
+	bool firstPacket0Found = false;
+	bool pageBodyPacketsFound = false;
+
+	for (;;) {
+		if (inFile->read((char *)inLine, 42) != 42)
+			// Reached end of .t42 file, or less than 42 bytes left
+			break;
+
+		// Magazine and packet numbers
+		inLine[0] = hamming_8_4_decode[inLine[0]];
+		inLine[1] = hamming_8_4_decode[inLine[1]];
+		if (inLine[0] == 0xff || inLine[1] == 0xff)
+			// Error decoding magazine or packet number
+			continue;
+		readMagazineNumber = inLine[0] & 0x07;
+		readPacketNumber = (inLine[0] >> 3) | (inLine[1] << 1);
+
+		if (readPacketNumber == 0) {
+			// Hamming decode page number, subcodes and control bits
+			for (int i=2; i<10; i++)
+				inLine[i] = hamming_8_4_decode[inLine[i]];
+			// See if the page number is valid
+			if (inLine[2] == 0xff || inLine[3] == 0xff)
+				// Error decoding page number
+				continue;
+
+			const int readPageNumber = (inLine[3] << 4) | inLine[2];
+
+			if (readPageNumber == 0xff)
+				// Time filling header
+				continue;
+
+			// A second or subsequent X/0 has been found
+			if (firstPacket0Found) {
+				if (readMagazineNumber != foundMagazineNumber)
+					// Packet from different magazine broadcast in parallel mode
+					continue;
+				if ((readPageNumber == foundPageNumber) && pageBodyPacketsFound)
+					// X/0 with same page number found after page body packets loaded - assume end of page
+					break;
+				if (readPageNumber != foundPageNumber) {
+					// More than one page in .t42 file - end of current page reached
+					qDebug("More than one page in .t42 file");
+					break;
+				}
+				// Could get here if X/0 with same page number was found with no body packets inbetween
+				continue;
+			} else {
+				// First X/0 found
+				foundMagazineNumber = readMagazineNumber;
+				foundPageNumber = readPageNumber;
+				firstPacket0Found = true;
+
+				if (foundMagazineNumber == 0)
+					document->setPageNumber(0x800 | foundPageNumber);
+				else
+					document->setPageNumber((foundMagazineNumber << 8) | foundPageNumber);
+
+				document->subPage(0)->setControlBit(PageBase::C4ErasePage, inLine[5] & 0x08);
+				document->subPage(0)->setControlBit(PageBase::C5Newsflash, inLine[7] & 0x04);
+				document->subPage(0)->setControlBit(PageBase::C6Subtitle, inLine[7] & 0x08);
+				for (int i=0; i<4; i++)
+					document->subPage(0)->setControlBit(PageBase::C7SuppressHeader+i, inLine[8] & (1 << i));
+				document->subPage(0)->setControlBit(PageBase::C11SerialMagazine, inLine[9] & 0x01);
+				document->subPage(0)->setControlBit(PageBase::C12NOS, inLine[9] & 0x08);
+				document->subPage(0)->setControlBit(PageBase::C13NOS, inLine[9] & 0x04);
+				document->subPage(0)->setControlBit(PageBase::C14NOS, inLine[9] & 0x02);
+
+				continue;
+			}
+		}
+
+		// No X/0 has been found yet, keep looking for one
+		if (!firstPacket0Found)
+			continue;
+
+		// Disregard whole-magazine packets
+		if (readPacketNumber > 28)
+			continue;
+
+		// We get here when a page-body packet belonging to the found X/0 header was found
+		pageBodyPacketsFound = true;
+
+		// At the moment this only loads a Level One Page properly
+		// because it assumes X/1 to X/25 is odd partity
+		if (readPacketNumber < 25) {
+			for (int i=2; i<42; i++)
+				// TODO - obey odd parity?
+				inLine[i] &= 0x7f;
+			document->subPage(0)->setPacket(readPacketNumber, QByteArray((const char *)&inLine[2], 40));
+			continue;
+		}
+
+		// X/26, X/27 or X/28
+		int readDesignationCode = hamming_8_4_decode[inLine[2]];
+
+		if (readDesignationCode == 0xff)
+			// Error decoding designation code
+			continue;
+
+		if (readPacketNumber == 27 && readDesignationCode < 4) {
+			// X/27/0 to X/27/3 for Editorial Linking
+			// Decode Hamming 8/4 on each of the six links, checking for errors on the way
+			for (int i=0; i<6; i++) {
+				bool decodingError = false;
+				const int b = 3 + i*6; // First byte of this link
+
+				for (int j=0; j<6; j++) {
+					inLine[b+j] = hamming_8_4_decode[inLine[b+j]];
+					if (inLine[b+j] == 0xff) {
+						decodingError = true;
+						break;
+					}
+				}
+
+				if (decodingError) {
+					// Error found in at least one byte of the link
+					// Neutralise the whole link to same magazine, page FF, subcode 3F7F
+					qDebug("X/27/%d link %d decoding error", readDesignationCode, i);
+					inLine[b]   = 0xf;
+					inLine[b+1] = 0xf;
+					inLine[b+2] = 0xf;
+					inLine[b+3] = 0x7;
+					inLine[b+4] = 0xf;
+					inLine[b+5] = 0x3;
+				}
+			}
+			document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
+
+			continue;
+		}
+
+		// X/26, or X/27/4 to X/27/15, or X/28
+		// Decode Hamming 24/18
+		for (int i=0; i<13; i++) {
+			const int b = 3 + i*3; // First byte of triplet
+
+			const int p0 = inLine[b];
+			const int p1 = inLine[b+1];
+			const int p2 = inLine[b+2];
+
+			unsigned int D1_D4;
+			unsigned int D5_D11;
+			unsigned int D12_D18;
+			unsigned int ABCDEF;
+			int32_t d;
+
+			D1_D4 = hamming_24_18_decode_d1_d4[p0 >> 2];
+			D5_D11 = p1 & 0x7f;
+			D12_D18 = p2 & 0x7f;
+
+			d = D1_D4 | (D5_D11 << 4) | (D12_D18 << 11);
+
+			ABCDEF = (hamming_24_18_parities[0][p0] ^ hamming_24_18_parities[1][p1]  ^ hamming_24_18_parities[2][p2]);
+
+			d ^= (int)hamming_24_18_decode_correct[ABCDEF];
+
+			if ((d & 0x80000000) == 0x80000000) {
+				// Error decoding Hamming 24/18
+				qDebug("X/%d/%d triplet %d decoding error", readPacketNumber, readDesignationCode, i);
+				if (readPacketNumber == 26) {
+					// Enhancements packet, set to "dummy" Address 41, Mode 0x1e, Data 0
+					inLine[b]   = 41;
+					inLine[b+1] = 0x1e;
+					inLine[b+2] = 0;
+				} else {
+					// Zero out whole decoded triplet, bound to make things go wrong...
+					inLine[b]   = 0x00;
+					inLine[b+1] = 0x00;
+					inLine[b+2] = 0x00;
+				}
+			} else {
+				inLine[b]   = d & 0x0003f;
+				inLine[b+1] = (d & 0x00fc0) >> 6;
+				inLine[b+2] = d >> 12;
+			}
+		}
+		document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
+	}
+
+	if (!firstPacket0Found)
+		qDebug("No X/0 found");
+	else if (!pageBodyPacketsFound)
+		qDebug("X/0 found, but no page body packets were found");
+}
+
 // Used by saveTTI and HashString
 int controlBitsToPS(PageBase *subPage)
 {
@@ -237,7 +437,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 	for (p=0; p<document.numberOfSubPages(); p++) {

 		// Page number
-		outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 16, QChar('0'));
+		outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 10, QChar('0'));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 			outStream << Qt::endl;
 #else
@@ -247,7 +447,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 		// Subpage
 		// Magazine Organisation Table and Magazine Inventory Page don't have subpages
 		if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) {
-			outStream << QString("SC,%1").arg(subPageNumber, 4, 16, QChar('0'));
+			outStream << QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0'));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 			outStream << Qt::endl;
 #else
@@ -291,7 +491,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 				}*/
 		}

-		// X27 then X28 always come first
+		// X/27 then X/28 always come first
 		for (int i=(writeFLCommand ? 1 : 0); i<16; i++)
 			writeHammingPacket(27, i);
 		for (int i=0; i<16; i++)
@@ -335,6 +535,190 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 	}
 }

+void exportM29File(QSaveFile &file, const TeletextDocument &document)
+{
+	const PageBase &subPage = *document.currentSubPage();
+	QTextStream outStream(&file);
+
+	auto writeM29Packet=[&](int designationCode)
+	{
+		if (subPage.packetExists(28, designationCode)) {
+			QByteArray outLine = subPage.packet(28, designationCode);
+
+			outStream << QString("OL,29,");
+			// TTI stores raw values with bit 6 set, doesn't do Hamming encoding
+			outLine[0] = designationCode | 0x40;
+			for (int c=1; c<outLine.size(); c++)
+				outLine[c] = outLine.at(c) | 0x40;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+			outStream << outLine << Qt::endl;
+#else
+			outStream << outLine << endl;
+#endif
+		}
+	};
+
+	outStream.setCodec("ISO-8859-1");
+
+	if (!document.description().isEmpty())
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+	outStream << "DE," << document.description() << Qt::endl;
+#else
+	outStream << "DE," << document.description() << endl;
+#endif
+
+	// Force page number to xFF
+	outStream << QString("PN,%1ff00").arg(document.pageNumber() >> 8, 1, 16);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+	outStream << Qt::endl;
+#else
+	outStream << endl;
+#endif
+
+	outStream << "PS,8000";
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+	outStream << Qt::endl;
+#else
+	outStream << endl;
+#endif
+
+	writeM29Packet(0);
+	writeM29Packet(1);
+	writeM29Packet(4);
+}
+
+void exportT42File(QSaveFile &file, const TeletextDocument &document)
+{
+	const PageBase &subPage = *document.currentSubPage();
+
+	QDataStream outStream(&file);
+	// Displayable row header we export as spaces, hence the (odd parity valid) 0x20 init value
+	QByteArray outLine(42, 0x20);
+	int magazineNumber = (document.pageNumber() & 0xf00) >> 8;
+
+	auto write7bitPacket=[&](int packetNumber)
+	{
+		if (subPage.packetExists(packetNumber)) {
+			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
+			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
+			outLine.replace(2, 40, subPage.packet(packetNumber));
+
+			// Odd parity encoding
+			for (int c=0; c<outLine.size(); c++) {
+				char p = outLine.at(c);
+
+				// Recursively divide integer into two equal halves and take their XOR until only 1 bit is left
+				p ^= p >> 4;
+				p ^= p >> 2;
+				p ^= p >> 1;
+				// If last bit left is 0 then it started with an even number of bits, so do the odd parity
+				if (!(p & 1))
+					outLine[c] = outLine.at(c) | 0x80;
+			}
+			outStream.writeRawData(outLine.constData(), 42);
+		}
+	};
+
+	auto writeHamming8_4Packet=[&](int packetNumber, int designationCode=0)
+	{
+		if (subPage.packetExists(packetNumber, designationCode)) {
+			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
+			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
+			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
+			outLine[2] = hamming_8_4_encode[designationCode];
+
+			for (int c=3; c<outLine.size(); c++)
+				outLine[c] = hamming_8_4_encode[(int)outLine.at(c)];
+
+			outStream.writeRawData(outLine.constData(), 42);
+		}
+	};
+
+	auto writeHamming24_18Packet=[&](int packetNumber, int designationCode=0)
+	{
+		if (subPage.packetExists(packetNumber, designationCode)) {
+			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
+			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
+			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
+			outLine[2] = hamming_8_4_encode[designationCode];
+
+			for (int c=3; c<outLine.size(); c+=3) {
+				unsigned int D5_D11;
+				unsigned int D12_D18;
+				unsigned int P5, P6;
+				unsigned int Byte_0;
+
+				const unsigned int toEncode = outLine[c] | (outLine[c+1] << 6) | (outLine[c+2] << 12);
+
+				Byte_0 = (hamming_24_18_forward[0][(toEncode >> 0) & 0xff] ^ hamming_24_18_forward[1][(toEncode >> 8) & 0xff] ^ hamming_24_18_forward_2[(toEncode >> 16) & 0x03]);
+				outLine[c] = Byte_0;
+
+				D5_D11 = (toEncode >> 4) & 0x7f;
+				D12_D18 = (toEncode >> 11) & 0x7f;
+
+				P5 = 0x80 & ~(hamming_24_18_parities[0][D12_D18] << 2);
+				outLine[c+1] = D5_D11 | P5;
+
+				P6 = 0x80 & ((hamming_24_18_parities[0][Byte_0] ^ hamming_24_18_parities[0][D5_D11]) << 2);
+				outLine[c+2] = D12_D18 | P6;
+			}
+
+			outStream.writeRawData(outLine.constData(), 42);
+		}
+	};
+
+
+	if (magazineNumber == 8)
+		magazineNumber = 0;
+
+	// Write X/0 separately as it features both Hamming 8/4 and 7-bit odd parity within
+	outLine[0] = magazineNumber & 0x07;
+	outLine[1] = 0; // Packet number 0
+	outLine[2] = document.pageNumber() & 0x00f;
+	outLine[3] = (document.pageNumber() & 0x0f0) >> 4;
+	outLine[4] = 0; // Subcode S1 - always export as 0
+	outLine[5] = subPage.controlBit(PageBase::C4ErasePage) << 3;
+	outLine[6] = 0; // Subcode S3 - always export as 0
+	outLine[7] = (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3);
+	outLine[8] = subPage.controlBit(PageBase::C7SuppressHeader) | (subPage.controlBit(PageBase::C8Update) << 1) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
+	outLine[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 1) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 3);
+
+	for (int i=0; i<10; i++)
+		outLine[i] = hamming_8_4_encode[(int)outLine.at(i)];
+
+	// If we allow text in the row header, we'd odd-parity encode it here
+
+	outStream.writeRawData(outLine.constData(), 42);
+
+	// After X/0, X/27 then X/28 always come next
+	for (int i=0; i<4; i++)
+		writeHamming8_4Packet(27, i);
+	for (int i=4; i<16; i++)
+		writeHamming24_18Packet(27, i);
+	for (int i=0; i<16; i++)
+		writeHamming24_18Packet(28, i);
+
+	if (document.packetCoding() == TeletextDocument::Coding7bit) {
+		// For 7 bit coding i.e. Level One Pages, X/26 are written before X/1 to X/25
+		for (int i=0; i<16; i++)
+			writeHamming24_18Packet(26, i);
+		for (int i=1; i<=24; i++)
+			write7bitPacket(i);
+	} else {
+		// For others (especially (G)POP pages) X/1 to X/25 are written before X/26
+		if (document.packetCoding() == TeletextDocument::Coding18bit)
+			for (int i=1; i<=25; i++)
+				writeHamming24_18Packet(i);
+		else if (document.packetCoding() == TeletextDocument::Coding4bit)
+			for (int i=1; i<=25; i++)
+				writeHamming8_4Packet(i);
+		else
+			qDebug("Exported broken file as page coding is not supported");
+		for (int i=0; i<16; i++)
+			writeHamming24_18Packet(26, i);
+	}
+}
+
 QByteArray rowPacketAlways(PageBase *subPage, int packetNumber)
 {
 	if (subPage->packetExists(packetNumber))
--- a/loadsave.h
+++ b/loadsave.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -30,11 +30,14 @@
 #include "levelonepage.h"
 #include "pagebase.h"

-void loadTTI(QFile *inFile, TeletextDocument *document);
+void loadTTI(QFile *, TeletextDocument *);
+void importT42(QFile *, TeletextDocument *);

 int controlBitsToPS(PageBase *);

 void saveTTI(QSaveFile &, const TeletextDocument &);
+void exportT42File(QSaveFile &, const TeletextDocument &);
+void exportM29File(QSaveFile &, const TeletextDocument &);

 QByteArray rowPacketAlways(PageBase *, int);

--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.4-alpha");
+	QApplication::setApplicationVersion("0.5.3-alpha");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/mainwidget.h
+++ b/mainwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -27,6 +27,7 @@
 #include <QPainter>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QRegExp>
 #include <QSaveFile>
 #include <QScreen>
 #include <QSettings>
@@ -108,14 +109,39 @@ void MainWindow::openFile(const QString &fileName)
 	other->show();
 }

+static inline bool hasTTISuffix(const QString &filename)
+{
+	return filename.endsWith(".tti", Qt::CaseInsensitive) || filename.endsWith(".ttix", Qt::CaseInsensitive);
+}
+
+static inline void changeSuffixFromTTI(QString &filename, const QString &newSuffix)
+{
+	if (filename.endsWith(".tti", Qt::CaseInsensitive)) {
+		filename.chop(4);
+		filename.append("." + newSuffix);
+	} else if (filename.endsWith(".ttix", Qt::CaseInsensitive)) {
+		filename.chop(5);
+		filename.append("." + newSuffix);
+	}
+}
+
 bool MainWindow::save()
 {
-	return m_isUntitled ? saveAs() : saveFile(m_curFile);
+	// If imported from non-.tti, force "Save As" so we don't clobber the original imported file
+	return m_isUntitled || !hasTTISuffix(m_curFile) ? saveAs() : saveFile(m_curFile);
 }

 bool MainWindow::saveAs()
 {
-	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), m_curFile);
+	QString suggestedName = m_curFile;
+
+	// If imported from non-.tti, change extension so we don't clobber the original imported file
+	if (suggestedName.endsWith(".t42", Qt::CaseInsensitive)) {
+		suggestedName.chop(4);
+		suggestedName.append(".tti");
+	}
+
+	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), suggestedName, "TTI teletext page (*.tti *.ttix)");
 	if (fileName.isEmpty())
 		return false;

@@ -167,9 +193,9 @@ void MainWindow::exportPNG()
 		const QImage scaledImage = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);

 		if (!scaledImage.save(exportFileName, "PNG"))
-			QMessageBox::warning(this, tr("QTeletextMaker"), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
+			QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
 	} else if (!doubleHeightImage.save(exportFileName, "PNG"))
-		QMessageBox::warning(this, tr("QTeletextMaker"), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1.").arg(QDir::toNativeSeparators(exportFileName)));
 }

 void MainWindow::exportZXNet()
@@ -187,7 +213,7 @@ void MainWindow::about()
 	QMessageBox::about(this, tr("About"), QString("<b>%1</b><br>"
 	"An open source Level 2.5 teletext page editor.<br>"
 	"<i>Version %2</i><br><br>"
-	"Copyright (C) 2020, 2021 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2022 Gavin MacGregor<br><br>"
 	"Released under the GNU General Public License version 3<br>"
 	"<a href=\"https://github.com/gkthemac/qteletextmaker\">https://github.com/gkthemac/qteletextmaker</a>").arg(QApplication::applicationDisplayName()).arg(QApplication::applicationVersion()));
 }
@@ -310,9 +336,9 @@ void MainWindow::createActions()

 	setRecentFilesVisible(MainWindow::hasRecentFiles());

-	QAction *exportPNGAct = fileMenu->addAction(tr("Export subpage as PNG..."));
-	exportPNGAct->setStatusTip("Export a PNG image of this subpage");
-	connect(exportPNGAct, &QAction::triggered, this, &MainWindow::exportPNG);
+	QAction *exportT42Act = fileMenu->addAction(tr("Export subpage as t42..."));
+	exportT42Act->setStatusTip("Export this subpage as a t42 file");
+	connect(exportT42Act, &QAction::triggered, this, &MainWindow::exportT42);

 	QMenu *exportHashStringSubMenu = fileMenu->addMenu(tr("Export subpage to online editor"));

@@ -324,6 +350,14 @@ void MainWindow::createActions()
 	exportEditTFAct->setStatusTip("Export and open this subpage in the edit.tf online editor");
 	connect(exportEditTFAct, &QAction::triggered, this, &MainWindow::exportEditTF);

+	QAction *exportPNGAct = fileMenu->addAction(tr("Export subpage as PNG..."));
+	exportPNGAct->setStatusTip("Export a PNG image of this subpage");
+	connect(exportPNGAct, &QAction::triggered, this, &MainWindow::exportPNG);
+
+	QAction *exportM29Act = fileMenu->addAction(tr("Export subpage X/28 as M/29..."));
+	exportM29Act->setStatusTip("Export this subpage's X/28 packets as a tti file with M/29 packets");
+	connect(exportM29Act, &QAction::triggered, this, &MainWindow::exportM29);
+
 	fileMenu->addSeparator();

 	QAction *closeAct = fileMenu->addAction(tr("&Close"), this, &QWidget::close);
@@ -688,12 +722,16 @@ void MainWindow::zoomIn()
 {
 	if (m_viewZoom < 4)
 		m_viewZoom++;
+	else if (m_viewZoom < 12)
+		m_viewZoom += 2;
 	setSceneDimensions();
 }

 void MainWindow::zoomOut()
 {
-	if (m_viewZoom > 0)
+	if (m_viewZoom > 4)
+		m_viewZoom -= 2;
+	else if (m_viewZoom > 0)
 		m_viewZoom--;
 	setSceneDimensions();
 }
@@ -782,7 +820,7 @@ void MainWindow::readSettings()
 	m_smoothTransformAction->setChecked(m_viewSmoothTransform);
 	m_smoothTransformAction->blockSignals(false);
 	m_viewZoom = settings.value("zoom", 2).toInt();
-	m_viewZoom = (m_viewZoom < 0 || m_viewZoom > 4) ? 2 : m_viewZoom;
+	m_viewZoom = (m_viewZoom < 0 || m_viewZoom > 12) ? 2 : m_viewZoom;

 	// zoom 0 = 420,426px, 1 = 620,570px, 2 = 780,720px
 	if (geometry.isEmpty()) {
@@ -827,7 +865,7 @@ bool MainWindow::maybeSave()
 {
 	if (m_textWidget->document()->undoStack()->isClean())
 		return true;
-	const QMessageBox::StandardButton ret = QMessageBox::warning(this, tr("QTeletextMaker"), tr("The document has been modified.\nDo you want to save your changes?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+	const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The document \"%1\" has been modified.\nDo you want to save your changes or discard them?").arg(QFileInfo(m_curFile).fileName()), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
 	switch (ret) {
 		case QMessageBox::Save:
 			return save();
@@ -844,14 +882,27 @@ void MainWindow::loadFile(const QString &fileName)
 	int levelSeen;

 	QFile file(fileName);
-	if (!file.open(QFile::ReadOnly | QFile::Text)) {
-		QMessageBox::warning(this, tr("QTeletextMaker"), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
+	const QFileInfo fileInfo(file);
+	QIODevice::OpenMode fileOpenMode;
+
+	if (fileInfo.suffix() == "t42")
+		fileOpenMode = QFile::ReadOnly;
+	else
+		fileOpenMode = QFile::ReadOnly | QFile::Text;
+
+	if (!file.open(fileOpenMode)) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
 		setCurrentFile(QString());
 		return;
 	}

 	QApplication::setOverrideCursor(Qt::WaitCursor);
-	loadTTI(&file, m_textWidget->document());
+
+	if (fileInfo.suffix() == "t42")
+		importT42(&file, m_textWidget->document());
+	else
+		loadTTI(&file, m_textWidget->document());
+
 	levelSeen = m_textWidget->document()->levelRequired();
 	m_levelRadioButton[levelSeen]->toggle();
 	m_textWidget->pageRender()->setRenderLevel(levelSeen);
@@ -949,13 +1000,13 @@ bool MainWindow::saveFile(const QString &fileName)
 	if (file.open(QFile::WriteOnly | QFile::Text)) {
 		saveTTI(file, *m_textWidget->document());
 		if (!file.commit())
-			errorMessage = tr("Cannot write file %1:\n%2.") .arg(QDir::toNativeSeparators(fileName), file.errorString());
+			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
 	} else
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
 	QApplication::restoreOverrideCursor();

 	if (!errorMessage.isEmpty()) {
-		QMessageBox::warning(this, tr("QTeletextMaker"), errorMessage);
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), errorMessage);
 		return false;
 	}

@@ -964,6 +1015,82 @@ bool MainWindow::saveFile(const QString &fileName)
 	return true;
 }

+void MainWindow::exportT42()
+{
+	QString errorMessage;
+	QString exportFileName = m_curFile;
+
+	changeSuffixFromTTI(exportFileName, "t42");
+
+	exportFileName = QFileDialog::getSaveFileName(this, tr("Export t42"), exportFileName, "t42 stream (*.t42)");
+	if (exportFileName.isEmpty())
+		return;
+
+	QApplication::setOverrideCursor(Qt::WaitCursor);
+	QSaveFile file(exportFileName);
+	if (file.open(QFile::WriteOnly)) {
+		exportT42File(file, *m_textWidget->document());
+		if (!file.commit())
+			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+	} else
+		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+	QApplication::restoreOverrideCursor();
+
+	if (!errorMessage.isEmpty())
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), errorMessage);
+}
+
+void MainWindow::exportM29()
+{
+	QString errorMessage;
+	QString exportFileName = m_curFile;
+
+	if (m_isUntitled || !QFileInfo(m_curFile).exists())
+		exportFileName = QString("P%1FF.tti").arg(m_textWidget->document()->pageNumber() >> 8, 1, 16);
+	else {
+		exportFileName = QFileInfo(m_curFile).fileName();
+		// Suggest a new filename to avoid clobbering the original file
+		if (QRegExp(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).indexIn(exportFileName) != -1) {
+			// Page number forms start of file name, change it to xFF
+			if (exportFileName.at(0) == 'P' || exportFileName.at(0) == 'p') {
+				exportFileName[2] = 'F';
+				exportFileName[3] = 'F';
+			} else {
+				exportFileName[1] = 'F';
+				exportFileName[2] = 'F';
+			}
+		// No page number at start of file name. Try to insert "-m29" while preserving .tti(x) suffix
+		} else if (exportFileName.endsWith(".tti", Qt::CaseInsensitive)) {
+			exportFileName.chop(4);
+			exportFileName.append("-m29.tti");
+		} else if (exportFileName.endsWith(".ttix", Qt::CaseInsensitive)) {
+			exportFileName.chop(5);
+			exportFileName.append("-m29.ttix");
+		} else
+			// Shouldn't get here, bit of a messy escape but still better than clobbering the original file
+			exportFileName.append("-m29.tti");
+
+		exportFileName = QDir(QFileInfo(m_curFile).absoluteDir()).filePath(exportFileName);
+	}
+
+	exportFileName = QFileDialog::getSaveFileName(this, tr("Export M/29 tti"), exportFileName, "TTI teletext page (*.tti *.ttix)");
+	if (exportFileName.isEmpty())
+		return;
+
+	QApplication::setOverrideCursor(Qt::WaitCursor);
+	QSaveFile file(exportFileName);
+	if (file.open(QFile::WriteOnly | QFile::Text)) {
+		exportM29File(file, *m_textWidget->document());
+		if (!file.commit())
+			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+	} else
+		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+	QApplication::restoreOverrideCursor();
+
+	if (!errorMessage.isEmpty())
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), errorMessage);
+}
+
 void MainWindow::setCurrentFile(const QString &fileName)
 {
 	static int sequenceNumber = 1;
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -58,9 +58,11 @@ private slots:
 	void open();
 	bool save();
 	bool saveAs();
-	void exportPNG();
+	void exportT42();
 	void exportZXNet();
 	void exportEditTF();
+	void exportPNG();
+	void exportM29();
 	void updateRecentFileActions();
 	void openRecentFile();
 	void about();
--- a/pagebase.cpp
+++ b/pagebase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagebase.h
+++ b/pagebase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pageenhancementsdockwidget.cpp
+++ b/pageenhancementsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -25,6 +25,7 @@
 #include <QLineEdit>
 #include <QMap>
 #include <QPair>
+#include <QRegExpValidator>
 #include <QSpinBox>
 #include <QString>

@@ -114,6 +115,8 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	level3p5OnlyLabel->setAlignment(Qt::AlignCenter);
 	x27Layout->addWidget(level3p5OnlyLabel, 5, 0, 1, 5);

+	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+
 	for (int i=0; i<8; i++) {
 		if (i < 4) {
 			// Required at which Levels
@@ -136,8 +139,8 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 		// Page link
 		m_composeLinkPageNumberLineEdit[i] = new QLineEdit("100");
 		m_composeLinkPageNumberLineEdit[i]->setMaxLength(3);
-		m_composeLinkPageNumberLineEdit[i]->setInputMask("DHH");
-		// TODO restrict first digit of page number to 1-8
+		m_composeLinkPageNumberLineEdit[i]->setInputMask(">DHH");
+		m_composeLinkPageNumberLineEdit[i]->setValidator(m_pageNumberValidator);
 		x27Layout->addWidget(m_composeLinkPageNumberLineEdit[i], i+(i<4 ? 1 : 2), 3, 1, 1);
 		connect(m_composeLinkPageNumberLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkPageNumber(i, value); } );

--- a/pageenhancementsdockwidget.h
+++ b/pageenhancementsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -24,6 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
+#include <QRegExpValidator>
 #include <QSpinBox>
 #include <QString>

@@ -51,6 +52,8 @@ private:
 	QCheckBox *m_composeLinkLevelCheckbox[4][2]; // For links 0-3
 	QComboBox *m_composeLinkFunctionComboBox[4]; // For links 4-7; remember to subtract 4!
 	QLineEdit *m_composeLinkPageNumberLineEdit[8], *m_composeLinkSubPageNumbersLineEdit[8];
+
+	QRegExpValidator *m_pageNumberValidator;
 };

 #endif
--- a/pageoptionsdockwidget.cpp
+++ b/pageoptionsdockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -24,6 +24,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QRegExpValidator>
 #include <QSpinBox>
 #include <QVBoxLayout>

@@ -40,14 +41,16 @@ PageOptionsDockWidget::PageOptionsDockWidget(TeletextWidget *parent): QDockWidge
 	this->setWindowTitle("Page options");

 	// Page number
+	m_pageNumberValidator = new QRegExpValidator(QRegExp("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
+
 	QHBoxLayout *pageNumberLayout = new QHBoxLayout;
 	pageNumberLayout->addWidget(new QLabel(tr("Page number")));
 	m_pageNumberEdit = new QLineEdit("100");
 	m_pageNumberEdit->setMaxLength(3);
-	m_pageNumberEdit->setInputMask("DHH");
-	//TODO restrict first digit of page number to 1-8
+	m_pageNumberEdit->setInputMask(">DHH");
+	m_pageNumberEdit->setValidator(m_pageNumberValidator);
 	pageNumberLayout->addWidget(m_pageNumberEdit);
-	connect(m_pageNumberEdit, &QLineEdit::textEdited, m_parentMainWidget->document(), &TeletextDocument::setPageNumber);
+	connect(m_pageNumberEdit, &QLineEdit::textEdited, m_parentMainWidget->document(), &TeletextDocument::setPageNumberFromString);

 	pageOptionsLayout->addLayout(pageNumberLayout);

@@ -66,8 +69,8 @@ PageOptionsDockWidget::PageOptionsDockWidget(TeletextWidget *parent): QDockWidge
 		fastTextLayout->addWidget(new QLabel(fastTextLabel[i]), 0, i, 1, 1, Qt::AlignCenter);
 		m_fastTextEdit[i] = new QLineEdit;
 		m_fastTextEdit[i]->setMaxLength(3);
-		m_fastTextEdit[i]->setInputMask("DHH");
-		//TODO restrict first digit of page number to 1-8
+		m_fastTextEdit[i]->setInputMask(">DHH");
+		m_fastTextEdit[i]->setValidator(m_pageNumberValidator);
 		fastTextLayout->addWidget(m_fastTextEdit[i], 1, i, 1, 1);
 		connect(m_fastTextEdit[i], &QLineEdit::textEdited, [=](QString value) { setFastTextLinkPageNumber(i, value); } );
 	}
--- a/pageoptionsdockwidget.h
+++ b/pageoptionsdockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -24,6 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
+#include <QRegExpValidator>
 #include <QSpinBox>

 #include "mainwidget.h"
@@ -45,6 +46,8 @@ private:
 	QComboBox *m_defaultRegionCombo, *m_defaultNOSCombo, *m_secondRegionCombo, *m_secondNOSCombo;
 	QLineEdit *m_fastTextEdit[6];

+	QRegExpValidator *m_pageNumberValidator;
+
 	void addRegionList(QComboBox *);
 	void setFastTextLinkPageNumber(int, const QString &);
 	void setDefaultRegion();
--- a/pagex26base.cpp
+++ b/pagex26base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/pagex26base.h
+++ b/pagex26base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/palettedockwidget.cpp
+++ b/palettedockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/palettedockwidget.h
+++ b/palettedockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/qteletextmaker.pro
+++ b/qteletextmaker.pro
@@ -2,6 +2,7 @@ QT += widgets
 requires(qtConfig(filedialog))

 HEADERS       = document.h \
+                hamming.h \
                keymap.h \
                levelonecommands.h \
                levelonepage.h \
--- a/render.cpp
+++ b/render.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -251,7 +251,6 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum

 void TeletextPageRender::decodePage()
 {
-	QPainter pixmapPainter;
 	int currentFullRowColour, downwardsFullRowColour;
 	int renderedFullScreenColour;

--- a/render.h
+++ b/render.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26commands.cpp
+++ b/x26commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -50,12 +50,25 @@ void InsertTripletCommand::redo()
 	for (int i=0; i<m_count; i++)
 		m_teletextDocument->currentSubPage()->enhancements()->insert(m_row+i, m_insertedTriplet);

+	if (!changingSubPage)
+		m_x26Model->endInsertRows();
+
+	// Preserve pointers to local object definitions that have moved
+	for (int i=0; i<m_teletextDocument->currentSubPage()->enhancements()->size(); i++) {
+		X26Triplet triplet = m_teletextDocument->currentSubPage()->enhancements()->at(i);
+
+		if (triplet.modeExt() >= 0x11 && triplet.modeExt() <= 0x13 && ((triplet.address() & 0x18) == 0x08) && triplet.objectLocalIndex() >= m_row) {
+			triplet.setObjectLocalIndex(triplet.objectLocalIndex() + m_count);
+			m_teletextDocument->currentSubPage()->enhancements()->replace(i, triplet);
+			if (!changingSubPage)
+				m_x26Model->emit dataChanged(m_x26Model->createIndex(i, 0), m_x26Model->createIndex(i, 3));
+		}
+	}
+
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
-	else {
-		m_x26Model->endInsertRows();
+	else
 		m_teletextDocument->emit refreshNeeded();
-	}

 	if (m_firstDo)
 		m_firstDo = false;
@@ -76,12 +89,25 @@ void InsertTripletCommand::undo()
 	for (int i=0; i<m_count; i++)
 		m_teletextDocument->currentSubPage()->enhancements()->removeAt(m_row);

+	if (!changingSubPage)
+		m_x26Model->endRemoveRows();
+
+	// Preserve pointers to local object definitions that have moved
+	for (int i=0; i<m_teletextDocument->currentSubPage()->enhancements()->size(); i++) {
+		X26Triplet triplet = m_teletextDocument->currentSubPage()->enhancements()->at(i);
+
+		if (triplet.modeExt() >= 0x11 && triplet.modeExt() <= 0x13 && ((triplet.address() & 0x18) == 0x08) && triplet.objectLocalIndex() >= m_row) {
+			triplet.setObjectLocalIndex(triplet.objectLocalIndex() - m_count);
+			m_teletextDocument->currentSubPage()->enhancements()->replace(i, triplet);
+			if (!changingSubPage)
+				m_x26Model->emit dataChanged(m_x26Model->createIndex(i, 0), m_x26Model->createIndex(i, 3));
+		}
+	}
+
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
-	else {
-		m_x26Model->endRemoveRows();
+	else
 		m_teletextDocument->emit refreshNeeded();
-	}
 }


@@ -101,15 +127,35 @@ DeleteTripletCommand::DeleteTripletCommand(TeletextDocument *teletextDocument, X

 void DeleteTripletCommand::redo()
 {
-	m_teletextDocument->emit aboutToChangeSubPage();
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	bool changingSubPage = (m_teletextDocument->currentSubPageIndex() != m_subPageIndex);
+
+	if (changingSubPage) {
+		m_teletextDocument->emit aboutToChangeSubPage();
+		m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	} else
+		m_x26Model->beginRemoveRows(QModelIndex(), m_row, m_row+m_count-1);

-	m_x26Model->beginRemoveRows(QModelIndex(), m_row, m_row+m_count-1);
 	for (int i=0; i<m_count; i++)
 		m_teletextDocument->currentSubPage()->enhancements()->removeAt(m_row);
-	m_x26Model->endRemoveRows();

-	m_teletextDocument->emit subPageSelected();
+	if (!changingSubPage)
+		m_x26Model->endRemoveRows();
+
+	// Preserve pointers to local object definitions that have moved
+	for (int i=0; i<m_teletextDocument->currentSubPage()->enhancements()->size(); i++) {
+		X26Triplet triplet = m_teletextDocument->currentSubPage()->enhancements()->at(i);
+
+		if (triplet.modeExt() >= 0x11 && triplet.modeExt() <= 0x13 && ((triplet.address() & 0x18) == 0x08) && triplet.objectLocalIndex() >= m_row) {
+			triplet.setObjectLocalIndex(triplet.objectLocalIndex() - m_count);
+			m_teletextDocument->currentSubPage()->enhancements()->replace(i, triplet);
+			m_x26Model->emit dataChanged(m_x26Model->createIndex(i, 0), m_x26Model->createIndex(i, 3));
+		}
+	}
+
+	if (changingSubPage)
+		m_teletextDocument->emit subPageSelected();
+	else
+		m_teletextDocument->emit refreshNeeded();
 }

 void DeleteTripletCommand::undo()
@@ -125,12 +171,25 @@ void DeleteTripletCommand::undo()
 	for (int i=0; i<m_count; i++)
 		m_teletextDocument->currentSubPage()->enhancements()->insert(m_row+i, m_deletedTriplet);

+	if (!changingSubPage)
+		m_x26Model->endInsertRows();
+
+	// Preserve pointers to local object definitions that have moved
+	for (int i=0; i<m_teletextDocument->currentSubPage()->enhancements()->size(); i++) {
+		X26Triplet triplet = m_teletextDocument->currentSubPage()->enhancements()->at(i);
+
+		if (triplet.modeExt() >= 0x11 && triplet.modeExt() <= 0x13 && ((triplet.address() & 0x18) == 0x08) && triplet.objectLocalIndex() >= m_row) {
+			triplet.setObjectLocalIndex(triplet.objectLocalIndex() + m_count);
+			m_teletextDocument->currentSubPage()->enhancements()->replace(i, triplet);
+			if (!changingSubPage)
+				m_x26Model->emit dataChanged(m_x26Model->createIndex(i, 0), m_x26Model->createIndex(i, 3));
+		}
+	}
+
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
-	else {
-		m_x26Model->endInsertRows();
+	else
 		m_teletextDocument->emit refreshNeeded();
-	}

 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
--- a/x26commands.h
+++ b/x26commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26dockwidget.cpp
+++ b/x26dockwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -105,16 +105,6 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	// "Cooked" or user-friendly triplet type, row and column selection
 	QHBoxLayout *cookedTripletLayout = new QHBoxLayout;

-	m_cookedModeTypeComboBox = new QComboBox;
-	m_cookedModeTypeComboBox->addItem("Set Active Position");
-	m_cookedModeTypeComboBox->addItem("Row triplet");
-	m_cookedModeTypeComboBox->addItem("Column triplet");
-	m_cookedModeTypeComboBox->addItem("Object");
-	m_cookedModeTypeComboBox->addItem("Terminator");
-	m_cookedModeTypeComboBox->addItem("PDC/reserved");
-	cookedTripletLayout->addWidget(m_cookedModeTypeComboBox);
-	connect(m_cookedModeTypeComboBox, QOverload<int>::of(&QComboBox::activated), this, &X26DockWidget::updateCookedModeFromCookedType);
-
 	// Cooked row spinbox
 	QLabel *rowLabel = new QLabel(tr("Row"));
 	rowLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
@@ -137,10 +127,81 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	connect(m_cookedColumnSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &X26DockWidget::cookedColumnSpinBoxChanged);

 	// Cooked triplet mode
-	m_cookedModeComboBox = new QComboBox;
-	m_cookedModeComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-	cookedTripletLayout->addWidget(m_cookedModeComboBox);
-	connect(m_cookedModeComboBox, QOverload<int>::of(&QComboBox::activated), this, &X26DockWidget::cookedModeComboBoxChanged);
+	QLabel *modeLabel = new QLabel(tr("Mode"));
+	modeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+	cookedTripletLayout->addWidget(modeLabel);
+	m_cookedModePushButton = new QPushButton;
+	cookedTripletLayout->addWidget(m_cookedModePushButton);
+
+	auto newModeMenuAction=[&](QMenu *menu, int mode)
+	{
+		QAction *action = menu->addAction(m_x26Model->modeTripletName(mode));
+		connect(action, &QAction::triggered, [=]() { cookedModeMenuSelected(mode); });
+	};
+
+	// Cooked triplet menu
+	m_cookedModeMenu = new QMenu(this);
+	newModeMenuAction(m_cookedModeMenu, 0x04);
+	QMenu *rowTripletSubMenu = m_cookedModeMenu->addMenu(tr("Row triplet"));
+	newModeMenuAction(rowTripletSubMenu, 0x00);
+	newModeMenuAction(rowTripletSubMenu, 0x01);
+	newModeMenuAction(rowTripletSubMenu, 0x07);
+	newModeMenuAction(rowTripletSubMenu, 0x18);
+	QMenu *columnTripletSubMenu = m_cookedModeMenu->addMenu(tr("Column triplet"));
+	newModeMenuAction(columnTripletSubMenu, 0x20);
+	newModeMenuAction(columnTripletSubMenu, 0x23);
+	newModeMenuAction(columnTripletSubMenu, 0x27);
+	newModeMenuAction(columnTripletSubMenu, 0x2c);
+	newModeMenuAction(columnTripletSubMenu, 0x2e);
+	newModeMenuAction(columnTripletSubMenu, 0x28);
+	columnTripletSubMenu->addSeparator();
+	newModeMenuAction(columnTripletSubMenu, 0x29);
+	newModeMenuAction(columnTripletSubMenu, 0x2f);
+	newModeMenuAction(columnTripletSubMenu, 0x21);
+	newModeMenuAction(columnTripletSubMenu, 0x22);
+	newModeMenuAction(columnTripletSubMenu, 0x2b);
+	newModeMenuAction(columnTripletSubMenu, 0x2d);
+	QMenu *diacriticalSubMenu = columnTripletSubMenu->addMenu(tr("G0 diacritical"));
+	for (int i=0; i<16; i++)
+		newModeMenuAction(diacriticalSubMenu, 0x30 + i);
+	QMenu *objectSubMenu = m_cookedModeMenu->addMenu(tr("Object"));
+	newModeMenuAction(objectSubMenu, 0x10);
+	newModeMenuAction(objectSubMenu, 0x11);
+	newModeMenuAction(objectSubMenu, 0x12);
+	newModeMenuAction(objectSubMenu, 0x13);
+	newModeMenuAction(objectSubMenu, 0x15);
+	newModeMenuAction(objectSubMenu, 0x16);
+	newModeMenuAction(objectSubMenu, 0x17);
+	newModeMenuAction(m_cookedModeMenu, 0x1f);
+	m_cookedModeMenu->addSeparator();
+	QMenu *pdcSubMenu = m_cookedModeMenu->addMenu(tr("PDC/reserved"));
+	newModeMenuAction(pdcSubMenu, 0x08);
+	newModeMenuAction(pdcSubMenu, 0x09);
+	newModeMenuAction(pdcSubMenu, 0x0a);
+	newModeMenuAction(pdcSubMenu, 0x0b);
+	newModeMenuAction(pdcSubMenu, 0x0c);
+	newModeMenuAction(pdcSubMenu, 0x0d);
+	newModeMenuAction(pdcSubMenu, 0x26);
+	QMenu *reservedRowSubMenu = pdcSubMenu->addMenu(tr("Reserved row"));
+	newModeMenuAction(reservedRowSubMenu, 0x02);
+	newModeMenuAction(reservedRowSubMenu, 0x03);
+	newModeMenuAction(reservedRowSubMenu, 0x05);
+	newModeMenuAction(reservedRowSubMenu, 0x06);
+	newModeMenuAction(reservedRowSubMenu, 0x0e);
+	newModeMenuAction(reservedRowSubMenu, 0x0f);
+	newModeMenuAction(reservedRowSubMenu, 0x14);
+	newModeMenuAction(reservedRowSubMenu, 0x19);
+	newModeMenuAction(reservedRowSubMenu, 0x1a);
+	newModeMenuAction(reservedRowSubMenu, 0x1b);
+	newModeMenuAction(reservedRowSubMenu, 0x1c);
+	newModeMenuAction(reservedRowSubMenu, 0x1d);
+	newModeMenuAction(reservedRowSubMenu, 0x1e);
+	QMenu *reservedColumnSubMenu = pdcSubMenu->addMenu(tr("Reserved column"));
+	newModeMenuAction(reservedColumnSubMenu, 0x24);
+	newModeMenuAction(reservedColumnSubMenu, 0x25);
+	newModeMenuAction(reservedColumnSubMenu, 0x26);
+
+	m_cookedModePushButton->setMenu(m_cookedModeMenu);

 	// Raw triplet values
 	QHBoxLayout *rawTripletLayout = new QHBoxLayout;
@@ -272,7 +333,7 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	m_objectSourceComboBox->addItem("POP");
 	m_objectSourceComboBox->addItem("GPOP");
 	invokeObjectLayout->addWidget(m_objectSourceComboBox);
-	connect(m_objectSourceComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](const int value) { updateModelFromCookedWidget(value, Qt::UserRole+1); updateCookedTripletParameters(m_x26View->currentIndex()); } );
+	connect(m_objectSourceComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](const int value) { updateModelFromCookedWidget(value, Qt::UserRole+1); updateAllCookedTripletWidgets(m_x26View->currentIndex()); } );

 	// Object required at which levels
 	m_objectRequiredAtLevelsComboBox = new QComboBox;
@@ -580,135 +641,7 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 {
 	const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();

-	// Find which triplettype the triplet is
-	const int oldCookedModeType = m_cookedModeTypeComboBox->currentIndex();
-	switch (modeExt) {
-		case 0x04:
-			m_cookedModeTypeComboBox->setCurrentIndex(0);
-			break;
-		case 0x00:
-		case 0x01:
-		case 0x07:
-		case 0x18:
-			m_cookedModeTypeComboBox->setCurrentIndex(1);
-			break;
-		case 0x20 ... 0x23:
-		case 0x27 ... 0x29:
-		case 0x2b ... 0x3f:
-			m_cookedModeTypeComboBox->setCurrentIndex(2);
-			break;
-		case 0x10 ... 0x13:
-		case 0x15 ... 0x17:
-			m_cookedModeTypeComboBox->setCurrentIndex(3);
-			break;
-		case 0x1f:
-			m_cookedModeTypeComboBox->setCurrentIndex(4);
-			break;
-		default:
-			m_cookedModeTypeComboBox->setCurrentIndex(5);
-	}
-
-	// If the triplettype has changed, update the triplet mode combobox
-	if (oldCookedModeType != m_cookedModeTypeComboBox->currentIndex())
-		updateCookedModeFromCookedType(-1);
-	for (int i=0; i<m_cookedModeComboBox->count(); i++)
-		if (m_cookedModeComboBox->itemData(i) == modeExt) {
-			m_cookedModeComboBox->blockSignals(true);
-			m_cookedModeComboBox->setCurrentIndex(i);
-			m_cookedModeComboBox->blockSignals(false);
-			break;
-		}
-
-	updateCookedTripletParameters(index);
-}
-
-void X26DockWidget::updateCookedModeFromCookedType(const int value)
-{
-	while (m_cookedModeComboBox->count() > 0)
-		m_cookedModeComboBox->removeItem(0);
-	// When called as a slot, "value" parameter would be the same as this currentIndex
-	switch (m_cookedModeTypeComboBox->currentIndex()) {
-		case 1:
-			m_cookedModeComboBox->addItem("select...", -1);
-			m_cookedModeComboBox->addItem("Full screen colour", 0x00);
-			m_cookedModeComboBox->addItem("Full row colour", 0x01);
-			m_cookedModeComboBox->addItem("Address row 0", 0x07);
-			m_cookedModeComboBox->addItem("DRCS mode", 0x18);
-			break;
-		case 2:
-			m_cookedModeComboBox->addItem("select...", -1);
-			m_cookedModeComboBox->addItem("Foreground colour", 0x20);
-			m_cookedModeComboBox->addItem("Background colour", 0x23);
-			m_cookedModeComboBox->addItem("Flash functions", 0x27);
-			m_cookedModeComboBox->addItem("Display attrs", 0x2c);
-			m_cookedModeComboBox->addItem("Font style L 3.5", 0x2e);
-			m_cookedModeComboBox->addItem("Mod G0 and G2", 0x28);
-			m_cookedModeComboBox->addItem("G0 character", 0x29);
-			m_cookedModeComboBox->addItem("G2 character", 0x2f);
-			m_cookedModeComboBox->addItem("G1 block mosaic", 0x21);
-			m_cookedModeComboBox->addItem("G3 at L 1.5", 0x22);
-			m_cookedModeComboBox->addItem("G3 at L 2.5", 0x2b);
-			m_cookedModeComboBox->addItem("DRCS character", 0x2d);
-			for (int i=0; i<16; i++)
-				m_cookedModeComboBox->addItem(QString("G0 diactricial ")+QString("%1").arg(i, 1, 16).toUpper(), 0x30 | i);
-			break;
-		case 3:
-			m_cookedModeComboBox->addItem("select...", -1);
-			m_cookedModeComboBox->addItem("Origin modifier", 0x10);
-			m_cookedModeComboBox->addItem("Invoke active obj", 0x11);
-			m_cookedModeComboBox->addItem("Invoke adaptive obj", 0x12);
-			m_cookedModeComboBox->addItem("Invoke passive obj", 0x13);
-			m_cookedModeComboBox->addItem("Define active obj", 0x15);
-			m_cookedModeComboBox->addItem("Define adaptive obj", 0x16);
-			m_cookedModeComboBox->addItem("Define passive obj", 0x17);
-			break;
-		case 5:
-			m_cookedModeComboBox->addItem("select...", -1);
-			m_cookedModeComboBox->addItem("Origin and Source", 0x08);
-			m_cookedModeComboBox->addItem("Month and day", 0x09);
-			m_cookedModeComboBox->addItem("Row + start hours", 0x0a);
-			m_cookedModeComboBox->addItem("Row + end hours", 0x0b);
-			m_cookedModeComboBox->addItem("Row + time offset", 0x0c);
-			m_cookedModeComboBox->addItem("Series ID and code", 0x0d);
-			m_cookedModeComboBox->addItem("Col + start/end mins", 0x26);
-			m_cookedModeComboBox->addItem("Reserved row 0x02", 0x02);
-			m_cookedModeComboBox->addItem("Reserved row 0x03", 0x03);
-			m_cookedModeComboBox->addItem("Reserved row 0x05", 0x05);
-			m_cookedModeComboBox->addItem("Reserved row 0x06", 0x06);
-			m_cookedModeComboBox->addItem("Reserved row 0x0e", 0x0e);
-			m_cookedModeComboBox->addItem("Reserved row 0x0f", 0x0f);
-			m_cookedModeComboBox->addItem("Reserved row 0x14", 0x14);
-			m_cookedModeComboBox->addItem("Reserved row 0x19", 0x19);
-			m_cookedModeComboBox->addItem("Reserved row 0x1a", 0x1a);
-			m_cookedModeComboBox->addItem("Reserved row 0x1b", 0x1b);
-			m_cookedModeComboBox->addItem("Reserved row 0x1c", 0x1c);
-			m_cookedModeComboBox->addItem("Reserved row 0x1d", 0x1d);
-			m_cookedModeComboBox->addItem("Reserved row 0x1e", 0x1e);
-			m_cookedModeComboBox->addItem("Reserved col 0x04", 0x04);
-			m_cookedModeComboBox->addItem("Reserved col 0x05", 0x05);
-			m_cookedModeComboBox->addItem("Reserved col 0x0a", 0x0a);
-			break;
-		case 0:
-			// When called as a slot the user set the combobox themself, so set the triplet mode immediately
-			if (value != -1) {
-				m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 2), 4, Qt::EditRole);
-				updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
-				updateCookedTripletParameters(m_x26View->currentIndex());
-			}
-			break;
-		case 4:
-			if (value != -1) {
-				m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 2), 31, Qt::EditRole);
-				updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
-				updateCookedTripletParameters(m_x26View->currentIndex());
-			}
-			break;
-	}
-}
-
-void X26DockWidget::updateCookedTripletParameters(const QModelIndex &index)
-{
-	const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
+	m_cookedModePushButton->setText(m_x26Model->modeTripletName(modeExt));

 	switch (modeExt) {
 		case 0x04: // Set active position
@@ -1004,21 +937,18 @@ void X26DockWidget::cookedColumnSpinBoxChanged(const int value)
 	updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
 }

-void X26DockWidget::cookedModeComboBoxChanged(const int value)
+void X26DockWidget::cookedModeMenuSelected(const int value)
 {
 	if (!m_x26View->currentIndex().isValid())
 		return;

-	// Avoid "select..."
-	if (m_cookedModeComboBox->itemData(value) == -1)
-		return;
-
-	m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 2), m_cookedModeComboBox->itemData(value).toInt(), Qt::EditRole);
+	m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 2), value, Qt::EditRole);

 	updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
-	updateCookedTripletParameters(m_x26View->currentIndex());
+	updateAllCookedTripletWidgets(m_x26View->currentIndex());
 }

+
 void X26DockWidget::updateModelFromCookedWidget(const int value, const int role)
 {
 	m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 0), value, role);
--- a/x26dockwidget.h
+++ b/x26dockwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -26,6 +26,7 @@
 #include <QDockWidget>
 #include <QGroupBox>
 #include <QLabel>
+#include <QMenu>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QSpinBox>
@@ -69,14 +70,12 @@ public slots:
 	void updateAllRawTripletSpinBoxes(const QModelIndex &);
 	void updateRawTripletDataSpinBox(const QModelIndex &);
 	void updateAllCookedTripletWidgets(const QModelIndex &);
-	void updateCookedModeFromCookedType(const int);
-	void updateCookedTripletParameters(const QModelIndex &);
 	void rawTripletAddressSpinBoxChanged(int);
 	void rawTripletModeSpinBoxChanged(int);
 	void rawTripletDataSpinBoxChanged(int);
 	void cookedRowSpinBoxChanged(const int);
 	void cookedColumnSpinBoxChanged(const int);
-	void cookedModeComboBoxChanged(const int);
+	void cookedModeMenuSelected(const int);
 	void updateModelFromCookedWidget(const int, const int);
 	void selectX26ListRow(int);

@@ -87,9 +86,9 @@ protected:
 private:
 	QTableView *m_x26View;
 	X26Model *m_x26Model;
-	QComboBox *m_cookedModeTypeComboBox;
 	QSpinBox *m_cookedRowSpinBox, *m_cookedColumnSpinBox;
-	QComboBox *m_cookedModeComboBox;
+	QMenu *m_cookedModeMenu;
+	QPushButton *m_cookedModePushButton;
 	QSpinBox *m_rawTripletAddressSpinBox, *m_rawTripletModeSpinBox, *m_rawTripletDataSpinBox;
 	QStackedLayout *m_rawOrCookedStackedLayout;
 	QComboBox *m_colourComboBox;
--- a/x26model.cpp
+++ b/x26model.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
--- a/x26model.h
+++ b/x26model.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -41,6 +41,8 @@ public:
 	bool removeRows(int position, int rows, const QModelIndex &index);
 //	Qt::ItemFlags flags(const QModelIndex &index) const;

+	const QString modeTripletName(int i) const { return m_modeTripletName[i]; }
+
 	// The x26commands classes manipulate the model but beginInsertRows and endInsertRows
 	// are protected methods, so we need to friend them
 	friend class InsertTripletCommand;
@@ -96,8 +98,8 @@ private:

 		// Column triplet modes
 		"Foreground colour",
-		"G1 character",
-		"G3 character, level 1.5",
+		"G1 block mosaic",
+		"G3 smooth mosaic, level 1.5",
 		"Background colour",

 		"Reserved 0x04",
@@ -108,12 +110,12 @@ private:
 		"Modified G0/G2 character set",
 		"G0 character",
 		"Reserved 0x0a",
-		"G3 character, level 2.5",
+		"G3 smooth mosaic, level 2.5",

 		"Display attributes",
 		"DRCS character",
-		"Font style",
-		"G2 character",
+		"Font style, level 3.5",
+		"G2 supplementary character",

 		"G0 character no diacritical",
 		"G0 character diacritical 1",
--- a/x26triplets.cpp
+++ b/x26triplets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -51,6 +51,23 @@ void X26Triplet::setAddressColumn(int addressColumn)
 	m_address = addressColumn;
 }

+void X26Triplet::setObjectLocalDesignationCode(int i)
+{
+	m_address = (m_address & 0x38) | (i >> 3);
+	m_data = (m_data & 0x0f) | ((i & 0x07) << 4);
+}
+
+void X26Triplet::setObjectLocalTripletNumber(int i)
+{
+	m_data = (m_data & 0x70) | i;
+}
+
+void X26Triplet::setObjectLocalIndex(int i)
+{
+	m_address = (m_address & 0x38) + (i >= 104); // Set bit 0 of address if triplet >= 8
+	m_data = (((i / 13) & 0x07) << 4) | (i % 13);
+}
+

 void X26TripletList::updateInternalData(int r)
 {
@@ -62,7 +79,7 @@ void X26TripletList::updateInternalData(int r)
 		activePosition.setColumn(m_list[r-1].m_activePositionColumn);
 	}

-	for (int i = r; i < m_list.size(); i++) {
+	for (int i=r; i < m_list.size(); i++) {
 		triplet = &m_list[i];
 		triplet->m_error = X26Triplet::NoError;
 		if (triplet->isRowTriplet()) {
@@ -94,10 +111,7 @@ void X26TripletList::updateInternalData(int r)
 					activePosition.reset();
 					// Make sure data field holds correct place of triplet
 					// otherwise the object won't appear
-					triplet->m_address &= 0x3c;
-					if (i >= 104) // Triplet 8
-						triplet->m_address |= 0x01;
-					triplet->m_data = (((i / 13) & 0x07) << 4) | (i % 13);
+					triplet->setObjectLocalIndex(i);
 					break;
 			};
 		// Column triplet: make sure that PDC and reserved triplets don't affect the Active Position
--- a/x26triplets.h
+++ b/x26triplets.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2022 Gavin MacGregor
 *
 * This file is part of QTeletextMaker.
 *
@@ -48,6 +48,13 @@ public:
 	void setAddressRow(int);
 	void setAddressColumn(int);

+	int objectLocalDesignationCode() const { return (((m_address & 0x01) << 3) | (m_data >> 4)); }
+	int objectLocalTripletNumber() const { return m_data & 0x0f; }
+	int objectLocalIndex() const { return objectLocalDesignationCode() * 13 + objectLocalTripletNumber(); }
+	void setObjectLocalDesignationCode(int);
+	void setObjectLocalTripletNumber(int);
+	void setObjectLocalIndex(int);
+
 	int activePositionRow() const { return m_activePositionRow; }
 	int activePositionColumn() const { return m_activePositionColumn; }
 	X26TripletError error() const { return m_error; }
Author	SHA1	Message	Date
G.K.MacGregor	4aa77395c0	Tag version 0.5.3-alpha	2022-01-05 21:45:17 +00:00
G.K.MacGregor	ae1aef63f9	Fix incorrect C8 and C14 bits on t42 exporing	2022-01-05 20:57:26 +00:00
G.K.MacGregor	406ab6c6ed	Update copyright notices to 2022	2021-12-31 21:40:36 +00:00
G.K.MacGregor	2da8da8c8e	Tag version 0.5.2-alpha	2021-12-28 12:33:58 +00:00
G.K.MacGregor	c2057e979d	Fix SC incorrectly saved as hexadecimal	2021-12-28 12:22:29 +00:00
G.K.MacGregor	f5402d216a	Show filename when asking about unsaved changes	2021-12-14 22:06:18 +00:00
G.K.MacGregor	43e3155a08	Tag version 0.5.1-alpha	2021-11-16 17:48:26 +00:00
G.K.MacGregor	fa29f25c91	Fix object definitions stuck on Level 2.5 only	2021-11-10 09:16:24 +00:00
G.K.MacGregor	dab124cf80	Remove unused variable	2021-09-15 14:42:03 +01:00
G.K.MacGregor	2f23c83d49	Clarify that font style is Level 3.5 only	2021-09-10 21:18:06 +01:00
G.K.MacGregor	3d68e384a5	Tag version 0.5-alpha	2021-09-10 17:14:27 +01:00
G.K.MacGregor	dc2f1cffe6	Remove debug config that sneaked in	2021-09-10 16:50:31 +01:00
G.K.MacGregor	f61dfbf654	Allow deeper zoom	2021-09-09 21:40:36 +01:00
G.K.MacGregor	e6175dc7f4	Clarify G1 and G3 characters as block and smooth mosaics	2021-09-09 19:05:10 +01:00
G.K.MacGregor	0ae8a93c21	Changed mode selector from 2 comboboxes to 1 menu	2021-09-09 18:57:55 +01:00
G.K.MacGregor	b921d14dbf	Add missing optimisation when deleting triplet	2021-09-09 17:18:15 +01:00
G.K.MacGregor	64943f01c5	Update "Invoke triplet" pointers automatically	2021-09-09 17:11:51 +01:00
G.K.MacGregor	279eaaad3e	Add wrappers to manipulate local object pointers	2021-09-09 14:44:52 +01:00
G.K.MacGregor	d8afb84861	Add exporting of X/28 packets as M/29	2021-09-06 22:07:14 +01:00
G.K.MacGregor	43691750ef	Fix wrong page number with magazine 8 on .t42 import	2021-09-05 18:29:36 +01:00
G.K.MacGregor	1104bc3c18	Add exporting of single page .t42 files, wrt #2	2021-09-05 18:24:51 +01:00
G.K.MacGregor	3e9f728cda	Fix incorrect bit shuffling on X/27/0 page links	2021-09-05 17:42:00 +01:00
G.K.MacGregor	2c16e541d5	Fix too long X/27/0 packet being returned	2021-09-05 16:49:21 +01:00
G.K.MacGregor	52f5bc5ebd	Enforce first digit of page number to 1-8	2021-08-18 10:40:07 +01:00
G.K.MacGregor	e466ef2afe	Change to .tti suffix when saving imported file	2021-08-17 18:40:57 +01:00
G.K.MacGregor	1e943c3f26	Add importing of single page .t42 files, wrt #2	2021-08-15 19:03:40 +01:00
G.K.MacGregor	798630bd50	Allow setting page number from int value	2021-08-08 19:34:14 +01:00
G.K.MacGregor	c356d0f5ae	Import M/29 packets	2021-08-03 21:49:32 +01:00