Tag version 0.6.1-alpha

Proportional font attributes are tracked within the decoder, but the effect
is not rendered.

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.
@@ -13,24 +14,25 @@ Features
 - Configurable zoom.
 - View teletext pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
 
-Although designed on and developed for Linux, the Qt 5 libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` will be enough to build QTeletextMaker.
+Although designed on and developed for Linux, the Qt 5 libraries are cross platform so a Windows executable can be built. A Windows executable can be found within the "Releases" link, compiled on a Linux host using [MXE](https://github.com/mxe/mxe) based on [these instructions](https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qtbase` should build and install the required dependencies to build QTeletextMaker.
 
 ## Building
 ### Linux
-Install the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Then type `qmake && make -j3` in a terminal, you can replace -j3 with the number of processor cores used for the compile process.
+Install the QtCore, QtGui and QtWidgets libraries and build headers, along with the qmake tool. Depending on how qmake is installed, type `qmake && make -j3` or `qmake5 && make -j3` in a terminal to build, you can replace -j3 with the number of processor cores used for the compile process.
 
-The above will place the qteletextmaker executable in the same directory as the source, type `./qteletextmaker` in the terminal to launch. Optionally, type `make install` afterwards to place the executable into /usr/local/bin.
+The above should place the qteletextmaker executable in the same directory as the source, type `./qteletextmaker` in the terminal to launch. Some Qt installs may place the executable into a "release" directory.
+
+Optionally, type `make install` afterwards to place the executable into /usr/local/bin.
 
 ## Current limitations
 The following X/26 enhancement triplets are not rendered by the editor, although the list is fully aware of them.
 - Invocation of Objects from POP and GPOP pages.
 - DRCS characters.
 - Modified G0 and G2 character set designation using X/26 triplets with mode 01000.
-- Full screen and full row colours set by Active Objects.
+- Proportional font spacing on Level 3.5
-- 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 +40,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 +56,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.

decode.h

@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2020-2023 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef DECODE_H
+#define DECODE_H
+
+#include <QList>
+#include <QMap>
+#include <QMultiMap>
+
+#include "levelonepage.h"
+
+class TeletextPageDecode : public QObject
+{
+	Q_OBJECT
+
+public:
+	enum CharacterFragment { NormalSize, DoubleHeightTopHalf, DoubleHeightBottomHalf, DoubleWidthLeftHalf, DoubleWidthRightHalf, DoubleSizeTopLeftQuarter, DoubleSizeTopRightQuarter, DoubleSizeBottomLeftQuarter, DoubleSizeBottomRightQuarter };
+	enum RowHeight { NormalHeight, TopHalf, BottomHalf };
+
+	TeletextPageDecode();
+	~TeletextPageDecode();
+	bool refresh(int r, int c) const { return m_refresh[r][c]; }
+	void setRefresh(int, int, bool);
+	void decodePage();
+	LevelOnePage *teletextPage() const { return m_levelOnePage; };
+	void setTeletextPage(LevelOnePage *);
+	void updateSidePanels();
+
+	unsigned char cellCharacterCode(int r, int c) const { return m_cell[r][c].character.code; };
+	int cellCharacterSet(int r, int c) const { return m_cell[r][c].character.set; };
+	int cellCharacterDiacritical(int r, int c) const { return m_cell[r][c].character.diacritical; };
+	int cellForegroundCLUT(int r, int c) const { return m_cell[r][c].attribute.foregroundCLUT; };
+	int cellBackgroundCLUT(int r, int c) const { return m_cell[r][c].attribute.backgroundCLUT; };
+	QColor cellForegroundQColor(int, int);
+	QColor cellBackgroundQColor(int, int);
+	QColor cellFlashForegroundQColor(int, int);
+	int cellFlashMode(int r, int c) const { return m_cell[r][c].attribute.flash.mode; };
+	int cellFlashRatePhase(int r, int c) const { return m_cell[r][c].attribute.flash.ratePhase; };
+	int cellFlash2HzPhaseNumber(int r, int c) const { return m_cell[r][c].attribute.flash.phase2HzShown; };
+	CharacterFragment cellCharacterFragment(int r, int c) const { return m_cell[r][c].fragment; };
+	bool cellBoxed(int r, int c) const { return m_cell[r][c].attribute.display.boxingWindow; };
+	bool cellConceal(int r, int c) const { return m_cell[r][c].attribute.display.conceal; };
+	bool cellUnderlined(int r, int c) const { return cellCharacterSet(r, c) < 24 ? m_cell[r][c].attribute.display.underlineSeparated : false; };
+	bool cellBold(int r, int c) const { return m_cell[r][c].attribute.style.bold; };
+	bool cellItalic(int r, int c) const { return m_cell[r][c].attribute.style.italic; };
+	bool cellProportional(int r, int c) const { return m_cell[r][c].attribute.style.proportional; };
+
+	bool level1MosaicAttribute(int r, int c) const { return m_cellLevel1Mosaic[r][c]; };
+	int level1CharSet(int r, int c) const { return m_cellLevel1CharSet[r][c]; };
+
+	RowHeight rowHeight(int r) const { return m_rowHeight[r]; };
+
+	QColor fullScreenQColor() const { return m_finalFullScreenQColor; };
+	QColor fullRowQColor(int r) const { return m_fullRowQColor[r]; };
+	int leftSidePanelColumns() const { return m_leftSidePanelColumns; };
+	int rightSidePanelColumns() const { return m_rightSidePanelColumns; };
+
+public slots:
+	void setLevel(int);
+
+signals:
+	void fullScreenColourChanged(QColor);
+	void fullRowColourChanged(int, QColor);
+	void sidePanelsChanged();
+
+protected:
+	inline void setFullScreenColour(int);
+	inline void setFullRowColour(int, int);
+
+	int m_finalFullScreenColour, m_level;
+	QColor m_finalFullScreenQColor;
+	int m_leftSidePanelColumns, m_rightSidePanelColumns;
+	const int m_foregroundRemap[8] = { 0,  0,  0,  8,  8, 16, 16, 16 };
+	const int m_backgroundRemap[8] = { 0,  8, 16,  8, 16,  8, 16, 24 };
+
+private:
+	class Invocation;
+
+	enum ColourPart { Foreground, Background, FlashForeground };
+
+	struct textCharacter {
+		unsigned char code=0x20;
+		int set=0;
+		int diacritical=0;
+	};
+
+	friend inline bool operator!=(const textCharacter &lhs, const textCharacter &rhs)
+	{
+		return lhs.code        != rhs.code ||
+	           lhs.set         != rhs.set  ||
+	           lhs.diacritical != rhs.diacritical;
+	}
+
+	struct flashFunctions {
+		int mode=0;
+		int ratePhase=0;
+		int phase2HzShown=0;
+	};
+
+	struct displayAttributes {
+		bool doubleHeight=false;
+		bool doubleWidth=false;
+		bool boxingWindow=false;
+		bool conceal=false;
+		bool invert=false;
+		bool underlineSeparated=false;
+	};
+
+	struct fontStyle {
+		bool proportional=false;
+		bool bold=false;
+		bool italic=false;
+	};
+
+	friend inline bool operator!=(const displayAttributes &lhs, const displayAttributes &rhs)
+	{
+		return lhs.doubleHeight       != rhs.doubleHeight       ||
+		       lhs.doubleWidth        != rhs.doubleWidth        ||
+		       lhs.boxingWindow       != rhs.boxingWindow       ||
+		       lhs.conceal            != rhs.conceal            ||
+		       lhs.invert             != rhs.invert             ||
+		       lhs.underlineSeparated != rhs.underlineSeparated;
+	}
+
+	struct textAttributes {
+		int foregroundCLUT=7;
+		int backgroundCLUT=0;
+		flashFunctions flash;
+		displayAttributes display;
+		fontStyle style;
+	};
+
+	friend inline bool operator!=(const textAttributes &lhs, const textAttributes &rhs)
+	{
+		return lhs.foregroundCLUT      != rhs.foregroundCLUT      ||
+		       lhs.backgroundCLUT      != rhs.backgroundCLUT      ||
+		       lhs.flash.mode          != rhs.flash.mode          ||
+		       lhs.flash.ratePhase     != rhs.flash.ratePhase     ||
+		       lhs.flash.phase2HzShown != rhs.flash.phase2HzShown ||
+		       lhs.display             != rhs.display             ||
+		       lhs.style.proportional  != rhs.style.proportional  ||
+		       lhs.style.bold          != rhs.style.bold          ||
+		       lhs.style.italic        != rhs.style.italic;
+	}
+
+	struct textCell {
+		textCharacter character;
+		textAttributes attribute;
+		CharacterFragment fragment=NormalSize;
+	};
+
+	friend inline bool operator!=(const textCell &lhs, const textCell &rhs)
+	{
+		return lhs.character != rhs.character ||
+		       lhs.attribute != rhs.attribute ||
+		       lhs.fragment  != rhs.fragment;
+	}
+
+	struct textPainter {
+		textAttributes attribute;
+		textCell result;
+		textCell rightHalfCell;
+		textCell bottomHalfCell[72];
+
+		int g0CharSet=0;
+		int g2CharSet=7;
+
+		int styleSpreadRows=0;
+		int setProportionalRows[72], clearProportionalRows[72];
+		int setBoldRows[72], clearBoldRows[72];
+		int setItalicRows[72], clearItalicRows[72];
+	};
+
+	const QMap<int, int> m_level1CharacterMap {
+		{ 0x00, 12 }, { 0x01, 15 }, { 0x02, 22 }, { 0x03, 16 }, { 0x04, 14 }, { 0x05, 19 }, { 0x06, 11 },
+		{ 0x08, 18 }, { 0x09, 15 }, { 0x0a, 22 }, { 0x0b, 16 }, { 0x0c, 14 }, { 0x0e, 11 },
+		{ 0x10, 12 }, { 0x11, 15 }, { 0x12, 22 }, { 0x13, 16 }, { 0x14, 14 }, { 0x15, 19 }, { 0x16, 23 },
+		{ 0x1d, 21 }, { 0x1f, 20 },
+		{ 0x20,  1 }, { 0x21, 15 }, { 0x22, 13 }, { 0x23, 17 }, { 0x24,  2 }, { 0x25,  3 }, { 0x26, 11 },
+		{ 0x36, 23 }, { 0x37,  4 },
+		{ 0x40, 12 }, { 0x44, 14 }, { 0x47,  5 },
+		{ 0x55,  6 }, { 0x57,  5 }
+	};
+	const QMap<int, int> m_g0CharacterMap {
+		{ 0x20,  1 }, { 0x24,  2 }, { 0x25,  3 },
+		{ 0x37,  4 },
+		{ 0x47,  5 },
+		{ 0x55,  6 }, { 0x57,  5 }
+	};
+	const QMap<int, int> m_g2CharacterMap {
+		{ 0x20,  8 }, { 0x24,  8 }, { 0x25,  8 },
+		{ 0x37,  9 },
+		{ 0x40, 10 }, { 0x44, 10 }, { 0x47, 10 },
+		{ 0x55, 10 }, { 0x57, 10 }
+	};
+
+	class Invocation
+	{
+	public:
+		Invocation();
+
+		X26TripletList *tripletList() const { return m_tripletList; };
+		void clear();
+		void setTripletList(X26TripletList *);
+		int startTripletNumber() const { return m_startTripletNumber; };
+		void setStartTripletNumber(int);
+		int endTripletNumber() const { return m_endTripletNumber; };
+		void setEndTripletNumber(int);
+		int originRow() const { return m_originRow; };
+		int originColumn() const { return m_originColumn; };
+		void setOrigin(int, int);
+		void buildMap(int);
+
+		QList<QPair<int, int>> charPositions() const { return m_characterMap.uniqueKeys(); };
+		QList<QPair<int, int>> attrPositions() const { return m_attributeMap.uniqueKeys(); };
+		QList<X26Triplet> charactersMappedAt(int r, int c) const { return m_characterMap.values(qMakePair(r, c)); };
+		QList<X26Triplet> attributesMappedAt(int r, int c) const { return m_attributeMap.values(qMakePair(r, c)); };
+		int rightMostColumn(int r) const { return m_rightMostColumn.value(r, -1); };
+		int fullScreenColour() const { return m_fullScreenCLUT; };
+		QList<X26Triplet> fullRowColoursMappedAt(int r) const { return m_fullRowCLUTMap.values(r); };
+
+	private:
+		X26TripletList *m_tripletList;
+		int m_startTripletNumber, m_endTripletNumber;
+		int m_originRow, m_originColumn;
+		// QPair is row and column
+		QMultiMap<QPair<int, int>, X26Triplet> m_characterMap;
+		QMultiMap<QPair<int, int>, X26Triplet> m_attributeMap;
+		QMap<int, int> m_rightMostColumn;
+		int m_fullScreenCLUT;
+		QMultiMap<int, X26Triplet> m_fullRowCLUTMap;
+	};
+
+	static int s_instances;
+	static textPainter s_blankPainter;
+
+	void decodeRow(int r);
+	QColor cellQColor(int, int, ColourPart);
+	textCell& cellAtCharacterOrigin(int, int);
+	void buildInvocationList(Invocation &, int);
+	textCharacter characterFromTriplets(const QList<X26Triplet>);
+	inline void rotateFlashMovement(flashFunctions &);
+
+	bool m_refresh[25][72];
+	textCell m_cell[25][72];
+	bool m_cellLevel1Mosaic[25][40];
+	int m_cellLevel1CharSet[25][40];
+	LevelOnePage* m_levelOnePage;
+	int m_fullRowColour[25];
+	QColor m_fullRowQColor[25];
+	QList<Invocation> m_invocations[3];
+	Invocation m_localEnhancements;
+	textPainter m_level1ActivePainter;
+	QList<textPainter> m_adapPassPainter[2];
+	int m_level1DefaultCharSet, m_level1SecondCharSet;
+	int m_defaultG0andG2, m_secondG0andG2;
+
+	RowHeight m_rowHeight[25];
+};
+
+#endif

document.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -94,6 +94,25 @@ bool TeletextDocument::isEmpty() const
 	return true;
 }
 
+void TeletextDocument::clear()
+{
+	LevelOnePage *blankSubPage = new LevelOnePage;
+
+	m_subPages.insert(m_subPages.begin(), blankSubPage);
+
+	emit aboutToChangeSubPage();
+	m_currentSubPageIndex = 0;
+	m_clutModel->setSubPage(m_subPages[0]);
+	emit subPageSelected();
+	cancelSelection();
+	m_undoStack->clear();
+
+	for (int i=m_subPages.size()-1; i>0; i--) {
+		delete(m_subPages[i]);
+		m_subPages.erase(m_subPages.begin()+i);
+	}
+}
+
 /*
 void TeletextDocument::setPageFunction(PageFunctionEnum newPageFunction)
 {
@@ -182,17 +201,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 +214,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 +225,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;

document.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -56,6 +56,7 @@ public:
 	~TeletextDocument();
 
 	bool isEmpty() const;
+	void clear();
 
 	PageFunctionEnum pageFunction() const { return m_pageFunction; }
 //	void setPageFunction(PageFunctionEnum);
@@ -74,7 +75,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);

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

keymap.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -528,15 +528,15 @@ static const QMap<QChar, char> keymapping[24] = {
 
 // Native scan codes to toggle mosaic bits - different platforms have different scan codes!
 // Order is top left, top right, middle left, middle right, bottom left, bottom right,
-// invert, set all, clear all
+// invert, set all, clear all, dither
 
 #ifdef Q_OS_UNIX
-static constexpr quint32 mosaicNativeScanCodes[9] = {
+static constexpr quint32 mosaicNativeScanCodes[10] = {
-	0x18, 0x19, 0x26, 0x27, 0x34, 0x35, 0x1b, 0x29, 0x36
+	0x18, 0x19, 0x26, 0x27, 0x34, 0x35, 0x1b, 0x29, 0x36, 0x28
 };
 #elif defined(Q_OS_WIN)
-static constexpr quint32 mosaicNativeScanCodes[9] = {
+static constexpr quint32 mosaicNativeScanCodes[10] = {
-	0x10, 0x11, 0x1e, 0x1f, 0x2c, 0x2d, 0x13, 0x21, 0x2e
+	0x10, 0x11, 0x1e, 0x1f, 0x2c, 0x2d, 0x13, 0x21, 0x2e, 0x20
 };
 #else
 #define QTTM_NONATIVESCANCODES

levelonecommands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -106,6 +106,8 @@ ToggleMosaicBitCommand::ToggleMosaicBitCommand(TeletextDocument *teletextDocumen
 	m_oldCharacter = teletextDocument->currentSubPage()->character(m_row, m_column);
 	if (bitToToggle == 0x20 || bitToToggle == 0x7f)
 		m_newCharacter = bitToToggle;
+	else if (bitToToggle == 0x66)
+		m_newCharacter = (m_row & 1) ? 0x66 : 0x39;
 	else
 		m_newCharacter = m_oldCharacter ^ bitToToggle;
 
@@ -413,8 +415,18 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 	if (m_selectionActive) {
 		m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
 		m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
+		m_pasteTopRow = m_teletextDocument->selectionTopRow();
+		m_pasteBottomRow = m_teletextDocument->selectionBottomRow();
+		m_pasteLeftColumn = m_teletextDocument->selectionLeftColumn();
+		m_pasteRightColumn = m_teletextDocument->selectionRightColumn();
+	} else {
+		m_pasteTopRow = m_row;
+		m_pasteLeftColumn = m_column;
+		// m_pasteBottomRow and m_pasteRightColumn will be filled in later
+		// when the size of the clipboard data is known
 	}
 
+	// Zero size here represents invalid or empty clipboard data
 	m_clipboardDataHeight = m_clipboardDataWidth = 0;
 
 	// Try to get something from the clipboard
@@ -422,6 +434,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 	nativeData = mimeData->data("application/x-teletext");
 	if (nativeData.size() > 2) {
 		// Native clipboard data: we put it there ourselves
+		m_plainText = false;
 		m_clipboardDataHeight = nativeData.at(0);
 		m_clipboardDataWidth = nativeData.at(1);
 
@@ -429,25 +442,119 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 		if (m_clipboardDataHeight > 0 && m_clipboardDataWidth > 0 && m_clipboardDataHeight <= 25 && m_clipboardDataWidth <= 40 && nativeData.size() == m_clipboardDataHeight * m_clipboardDataWidth + 2)
 			for (int r=0; r<m_clipboardDataHeight; r++)
 				m_pastingCharacters.append(nativeData.mid(2 + r * m_clipboardDataWidth, m_clipboardDataWidth));
-		else
+		else {
 			// Invalidate
 			m_clipboardDataHeight = m_clipboardDataWidth = 0;
+			return;
+		}
+
+		if (!m_selectionActive) {
+			m_pasteBottomRow = m_row + m_clipboardDataHeight - 1;
+			m_pasteRightColumn = m_column + m_clipboardDataWidth - 1;
+		}
 	} else if (mimeData->hasText()) {
 		// Plain text
+		m_plainText = true;
+
+		const int rightColumn = m_selectionActive ? m_pasteRightColumn : 39;
+
+		// Parse line-feeds in the clipboard data
 		QStringList plainTextData = mimeData->text().split(QRegExp("\n|\r\n|\r"));
 
+		// "if" statement will be false if clipboard data is a single line of text
+		// that will fit from the cursor position
+		if (plainTextData.size() != 1 || m_pasteLeftColumn + plainTextData.at(0).size() - 1 > rightColumn) {
+			bool wrappingNeeded = false;
+
+			if (!m_selectionActive) {
+				// If selection is NOT active, use the full width of the page to paste.
+				// The second and subsequent lines will start at column 1, unless the
+				// cursor is explicitly on column 0.
+				if (m_pasteLeftColumn != 0)
+					m_pasteLeftColumn = 1;
+
+				// Check if first word in the first line will fit from the cursor position
+				bool firstWordFits = true;
+				const int firstSpace = plainTextData.at(0).indexOf(' ');
+
+				if (firstSpace == -1 && m_column + plainTextData.at(0).size() > 40)
+					firstWordFits = false; // Only one word in first line, and it won't fit
+				else if (m_column + firstSpace > 40)
+					firstWordFits = false; // First word in first line won't fit
+
+				// If the first word WILL fit at the cursor position, pad the first line
+				// to match the cursor position using null characters.
+				// In the QString null characters represent character cells in the
+				// pasting rectangle that won't overwrite what's on the page.
+				// If the first word WON'T fit, start pasting at the beginning of the next row.
+				if (firstWordFits)
+					plainTextData[0] = QString(m_column-m_pasteLeftColumn, QChar::Null) + plainTextData.at(0);
+				else if (m_pasteTopRow < 24)
+					m_pasteTopRow++;
+				else
+					return;
+			}
+
+			const int pasteWidth = rightColumn - m_pasteLeftColumn + 1;
+
+			// Find out if we need to word-wrap
+			for (int i=0; i<plainTextData.size(); i++)
+				if (plainTextData.at(i).size() > pasteWidth) {
+					wrappingNeeded = true;
+					break;
+				}
+
+			if (wrappingNeeded) {
+				QStringList wrappedText;
+
+				for (int i=0; i<plainTextData.size(); i++) {
+					// Split this line into individual words
+					QStringList lineWords = plainTextData.at(i).split(' ');
+
+					// If there's any words which are too long to fit,
+					// break them across multiple lines
+					for (int j=0; j<lineWords.size(); j++)
+						if (lineWords.at(j).size() > pasteWidth) {
+							lineWords.insert(j+1, lineWords.at(j).mid(pasteWidth));
+							lineWords[j].truncate(pasteWidth);
+						}
+
+					// Now reassemble the words into lines that will fit
+					QString currentLine = lineWords.at(0);
+
+					for (int j=1; j<lineWords.size(); j++)
+						if (currentLine.size() + 1 + lineWords.at(j).size() <= pasteWidth)
+							currentLine.append(' ' + lineWords.at(j));
+						else {
+							wrappedText.append(currentLine);
+							currentLine = lineWords.at(j);
+						}
+
+					wrappedText.append(currentLine);
+				}
+				plainTextData.swap(wrappedText);
+			}
+		}
+
 		m_clipboardDataHeight = plainTextData.size();
 		m_clipboardDataWidth = 0;
 
+		// Convert the unicode clipboard text into teletext bytes matching the current Level 1
+		// character set of this page
 		for (int r=0; r<m_clipboardDataHeight; r++) {
 			m_pastingCharacters.append(QByteArray());
 			for (int c=0; c<plainTextData.at(r).size(); c++) {
-				// Try to map the unicode character to the current Level 1 character set of this page
-
 				char convertedChar;
 				const QChar charToConvert = plainTextData.at(r).at(c);
 
-				if (keymapping[pageCharSet].contains(charToConvert))
+				// Map a null character in the QString to 0xff (or -1)
+				// In the QByteArray 0xff bytes represent character cells in the pasting rectangle
+				// that won't overwrite what's on the page
+				if (charToConvert == QChar::Null)
+					convertedChar = -1;
+				else if (charToConvert >= 0x01 && charToConvert <= 0x1f)
+					convertedChar = ' ';
+				else if (keymapping[pageCharSet].contains(charToConvert))
 					// Remapped character or non-Latin character converted successfully
 					convertedChar = keymapping[pageCharSet].value(charToConvert);
 				else {
@@ -463,26 +570,19 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 			}
 			m_clipboardDataWidth = qMax(m_pastingCharacters.at(r).size(), m_clipboardDataWidth);
 		}
-		// Pad short lines with spaces to make a box
+		// Pad the end of short lines with spaces to make a box
 		for (int r=0; r<m_clipboardDataHeight; r++)
 			m_pastingCharacters[r] = m_pastingCharacters.at(r).leftJustified(m_clipboardDataWidth);
+
+		if (!m_selectionActive) {
+			m_pasteBottomRow = m_pasteTopRow + m_clipboardDataHeight - 1;
+			m_pasteRightColumn = m_pasteLeftColumn + m_clipboardDataWidth - 1;
+		}
 	}
 
 	if (m_clipboardDataWidth == 0 || m_clipboardDataHeight == 0)
 		return;
 
-	if (m_selectionActive) {
-		m_pasteTopRow = m_teletextDocument->selectionTopRow();
-		m_pasteBottomRow = m_teletextDocument->selectionBottomRow();
-		m_pasteLeftColumn = m_teletextDocument->selectionLeftColumn();
-		m_pasteRightColumn = m_teletextDocument->selectionRightColumn();
-	} else {
-		m_pasteTopRow = m_row;
-		m_pasteBottomRow = m_row + m_clipboardDataHeight - 1;
-		m_pasteLeftColumn = m_column;
-		m_pasteRightColumn = m_column + m_clipboardDataWidth - 1;
-	}
-
 	// Store copy of the characters that we're about to overwrite
 	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
 		QByteArray rowArray;
@@ -517,11 +617,21 @@ void PasteCommand::redo()
 		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
 			// Guard against size of pasted block going beyond last line or column
 			if (r < 25 && c < 40) {
-				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_pastingCharacters[arrayR].at(arrayC++));
+				// Check for 0xff bytes using "-1"
+				// gcc complains about "comparision always true due to limited range"
+				if (m_pastingCharacters.at(arrayR).at(arrayC) != -1)
+					m_teletextDocument->currentSubPage()->setCharacter(r, c, m_pastingCharacters.at(arrayR).at(arrayC));
+
+				arrayC++;
 
 				// If paste area is wider than clipboard data, repeat the pattern
-				if (arrayC == m_clipboardDataWidth)
+				// if it wasn't plain text
-					arrayC = 0;
+				if (arrayC == m_clipboardDataWidth) {
+					if (!m_plainText)
+						arrayC = 0;
+					else
+						break;
+				}
 			}
 
 		if (r < 25)
@@ -529,8 +639,13 @@ void PasteCommand::redo()
 
 		arrayR++;
 		// If paste area is taller than clipboard data, repeat the pattern
-		if (arrayR == m_clipboardDataHeight)
+		// if it wasn't plain text
-			arrayR = 0;
+		if (arrayR == m_clipboardDataHeight) {
+			if (!m_plainText)
+				arrayR = 0;
+			else
+				break;
+		}
 	}
 
 	if (m_selectionActive) {
@@ -556,8 +671,11 @@ void PasteCommand::undo()
 		arrayC = 0;
 		for (int c=m_pasteLeftColumn; c<=m_pasteRightColumn; c++)
 			// Guard against size of pasted block going beyond last line or column
-			if (r < 25 && c < 40)
+			if (r < 25 && c < 40) {
-				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC++));
+				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC));
+
+				arrayC++;
+			}
 
 		if (r < 25)
 			emit m_teletextDocument->contentsChange(r);

levelonecommands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -179,7 +179,7 @@ private:
 	int m_pasteTopRow, m_pasteBottomRow, m_pasteLeftColumn, m_pasteRightColumn;
 	int m_clipboardDataHeight, m_clipboardDataWidth;
 	int m_selectionCornerRow, m_selectionCornerColumn;
-	bool m_selectionActive;
+	bool m_selectionActive, m_plainText;
 };
 #endif // !QT_NO_CLIPBOARD
 

levelonepage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -25,6 +25,8 @@
 
 #include "levelonepage.h"
 
+#include "x26triplets.h"
+
 LevelOnePage::LevelOnePage()
 {
 	m_enhancements.reserve(maxEnhancements());
@@ -125,12 +127,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[37] = 0xf;
-		result[44] = result[45] = 0;
+		result[38] = result[39] = 0;
 
 		return result;
 	}
@@ -295,7 +297,7 @@ bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
 			return !isPaletteDefault(16, 31);
 		}
 		if (designationCode == 4)
-			return !isPaletteDefault(0,15);
+			return !isPaletteDefault(0, 15);
 	}
 
 	return PageBase::packetExists(packetNumber, designationCode);
@@ -381,6 +383,9 @@ QColor LevelOnePage::CLUTtoQColor(int index, int renderLevel) const
 {
 	int colour12Bit = CLUT(index, renderLevel);
 
+	if (index == 8)
+		return QColor(Qt::transparent);
+
 	return QColor(((colour12Bit & 0xf00) >> 8) * 17, ((colour12Bit & 0x0f0) >> 4) * 17, (colour12Bit & 0x00f) * 17);
 }
 
@@ -391,7 +396,7 @@ bool LevelOnePage::isPaletteDefault(int colour) const
 
 bool LevelOnePage::isPaletteDefault(int fromColour, int toColour) const
 {
-	for (int i=fromColour; i<toColour; i++)
+	for (int i=fromColour; i<=toColour; i++)
 		if (m_CLUT[i] != m_defaultCLUT[i])
 			return false;
 
@@ -400,17 +405,21 @@ bool LevelOnePage::isPaletteDefault(int fromColour, int toColour) const
 
 int LevelOnePage::levelRequired() const
 {
+	// X/28/4 present i.e. CLUTs 0 or 1 redefined - Level 3.5
 	if (!isPaletteDefault(0, 15))
 		return 3;
 
 	// TODO Check for X/28/1 for DCLUT for mode 1-3 DRCS characters - return 3
 
-	int levelSeen = (!isPaletteDefault(16,31) || m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf) ? 2 : 0;
+	// Assume Level 2.5 if any X/28 page enhancements are present, otherwise assume Level 1
+	int levelSeen = (!isPaletteDefault(16, 31) || m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf) ? 2 : 0;
 
+	// If there's no X/26 triplets, exit here as Level 1 or 2.5
 	if (m_enhancements.isEmpty())
 		return levelSeen;
 
 	for (int i=0; i<m_enhancements.size(); i++) {
+		// Font style - Level 3.5 only triplet
 		if (m_enhancements.at(i).modeExt() == 0x2e) // Font style
 			return 3;
 
@@ -423,9 +432,10 @@ int LevelOnePage::levelRequired() const
 				case 0x22: // G3 character @ Level 1.5
 				case 0x2f: // G2 character
 				case 0x30 ... 0x3f: // G0 character with diacritical
-					levelSeen = qMax(levelSeen, 1);
+					levelSeen = 1;
 					break;
 			}
+
 		if (levelSeen < 2)
 			switch (m_enhancements.at(i).modeExt()) {
 				// Check for Level 2.5 triplets
@@ -433,25 +443,26 @@ int LevelOnePage::levelRequired() const
 				case 0x01: // Full row colour
 				case 0x10 ... 0x13: // Origin Modifer and Object Invocation
 				case 0x15 ... 0x17: // Object Definition
-					// Check if Object Defition is required only at Level 3.5
-					if ((m_enhancements.at(i).address() & 0x18) == 0x10)
-						return 3;
-					else
-						levelSeen = qMax(levelSeen, 2);
-					break;
 				case 0x18: // DRCS Mode
-					// Check if DRCS is required only at Level 3.5
-					if ((m_enhancements.at(i).data() & 0x30) == 0x20)
-						return 3;
-					else
-						levelSeen = qMax(levelSeen, 2);
-					break;
 				case 0x20: // Foreground colour
 				case 0x21: // G1 character
 				case 0x23: // Background colour
 				case 0x27 ... 0x29: // Flash functions, G0 and G2 charset designation, G0 character @ Level 2.5
 				case 0x2b ... 0x2d: // G3 character @ Level 2.5, display attributes, DRCS character
-					levelSeen = qMax(levelSeen, 2);
+					levelSeen = 2;
+					break;
+			}
+
+		if (levelSeen == 2)
+			switch (m_enhancements.at(i).modeExt()) {
+				// Check for triplets with "required at Level 3.5 only" parameters
+				case 0x15 ... 0x17: // Object Definition
+					if ((m_enhancements.at(i).address() & 0x18) == 0x10)
+						return 3;
+					break;
+				case 0x18: // DRCS Mode
+					if ((m_enhancements.at(i).data() & 0x30) == 0x20)
+						return 3;
 					break;
 			}
 	}

levelonepage.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

loadsave.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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))

loadsave.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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);
 

main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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.6.1-alpha");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

mainwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -38,6 +38,7 @@
 
 #include "mainwidget.h"
 
+#include "decode.h"
 #include "document.h"
 #include "keymap.h"
 #include "levelonecommands.h"
@@ -52,16 +53,18 @@ TeletextWidget::TeletextWidget(QFrame *parent) : QFrame(parent)
 	this->setAttribute(Qt::WA_InputMethodEnabled, true);
 	m_teletextDocument = new TeletextDocument();
 	m_levelOnePage = m_teletextDocument->currentSubPage();
-	m_pageRender.setTeletextPage(m_levelOnePage);
+	m_pageDecode.setTeletextPage(m_levelOnePage);
+	m_pageRender.setDecoder(&m_pageDecode);
 	m_insertMode = false;
 	m_selectionInProgress = false;
 	setFocusPolicy(Qt::StrongFocus);
 	m_flashTiming = m_flashPhase = 0;
 	connect(&m_pageRender, &TeletextPageRender::flashChanged, this, &TeletextWidget::updateFlashTimer);
-	connect(&m_pageRender, &TeletextPageRender::sidePanelsChanged, this, &TeletextWidget::changeSize);
+	connect(&m_pageDecode, &TeletextPageDecode::sidePanelsChanged, this, &TeletextWidget::changeSize);
 	connect(m_teletextDocument, &TeletextDocument::subPageSelected, this, &TeletextWidget::subPageSelected);
 	connect(m_teletextDocument, &TeletextDocument::contentsChange, this, &TeletextWidget::refreshRow);
 	connect(m_teletextDocument, &TeletextDocument::refreshNeeded, this, &TeletextWidget::refreshPage);
+	connect(m_teletextDocument, &TeletextDocument::colourChanged, &m_pageRender, &TeletextPageRender::colourChanged);
 }
 
 TeletextWidget::~TeletextWidget()
@@ -85,20 +88,24 @@ void TeletextWidget::inputMethodEvent(QInputMethodEvent* event)
 void TeletextWidget::subPageSelected()
 {
 	m_levelOnePage = m_teletextDocument->currentSubPage();
-	m_pageRender.setTeletextPage(m_levelOnePage);
+	m_pageDecode.setTeletextPage(m_levelOnePage);
-	refreshPage();
+	m_pageDecode.decodePage();
+	m_pageRender.renderPage(true);
+	update();
 }
 
 void TeletextWidget::refreshRow(int rowChanged)
 {
-	m_pageRender.renderPage(rowChanged);
+	Q_UNUSED(rowChanged);
+
+	// TODO trace signals where this is called so we can remove this
+	m_pageDecode.decodePage();
 	update();
 }
 
 void TeletextWidget::refreshPage()
 {
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 	update();
 }
 
@@ -107,11 +114,12 @@ void TeletextWidget::paintEvent(QPaintEvent *event)
 	Q_UNUSED(event);
 	QPainter widgetPainter(this);
 
-	widgetPainter.drawPixmap(m_pageRender.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 0, 0, 480, 250);
+	m_pageRender.renderPage();
-	if (m_pageRender.leftSidePanelColumns())
+	widgetPainter.drawPixmap(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 0, 0, 480, 250);
-		widgetPainter.drawPixmap(0, 0, *m_pageRender.pagePixmap(m_flashPhase), 864-m_pageRender.leftSidePanelColumns()*12, 0, m_pageRender.leftSidePanelColumns()*12, 250);
+	if (m_pageDecode.leftSidePanelColumns())
-	if (m_pageRender.rightSidePanelColumns())
+		widgetPainter.drawPixmap(0, 0, *m_pageRender.pagePixmap(m_flashPhase), 864-m_pageDecode.leftSidePanelColumns()*12, 0, m_pageDecode.leftSidePanelColumns()*12, 250);
-		widgetPainter.drawPixmap(480+m_pageRender.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 480, 0, m_pageRender.rightSidePanelColumns()*12, 250);
+	if (m_pageDecode.rightSidePanelColumns())
+		widgetPainter.drawPixmap(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.pagePixmap(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
 }
 
 void TeletextWidget::updateFlashTimer(int newFlashTimer)
@@ -155,15 +163,21 @@ void TeletextWidget::setInsertMode(bool insertMode)
 	m_insertMode = insertMode;
 }
 
-void TeletextWidget::toggleReveal(bool revealOn)
+void TeletextWidget::setReveal(bool reveal)
 {
-	m_pageRender.setReveal(revealOn);
+	m_pageRender.setReveal(reveal);
 	update();
 }
 
-void TeletextWidget::toggleMix(bool mixOn)
+void TeletextWidget::setMix(bool mix)
 {
-	m_pageRender.setMix(mixOn);
+	m_pageRender.setMix(mix);
+	update();
+}
+
+void TeletextWidget::setShowControlCodes(bool showControlCodes)
+{
+	m_pageRender.setShowControlCodes(showControlCodes);
 	update();
 }
 
@@ -171,8 +185,8 @@ void TeletextWidget::setControlBit(int bitNumber, bool active)
 {
 	m_levelOnePage->setControlBit(bitNumber, active);
 	if (bitNumber == 1 || bitNumber == 2) {
-		m_pageRender.decodePage();
+		m_pageDecode.decodePage();
-		m_pageRender.renderPage();
+		m_pageRender.renderPage(true);
 	}
 }
 
@@ -189,31 +203,27 @@ void TeletextWidget::setDefaultNOS(int newDefaultNOS)
 void TeletextWidget::setDefaultScreenColour(int newColour)
 {
 	m_levelOnePage->setDefaultScreenColour(newColour);
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 }
 
 void TeletextWidget::setDefaultRowColour(int newColour)
 {
 	m_levelOnePage->setDefaultRowColour(newColour);
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 	update();
 }
 
 void TeletextWidget::setColourTableRemap(int newMap)
 {
 	m_levelOnePage->setColourTableRemap(newMap);
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 	update();
 }
 
 void TeletextWidget::setBlackBackgroundSubst(bool substOn)
 {
 	m_levelOnePage->setBlackBackgroundSubst(substOn);
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 	update();
 }
 
@@ -225,18 +235,18 @@ void TeletextWidget::setSidePanelWidths(int newLeftSidePanelColumns, int newRigh
 		m_levelOnePage->setSidePanelColumns((newLeftSidePanelColumns == 16) ? 0 : newLeftSidePanelColumns);
 	else
 		m_levelOnePage->setSidePanelColumns((newRightSidePanelColumns == 0) ? 0 : 16-newRightSidePanelColumns);
-	m_pageRender.updateSidePanels();
+	m_pageDecode.updateSidePanels();
 }
 
 void TeletextWidget::setSidePanelAtL35Only(bool newSidePanelAtL35Only)
 {
 	m_levelOnePage->setSidePanelStatusL25(!newSidePanelAtL35Only);
-	m_pageRender.updateSidePanels();
+	m_pageDecode.updateSidePanels();
 }
 
 void TeletextWidget::changeSize()
 {
-	setFixedSize(QSize(480+(pageRender()->leftSidePanelColumns()+pageRender()->rightSidePanelColumns())*12, 250));
+	setFixedSize(QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250));
 	emit sizeChanged();
 }
 
@@ -245,16 +255,16 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 	if (event->key() < 0x01000000) {
 		// A character-typing key was pressed
 		// Try to keymap it, if not keymapped then plain ASCII code (may be) returned
-		char mappedKeyPress = keymapping[m_pageRender.level1CharSet(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn())].value(event->text().at(0), *qPrintable(event->text()));
+		char mappedKeyPress = keymapping[m_pageDecode.level1CharSet(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn())].value(event->text().at(0), *qPrintable(event->text().at(0)));
-		if (mappedKeyPress < 0x20)
+		if (mappedKeyPress >= 0x00 && mappedKeyPress <= 0x1f)
 			return;
 		// If outside ASCII map then the character can't be represented by current Level 1 character set
 		// Map it to block character so it doesn't need to be inserted-between later on
 		if (mappedKeyPress & 0x80)
 			mappedKeyPress = 0x7f;
-		if (m_pageRender.level1MosaicAttribute(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn()) && (mappedKeyPress < 0x40 || mappedKeyPress > 0x5f)) {
+		if (m_pageDecode.level1MosaicAttribute(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn()) && (mappedKeyPress < 0x40 || mappedKeyPress > 0x5f)) {
 			// We're on a mosaic and a blast-through character was NOT pressed
-			if (event->key() >= Qt::Key_1 && event->key() <= Qt::Key_9 && event->modifiers() & Qt::KeypadModifier) {
+			if (event->key() >= Qt::Key_0 && event->key() <= Qt::Key_9 && event->modifiers() & Qt::KeypadModifier) {
 				switch (event->key()) {
 					case Qt::Key_7:
 						toggleCharacterBit(0x01); // Top left
@@ -283,6 +293,9 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 					case Qt::Key_3:
 						toggleCharacterBit(0x20); // Clear all
 						break;
+					case Qt::Key_0:
+						toggleCharacterBit(0x66); // Dither
+						break;
 				}
 				return;
 			}
@@ -323,6 +336,9 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 					case mosaicNativeScanCodes[8]:
 						toggleCharacterBit(0x20); // Clear all
 						break;
+					case mosaicNativeScanCodes[9]:
+						toggleCharacterBit(0x66); // Dither
+						break;
 				}
 				return;
 			} else
@@ -381,9 +397,9 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		case Qt::Key_PageDown:
 			m_teletextDocument->selectSubPagePrevious();
 			break;
-		case Qt::Key_F5:
+		case Qt::Key_F6:
-			m_pageRender.decodePage();
+			m_pageDecode.decodePage();
-			m_pageRender.renderPage();
+			m_pageRender.renderPage(true);
 			update();
 			break;
 		default:
@@ -420,7 +436,7 @@ void TeletextWidget::selectionToClipboard()
 			nativeData[i++] = m_teletextDocument->currentSubPage()->character(r, c);
 
 			if (m_teletextDocument->currentSubPage()->character(r, c) >= 0x20)
-				plainTextData.append(keymapping[m_pageRender.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), m_teletextDocument->currentSubPage()->character(r, c)));
+				plainTextData.append(keymapping[m_pageDecode.level1CharSet(r, c)].key(m_teletextDocument->currentSubPage()->character(r, c), m_teletextDocument->currentSubPage()->character(r, c)));
 			else
 				plainTextData.append(' ');
 		}
@@ -453,13 +469,13 @@ void TeletextWidget::copy()
 
 void TeletextWidget::paste()
 {
-	m_teletextDocument->undoStack()->push(new PasteCommand(m_teletextDocument, m_pageRender.level1CharSet(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn())));
+	m_teletextDocument->undoStack()->push(new PasteCommand(m_teletextDocument, m_pageDecode.level1CharSet(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn())));
 }
 
 QPair<int, int> TeletextWidget::mouseToRowAndColumn(const QPoint &mousePosition)
 {
 	int row = mousePosition.y() / 10;
-	int column = mousePosition.x() / 12 - m_pageRender.leftSidePanelColumns();
+	int column = mousePosition.x() / 12 - m_pageDecode.leftSidePanelColumns();
 	if (row < 1)
 		row = 1;
 	if (row > 24)
@@ -655,6 +671,22 @@ void LevelOneScene::updateSelection()
 	m_selectionRectItem->setVisible(true);
 }
 
+void LevelOneScene::setMix(bool mix)
+{
+	if (mix) {
+		m_fullScreenTopRectItem->setBrush(Qt::transparent);
+		m_fullScreenBottomRectItem->setBrush(Qt::transparent);
+		for (int r=0; r<25; r++) {
+			m_fullRowLeftRectItem[r]->setBrush(Qt::transparent);
+			m_fullRowRightRectItem[r]->setBrush(Qt::transparent);
+		}
+	} else {
+		setFullScreenColour(static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullScreenQColor());
+		for (int r=0; r<25; r++)
+			setFullRowColour(r, static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageDecode()->fullRowQColor(r));
+	}
+}
+
 void LevelOneScene::toggleGrid(bool gridOn)
 {
 	m_grid = gridOn;
@@ -667,21 +699,17 @@ void LevelOneScene::toggleGrid(bool gridOn)
 void LevelOneScene::hideGUIElements(bool hidden)
 {
 	if (hidden) {
-		m_mainGridItemGroup->setVisible(false);
 		m_cursorRectItem->setVisible(false);
 		m_selectionRectItem->setVisible(false);
-		for (int i=0; i<32; i++)
-			if (m_sidePanelGridNeeded[i])
-				m_sidePanelGridItemGroup[i]->setVisible(false);
 	} else {
 		if (static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->selectionActive())
 			m_selectionRectItem->setVisible(true);
 
 		m_cursorRectItem->setVisible(true);
-		toggleGrid(m_grid);
 	}
 }
 
+// Implements Ctrl+mousewheel zoom
 bool LevelOneScene::eventFilter(QObject *object, QEvent *event)
 {
 	Q_UNUSED(object);
@@ -698,14 +726,38 @@ bool LevelOneScene::eventFilter(QObject *object, QEvent *event)
 	return false;
 }
 
+// Clicking outside the main text widget but still within the scene would
+// cause keyboard focus loss.
+// So on every keypress within the scene, wrench the focus back to the widget
+// if necessary.
+void LevelOneScene::keyPressEvent(QKeyEvent *keyEvent)
+{
+	if (focusItem() != m_levelOneProxyWidget)
+		setFocusItem(m_levelOneProxyWidget);
+
+	QGraphicsScene::keyPressEvent(keyEvent);
+}
+
+void LevelOneScene::keyReleaseEvent(QKeyEvent *keyEvent)
+{
+	if (focusItem() != m_levelOneProxyWidget)
+		setFocusItem(m_levelOneProxyWidget);
+
+	QGraphicsScene::keyReleaseEvent(keyEvent);
+}
+
 void LevelOneScene::setFullScreenColour(const QColor &newColor)
 {
-	m_fullScreenTopRectItem->setBrush(QBrush(newColor));
+	if (!static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->mix()) {
-	m_fullScreenBottomRectItem->setBrush(QBrush(newColor));
+		m_fullScreenTopRectItem->setBrush(newColor);
+		m_fullScreenBottomRectItem->setBrush(newColor);
+	}
 }
 
 void LevelOneScene::setFullRowColour(int row, const QColor &newColor)
 {
-	m_fullRowLeftRectItem[row]->setBrush(QBrush(newColor));
+	if (!static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->pageRender()->mix()) {
-	m_fullRowRightRectItem[row]->setBrush(QBrush(newColor));
+		m_fullRowLeftRectItem[row]->setBrush(newColor);
+		m_fullRowRightRectItem[row]->setBrush(newColor);
+	}
 }

mainwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -29,6 +29,7 @@
 #include <QTextStream>
 #include <vector>
 
+#include "decode.h"
 #include "document.h"
 #include "levelonepage.h"
 #include "render.h"
@@ -46,12 +47,14 @@ public:
 	void toggleCharacterBit(unsigned char);
 	bool insertMode() const { return m_insertMode; };
 	void setInsertMode(bool);
+	bool showControlCodes() const { return m_pageRender.showControlCodes(); };
 
-	QSize sizeHint() { return QSize(480+(pageRender()->leftSidePanelColumns()+pageRender()->rightSidePanelColumns())*12, 250); }
+	QSize sizeHint() { return QSize(480+(pageDecode()->leftSidePanelColumns()+pageDecode()->rightSidePanelColumns())*12, 250); }
 
 	void inputMethodEvent(QInputMethodEvent *);
 
 	TeletextDocument* document() const { return m_teletextDocument; }
+	TeletextPageDecode *pageDecode() { return &m_pageDecode; }
 	TeletextPageRender *pageRender() { return &m_pageRender; }
 
 signals:
@@ -61,8 +64,9 @@ signals:
 public slots:
 	void subPageSelected();
 	void refreshPage();
-	void toggleReveal(bool);
+	void setReveal(bool);
-	void toggleMix(bool);
+	void setMix(bool);
+	void setShowControlCodes(bool);
 	void updateFlashTimer(int);
 	void pauseFlash(bool);
 	void refreshRow(int);
@@ -92,6 +96,7 @@ protected:
 	void focusInEvent(QFocusEvent *event) override;
 	void focusOutEvent(QFocusEvent *event) override;
 
+	TeletextPageDecode m_pageDecode;
 	TeletextPageRender m_pageRender;
 
 private:
@@ -119,6 +124,7 @@ public:
 public slots:
 	void updateCursor();
 	void updateSelection();
+	void setMix(bool);
 	void toggleGrid(bool);
 	void hideGUIElements(bool);
 	void setFullScreenColour(const QColor &);
@@ -128,9 +134,12 @@ signals:
 	void mouseZoomIn();
 	void mouseZoomOut();
 
-private:
+protected:
 	bool eventFilter(QObject *, QEvent *);
+	void keyPressEvent(QKeyEvent *);
+	void keyReleaseEvent(QKeyEvent *);
 
+private:
 	QGraphicsRectItem *m_fullScreenTopRectItem, *m_fullScreenBottomRectItem;
 	QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25];
 	QGraphicsProxyWidget *m_levelOneProxyWidget;

mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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>
@@ -41,6 +42,7 @@
 #include "levelonecommands.h"
 #include "loadsave.h"
 #include "mainwidget.h"
+#include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
@@ -108,20 +110,73 @@ 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;
 
 	return saveFile(fileName);
 }
 
+void MainWindow::reload()
+{
+	if (m_isUntitled)
+		return;
+
+	if (!m_textWidget->document()->undoStack()->isClean()) {
+		const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The document \"%1\" has been modified.\nDo you want to discard your changes?").arg(QFileInfo(m_curFile).fileName()), QMessageBox::Discard | QMessageBox::Cancel);
+
+		if (ret != QMessageBox::Discard)
+			return;
+	} else {
+		const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Do you want to reload the document \"%1\" from disk?").arg(QFileInfo(m_curFile).fileName()), QMessageBox::Yes | QMessageBox::No);
+
+		if (ret != QMessageBox::Yes)
+			return;
+	}
+
+	int subPageIndex = m_textWidget->document()->currentSubPageIndex();
+
+	m_textWidget->document()->clear();
+	loadFile(m_curFile);
+
+	if (subPageIndex >= m_textWidget->document()->numberOfSubPages())
+		subPageIndex = m_textWidget->document()->numberOfSubPages()-1;
+
+	m_textWidget->document()->selectSubPageIndex(subPageIndex, true);
+}
+
 void MainWindow::exportPNG()
 {
 	QString exportFileName = QFileDialog::getSaveFileName(this, tr("Export PNG"), QString(), "PNG image (*.png)");
@@ -131,28 +186,27 @@ void MainWindow::exportPNG()
 	// Prepare widget image for extraction
 	m_textWidget->pauseFlash(true);
 	m_textScene->hideGUIElements(true);
-	bool reshowCodes = m_textWidget->pageRender()->showCodes();
-	if (reshowCodes)
-		m_textWidget->pageRender()->setShowCodes(false);
 	// Disable exporting in Mix mode as it corrupts the background
 	bool reMix = m_textWidget->pageRender()->mix();
-	if (reMix)
+	if (reMix) {
-		m_textWidget->pageRender()->setMix(false);
+		m_textWidget->setMix(false);
+		m_textScene->setMix(false);
+	}
 
 	// Extract the image from the scene
 	QImage interImage = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
 //	This ought to make the background transparent in Mix mode, but it doesn't
-//	if (m_textWidget->pageRender()->mix())
+//	if (m_textWidget->pageDecode()->mix())
 //		interImage.fill(QColor(0, 0, 0, 0));
 	QPainter interPainter(&interImage);
 	m_textScene->render(&interPainter);
 
 	// Now we've extracted the image we can put the GUI things back
 	m_textScene->hideGUIElements(false);
-	if (reshowCodes)
+	if (reMix) {
-		m_textWidget->pageRender()->setShowCodes(true);
+		m_textWidget->setMix(true);
-	if (reMix)
+		m_textScene->setMix(true);
-		m_textWidget->pageRender()->setMix(true);
+	}
 	m_textWidget->pauseFlash(false);
 
 	// Now scale the extracted image to the selected aspect ratio
@@ -167,9 +221,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 +241,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-2023 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()));
 }
@@ -208,6 +262,8 @@ void MainWindow::init()
 	addDockWidget(Qt::RightDockWidgetArea, m_x26DockWidget);
 	m_paletteDockWidget = new PaletteDockWidget(m_textWidget);
 	addDockWidget(Qt::RightDockWidgetArea, m_paletteDockWidget);
+	m_pageComposeLinksDockWidget = new PageComposeLinksDockWidget(m_textWidget);
+	addDockWidget(Qt::RightDockWidgetArea, m_pageComposeLinksDockWidget);
 
 	m_textScene = new LevelOneScene(m_textWidget, this);
 
@@ -230,8 +286,8 @@ void MainWindow::init()
 	connect(m_textWidget->document(), &TeletextDocument::aboutToChangeSubPage, m_x26DockWidget, &X26DockWidget::unloadX26List);
 	connect(m_textWidget->document(), &TeletextDocument::subPageSelected, this, &MainWindow::updatePageWidgets);
 	connect(m_textWidget, &TeletextWidget::sizeChanged, this, &MainWindow::setSceneDimensions);
-	connect(m_textWidget->pageRender(), &TeletextPageRender::fullScreenColourChanged, m_textScene, &LevelOneScene::setFullScreenColour);
+	connect(m_textWidget->pageDecode(), &TeletextPageDecode::fullScreenColourChanged, m_textScene, &LevelOneScene::setFullScreenColour);
-	connect(m_textWidget->pageRender(), &TeletextPageRender::fullRowColourChanged, m_textScene, &LevelOneScene::setFullRowColour);
+	connect(m_textWidget->pageDecode(), &TeletextPageDecode::fullRowColourChanged, m_textScene, &LevelOneScene::setFullRowColour);
 	connect(m_textWidget, &TeletextWidget::insertKeyPressed, this, &MainWindow::toggleInsertMode);
 
 	connect(m_textScene, &LevelOneScene::mouseZoomIn, this, &MainWindow::zoomIn);
@@ -295,6 +351,11 @@ void MainWindow::createActions()
 	saveAsAct->setShortcuts(QKeySequence::SaveAs);
 	saveAsAct->setStatusTip(tr("Save the document under a new name"));
 
+	const QIcon reloadIcon = QIcon::fromTheme("document-revert");
+	QAction *reloadAct = fileMenu->addAction(reloadIcon, tr("Reload"), this, &MainWindow::reload);
+	reloadAct->setShortcuts(QKeySequence::Refresh);
+	reloadAct->setStatusTip(tr("Reload the document from disk"));
+
 	fileMenu->addSeparator();
 
 	QMenu *recentMenu = fileMenu->addMenu(tr("Recent"));
@@ -310,9 +371,16 @@ void MainWindow::createActions()
 
 	setRecentFilesVisible(MainWindow::hasRecentFiles());
 
-	QAction *exportPNGAct = fileMenu->addAction(tr("Export subpage as PNG..."));
+	m_exportAutoAct = fileMenu->addAction(tr("Export subpage..."));
-	exportPNGAct->setStatusTip("Export a PNG image of this subpage");
+	m_exportAutoAct->setEnabled(false);
-	connect(exportPNGAct, &QAction::triggered, this, &MainWindow::exportPNG);
+	m_exportAutoAct->setShortcut(tr("Ctrl+E"));
+	m_exportAutoAct->setStatusTip("Export this subpage back to the imported file");
+	connect(fileMenu, &QMenu::aboutToShow, this, &MainWindow::updateExportAutoAction);
+	connect(m_exportAutoAct, &QAction::triggered, this, &MainWindow::exportAuto);
+
+	QAction *exportT42Act = fileMenu->addAction(tr("Export subpage as t42..."));
+	exportT42Act->setStatusTip("Export this subpage as a t42 file");
+	connect(exportT42Act, &QAction::triggered, this, [=]() { exportT42(false); });
 
 	QMenu *exportHashStringSubMenu = fileMenu->addMenu(tr("Export subpage to online editor"));
 
@@ -324,6 +392,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);
@@ -422,13 +498,14 @@ void MainWindow::createActions()
 	revealAct->setCheckable(true);
 	revealAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
 	revealAct->setStatusTip(tr("Toggle reveal"));
-	connect(revealAct, &QAction::toggled, m_textWidget, &TeletextWidget::toggleReveal);
+	connect(revealAct, &QAction::toggled, m_textWidget, &TeletextWidget::setReveal);
 
 	QAction *mixAct = viewMenu->addAction(tr("&Mix"));
 	mixAct->setCheckable(true);
 	mixAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
 	mixAct->setStatusTip(tr("Toggle mix"));
-	connect(mixAct, &QAction::toggled, m_textWidget, &TeletextWidget::toggleMix);
+	connect(mixAct, &QAction::toggled, m_textWidget, &TeletextWidget::setMix);
+	connect(mixAct, &QAction::toggled, m_textScene, &LevelOneScene::setMix);
 
 	QAction *gridAct = viewMenu->addAction(tr("&Grid"));
 	gridAct->setCheckable(true);
@@ -436,11 +513,11 @@ void MainWindow::createActions()
 	gridAct->setStatusTip(tr("Toggle the text grid"));
 	connect(gridAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleGrid);
 
-	QAction *showCodesAct = viewMenu->addAction(tr("Show codes"));
+	QAction *showControlCodesAct = viewMenu->addAction(tr("Show control codes"));
-	showCodesAct->setCheckable(true);
+	showControlCodesAct->setCheckable(true);
-	showCodesAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
+	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
-	showCodesAct->setStatusTip(tr("Toggle showing of control codes"));
+	showControlCodesAct->setStatusTip(tr("Toggle showing of control codes"));
-	connect(showCodesAct, &QAction::toggled, m_textWidget->pageRender(), &TeletextPageRender::setShowCodes);
+	connect(showControlCodesAct, &QAction::toggled, m_textWidget, &TeletextWidget::setShowControlCodes);
 
 	viewMenu->addSeparator();
 
@@ -599,6 +676,7 @@ void MainWindow::createActions()
 	toolsMenu->addAction(m_x26DockWidget->toggleViewAction());
 	toolsMenu->addAction(m_pageEnhancementsDockWidget->toggleViewAction());
 	toolsMenu->addAction(m_paletteDockWidget->toggleViewAction());
+	toolsMenu->addAction(m_pageComposeLinksDockWidget->toggleViewAction());
 
 	//FIXME is this main menubar separator to put help menu towards the right?
 	menuBar()->addSeparator();
@@ -634,7 +712,7 @@ void MainWindow::setSceneDimensions()
 	else
 		newSceneWidth = m_textWidget->width() + leftRightBorders[m_viewBorder]*2;
 
-	m_textScene->setBorderDimensions(newSceneWidth, 250+topBottomBorders[m_viewBorder]*2, m_textWidget->width(), m_textWidget->pageRender()->leftSidePanelColumns(), m_textWidget->pageRender()->rightSidePanelColumns());
+	m_textScene->setBorderDimensions(newSceneWidth, 250+topBottomBorders[m_viewBorder]*2, m_textWidget->width(), m_textWidget->pageDecode()->leftSidePanelColumns(), m_textWidget->pageDecode()->rightSidePanelColumns());
 	m_textView->setTransform(QTransform((1+(float)m_viewZoom/2)*aspectRatioHorizontalScaling[m_viewAspectRatio], 0, 0, 1+(float)m_viewZoom/2, 0, 0));
 }
 
@@ -688,12 +766,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();
 }
@@ -715,30 +797,27 @@ void MainWindow::toggleInsertMode()
 
 void MainWindow::createStatusBar()
 {
-	QLabel *subPageLabel = new QLabel("Subpage");
-	statusBar()->insertWidget(0, subPageLabel);
-
 	m_previousSubPageButton = new QToolButton;
-	m_previousSubPageButton->setMinimumSize(subPageLabel->height(), subPageLabel->height());
-	m_previousSubPageButton->setMaximumSize(subPageLabel->height(), subPageLabel->height());
 	m_previousSubPageButton->setAutoRaise(true);
 	m_previousSubPageButton->setArrowType(Qt::LeftArrow);
-	statusBar()->insertWidget(1, m_previousSubPageButton);
+	statusBar()->insertWidget(0, m_previousSubPageButton);
 	connect(m_previousSubPageButton, &QToolButton::clicked, m_textWidget->document(), &TeletextDocument::selectSubPagePrevious);
 
 	m_subPageLabel = new QLabel("1/1");
-	statusBar()->insertWidget(2, m_subPageLabel);
+	statusBar()->insertWidget(1, m_subPageLabel);
 
 	m_nextSubPageButton = new QToolButton;
-	m_nextSubPageButton->setMinimumSize(subPageLabel->height(), subPageLabel->height());
+	m_previousSubPageButton->setMinimumSize(m_subPageLabel->height(), m_subPageLabel->height());
-	m_nextSubPageButton->setMaximumSize(subPageLabel->height(), subPageLabel->height());
+	m_previousSubPageButton->setMaximumSize(m_subPageLabel->height(), m_subPageLabel->height());
+	m_nextSubPageButton->setMinimumSize(m_subPageLabel->height(), m_subPageLabel->height());
+	m_nextSubPageButton->setMaximumSize(m_subPageLabel->height(), m_subPageLabel->height());
 	m_nextSubPageButton->setAutoRaise(true);
 	m_nextSubPageButton->setArrowType(Qt::RightArrow);
-	statusBar()->insertWidget(3, m_nextSubPageButton);
+	statusBar()->insertWidget(2, m_nextSubPageButton);
 	connect(m_nextSubPageButton, &QToolButton::clicked, m_textWidget->document(), &TeletextDocument::selectSubPageNext);
 
-	m_cursorPositionLabel = new QLabel("Row 1 Column 1");
+	m_cursorPositionLabel = new QLabel("1, 1");
-	statusBar()->insertWidget(4, m_cursorPositionLabel);
+	statusBar()->insertWidget(3, m_cursorPositionLabel);
 
 	m_insertModePushButton = new QPushButton("OVERWRITE");
 	m_insertModePushButton->setFlat(true);
@@ -757,10 +836,10 @@ void MainWindow::createStatusBar()
 		statusBar()->addPermanentWidget(m_levelRadioButton[i]);
 	}
 	m_levelRadioButton[0]->toggle();
-	connect(m_levelRadioButton[0], &QAbstractButton::clicked, [=]() { m_textWidget->pageRender()->setRenderLevel(0); m_textWidget->update(); });
+	connect(m_levelRadioButton[0], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(0); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false); });
-	connect(m_levelRadioButton[1], &QAbstractButton::clicked, [=]() { m_textWidget->pageRender()->setRenderLevel(1); m_textWidget->update(); });
+	connect(m_levelRadioButton[1], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(1); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
-	connect(m_levelRadioButton[2], &QAbstractButton::clicked, [=]() { m_textWidget->pageRender()->setRenderLevel(2); m_textWidget->update(); });
+	connect(m_levelRadioButton[2], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(2); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(false);});
-	connect(m_levelRadioButton[3], &QAbstractButton::clicked, [=]() { m_textWidget->pageRender()->setRenderLevel(3); m_textWidget->update(); });
+	connect(m_levelRadioButton[3], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(3); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(true);});
 	statusBar()->showMessage(tr("Ready"));
 }
 
@@ -782,7 +861,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()) {
@@ -808,6 +887,8 @@ void MainWindow::readSettings()
 		m_x26DockWidget->setFloating(true);
 		m_paletteDockWidget->hide();
 		m_paletteDockWidget->setFloating(true);
+		m_pageComposeLinksDockWidget->hide();
+		m_pageComposeLinksDockWidget->setFloating(true);
 	} else
 		restoreState(windowState);
 }
@@ -827,7 +908,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,17 +925,35 @@ void MainWindow::loadFile(const QString &fileName)
 	int levelSeen;
 
 	QFile file(fileName);
-	if (!file.open(QFile::ReadOnly | QFile::Text)) {
+	const QFileInfo fileInfo(file);
-		QMessageBox::warning(this, tr("QTeletextMaker"), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
+	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());
+		m_exportAutoFileName = fileName;
+	} else {
+		loadTTI(&file, m_textWidget->document());
+		m_exportAutoFileName.clear();
+	}
+
 	levelSeen = m_textWidget->document()->levelRequired();
 	m_levelRadioButton[levelSeen]->toggle();
-	m_textWidget->pageRender()->setRenderLevel(levelSeen);
+	m_textWidget->pageDecode()->setLevel(levelSeen);
+	if (levelSeen == 3)
+		m_paletteDockWidget->setLevel3p5Accepted(true);
 	updatePageWidgets();
 
 	QApplication::restoreOverrideCursor();
@@ -934,6 +1033,18 @@ void MainWindow::updateRecentFileActions()
 		m_recentFileActs[i]->setVisible(false);
 }
 
+void MainWindow::updateExportAutoAction()
+{
+	if (m_exportAutoFileName.isEmpty()) {
+		m_exportAutoAct->setText(tr("Export subpage..."));
+		m_exportAutoAct->setEnabled(false);
+		return;
+	}
+
+	m_exportAutoAct->setText(tr("Overwrite &%1").arg(MainWindow::strippedName(m_exportAutoFileName)));
+	m_exportAutoAct->setEnabled(true);
+}
+
 void MainWindow::openRecentFile()
 {
 	if (const QAction *action = qobject_cast<const QAction *>(sender()))
@@ -949,13 +1060,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 +1075,103 @@ bool MainWindow::saveFile(const QString &fileName)
 	return true;
 }
 
+void MainWindow::exportAuto()
+{
+	// Menu should be disabled if m_exportAutoFileName is empty, but just in case...
+	if (m_exportAutoFileName.isEmpty())
+		return;
+
+	exportT42(true);
+}
+
+void MainWindow::exportT42(bool fromAuto)
+{
+	QString errorMessage;
+	QString exportFileName;
+
+	if (fromAuto)
+		exportFileName = m_exportAutoFileName;
+	else {
+		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);
+		return;
+	}
+
+	MainWindow::prependToRecentFiles(exportFileName);
+
+	m_exportAutoFileName = exportFileName;
+	statusBar()->showMessage(tr("File exported"), 2000);
+}
+
+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;
@@ -1002,7 +1210,20 @@ MainWindow *MainWindow::findMainWindow(const QString &fileName) const
 
 void MainWindow::updateCursorPosition()
 {
-	m_cursorPositionLabel->setText(QString("Row %1 Column %2").arg(m_textWidget->document()->cursorRow()).arg(m_textWidget->document()->cursorColumn()));
+	QString result;
+	result.reserve(19);
+
+	if (m_textWidget->document()->cursorRow() == 0)
+		result = QString("Header, %1").arg(m_textWidget->document()->cursorColumn());
+	else if (m_textWidget->document()->cursorRow() == 24)
+		result = QString("FLOF, %1").arg(m_textWidget->document()->cursorColumn());
+	else
+		result = QString("%1, %2").arg(m_textWidget->document()->cursorRow()).arg(m_textWidget->document()->cursorColumn());
+
+	if (m_textWidget->document()->selectionActive())
+		result.append(QString(" (%1, %2)").arg(m_textWidget->document()->selectionHeight()).arg(m_textWidget->document()->selectionWidth()));
+
+	m_cursorPositionLabel->setText(result);
 	m_textScene->updateCursor();
 	m_textView->ensureVisible(m_textScene->cursorRectItem(), 16, 24);
 }
@@ -1012,9 +1233,11 @@ void MainWindow::updatePageWidgets()
 	m_subPageLabel->setText(QString("%1/%2").arg(m_textWidget->document()->currentSubPageIndex()+1).arg(m_textWidget->document()->numberOfSubPages()));
 	m_previousSubPageButton->setEnabled(!(m_textWidget->document()->currentSubPageIndex() == 0));
 	m_nextSubPageButton->setEnabled(!(m_textWidget->document()->currentSubPageIndex() == (m_textWidget->document()->numberOfSubPages()) - 1));
+	updateCursorPosition();
 	m_deleteSubPageAction->setEnabled(m_textWidget->document()->numberOfSubPages() > 1);
 	m_pageOptionsDockWidget->updateWidgets();
 	m_pageEnhancementsDockWidget->updateWidgets();
 	m_x26DockWidget->loadX26List();
 	m_paletteDockWidget->updateAllColourButtons();
+	m_pageComposeLinksDockWidget->updateWidgets();
 }

mainwindow.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -31,6 +31,7 @@
 #include <QToolButton>
 
 #include "mainwidget.h"
+#include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
@@ -58,10 +59,15 @@ private slots:
 	void open();
 	bool save();
 	bool saveAs();
-	void exportPNG();
+	void reload();
+	void exportAuto();
+	void exportT42(bool);
 	void exportZXNet();
 	void exportEditTF();
+	void exportPNG();
+	void exportM29();
 	void updateRecentFileActions();
+	void updateExportAutoAction();
 	void openRecentFile();
 	void about();
 	void updatePageWidgets();
@@ -112,10 +118,12 @@ private:
 	PageEnhancementsDockWidget *m_pageEnhancementsDockWidget;
 	X26DockWidget *m_x26DockWidget;
 	PaletteDockWidget *m_paletteDockWidget;
+	PageComposeLinksDockWidget *m_pageComposeLinksDockWidget;
 
 	QAction *m_recentFileActs[m_MaxRecentFiles];
 	QAction *m_recentFileSeparator;
 	QAction *m_recentFileSubMenuAct;
+	QAction *m_exportAutoAct;
 	QAction *m_deleteSubPageAction;
 	QAction *m_borderActs[3];
 	QAction *m_aspectRatioActs[4];
@@ -126,7 +134,7 @@ private:
 	QPushButton *m_insertModePushButton;
 	QRadioButton *m_levelRadioButton[4];
 
-	QString m_curFile;
+	QString m_curFile, m_exportAutoFileName;
 	bool m_isUntitled;
 };
 

pagebase.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagebase.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagecomposelinksdockwidget.cpp

@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2020-2023 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMap>
+#include <QPair>
+#include <QRegExpValidator>
+#include <QString>
+
+#include "pagecomposelinksdockwidget.h"
+
+PageComposeLinksDockWidget::PageComposeLinksDockWidget(TeletextWidget *parent): QDockWidget(parent)
+{
+	QVBoxLayout *pageComposeLinksLayout = new QVBoxLayout;
+	QWidget *pageComposeLinksWidget = new QWidget;
+
+	m_parentMainWidget = parent;
+
+	this->setObjectName("PageComposeLinksDockWidget");
+	this->setWindowTitle("Compositional links");
+
+	QGridLayout *x27Layout = new QGridLayout;
+
+	QLabel *levelAllLabel = new QLabel(tr("Levels 2.5 and 3.5"));
+	levelAllLabel->setAlignment(Qt::AlignCenter);
+	x27Layout->addWidget(levelAllLabel, 0, 0, 1, 5);
+
+	// Link functions
+	x27Layout->addWidget(new QLabel(tr("GPOP")),  2, 0, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("POP")),   3, 0, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("GDRCS")), 4, 0, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("DRCS")),  5, 0, 1, 1);
+
+	// Labels across the top
+	x27Layout->addWidget(new QLabel(tr("L2.5")), 1, 1, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("L3.5")),  1, 2, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("Page no")), 1, 3, 1, 1);
+	x27Layout->addWidget(new QLabel(tr("Sub pages required")), 1, 4, 1, 1);
+
+	QLabel *level3p5OnlyLabel = new QLabel(tr("Level 3.5 only"));
+	level3p5OnlyLabel->setAlignment(Qt::AlignCenter);
+	x27Layout->addWidget(level3p5OnlyLabel, 6, 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
+			m_composeLinkLevelCheckbox[i][0] = new QCheckBox(this);
+			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][0], i+2, 1, 1, 1);
+			connect(m_composeLinkLevelCheckbox[i][0], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel2p5(i, active); });
+			m_composeLinkLevelCheckbox[i][1] = new QCheckBox(this);
+			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][1], i+2, 2, 1, 1);
+			connect(m_composeLinkLevelCheckbox[i][1], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel3p5(i, active); });
+		} else {
+			// Selectable link functions for Level 3.5
+			m_composeLinkFunctionComboBox[i-4] = new QComboBox;
+			m_composeLinkFunctionComboBox[i-4]->addItem("GPOP");
+			m_composeLinkFunctionComboBox[i-4]->addItem("POP");
+			m_composeLinkFunctionComboBox[i-4]->addItem("GDRCS");
+			m_composeLinkFunctionComboBox[i-4]->addItem("DRCS");
+			x27Layout->addWidget(m_composeLinkFunctionComboBox[i-4], i+3, 0, 1, 1, Qt::AlignTop);
+			connect(m_composeLinkFunctionComboBox[i-4], QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkFunction(i, index); } );
+		}
+		// Page link
+		m_composeLinkPageNumberLineEdit[i] = new QLineEdit("100");
+		m_composeLinkPageNumberLineEdit[i]->setMaxLength(3);
+		m_composeLinkPageNumberLineEdit[i]->setInputMask(">DHH");
+		m_composeLinkPageNumberLineEdit[i]->setValidator(m_pageNumberValidator);
+		x27Layout->addWidget(m_composeLinkPageNumberLineEdit[i], i+(i<4 ? 2 : 3), 3, 1, 1);
+		connect(m_composeLinkPageNumberLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkPageNumber(i, value); } );
+
+		// Sub page numbers required
+		m_composeLinkSubPageNumbersLineEdit[i] = new QLineEdit(this);
+		x27Layout->addWidget(m_composeLinkSubPageNumbersLineEdit[i], i+(i<4 ? 2 : 3), 4, 1, 1);
+		connect(m_composeLinkSubPageNumbersLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkSubPageNumbers(i, value); } );
+	}
+
+	pageComposeLinksLayout->addLayout(x27Layout);
+
+	pageComposeLinksLayout->addStretch(1);
+
+	pageComposeLinksWidget->setLayout(pageComposeLinksLayout);
+	this->setWidget(pageComposeLinksWidget);
+}
+
+void PageComposeLinksDockWidget::setComposeLinkPageNumber(int linkNumber, const QString &newPageNumberString)
+{
+	// The LineEdit should check if a valid hex number was entered, but just in case...
+	bool newPageNumberOk;
+	int newPageNumberRead = newPageNumberString.toInt(&newPageNumberOk, 16);
+	if ((!newPageNumberOk) || newPageNumberRead < 0x100 || newPageNumberRead > 0x8ff)
+		return;
+
+	// Stored as page link with relative magazine number, convert from absolute page number that was entered
+	newPageNumberRead ^= (m_parentMainWidget->document()->pageNumber() & 0x700);
+	m_parentMainWidget->document()->currentSubPage()->setComposeLinkPageNumber(linkNumber, newPageNumberRead);
+}
+
+void PageComposeLinksDockWidget::setComposeLinkSubPageNumbers(int linkNumber, const QString &newSubPagesString)
+{
+	int newSubPageCodes = 0x0000;
+
+	if (!newSubPagesString.isEmpty()) {
+		// Turn user-entered comma separated subpages and subpage-ranges into bits
+		// First we do the "comma separated"
+		const QStringList items = newSubPagesString.split(QLatin1Char(','), QString::SkipEmptyParts);
+		// Now see if there's valid single numbers or ranges between the commas
+		for (const QString &item : items) {
+			if (item.isEmpty())
+				return;
+			if (item.contains(QLatin1Char('-'))) {
+				// Dash found, should be a range of subpages: check for two things either side of dash
+				const QStringList rangeItems = item.split('-');
+				if (rangeItems.count() != 2)
+					return;
+				// Now check if the two things are valid numbers 0-15, with first number less than second
+				bool ok1, ok2;
+				const int number1 = rangeItems[0].toInt(&ok1);
+				const int number2 = rangeItems[1].toInt(&ok2);
+				if (!ok1 || !ok2 || number1 < 0 || number2 < 0 || number1 > 15 || number2 > 15 || number2 < number1)
+					return;
+				// Yes, it is a valid range. Apply it to the result
+				for (int i=number1; i<=number2; i++)
+					newSubPageCodes |= (1 << i);
+			} else {
+				// A single thing (maybe extracted between commas): check if the thing is a number 0-15
+				bool ok;
+				const int number = item.toInt(&ok);
+				if (!ok || number < 0 || number > 15)
+					return;
+				// Yes, it is a valid number. Apply it to the result
+				newSubPageCodes |= (1 << number);
+			}
+		}
+	}
+
+	m_parentMainWidget->document()->currentSubPage()->setComposeLinkSubPageCodes(linkNumber, newSubPageCodes);
+}
+
+void PageComposeLinksDockWidget::updateWidgets()
+{
+	for (int i=0; i<8; i++) {
+		if (i >= 4) {
+			m_composeLinkFunctionComboBox[i-4]->blockSignals(true);
+			m_composeLinkFunctionComboBox[i-4]->setCurrentIndex(m_parentMainWidget->document()->currentSubPage()->composeLinkFunction(i));
+			m_composeLinkFunctionComboBox[i-4]->blockSignals(false);
+		} else {
+			m_composeLinkLevelCheckbox[i][0]->blockSignals(true);
+			m_composeLinkLevelCheckbox[i][0]->setChecked(m_parentMainWidget->document()->currentSubPage()->composeLinkLevel2p5(i));
+			m_composeLinkLevelCheckbox[i][0]->blockSignals(false);
+			m_composeLinkLevelCheckbox[i][1]->blockSignals(true);
+			m_composeLinkLevelCheckbox[i][1]->setChecked(m_parentMainWidget->document()->currentSubPage()->composeLinkLevel3p5(i));
+			m_composeLinkLevelCheckbox[i][1]->blockSignals(false);
+		}
+		// Stored as page link with relative magazine number, convert to absolute page number for display
+		int absoluteLinkPageNumber = m_parentMainWidget->document()->currentSubPage()->composeLinkPageNumber(i) ^ (m_parentMainWidget->document()->pageNumber() & 0x700);
+		// Fix magazine 0 to 8
+		if ((absoluteLinkPageNumber & 0x700) == 0x000)
+			absoluteLinkPageNumber |= 0x800;
+		m_composeLinkPageNumberLineEdit[i]->blockSignals(true);
+		m_composeLinkPageNumberLineEdit[i]->setText(QString::number(absoluteLinkPageNumber, 16).toUpper());
+		m_composeLinkPageNumberLineEdit[i]->blockSignals(false);
+
+		// Turn subpage bits into user-friendly comma separated numbers and number-ranges
+		QString rangeString;
+
+		if (m_parentMainWidget->document()->currentSubPage()->composeLinkSubPageCodes(i) != 0x0000) {
+			// First build a list of consecutive ranges seen
+			// The "b-index" is based on https://codereview.stackexchange.com/a/90074
+			QMap<int, QPair<int, int>> ranges;
+			int index = 0;
+			for (int b=0; b<16; b++)
+				if ((m_parentMainWidget->document()->currentSubPage()->composeLinkSubPageCodes(i) >> b) & 0x01) {
+					if (!ranges.contains(b-index))
+						ranges.insert(b-index, qMakePair(b, b));
+					else
+						ranges[b-index].second = b;
+					index++;
+				}
+			// Now go through the list and add single numbers or ranges as appropriate
+			QPair<int, int> range;
+			foreach (range, ranges) {
+				// For second and subsequent entries only, append a comma first
+				if (!rangeString.isEmpty())
+					rangeString.append(',');
+				// Append the single number or the first number of the range
+				rangeString.append(QString("%1").arg(range.first));
+				// If that was part of a range and not a single orphaned number
+				if (range.first != range.second) {
+					// Ranges of 3 or more use a dash. A range of 2 can make do with a comma
+					rangeString.append((range.first+1 == range.second) ? ',' : '-');
+					// Append the second number of the range
+					rangeString.append(QString("%1").arg(range.second));
+				}
+			}
+		}
+		m_composeLinkSubPageNumbersLineEdit[i]->blockSignals(true);
+		m_composeLinkSubPageNumbersLineEdit[i]->setText(rangeString);
+		m_composeLinkSubPageNumbersLineEdit[i]->blockSignals(false);
+	}
+}

pagecomposelinksdockwidget.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020-2023 Gavin MacGregor
+ *
+ * This file is part of QTeletextMaker.
+ *
+ * QTeletextMaker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QTeletextMaker is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef PAGECOMPOSELINKSDOCKWIDGET_H
+#define PAGECOMPOSELINKSDOCKWIDGET_H
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDockWidget>
+#include <QLineEdit>
+#include <QRegExpValidator>
+#include <QString>
+
+#include "mainwidget.h"
+
+class PageComposeLinksDockWidget : public QDockWidget
+{
+	Q_OBJECT
+
+public:
+	PageComposeLinksDockWidget(TeletextWidget *parent);
+	void updateWidgets();
+
+private:
+	void setComposeLinkPageNumber(int, const QString &);
+	void setComposeLinkSubPageNumbers(int, const QString &);
+
+	TeletextWidget *m_parentMainWidget;
+	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

pageenhancementsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -22,11 +22,7 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLineEdit>
-#include <QMap>
-#include <QPair>
 #include <QSpinBox>
-#include <QString>
 
 #include "pageenhancementsdockwidget.h"
 
@@ -38,25 +34,26 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	m_parentMainWidget = parent;
 
 	this->setObjectName("PageEnhancementsDockWidget");
-	this->setWindowTitle("Page enhancements");
+	this->setWindowTitle("X/28 page enhancements");
 
-	QGroupBox *x28GroupBox = new QGroupBox(tr("X/28 enhancements"));
+	// Colour group box and layout
-	QGridLayout *x28Layout = new QGridLayout;
+	QGroupBox *colourGroupBox = new QGroupBox(tr("Colours"));
+	QGridLayout *colourLayout = new QGridLayout;
 
 	// Default screen and default row colours
-	x28Layout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1);
+	colourLayout->addWidget(new QLabel(tr("Default screen colour")), 0, 0, 1, 1);
-	x28Layout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1);
+	colourLayout->addWidget(new QLabel(tr("Default row colour")), 1, 0, 1, 1);
 	m_defaultScreenColourCombo = new QComboBox;
 	m_defaultScreenColourCombo->setModel(m_parentMainWidget->document()->clutModel());
 	m_defaultRowColourCombo = new QComboBox;
 	m_defaultRowColourCombo->setModel(m_parentMainWidget->document()->clutModel());
-	x28Layout->addWidget(m_defaultScreenColourCombo, 0, 1, 1, 1, Qt::AlignTop);
+	colourLayout->addWidget(m_defaultScreenColourCombo, 0, 1, 1, 1, Qt::AlignTop);
 	connect(m_defaultScreenColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultScreenColour(index); });
-	x28Layout->addWidget(m_defaultRowColourCombo, 1, 1, 1, 1, Qt::AlignTop);
+	colourLayout->addWidget(m_defaultRowColourCombo, 1, 1, 1, 1, Qt::AlignTop);
 	connect(m_defaultRowColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setDefaultRowColour(index); });
 
 	// CLUT remapping
-	x28Layout->addWidget(new QLabel(tr("CLUT remapping")), 2, 0, 1, 1);
+	colourLayout->addWidget(new QLabel(tr("CLUT remapping")), 2, 0, 1, 1);
 	m_colourTableCombo = new QComboBox;
 	m_colourTableCombo->addItem("Fore 0  Back 0");
 	m_colourTableCombo->addItem("Fore 0  Back 1");
@@ -66,89 +63,44 @@ PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent):
 	m_colourTableCombo->addItem("Fore 2  Back 1");
 	m_colourTableCombo->addItem("Fore 2  Back 2");
 	m_colourTableCombo->addItem("Fore 2  Back 3");
-	x28Layout->addWidget(m_colourTableCombo, 2, 1, 1, 1, Qt::AlignTop);
+	colourLayout->addWidget(m_colourTableCombo, 2, 1, 1, 1, Qt::AlignTop);
 	connect(m_colourTableCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->setColourTableRemap(index); });
 
 	// Black background colour substitution
 	m_blackBackgroundSubstAct = new QCheckBox("Black background colour substitution");
-	x28Layout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop);
+	colourLayout->addWidget(m_blackBackgroundSubstAct, 3, 0, 1, 2, Qt::AlignTop);
 	connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setBlackBackgroundSubst);
 
+	// Add group box to the main layout
+	colourGroupBox->setLayout(colourLayout);
+	pageEnhancementsLayout->addWidget(colourGroupBox);
+
+
+	// Side panels group box and layout
+	QGroupBox *sidePanelsGroupBox = new QGroupBox(tr("Side panels"));
+	QGridLayout *sidePanelsLayout = new QGridLayout;
+
 	// Side panel columns
-	x28Layout->addWidget(new QLabel(tr("Left side panel columns")), 4, 0, 1, 1);
+	sidePanelsLayout->addWidget(new QLabel(tr("Left side panel columns")), 0, 0, 1, 1);
 	m_leftSidePanelSpinBox = new QSpinBox(this);
 	m_leftSidePanelSpinBox->setMaximum(16);
-	x28Layout->addWidget(m_leftSidePanelSpinBox, 4, 1, 1, 1, Qt::AlignTop);
+	sidePanelsLayout->addWidget(m_leftSidePanelSpinBox, 0, 1, 1, 1, Qt::AlignTop);
 	connect(m_leftSidePanelSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), [=](int index){ setLeftSidePanelWidth(index); });
 
-	x28Layout->addWidget(new QLabel(tr("Right side panel columns")), 5, 0, 1, 1);
+	sidePanelsLayout->addWidget(new QLabel(tr("Right side panel columns")), 1, 0, 1, 1);
 	m_rightSidePanelSpinBox = new QSpinBox(this);
 	m_rightSidePanelSpinBox->setMaximum(16);
-	x28Layout->addWidget(m_rightSidePanelSpinBox, 5, 1, 1, 1, Qt::AlignTop);
+	sidePanelsLayout->addWidget(m_rightSidePanelSpinBox, 1, 1, 1, 1, Qt::AlignTop);
 	connect(m_rightSidePanelSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), [=](int index){ setRightSidePanelWidth(index); });
 
 	// Side panels status
 	m_sidePanelStatusAct = new QCheckBox("Side panels at level 3.5 only");
-	x28Layout->addWidget(m_sidePanelStatusAct, 6, 0, 1, 2, Qt::AlignTop);
+	sidePanelsLayout->addWidget(m_sidePanelStatusAct, 2, 0, 1, 2, Qt::AlignTop);
 	connect(m_sidePanelStatusAct, &QCheckBox::stateChanged, m_parentMainWidget, &TeletextWidget::setSidePanelAtL35Only);
 
-	x28GroupBox->setLayout(x28Layout);
+	// Add group box to the main layout
-	pageEnhancementsLayout->addWidget(x28GroupBox);
+	sidePanelsGroupBox->setLayout(sidePanelsLayout);
-
+	pageEnhancementsLayout->addWidget(sidePanelsGroupBox);
-	QGroupBox *x27GroupBox = new QGroupBox(tr("X/27 links - Level 2.5 and 3.5"));
-	QGridLayout *x27Layout = new QGridLayout;
-
-	// Link functions
-	x27Layout->addWidget(new QLabel(tr("GPOP")),  1, 0, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("POP")),   2, 0, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("GDRCS")), 3, 0, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("DRCS")),  4, 0, 1, 1);
-
-	// Labels across the top
-	x27Layout->addWidget(new QLabel(tr("L2.5")), 0, 1, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("L3.5")),  0, 2, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("Page no")), 0, 3, 1, 1);
-	x27Layout->addWidget(new QLabel(tr("Sub pages required")), 0, 4, 1, 1);
-
-	QLabel *level3p5OnlyLabel = new QLabel(tr("Level 3.5 only"));
-	level3p5OnlyLabel->setAlignment(Qt::AlignCenter);
-	x27Layout->addWidget(level3p5OnlyLabel, 5, 0, 1, 5);
-
-	for (int i=0; i<8; i++) {
-		if (i < 4) {
-			// Required at which Levels
-			m_composeLinkLevelCheckbox[i][0] = new QCheckBox(this);
-			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][0], i+1, 1, 1, 1);
-			connect(m_composeLinkLevelCheckbox[i][0], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel2p5(i, active); });
-			m_composeLinkLevelCheckbox[i][1] = new QCheckBox(this);
-			x27Layout->addWidget(m_composeLinkLevelCheckbox[i][1], i+1, 2, 1, 1);
-			connect(m_composeLinkLevelCheckbox[i][1], &QCheckBox::stateChanged, [=](bool active) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkLevel3p5(i, active); });
-		} else {
-			// Selectable link functions for Level 3.5
-			m_composeLinkFunctionComboBox[i-4] = new QComboBox;
-			m_composeLinkFunctionComboBox[i-4]->addItem("GPOP");
-			m_composeLinkFunctionComboBox[i-4]->addItem("POP");
-			m_composeLinkFunctionComboBox[i-4]->addItem("GDRCS");
-			m_composeLinkFunctionComboBox[i-4]->addItem("DRCS");
-			x27Layout->addWidget(m_composeLinkFunctionComboBox[i-4], i+2, 0, 1, 1, Qt::AlignTop);
-			connect(m_composeLinkFunctionComboBox[i-4], QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) { m_parentMainWidget->document()->currentSubPage()->setComposeLinkFunction(i, index); } );
-		}
-		// 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
-		x27Layout->addWidget(m_composeLinkPageNumberLineEdit[i], i+(i<4 ? 1 : 2), 3, 1, 1);
-		connect(m_composeLinkPageNumberLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkPageNumber(i, value); } );
-
-		// Sub page numbers required
-		m_composeLinkSubPageNumbersLineEdit[i] = new QLineEdit(this);
-		x27Layout->addWidget(m_composeLinkSubPageNumbersLineEdit[i], i+(i<4 ? 1 : 2), 4, 1, 1);
-		connect(m_composeLinkSubPageNumbersLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkSubPageNumbers(i, value); } );
-	}
-
-	x27GroupBox->setLayout(x27Layout);
-	pageEnhancementsLayout->addWidget(x27GroupBox);
 
 	pageEnhancementsLayout->addStretch(1);
 
@@ -178,60 +130,6 @@ void PageEnhancementsDockWidget::setRightSidePanelWidth(int newRightPanelSize)
 	m_parentMainWidget->setSidePanelWidths(m_leftSidePanelSpinBox->value(), newRightPanelSize);
 }
 
-void PageEnhancementsDockWidget::setComposeLinkPageNumber(int linkNumber, const QString &newPageNumberString)
-{
-	// The LineEdit should check if a valid hex number was entered, but just in case...
-	bool newPageNumberOk;
-	int newPageNumberRead = newPageNumberString.toInt(&newPageNumberOk, 16);
-	if ((!newPageNumberOk) || newPageNumberRead < 0x100 || newPageNumberRead > 0x8ff)
-		return;
-
-	// Stored as page link with relative magazine number, convert from absolute page number that was entered
-	newPageNumberRead ^= (m_parentMainWidget->document()->pageNumber() & 0x700);
-	m_parentMainWidget->document()->currentSubPage()->setComposeLinkPageNumber(linkNumber, newPageNumberRead);
-}
-
-void PageEnhancementsDockWidget::setComposeLinkSubPageNumbers(int linkNumber, const QString &newSubPagesString)
-{
-	int newSubPageCodes = 0x0000;
-
-	if (!newSubPagesString.isEmpty()) {
-		// Turn user-entered comma separated subpages and subpage-ranges into bits
-		// First we do the "comma separated"
-		const QStringList items = newSubPagesString.split(QLatin1Char(','), QString::SkipEmptyParts);
-		// Now see if there's valid single numbers or ranges between the commas
-		for (const QString &item : items) {
-			if (item.isEmpty())
-				return;
-			if (item.contains(QLatin1Char('-'))) {
-				// Dash found, should be a range of subpages: check for two things either side of dash
-				const QStringList rangeItems = item.split('-');
-				if (rangeItems.count() != 2)
-					return;
-				// Now check if the two things are valid numbers 0-15, with first number less than second
-				bool ok1, ok2;
-				const int number1 = rangeItems[0].toInt(&ok1);
-				const int number2 = rangeItems[1].toInt(&ok2);
-				if (!ok1 || !ok2 || number1 < 0 || number2 < 0 || number1 > 15 || number2 > 15 || number2 < number1)
-					return;
-				// Yes, it is a valid range. Apply it to the result
-				for (int i=number1; i<=number2; i++)
-					newSubPageCodes |= (1 << i);
-			} else {
-				// A single thing (maybe extracted between commas): check if the thing is a number 0-15
-				bool ok;
-				const int number = item.toInt(&ok);
-				if (!ok || number < 0 || number > 15)
-					return;
-				// Yes, it is a valid number. Apply it to the result
-				newSubPageCodes |= (1 << number);
-			}
-		}
-	}
-
-	m_parentMainWidget->document()->currentSubPage()->setComposeLinkSubPageCodes(linkNumber, newSubPageCodes);
-}
-
 void PageEnhancementsDockWidget::updateWidgets()
 {
 	int leftSidePanelColumnsResult = 0;
@@ -265,64 +163,4 @@ void PageEnhancementsDockWidget::updateWidgets()
 	m_sidePanelStatusAct->blockSignals(true);
 	m_sidePanelStatusAct->setChecked(!m_parentMainWidget->document()->currentSubPage()->sidePanelStatusL25());
 	m_sidePanelStatusAct->blockSignals(false);
-
-	for (int i=0; i<8; i++) {
-		if (i >= 4) {
-			m_composeLinkFunctionComboBox[i-4]->blockSignals(true);
-			m_composeLinkFunctionComboBox[i-4]->setCurrentIndex(m_parentMainWidget->document()->currentSubPage()->composeLinkFunction(i));
-			m_composeLinkFunctionComboBox[i-4]->blockSignals(false);
-		} else {
-			m_composeLinkLevelCheckbox[i][0]->blockSignals(true);
-			m_composeLinkLevelCheckbox[i][0]->setChecked(m_parentMainWidget->document()->currentSubPage()->composeLinkLevel2p5(i));
-			m_composeLinkLevelCheckbox[i][0]->blockSignals(false);
-			m_composeLinkLevelCheckbox[i][1]->blockSignals(true);
-			m_composeLinkLevelCheckbox[i][1]->setChecked(m_parentMainWidget->document()->currentSubPage()->composeLinkLevel3p5(i));
-			m_composeLinkLevelCheckbox[i][1]->blockSignals(false);
-		}
-		// Stored as page link with relative magazine number, convert to absolute page number for display
-		int absoluteLinkPageNumber = m_parentMainWidget->document()->currentSubPage()->composeLinkPageNumber(i) ^ (m_parentMainWidget->document()->pageNumber() & 0x700);
-		// Fix magazine 0 to 8
-		if ((absoluteLinkPageNumber & 0x700) == 0x000)
-			absoluteLinkPageNumber |= 0x800;
-		m_composeLinkPageNumberLineEdit[i]->blockSignals(true);
-		m_composeLinkPageNumberLineEdit[i]->setText(QString::number(absoluteLinkPageNumber, 16).toUpper());
-		m_composeLinkPageNumberLineEdit[i]->blockSignals(false);
-
-		// Turn subpage bits into user-friendly comma separated numbers and number-ranges
-		QString rangeString;
-
-		if (m_parentMainWidget->document()->currentSubPage()->composeLinkSubPageCodes(i) != 0x0000) {
-			// First build a list of consecutive ranges seen
-			// The "b-index" is based on https://codereview.stackexchange.com/a/90074
-			QMap<int, QPair<int, int>> ranges;
-			int index = 0;
-			for (int b=0; b<16; b++)
-				if ((m_parentMainWidget->document()->currentSubPage()->composeLinkSubPageCodes(i) >> b) & 0x01) {
-					if (!ranges.contains(b-index))
-						ranges.insert(b-index, qMakePair(b, b));
-					else
-						ranges[b-index].second = b;
-					index++;
-				}
-			// Now go through the list and add single numbers or ranges as appropriate
-			QPair<int, int> range;
-			foreach (range, ranges) {
-				// For second and subsequent entries only, append a comma first
-				if (!rangeString.isEmpty())
-					rangeString.append(',');
-				// Append the single number or the first number of the range
-				rangeString.append(QString("%1").arg(range.first));
-				// If that was part of a range and not a single orphaned number
-				if (range.first != range.second) {
-					// Ranges of 3 or more use a dash. A range of 2 can make do with a comma
-					rangeString.append((range.first+1 == range.second) ? ',' : '-');
-					// Append the second number of the range
-					rangeString.append(QString("%1").arg(range.second));
-				}
-			}
-		}
-		m_composeLinkSubPageNumbersLineEdit[i]->blockSignals(true);
-		m_composeLinkSubPageNumbersLineEdit[i]->setText(rangeString);
-		m_composeLinkSubPageNumbersLineEdit[i]->blockSignals(false);
-	}
 }

pageenhancementsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -23,9 +23,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDockWidget>
-#include <QLineEdit>
 #include <QSpinBox>
-#include <QString>
 
 #include "mainwidget.h"
 
@@ -40,17 +38,11 @@ public:
 private:
 	void setLeftSidePanelWidth(int);
 	void setRightSidePanelWidth(int);
-	void setComposeLinkPageNumber(int, const QString &);
-	void setComposeLinkSubPageNumbers(int, const QString &);
 
 	TeletextWidget *m_parentMainWidget;
 	QComboBox *m_defaultScreenColourCombo, *m_defaultRowColourCombo, *m_colourTableCombo;
 	QCheckBox *m_blackBackgroundSubstAct, *m_sidePanelStatusAct;
 	QSpinBox *m_leftSidePanelSpinBox, *m_rightSidePanelSpinBox;
-
-	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];
 };
 
 #endif

pageoptionsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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");
+	m_pageNumberEdit->setInputMask(">DHH");
-	//TODO restrict first digit of page number to 1-8
+	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");
+		m_fastTextEdit[i]->setInputMask(">DHH");
-		//TODO restrict first digit of page number to 1-8
+		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); } );
 	}

pageoptionsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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();

pagex26base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagex26base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

palettedockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -39,6 +39,9 @@ PaletteDockWidget::PaletteDockWidget(TeletextWidget *parent): QDockWidget(parent
 
 	m_parentMainWidget = parent;
 
+	m_level3p5Accepted = false; // true when Level 3.5 radio button is checked in main window
+	m_level3p5Seen = false;     // true when CLUT 0 or 1 is redefined
+
 	this->setObjectName("PaletteDockWidget");
 	this->setWindowTitle("Palette");
 	for (int c=0; c<=7; c++)
@@ -57,6 +60,9 @@ PaletteDockWidget::PaletteDockWidget(TeletextWidget *parent): QDockWidget(parent
 			connect(m_colourButton[i], &QAbstractButton::clicked, [=]() { selectColour(i); });
 		}
 	}
+
+	updateLevel3p5Cursor();
+
 	m_showHexValuesCheckBox = new QCheckBox(tr("Show colour hex values"));
 	paletteGridLayout->addWidget(m_showHexValuesCheckBox, 5, 1, 1, 8);
 	connect(m_showHexValuesCheckBox, &QCheckBox::stateChanged, this, &PaletteDockWidget::updateAllColourButtons);
@@ -70,26 +76,34 @@ void PaletteDockWidget::updateColourButton(int colourIndex)
 {
 	if (colourIndex == 8)
 		return;
+
 	QString colourString = QString("%1").arg(m_parentMainWidget->document()->currentSubPage()->CLUT(colourIndex), 3, 16, QChar('0'));
 	if (m_showHexValuesCheckBox->isChecked())
 		m_colourButton[colourIndex]->setText(colourString);
 	else
 		m_colourButton[colourIndex]->setText(nullptr);
 
-	// Set text itself to black or white so it can be seen over background colour - http://alienryderflex.com/hsp.html
 	int r = m_parentMainWidget->document()->currentSubPage()->CLUT(colourIndex) >> 8;
 	int g = (m_parentMainWidget->document()->currentSubPage()->CLUT(colourIndex) >> 4) & 0xf;
 	int b = m_parentMainWidget->document()->currentSubPage()->CLUT(colourIndex) & 0xf;
+	// Set text itself to black or white so it can be seen over background colour - http://alienryderflex.com/hsp.html
 	char blackOrWhite = (sqrt(r*r*0.299 + g*g*0.587 + b*b*0.114) > 7.647) ? '0' : 'f';
 
 	QString qss = QString("background-color: #%1; color: #%2%2%2; border: none").arg(colourString).arg(blackOrWhite);
 	m_colourButton[colourIndex]->setStyleSheet(qss);
 
-	if (m_parentMainWidget->document()->currentSubPage()->isPaletteDefault(colourIndex))
+	if (m_parentMainWidget->document()->currentSubPage()->isPaletteDefault(colourIndex)) {
-		// Default colour was set, disable Reset button if all colours in row are default as well
+		// Default colour was set, disable Reset button if all colours in a CLUT row are default as well
-		m_resetButton[colourIndex>>3]->setEnabled(!m_parentMainWidget->document()->currentSubPage()->isPaletteDefault(colourIndex & 0x18, colourIndex | 0x07));
+		m_resetButton[colourIndex >> 3]->setEnabled(!m_parentMainWidget->document()->currentSubPage()->isPaletteDefault(colourIndex & 0x18, colourIndex | 0x07));
-	else
+		// Check if CLUTs 0 and 1 are all default if necessary
-		m_resetButton[colourIndex>>3]->setEnabled(true);
+		if (colourIndex < 16 && m_parentMainWidget->document()->currentSubPage()->isPaletteDefault(0, 15))
+			setLevel3p5Seen(false);
+	} else {
+		// Custom colour was set, enable Reset button for that CLUT
+		m_resetButton[colourIndex >> 3]->setEnabled(true);
+		if (colourIndex < 16)
+			setLevel3p5Seen(true);
+	}
 }
 
 void PaletteDockWidget::updateAllColourButtons()
@@ -98,6 +112,41 @@ void PaletteDockWidget::updateAllColourButtons()
 		updateColourButton(i);
 }
 
+void PaletteDockWidget::setLevel3p5Accepted(bool b)
+{
+	if (b == m_level3p5Accepted)
+		return;
+
+	m_level3p5Accepted = b;
+
+	updateLevel3p5Cursor();
+}
+
+void PaletteDockWidget::setLevel3p5Seen(bool b)
+{
+	if (b == m_level3p5Seen)
+		return;
+
+	m_level3p5Seen = b;
+
+	updateLevel3p5Cursor();
+}
+
+void PaletteDockWidget::updateLevel3p5Cursor()
+{
+	const Qt::CursorShape cursor = (m_level3p5Accepted || m_level3p5Seen) ? Qt::ArrowCursor : Qt::ForbiddenCursor;
+
+	if (m_colourButton[0]->cursor() == cursor)
+		return;
+
+	for (int i=0; i<16; i++) {
+		if (i == 8)
+			continue;
+
+		m_colourButton[i]->setCursor(cursor);
+	}
+}
+
 void PaletteDockWidget::showEvent(QShowEvent *event)
 {
 	Q_UNUSED(event);
@@ -106,6 +155,9 @@ void PaletteDockWidget::showEvent(QShowEvent *event)
 
 void PaletteDockWidget::selectColour(int colourIndex)
 {
+	if (colourIndex < 16 && !m_level3p5Accepted && !m_level3p5Seen)
+		return;
+
     const QColor newColour = QColorDialog::getColor(m_parentMainWidget->document()->currentSubPage()->CLUTtoQColor(colourIndex), this, "Select Colour");
 
 	if (newColour.isValid())

palettedockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,18 +36,22 @@ public:
 
 public slots:
 	void updateColourButton(int);
+	void setLevel3p5Accepted(bool);
 
 protected:
 	void showEvent(QShowEvent *);
 
 private slots:
 	void selectColour(int);
+	void setLevel3p5Seen(bool);
+	void updateLevel3p5Cursor();
 
 private:
 	void resetCLUT(int);
 
 	QPushButton *m_colourButton[32], *m_resetButton[4];
 	QCheckBox *m_showHexValuesCheckBox;
+	bool m_level3p5Accepted, m_level3p5Seen;
 
 	TeletextWidget *m_parentMainWidget;
 };

qteletextmaker.pro

@@ -1,7 +1,9 @@
 QT += widgets
 requires(qtConfig(filedialog))
 
-HEADERS       = document.h \
+HEADERS       = decode.h \
+                document.h \
+                hamming.h \
                 keymap.h \
                 levelonecommands.h \
                 levelonepage.h \
@@ -10,6 +12,7 @@ HEADERS       = document.h \
                 mainwindow.h \
                 pagebase.h \
                 pagex26base.h \
+                pagecomposelinksdockwidget.h \
                 pageenhancementsdockwidget.h \
                 pageoptionsdockwidget.h \
                 palettedockwidget.h \
@@ -18,7 +21,8 @@ HEADERS       = document.h \
                 x26dockwidget.h \
                 x26model.h \
                 x26triplets.h
-SOURCES       = document.cpp \
+SOURCES       = decode.cpp \
+                document.cpp \
                 levelonecommands.cpp \
                 levelonepage.cpp \
                 loadsave.cpp \
@@ -27,6 +31,7 @@ SOURCES       = document.cpp \
                 mainwindow.cpp \
                 pagebase.cpp \
                 pagex26base.cpp \
+                pagecomposelinksdockwidget.cpp \
                 pageenhancementsdockwidget.cpp \
                 pageoptionsdockwidget.cpp \
                 palettedockwidget.cpp \

render.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,169 +21,16 @@
 #define RENDER_H
 
 #include <QBitmap>
-#include <QMap>
+#include <QPixmap>
-#include <QMultiMap>
-#include <QPair>
-#include <vector>
 
-#include "levelonepage.h"
+#include "decode.h"
-
-
-struct textCharacter {
-	unsigned char code=0x20;
-	int set=0;
-	int diacritical=0;
-};
-
-struct displayAttributes {
-	bool doubleHeight=false;
-	bool doubleWidth=false;
-	bool boxingWindow=false;
-	bool conceal=false;
-	bool invert=false;
-	bool underlineSeparated=false;
-	bool forceContiguous=false;
-};
-
-struct textAttributes {
-	int foreColour=0x07;
-	int backColour=0x00;
-	struct flashFunctions {
-		int mode=0;
-		int ratePhase=0;
-		int phaseNumber=0;
-	} flash;
-	displayAttributes display;
-	/* font style */
-};
-
-struct textCell {
-	textCharacter character;
-	textAttributes attribute;
-	bool bottomHalf=false;
-	bool rightHalf=false;
-	bool level1Mosaic=false;
-	int level1CharSet=0;
-};
-
-struct applyAttributes {
-	bool applyForeColour=false;
-	bool applyBackColour=false;
-	bool applyFlash=false;
-	bool applyDisplayAttributes=false;
-	bool applyTextSizeOnly=false;
-	bool applyBoxingOnly=false;
-	bool applyConcealOnly=false;
-	bool applyContiguousOnly=false;
-	bool copyAboveAttributes=false;
-	textAttributes attribute;
-};
-
-class ActivePosition
-{
-public:
-	ActivePosition();
-	int row() const { return (m_row == -1) ? 0 : m_row; }
-	int column() const { return (m_column == -1) ? 0 : m_column; }
-	bool isDeployed() const { return m_row != -1; }
-	bool setRow(int);
-	bool setColumn(int);
-//	bool setRowAndColumn(int, int);
-
-private:
-	int m_row, m_column;
-};
-
-
-class TextLayer
-{
-public:
-//	TextLayer(TeletextPage* thePage) : currentPage(thePage) { };
-	virtual ~TextLayer() = default;
-	void setTeletextPage(LevelOnePage *);
-	virtual textCharacter character(int, int) =0;
-	virtual void attributes(int, int, applyAttributes *) =0;
-	virtual int fullScreenColour() const =0;
-	virtual int fullRowColour(int) const =0;
-	virtual bool fullRowDownwards(int) const =0;
-	virtual int objectType() const =0;
-	virtual int originR() const { return 0; };
-	virtual int originC() const { return 0; };
-	void setFullScreenColour(int);
-	void setFullRowColour(int, int, bool);
-
-	// Key QPair is row and column, value QPair is triplet mode and data
-	QMultiMap<QPair<int, int>, QPair<int, int>> enhanceMap;
-
-protected:
-	LevelOnePage* m_levelOnePage;
-	int m_layerFullScreenColour=-1;
-	int m_layerFullRowColour[25];
-	bool m_layerFullRowDownwards[25];
-	applyAttributes m_applyAttributes;
-};
-
-class EnhanceLayer: public TextLayer
-{
-public:
-	EnhanceLayer();
-	textCharacter character(int, int);
-	void attributes(int, int, applyAttributes *);
-	int fullScreenColour() const { return m_layerFullScreenColour; };
-	int fullRowColour(int r) const { return m_layerFullRowColour[r]; };
-	bool fullRowDownwards(int r) const { return m_layerFullRowDownwards[r]; };
-	int objectType() const { return m_objectType; };
-	int originR() const { return m_originR; };
-	int originC() const { return m_originC; };
-	void setObjectType(int);
-	void setOrigin(int, int);
-
-protected:
-	int m_objectType=0;
-	int m_originR=0;
-	int m_originC=0;
-	int m_rowCached=-1;
-	int m_rightMostColumn[25];
-};
-
-class Level1Layer: public TextLayer
-{
-public:
-//	Level1Layer(TeletextPage *thePage) : TextLayer(thePage) { };
-	Level1Layer();
-	textCharacter character(int, int);
-	void attributes(int, int, applyAttributes *);
-	int fullScreenColour() const { return -1; };
-	int fullRowColour(int) const { return -1; };
-	bool fullRowDownwards(int) const { return false; };
-	int objectType() const { return 0; }
-	bool isRowBottomHalf(int r) const { return m_rowHeight[r]==RHbottomhalf; }
-
-private:
-	void updateRowCache(int);
-
-	struct level1CacheAttributes {
-		int foreColour=0x07;
-		int backColour=0x00;
-		unsigned char sizeCode=0x0c;
-		bool mosaics=false;
-		bool separated=false;
-		bool held=false;
-		bool escSwitch=false;
-		unsigned char holdChar=0x20;
-		bool holdSeparated=false;
-	};
-	level1CacheAttributes m_attributeCache[40];
-	int m_rowCached=-1;
-	bool m_rowHasDoubleHeightAttr[25];
-	enum rowHeightEnum { RHnormal=-1, RHtophalf, RHbottomhalf } m_rowHeight[25];
-};
 
 class TeletextFontBitmap
 {
 public:
 	TeletextFontBitmap();
 	~TeletextFontBitmap();
+
 	QBitmap *rawBitmap() const { return s_fontBitmap; }
 
 private:
@@ -198,67 +45,39 @@ class TeletextPageRender : public QObject
 public:
 	TeletextPageRender();
 	~TeletextPageRender();
-	void decodePage();
+
-	void renderPage();
-	void renderPage(int r);
-	bool mix() const { return m_mix; };
-	bool showCodes() const { return m_showCodes; };
-	void setTeletextPage(LevelOnePage *);
-	void updateSidePanels();
-	void buildEnhanceMap(TextLayer *, int=0);
 	QPixmap* pagePixmap(int i) const { return m_pagePixmap[i]; };
-	bool level1MosaicAttribute(int r, int c) const { return m_cell[r][c].level1Mosaic; };
+	bool mix() const { return m_mix; };
-	int level1CharSet(int r, int c) const { return m_cell[r][c].level1CharSet; };
+	void setDecoder(TeletextPageDecode *);
-	int leftSidePanelColumns() const { return m_leftSidePanelColumns; };
+	void renderPage(bool force=false);
-	int rightSidePanelColumns() const { return m_rightSidePanelColumns; };
+	bool showControlCodes() const { return m_showControlCodes; };
 
 public slots:
+	void colourChanged(int);
 	void setReveal(bool);
 	void setMix(bool);
-	void setShowCodes(bool);
+	void setShowControlCodes(bool);
-	void setRenderLevel(int);
 
 signals:
-	void fullScreenColourChanged(QColor);
-	void fullRowColourChanged(int, QColor);
 	void flashChanged(int);
-	void sidePanelsChanged();
 
 protected:
-	void updateFlashRequired(int);
-	inline void setFullScreenColour(int);
-	inline void setFullRowColour(int, int);
-
 	TeletextFontBitmap m_fontBitmap;
 	QPixmap* m_pagePixmap[6];
-	int m_finalFullScreenColour, m_renderLevel;
+	unsigned char m_controlCodeCache[25][40];
-	QColor m_finalFullScreenQColor;
+	bool m_reveal, m_mix, m_showControlCodes;
-	int m_leftSidePanelColumns, m_rightSidePanelColumns;
+	int m_flashBuffersHz;
-	bool m_reveal, m_mix, m_showCodes;
+	int m_flashingRow[25];
-	Level1Layer m_level1Layer;
-	std::vector<TextLayer *> m_textLayer;
-	const int m_foregroundRemap[8] = { 0,  0,  0,  8,  8, 16, 16, 16 };
-	const int m_backgroundRemap[8] = { 0,  8, 16,  8, 16,  8, 16, 24 };
 
 private:
-	textCell m_cell[25][72];
+	inline void drawFromBitmap(QPainter &, int, int, const QBitmap, TeletextPageDecode::CharacterFragment);
-	LevelOnePage* m_levelOnePage;
+	inline void drawFromFontBitmap(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
-	int m_flashRequired;
+	inline void drawCharacter(QPainter &, int, int, unsigned char, int, int, TeletextPageDecode::CharacterFragment);
-	int m_fullRowColour[25];
+	inline void drawBoldOrItalicCharacter(QPainter &, int, int, unsigned char, int, TeletextPageDecode::CharacterFragment);
-	QColor m_fullRowQColor[25];
+	void renderRow(int, int, bool force=false);
-	int m_flashRow[25];
+	void setRowFlashStatus(int, int);
-	bool m_concealRow[25];
-};
 
-static const QMap<int, int> g0CharacterMap {
+	TeletextPageDecode *m_decoder;
-	{ 0x00, 12 }, { 0x01, 15 }, { 0x02, 22 }, { 0x03, 16 }, { 0x04, 14 }, { 0x05, 19 }, { 0x06, 11 },
-	{ 0x08, 18 }, { 0x09, 15 }, { 0x0a, 22 }, { 0x0b, 16 }, { 0x0c, 14 }, { 0x0e, 11 },
-	{ 0x10, 12 }, { 0x11, 15 }, { 0x12, 22 }, { 0x13, 16 }, { 0x14, 14 }, { 0x15, 19 }, { 0x16, 23 },
-	{ 0x1d, 21 }, { 0x1f, 20 },
-	{ 0x20,  1 }, { 0x21, 15 }, { 0x22, 13 }, { 0x23, 17 }, { 0x24,  2 }, { 0x25,  3 }, { 0x26, 11 },
-	{ 0x36, 23 }, { 0x37,  4 },
-	{ 0x40, 12 }, { 0x44, 14 }, { 0x47,  5 },
-	{ 0x55,  6 }, { 0x57,  5 }
 };
 
 #endif

x26commands.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -50,17 +50,30 @@ 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 {
+	else
-		m_x26Model->endInsertRows();
 		m_teletextDocument->emit refreshNeeded();
-	}
 
 	if (m_firstDo)
 		m_firstDo = false;
-	else
+
-		m_teletextDocument->emit tripletCommandHighlight(m_row+1);
+	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
 
 void InsertTripletCommand::undo()
@@ -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 {
+	else
-		m_x26Model->endRemoveRows();
 		m_teletextDocument->emit refreshNeeded();
-	}
 }
 
 
@@ -101,15 +127,35 @@ DeleteTripletCommand::DeleteTripletCommand(TeletextDocument *teletextDocument, X
 
 void DeleteTripletCommand::redo()
 {
-	m_teletextDocument->emit aboutToChangeSubPage();
+	bool changingSubPage = (m_teletextDocument->currentSubPageIndex() != m_subPageIndex);
-	m_teletextDocument->selectSubPageIndex(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 {
+	else
-		m_x26Model->endInsertRows();
 		m_teletextDocument->emit refreshNeeded();
-	}
 
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }

x26commands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

x26dockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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,101 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	connect(m_cookedColumnSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &X26DockWidget::cookedColumnSpinBoxChanged);
 
 	// Cooked triplet mode
-	m_cookedModeComboBox = new QComboBox;
+	QLabel *modeLabel = new QLabel(tr("Mode"));
-	m_cookedModeComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+	modeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
-	cookedTripletLayout->addWidget(m_cookedModeComboBox);
+	cookedTripletLayout->addWidget(modeLabel);
-	connect(m_cookedModeComboBox, QOverload<int>::of(&QComboBox::activated), this, &X26DockWidget::cookedModeComboBoxChanged);
+	m_cookedModePushButton = new QPushButton;
+	cookedTripletLayout->addWidget(m_cookedModePushButton);
+
+	// Cooked triplet menu
+	// We build the menus for both "Insert" buttons at the same time
+	m_cookedModeMenu = new QMenu(this);
+	m_insertBeforeMenu = new QMenu(this);
+	m_insertAfterMenu = new QMenu(this);
+
+	for (int m=0; m<3; m++) {
+		QMenu *menuToBuild;
+
+		if (m == 0)
+			menuToBuild = m_cookedModeMenu;
+		else if (m == 1)
+			menuToBuild = m_insertBeforeMenu;
+		else // if (m == 2)
+			menuToBuild = m_insertAfterMenu;
+
+		auto newModeMenuAction=[&](QMenu *menu, int mode)
+		{
+			QAction *action = menu->addAction(m_x26Model->modeTripletName(mode));
+			if (m == 0)
+				connect(action, &QAction::triggered, [=]() { cookedModeMenuSelected(mode); });
+			else if (m == 1)
+				connect(action, &QAction::triggered, [=]() { insertTriplet(mode, false); });
+			else // if (m == 2)
+				connect(action, &QAction::triggered, [=]() { insertTriplet(mode, true); });
+		};
+
+		newModeMenuAction(menuToBuild, 0x04);
+		QMenu *rowTripletSubMenu = menuToBuild->addMenu(tr("Row triplet"));
+		newModeMenuAction(rowTripletSubMenu, 0x00);
+		newModeMenuAction(rowTripletSubMenu, 0x01);
+		newModeMenuAction(rowTripletSubMenu, 0x07);
+		newModeMenuAction(rowTripletSubMenu, 0x18);
+		QMenu *columnTripletSubMenu = menuToBuild->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 = menuToBuild->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(menuToBuild, 0x1f);
+		menuToBuild->addSeparator();
+		QMenu *pdcSubMenu = menuToBuild->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, 0x2a);
+	}
+
+	m_cookedModePushButton->setMenu(m_cookedModeMenu);
 
 	// Raw triplet values
 	QHBoxLayout *rawTripletLayout = new QHBoxLayout;
@@ -272,7 +353,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;
@@ -444,60 +525,70 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	m_tripletParameterStackedLayout->addWidget(blankWidget);
 
 	// Index 1
+	colourAndRowLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *colourAndRowWidget = new QWidget;
 	colourAndRowWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	colourAndRowWidget->setLayout(colourAndRowLayout);
 	m_tripletParameterStackedLayout->addWidget(colourAndRowWidget);
 
 	// Index 2
+	characterCodeLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *characterCodeWidget = new QWidget;
 	characterCodeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	characterCodeWidget->setLayout(characterCodeLayout);
 	m_tripletParameterStackedLayout->addWidget(characterCodeWidget);
 
 	// Index 3
+	flashModeRateLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *flashModeRateWidget = new QWidget;
 	flashModeRateWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	flashModeRateWidget->setLayout(flashModeRateLayout);
 	m_tripletParameterStackedLayout->addWidget(flashModeRateWidget);
 
 	// Index 4
+	displayAttributesLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *displayAttributesWidget = new QWidget;
 	displayAttributesWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	displayAttributesWidget->setLayout(displayAttributesLayout);
 	m_tripletParameterStackedLayout->addWidget(displayAttributesWidget);
 
 	// Index 5
+	invokeObjectLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *invokeObjectWidget = new QWidget;
 	invokeObjectWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	invokeObjectWidget->setLayout(invokeObjectLayout);
 	m_tripletParameterStackedLayout->addWidget(invokeObjectWidget);
 
 	// Index 6
+	DRCSModeLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *DRCSModeWidget = new QWidget;
 	DRCSModeWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	DRCSModeWidget->setLayout(DRCSModeLayout);
 	m_tripletParameterStackedLayout->addWidget(DRCSModeWidget);
 
 	// Index 7
+	DRCSCharacterLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *DRCSCharacterWidget = new QWidget;
 	DRCSCharacterWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	DRCSCharacterWidget->setLayout(DRCSCharacterLayout);
 	m_tripletParameterStackedLayout->addWidget(DRCSCharacterWidget);
 
 	// Index 8
+	fontStyleLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *fontStyleWidget = new QWidget;
 	fontStyleWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	fontStyleWidget->setLayout(fontStyleLayout);
 	m_tripletParameterStackedLayout->addWidget(fontStyleWidget);
 
 	// Index 9
+	reservedPDCLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *reservedPDCWidget = new QWidget;
 	reservedPDCWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	reservedPDCWidget->setLayout(reservedPDCLayout);
 	m_tripletParameterStackedLayout->addWidget(reservedPDCWidget);
 
 	// Index 10
+	terminationMarkerLayout->setContentsMargins(0, 0, 0, 0);
 	QWidget *terminationMarkerWidget = new QWidget;
 	terminationMarkerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	terminationMarkerWidget->setLayout(terminationMarkerLayout);
@@ -513,30 +604,41 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	// Insert and delete widgets
 	QHBoxLayout *insertDeleteLayout = new QHBoxLayout;
 
-	m_insertPushButton = new QPushButton(tr("Insert triplet"));
+	m_insertBeforePushButton = new QPushButton(tr("Insert before"));
-	insertDeleteLayout->addWidget(m_insertPushButton);
+	insertDeleteLayout->addWidget(m_insertBeforePushButton);
-	m_deletePushButton = new QPushButton(tr("Delete triplet"));
+	m_insertBeforePushButton->setMenu(m_insertBeforeMenu);
+
+	m_insertAfterPushButton = new QPushButton(tr("Insert after"));
+	insertDeleteLayout->addWidget(m_insertAfterPushButton);
+	m_insertAfterPushButton->setMenu(m_insertAfterMenu);
+
+	m_insertCopyPushButton = new QPushButton(tr("Insert copy"));
+	insertDeleteLayout->addWidget(m_insertCopyPushButton);
+
+	m_deletePushButton = new QPushButton(tr("Delete"));
 	insertDeleteLayout->addWidget(m_deletePushButton);
 
-	connect(m_insertPushButton, &QPushButton::clicked, this, &X26DockWidget::insertTriplet);
+	connect(m_insertCopyPushButton, &QPushButton::clicked, this, &X26DockWidget::insertTripletCopy);
 	connect(m_deletePushButton, &QPushButton::clicked, this, &X26DockWidget::deleteTriplet);
 
 	x26Layout->addLayout(insertDeleteLayout);
 
+	disableTripletWidgets();
+
 	x26Widget->setLayout(x26Layout);
 	this->setWidget(x26Widget);
 
 	m_x26View->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(m_x26View, &QWidget::customContextMenuRequested, this, &X26DockWidget::customMenuRequested);
 
-	connect(m_x26View, &QAbstractItemView::clicked, this, &X26DockWidget::rowClicked);
+	connect(m_x26View->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &X26DockWidget::rowSelected);
 }
 
 void X26DockWidget::keyPressEvent(QKeyEvent *event)
 {
 	switch (event->key()) {
 		case Qt::Key_Insert:
-			insertTriplet();
+			insertTripletCopy();
 			break;
 		case Qt::Key_Delete:
 			deleteTriplet();
@@ -554,7 +656,7 @@ void X26DockWidget::selectX26ListRow(int row)
 		row = m_x26Model->rowCount() - 1;
 
 	m_x26View->selectRow(row);
-	rowClicked(m_x26View->currentIndex());
+	rowSelected(m_x26View->currentIndex(), QModelIndex());
 }
 
 void X26DockWidget::loadX26List()
@@ -570,145 +672,53 @@ void X26DockWidget::unloadX26List()
 	m_rawTripletModeSpinBox->setEnabled(false);
 }
 
-void X26DockWidget::rowClicked(const QModelIndex &index)
+void X26DockWidget::rowSelected(const QModelIndex &current, const QModelIndex &previous)
 {
-	updateAllRawTripletSpinBoxes(index);
+	Q_UNUSED(previous);
-	updateAllCookedTripletWidgets(index);
+
+	if (current.isValid()) {
+		updateAllRawTripletSpinBoxes(current);
+		updateAllCookedTripletWidgets(current);
+	} else
+		disableTripletWidgets();
+}
+
+void X26DockWidget::disableTripletWidgets()
+{
+	m_rawTripletAddressSpinBox->setEnabled(false);
+	m_rawTripletDataSpinBox->setEnabled(false);
+	m_rawTripletModeSpinBox->setEnabled(false);
+	m_rawTripletAddressSpinBox->blockSignals(true);
+	m_rawTripletModeSpinBox->blockSignals(true);
+	m_rawTripletDataSpinBox->blockSignals(true);
+	m_rawTripletAddressSpinBox->setValue(0);
+	m_rawTripletModeSpinBox->setValue(0);
+	m_rawTripletDataSpinBox->setValue(0);
+	m_rawTripletAddressSpinBox->blockSignals(false);
+	m_rawTripletModeSpinBox->blockSignals(false);
+	m_rawTripletDataSpinBox->blockSignals(false);
+
+	m_cookedRowSpinBox->setEnabled(false);
+	m_cookedColumnSpinBox->setEnabled(false);
+	m_cookedRowSpinBox->blockSignals(true);
+	m_cookedColumnSpinBox->blockSignals(true);
+	m_cookedRowSpinBox->setValue(1);
+	m_cookedColumnSpinBox->setValue(0);
+	m_cookedRowSpinBox->blockSignals(false);
+	m_cookedColumnSpinBox->blockSignals(false);
+
+	m_cookedModePushButton->setEnabled(false);
+	m_cookedModePushButton->setText(QString());
+
+	m_tripletParameterStackedLayout->setCurrentIndex(0);
 }
 
 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
+	m_cookedModePushButton->setEnabled(true);
-	const int oldCookedModeType = m_cookedModeTypeComboBox->currentIndex();
+	m_cookedModePushButton->setText(m_x26Model->modeTripletName(modeExt));
-	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();
 
 	switch (modeExt) {
 		case 0x04: // Set active position
@@ -739,16 +749,13 @@ void X26DockWidget::updateCookedTripletParameters(const QModelIndex &index)
 		case 0x29: // G0 character
 		case 0x2b: // G3 character at Level 2.5
 		case 0x2f ... 0x3f: // G2 character, G0 character with diacritical
-			// TODO non-Latin G0 and G2 character sets
 			m_characterCodeComboBox->blockSignals(true);
-			if (modeExt == 0x22 || modeExt == 0x2b)
+			if (modeExt == 0x21)
-				m_characterListModel.setCharacterSet(26);
-			else if (modeExt == 0x2f)
-				m_characterListModel.setCharacterSet(7);
-			else if (modeExt == 0x21)
 				m_characterListModel.setCharacterSet(24);
+			else if (modeExt == 0x22 || modeExt == 0x2b)
+				m_characterListModel.setCharacterSet(26);
 			else
-				m_characterListModel.setCharacterSet(0);
+				m_characterListModel.setCharacterSet(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+2).toInt());
 			m_characterCodeComboBox->setCurrentIndex(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt()-32);
 			m_characterCodeComboBox->blockSignals(false);
 			m_tripletParameterStackedLayout->setCurrentIndex(2);
@@ -1004,35 +1011,87 @@ 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..."
+	m_x26Model->setData(m_x26Model->index(m_x26View->currentIndex().row(), 2), value, Qt::EditRole);
-	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);
 
 	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);
 	updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
 }
 
-void X26DockWidget::insertTriplet()
+void X26DockWidget::insertTriplet(int modeExt, bool after)
+{
+	QModelIndex index = m_x26View->currentIndex();
+	X26Triplet newTriplet(modeExt < 0x20 ? 41 : 0, modeExt & 0x1f, 0);
+	int newListRow;
+
+	if (index.isValid()) {
+		newListRow = index.row()+after;
+
+		// If we're inserting a column triplet next to another column triplet,
+		// duplicate the column number
+		// Avoid the PDC and reserved mode triplets
+		if (modeExt >= 0x20 && modeExt != 0x24 && modeExt != 0x25 && modeExt != 0x26 && modeExt != 0x2a) {
+			const int existingTripletModeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
+
+			if (existingTripletModeExt >= 0x20 && existingTripletModeExt != 0x24 && existingTripletModeExt != 0x25 && existingTripletModeExt != 0x26 && existingTripletModeExt != 0x2a)
+				newTriplet.setAddress(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole).toInt());
+		}
+		// If we're inserting a Set Active Position or Full Row Colour triplet,
+		// look for a previous row setting triplet and set this one to the row after
+		if (modeExt == 0x04 || modeExt == 0x01) {
+			for (int i=newListRow-1; i>=0; i--) {
+				const int scanTripletModeExt = index.model()->data(index.model()->index(i, 2), Qt::EditRole).toInt();
+
+				if (scanTripletModeExt == 0x04 || scanTripletModeExt == 0x01) {
+					const int scanActivePositionRow = index.model()->data(index.model()->index(i, 0), Qt::EditRole).toInt()+1;
+
+					if (scanActivePositionRow < 25)
+						newTriplet.setAddressRow(scanActivePositionRow);
+					else
+						newTriplet.setAddressRow(24);
+
+					break;
+				}
+			}
+		}
+	} else
+		newListRow = 0;
+
+	// For character triplets, ensure Data is not reserved
+	if (modeExt == 0x21 || modeExt == 0x22 || modeExt == 0x29 || modeExt == 0x2b || modeExt >= 0x2f)
+		newTriplet.setData(0x20);
+	// For Address Row 0, set Address
+	if (modeExt == 0x07)
+		newTriplet.setAddress(63);
+	// For Termination Marker, set Address and Mode
+	if (modeExt == 0x1f) {
+		newTriplet.setAddress(63);
+		newTriplet.setData(7);
+	}
+
+	m_x26Model->insertRows(newListRow, 1, QModelIndex(), newTriplet);
+}
+
+void X26DockWidget::insertTripletCopy()
 {
 	QModelIndex index = m_x26View->currentIndex();
 
 	if (index.isValid())
 		m_x26Model->insertRow(index.row(), QModelIndex());
 	else
-		m_x26Model->insertFirstRow();
+		// No existing triplet to copy, so insert a Termination Marker
+		m_x26Model->insertRows(0, 1, QModelIndex(), X26Triplet(63, 31, 7));
 }
 
 void X26DockWidget::deleteTriplet()
@@ -1048,9 +1107,9 @@ void X26DockWidget::customMenuRequested(QPoint pos)
 
 	QMenu *menu = new QMenu(this);
 
-	QAction *insertAct = new QAction("Insert triplet", this);
+	QAction *insertAct = new QAction("Insert triplet copy", this);
 	menu->addAction(insertAct);
-	connect(insertAct, &QAction::triggered, this, &X26DockWidget::insertTriplet);
+	connect(insertAct, &QAction::triggered, this, &X26DockWidget::insertTripletCopy);
 	if (index.isValid()) {
 		QAction *deleteAct = new QAction("Delete triplet", this);
 		menu->addAction(deleteAct);

x26dockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 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>
@@ -60,23 +61,22 @@ public:
 	X26DockWidget(TeletextWidget *parent);
 
 public slots:
-	void insertTriplet();
+	void insertTriplet(int, bool);
+	void insertTripletCopy();
 	void deleteTriplet();
 	void customMenuRequested(QPoint pos);
 	void loadX26List();
 	void unloadX26List();
-	void rowClicked(const QModelIndex &);
+	void rowSelected(const QModelIndex &, const QModelIndex &);
 	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 +87,9 @@ protected:
 private:
 	QTableView *m_x26View;
 	X26Model *m_x26Model;
-	QComboBox *m_cookedModeTypeComboBox;
 	QSpinBox *m_cookedRowSpinBox, *m_cookedColumnSpinBox;
-	QComboBox *m_cookedModeComboBox;
+	QMenu *m_cookedModeMenu, *m_insertBeforeMenu, *m_insertAfterMenu;
+	QPushButton *m_cookedModePushButton;
 	QSpinBox *m_rawTripletAddressSpinBox, *m_rawTripletModeSpinBox, *m_rawTripletDataSpinBox;
 	QStackedLayout *m_rawOrCookedStackedLayout;
 	QComboBox *m_colourComboBox;
@@ -114,9 +114,12 @@ private:
 	QSpinBox *m_reservedPDCSpinBox;
 	QComboBox *m_terminationMarkerPageTypeComboBox;
 	QCheckBox *m_terminationMarkerMoreFollowsCheckBox;
-	QPushButton *m_insertPushButton, *m_deletePushButton;
+	QPushButton *m_insertBeforePushButton, *m_insertAfterPushButton, *m_insertCopyPushButton, *m_deletePushButton;
 
 	TeletextWidget *m_parentMainWidget;
+
+	void disableTripletWidgets();
+
 };
 
 #endif

x26model.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -65,11 +65,19 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 		}
 
 	// Error colours from KDE Plasma Breeze (light) theme
-	if (role == Qt::ForegroundRole && triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
+	if (role == Qt::ForegroundRole) {
-		return QColor(252, 252, 252);
+		if (triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
+			return QColor(252, 252, 252);
+		else if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+			return QColor(35, 38, 39);
+	}
 
-	if (role == Qt::BackgroundRole && triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
+	if (role == Qt::BackgroundRole) {
-		return QColor(218, 68, 63);
+		if (triplet.error() != X26Triplet::NoError && index.column() == m_tripletErrors[triplet.error()].columnHighlight)
+			return QColor(218, 68, 63);
+		else if ((index.column() == 2 && triplet.reservedMode()) || (index.column() == 3 && triplet.reservedData()))
+			return QColor(246, 116, 0);
+	}
 
 	if (role == Qt::ToolTipRole && triplet.error() != X26Triplet::NoError)
 		return m_tripletErrors[triplet.error()].message;
@@ -258,7 +266,30 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return result;
 				}
 				break;
-			//TODO case 0x28: // G0 and G2 designation
+			case 0x28: // Modified G0 and G2 character set
+				switch (triplet.data()) {
+					case 0x20:
+						return QString("0x20 Cyrillic 1 Serbian/Croatian");
+					case 0x24:
+						return QString("0x24 Cyrillic 2 Russian/Bulgarian");
+					case 0x25:
+						return QString("0x25 Cyrillic 3 Ukranian");
+					case 0x36:
+						return QString("0x36 Latin");
+					case 0x37:
+						return QString("0x37 Greek");
+					case 0x40:
+					case 0x44:
+						return QString("0x%1 G0 Latin, G2 Arabic").arg(triplet.data(), 2, 16);
+					case 0x47:
+					case 0x57:
+						return QString("0x%1 Arabic").arg(triplet.data(), 2, 16);
+					case 0x55:
+						return QString("0x55 G0 Hebrew, G2 Arabic");
+				}
+				if (triplet.data() < 0x27)
+					return QString("0x%1 Latin").arg(triplet.data(), 2, 16, QChar('0'));
+				break;
 			case 0x2c: // Display attributes
 				if (triplet.data() & 0x02)
 					result.append("Boxing ");
@@ -306,7 +337,6 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					result.chop(1);
 				result.append(QString(", %1 row(s)").arg(triplet.data() >> 4));
 				return result;
-			case 0x28: // Modified G0 and G2 character set
 			case 0x26: // PDC
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 			default: // Reserved
@@ -338,16 +368,11 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				if (triplet.data() >= 0x20)
 					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 26*10, 12, 10);
 				break;
-			case 0x2f: // G2 character
-				// TODO non-Latin G2 character sets
-				if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 7*10, 12, 10);
-				break;
 			case 0x29: // G0 character
+			case 0x2f: // G2 character
 			case 0x30 ... 0x3f: // G0 diacritical mark
-				// TODO non-Latin G0 character sets
 				if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 0, 12, 10);
+					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, m_parentMainWidget->pageDecode()->cellCharacterSet(triplet.activePositionRow(), triplet.activePositionColumn())*10, 12, 10);
 				break;
 		};
 
@@ -463,9 +488,16 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return triplet.data() >> 4;
 			}
 			break;
+		case 0x29: // G0 character
+		case 0x2f: // G2 character
+		case 0x30 ... 0x3f: // G0 diacritical mark
+			// Qt::UserRole+1 is character number, returned by default below
+			if (role == Qt::UserRole+2) // Character set
+				return m_parentMainWidget->pageDecode()->cellCharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
+			break;
 	};
 
-	// Fpr other triplet modes, return the complete data value
+	// For characters and other triplet modes, return the complete data value
 	if (role == Qt::UserRole+1)
 		return triplet.data();
 
@@ -610,7 +642,7 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if (triplet.data() >= 0x18)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0, role));
 						break;
-					case 0x28: // Display attributes
+					case 0x2c: // Display attributes
 					case 0x2e: // Font style
 						// Clear reserved bit D3
 						if (triplet.data() & 0x08)
@@ -797,13 +829,6 @@ QVariant X26Model::headerData(int section, Qt::Orientation orientation, int role
 	return QVariant();
 }
 
-bool X26Model::insertFirstRow()
-{
-	m_parentMainWidget->document()->undoStack()->push(new InsertTripletCommand(m_parentMainWidget->document(), this, 0, 1, X26Triplet(63, 31, 7)));
-
-	return true;
-}
-
 bool X26Model::insertRows(int row, int count, const QModelIndex &parent)
 {
 	Q_UNUSED(parent);
@@ -815,6 +840,17 @@ bool X26Model::insertRows(int row, int count, const QModelIndex &parent)
 	return true;
 }
 
+bool X26Model::insertRows(int row, int count, const QModelIndex &parent, X26Triplet triplet)
+{
+	Q_UNUSED(parent);
+
+	if (m_parentMainWidget->document()->currentSubPage()->enhancements()->size() + count > m_parentMainWidget->document()->currentSubPage()->maxEnhancements())
+		return false;
+
+	m_parentMainWidget->document()->undoStack()->push(new InsertTripletCommand(m_parentMainWidget->document(), this, row, count, triplet));
+	return true;
+}
+
 bool X26Model::removeRows(int row, int count, const QModelIndex &index)
 {
 	Q_UNUSED(index);

x26model.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,11 +36,13 @@ public:
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 	bool setData(const QModelIndex &index, const QVariant &value, int role);
 	QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-	bool insertFirstRow();
 	bool insertRows(int position, int rows, const QModelIndex &parent);
+	bool insertRows(int position, int rows, const QModelIndex &parent, X26Triplet triplet);
 	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",
+		"G1 block mosaic",
-		"G3 character, level 1.5",
+		"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",
+		"Font style, level 3.5",
-		"G2 character",
+		"G2 supplementary character",
 
 		"G0 character no diacritical",
 		"G0 character diacritical 1",
@@ -138,10 +140,14 @@ private:
 		int columnHighlight;
 	};
 
-	const tripletErrorShow m_tripletErrors[3] {
+	// Needs to be in the same order as enum X26TripletError in x26triplets.h
+	const tripletErrorShow m_tripletErrors[6] {
 		{ "", 0 }, // No error
 		{ "Active Position can't move up", 0 },
-		{ "Active Position can't move left within row", 1 }
+		{ "Active Position can't move left within row", 1 },
+		{ "Invocation not pointing to Object Definition", 3 },
+		{ "Invoked and Defined Object types don't match", 2 },
+		{ "Origin Modifier not followed by Object Invocation", 2 }
 	};
 };
 

x26triplets.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -51,87 +51,206 @@ 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 X26TripletList::updateInternalData(int r)
+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()
 {
 	ActivePosition activePosition;
 	X26Triplet *triplet;
 
-	if (r != 0) {
+	// Check for errors, and fill in where the Active Position goes for Level 2.5 and above
-		activePosition.setRow(m_list[r-1].m_activePositionRow);
+	for (int i=0; i < m_list.size(); i++) {
-		activePosition.setColumn(m_list[r-1].m_activePositionColumn);
-	}
-
-	for (int i = r; i < m_list.size(); i++) {
 		triplet = &m_list[i];
 		triplet->m_error = X26Triplet::NoError;
+		triplet->m_reservedMode = false;
+		triplet->m_reservedData = false;
+
 		if (triplet->isRowTriplet()) {
-			switch (m_list.at(i).modeExt()) {
+			switch (triplet->modeExt()) {
 				case 0x00: // Full screen colour
 					if (activePosition.isDeployed())
 						// TODO more specific error needed
 						triplet->m_error = X26Triplet::ActivePositionMovedUp;
+					if (triplet->m_data & 0x60)
+						triplet->m_reservedData = true;
 					break;
 				case 0x01: // Full row colour
 					if (!activePosition.setRow(triplet->addressRow()))
 						triplet->m_error = X26Triplet::ActivePositionMovedUp;
+					if ((triplet->m_data & 0x60) != 0x00 && (triplet->m_data & 0x60) != 0x60)
+						triplet->m_reservedData = true;
 					break;
 				case 0x04: // Set Active Position;
 					if (!activePosition.setRow(triplet->addressRow()))
 						triplet->m_error = X26Triplet::ActivePositionMovedUp;
-					else if (triplet->data() >= 40 || !activePosition.setColumn(triplet->data()))
+					else if (triplet->data() >= 40)
+						// FIXME data column highlighted?
+						triplet->m_reservedData = true;
+					else if (!activePosition.setColumn(triplet->data()))
 						triplet->m_error = X26Triplet::ActivePositionMovedLeft;
 					break;
 				case 0x07: // Address row 0
-					if (activePosition.isDeployed())
+					if (triplet->m_address != 63)
+						// FIXME data column highlighted?
+						triplet->m_reservedData = true;
+					else if (activePosition.isDeployed())
 						triplet->m_error = X26Triplet::ActivePositionMovedUp;
 					else {
 						activePosition.setRow(0);
 						activePosition.setColumn(8);
 					}
+					if ((triplet->m_data & 0x60) != 0x00 && (triplet->m_data & 0x60) != 0x60)
+						triplet->m_reservedData = true;
+					break;
+				case 0x10: // Origin Modifier
+					if (i == m_list.size()-1 ||
+					    m_list.at(i+1).modeExt() < 0x11 ||
+					    m_list.at(i+1).modeExt() > 0x13)
+						triplet->m_error = X26Triplet::OriginModifierAlone;
+					break;
+				case 0x11 ... 0x13: // Invoke Object
+					if (triplet->objectSource() == X26Triplet::LocalObject) {
+						if (triplet->objectLocalTripletNumber() > 12 ||
+							triplet->objectLocalIndex() > (m_list.size()-1) ||
+							m_list.at(triplet->objectLocalIndex()).modeExt() < 0x15 ||
+							m_list.at(triplet->objectLocalIndex()).modeExt() > 0x17)
+							triplet->m_error = X26Triplet::InvokePointerInvalid;
+						else if ((triplet->modeExt() | 0x04) != m_list.at(triplet->objectLocalIndex()).modeExt())
+							triplet->m_error = X26Triplet::InvokeTypeMismatch;
+					}
 					break;
 				case 0x15 ... 0x17: // Define Object
 					activePosition.reset();
 					// Make sure data field holds correct place of triplet
 					// otherwise the object won't appear
-					triplet->m_address &= 0x3c;
+					triplet->setObjectLocalIndex(i);
-					if (i >= 104) // Triplet 8
-						triplet->m_address |= 0x01;
-					triplet->m_data = (((i / 13) & 0x07) << 4) | (i % 13);
 					break;
+				case 0x18: // DRCS mode
+					if ((triplet->m_data & 0x30) == 0x00)
+						triplet->m_reservedData = true;
+				case 0x1f: // Termination marker
+				case 0x08 ... 0x0d: // PDC
+					break;
+				default:
+					triplet->m_reservedMode = true;
 			};
-		// Column triplet: make sure that PDC and reserved triplets don't affect the Active Position
+		// Column triplet: all triplets modes except PDC and reserved move the Active Position
-		} else if (triplet->modeExt() != 0x24 && triplet->modeExt() != 0x25 && triplet->modeExt() != 0x26 && triplet->modeExt() != 0x2a)
+		} else if (triplet->modeExt() == 0x24 || triplet->modeExt() == 0x25 || triplet->modeExt() == 0x2a)
-			if (!activePosition.setColumn(triplet->addressColumn()))
+			triplet->m_reservedMode = true;
-				triplet->m_error = X26Triplet::ActivePositionMovedLeft;
+		else if (triplet->modeExt() != 0x26 && !activePosition.setColumn(triplet->addressColumn()))
+			triplet->m_error = X26Triplet::ActivePositionMovedLeft;
+		else
+			switch (triplet->modeExt()) {
+				case 0x20: // Foreground colour
+				case 0x23: // Foreground colour
+					if (triplet->m_data & 0x60)
+						triplet->m_reservedData = true;
+					break;
+				case 0x21: // G1 mosaic character
+				case 0x22: // G3 mosaic character at level 1.5
+				case 0x29: // G0 character
+				case 0x2b: // G3 mosaic character at level >=2.5
+				case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+					if (triplet->m_data < 0x20)
+						triplet->m_reservedData = true;
+					break;
+				case 0x27: // Additional flash functions
+					if (triplet->m_data >= 0x18)
+						triplet->m_reservedData = true;
+					break;
+				case 0x28: // Modified G0 and G2 character set
+					if (triplet->m_data > 0x26)
+						switch (triplet->m_data) {
+							case 0x36:
+							case 0x37:
+							case 0x40:
+							case 0x44:
+							case 0x47:
+							case 0x55:
+							case 0x57:
+								break;
+							default:
+								triplet->m_reservedData = true;
+						}
+					break;
+				case 0x2d: // DRCS character
+					if ((triplet->m_data & 0x3f) >= 48)
+						// Should really be an error?
+						triplet->m_reservedData = true;
+			}
+
 		triplet->m_activePositionRow = activePosition.row();
 		triplet->m_activePositionColumn = activePosition.column();
 	}
+
+	// Now work out where the Active Position goes on a Level 1.5 decoder
+	activePosition.reset();
+
+	for (int i=0; i < m_list.size(); i++) {
+		triplet = &m_list[i];
+
+		if (triplet->modeExt() == 0x1f) // Termination marker
+			break;
+
+		switch (triplet->modeExt()) {
+			case 0x04: // Set Active Position;
+				activePosition.setRow(triplet->addressRow());
+				break;
+			case 0x07: // Address row 0
+				if (triplet->m_address == 63 && activePosition.setRow(0))
+					activePosition.setColumn(8);
+				break;
+			case 0x22: // G3 mosaic character at level 1.5
+			case 0x2f ... 0x3f: // G2 character or G0 diacritical mark
+				activePosition.setColumn(triplet->addressColumn());
+				break;
+		}
+
+		triplet->m_activePositionRow1p5 = activePosition.row();
+		triplet->m_activePositionColumn1p5 = activePosition.column();
+	}
+
 }
 
 void X26TripletList::append(const X26Triplet &value)
 {
 	m_list.append(value);
-	updateInternalData(m_list.size()-1);
+	updateInternalData();
 }
 
 void X26TripletList::insert(int i, const X26Triplet &value)
 {
 	m_list.insert(i, value);
-	updateInternalData(i);
+	updateInternalData();
 }
 
 void X26TripletList::removeAt(int i)
 {
 	m_list.removeAt(i);
 	if (m_list.size() != 0 && i < m_list.size())
-		updateInternalData(i);
+		updateInternalData();
 }
 
 void X26TripletList::replace(int i, const X26Triplet &value)
 {
 	m_list.replace(i, value);
-	updateInternalData(i);
+	updateInternalData();
 }
 
 

x26triplets.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, 2021 Gavin MacGregor
+ * Copyright (C) 2020-2023 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -25,7 +25,9 @@
 class X26Triplet
 {
 public:
-	enum X26TripletError { NoError, ActivePositionMovedUp, ActivePositionMovedLeft };
+	// x26model.h has the Plain English descriptions of these errors
+	enum X26TripletError { NoError, ActivePositionMovedUp, ActivePositionMovedLeft, InvokePointerInvalid, InvokeTypeMismatch, OriginModifierAlone };
+	enum ObjectSource { InvalidObjectSource, LocalObject, POPObject, GPOPObject };
 
 	X26Triplet() {}
 //	X26Triplet(const X26Triplet &other);
@@ -48,17 +50,36 @@ public:
 	void setAddressRow(int);
 	void setAddressColumn(int);
 
+	int objectSource() const { return (m_address & 0x18) >> 3; }
+
+	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; }
+	int activePositionRow1p5() const { return m_activePositionRow1p5; }
+	int activePositionColumn1p5() const { return m_activePositionColumn1p5; }
 	X26TripletError error() const { return m_error; }
+	bool reservedMode() const { return m_reservedMode; }
+	bool reservedData() const { return m_reservedData; }
 
 	friend class X26TripletList;
 
 private:
+	// Only these variables are manipulated by the X26Triplet class
 	int m_address, m_mode, m_data;
+	// and the following are filled in by X26TripletList::updateInternalData()
 	int m_activePositionRow = -1;
 	int m_activePositionColumn = -1;
+	int m_activePositionRow1p5 = -1;
+	int m_activePositionColumn1p5 = -1;
 	X26TripletError m_error = NoError;
+	bool m_reservedMode = false;
+	bool m_reservedData = false;
 };
 
 class X26TripletList
@@ -77,7 +98,7 @@ public:
 	int size() const { return m_list.size(); }
 
 private:
-	void updateInternalData(int);
+	void updateInternalData();
 
 	QList<X26Triplet> m_list;