Tag version 0.6.4-beta

When a selection box is dragged, holding Ctrl while pressing the arrow
keys will shift the mosaics one sixel at a time.

If a shifting sixel encounters a non-mosaic cell it will pass through to
the other side of it.

README.md

@@ -1,5 +1,7 @@
 # QTeletextMaker
-QTeletextMaker is a teletext page editor in development. It is written in C++ using the Qt 5 widget libraries, and released under the GNU General Public License v3.0
+QTeletextMaker is a teletext page editor with an emphasis on Level 2.5 enhancement editing, released under the GNU General Public License v3.0
+
+It is written in C++ using the Qt 5 widget libraries but should also compile with Qt 6.
 
 Features
 - Load and save teletext pages in .tti format.
@@ -14,21 +16,21 @@ 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 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 version 5 or 6 of 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` or `qmake6 && 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.
+- Proportional font spacing on Level 3.5
-- Full screen and full row colours set by Active Objects.
-- 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, which are:
@@ -45,7 +47,7 @@ Most triplet modes will present varying widgets below which can be used to alter
 
 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.
 
-The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://web.archive.org/web/20160326062859/https://www.phecap.nl/download/enhenced-teletext-specs.pdf).
+The full behaviour of X/26 enhancement triplets can be found in section 12.3 of the [Enhanced Teletext specification ETS 300 706](https://www.etsi.org/deliver/etsi_en/300700_300799/300706/01.02.01_60/en_300706v010201p.pdf).
 
 ### Setting the Active Position
 The Active Position, whether set explicitly by a "Set Active Position" triplet or by a row or column triplet, can only be moved in screen address order i.e. from left to right within a row and then from top to bottom across rows. In other words:

decode.h

@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2020-2024 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 r, int c, bool refresh);
+	void decodePage();
+	LevelOnePage *teletextPage() const { return m_levelOnePage; };
+	void setTeletextPage(LevelOnePage *newCurrentPage);
+	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 cellG0CharacterSet(int r, int c) const { return m_cell[r][c].g0Set; };
+	int cellG2CharacterSet(int r, int c) const { return m_cell[r][c].g2Set; };
+	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 r, int c);
+	QColor cellBackgroundQColor(int r, int c);
+	QColor cellFlashForegroundQColor(int r, int c);
+	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 level1MosaicAttr(int r, int c) const { return m_cellLevel1MosaicAttr[r][c]; };
+	bool level1MosaicChar(int r, int c) const { return m_cellLevel1MosaicChar[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 level);
+
+signals:
+	void fullScreenColourChanged(QColor newColour);
+	void fullRowColourChanged(int r, QColor newColour);
+	void sidePanelsChanged();
+
+protected:
+	inline void setFullScreenColour(int newColour);
+	inline void setFullRowColour(int row, int newColour);
+
+	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;
+		int g0Set=0;
+		int g2Set=7;
+	};
+
+	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 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 *tripletList);
+		int startTripletNumber() const { return m_startTripletNumber; };
+		void setStartTripletNumber(int n);
+		int endTripletNumber() const { return m_endTripletNumber; };
+		void setEndTripletNumber(int n);
+		int originRow() const { return m_originRow; };
+		int originColumn() const { return m_originColumn; };
+		void setOrigin(int row, int column);
+		void buildMap(int level);
+
+		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 r, int c, ColourPart colourPart);
+	textCell& cellAtCharacterOrigin(int r, int c);
+	void buildInvocationList(Invocation &invocation, int objectType);
+	textCharacter characterFromTriplets(const QList<X26Triplet> triplets);
+	inline void rotateFlashMovement(flashFunctions &flash);
+
+	bool m_refresh[25][72];
+	textCell m_cell[25][72];
+	bool m_cellLevel1MosaicAttr[25][40];
+	bool m_cellLevel1MosaicChar[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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 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)
 {

document.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 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);
@@ -66,19 +67,19 @@ public:
 	LevelOnePage* subPage(int p) const { return m_subPages[p]; }
 	LevelOnePage* currentSubPage() const { return m_subPages[m_currentSubPageIndex]; }
 	int currentSubPageIndex() const { return m_currentSubPageIndex; }
-	void selectSubPageIndex(int, bool=false);
+	void selectSubPageIndex(int newSubPageIndex, bool refresh=false);
 	void selectSubPageNext();
 	void selectSubPagePrevious();
-	void insertSubPage(int, bool);
+	void insertSubPage(int beforeSubPageIndex, bool copySubPage);
-	void deleteSubPage(int);
+	void deleteSubPage(int subPageToDelete);
-	void deleteSubPageToRecycle(int);
+	void deleteSubPageToRecycle(int subPageToRecycle);
-	void unDeleteSubPageFromRecycle(int);
+	void unDeleteSubPageFromRecycle(int subPage);
 	int pageNumber() const { return m_pageNumber; }
-	void setPageNumber(int);
+	void setPageNumber(int pageNumber);
-	void setPageNumberFromString(QString);
+	void setPageNumberFromString(QString pageNumberString);
 	QString description() const { return m_description; }
-	void setDescription(QString);
+	void setDescription(QString newDescription);
-	void setFastTextLinkPageNumberOnAllSubPages(int, int);
+	void setFastTextLinkPageNumberOnAllSubPages(int linkNumber, int pageNumber);
 	QUndoStack *undoStack() const { return m_undoStack; }
 	ClutModel *clutModel() const { return m_clutModel; }
 	int cursorRow() const { return m_cursorRow; }
@@ -87,7 +88,7 @@ public:
 	void cursorDown(bool shiftKey=false);
 	void cursorLeft(bool shiftKey=false);
 	void cursorRight(bool shiftKey=false);
-	void moveCursor(int, int, bool selectionInProgress=false);
+	void moveCursor(int cursorRow, int cursorColumn, bool selectionInProgress=false);
 	int selectionTopRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : qMin(m_selectionCornerRow, m_cursorRow); }
 	int selectionBottomRow() const { return qMax(m_selectionCornerRow, m_cursorRow); }
 	int selectionLeftColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : qMin(m_selectionCornerColumn, m_cursorColumn); }
@@ -97,21 +98,21 @@ public:
 	bool selectionActive() const { return m_selectionSubPage == currentSubPage(); }
 	int selectionCornerRow() const { return m_selectionCornerRow == -1 ? m_cursorRow : m_selectionCornerRow; }
 	int selectionCornerColumn() const { return m_selectionCornerColumn == -1 ? m_cursorColumn : m_selectionCornerColumn; }
-	void setSelectionCorner(int, int);
+	void setSelectionCorner(int row, int column);
-	void setSelection(int, int, int, int);
+	void setSelection(int topRow, int leftColumn, int bottomRow, int rightColumn);
 	void cancelSelection();
 	int levelRequired() const;
 
 signals:
 	void cursorMoved();
 	void selectionMoved();
-	void colourChanged(int);
+	void colourChanged(int i);
-	void contentsChange(int);
+	void pageOptionsChanged();
 	void aboutToChangeSubPage();
 	void subPageSelected();
-	void refreshNeeded();
+	void contentsChanged();
 
-	void tripletCommandHighlight(int);
+	void tripletCommandHighlight(int tripletNumber);
 
 private:
 	QString m_description;

examples/Level3p5-CharDesignation.tti

@@ -0,0 +1,71 @@
+DE,Unlimited character sets with Level 3.5
+PN,19901
+SC,0001
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@laIA@Bma|mDRdo}eO~fo~gOoayA@BpawXH@Xi`
+OL,26,AYIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gOrA|
+OL,26,BXHPXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~
+OL,26,CgOtawXHRXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}
+OL,26,DeO~fo~gOvA|XhRXi`YIaZia[Ib]ip^Iq_iq`Ir
+OL,26,EbI~do}eO~fo~gOxawXh[Xi`YIaZia[Ib]ip^Iq
+OL,26,F_iq`IrbI~do}eO~fo~gOzA|XhjXi`YIaZia[Ib
+OL,26,G]ip^Iq_iq`IrbI~do}eO~fo~gO|awXhkXi`YIa
+OL,26,HZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO~A|XH`
+OL,26,IXi`YIaZia[Ib]ip^Iq_iq`IrbI~do}eO~fo~gO
+OL,26,JhApCCCCCCCCCCCC
+OL,1, Level 3.5 allows unlimited char  F(1/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F                       `G0 lvl 1`` -G2`
+OL,5,FLevel 1 with         G ABCD abcd |     
+OL,6,F  Level 1.5 G2 chars                   
+OL,7,F`Char set```` `Bits``  `G0 X/26``` `G2`
+OL,8,FLatin        B0000xxxG                 
+OL,10,FCyrillic 1   B0100000G                 
+OL,11,F  Serbian/Croatian                     
+OL,12,FCyrillic 2   B0100100G                 
+OL,13,F  Russian/Bulgarian                    
+OL,14,FCyrillic 3   B0100101G                 
+OL,15,F  Ukranian                             
+OL,16,FGreek        B0110111G                 
+OL,18,FHebrew       B1010101G                 
+OL,20,FArabic       B1010111G                 
+OL,22,FLatin with   B1000000G                 
+OL,23,F  Arabic G2                            
+PN,19902
+SC,0002
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GQd^w}ww]_}_wM@D
+OL,28,D@@|g@@pC@|p@@CO|O@pA@\p]@@wAG\gYF@D
+OL,26,@layA@Bma|nD@Ao|BO}Co}DO~Eo~FOoayA@Bpaw
+OL,26,AhQaHH@qD@@H@rA|hQaHHPsD@@HPtawhQaHHRuD@
+OL,26,B@HRvA|hQaHhRwD@@hRxawhQaHh[yD@@h[zA|hQa
+OL,26,CHhj{D@@hj|awhQaHhk}D@@hk~A|hQaHH`D@@H`
+OL,26,DhAp_CxUaHI`Ii`JIaKiaLIbMibNIcOicPIdQid
+OL,26,ERIeSieTIfUifVIgWigXIhYihZIi[ii\Ij]ij^Ik
+OL,26,F_ik`IlailbImcimdIneinfIogioiD@Ao|BO}Co}
+OL,26,GDO~Eo~FOHIpIipJIqKiqLIrMirNIsOisPItQit
+OL,26,HRIuSiuTIvUivVIwWiwXIxYixZIy[iy\Iz]iz^I{
+OL,26,I_i{`I|ai|bI}ci}dI~ei~fIBBBBB
+OL,1, Level 3.5 allows unlimited char  F(2/2)
+OL,2, sets using the "Modified G0 and G2     
+OL,3, Character Set Designation" triplet.    
+OL,4,F`G2``` `G0 from level 1`````````` `NOS`
+OL,5,FL1.5  G@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_
+OL,6,        `abcdefghijklmnopqrstuvwxyz{|}~ 
+OL,7,F`G2``` `G0 from X/26 enhancements``````
+OL,8,FLatin G                                
+OL,10,FCyr 1 CG        CG    C G   C  FGCFC F 
+OL,11,       CG        CG    C G   C  FGCFC   
+OL,12,FCyr 2 CG        CG    C G   C  FGCFC F 
+OL,13,       CG        CG    C G   C  FGCFC   
+OL,14,FCyr 3 CG        CG    C G   C  FGCFC F 
+OL,15,       CG        CG    C G   C  FGCFC   
+OL,16,FGreek G                                
+OL,18,FHebrewG                                
+OL,20,FArabicG                                
+OL,22,FL/AbG2G                                

examples/SubObjects-TeletextStoreBag.tti

@@ -0,0 +1,36 @@
+DE,Parody of Microsoft Store icon
+PN,15400
+SC,0000
+PS,8000
+CT,8,T
+OL,28,@@@|gpCu_@|wKpZA`UB_GdN`M\LXKTJPILXwM@@
+OL,26,@iD@hq]jD@hq]kD@hq]lD@hq]mD@hq]nD@hq]oD@
+OL,26,Ahq]pD@ACLN@LPbZQ`OQcOXCOXbRqD@hQarD@hQa
+OL,26,BsD@ACLJcO_COtD@hQdvD@hQdxD@hQdzD@hQd|D@
+OL,26,CACLJBp^CO^Bx}D@hq]~D@hq]D@hq]_Cxu]A@L
+OL,26,DhshXCOxUaACLhshN@LQ@LYCOxUdACL_COiD@ACL
+OL,26,E_COxwhQ`LQaR@MRaS`MSaT@NTaU`NUaV@O
+OL,26,FVaBBBBBBBBBBBB
+OL,1,Twwf$$$                
+OL,2,T==9111                
+OL,3,Twwf$$$FWelcome to the 
+OL,4,T==9111                
+OL,5,Twwf$$$WTELETEXT STORE 
+OL,6,T==9111                
+OL,7,Twwf$$$                
+OL,8,T]           ^xWV]    tW\               
+OL,9,T]           ^WT\wwf$$W               
+OL,10,T]           ^WT\==911W               
+OL,11,T]       V]W                 \        
+OL,12,T]       W]                    \        
+OL,13,T]       W]                    \        
+OL,14,T]       W]Q   RS     \        
+OL,15,T]       W]Q   RS     \        
+OL,16,T]       W]Q                   \        
+OL,17,T]       W]Q  TUV     \        
+OL,18,T]       W]Q  TUV     \        
+OL,19,T]       W]                    \        
+OL,20,T]       Wo]                ^?\         
+OL,21,Twwf$$$                
+OL,22,T==9111                
+OL,23,Twwf$$$                

examples/Template-ActivePosition.tti

@@ -0,0 +1,9 @@
+PN,19900
+SC,0000
+PS,8000
+CT,8,T
+OL,26,@iD@@kfjD@@kfkD@@kflD@@kfmD@@kfnD@@kfoD@
+OL,26,A@kfpD@@kfqD@@kfrD@@kfsD@@kftD@@kfuD@@kf
+OL,26,BvD@@kfwD@@kfxD@@kfxD@@kfyD@@kfzD@@kf{D@
+OL,26,C@kf|D@@kf}D@@kf~D@@kfD@@kfCCCC
+OL,1,  Active Position across every row      

keymap.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,304 +28,304 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 1 Cyrillic G0 1 Serbian/Croatian
-		{ 0x0427, 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x40 }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0408, 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
+		{ QChar(0x0408), 0x4a }, // Ј CYRILLIC CAPITAL LETTER JE
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x040c, 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
+		{ QChar(0x040c), 0x51 }, // Ќ CYRILLIC CAPITAL LETTER KJE
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0412, 0x56 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x56 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x0403, 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
+		{ QChar(0x0403), 0x57 }, // Ѓ CYRILLIC CAPITAL LETTER GJE
-		{ 0x0409, 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
+		{ QChar(0x0409), 0x58 }, // Љ CYRILLIC CAPITAL LETTER LJE
-		{ 0x040a, 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
+		{ QChar(0x040a), 0x59 }, // Њ CYRILLIC CAPITAL LETTER NJE
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x040b, 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
+		{ QChar(0x040b), 0x5b }, // Ћ CYRILLIC CAPITAL LETTER TSHE
-		{ 0x0416, 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x5c }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0402, 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
+		{ QChar(0x0402), 0x5d }, // Ђ CYRILLIC CAPITAL LETTER DJE
-		{ 0x0428, 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5e }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x040f, 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
+		{ QChar(0x040f), 0x5f }, // Џ CYRILLIC CAPITAL LETTER DZHE
-		{ 0x0447, 0x60 }, // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x60 }, // ч CYRILLIC SMALL LETTER CHE
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0458, 0x6a }, // ј CYRILLIC SMALL LETTER JE
+		{ QChar(0x0458), 0x6a }, // ј CYRILLIC SMALL LETTER JE
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x045c, 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
+		{ QChar(0x045c), 0x71 }, // ќ CYRILLIC SMALL LETTER KJE
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0432, 0x76 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x76 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x0453, 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
+		{ QChar(0x0453), 0x77 }, // ѓ CYRILLIC SMALL LETTER GJE
-		{ 0x0459, 0x78 }, // љ CYRILLIC SMALL LETTER LJE
+		{ QChar(0x0459), 0x78 }, // љ CYRILLIC SMALL LETTER LJE
-		{ 0x045a, 0x79 }, // њ CYRILLIC SMALL LETTER NJE
+		{ QChar(0x045a), 0x79 }, // њ CYRILLIC SMALL LETTER NJE
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x045b, 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
+		{ QChar(0x045b), 0x7b }, // ћ CYRILLIC SMALL LETTER TSHE
-		{ 0x0436, 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x7c }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0452, 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
+		{ QChar(0x0452), 0x7d }, // ђ CYRILLIC SMALL LETTER DJE
-		{ 0x0448, 0x7e }  // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7e }  // ш CYRILLIC SMALL LETTER SHA
 	},
 
 	{ // 2 Cyrillic G0 2 Russian/Bulgarian
-		{ 0x044b, 0x26 }, // ы CYRILLIC SMALL LETTER YERU
+		{ QChar(0x044b), 0x26 }, // ы CYRILLIC SMALL LETTER YERU
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x042a, 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
+		{ QChar(0x042a), 0x59 }, // Ъ CYRILLIC CAPITAL LETTER HARD SIGN
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x042d, 0x5c }, // Э CYRILLIC CAPITAL LETTER E
+		{ QChar(0x042d), 0x5c }, // Э CYRILLIC CAPITAL LETTER E
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x042b, 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
+		{ QChar(0x042b), 0x5f }, // Ы CYRILLIC CAPITAL LETTER YERU
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x044a, 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
+		{ QChar(0x044a), 0x79 }, // ъ CYRILLIC SMALL LETTER HARD SIGN
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x044d, 0x7c }, // э CYRILLIC SMALL LETTER E
+		{ QChar(0x044d), 0x7c }, // э CYRILLIC SMALL LETTER E
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 3 Cyrillic G0 3 Ukranian
-		{ 0x0457, 0x26 }, // ї CYRILLIC SMALL LETTER YI
+		{ QChar(0x0457), 0x26 }, // ї CYRILLIC SMALL LETTER YI
-		{ 0x042e, 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
+		{ QChar(0x042e), 0x40 }, // Ю CYRILLIC CAPITAL LETTER YU
-		{ 0x0410, 0x41 }, // А CYRILLIC CAPITAL LETTER A
+		{ QChar(0x0410), 0x41 }, // А CYRILLIC CAPITAL LETTER A
-		{ 0x0411, 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
+		{ QChar(0x0411), 0x42 }, // Б CYRILLIC CAPITAL LETTER BE
-		{ 0x0426, 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
+		{ QChar(0x0426), 0x43 }, // Ц CYRILLIC CAPITAL LETTER TSE
-		{ 0x0414, 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
+		{ QChar(0x0414), 0x44 }, // Д CYRILLIC CAPITAL LETTER DE
-		{ 0x0415, 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
+		{ QChar(0x0415), 0x45 }, // Е CYRILLIC CAPITAL LETTER IE
-		{ 0x0424, 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
+		{ QChar(0x0424), 0x46 }, // Ф CYRILLIC CAPITAL LETTER EF
-		{ 0x0413, 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
+		{ QChar(0x0413), 0x47 }, // Г CYRILLIC CAPITAL LETTER GHE
-		{ 0x0425, 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
+		{ QChar(0x0425), 0x48 }, // Х CYRILLIC CAPITAL LETTER HA
-		{ 0x0418, 0x49 }, // И CYRILLIC CAPITAL LETTER I
+		{ QChar(0x0418), 0x49 }, // И CYRILLIC CAPITAL LETTER I
-		{ 0x0419, 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
+		{ QChar(0x0419), 0x4a }, // Й CYRILLIC CAPITAL LETTER SHORT I
-		{ 0x041a, 0x4b }, // К CYRILLIC CAPITAL LETTER KA
+		{ QChar(0x041a), 0x4b }, // К CYRILLIC CAPITAL LETTER KA
-		{ 0x041b, 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
+		{ QChar(0x041b), 0x4c }, // Л CYRILLIC CAPITAL LETTER EL
-		{ 0x041c, 0x4d }, // М CYRILLIC CAPITAL LETTER EM
+		{ QChar(0x041c), 0x4d }, // М CYRILLIC CAPITAL LETTER EM
-		{ 0x041d, 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
+		{ QChar(0x041d), 0x4e }, // Н CYRILLIC CAPITAL LETTER EN
-		{ 0x041e, 0x4f }, // О CYRILLIC CAPITAL LETTER O
+		{ QChar(0x041e), 0x4f }, // О CYRILLIC CAPITAL LETTER O
-		{ 0x041f, 0x50 }, // П CYRILLIC CAPITAL LETTER PE
+		{ QChar(0x041f), 0x50 }, // П CYRILLIC CAPITAL LETTER PE
-		{ 0x042f, 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
+		{ QChar(0x042f), 0x51 }, // Я CYRILLIC CAPITAL LETTER YA
-		{ 0x0420, 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
+		{ QChar(0x0420), 0x52 }, // Р CYRILLIC CAPITAL LETTER ER
-		{ 0x0421, 0x53 }, // С CYRILLIC CAPITAL LETTER ES
+		{ QChar(0x0421), 0x53 }, // С CYRILLIC CAPITAL LETTER ES
-		{ 0x0422, 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
+		{ QChar(0x0422), 0x54 }, // Т CYRILLIC CAPITAL LETTER TE
-		{ 0x0423, 0x55 }, // У CYRILLIC CAPITAL LETTER U
+		{ QChar(0x0423), 0x55 }, // У CYRILLIC CAPITAL LETTER U
-		{ 0x0416, 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
+		{ QChar(0x0416), 0x56 }, // Ж CYRILLIC CAPITAL LETTER ZHE
-		{ 0x0412, 0x57 }, // В CYRILLIC CAPITAL LETTER VE
+		{ QChar(0x0412), 0x57 }, // В CYRILLIC CAPITAL LETTER VE
-		{ 0x042c, 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
+		{ QChar(0x042c), 0x58 }, // Ь CYRILLIC CAPITAL LETTER SOFT SIGN
-		{ 0x0406, 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0406), 0x59 }, // І CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0417, 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
+		{ QChar(0x0417), 0x5a }, // З CYRILLIC CAPITAL LETTER ZE
-		{ 0x0428, 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
+		{ QChar(0x0428), 0x5b }, // Ш CYRILLIC CAPITAL LETTER SHA
-		{ 0x0404, 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
+		{ QChar(0x0404), 0x5c }, // Є CYRILLIC CAPITAL LETTER UKRAINIAN IE
-		{ 0x0429, 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
+		{ QChar(0x0429), 0x5d }, // Щ CYRILLIC CAPITAL LETTER SHCHA
-		{ 0x0427, 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
+		{ QChar(0x0427), 0x5e }, // Ч CYRILLIC CAPITAL LETTER CHE
-		{ 0x0407, 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
+		{ QChar(0x0407), 0x5f }, // Ї CYRILLIC CAPITAL LETTER YI
-		{ 0x044e, 0x60 }, // ю CYRILLIC SMALL LETTER YU
+		{ QChar(0x044e), 0x60 }, // ю CYRILLIC SMALL LETTER YU
-		{ 0x0430, 0x61 }, // а CYRILLIC SMALL LETTER A
+		{ QChar(0x0430), 0x61 }, // а CYRILLIC SMALL LETTER A
-		{ 0x0431, 0x62 }, // б CYRILLIC SMALL LETTER BE
+		{ QChar(0x0431), 0x62 }, // б CYRILLIC SMALL LETTER BE
-		{ 0x0446, 0x63 }, // ц CYRILLIC SMALL LETTER TSE
+		{ QChar(0x0446), 0x63 }, // ц CYRILLIC SMALL LETTER TSE
-		{ 0x0434, 0x64 }, // д CYRILLIC SMALL LETTER DE
+		{ QChar(0x0434), 0x64 }, // д CYRILLIC SMALL LETTER DE
-		{ 0x0435, 0x65 }, // е CYRILLIC SMALL LETTER IE
+		{ QChar(0x0435), 0x65 }, // е CYRILLIC SMALL LETTER IE
-		{ 0x0444, 0x66 }, // ф CYRILLIC SMALL LETTER EF
+		{ QChar(0x0444), 0x66 }, // ф CYRILLIC SMALL LETTER EF
-		{ 0x0433, 0x67 }, // г CYRILLIC SMALL LETTER GHE
+		{ QChar(0x0433), 0x67 }, // г CYRILLIC SMALL LETTER GHE
-		{ 0x0445, 0x68 }, // х CYRILLIC SMALL LETTER HA
+		{ QChar(0x0445), 0x68 }, // х CYRILLIC SMALL LETTER HA
-		{ 0x0438, 0x69 }, // и CYRILLIC SMALL LETTER I
+		{ QChar(0x0438), 0x69 }, // и CYRILLIC SMALL LETTER I
-		{ 0x0439, 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
+		{ QChar(0x0439), 0x6a }, // й CYRILLIC SMALL LETTER SHORT I
-		{ 0x043a, 0x6b }, // к CYRILLIC SMALL LETTER KA
+		{ QChar(0x043a), 0x6b }, // к CYRILLIC SMALL LETTER KA
-		{ 0x043b, 0x6c }, // л CYRILLIC SMALL LETTER EL
+		{ QChar(0x043b), 0x6c }, // л CYRILLIC SMALL LETTER EL
-		{ 0x043c, 0x6d }, // м CYRILLIC SMALL LETTER EM
+		{ QChar(0x043c), 0x6d }, // м CYRILLIC SMALL LETTER EM
-		{ 0x043d, 0x6e }, // н CYRILLIC SMALL LETTER EN
+		{ QChar(0x043d), 0x6e }, // н CYRILLIC SMALL LETTER EN
-		{ 0x043e, 0x6f }, // о CYRILLIC SMALL LETTER O
+		{ QChar(0x043e), 0x6f }, // о CYRILLIC SMALL LETTER O
-		{ 0x043f, 0x70 }, // п CYRILLIC SMALL LETTER PE
+		{ QChar(0x043f), 0x70 }, // п CYRILLIC SMALL LETTER PE
-		{ 0x044f, 0x71 }, // я CYRILLIC SMALL LETTER YA
+		{ QChar(0x044f), 0x71 }, // я CYRILLIC SMALL LETTER YA
-		{ 0x0440, 0x72 }, // р CYRILLIC SMALL LETTER ER
+		{ QChar(0x0440), 0x72 }, // р CYRILLIC SMALL LETTER ER
-		{ 0x0441, 0x73 }, // с CYRILLIC SMALL LETTER ES
+		{ QChar(0x0441), 0x73 }, // с CYRILLIC SMALL LETTER ES
-		{ 0x0442, 0x74 }, // т CYRILLIC SMALL LETTER TE
+		{ QChar(0x0442), 0x74 }, // т CYRILLIC SMALL LETTER TE
-		{ 0x0443, 0x75 }, // у CYRILLIC SMALL LETTER U
+		{ QChar(0x0443), 0x75 }, // у CYRILLIC SMALL LETTER U
-		{ 0x0436, 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
+		{ QChar(0x0436), 0x76 }, // ж CYRILLIC SMALL LETTER ZHE
-		{ 0x0432, 0x77 }, // в CYRILLIC SMALL LETTER VE
+		{ QChar(0x0432), 0x77 }, // в CYRILLIC SMALL LETTER VE
-		{ 0x044c, 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
+		{ QChar(0x044c), 0x78 }, // ь CYRILLIC SMALL LETTER SOFT SIGN
-		{ 0x0456, 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+		{ QChar(0x0456), 0x79 }, // і CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-		{ 0x0437, 0x7a }, // з CYRILLIC SMALL LETTER ZE
+		{ QChar(0x0437), 0x7a }, // з CYRILLIC SMALL LETTER ZE
-		{ 0x0448, 0x7b }, // ш CYRILLIC SMALL LETTER SHA
+		{ QChar(0x0448), 0x7b }, // ш CYRILLIC SMALL LETTER SHA
-		{ 0x0454, 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
+		{ QChar(0x0454), 0x7c }, // є CYRILLIC SMALL LETTER UKRAINIAN IE
-		{ 0x0449, 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
+		{ QChar(0x0449), 0x7d }, // щ CYRILLIC SMALL LETTER SHCHA
-		{ 0x0447, 0x7e }  // ч CYRILLIC SMALL LETTER CHE
+		{ QChar(0x0447), 0x7e }  // ч CYRILLIC SMALL LETTER CHE
 	},
 
 	{ // 4 Greek
-		{ 0x0390, 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+		{ QChar(0x0390), 0x40 }, // ΐ GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-		{ 0x0391, 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
+		{ QChar(0x0391), 0x41 }, // Α GREEK CAPITAL LETTER ALPHA
-		{ 0x0392, 0x42 }, // Β GREEK CAPITAL LETTER BETA
+		{ QChar(0x0392), 0x42 }, // Β GREEK CAPITAL LETTER BETA
-		{ 0x0393, 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
+		{ QChar(0x0393), 0x43 }, // Γ GREEK CAPITAL LETTER GAMMA
-		{ 0x0394, 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
+		{ QChar(0x0394), 0x44 }, // Δ GREEK CAPITAL LETTER DELTA
-		{ 0x0395, 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
+		{ QChar(0x0395), 0x45 }, // Ε GREEK CAPITAL LETTER EPSILON
-		{ 0x0396, 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
+		{ QChar(0x0396), 0x46 }, // Ζ GREEK CAPITAL LETTER ZETA
-		{ 0x0397, 0x47 }, // Η GREEK CAPITAL LETTER ETA
+		{ QChar(0x0397), 0x47 }, // Η GREEK CAPITAL LETTER ETA
-		{ 0x0398, 0x48 }, // Θ GREEK CAPITAL LETTER THETA
+		{ QChar(0x0398), 0x48 }, // Θ GREEK CAPITAL LETTER THETA
-		{ 0x0399, 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
+		{ QChar(0x0399), 0x49 }, // Ι GREEK CAPITAL LETTER IOTA
-		{ 0x039a, 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
+		{ QChar(0x039a), 0x4a }, // Κ GREEK CAPITAL LETTER KAPPA
-		{ 0x039b, 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
+		{ QChar(0x039b), 0x4b }, // Λ GREEK CAPITAL LETTER LAMBDA
-		{ 0x039c, 0x4c }, // Μ GREEK CAPITAL LETTER MU
+		{ QChar(0x039c), 0x4c }, // Μ GREEK CAPITAL LETTER MU
-		{ 0x039d, 0x4d }, // Ν GREEK CAPITAL LETTER NU
+		{ QChar(0x039d), 0x4d }, // Ν GREEK CAPITAL LETTER NU
-		{ 0x039e, 0x4e }, // Ξ GREEK CAPITAL LETTER XI
+		{ QChar(0x039e), 0x4e }, // Ξ GREEK CAPITAL LETTER XI
-		{ 0x039f, 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
+		{ QChar(0x039f), 0x4f }, // Ο GREEK CAPITAL LETTER OMICRON
-		{ 0x03a0, 0x50 }, // Π GREEK CAPITAL LETTER PI
+		{ QChar(0x03a0), 0x50 }, // Π GREEK CAPITAL LETTER PI
-		{ 0x03a1, 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
+		{ QChar(0x03a1), 0x51 }, // Ρ GREEK CAPITAL LETTER RHO
-		{ 0x03a3, 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
+		{ QChar(0x03a3), 0x53 }, // Σ GREEK CAPITAL LETTER SIGMA
-		{ 0x03a4, 0x54 }, // Τ GREEK CAPITAL LETTER TAU
+		{ QChar(0x03a4), 0x54 }, // Τ GREEK CAPITAL LETTER TAU
-		{ 0x03a5, 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
+		{ QChar(0x03a5), 0x55 }, // Υ GREEK CAPITAL LETTER UPSILON
-		{ 0x03a6, 0x56 }, // Φ GREEK CAPITAL LETTER PHI
+		{ QChar(0x03a6), 0x56 }, // Φ GREEK CAPITAL LETTER PHI
-		{ 0x03a7, 0x57 }, // Χ GREEK CAPITAL LETTER CHI
+		{ QChar(0x03a7), 0x57 }, // Χ GREEK CAPITAL LETTER CHI
-		{ 0x03a8, 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
+		{ QChar(0x03a8), 0x58 }, // Ψ GREEK CAPITAL LETTER PSI
-		{ 0x03a9, 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
+		{ QChar(0x03a9), 0x59 }, // Ω GREEK CAPITAL LETTER OMEGA
-		{ 0x03aa, 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03aa), 0x5a }, // Ϊ GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-		{ 0x03ab, 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03ab), 0x5b }, // Ϋ GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03ac, 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
+		{ QChar(0x03ac), 0x5c }, // ά GREEK SMALL LETTER ALPHA WITH TONOS
-		{ 0x03ad, 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
+		{ QChar(0x03ad), 0x5d }, // έ GREEK SMALL LETTER EPSILON WITH TONOS
-		{ 0x03ae, 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
+		{ QChar(0x03ae), 0x5e }, // ή GREEK SMALL LETTER ETA WITH TONOS
-		{ 0x03af, 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
+		{ QChar(0x03af), 0x5f }, // ί GREEK SMALL LETTER IOTO WITH TONOS
-		{ 0x03b0, 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+		{ QChar(0x03b0), 0x60 }, // ΰ GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-		{ 0x03b1, 0x61 }, // α GREEK SMALL LETTER ALPHA
+		{ QChar(0x03b1), 0x61 }, // α GREEK SMALL LETTER ALPHA
-		{ 0x03b2, 0x62 }, // β GREEK SMALL LETTER BETA
+		{ QChar(0x03b2), 0x62 }, // β GREEK SMALL LETTER BETA
-		{ 0x03b3, 0x63 }, // γ GREEK SMALL LETTER GAMMA
+		{ QChar(0x03b3), 0x63 }, // γ GREEK SMALL LETTER GAMMA
-		{ 0x03b4, 0x64 }, // δ GREEK SMALL LETTER DELTA
+		{ QChar(0x03b4), 0x64 }, // δ GREEK SMALL LETTER DELTA
-		{ 0x03b5, 0x65 }, // ε GREEK SMALL LETTER EPSILON
+		{ QChar(0x03b5), 0x65 }, // ε GREEK SMALL LETTER EPSILON
-		{ 0x03b6, 0x66 }, // ζ GREEK SMALL LETTER ZETA
+		{ QChar(0x03b6), 0x66 }, // ζ GREEK SMALL LETTER ZETA
-		{ 0x03b7, 0x67 }, // η GREEK SMALL LETTER ETA
+		{ QChar(0x03b7), 0x67 }, // η GREEK SMALL LETTER ETA
-		{ 0x03b8, 0x68 }, // θ GREEK SMALL LETTER THETA
+		{ QChar(0x03b8), 0x68 }, // θ GREEK SMALL LETTER THETA
-		{ 0x03b9, 0x69 }, // ι GREEK SMALL LETTER IOTA
+		{ QChar(0x03b9), 0x69 }, // ι GREEK SMALL LETTER IOTA
-		{ 0x03ba, 0x6a }, // κ GREEK SMALL LETTER KAPPA
+		{ QChar(0x03ba), 0x6a }, // κ GREEK SMALL LETTER KAPPA
-		{ 0x03bb, 0x6b }, // λ GREEK SMALL LETTER LAMBDA
+		{ QChar(0x03bb), 0x6b }, // λ GREEK SMALL LETTER LAMBDA
-		{ 0x03bc, 0x6c }, // μ GREEK SMALL LETTER MU
+		{ QChar(0x03bc), 0x6c }, // μ GREEK SMALL LETTER MU
-		{ 0x03bd, 0x6d }, // ν GREEK SMALL LETTER NU
+		{ QChar(0x03bd), 0x6d }, // ν GREEK SMALL LETTER NU
-		{ 0x03be, 0x6e }, // ξ GREEK SMALL LETTER XI
+		{ QChar(0x03be), 0x6e }, // ξ GREEK SMALL LETTER XI
-		{ 0x03bf, 0x6f }, // ο GREEK SMALL LETTER OMICRON
+		{ QChar(0x03bf), 0x6f }, // ο GREEK SMALL LETTER OMICRON
-		{ 0x03c0, 0x70 }, // π GREEK SMALL LETTER PI
+		{ QChar(0x03c0), 0x70 }, // π GREEK SMALL LETTER PI
-		{ 0x03c1, 0x71 }, // ρ GREEK SMALL LETTER RHO
+		{ QChar(0x03c1), 0x71 }, // ρ GREEK SMALL LETTER RHO
-		{ 0x03c2, 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
+		{ QChar(0x03c2), 0x72 }, // ς GREEK SMALL LETTER FINAL SIGMA
-		{ 0x03c3, 0x73 }, // σ GREEK SMALL LETTER SIGMA
+		{ QChar(0x03c3), 0x73 }, // σ GREEK SMALL LETTER SIGMA
-		{ 0x03c4, 0x74 }, // τ GREEK SMALL LETTER TAU
+		{ QChar(0x03c4), 0x74 }, // τ GREEK SMALL LETTER TAU
-		{ 0x03c5, 0x75 }, // υ GREEK SMALL LETTER UPSILON
+		{ QChar(0x03c5), 0x75 }, // υ GREEK SMALL LETTER UPSILON
-		{ 0x03c6, 0x76 }, // φ GREEK SMALL LETTER PHI
+		{ QChar(0x03c6), 0x76 }, // φ GREEK SMALL LETTER PHI
-		{ 0x03c7, 0x77 }, // χ GREEK SMALL LETTER CHI
+		{ QChar(0x03c7), 0x77 }, // χ GREEK SMALL LETTER CHI
-		{ 0x03c8, 0x78 }, // ψ GREEK SMALL LETTER PSI
+		{ QChar(0x03c8), 0x78 }, // ψ GREEK SMALL LETTER PSI
-		{ 0x03c9, 0x79 }, // ω GREEK SMALL LETTER OMEGA
+		{ QChar(0x03c9), 0x79 }, // ω GREEK SMALL LETTER OMEGA
-		{ 0x03ca, 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
+		{ QChar(0x03ca), 0x7a }, // ϊ GREEK SMALL LETTER IOTA WITH DIALYTIKA
-		{ 0x03cb, 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+		{ QChar(0x03cb), 0x7b }, // ϋ GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-		{ 0x03cc, 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
+		{ QChar(0x03cc), 0x7c }, // ό GREEK SMALL LETTER OMICRON WITH TONOS
-		{ 0x03cd, 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
+		{ QChar(0x03cd), 0x7d }, // ύ GREEK SMALL LETTER UPSILON WITH TONOS
-		{ 0x03ce, 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
+		{ QChar(0x03ce), 0x7e }  // ώ GREEK SMALL LETTER OMEGA WITH TONOS
 	},
 
 	{ // TODO 5 Arabic G0
 	},
 
 	{ // 6 Hebrew G0
-		{ 0x05d0, 0x60 }, // א HEBREW LETTER ALEF
+		{ QChar(0x05d0), 0x60 }, // א HEBREW LETTER ALEF
-		{ 0x05d1, 0x61 }, // ב HEBREW LETTER BET
+		{ QChar(0x05d1), 0x61 }, // ב HEBREW LETTER BET
-		{ 0x05d2, 0x62 }, // ג HEBREW LETTER GIMEL
+		{ QChar(0x05d2), 0x62 }, // ג HEBREW LETTER GIMEL
-		{ 0x05d3, 0x63 }, // ד HEBREW LETTER DALET
+		{ QChar(0x05d3), 0x63 }, // ד HEBREW LETTER DALET
-		{ 0x05d4, 0x64 }, // ה HEBREW LETTER HE
+		{ QChar(0x05d4), 0x64 }, // ה HEBREW LETTER HE
-		{ 0x05d5, 0x65 }, // ו HEBREW LETTER VAV
+		{ QChar(0x05d5), 0x65 }, // ו HEBREW LETTER VAV
-		{ 0x05d6, 0x66 }, // ז HEBREW LETTER ZAYIN
+		{ QChar(0x05d6), 0x66 }, // ז HEBREW LETTER ZAYIN
-		{ 0x05d7, 0x67 }, // ח HEBREW LETTER HET
+		{ QChar(0x05d7), 0x67 }, // ח HEBREW LETTER HET
-		{ 0x05d8, 0x68 }, // ט HEBREW LETTER TET
+		{ QChar(0x05d8), 0x68 }, // ט HEBREW LETTER TET
-		{ 0x05d9, 0x69 }, // י HEBREW LETTER YOD
+		{ QChar(0x05d9), 0x69 }, // י HEBREW LETTER YOD
-		{ 0x05da, 0x6a }, // ך HEBREW LETTER FINAL KAF
+		{ QChar(0x05da), 0x6a }, // ך HEBREW LETTER FINAL KAF
-		{ 0x05db, 0x6b }, // כ HEBREW LETTER KAF
+		{ QChar(0x05db), 0x6b }, // כ HEBREW LETTER KAF
-		{ 0x05dc, 0x6c }, // ל HEBREW LETTER LAMED
+		{ QChar(0x05dc), 0x6c }, // ל HEBREW LETTER LAMED
-		{ 0x05dd, 0x6d }, // ם HEBREW LETTER FINAL MEM
+		{ QChar(0x05dd), 0x6d }, // ם HEBREW LETTER FINAL MEM
-		{ 0x05de, 0x6e }, // מ HEBREW LETTER MEM
+		{ QChar(0x05de), 0x6e }, // מ HEBREW LETTER MEM
-		{ 0x05df, 0x6f }, // ן HEBREW LETTER FINAL NUN
+		{ QChar(0x05df), 0x6f }, // ן HEBREW LETTER FINAL NUN
-		{ 0x05e0, 0x70 }, // נ HEBREW LETTER NUN
+		{ QChar(0x05e0), 0x70 }, // נ HEBREW LETTER NUN
-		{ 0x05e1, 0x71 }, // ס HEBREW LETTER SAMEKH
+		{ QChar(0x05e1), 0x71 }, // ס HEBREW LETTER SAMEKH
-		{ 0x05e2, 0x72 }, // ע HEBREW LETTER AYIN
+		{ QChar(0x05e2), 0x72 }, // ע HEBREW LETTER AYIN
-		{ 0x05e3, 0x73 }, // ף HEBREW LETTER FINAL PE
+		{ QChar(0x05e3), 0x73 }, // ף HEBREW LETTER FINAL PE
-		{ 0x05e4, 0x74 }, // פ HEBREW LETTER PE
+		{ QChar(0x05e4), 0x74 }, // פ HEBREW LETTER PE
-		{ 0x05e5, 0x75 }, // ץ HEBREW LETTER FINAL TSADI
+		{ QChar(0x05e5), 0x75 }, // ץ HEBREW LETTER FINAL TSADI
-		{ 0x05e6, 0x76 }, // צ HEBREW LETTER TSADI
+		{ QChar(0x05e6), 0x76 }, // צ HEBREW LETTER TSADI
-		{ 0x05e7, 0x77 }, // ק HEBREW LETTER QOF
+		{ QChar(0x05e7), 0x77 }, // ק HEBREW LETTER QOF
-		{ 0x05e8, 0x78 }, // ר HEBREW LETTER RESH
+		{ QChar(0x05e8), 0x78 }, // ר HEBREW LETTER RESH
-		{ 0x05e9, 0x79 }, // ש HEBREW LETTER SHIN
+		{ QChar(0x05e9), 0x79 }, // ש HEBREW LETTER SHIN
-		{ 0x05ea, 0x7a }, // ת HEBREW LETTER TAV
+		{ QChar(0x05ea), 0x7a }, // ת HEBREW LETTER TAV
-		{ 0x20aa, 0x7b }, // ₪ NEW SHEQEL SIGN
+		{ QChar(0x20aa), 0x7b }, // ₪ NEW SHEQEL SIGN
-		{ 0x00be, 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00be), 0x7d }, // ½ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	// Only used by X/26 enhancements, not directly by keyboard
@@ -339,204 +339,204 @@ static const QMap<QChar, char> keymapping[24] = {
 	},
 
 	{ // 11 Czech/Slovak
-		{ 0x016f, 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
+		{ QChar(0x016f), 0x24 }, // ů LATIN SMALL LETTER U WITH RING ABOVE
-		{ 0x010d, 0x40 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x40 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0165, 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
+		{ QChar(0x0165), 0x5b }, // ť LATIN SMALL LETTER T WITH CARON
-		{ 0x017e, 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x5c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fd, 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
+		{ QChar(0x00fd), 0x5d }, // ý LATIN SMALL LETTER Y WITH ACUTE
-		{ 0x00ed, 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x00ed), 0x5e }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x0159, 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
+		{ QChar(0x0159), 0x5f }, // ř LATIN SMALL LETTER R WITH CARON
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e1, 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x00e1), 0x7b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x011b, 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
+		{ QChar(0x011b), 0x7c }, // ě LATIN SMALL LETTER E WITH CARON
-		{ 0x00fa, 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x00fa), 0x7d }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 12 English
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x005f, 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+		{ QChar(0x005f), 0x60 }, // ─ LOW LINE - rendered as U+2500 BOX DRAWINGS LIGHT HORIZONTAL
 
-		{ 0x00bc, 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
+		{ QChar(0x00bc), 0x7b }, // ¼ VULGAR FRACTION ONE QUARTER
-		{ 0x00bd, 0x5c }, // ½ VULGAR FRACTION ONE HALF
+		{ QChar(0x00bd), 0x5c }, // ½ VULGAR FRACTION ONE HALF
-		{ 0x00be, 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
+		{ QChar(0x00be), 0x7b }, // ¾ VULGAR FRACTION THREE QUARTERS
-		{ 0x00f7, 0x7e }  // ÷ DIVISION SIGN
+		{ QChar(0x00f7), 0x7e }  // ÷ DIVISION SIGN
 	},
 
 	{ // 13 Estonian
-		{ 0x00f5, 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
+		{ QChar(0x00f5), 0x24 }, // õ LATIN SMALL LETTER O WITH TILDE
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00d5, 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
+		{ QChar(0x00d5), 0x5f }, // Õ LATIN CAPITAL LETTER O WITH TILDE
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 14 French - aze qsd wxc
-		{ 0x00e9, 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x23 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ef, 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
+		{ QChar(0x00ef), 0x24 }, // ï LATIN SMALL LETTER I WITH DIAERESIS
-		{ 0x00e0, 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x40 }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00eb, 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x00eb), 0x5b }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x00ea, 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
+		{ QChar(0x00ea), 0x5c }, // ê LATIN SMALL LETTER E WITH CIRCUMFLEX
-		{ 0x00f9, 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00f9), 0x5d }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00ee, 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00ee), 0x5e }, // î LATIN SMALL LETTER I WITH CIRCUMFLEX
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x00e8, 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x60 }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x00f4, 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
+		{ QChar(0x00f4), 0x7c }, // ô LATIN SMALL LETTER O WITH CIRCUMFLEX
-		{ 0x00fb, 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
+		{ QChar(0x00fb), 0x7d }, // û LATIN SMALL LETTER U WITH CIRCUMFLEX
-		{ 0x00e7, 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x7e }  // ç LATIN SMALL LETTER C WITH CEDILLA
 	},
 
 	{ // 15 German
-		{ 0x00a7, 0x40 }, // § SECTION SIGN
+		{ QChar(0x00a7), 0x40 }, // § SECTION SIGN
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00dc, 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5d }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00b0, 0x60 }, // ° DEGREE SIGN
+		{ QChar(0x00b0), 0x60 }, // ° DEGREE SIGN
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00fc, 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7d }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00df, 0x7e }  // ß LATIN SMALL LETTER SHARP S
+		{ QChar(0x00df), 0x7e }  // ß LATIN SMALL LETTER SHARP S
 	},
 
 	{ // 16 Italian
-		{ 0x00a3, 0x23 }, // £ POUND SIGN
+		{ QChar(0x00a3), 0x23 }, // £ POUND SIGN
-		{ 0x00e9, 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x40 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00b0, 0x5b }, // ° DEGREE SIGN
+		{ QChar(0x00b0), 0x5b }, // ° DEGREE SIGN
-		{ 0x00e7, 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x5c }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x0023, 0x5f }, // # NUMBER SIGN
+		{ QChar(0x0023), 0x5f }, // # NUMBER SIGN
-		{ 0x00f9, 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
+		{ QChar(0x00f9), 0x60 }, // ù LATIN SMALL LETTER U WITH GRAVE
-		{ 0x00e0, 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x7b }, // à LATIN SMALL LETTER A WITH GRAVE
-		{ 0x00f2, 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
+		{ QChar(0x00f2), 0x7c }, // ò LATIN SMALL LETTER O WITH GRAVE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00ec, 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
+		{ QChar(0x00ec), 0x7e }  // ì LATIN SMALL LETTER I WITH GRAVE
 	},
 
 	{ // 17 Lettish/Lithuanian
-		{ 0x0160, 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x40 }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x0117, 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
+		{ QChar(0x0117), 0x5b }, // ė LATIN SMALL LETTER E WITH DOT ABOVE
-		{ 0x0119, 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x0119), 0x5c }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017d, 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5d }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x010d, 0x5e }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x5e }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x016b, 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
+		{ QChar(0x016b), 0x5f }, // ū LATIN SMALL LETTER U WITH MACRON
-		{ 0x0161, 0x60 }, // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x60 }, // š LATIN SMALL LETTER S WITH CARON
-		{ 0x0105, 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x0105), 0x7b }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x0173, 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
+		{ QChar(0x0173), 0x7c }, // ų LATIN SMALL LETTER U WITH OGONEK
-		{ 0x017e, 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7d }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x012f, 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
+		{ QChar(0x012f), 0x7e }  // į LATIN SMALL LETTER I WITH OGONEK
 	},
 
 	{ // 18 Polish
-		{ 0x0144, 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
+		{ QChar(0x0144), 0x24 }, // ń LATIN SMALL LETTER N WITH ACUTE
-		{ 0x0105, 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
+		{ QChar(0x0105), 0x40 }, // ą LATIN SMALL LETTER A WITH OGONEK
-		{ 0x017b, 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
+		{ QChar(0x017b), 0x5b }, // Ż LATIN CAPITAL LETTER Z WITH DOT ABOVE - rendered as U+01B5 ...WITH STROKE
-		{ 0x015a, 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
+		{ QChar(0x015a), 0x5c }, // Ś LATIN CAPITAL LETTER S WITH ACUTE
-		{ 0x0141, 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
+		{ QChar(0x0141), 0x5d }, // Ł LATIN CAPITAL LETTER L WITH STROKE
-		{ 0x0107, 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x0107), 0x5e }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x00f3, 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x00f3), 0x5f }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x0119, 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
+		{ QChar(0x0119), 0x60 }, // ę LATIN SMALL LETTER E WITH OGONEK
-		{ 0x017c, 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
+		{ QChar(0x017c), 0x7b }, // ż LATIN SMALL LETTER Z WITH DOT ABOVE
-		{ 0x015b, 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
+		{ QChar(0x015b), 0x7c }, // ś LATIN SMALL LETTER S WITH ACUTE
-		{ 0x0142, 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
+		{ QChar(0x0142), 0x7d }, // ł LATIN SMALL LETTER L WITH STROKE
-		{ 0x017a, 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
+		{ QChar(0x017a), 0x7e }  // ź LATIN SMALL LETTER Z WITH ACUTE
 	},
 
 	{ // 19 Portuguese/Spanish
-		{ 0x00e7, 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x23 }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00a1, 0x40 }, // ¡ INVERTED EXCLAMATION MARK
+		{ QChar(0x00a1), 0x40 }, // ¡ INVERTED EXCLAMATION MARK
-		{ 0x00e1, 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
+		{ QChar(0x00e1), 0x5b }, // á LATIN SMALL LETTER A WITH ACUTE
-		{ 0x00e9, 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x5c }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00ed, 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
+		{ QChar(0x00ed), 0x5d }, // í LATIN SMALL LETTER I WITH ACUTE
-		{ 0x00f3, 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
+		{ QChar(0x00f3), 0x5e }, // ó LATIN SMALL LETTER O WITH ACUTE
-		{ 0x00fa, 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
+		{ QChar(0x00fa), 0x5f }, // ú LATIN SMALL LETTER U WITH ACUTE
-		{ 0x00bf, 0x60 }, // ¿ INVERTED QUESTION MARK
+		{ QChar(0x00bf), 0x60 }, // ¿ INVERTED QUESTION MARK
-		{ 0x00fc, 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7b }, // ü LATIN SMALL LETTER U WITH DIAERESIS
-		{ 0x00f1, 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
+		{ QChar(0x00f1), 0x7c }, // ñ LATIN SMALL LETTER N WITH TILDE
-		{ 0x00e8, 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
+		{ QChar(0x00e8), 0x7d }, // è LATIN SMALL LETTER E WITH GRAVE
-		{ 0x00e0, 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
+		{ QChar(0x00e0), 0x7e }  // à LATIN SMALL LETTER A WITH GRAVE
 	},
 
 	{ // 20 Rumanian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x021a, 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
+		{ QChar(0x021a), 0x40 }, // Ț LATIN CAPITAL LETTER T WITH COMMA BELOW
-		{ 0x00c2, 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00c2), 0x5b }, // Â LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-		{ 0x0218, 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
+		{ QChar(0x0218), 0x5c }, // Ș LATIN CAPITAL LETTER S WITH COMMA BELOW
-		{ 0x0102, 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
+		{ QChar(0x0102), 0x5d }, // Ă LATIN CAPITAL LETTER A WITH BREVE
-		{ 0x00c3, 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00c3), 0x5e }, // Î LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-		{ 0x0131, 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x0131), 0x5f }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x021b, 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
+		{ QChar(0x021b), 0x60 }, // ț LATIN SMALL LETTER T WITH COMMA BELOW
-		{ 0x00e2, 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
+		{ QChar(0x00e2), 0x7b }, // â LATIN SMALL LETTER A WITH CIRCUMFLEX
-		{ 0x0219, 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
+		{ QChar(0x0219), 0x7c }, // ș LATIN SMALL LETTER S WITH COMMA BELOW
-		{ 0x0103, 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
+		{ QChar(0x0103), 0x7d }, // ă LATIN SMALL LETTER A WITH BREVE
-		{ 0x00ee, 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
+		{ QChar(0x00ee), 0x7e }  // î LATIN SMALL LETTER I WITH CIRCUMFLEX
 	},
 
 	{ // 21 Serbian/Croatian/Slovenian
-		{ 0x00cb, 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
+		{ QChar(0x00cb), 0x24 }, // Ë LATIN CAPITAL LETTER E WITH DIAERESIS
-		{ 0x010c, 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
+		{ QChar(0x010c), 0x40 }, // Č LATIN CAPITAL LETTER C WITH CARON
-		{ 0x0106, 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
+		{ QChar(0x0106), 0x5b }, // Ć LATIN CAPITAL LETTER C WITH ACUTE
-		{ 0x017d, 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
+		{ QChar(0x017d), 0x5c }, // Ž LATIN CAPITAL LETTER Z WITH CARON
-		{ 0x0110, 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
+		{ QChar(0x0110), 0x5d }, // Đ LATIN CAPITAL LETTER D WITH STROKE
-		{ 0x0160, 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
+		{ QChar(0x0160), 0x5e }, // Š LATIN CAPITAL LETTER S WITH CARON
-		{ 0x00eb, 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
+		{ QChar(0x00eb), 0x5f }, // ë LATIN SMALL LETTER E WITH DIAERESIS
-		{ 0x010d, 0x60 }, // č LATIN SMALL LETTER C WITH CARON
+		{ QChar(0x010d), 0x60 }, // č LATIN SMALL LETTER C WITH CARON
-		{ 0x0107, 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
+		{ QChar(0x0107), 0x7b }, // ć LATIN SMALL LETTER C WITH ACUTE
-		{ 0x017e, 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
+		{ QChar(0x017e), 0x7c }, // ž LATIN SMALL LETTER Z WITH CARON
-		{ 0x0111, 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
+		{ QChar(0x0111), 0x7d }, // đ LATIN SMALL LETTER D WITH STROKE
-		{ 0x0161, 0x7e }  // š LATIN SMALL LETTER S WITH CARON
+		{ QChar(0x0161), 0x7e }  // š LATIN SMALL LETTER S WITH CARON
 	},
 
 	{ // 22 Swedish/Finnish/Hungarian
-		{ 0x00a4, 0x24 }, // ¤ CURRENCY SIGN
+		{ QChar(0x00a4), 0x24 }, // ¤ CURRENCY SIGN
-		{ 0x00c9, 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
+		{ QChar(0x00c9), 0x40 }, // É LATIN CAPITAL LETTER E WITH ACUTE
-		{ 0x00c4, 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
+		{ QChar(0x00c4), 0x5b }, // Ä LATIN CAPITAL LETTER A WITH DIAERESIS
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c5, 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
+		{ QChar(0x00c5), 0x5d }, // Å LATIN CAPITAL LETTER A WITH RING ABOVE
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x00e9, 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
+		{ QChar(0x00e9), 0x60 }, // é LATIN SMALL LETTER E WITH ACUTE
-		{ 0x00e4, 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
+		{ QChar(0x00e4), 0x7b }, // ä LATIN SMALL LETTER A WITH DIAERESIS
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e5, 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
+		{ QChar(0x00e5), 0x7d }, // å LATIN SMALL LETTER A WITH RING ABOVE
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	},
 
 	{ // 23 Turkish
-		{ 0x20ba, 0x23 }, // ₺ TURKISH LIRA SIGN
+		{ QChar(0x20ba), 0x23 }, // ₺ TURKISH LIRA SIGN
-		{ 0x011f, 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
+		{ QChar(0x011f), 0x24 }, // ğ LATIN SMALL LETTER G WITH BREVE
-		{ 0x0130, 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
+		{ QChar(0x0130), 0x40 }, // İ LATIN CAPITAL LETTER I WITH DOT ABOVE
-		{ 0x015e, 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
+		{ QChar(0x015e), 0x5b }, // Ş LATIN CAPITAL LETTER S WITH CEDILLA
-		{ 0x00d6, 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
+		{ QChar(0x00d6), 0x5c }, // Ö LATIN CAPITAL LETTER O WITH DIAERESIS
-		{ 0x00c7, 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
+		{ QChar(0x00c7), 0x5d }, // Ç LATIN CAPITAL LETTER C WITH CEDILLA
-		{ 0x00dc, 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
+		{ QChar(0x00dc), 0x5e }, // Ü LATIN CAPITAL LETTER U WITH DIAERESIS
-		{ 0x011e, 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
+		{ QChar(0x011e), 0x5f }, // Ğ LATIN CAPITAL LETTER G WITH BREVE
-		{ 0x0131, 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
+		{ QChar(0x0131), 0x60 }, // ı LATIN SMALL LETTER DOTLESS I
-		{ 0x015f, 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
+		{ QChar(0x015f), 0x7b }, // ş LATIN SMALL LETTER S WITH CEDILLA
-		{ 0x00f6, 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
+		{ QChar(0x00f6), 0x7c }, // ö LATIN SMALL LETTER O WITH DIAERESIS
-		{ 0x00e7, 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
+		{ QChar(0x00e7), 0x7d }, // ç LATIN SMALL LETTER C WITH CEDILLA
-		{ 0x00fc, 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
+		{ QChar(0x00fc), 0x7e }  // ü LATIN SMALL LETTER U WITH DIAERESIS
 	}
 };
 
 
 // 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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,7 +21,10 @@
 #include <QByteArray>
 #include <QByteArrayList>
 #include <QClipboard>
+#include <QImage>
 #include <QMimeData>
+#include <QRegularExpression>
+#include <QSet>
 
 #include "levelonecommands.h"
 
@@ -37,6 +40,51 @@ LevelOneCommand::LevelOneCommand(TeletextDocument *teletextDocument, QUndoComman
 	m_firstDo = true;
 }
 
+QByteArrayList LevelOneCommand::storeCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn)
+{
+	QByteArrayList result;
+
+	for (int r=topRow; r<=bottomRow; r++) {
+		QByteArray rowArray;
+
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40)
+				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
+			else
+				// Gone beyond last line or column - store a filler character which we won't see
+				// Not sure if this is really necessary as out-of-bounds access might not occur?
+				rowArray.append(0x7f);
+
+		result.append(rowArray);
+	}
+
+	return result;
+}
+
+void LevelOneCommand::retrieveCharacters(int topRow, int leftColumn, const QByteArrayList &storedChars)
+{
+	const int bottomRow = topRow + storedChars.size() - 1;
+	const int rightColumn = leftColumn + storedChars.at(0).size() - 1;
+
+	int arrayR = 0;
+	int arrayC;
+
+	for (int r=topRow; r<=bottomRow; r++) {
+		arrayC = 0;
+		for (int c=leftColumn; c<=rightColumn; c++)
+			// Guard against size of pasted block going beyond last line or column
+			if (r < 25 && c < 40) {
+				m_teletextDocument->currentSubPage()->setCharacter(r, c, storedChars.at(arrayR).at(arrayC));
+
+				arrayC++;
+			}
+
+		arrayR++;
+	}
+}
+
+
 TypeCharacterCommand::TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_columnStart = m_columnEnd = m_column;
@@ -71,7 +119,7 @@ void TypeCharacterCommand::redo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void TypeCharacterCommand::undo()
@@ -82,7 +130,7 @@ void TypeCharacterCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool TypeCharacterCommand::mergeWith(const QUndoCommand *command)
@@ -104,10 +152,19 @@ bool TypeCharacterCommand::mergeWith(const QUndoCommand *command)
 ToggleMosaicBitCommand::ToggleMosaicBitCommand(TeletextDocument *teletextDocument, unsigned char bitToToggle, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_oldCharacter = teletextDocument->currentSubPage()->character(m_row, m_column);
+
 	if (bitToToggle == 0x20 || bitToToggle == 0x7f)
+		// Clear or fill the whole mosaic character
 		m_newCharacter = bitToToggle;
-	else
+	else if (bitToToggle == 0x66)
+		// Dither
+		m_newCharacter = (m_row & 1) ? 0x66 : 0x39;
+	else if (m_oldCharacter & 0x20)
+		// Previous character was mosaic, just toggle the bit(s)
 		m_newCharacter = m_oldCharacter ^ bitToToggle;
+	else
+		// Previous character was blast-through, change to mosaic and set bit alone
+		m_newCharacter = bitToToggle | 0x20;
 
 	setText(QObject::tr("mosaic"));
 
@@ -119,7 +176,7 @@ void ToggleMosaicBitCommand::redo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_newCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void ToggleMosaicBitCommand::undo()
@@ -128,7 +185,7 @@ void ToggleMosaicBitCommand::undo()
 	m_teletextDocument->currentSubPage()->setCharacter(m_row, m_column, m_oldCharacter);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool ToggleMosaicBitCommand::mergeWith(const QUndoCommand *command)
@@ -180,7 +237,7 @@ void BackspaceKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_columnEnd);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void BackspaceKeyCommand::undo()
@@ -192,7 +249,7 @@ void BackspaceKeyCommand::undo()
 
 	m_teletextDocument->moveCursor(m_row, m_columnStart);
 	m_teletextDocument->cursorRight();
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool BackspaceKeyCommand::mergeWith(const QUndoCommand *command)
@@ -234,7 +291,7 @@ void DeleteKeyCommand::redo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_newRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteKeyCommand::undo()
@@ -245,7 +302,7 @@ void DeleteKeyCommand::undo()
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_oldRowContents[c]);
 
 	m_teletextDocument->moveCursor(m_row, m_column);
-	emit m_teletextDocument->contentsChange(m_row);
+	emit m_teletextDocument->contentsChanged();
 }
 
 bool DeleteKeyCommand::mergeWith(const QUndoCommand *command)
@@ -262,6 +319,145 @@ bool DeleteKeyCommand::mergeWith(const QUndoCommand *command)
 }
 
 
+ShiftMosaicsCommand::ShiftMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
+{
+	m_selectionTopRow = m_teletextDocument->selectionTopRow();
+	m_selectionLeftColumn = m_teletextDocument->selectionLeftColumn();
+	m_selectionBottomRow = m_teletextDocument->selectionBottomRow();
+	m_selectionRightColumn = m_teletextDocument->selectionRightColumn();
+
+	m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
+	m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
+
+	m_mosaicList = mosaicList;
+
+	m_oldCharacters = storeCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
+	m_newCharacters = m_oldCharacters;
+}
+
+void ShiftMosaicsCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_newCharacters);
+
+	emit m_teletextDocument->contentsChanged();
+
+	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
+	m_teletextDocument->moveCursor(m_row, m_column, true);
+}
+
+void ShiftMosaicsCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_oldCharacters);
+
+	emit m_teletextDocument->contentsChanged();
+
+	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
+	m_teletextDocument->moveCursor(m_row, m_column, true);
+}
+
+bool ShiftMosaicsCommand::mergeWith(const QUndoCommand *command)
+{
+	const ShiftMosaicsCommand *newerCommand = static_cast<const ShiftMosaicsCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex || m_selectionTopRow != newerCommand->m_selectionTopRow || m_selectionLeftColumn != newerCommand->m_selectionLeftColumn || m_selectionBottomRow != newerCommand->m_selectionBottomRow || m_selectionRightColumn != newerCommand->m_selectionRightColumn)
+		return false;
+
+	m_newCharacters = newerCommand->m_newCharacters;
+
+	return true;
+}
+
+ShiftMosaicsUpCommand::ShiftMosaicsUpCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sr=r+1; sr<=m_selectionBottomRow; sr++)
+					if (m_mosaicList.contains(qMakePair(sr, c))) {
+						mosaicWrap = m_newCharacters[sr - m_selectionTopRow][lc];
+						mosaicWrap = ((mosaicWrap & 0x01) << 4) | ((mosaicWrap & 0x02) << 5);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] >> 2) & 0x07) | ((m_newCharacters[lr][lc] & 0x40) >> 3) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics up"));
+}
+
+ShiftMosaicsDownCommand::ShiftMosaicsDownCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int r=m_selectionBottomRow; r>=m_selectionTopRow; r--)
+		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sr=r-1; sr>=m_selectionTopRow; sr--)
+					if (m_mosaicList.contains(qMakePair(sr, c))) {
+						mosaicWrap = m_newCharacters[sr - m_selectionTopRow][lc];
+						mosaicWrap = ((mosaicWrap & 0x10) >> 4) | ((mosaicWrap & 0x40) >> 5);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x07) << 2) | ((m_newCharacters[lr][lc] & 0x08) << 3) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics down"));
+}
+
+ShiftMosaicsLeftCommand::ShiftMosaicsLeftCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
+		for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sc=c+1; sc<=m_selectionRightColumn; sc++)
+					if (m_mosaicList.contains(qMakePair(r, sc))) {
+						mosaicWrap = m_newCharacters[lr][sc - m_selectionLeftColumn];
+						mosaicWrap = ((mosaicWrap & 0x05) << 1) | ((mosaicWrap & 0x10) << 2);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x0a) >> 1) | ((m_newCharacters[lr][lc] & 0x40) >> 2) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics left"));
+}
+
+ShiftMosaicsRightCommand::ShiftMosaicsRightCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent) : ShiftMosaicsCommand(teletextDocument, mosaicList, parent)
+{
+	for (int c=m_selectionRightColumn; c>=m_selectionLeftColumn; c--)
+		for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++)
+			if (m_mosaicList.contains(qMakePair(r, c))) {
+				const int lr = r - m_selectionTopRow;
+				const int lc = c - m_selectionLeftColumn;
+				unsigned char mosaicWrap = 0x00;
+
+				for (int sc=c-1; sc>=m_selectionLeftColumn; sc--)
+					if (m_mosaicList.contains(qMakePair(r, sc))) {
+						mosaicWrap = m_newCharacters[lr][sc - m_selectionLeftColumn];
+						mosaicWrap = ((mosaicWrap & 0x0a) >> 1) | ((mosaicWrap & 0x40) >> 2);
+						break;
+					}
+
+				m_newCharacters[lr][lc] = ((m_newCharacters[lr][lc] & 0x05) << 1) | ((m_newCharacters[lr][lc] & 0x10) << 2) | mosaicWrap | 0x20;
+			}
+
+	setText(QObject::tr("shift mosaics right"));
+}
+
+
 InsertRowCommand::InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
 {
 	m_copyRow = copyRow;
@@ -288,7 +484,7 @@ void InsertRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(m_row, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void InsertRowCommand::undo()
@@ -303,7 +499,7 @@ void InsertRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(23, c, m_deletedBottomRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -328,7 +524,7 @@ void DeleteRowCommand::redo()
 		for (int c=0; c<40; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(blankingRow, c, ' ');
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 void DeleteRowCommand::undo()
@@ -343,7 +539,7 @@ void DeleteRowCommand::undo()
 	for (int c=0; c<40; c++)
 		m_teletextDocument->currentSubPage()->setCharacter(m_row, c, m_deletedRow[c]);
 
-	emit m_teletextDocument->refreshNeeded();
+	emit m_teletextDocument->contentsChanged();
 }
 
 
@@ -358,15 +554,7 @@ CutCommand::CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent)
 	m_selectionCornerRow = m_teletextDocument->selectionCornerRow();
 	m_selectionCornerColumn = m_teletextDocument->selectionCornerColumn();
 
-	// Store copy of the characters that we're about to blank
+	m_oldCharacters = storeCharacters(m_selectionTopRow, m_selectionLeftColumn, m_selectionBottomRow, m_selectionRightColumn);
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
-		QByteArray rowArray;
-
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-
-		m_deletedCharacters.append(rowArray);
-	}
 
 	setText(QObject::tr("cut"));
 }
@@ -378,25 +566,18 @@ void CutCommand::redo()
 	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
 		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
 			m_teletextDocument->currentSubPage()->setCharacter(r, c, 0x20);
-		emit m_teletextDocument->contentsChange(r);
 	}
+
+	emit m_teletextDocument->contentsChanged();
 }
 
 void CutCommand::undo()
 {
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
+	retrieveCharacters(m_selectionTopRow, m_selectionLeftColumn, m_oldCharacters);
-	int arrayC;
 
-	for (int r=m_selectionTopRow; r<=m_selectionBottomRow; r++) {
+	emit m_teletextDocument->contentsChanged();
-		arrayC = 0;
-		for (int c=m_selectionLeftColumn; c<=m_selectionRightColumn; c++)
-			m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC++));
-
-		emit m_teletextDocument->contentsChange(r);
-		arrayR++;
-	}
 
 	m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
 	m_teletextDocument->moveCursor(m_row, m_column, true);
@@ -413,8 +594,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 +613,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,32 +621,124 @@ 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
-		QStringList plainTextData = mimeData->text().split(QRegExp("\n|\r\n|\r"));
+		m_plainText = true;
+
+		const int rightColumn = m_selectionActive ? m_pasteRightColumn : 39;
+
+		// Parse line-feeds in the clipboard data
+		QStringList plainTextData = mimeData->text().split(QRegularExpression("\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
+				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 >= QChar(0x01) && charToConvert <= QChar(0x1f))
+					convertedChar = ' ';
+				else if (keymapping[pageCharSet].contains(charToConvert))
 					// Remapped character or non-Latin character converted successfully
 					convertedChar = keymapping[pageCharSet].value(charToConvert);
 				else {
 					// Either a Latin character or non-Latin character that can't be converted
 					// See if it's a Latin character
 					convertedChar = charToConvert.toLatin1();
-					if (convertedChar == 0)
+					if (convertedChar <= 0)
 						// Couldn't convert - make it a block character so it doesn't need to be inserted-between later on
 						convertedChar = 0x7f;
 				}
@@ -463,41 +747,89 @@ 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;
+		}
+	} else if (mimeData->hasImage()) {
+		QImage imageData = qvariant_cast<QImage>(mimeData->imageData());
+		m_plainText = false;
+		// Round up when dividing pixel size into character cell size
+		m_clipboardDataHeight = (imageData.height() + 2) / 3;
+		m_clipboardDataWidth = (imageData.width() + 1) / 2;
+
+		// Format_MonoLSB reverses the bits which makes them easier to shuffle into sixels
+		if (imageData.depth() == 1)
+			imageData.convertTo(QImage::Format_MonoLSB);
+		else
+			// Only pure black and white images convert reliably this way...
+			imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QVector<QRgb>{0x000000ff, 0xffffffff});
+
+		for (int r=0; r<m_clipboardDataHeight; r++)
+			m_pastingCharacters.append(QByteArray(m_clipboardDataWidth, 0x00));
+
+		// Directly read the pixel-bits and convert them to sixels with some funky bit manipulation
+		for (int y=0; y<imageData.height(); y++) {
+			const unsigned char *bytePointer = imageData.constScanLine(y);
+			// Three rows of sixels per character cell
+			const int r = y / 3;
+			// Where to shuffle the bits into the top, middle or bottom row of sixels
+			// Yes it does put the bottom right sixel into bit 5 instead of bit 6;
+			// this gets remedied further on
+			const int yShift = (y % 3) * 2;
+			// The loop does eight horizontal pixels into four character cells at a time
+			for (int x=0; x<imageData.width(); x+=8) {
+				const unsigned char byteScanned = *bytePointer;
+				const int c = x / 2;
+
+				m_pastingCharacters[r][c] = m_pastingCharacters[r][c] | ((byteScanned & 0x03) << yShift);
+				// Since we're doing four character cells at a time, we need to exit the loop
+				// early before we go out of bounds.
+				// Yes it does leave an undefined last column of sixels from images that are an
+				// odd numbered number of pixels wide; this gets remedied further on
+				if (x + 2 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+1] = m_pastingCharacters[r][c+1] | (((byteScanned >> 2) & 0x03) << yShift);
+				if (x + 4 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+2] = m_pastingCharacters[r][c+2] | (((byteScanned >> 4) & 0x03) << yShift);
+				if (x + 6 >= imageData.width())
+					continue;
+				m_pastingCharacters[r][c+3] = m_pastingCharacters[r][c+3] | (((byteScanned >> 6) & 0x03) << yShift);
+
+				bytePointer++;
+			}
+		}
+
+		for (int r=0; r<m_clipboardDataHeight; r++) {
+			for (int c=0; c<m_clipboardDataWidth; c++)
+				if (m_pastingCharacters.at(r).at(c) & 0x20)
+					// If bit 5 was set, correct this to bit 6
+					// but we keep bit 5 set as all mosaic characters have bit 5 set
+					m_pastingCharacters[r][c] = m_pastingCharacters.at(r).at(c) | 0x40;
+				else
+					// Set bit 5 to have it recognised as a mosaic character
+					m_pastingCharacters[r][c] = m_pastingCharacters.at(r).at(c) | 0x20;
+			// If image was an odd numbered width, neutralise the undefined sixels
+			// on the right half
+			if (imageData.width() & 0x01)
+				m_pastingCharacters[r][m_clipboardDataWidth-1] = m_pastingCharacters.at(r).at(m_clipboardDataWidth-1) & 0x35;
+		}
+
+		if (!m_selectionActive) {
+			m_pasteBottomRow = m_row + m_clipboardDataHeight - 1;
+			m_pasteRightColumn = m_column + m_clipboardDataWidth - 1;
+		}
 	}
 
 	if (m_clipboardDataWidth == 0 || m_clipboardDataHeight == 0)
 		return;
 
-	if (m_selectionActive) {
+	m_oldCharacters = storeCharacters(m_pasteTopRow, m_pasteLeftColumn, m_pasteBottomRow, m_pasteRightColumn);
-		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;
-
-		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)
-				rowArray.append(m_teletextDocument->currentSubPage()->character(r, c));
-			else
-				// Gone beyond last line or column - store a filler character which we won't see
-				// Not sure if this is really necessary as out-of-bounds access might not occur?
-				rowArray.append(0x7f);
-
-		m_deletedCharacters.append(rowArray);
-	}
 
 	setText(QObject::tr("paste"));
 }
@@ -517,21 +849,35 @@ 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
+				if (arrayC == m_clipboardDataWidth) {
+					if (!m_plainText)
 						arrayC = 0;
+					else
+						break;
+				}
 			}
-
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
 
 		arrayR++;
 		// If paste area is taller than clipboard data, repeat the pattern
-		if (arrayR == m_clipboardDataHeight)
+		// if it wasn't plain text
+		if (arrayR == m_clipboardDataHeight) {
+			if (!m_plainText)
 				arrayR = 0;
+			else
+				break;
 		}
+	}
+
+	emit m_teletextDocument->contentsChanged();
 
 	if (m_selectionActive) {
 		m_teletextDocument->setSelectionCorner(m_selectionCornerRow, m_selectionCornerColumn);
@@ -549,21 +895,9 @@ void PasteCommand::undo()
 
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
 
-	int arrayR = 0;
+	retrieveCharacters(m_pasteTopRow, m_pasteLeftColumn, m_oldCharacters);
-	int arrayC;
 
-	for (int r=m_pasteTopRow; r<=m_pasteBottomRow; r++) {
+	emit m_teletextDocument->contentsChanged();
-		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)
-				m_teletextDocument->currentSubPage()->setCharacter(r, c, m_deletedCharacters[arrayR].at(arrayC++));
-
-		if (r < 25)
-			emit m_teletextDocument->contentsChange(r);
-
-		arrayR++;
-	}
 
 	if (!m_selectionActive)
 		m_teletextDocument->moveCursor(m_row, m_column);
@@ -612,64 +946,3 @@ void DeleteSubPageCommand::undo()
 	m_teletextDocument->unDeleteSubPageFromRecycle(m_subPageIndex);
 	m_teletextDocument->selectSubPageIndex(m_subPageIndex, true);
 }
-
-
-SetColourCommand::SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
-{
-	m_colourIndex = colourIndex;
-	m_oldColour = teletextDocument->currentSubPage()->CLUT(colourIndex);
-	m_newColour = newColour;
-
-	setText(QObject::tr("colour change"));
-
-}
-
-void SetColourCommand::redo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_newColour);
-
-	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
-}
-
-void SetColourCommand::undo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_oldColour);
-
-	emit m_teletextDocument->colourChanged(m_colourIndex);
-	emit m_teletextDocument->refreshNeeded();
-}
-
-
-ResetCLUTCommand::ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent) : LevelOneCommand(teletextDocument, parent)
-{
-	m_colourTable = colourTable;
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++)
-		m_oldColourEntry[i&7] = teletextDocument->currentSubPage()->CLUT(i);
-
-	setText(QObject::tr("CLUT %1 reset").arg(m_colourTable));
-}
-
-void ResetCLUTCommand::redo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
-		m_teletextDocument->currentSubPage()->setCLUT(i, m_teletextDocument->currentSubPage()->CLUT(i, 0));
-		emit m_teletextDocument->colourChanged(i);
-	}
-
-	emit m_teletextDocument->refreshNeeded();
-}
-
-void ResetCLUTCommand::undo()
-{
-	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
-	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
-		m_teletextDocument->currentSubPage()->setCLUT(i, m_oldColourEntry[i&7]);
-		emit m_teletextDocument->colourChanged(i);
-	}
-
-	emit m_teletextDocument->refreshNeeded();
-}

levelonecommands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,6 +21,7 @@
 #define LEVELONECOMMANDS_H
 
 #include <QByteArrayList>
+#include <QSet>
 #include <QUndoCommand>
 
 #include "document.h"
@@ -28,9 +29,12 @@
 class LevelOneCommand : public QUndoCommand
 {
 public:
-	LevelOneCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	LevelOneCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 protected:
+	QByteArrayList storeCharacters(int topRow, int leftColumn, int bottomRow, int rightColumn);
+	void retrieveCharacters(int topRow, int leftColumn, const QByteArrayList &oldChars);
+
 	TeletextDocument *m_teletextDocument;
 	int m_subPageIndex, m_row, m_column;
 	bool m_firstDo;
@@ -41,11 +45,11 @@ class TypeCharacterCommand : public LevelOneCommand
 public:
 	enum { Id = 101 };
 
-	TypeCharacterCommand(TeletextDocument *, unsigned char, bool, QUndoCommand *parent = 0);
+	TypeCharacterCommand(TeletextDocument *teletextDocument, unsigned char newCharacter, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -59,11 +63,11 @@ class ToggleMosaicBitCommand : public LevelOneCommand
 public:
 	enum { Id = 102 };
 
-	ToggleMosaicBitCommand(TeletextDocument *, unsigned char, QUndoCommand *parent = 0);
+	ToggleMosaicBitCommand(TeletextDocument *teletextDocument, unsigned char bitToToggle, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -75,11 +79,11 @@ class BackspaceKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 103 };
 
-	BackspaceKeyCommand(TeletextDocument *, bool insertMode, QUndoCommand *parent = 0);
+	BackspaceKeyCommand(TeletextDocument *teletextDocument, bool insertMode, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
@@ -93,21 +97,77 @@ class DeleteKeyCommand : public LevelOneCommand
 public:
 	enum { Id = 104 };
 
-	DeleteKeyCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteKeyCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
-	bool mergeWith(const QUndoCommand *) override;
+	bool mergeWith(const QUndoCommand *command) override;
 	int id() const override { return Id; }
 
 private:
 	unsigned char m_oldRowContents[40], m_newRowContents[40];
 };
 
+class ShiftMosaicsCommand : public LevelOneCommand
+{
+public:
+	ShiftMosaicsCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+
+protected:
+	QByteArrayList m_oldCharacters, m_newCharacters;
+	QSet<QPair<int, int>> m_mosaicList;
+	int m_selectionTopRow, m_selectionBottomRow, m_selectionLeftColumn, m_selectionRightColumn;
+	int m_selectionCornerRow, m_selectionCornerColumn;
+};
+
+class ShiftMosaicsUpCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 110 };
+
+	ShiftMosaicsUpCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsDownCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 111 };
+
+	ShiftMosaicsDownCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsLeftCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 112 };
+
+	ShiftMosaicsLeftCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
+class ShiftMosaicsRightCommand : public ShiftMosaicsCommand
+{
+public:
+	enum { Id = 113 };
+
+	ShiftMosaicsRightCommand(TeletextDocument *teletextDocument, const QSet<QPair<int, int>> &mosaicList, QUndoCommand *parent = 0);
+
+	int id() const override { return Id; }
+};
+
 class InsertSubPageCommand : public LevelOneCommand
 {
 public:
-	InsertSubPageCommand(TeletextDocument *, bool, bool, QUndoCommand *parent = 0);
+	InsertSubPageCommand(TeletextDocument *teletextDocument, bool afterCurrentSubPage, bool copySubPage, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -120,7 +180,7 @@ private:
 class DeleteSubPageCommand : public LevelOneCommand
 {
 public:
-	DeleteSubPageCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteSubPageCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -129,7 +189,7 @@ public:
 class InsertRowCommand : public LevelOneCommand
 {
 public:
-	InsertRowCommand(TeletextDocument *, bool, QUndoCommand *parent = 0);
+	InsertRowCommand(TeletextDocument *teletextDocument, bool copyRow, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -142,7 +202,7 @@ private:
 class DeleteRowCommand : public LevelOneCommand
 {
 public:
-	DeleteRowCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	DeleteRowCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -155,13 +215,13 @@ private:
 class CutCommand : public LevelOneCommand
 {
 public:
-	CutCommand(TeletextDocument *, QUndoCommand *parent = 0);
+	CutCommand(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters;
+	QByteArrayList m_oldCharacters;
 	int m_selectionTopRow, m_selectionBottomRow, m_selectionLeftColumn, m_selectionRightColumn;
 	int m_selectionCornerRow, m_selectionCornerColumn;
 };
@@ -169,43 +229,18 @@ private:
 class PasteCommand : public LevelOneCommand
 {
 public:
-	PasteCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
+	PasteCommand(TeletextDocument *teletextDocument, int pageCharSet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
 
 private:
-	QByteArrayList m_deletedCharacters, m_pastingCharacters;
+	QByteArrayList m_oldCharacters, m_pastingCharacters;
 	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
 
-class SetColourCommand : public LevelOneCommand
-{
-public:
-	SetColourCommand(TeletextDocument *, int, int, QUndoCommand *parent = 0);
-
-	void redo() override;
-	void undo() override;
-
-private:
-	int m_colourIndex, m_oldColour, m_newColour;
-};
-
-class ResetCLUTCommand : public LevelOneCommand
-{
-public:
-	ResetCLUTCommand(TeletextDocument *, int, QUndoCommand *parent = 0);
-
-	void redo() override;
-	void undo() override;
-
-private:
-	int m_colourTable;
-	int m_oldColourEntry[8];
-};
-
 #endif

levelonepage.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -25,6 +25,8 @@
 
 #include "levelonepage.h"
 
+#include "x26triplets.h"
+
 LevelOnePage::LevelOnePage()
 {
 	m_enhancements.reserve(maxEnhancements());
@@ -62,7 +64,7 @@ void LevelOnePage::clearPage()
 		m_fastTextLink[i] = { 0x0ff, 0x3f7f };
 
 /*	m_subPageNumber = 0x0000; */
-	m_cycleValue = 8;
+	m_cycleValue = 20;
 	m_cycleType = CTseconds;
 	m_defaultCharSet = 0;
 	m_defaultNOS = 0;
@@ -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
 
+	// 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;
 
@@ -422,36 +431,52 @@ int LevelOnePage::levelRequired() const
 				case 0x1f: // Termination
 				case 0x22: // G3 character @ Level 1.5
 				case 0x2f: // G2 character
-				case 0x30 ... 0x3f: // G0 character with diacritical
+					levelSeen = 1;
-					levelSeen = qMax(levelSeen, 1);
 					break;
+				default:
+					if (m_enhancements.at(i).modeExt() >= 0x30 && m_enhancements.at(i).modeExt() <= 0x3f)
+						// G0 character with diacritical
+						levelSeen = 1;
 			}
+
 		if (levelSeen < 2)
 			switch (m_enhancements.at(i).modeExt()) {
 				// Check for Level 2.5 triplets
 				case 0x00: // Full screen colour
 				case 0x01: // Full row colour
-				case 0x10 ... 0x13: // Origin Modifer and Object Invocation
+				case 0x10: // Origin Modifier
-				case 0x15 ... 0x17: // Object Definition
+				case 0x11: // Invoke Active Object
-					// Check if Object Defition is required only at Level 3.5
+				case 0x12: // Invoke Adaptive Object
-					if ((m_enhancements.at(i).address() & 0x18) == 0x10)
+				case 0x13: // Invoke Passive Object
-						return 3;
+				case 0x15: // Define Active Object
-					else
+				case 0x16: // Define Adaptive Object
-						levelSeen = qMax(levelSeen, 2);
+				case 0x17: // Define Passive Object
-					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 0x27: // Flash functions
-				case 0x2b ... 0x2d: // G3 character @ Level 2.5, display attributes, DRCS character
+				case 0x28: // G0 and G2 charset designation
-					levelSeen = qMax(levelSeen, 2);
+				case 0x29: // G0 character @ Level 2.5
+				case 0x2b: // G3 character @ Level 2.5
+				case 0x2c: // Display attributes
+				case 0x2d: // DRCS character
+					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: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
+					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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -36,19 +36,19 @@ public:
 	enum CycleTypeEnum { CTcycles, CTseconds };
 
 	LevelOnePage();
-	LevelOnePage(const PageBase &);
+	LevelOnePage(const PageBase &other);
 
 	bool isEmpty() const override;
 
-	QByteArray packet(int) const override;
+	QByteArray packet(int packetNumber) const override;
-	QByteArray packet(int, int) const override;
+	QByteArray packet(int packetNumber, int designationCode) const override;
-	bool packetExists(int) const override;
+	bool packetExists(int packetNumber) const override;
-	bool packetExists(int, int) const override;
+	bool packetExists(int packetNumber, int designationCode) const override;
-	bool setPacket(int, QByteArray) override;
+	bool setPacket(int packetNumber, QByteArray packetContents) override;
-	bool setPacket(int, int, QByteArray) override;
+	bool setPacket(int packetNumber, int designationCode, QByteArray packetContents) override;
 
 	bool controlBit(int bitNumber) const override;
-	bool setControlBit(int, bool) override;
+	bool setControlBit(int bitNumber, bool active) override;
 
 	void clearPage();
 
@@ -56,53 +56,53 @@ public:
 
 /*	void setSubPageNumber(int); */
 	int cycleValue() const { return m_cycleValue; };
-	void setCycleValue(int);
+	void setCycleValue(int newValue);
 	CycleTypeEnum cycleType() const { return m_cycleType; };
-	void setCycleType(CycleTypeEnum);
+	void setCycleType(CycleTypeEnum newType);
 	int defaultCharSet() const { return m_defaultCharSet; }
-	void setDefaultCharSet(int);
+	void setDefaultCharSet(int newDefaultCharSet);
 	int defaultNOS() const { return m_defaultNOS; }
-	void setDefaultNOS(int);
+	void setDefaultNOS(int defaultNOS);
 	int secondCharSet() const { return m_secondCharSet; }
-	void setSecondCharSet(int);
+	void setSecondCharSet(int newSecondCharSet);
 	int secondNOS() const { return m_secondNOS; }
-	void setSecondNOS(int);
+	void setSecondNOS(int newSecondNOS);
 	unsigned char character(int row, int column) const { return m_level1Page[row][column]; }
-	void setCharacter(int, int, unsigned char);
+	void setCharacter(int row, int column, unsigned char newCharacter);
 	int defaultScreenColour() const { return m_defaultScreenColour; }
-	void setDefaultScreenColour(int);
+	void setDefaultScreenColour(int newDefaultScreenColour);
 	int defaultRowColour() const { return m_defaultRowColour; }
-	void setDefaultRowColour(int);
+	void setDefaultRowColour(int newDefaultRowColour);
 	int colourTableRemap() const { return m_colourTableRemap; }
-	void setColourTableRemap(int);
+	void setColourTableRemap(int newColourTableRemap);
 	bool blackBackgroundSubst() const { return m_blackBackgroundSubst; }
-	void setBlackBackgroundSubst(bool);
+	void setBlackBackgroundSubst(bool newBlackBackgroundSubst);
 	int CLUT(int index, int renderLevel=3) const;
-	void setCLUT(int, int);
+	void setCLUT(int index, int newColour);
 	QColor CLUTtoQColor(int index, int renderlevel=3) const;
-	bool isPaletteDefault(int) const;
+	bool isPaletteDefault(int colour) const;
-	bool isPaletteDefault(int, int) const;
+	bool isPaletteDefault(int fromColour, int toColour) const;
 	int levelRequired() const;
 	bool leftSidePanelDisplayed() const { return m_leftSidePanelDisplayed; }
-	void setLeftSidePanelDisplayed(bool);
+	void setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed);
 	bool rightSidePanelDisplayed() const { return m_rightSidePanelDisplayed; }
-	void setRightSidePanelDisplayed(bool);
+	void setRightSidePanelDisplayed(bool newRightSidePanelDisplayed);
 	int sidePanelColumns() const { return m_sidePanelColumns; }
-	void setSidePanelColumns(int);
+	void setSidePanelColumns(int newSidePanelColumns);
 	bool sidePanelStatusL25() const { return m_sidePanelStatusL25; }
-	void setSidePanelStatusL25(bool);
+	void setSidePanelStatusL25(bool newSidePanelStatusL25);
 	int fastTextLinkPageNumber(int linkNumber) const { return m_fastTextLink[linkNumber].pageNumber; }
-	void setFastTextLinkPageNumber(int, int);
+	void setFastTextLinkPageNumber(int linkNumber, int pageNumber);
 	int composeLinkFunction(int linkNumber) const { return m_composeLink[linkNumber].function; }
-	void setComposeLinkFunction(int, int);
+	void setComposeLinkFunction(int linkNumber, int newFunction);
 	bool composeLinkLevel2p5(int linkNumber) const { return m_composeLink[linkNumber].level2p5; }
-	void setComposeLinkLevel2p5(int, bool);
+	void setComposeLinkLevel2p5(int linkNumber, bool newRequired);
 	bool composeLinkLevel3p5(int linkNumber) const { return m_composeLink[linkNumber].level3p5; }
-	void setComposeLinkLevel3p5(int, bool);
+	void setComposeLinkLevel3p5(int linkNumber, bool newRequired);
 	int composeLinkPageNumber(int linkNumber) const { return m_composeLink[linkNumber].pageNumber; }
-	void setComposeLinkPageNumber(int, int);
+	void setComposeLinkPageNumber(int linkNumber, int newPageNumber);
 	int composeLinkSubPageCodes(int linkNumber) const { return m_composeLink[linkNumber].subPageCodes; }
-	void setComposeLinkSubPageCodes(int, int);
+	void setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes);
 
 private:
 	unsigned char m_level1Page[25][40];

loadsave.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -419,7 +419,11 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -558,7 +562,11 @@ void exportM29File(QSaveFile &file, const TeletextDocument &document)
 		}
 	};
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	outStream.setCodec("ISO-8859-1");
+#else
+	outStream.setEncoding(QStringConverter::Latin1);
+#endif
 
 	if (!document.description().isEmpty())
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)

loadsave.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -30,18 +30,18 @@
 #include "levelonepage.h"
 #include "pagebase.h"
 
-void loadTTI(QFile *, TeletextDocument *);
+void loadTTI(QFile *inFile, TeletextDocument *document);
-void importT42(QFile *, TeletextDocument *);
+void importT42(QFile *inFile, TeletextDocument *document);
 
-int controlBitsToPS(PageBase *);
+int controlBitsToPS(PageBase *subPage);
 
-void saveTTI(QSaveFile &, const TeletextDocument &);
+void saveTTI(QSaveFile &file, const TeletextDocument &document);
-void exportT42File(QSaveFile &, const TeletextDocument &);
+void exportT42File(QSaveFile &file, const TeletextDocument &document);
-void exportM29File(QSaveFile &, const TeletextDocument &);
+void exportM29File(QSaveFile &file, const TeletextDocument &document);
 
-QByteArray rowPacketAlways(PageBase *, int);
+QByteArray rowPacketAlways(PageBase *subPage, int packetNumber);
 
-QString exportHashStringPage(LevelOnePage *);
+QString exportHashStringPage(LevelOnePage *subPage);
 QString exportHashStringPackets(LevelOnePage *subPage);
 
 #endif

main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 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.5.3-alpha");
+	QApplication::setApplicationVersion("0.6.4-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

mainwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -26,11 +26,13 @@
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
 #include <QGraphicsSceneEvent>
+#include <QImage>
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMimeData>
 #include <QPainter>
 #include <QPair>
+#include <QSet>
 #include <QUndoCommand>
 #include <QWidget>
 #include <vector>
@@ -38,6 +40,7 @@
 
 #include "mainwidget.h"
 
+#include "decode.h"
 #include "document.h"
 #include "keymap.h"
 #include "levelonecommands.h"
@@ -52,16 +55,17 @@ 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::contentsChanged, this, &TeletextWidget::refreshPage);
-	connect(m_teletextDocument, &TeletextDocument::refreshNeeded, this, &TeletextWidget::refreshPage);
+	connect(m_teletextDocument, &TeletextDocument::colourChanged, &m_pageRender, &TeletextPageRender::colourChanged);
 }
 
 TeletextWidget::~TeletextWidget()
@@ -85,20 +89,15 @@ 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);
-
-void TeletextWidget::refreshRow(int rowChanged)
-{
-	m_pageRender.renderPage(rowChanged);
 	update();
 }
 
 void TeletextWidget::refreshPage()
 {
-	m_pageRender.decodePage();
+	m_pageDecode.decodePage();
-	m_pageRender.renderPage();
 	update();
 }
 
@@ -107,11 +106,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.drawImage(m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(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.drawImage(0, 0, *m_pageRender.image(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.drawImage(480+m_pageDecode.leftSidePanelColumns()*12, 0, *m_pageRender.image(m_flashPhase), 480, 0, m_pageDecode.rightSidePanelColumns()*12, 250);
 }
 
 void TeletextWidget::updateFlashTimer(int newFlashTimer)
@@ -155,15 +155,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 +177,9 @@ 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);
+		update();
 	}
 }
 
@@ -186,37 +193,6 @@ void TeletextWidget::setDefaultNOS(int newDefaultNOS)
 	m_levelOnePage->setDefaultNOS(newDefaultNOS);
 }
 
-void TeletextWidget::setDefaultScreenColour(int newColour)
-{
-	m_levelOnePage->setDefaultScreenColour(newColour);
-	m_pageRender.decodePage();
-	m_pageRender.renderPage();
-}
-
-void TeletextWidget::setDefaultRowColour(int newColour)
-{
-	m_levelOnePage->setDefaultRowColour(newColour);
-	m_pageRender.decodePage();
-	m_pageRender.renderPage();
-	update();
-}
-
-void TeletextWidget::setColourTableRemap(int newMap)
-{
-	m_levelOnePage->setColourTableRemap(newMap);
-	m_pageRender.decodePage();
-	m_pageRender.renderPage();
-	update();
-}
-
-void TeletextWidget::setBlackBackgroundSubst(bool substOn)
-{
-	m_levelOnePage->setBlackBackgroundSubst(substOn);
-	m_pageRender.decodePage();
-	m_pageRender.renderPage();
-	update();
-}
-
 void TeletextWidget::setSidePanelWidths(int newLeftSidePanelColumns, int newRightSidePanelColumns)
 {
 	m_levelOnePage->setLeftSidePanelDisplayed(newLeftSidePanelColumns != 0);
@@ -225,18 +201,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 +221,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.level1MosaicAttr(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 +259,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 +302,9 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 					case mosaicNativeScanCodes[8]:
 						toggleCharacterBit(0x20); // Clear all
 						break;
+					case mosaicNativeScanCodes[9]:
+						toggleCharacterBit(0x66); // Dither
+						break;
 				}
 				return;
 			} else
@@ -337,6 +319,7 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		setCharacter(mappedKeyPress);
 		return;
 	}
+
 	switch (event->key()) {
 		case Qt::Key_Backspace:
 			m_teletextDocument->undoStack()->push(new BackspaceKeyCommand(m_teletextDocument, m_insertMode));
@@ -352,15 +335,27 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 			break;
 
 		case Qt::Key_Up:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorUp(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Down:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorDown(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Left:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorLeft(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Right:
+			if (event->modifiers() & Qt::ControlModifier)
+				shiftMosaics(event->key());
+			else
 				m_teletextDocument->cursorRight(event->modifiers() & Qt::ShiftModifier);
 			break;
 		case Qt::Key_Return:
@@ -381,11 +376,6 @@ void TeletextWidget::keyPressEvent(QKeyEvent *event)
 		case Qt::Key_PageDown:
 			m_teletextDocument->selectSubPagePrevious();
 			break;
-		case Qt::Key_F5:
-			m_pageRender.decodePage();
-			m_pageRender.renderPage();
-			update();
-			break;
 		default:
 			QFrame::keyPressEvent(event);
 	}
@@ -401,10 +391,40 @@ void TeletextWidget::toggleCharacterBit(unsigned char bitToToggle)
 	m_teletextDocument->undoStack()->push(new ToggleMosaicBitCommand(m_teletextDocument, bitToToggle));
 }
 
+void TeletextWidget::shiftMosaics(int key)
+{
+	if (!m_teletextDocument->selectionActive())
+		return;
+
+	QSet<QPair<int, int>> mosaicList;
+
+	for (int r=m_teletextDocument->selectionTopRow(); r<=m_teletextDocument->selectionBottomRow(); r++)
+		for (int c=m_teletextDocument->selectionLeftColumn(); c<=m_teletextDocument->selectionRightColumn(); c++)
+			if (m_pageDecode.level1MosaicChar(r, c))
+				mosaicList.insert(qMakePair(r, c));
+
+	if (!mosaicList.isEmpty())
+		switch (key) {
+			case Qt::Key_Up:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsUpCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Down:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsDownCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Left:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsLeftCommand(m_teletextDocument, mosaicList));
+				break;
+			case Qt::Key_Right:
+				m_teletextDocument->undoStack()->push(new ShiftMosaicsRightCommand(m_teletextDocument, mosaicList));
+				break;
+		}
+}
+
 void TeletextWidget::selectionToClipboard()
 {
 	QByteArray nativeData;
 	QString plainTextData;
+	QImage *imageData = nullptr;
 	QClipboard *clipboard = QApplication::clipboard();
 
 	nativeData.resize(2 + m_teletextDocument->selectionWidth() * m_teletextDocument->selectionHeight());
@@ -420,9 +440,34 @@ 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), QChar(m_teletextDocument->currentSubPage()->character(r, c))));
 			else
 				plainTextData.append(' ');
+
+			if (m_pageDecode.level1MosaicChar(r, c)) {
+				// A first mosaic character was found so create the image "just in time"
+				if (imageData == nullptr) {
+					imageData = new QImage(m_teletextDocument->selectionWidth() * 2, m_teletextDocument->selectionHeight() * 3, QImage::Format_Mono);
+
+					imageData->fill(0);
+				}
+
+				const int ix = (c - m_teletextDocument->selectionLeftColumn()) * 2;
+				const int iy = (r - m_teletextDocument->selectionTopRow()) * 3;
+
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x01)
+					imageData->setPixel(ix, iy, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x02)
+					imageData->setPixel(ix+1, iy, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x04)
+					imageData->setPixel(ix, iy+1, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x08)
+					imageData->setPixel(ix+1, iy+1, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x10)
+					imageData->setPixel(ix, iy+2, 1);
+				if (m_teletextDocument->currentSubPage()->character(r, c) & 0x40)
+					imageData->setPixel(ix+1, iy+2, 1);
+			}
 		}
 
 		plainTextData.append('\n');
@@ -431,6 +476,11 @@ void TeletextWidget::selectionToClipboard()
 	QMimeData *mimeData = new QMimeData();
 	mimeData->setData("application/x-teletext", nativeData);
 	mimeData->setText(plainTextData);
+	if (imageData != nullptr) {
+		mimeData->setImageData(*imageData);
+		delete imageData;
+	}
+
 	clipboard->setMimeData(mimeData);
 }
 
@@ -453,13 +503,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 +705,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 +733,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 +760,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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 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"
@@ -42,16 +43,18 @@ class TeletextWidget : public QFrame
 public:
 	TeletextWidget(QFrame *parent = 0);
 	~TeletextWidget();
-	void setCharacter(unsigned char);
+	void setCharacter(unsigned char newCharacter);
-	void toggleCharacterBit(unsigned char);
+	void toggleCharacterBit(unsigned char bitToToggle);
 	bool insertMode() const { return m_insertMode; };
-	void setInsertMode(bool);
+	void setInsertMode(bool insertMode);
+	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 *);
+	void inputMethodEvent(QInputMethodEvent *event);
 
 	TeletextDocument* document() const { return m_teletextDocument; }
+	TeletextPageDecode *pageDecode() { return &m_pageDecode; }
 	TeletextPageRender *pageRender() { return &m_pageRender; }
 
 signals:
@@ -61,21 +64,17 @@ signals:
 public slots:
 	void subPageSelected();
 	void refreshPage();
-	void toggleReveal(bool);
+	void setReveal(bool reveal);
-	void toggleMix(bool);
+	void setMix(bool mix);
-	void updateFlashTimer(int);
+	void setShowControlCodes(bool showControlCodes);
-	void pauseFlash(bool);
+	void updateFlashTimer(int newFlashTimer);
-	void refreshRow(int);
+	void pauseFlash(bool pauseNow);
 
-	void setControlBit(int, bool);
+	void setControlBit(int bitNumber, bool active);
-	void setDefaultCharSet(int);
+	void setDefaultCharSet(int newDefaultCharSet);
-	void setDefaultNOS(int);
+	void setDefaultNOS(int newDefaultNOS);
-	void setDefaultScreenColour(int);
+	void setSidePanelWidths(int newLeftSidePanelColumns, int newRightSidePanelColumns);
-	void setDefaultRowColour(int);
+	void setSidePanelAtL35Only(bool newSidePanelAtL35Only);
-	void setColourTableRemap(int);
-	void setBlackBackgroundSubst(bool);
-	void setSidePanelWidths(int, int);
-	void setSidePanelAtL35Only(bool);
 
 	void cut();
 	void copy();
@@ -92,6 +91,7 @@ protected:
 	void focusInEvent(QFocusEvent *event) override;
 	void focusOutEvent(QFocusEvent *event) override;
 
+	TeletextPageDecode m_pageDecode;
 	TeletextPageRender m_pageRender;
 
 private:
@@ -102,9 +102,10 @@ private:
 	int m_flashTiming, m_flashPhase;
 
 	void timerEvent(QTimerEvent *event) override;
+	void shiftMosaics(int key);
 	void selectionToClipboard();
 
-	QPair<int, int> mouseToRowAndColumn(const QPoint &);
+	QPair<int, int> mouseToRowAndColumn(const QPoint &mousePosition);
 };
 
 class LevelOneScene : public QGraphicsScene
@@ -112,25 +113,29 @@ class LevelOneScene : public QGraphicsScene
 	Q_OBJECT
 
 public:
-	LevelOneScene(QWidget *, QObject *parent = nullptr);
+	LevelOneScene(QWidget *levelOneWidget, QObject *parent = nullptr);
-	void setBorderDimensions(int, int, int, int, int);
+	void setBorderDimensions(int sceneWidth, int sceneHeight, int widgetWidth, int leftSidePanelColumns, int rightSidePanelColumns);
 	QGraphicsRectItem *cursorRectItem() const { return m_cursorRectItem; }
 
 public slots:
 	void updateCursor();
 	void updateSelection();
-	void toggleGrid(bool);
+	void setMix(bool mix);
-	void hideGUIElements(bool);
+	void toggleGrid(bool gridOn);
-	void setFullScreenColour(const QColor &);
+	void hideGUIElements(bool hidden);
-	void setFullRowColour(int, const QColor &);
+	void setFullScreenColour(const QColor &newColor);
+	void setFullRowColour(int row, const QColor &newColor);
 
 signals:
 	void mouseZoomIn();
 	void mouseZoomOut();
 
-private:
+protected:
-	bool eventFilter(QObject *, QEvent *);
+	bool eventFilter(QObject *object, QEvent *event);
+	void keyPressEvent(QKeyEvent *event);
+	void keyReleaseEvent(QKeyEvent *keyEvent);
 
+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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,6 +17,7 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <QActionGroup>
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -27,11 +28,12 @@
 #include <QPainter>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSaveFile>
 #include <QScreen>
 #include <QSettings>
 #include <QShortcut>
+#include <QSlider>
 #include <QStatusBar>
 #include <QToolBar>
 #include <QToolButton>
@@ -42,6 +44,7 @@
 #include "levelonecommands.h"
 #include "loadsave.h"
 #include "mainwidget.h"
+#include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
@@ -148,6 +151,34 @@ bool MainWindow::saveAs()
 	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)");
@@ -157,28 +188,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
@@ -213,7 +243,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-2022 Gavin MacGregor<br><br>"
+	"Copyright (C) 2020-2024 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()));
 }
@@ -234,6 +264,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);
 
@@ -247,7 +279,7 @@ void MainWindow::init()
 	if (m_viewSmoothTransform)
 		m_textView->setRenderHints(QPainter::SmoothPixmapTransform);
 	m_textView->setBackgroundBrush(QBrush(QColor(32, 48, 96)));
-	setSceneDimensions();
+	m_zoomSlider->setValue(m_viewZoom);
 	setCentralWidget(m_textView);
 
 	connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition);
@@ -255,9 +287,10 @@ void MainWindow::init()
 	connect(m_textWidget->document()->undoStack(), &QUndoStack::cleanChanged, this, [=]() { setWindowModified(!m_textWidget->document()->undoStack()->isClean()); } );
 	connect(m_textWidget->document(), &TeletextDocument::aboutToChangeSubPage, m_x26DockWidget, &X26DockWidget::unloadX26List);
 	connect(m_textWidget->document(), &TeletextDocument::subPageSelected, this, &MainWindow::updatePageWidgets);
+	connect(m_textWidget->document(), &TeletextDocument::pageOptionsChanged, 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);
@@ -321,6 +354,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->setShortcut(QKeySequence(Qt::Key_F5));
+	reloadAct->setStatusTip(tr("Reload the document from disk"));
+
 	fileMenu->addSeparator();
 
 	QMenu *recentMenu = fileMenu->addMenu(tr("Recent"));
@@ -336,9 +374,16 @@ void MainWindow::createActions()
 
 	setRecentFilesVisible(MainWindow::hasRecentFiles());
 
+	m_exportAutoAct = fileMenu->addAction(tr("Export subpage..."));
+	m_exportAutoAct->setEnabled(false);
+	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, &MainWindow::exportT42);
+	connect(exportT42Act, &QAction::triggered, this, [=]() { exportT42(false); });
 
 	QMenu *exportHashStringSubMenu = fileMenu->addMenu(tr("Export subpage to online editor"));
 
@@ -418,17 +463,17 @@ void MainWindow::createActions()
 #endif // !QT_NO_CLIPBOARD
 
 	QAction *insertBlankRowAct = editMenu->addAction(tr("Insert blank row"));
-	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I));
+	insertBlankRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
 	insertBlankRowAct->setStatusTip(tr("Insert a blank row at the cursor position"));
 	connect(insertBlankRowAct, &QAction::triggered, [=]() { insertRow(false); } );
 
 	QAction *insertCopyRowAct = editMenu->addAction(tr("Insert copy row"));
-	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
+	insertCopyRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_I));
 	insertCopyRowAct->setStatusTip(tr("Insert a row that's a copy of the row at the cursor position"));
 	connect(insertCopyRowAct, &QAction::triggered, [=]() { insertRow(true); } );
 
 	QAction *deleteRowAct = editMenu->addAction(tr("Delete row"));
-	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D));
+	deleteRowAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D));
 	deleteRowAct->setStatusTip(tr("Delete the row at the cursor position"));
 	connect(deleteRowAct, &QAction::triggered, this, &MainWindow::deleteRow);
 
@@ -454,27 +499,28 @@ void MainWindow::createActions()
 
 	QAction *revealAct = viewMenu->addAction(tr("&Reveal"));
 	revealAct->setCheckable(true);
-	revealAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+	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->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);
-	gridAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_G));
+	gridAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_G));
 	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();
 
@@ -527,7 +573,7 @@ void MainWindow::createActions()
 	connect(zoomOutAct, &QAction::triggered, this, &MainWindow::zoomOut);
 
 	QAction *zoomResetAct = viewMenu->addAction(tr("Reset zoom"));
-	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0));
+	zoomResetAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
 	zoomResetAct->setStatusTip(tr("Reset zoom level"));
 	connect(zoomResetAct, &QAction::triggered, this, &MainWindow::zoomReset);
 
@@ -539,19 +585,19 @@ void MainWindow::createActions()
 		const char *colours[] = { "Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White" };
 
 		QAction *alphaColour = alphaColourSubMenu->addAction(tr(colours[i]));
-		alphaColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::Key_0 + i));
+		alphaColour->setShortcut(QKeySequence(QString("Esc, %1").arg(i)));
 		alphaColour->setStatusTip(QString("Insert alphanumeric %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(alphaColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i); });
 
 		QAction *mosaicColour = mosaicColourSubMenu->addAction(tr(colours[i]));
-		mosaicColour->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_0 + i));
+		mosaicColour->setShortcut(QKeySequence(QString("Esc, Shift+%1").arg(i)));
 		mosaicColour->setStatusTip(QString("Insert mosaic %1 attribute").arg(QString(colours[i]).toLower()));
 		connect(mosaicColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i+0x10); });
 	}
 
 	QMenu *mosaicsStyleSubMenu = insertMenu->addMenu(tr("Mosaics style"));
 	QAction *mosaicsSeparatedAct = mosaicsStyleSubMenu->addAction(tr("Separated mosaics"));
-	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_S));
+	mosaicsSeparatedAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_S));
 	mosaicsSeparatedAct->setStatusTip(tr("Insert separated mosaics attribute"));
 	connect(mosaicsSeparatedAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1a); });
 	QAction *mosaicsContiguousAct = mosaicsStyleSubMenu->addAction(tr("Contiguous mosaics"));
@@ -561,7 +607,7 @@ void MainWindow::createActions()
 
 	QMenu *mosaicsHoldSubMenu = insertMenu->addMenu(tr("Mosaics hold"));
 	QAction *mosaicsHoldAct = mosaicsHoldSubMenu->addAction(tr("Hold mosaics"));
-	mosaicsHoldAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_H));
+	mosaicsHoldAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_H));
 	mosaicsHoldAct->setStatusTip(tr("Insert hold mosaics attribute"));
 	connect(mosaicsHoldAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1e); });
 	QAction *mosaicsReleaseAct = mosaicsHoldSubMenu->addAction(tr("Release mosaics"));
@@ -571,7 +617,7 @@ void MainWindow::createActions()
 
 	QMenu *backgroundColourSubMenu = insertMenu->addMenu(tr("Background colour"));
 	QAction *backgroundNewAct = backgroundColourSubMenu->addAction(tr("New background"));
-	backgroundNewAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_N));
+	backgroundNewAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_N));
 	backgroundNewAct->setStatusTip(tr("Insert new background attribute"));
 	connect(backgroundNewAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1d); });
 	QAction *backgroundBlackAct = backgroundColourSubMenu->addAction(tr("Black background"));
@@ -585,15 +631,15 @@ void MainWindow::createActions()
 	textSizeNormalAct->setStatusTip(tr("Insert normal size attribute"));
 	connect(textSizeNormalAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0c); });
 	QAction *textSizeDoubleHeightAct = textSizeSubMenu->addAction(tr("Double height"));
-	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleHeightAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleHeightAct->setStatusTip(tr("Insert double height attribute"));
 	connect(textSizeDoubleHeightAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0d); });
 	QAction *textSizeDoubleWidthAct = textSizeSubMenu->addAction(tr("Double width"));
-	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_D));
+	textSizeDoubleWidthAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_D));
 	textSizeDoubleWidthAct->setStatusTip(tr("Insert double width attribute"));
 	connect(textSizeDoubleWidthAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0e); });
 	QAction *textSizeDoubleSizeAct = textSizeSubMenu->addAction(tr("Double size"));
-	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::SHIFT + Qt::Key_D));
+	textSizeDoubleSizeAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::SHIFT | Qt::Key_D));
 	textSizeDoubleSizeAct->setStatusTip(tr("Insert double size attribute"));
 	connect(textSizeDoubleSizeAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0f); });
 
@@ -604,7 +650,7 @@ void MainWindow::createActions()
 
 	QMenu *flashSubMenu = insertMenu->addMenu(tr("Flash"));
 	QAction *flashFlashingAct = flashSubMenu->addAction(tr("Flashing"));
-	flashFlashingAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_F));
+	flashFlashingAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_F));
 	flashFlashingAct->setStatusTip(tr("Insert flashing attribute"));
 	connect(flashFlashingAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x08); });
 	QAction *flashSteadyAct = flashSubMenu->addAction(tr("Steady"));
@@ -614,7 +660,7 @@ void MainWindow::createActions()
 
 	QMenu *boxingSubMenu = insertMenu->addMenu(tr("Box"));
 	QAction *boxingStartAct = boxingSubMenu->addAction(tr("Start box"));
-	boxingStartAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::SHIFT + Qt::Key_X));
+	boxingStartAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::SHIFT | Qt::Key_X));
 	boxingStartAct->setStatusTip(tr("Insert start box attribute"));
 	connect(boxingStartAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0b); });
 	QAction *boxingEndAct = boxingSubMenu->addAction(tr("End box"));
@@ -623,7 +669,7 @@ void MainWindow::createActions()
 	connect(boxingEndAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x0a); });
 
 	QAction *escSwitchAct = insertMenu->addAction(tr("ESC/switch"));
-	escSwitchAct->setShortcut(QKeySequence(Qt::Key_Escape, Qt::CTRL + Qt::Key_S));
+	escSwitchAct->setShortcut(QKeySequence(Qt::NoModifier | Qt::Key_Escape, Qt::CTRL | Qt::Key_S));
 	escSwitchAct->setStatusTip(tr("Insert ESC/switch character set attribute"));
 	connect(escSwitchAct, &QAction::triggered, [=]() { m_textWidget->setCharacter(0x1b); });
 
@@ -633,6 +679,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();
@@ -668,7 +715,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));
 }
 
@@ -720,26 +767,36 @@ void MainWindow::setSmoothTransform(bool smoothTransform)
 
 void MainWindow::zoomIn()
 {
-	if (m_viewZoom < 4)
+	if (m_viewZoom < 4) {
 		m_viewZoom++;
-	else if (m_viewZoom < 12)
+		m_zoomSlider->setValue(m_viewZoom);
+	} else if (m_viewZoom < 12) {
 		m_viewZoom += 2;
-	setSceneDimensions();
+		m_zoomSlider->setValue(m_viewZoom / 2 + 2);
+	}
 }
 
 void MainWindow::zoomOut()
 {
-	if (m_viewZoom > 4)
+	if (m_viewZoom > 4) {
 		m_viewZoom -= 2;
-	else if (m_viewZoom > 0)
+		m_zoomSlider->setValue(m_viewZoom == 4 ? 4 : m_viewZoom / 2 + 2);
+	} else if (m_viewZoom > 0) {
 		m_viewZoom--;
+		m_zoomSlider->setValue(m_viewZoom);
+	}
+}
+
+void MainWindow::zoomSet(int viewZoom)
+{
+	m_viewZoom = (viewZoom < 5) ? viewZoom : (viewZoom - 2) * 2;
 	setSceneDimensions();
 }
 
 void MainWindow::zoomReset()
 {
 	m_viewZoom = 2;
-	setSceneDimensions();
+	m_zoomSlider->setValue(2);
 }
 
 void MainWindow::toggleInsertMode()
@@ -753,33 +810,43 @@ 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_zoomSlider = new QSlider;
+	m_zoomSlider->setOrientation(Qt::Horizontal);
+	m_zoomSlider->setMinimumHeight(m_subPageLabel->height());
+	m_zoomSlider->setMaximumHeight(m_subPageLabel->height());
+	m_zoomSlider->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+	m_zoomSlider->setRange(0, 8);
+	m_zoomSlider->setPageStep(1);
+	m_zoomSlider->setFocusPolicy(Qt::NoFocus);
+	statusBar()->insertWidget(4, m_zoomSlider);
+	connect(m_zoomSlider, &QSlider::valueChanged, this, &MainWindow::zoomSet);
 
 	m_insertModePushButton = new QPushButton("OVERWRITE");
 	m_insertModePushButton->setFlat(true);
+	m_insertModePushButton->setMinimumHeight(m_subPageLabel->height());
+	m_insertModePushButton->setMaximumHeight(m_subPageLabel->height());
 	m_insertModePushButton->setFocusProxy(m_textWidget);
 	statusBar()->addPermanentWidget(m_insertModePushButton);
 	connect(m_insertModePushButton, &QPushButton::clicked, this, &MainWindow::toggleInsertMode);
@@ -795,10 +862,11 @@ 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"));
 }
 
@@ -846,6 +914,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);
 }
@@ -898,14 +968,19 @@ void MainWindow::loadFile(const QString &fileName)
 
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 
-	if (fileInfo.suffix() == "t42")
+	if (fileInfo.suffix() == "t42") {
 		importT42(&file, m_textWidget->document());
-	else
+		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();
@@ -985,6 +1060,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()))
@@ -1015,16 +1102,30 @@ bool MainWindow::saveFile(const QString &fileName)
 	return true;
 }
 
-void MainWindow::exportT42()
+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 = m_curFile;
+	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);
@@ -1036,8 +1137,15 @@ void MainWindow::exportT42()
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
 	QApplication::restoreOverrideCursor();
 
-	if (!errorMessage.isEmpty())
+	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()
@@ -1050,7 +1158,7 @@ void MainWindow::exportM29()
 	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) {
+		if (QRegularExpression(("^[Pp]?[1-8][0-9A-Fa-f][0-9A-Fa-f]")).match(exportFileName).hasMatch()) {
 			// Page number forms start of file name, change it to xFF
 			if (exportFileName.at(0) == 'P' || exportFileName.at(0) == 'p') {
 				exportFileName[2] = 'F';
@@ -1129,7 +1237,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);
 }
@@ -1139,9 +1260,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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,16 +21,17 @@
 #define MAINWINDOW_H
 
 #include <QCheckBox>
-#include <QComboBox>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMainWindow>
 #include <QLabel>
 #include <QPushButton>
+#include <QSlider>
 #include <QToolButton>
 
 #include "mainwidget.h"
+#include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
@@ -58,28 +59,32 @@ private slots:
 	void open();
 	bool save();
 	bool saveAs();
-	void exportT42();
+	void reload();
+	void exportAuto();
+	void exportT42(bool fromAuto);
 	void exportZXNet();
 	void exportEditTF();
 	void exportPNG();
 	void exportM29();
 	void updateRecentFileActions();
+	void updateExportAutoAction();
 	void openRecentFile();
 	void about();
 	void updatePageWidgets();
 	void updateCursorPosition();
 
-	void insertRow(bool);
+	void insertRow(bool copyRow);
 	void deleteRow();
-	void insertSubPage(bool, bool);
+	void insertSubPage(bool afterCurrentSubPage, bool copyCurrentSubPage);
 	void deleteSubPage();
 
 	void setSceneDimensions();
-	void setBorder(int);
+	void setBorder(int newViewBorder);
-	void setAspectRatio(int);
+	void setAspectRatio(int newViewAspectRatio);
-	void setSmoothTransform(bool);
+	void setSmoothTransform(bool smoothTransform);
 	void zoomIn();
 	void zoomOut();
+	void zoomSet(int viewZoom);
 	void zoomReset();
 
 	void toggleInsertMode();
@@ -114,10 +119,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];
@@ -125,10 +132,11 @@ private:
 
 	QLabel *m_subPageLabel, *m_cursorPositionLabel;
 	QToolButton *m_previousSubPageButton, *m_nextSubPageButton;
+	QSlider *m_zoomSlider;
 	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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *

pagebase.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,17 +35,17 @@ public:
 
 	virtual bool isEmpty() const;
 
-	virtual QByteArray packet(int) const;
+	virtual QByteArray packet(int i) const;
-	virtual QByteArray packet(int, int) const;
+	virtual QByteArray packet(int i, int j) const;
 	virtual bool packetExists(int i) const { return m_displayPackets[i] != nullptr; }
 	virtual bool packetExists(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; }
-	virtual bool setPacket(int, QByteArray);
+	virtual bool setPacket(int i, QByteArray packetContents);
-	virtual bool setPacket(int, int, QByteArray);
+	virtual bool setPacket(int i, int j, QByteArray packetContents);
 //	bool deletePacket(int);
 //	bool deletePacket(int, int);
 
 	virtual bool controlBit(int bitNumber) const { return m_controlBits[bitNumber]; }
-	virtual bool setControlBit(int, bool);
+	virtual bool setControlBit(int bitNumber, bool active);
 
 private:
 	bool m_controlBits[11];

pagecomposelinksdockwidget.cpp

@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2020-2024 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 <QRegularExpressionValidator>
+#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 QRegularExpressionValidator(QRegularExpression("[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(','), Qt::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-2024 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 <QRegularExpressionValidator>
+#include <QString>
+
+#include "mainwidget.h"
+
+class PageComposeLinksDockWidget : public QDockWidget
+{
+	Q_OBJECT
+
+public:
+	PageComposeLinksDockWidget(TeletextWidget *parent);
+	void updateWidgets();
+
+private:
+	void setComposeLinkPageNumber(int linkNumber, const QString &newPageNumberString);
+	void setComposeLinkSubPageNumbers(int linkNumber, const QString &newSubPagesString);
+
+	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];
+
+	QRegularExpressionValidator *m_pageNumberValidator;
+};
+
+#endif

pageenhancementsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -22,15 +22,12 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
-#include <QLineEdit>
-#include <QMap>
-#include <QPair>
-#include <QRegExpValidator>
 #include <QSpinBox>
-#include <QString>
 
 #include "pageenhancementsdockwidget.h"
 
+#include "x28commands.h"
+
 PageEnhancementsDockWidget::PageEnhancementsDockWidget(TeletextWidget *parent): QDockWidget(parent)
 {
 	QVBoxLayout *pageEnhancementsLayout = new QVBoxLayout;
@@ -39,25 +36,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); });
+	connect(m_defaultScreenColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetFullScreenColourCommand(m_parentMainWidget->document(), 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); });
+	connect(m_defaultRowColourCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetFullRowColourCommand(m_parentMainWidget->document(), 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");
@@ -67,91 +65,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); });
+	connect(m_colourTableCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index){ m_parentMainWidget->document()->undoStack()->push(new SetCLUTRemapCommand(m_parentMainWidget->document(), 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);
+	connect(m_blackBackgroundSubstAct, &QCheckBox::stateChanged, [=](int state){ m_parentMainWidget->document()->undoStack()->push(new SetBlackBackgroundSubstCommand(m_parentMainWidget->document(), state)); });
+
+	// 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);
-
-	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+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");
-		m_composeLinkPageNumberLineEdit[i]->setValidator(m_pageNumberValidator);
-		x27Layout->addWidget(m_composeLinkPageNumberLineEdit[i], i+(i<4 ? 1 : 2), 3, 1, 1);
-		connect(m_composeLinkPageNumberLineEdit[i], &QLineEdit::textEdited, [=](QString value) { setComposeLinkPageNumber(i, value); } );
-
-		// 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);
 
@@ -181,60 +132,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;
@@ -268,64 +165,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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -23,10 +23,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDockWidget>
-#include <QLineEdit>
-#include <QRegExpValidator>
 #include <QSpinBox>
-#include <QString>
 
 #include "mainwidget.h"
 
@@ -39,21 +36,13 @@ public:
 	void updateWidgets();
 
 private:
-	void setLeftSidePanelWidth(int);
+	void setLeftSidePanelWidth(int newLeftPanelSize);
-	void setRightSidePanelWidth(int);
+	void setRightSidePanelWidth(int newRightPanelSize);
-	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];
-
-	QRegExpValidator *m_pageNumberValidator;
 };
 
 #endif

pageoptionsdockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 #include <QVBoxLayout>
 
@@ -41,7 +41,7 @@ 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);
+	m_pageNumberValidator = new QRegularExpressionValidator(QRegularExpression("[1-8][0-9A-Fa-f][0-9A-Fa-f]"), this);
 
 	QHBoxLayout *pageNumberLayout = new QHBoxLayout;
 	pageNumberLayout->addWidget(new QLabel(tr("Page number")));
@@ -192,6 +192,9 @@ void PageOptionsDockWidget::updateWidgets()
 	m_defaultNOSCombo->setCurrentIndex(m_defaultNOSCombo->findData((m_parentMainWidget->document()->currentSubPage()->defaultCharSet() << 3) | m_parentMainWidget->document()->currentSubPage()->defaultNOS()));
 	m_defaultNOSCombo->blockSignals(false);
 	m_secondRegionCombo->blockSignals(true);
+	if (m_parentMainWidget->document()->currentSubPage()->secondCharSet() == 15)
+		m_secondRegionCombo->setCurrentIndex(0);
+	else
 		m_secondRegionCombo->setCurrentText(QString::number(m_parentMainWidget->document()->currentSubPage()->secondCharSet()));
 	m_secondRegionCombo->blockSignals(false);
 	m_secondNOSCombo->blockSignals(true);

pageoptionsdockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -24,7 +24,7 @@
 #include <QComboBox>
 #include <QDockWidget>
 #include <QLineEdit>
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 #include <QSpinBox>
 
 #include "mainwidget.h"
@@ -46,10 +46,10 @@ private:
 	QComboBox *m_defaultRegionCombo, *m_defaultNOSCombo, *m_secondRegionCombo, *m_secondNOSCombo;
 	QLineEdit *m_fastTextEdit[6];
 
-	QRegExpValidator *m_pageNumberValidator;
+	QRegularExpressionValidator *m_pageNumberValidator;
 
-	void addRegionList(QComboBox *);
+	void addRegionList(QComboBox *regionCombo);
-	void setFastTextLinkPageNumber(int, const QString &);
+	void setFastTextLinkPageNumber(int linkNumber, const QString &pageNumberString);
 	void setDefaultRegion();
 	void setDefaultNOS();
 	void setSecondRegion();

pagex26base.cpp

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

pagex26base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,8 +35,8 @@ public:
 	virtual int maxEnhancements() const =0;
 
 protected:
-	QByteArray packetFromEnhancementList(int) const;
+	QByteArray packetFromEnhancementList(int packetNumber) const;
-	void setEnhancementListFromPacket(int, QByteArray);
+	void setEnhancementListFromPacket(int packetNumber, QByteArray packetContents);
 	bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; };
 
 	X26TripletList m_enhancements;

palettedockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -28,7 +28,7 @@
 
 #include "palettedockwidget.h"
 
-#include "levelonecommands.h"
+#include "x28commands.h"
 #include "document.h"
 #include "mainwidget.h"
 
@@ -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));
-	else
+		// Check if CLUTs 0 and 1 are all default if necessary
+		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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,19 +35,23 @@ public:
 	void updateAllColourButtons();
 
 public slots:
-	void updateColourButton(int);
+	void updateColourButton(int colourIndex);
+	void setLevel3p5Accepted(bool b);
 
 protected:
-	void showEvent(QShowEvent *);
+	void showEvent(QShowEvent *event);
 
 private slots:
-	void selectColour(int);
+	void selectColour(int colourIndex);
+	void setLevel3p5Seen(bool b);
+	void updateLevel3p5Cursor();
 
 private:
-	void resetCLUT(int);
+	void resetCLUT(int colourTable);
 
 	QPushButton *m_colourButton[32], *m_resetButton[4];
 	QCheckBox *m_showHexValuesCheckBox;
+	bool m_level3p5Accepted, m_level3p5Seen;
 
 	TeletextWidget *m_parentMainWidget;
 };

qteletextmaker.pro

@@ -1,7 +1,8 @@
 QT += widgets
 requires(qtConfig(filedialog))
 
-HEADERS       = document.h \
+HEADERS       = decode.h \
+                document.h \
                 hamming.h \
                 keymap.h \
                 levelonecommands.h \
@@ -11,15 +12,19 @@ HEADERS       = document.h \
                 mainwindow.h \
                 pagebase.h \
                 pagex26base.h \
+                pagecomposelinksdockwidget.h \
                 pageenhancementsdockwidget.h \
                 pageoptionsdockwidget.h \
                 palettedockwidget.h \
                 render.h \
                 x26commands.h \
                 x26dockwidget.h \
+                x26menus.h \
                 x26model.h \
-                x26triplets.h
+                x26triplets.h \
-SOURCES       = document.cpp \
+                x28commands.h
+SOURCES       = decode.cpp \
+                document.cpp \
                 levelonecommands.cpp \
                 levelonepage.cpp \
                 loadsave.cpp \
@@ -28,14 +33,17 @@ SOURCES       = document.cpp \
                 mainwindow.cpp \
                 pagebase.cpp \
                 pagex26base.cpp \
+                pagecomposelinksdockwidget.cpp \
                 pageenhancementsdockwidget.cpp \
                 pageoptionsdockwidget.cpp \
                 palettedockwidget.cpp \
                 render.cpp \
                 x26commands.cpp \
                 x26dockwidget.cpp \
+                x26menus.cpp \
                 x26model.cpp \
-                x26triplets.cpp
+                x26triplets.cpp \
+                x28commands.cpp
 RESOURCES     = qteletextmaker.qrc
 
 # install

render.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,174 +21,27 @@
 #define RENDER_H
 
 #include <QBitmap>
-#include <QMap>
+#include <QColor>
-#include <QMultiMap>
+#include <QIcon>
-#include <QPair>
+#include <QImage>
-#include <vector>
+#include <QPixmap>
 
-#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; }
+
+	QImage *image() const { return s_fontImage; }
+	QPixmap charBitmap(int c, int s) const { return s_fontBitmap->copy((c-32)*12, s*10, 12, 10); }
+	QIcon charIcon(int c, int s) const { return QIcon(charBitmap(c, s)); }
 
 private:
 	static int s_instances;
 	static QBitmap* s_fontBitmap;
+	static QImage* s_fontImage;
 };
 
 class TeletextPageRender : public QObject
@@ -198,67 +51,40 @@ class TeletextPageRender : public QObject
 public:
 	TeletextPageRender();
 	~TeletextPageRender();
-	void decodePage();
+
-	void renderPage();
+	QImage* image(int i) const { return m_pageImage[i]; };
-	void renderPage(int r);
 	bool mix() const { return m_mix; };
-	bool showCodes() const { return m_showCodes; };
+	void setDecoder(TeletextPageDecode *decoder);
-	void setTeletextPage(LevelOnePage *);
+	void renderPage(bool force=false);
-	void updateSidePanels();
+	bool showControlCodes() const { return m_showControlCodes; };
-	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; };
-	int level1CharSet(int r, int c) const { return m_cell[r][c].level1CharSet; };
-	int leftSidePanelColumns() const { return m_leftSidePanelColumns; };
-	int rightSidePanelColumns() const { return m_rightSidePanelColumns; };
 
 public slots:
-	void setReveal(bool);
+	void colourChanged(int index);
-	void setMix(bool);
+	void setReveal(bool reveal);
-	void setShowCodes(bool);
+	void setMix(bool mix);
-	void setRenderLevel(int);
+	void setShowControlCodes(bool showControlCodes);
 
 signals:
-	void fullScreenColourChanged(QColor);
+	void flashChanged(int newFlashHz);
-	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];
+	QImage* m_pageImage[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 QImage, TeletextPageDecode::CharacterFragment);
-	LevelOnePage* m_levelOnePage;
+	inline void drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
-	int m_flashRequired;
+	inline void drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment);
-	int m_fullRowColour[25];
+	inline void drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
-	QColor m_fullRowQColor[25];
+	void renderRow(int r, int ph, bool force=false);
-	int m_flashRow[25];
+	void setRowFlashStatus(int r, int rowFlashHz);
-	bool m_concealRow[25];
-};
 
-static const QMap<int, int> g0CharacterMap {
+	QColor m_foregroundQColor, m_backgroundQColor;
-	{ 0x00, 12 }, { 0x01, 15 }, { 0x02, 22 }, { 0x03, 16 }, { 0x04, 14 }, { 0x05, 19 }, { 0x06, 11 },
+	TeletextPageDecode *m_decoder;
-	{ 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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -68,12 +68,12 @@ void InsertTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
-	else
+
-		m_teletextDocument->emit tripletCommandHighlight(m_row+1);
+	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
 
 void InsertTripletCommand::undo()
@@ -107,7 +107,7 @@ void InsertTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 
@@ -155,7 +155,7 @@ void DeleteTripletCommand::redo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 }
 
 void DeleteTripletCommand::undo()
@@ -189,7 +189,7 @@ void DeleteTripletCommand::undo()
 	if (changingSubPage)
 		m_teletextDocument->emit subPageSelected();
 	else
-		m_teletextDocument->emit refreshNeeded();
+		m_teletextDocument->emit contentsChanged();
 
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
@@ -225,7 +225,7 @@ void EditTripletCommand::redo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_newTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 
 	if (m_firstDo)
 		m_firstDo = false;
@@ -240,7 +240,7 @@ void EditTripletCommand::undo()
 
 	m_teletextDocument->currentSubPage()->enhancements()->replace(m_row, m_oldTriplet);
 	m_x26Model->emit dataChanged(m_x26Model->createIndex(m_row, 0), m_x26Model->createIndex(m_row, 3), {m_role});
-	m_teletextDocument->emit refreshNeeded();
+	m_teletextDocument->emit contentsChanged();
 	m_teletextDocument->emit tripletCommandHighlight(m_row);
 }
 

x26commands.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -29,7 +29,7 @@
 class InsertTripletCommand : public QUndoCommand
 {
 public:
-	InsertTripletCommand(TeletextDocument *, X26Model *, int, int, const X26Triplet, QUndoCommand *parent = 0);
+	InsertTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, const X26Triplet newTriplet, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -45,7 +45,7 @@ private:
 class DeleteTripletCommand : public QUndoCommand
 {
 public:
-	DeleteTripletCommand(TeletextDocument *, X26Model *, int, int, QUndoCommand *parent = 0);
+	DeleteTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int count, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;
@@ -63,7 +63,7 @@ public:
 	enum { Id = 201 };
 	enum EditTripletEnum { ETaddress, ETmode, ETdata };
 
-	EditTripletCommand(TeletextDocument *, X26Model *, int, int, int, int, int, QUndoCommand *parent = 0);
+	EditTripletCommand(TeletextDocument *teletextDocument, X26Model *x26Model, int row, int tripletPart, int bitsToKeep, int newValue, int role, QUndoCommand *parent = 0);
 
 	void redo() override;
 	void undo() override;

x26dockwidget.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -17,6 +17,8 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "x26dockwidget.h"
+
 #include <QAbstractListModel>
 #include <QActionGroup>
 #include <QButtonGroup>
@@ -36,11 +38,12 @@
 #include <QVBoxLayout>
 
 #include "render.h"
-#include "x26dockwidget.h"
+#include "x26menus.h"
 
 CharacterListModel::CharacterListModel(QObject *parent): QAbstractListModel(parent)
 {
 	m_characterSet = 0;
+	m_mosaic = true;
 }
 
 int CharacterListModel::rowCount(const QModelIndex & /*parent*/) const
@@ -56,16 +59,30 @@ QVariant CharacterListModel::data(const QModelIndex &index, int role) const
 	if (role == Qt::DisplayRole)
 		return QString("0x%1").arg(index.row()+0x20, 2, 16);
 
-	if (role == Qt::DecorationRole)
+	if (role == Qt::DecorationRole) {
-		return m_fontBitmap.rawBitmap()->copy(index.row()*12, m_characterSet*10, 12, 10);
+		if (m_mosaic && (index.row()+32) & 0x20)
+			return m_fontBitmap.charBitmap(index.row()+32, 24);
+		else
+			return m_fontBitmap.charBitmap(index.row()+32, m_characterSet);
+	}
 
 	return QVariant();
 }
 
 void CharacterListModel::setCharacterSet(int characterSet)
 {
-	if (characterSet != m_characterSet) {
+	if (characterSet != m_characterSet || m_mosaic) {
 		m_characterSet = characterSet;
+		m_mosaic = false;
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QVector<int>(Qt::DecorationRole));
+	}
+}
+
+void CharacterListModel::setG1AndBlastCharacterSet(int characterSet)
+{
+	if (characterSet != m_characterSet || !m_mosaic) {
+		m_characterSet = characterSet;
+		m_mosaic = true;
 		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QVector<int>(Qt::DecorationRole));
 	}
 }
@@ -133,73 +150,17 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	m_cookedModePushButton = new QPushButton;
 	cookedTripletLayout->addWidget(m_cookedModePushButton);
 
-	auto newModeMenuAction=[&](QMenu *menu, int mode)
-	{
-		QAction *action = menu->addAction(m_x26Model->modeTripletName(mode));
-		connect(action, &QAction::triggered, [=]() { cookedModeMenuSelected(mode); });
-	};
-
 	// Cooked triplet menu
-	m_cookedModeMenu = new QMenu(this);
+	// We connect the menus for both "Insert" buttons at the same time
-	newModeMenuAction(m_cookedModeMenu, 0x04);
+	m_cookedModeMenu = new TripletModeQMenu(this);
-	QMenu *rowTripletSubMenu = m_cookedModeMenu->addMenu(tr("Row triplet"));
+	m_insertBeforeMenu = new TripletModeQMenu(this);
-	newModeMenuAction(rowTripletSubMenu, 0x00);
+	m_insertAfterMenu = new TripletModeQMenu(this);
-	newModeMenuAction(rowTripletSubMenu, 0x01);
+
-	newModeMenuAction(rowTripletSubMenu, 0x07);
+	for (int m=0; m<64; m++) {
-	newModeMenuAction(rowTripletSubMenu, 0x18);
+		connect(static_cast<TripletModeQMenu *>(m_cookedModeMenu)->action(m), &QAction::triggered, [=]() { cookedModeMenuSelected(m); });
-	QMenu *columnTripletSubMenu = m_cookedModeMenu->addMenu(tr("Column triplet"));
+		connect(static_cast<TripletModeQMenu *>(m_insertBeforeMenu)->action(m), &QAction::triggered, [=]() { insertTriplet(m, false); });
-	newModeMenuAction(columnTripletSubMenu, 0x20);
+		connect(static_cast<TripletModeQMenu *>(m_insertAfterMenu)->action(m), &QAction::triggered, [=]() { insertTriplet(m, true); });
-	newModeMenuAction(columnTripletSubMenu, 0x23);
+	}
-	newModeMenuAction(columnTripletSubMenu, 0x27);
-	newModeMenuAction(columnTripletSubMenu, 0x2c);
-	newModeMenuAction(columnTripletSubMenu, 0x2e);
-	newModeMenuAction(columnTripletSubMenu, 0x28);
-	columnTripletSubMenu->addSeparator();
-	newModeMenuAction(columnTripletSubMenu, 0x29);
-	newModeMenuAction(columnTripletSubMenu, 0x2f);
-	newModeMenuAction(columnTripletSubMenu, 0x21);
-	newModeMenuAction(columnTripletSubMenu, 0x22);
-	newModeMenuAction(columnTripletSubMenu, 0x2b);
-	newModeMenuAction(columnTripletSubMenu, 0x2d);
-	QMenu *diacriticalSubMenu = columnTripletSubMenu->addMenu(tr("G0 diacritical"));
-	for (int i=0; i<16; i++)
-		newModeMenuAction(diacriticalSubMenu, 0x30 + i);
-	QMenu *objectSubMenu = m_cookedModeMenu->addMenu(tr("Object"));
-	newModeMenuAction(objectSubMenu, 0x10);
-	newModeMenuAction(objectSubMenu, 0x11);
-	newModeMenuAction(objectSubMenu, 0x12);
-	newModeMenuAction(objectSubMenu, 0x13);
-	newModeMenuAction(objectSubMenu, 0x15);
-	newModeMenuAction(objectSubMenu, 0x16);
-	newModeMenuAction(objectSubMenu, 0x17);
-	newModeMenuAction(m_cookedModeMenu, 0x1f);
-	m_cookedModeMenu->addSeparator();
-	QMenu *pdcSubMenu = m_cookedModeMenu->addMenu(tr("PDC/reserved"));
-	newModeMenuAction(pdcSubMenu, 0x08);
-	newModeMenuAction(pdcSubMenu, 0x09);
-	newModeMenuAction(pdcSubMenu, 0x0a);
-	newModeMenuAction(pdcSubMenu, 0x0b);
-	newModeMenuAction(pdcSubMenu, 0x0c);
-	newModeMenuAction(pdcSubMenu, 0x0d);
-	newModeMenuAction(pdcSubMenu, 0x26);
-	QMenu *reservedRowSubMenu = pdcSubMenu->addMenu(tr("Reserved row"));
-	newModeMenuAction(reservedRowSubMenu, 0x02);
-	newModeMenuAction(reservedRowSubMenu, 0x03);
-	newModeMenuAction(reservedRowSubMenu, 0x05);
-	newModeMenuAction(reservedRowSubMenu, 0x06);
-	newModeMenuAction(reservedRowSubMenu, 0x0e);
-	newModeMenuAction(reservedRowSubMenu, 0x0f);
-	newModeMenuAction(reservedRowSubMenu, 0x14);
-	newModeMenuAction(reservedRowSubMenu, 0x19);
-	newModeMenuAction(reservedRowSubMenu, 0x1a);
-	newModeMenuAction(reservedRowSubMenu, 0x1b);
-	newModeMenuAction(reservedRowSubMenu, 0x1c);
-	newModeMenuAction(reservedRowSubMenu, 0x1d);
-	newModeMenuAction(reservedRowSubMenu, 0x1e);
-	QMenu *reservedColumnSubMenu = pdcSubMenu->addMenu(tr("Reserved column"));
-	newModeMenuAction(reservedColumnSubMenu, 0x24);
-	newModeMenuAction(reservedColumnSubMenu, 0x25);
-	newModeMenuAction(reservedColumnSubMenu, 0x26);
 
 	m_cookedModePushButton->setMenu(m_cookedModeMenu);
 
@@ -505,60 +466,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);
@@ -574,30 +545,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();
@@ -615,7 +597,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()
@@ -631,17 +613,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();
 
-	m_cookedModePushButton->setText(m_x26Model->modeTripletName(modeExt));
+	m_cookedModePushButton->setEnabled(true);
+	m_cookedModePushButton->setText(m_modeTripletNames.modeName(modeExt));
 
 	switch (modeExt) {
 		case 0x04: // Set active position
@@ -671,17 +689,30 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 		case 0x22: // G3 character at Level 1.5
 		case 0x29: // G0 character
 		case 0x2b: // G3 character at Level 2.5
-		case 0x2f ... 0x3f: // G2 character, G0 character with diacritical
+		case 0x2f: // G2 character
-			// TODO non-Latin G0 and G2 character sets
+		case 0x30:
+		case 0x31:
+		case 0x32:
+		case 0x33:
+		case 0x34:
+		case 0x35:
+		case 0x36:
+		case 0x37:
+		case 0x38:
+		case 0x39:
+		case 0x3a:
+		case 0x3b:
+		case 0x3c:
+		case 0x3d:
+		case 0x3e:
+		case 0x3f: // G0 character with diacritical
 			m_characterCodeComboBox->blockSignals(true);
-			if (modeExt == 0x22 || modeExt == 0x2b)
+			if (modeExt == 0x21)
+				m_characterListModel.setG1AndBlastCharacterSet(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+3).toInt());
+			else if (modeExt == 0x22 || modeExt == 0x2b)
 				m_characterListModel.setCharacterSet(26);
-			else if (modeExt == 0x2f)
-				m_characterListModel.setCharacterSet(7);
-			else if (modeExt == 0x21)
-				m_characterListModel.setCharacterSet(24);
 			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);
@@ -714,8 +745,12 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 			m_displayAttributeUnderlineCheckBox->blockSignals(false);
 			m_tripletParameterStackedLayout->setCurrentIndex(4);
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
-		case 0x15 ... 0x17: // Define object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			if (index.model()->data(index.model()->index(index.row(), 1), Qt::UserRole).toInt() & 0x04) {
 				// Define object
 				m_objectSourceComboBox->setVisible(false);
@@ -955,14 +990,79 @@ void X26DockWidget::updateModelFromCookedWidget(const int value, const int role)
 	updateAllRawTripletSpinBoxes(m_x26View->currentIndex());
 }
 
-void X26DockWidget::insertTriplet()
+void X26DockWidget::insertTriplet(int modeExt, bool after)
+{
+	QModelIndex index = m_x26View->currentIndex();
+
+	if (index.isValid())
+		insertTriplet(modeExt, index.row()+after);
+	else
+		insertTriplet(modeExt);
+}
+
+void X26DockWidget::insertTriplet(int modeExt, int row)
+{
+	X26Triplet newTriplet(modeExt < 0x20 ? 41 : 0, modeExt & 0x1f, 0);
+
+	if (row != -1) {
+		QModelIndex index = m_x26View->currentIndex();
+
+		if (index.isValid()) {
+			// 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=row-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
+		row = 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(row, 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()
@@ -974,17 +1074,161 @@ void X26DockWidget::deleteTriplet()
 
 void X26DockWidget::customMenuRequested(QPoint pos)
 {
+	QMenu *customMenu = nullptr;
+
 	QModelIndex index = m_x26View->indexAt(pos);
 
-	QMenu *menu = new QMenu(this);
-
-	QAction *insertAct = new QAction("Insert triplet", this);
-	menu->addAction(insertAct);
-	connect(insertAct, &QAction::triggered, this, &X26DockWidget::insertTriplet);
 	if (index.isValid()) {
+		const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
+
+		switch (modeExt) {
+			case 0x11:
+			case 0x12:
+			case 0x13: {  // Invoke Object
+				QMenu *localDefMenu;
+				const QList objectList = m_parentMainWidget->document()->currentSubPage()->enhancements()->objects(modeExt - 0x11);
+
+				for (int i=0; i<objectList.size(); i++) {
+					// Messy way to create submenu only if definitions exist
+					if (i == 0) {
+						customMenu = new QMenu(this);
+						localDefMenu = customMenu->addMenu(tr("Local definition"));
+					}
+
+					const int d = objectList.at(i) / 13;
+					const int t = objectList.at(i) % 13;
+					QAction *action = localDefMenu->addAction(QString("d%1 t%2").arg(d).arg(t));
+					connect(action, &QAction::triggered, [=]() {
+						updateModelFromCookedWidget(0, Qt::UserRole+1);
+						updateModelFromCookedWidget(d, Qt::UserRole+2);
+						updateModelFromCookedWidget(t, Qt::UserRole+3);
+						updateAllCookedTripletWidgets(index);
+					} );
+				}
+			} break;
+			case 0x01: // Full Row colour
+			case 0x07: // Address row 0
+				customMenu = new TripletCLUTQMenu(true, this);
+
+				connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(32), &QAction::triggered, [=]() { updateModelFromCookedWidget(0, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(33), &QAction::triggered, [=]() { updateModelFromCookedWidget(1, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				// fall-through
+			case 0x00: // Full Screen colour
+			case 0x20: // Foreground colour
+			case 0x23: // Background colour
+				if (!customMenu)
+					customMenu = new TripletCLUTQMenu(false, this);
+
+				for (int i=0; i<32; i++) {
+					static_cast<TripletCLUTQMenu *>(customMenu)->setColour(i, m_parentMainWidget->document()->currentSubPage()->CLUTtoQColor(i));
+					connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				}
+				break;
+			case 0x27: // Additional flash functions
+				customMenu = new TripletFlashQMenu(this);
+
+				static_cast<TripletFlashQMenu *>(customMenu)->setModeChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				static_cast<TripletFlashQMenu *>(customMenu)->setRatePhaseChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+2).toInt());
+
+				for (int i=0; i<4; i++)
+					connect(static_cast<TripletFlashQMenu *>(customMenu)->modeAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				for (int i=0; i<6; i++)
+					connect(static_cast<TripletFlashQMenu *>(customMenu)->ratePhaseAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+				break;
+			case 0x2c: // Display attributes
+				customMenu = new TripletDisplayAttrsQMenu(this);
+
+				static_cast<TripletDisplayAttrsQMenu *>(customMenu)->setTextSizeChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				for (int i=0; i<4; i++) {
+					static_cast<TripletDisplayAttrsQMenu *>(customMenu)->setOtherAttrChecked(i, index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+i+2).toBool());
+					connect(static_cast<TripletDisplayAttrsQMenu *>(customMenu)->textSizeAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+					connect(static_cast<TripletDisplayAttrsQMenu *>(customMenu)->otherAttrAction(i), &QAction::toggled, [=](const int checked) { updateModelFromCookedWidget(checked, Qt::UserRole+i+2); updateAllCookedTripletWidgets(index); });
+				}
+				break;
+			case 0x2e: // Font style
+				customMenu = new TripletFontStyleQMenu(this);
+
+				for (int i=0; i<3; i++) {
+					static_cast<TripletFontStyleQMenu *>(customMenu)->setStyleChecked(i, index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+i+1).toBool());
+					connect(static_cast<TripletFontStyleQMenu *>(customMenu)->styleAction(i), &QAction::toggled, [=](const int checked) { updateModelFromCookedWidget(checked, Qt::UserRole+i+1); updateAllCookedTripletWidgets(index); });
+				}
+				static_cast<TripletFontStyleQMenu *>(customMenu)->setRowsChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+4).toInt());
+				for (int i=0; i<8; i++)
+					connect(static_cast<TripletFontStyleQMenu *>(customMenu)->rowsAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+4); updateAllCookedTripletWidgets(index); });
+				break;
+			case 0x21: // G1 mosaic character
+				customMenu = new TripletCharacterQMenu(m_x26Model->data(index.model()->index(index.row(), 2), Qt::UserRole+3).toInt(), true, this);
+				// fall-through
+			case 0x22: // G3 mosaic character at level 1.5
+			case 0x2b: // G3 mosaic character at level >=2.5
+			case 0x29: // G0 character
+			case 0x2f: // G2 character
+			case 0x30:
+			case 0x31:
+			case 0x32:
+			case 0x33:
+			case 0x34:
+			case 0x35:
+			case 0x36:
+			case 0x37:
+			case 0x38:
+			case 0x39:
+			case 0x3a:
+			case 0x3b:
+			case 0x3c:
+			case 0x3d:
+			case 0x3e:
+			case 0x3f: // G0 character with diacritical
+				if (!customMenu)
+					customMenu = new TripletCharacterQMenu(m_x26Model->data(index.model()->index(index.row(), 2), Qt::UserRole+2).toInt(), false, this);
+
+				for (int i=0; i<96; i++)
+					connect(static_cast<TripletCharacterQMenu *>(customMenu)->action(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i+32, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				break;
+		}
+
+		if (customMenu)
+			customMenu->addSeparator();
+		else
+			customMenu = new QMenu(this);
+
+		TripletModeQMenu *modeChangeMenu = new TripletModeQMenu(this);
+		modeChangeMenu->setTitle(tr("Change triplet mode"));
+		customMenu->addMenu(modeChangeMenu);
+
+		customMenu->addSeparator();
+
+		TripletModeQMenu *insertBeforeQMenu = new TripletModeQMenu(this);
+		insertBeforeQMenu->setTitle(tr("Insert before"));
+		customMenu->addMenu(insertBeforeQMenu);
+
+		TripletModeQMenu *insertAfterQMenu = new TripletModeQMenu(this);
+		insertAfterQMenu->setTitle(tr("Insert after"));
+		customMenu->addMenu(insertAfterQMenu);
+
+		for (int i=0; i<64; i++) {
+			connect(static_cast<TripletModeQMenu *>(modeChangeMenu)->action(i), &QAction::triggered, [=]() { cookedModeMenuSelected(i); });
+			connect(static_cast<TripletModeQMenu *>(insertBeforeQMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, false); });
+			connect(static_cast<TripletModeQMenu *>(insertAfterQMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, true); });
+		}
+
+		QAction *insertCopyAct = new QAction(tr("Insert copy"), this);
+		customMenu->addAction(insertCopyAct);
+		connect(insertCopyAct, &QAction::triggered, this, &X26DockWidget::insertTripletCopy);
+
 		QAction *deleteAct = new QAction("Delete triplet", this);
-		menu->addAction(deleteAct);
+		customMenu->addAction(deleteAct);
 		connect(deleteAct, &QAction::triggered, this, &X26DockWidget::deleteTriplet);
+	} else {
+		customMenu = new QMenu(this);
+
+		TripletModeQMenu *appendModeMenu = new TripletModeQMenu(this);
+		appendModeMenu->setTitle(tr("Append"));
+		customMenu->addMenu(appendModeMenu);
+
+		for (int i=0; i<64; i++)
+			connect(static_cast<TripletModeQMenu *>(appendModeMenu)->action(i), &QAction::triggered, [=]() { insertTriplet(i, m_x26Model->rowCount()); });
 	}
-	menu->popup(m_x26View->viewport()->mapToGlobal(pos));
+
+	customMenu->popup(m_x26View->viewport()->mapToGlobal(pos));
 }

x26dockwidget.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -35,6 +35,7 @@
 
 #include "mainwidget.h"
 #include "render.h"
+#include "x26menus.h"
 #include "x26model.h"
 
 class CharacterListModel : public QAbstractListModel
@@ -46,11 +47,13 @@ public:
 
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	void setCharacterSet(int);
+	void setCharacterSet(int characterSet);
+	void setG1AndBlastCharacterSet(int characterSet);
 
 private:
 	TeletextFontBitmap m_fontBitmap;
 	int m_characterSet;
+	bool m_mosaic;
 };
 
 class X26DockWidget : public QDockWidget
@@ -61,23 +64,25 @@ public:
 	X26DockWidget(TeletextWidget *parent);
 
 public slots:
-	void insertTriplet();
+	void insertTriplet(int modeExt, bool after);
+	void insertTriplet(int modeExt, int row = -1);
+	void insertTripletCopy();
 	void deleteTriplet();
 	void customMenuRequested(QPoint pos);
 	void loadX26List();
 	void unloadX26List();
-	void rowClicked(const QModelIndex &);
+	void rowSelected(const QModelIndex &current, const QModelIndex &previous);
-	void updateAllRawTripletSpinBoxes(const QModelIndex &);
+	void updateAllRawTripletSpinBoxes(const QModelIndex &index);
-	void updateRawTripletDataSpinBox(const QModelIndex &);
+	void updateRawTripletDataSpinBox(const QModelIndex &index);
-	void updateAllCookedTripletWidgets(const QModelIndex &);
+	void updateAllCookedTripletWidgets(const QModelIndex & index);
-	void rawTripletAddressSpinBoxChanged(int);
+	void rawTripletAddressSpinBoxChanged(int value);
-	void rawTripletModeSpinBoxChanged(int);
+	void rawTripletModeSpinBoxChanged(int value);
-	void rawTripletDataSpinBoxChanged(int);
+	void rawTripletDataSpinBoxChanged(int value);
-	void cookedRowSpinBoxChanged(const int);
+	void cookedRowSpinBoxChanged(const int value);
-	void cookedColumnSpinBoxChanged(const int);
+	void cookedColumnSpinBoxChanged(const int value);
-	void cookedModeMenuSelected(const int);
+	void cookedModeMenuSelected(const int value);
-	void updateModelFromCookedWidget(const int, const int);
+	void updateModelFromCookedWidget(const int value, const int role);
-	void selectX26ListRow(int);
+	void selectX26ListRow(int row);
 
 protected:
 	void keyPressEvent(QKeyEvent *event) override;
@@ -87,7 +92,7 @@ private:
 	QTableView *m_x26View;
 	X26Model *m_x26Model;
 	QSpinBox *m_cookedRowSpinBox, *m_cookedColumnSpinBox;
-	QMenu *m_cookedModeMenu;
+	QMenu *m_cookedModeMenu, *m_insertBeforeMenu, *m_insertAfterMenu;
 	QPushButton *m_cookedModePushButton;
 	QSpinBox *m_rawTripletAddressSpinBox, *m_rawTripletModeSpinBox, *m_rawTripletDataSpinBox;
 	QStackedLayout *m_rawOrCookedStackedLayout;
@@ -113,9 +118,14 @@ private:
 	QSpinBox *m_reservedPDCSpinBox;
 	QComboBox *m_terminationMarkerPageTypeComboBox;
 	QCheckBox *m_terminationMarkerMoreFollowsCheckBox;
-	QPushButton *m_insertPushButton, *m_deletePushButton;
+	QPushButton *m_insertBeforePushButton, *m_insertAfterPushButton, *m_insertCopyPushButton, *m_deletePushButton;
+
+	ModeTripletNames m_modeTripletNames;
 
 	TeletextWidget *m_parentMainWidget;
+
+	void disableTripletWidgets();
+
 };
 
 #endif

x26menus.cpp

@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2020-2024 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 "x26menus.h"
+
+#include <QActionGroup>
+#include <QColor>
+#include <QIcon>
+#include <QMenu>
+#include <QPixmap>
+#include <QString>
+
+#include "render.h"
+
+TripletModeQMenu::TripletModeQMenu(QWidget *parent): QMenu(parent)
+{
+	addModeAction(this, 0x04);
+
+	QMenu *rowTripletSubMenu = this->addMenu(tr("Row triplet"));
+	addModeAction(rowTripletSubMenu, 0x00);
+	addModeAction(rowTripletSubMenu, 0x01);
+	addModeAction(rowTripletSubMenu, 0x07);
+	addModeAction(rowTripletSubMenu, 0x18);
+
+	QMenu *columnTripletSubMenu = this->addMenu(tr("Column triplet"));
+	addModeAction(columnTripletSubMenu, 0x20);
+	addModeAction(columnTripletSubMenu, 0x23);
+	addModeAction(columnTripletSubMenu, 0x27);
+	addModeAction(columnTripletSubMenu, 0x2c);
+	addModeAction(columnTripletSubMenu, 0x2e);
+	addModeAction(columnTripletSubMenu, 0x28);
+	columnTripletSubMenu->addSeparator();
+	addModeAction(columnTripletSubMenu, 0x29);
+	addModeAction(columnTripletSubMenu, 0x2f);
+	addModeAction(columnTripletSubMenu, 0x21);
+	addModeAction(columnTripletSubMenu, 0x22);
+	addModeAction(columnTripletSubMenu, 0x2b);
+	addModeAction(columnTripletSubMenu, 0x2d);
+
+	QMenu *diacriticalSubMenu = columnTripletSubMenu->addMenu(tr("G0 diacritical"));
+	for (int i=0; i<16; i++)
+		addModeAction(diacriticalSubMenu, 0x30 + i);
+
+	QMenu *objectSubMenu = this->addMenu(tr("Object"));
+	addModeAction(objectSubMenu, 0x10);
+	addModeAction(objectSubMenu, 0x11);
+	addModeAction(objectSubMenu, 0x12);
+	addModeAction(objectSubMenu, 0x13);
+	addModeAction(objectSubMenu, 0x15);
+	addModeAction(objectSubMenu, 0x16);
+	addModeAction(objectSubMenu, 0x17);
+	addModeAction(this, 0x1f);
+	this->addSeparator();
+
+	QMenu *pdcSubMenu = this->addMenu(tr("PDC/reserved"));
+	addModeAction(pdcSubMenu, 0x08);
+	addModeAction(pdcSubMenu, 0x09);
+	addModeAction(pdcSubMenu, 0x0a);
+	addModeAction(pdcSubMenu, 0x0b);
+	addModeAction(pdcSubMenu, 0x0c);
+	addModeAction(pdcSubMenu, 0x0d);
+	addModeAction(pdcSubMenu, 0x26);
+
+	QMenu *reservedRowSubMenu = pdcSubMenu->addMenu(tr("Reserved row"));
+	addModeAction(reservedRowSubMenu, 0x02);
+	addModeAction(reservedRowSubMenu, 0x03);
+	addModeAction(reservedRowSubMenu, 0x05);
+	addModeAction(reservedRowSubMenu, 0x06);
+	addModeAction(reservedRowSubMenu, 0x0e);
+	addModeAction(reservedRowSubMenu, 0x0f);
+	addModeAction(reservedRowSubMenu, 0x14);
+	addModeAction(reservedRowSubMenu, 0x19);
+	addModeAction(reservedRowSubMenu, 0x1a);
+	addModeAction(reservedRowSubMenu, 0x1b);
+	addModeAction(reservedRowSubMenu, 0x1c);
+	addModeAction(reservedRowSubMenu, 0x1d);
+	addModeAction(reservedRowSubMenu, 0x1e);
+
+	QMenu *reservedColumnSubMenu = pdcSubMenu->addMenu(tr("Reserved column"));
+	addModeAction(reservedColumnSubMenu, 0x24);
+	addModeAction(reservedColumnSubMenu, 0x25);
+	addModeAction(reservedColumnSubMenu, 0x2a);
+}
+
+void TripletModeQMenu::addModeAction(QMenu *menu, int mode)
+{
+	m_actions[mode] = menu->addAction(m_modeTripletNames.modeName(mode));
+}
+
+
+TripletCLUTQMenu::TripletCLUTQMenu(bool rows, QWidget *parent): QMenu(parent)
+{
+	QMenu *clut[4];
+
+	for (int c=0; c<4; c++) {
+		clut[c] = this->addMenu(QString("CLUT %1").arg(c));
+
+		for (int e=0; e<8; e++)
+			m_actions[c*8+e] = clut[c]->addAction(QString("CLUT %1:%2").arg(c).arg(e));
+	}
+
+	if (rows) {
+		m_actions[32] = this->addAction(tr("This row only"));
+		m_actions[33] = this->addAction(tr("Down to bottom"));
+	}
+}
+
+void TripletCLUTQMenu::setColour(int i, QColor c)
+{
+	QPixmap menuColour(32, 32); // Should get downscaled to the menu text size
+
+	menuColour.fill(c);
+	m_actions[i]->setIcon(QIcon(menuColour));
+}
+
+
+TripletCharacterQMenu::TripletCharacterQMenu(int charSet, bool mosaic, QWidget *parent): QMenu(parent)
+{
+	QMenu *charRange[6];
+
+	for (int r=0; r<6; r++) {
+		charRange[r] = this->addMenu(QString("0x%010-0x%01f").arg(r+2));
+
+		const int charSetInColumn = (mosaic && ((r & 0x2) == 0)) ? 24 : charSet;
+
+		for (int c=0; c<16; c++)
+			m_actions[r*16+c] = charRange[r]->addAction(QIcon(m_fontBitmap.charBitmap(r*16+c+32, charSetInColumn)), QString("0x%1").arg(r*16+c+32, 2, 16, QChar('0')));
+	}
+}
+
+
+TripletFlashQMenu::TripletFlashQMenu(QWidget *parent): QMenu(parent)
+{
+	QMenu *flashModeMenu = this->addMenu(tr("Flash mode"));
+	m_actions[0] = flashModeMenu->addAction(tr("Steady"));
+	m_actions[1] = flashModeMenu->addAction(tr("Normal"));
+	m_actions[2] = flashModeMenu->addAction(tr("Invert"));
+	m_actions[3] = flashModeMenu->addAction(tr("Adjacent CLUT"));
+	m_modeActionGroup = new QActionGroup(this);
+	for (int i=0; i<4; i++) {
+		m_actions[i]->setCheckable(true);
+		m_modeActionGroup->addAction(m_actions[i]);
+	}
+
+	QMenu *flashRatePhaseMenu = this->addMenu(tr("Flash rate/phase"));
+	m_actions[4] = flashRatePhaseMenu->addAction(tr("Slow 1Hz"));
+	m_actions[5] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 1"));
+	m_actions[6] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 2"));
+	m_actions[7] = flashRatePhaseMenu->addAction(tr("Fast 2Hz phase 3"));
+	m_actions[8] = flashRatePhaseMenu->addAction(tr("Fast 2Hz inc/right"));
+	m_actions[9] = flashRatePhaseMenu->addAction(tr("Fast 2Hz dec/left"));
+	m_ratePhaseActionGroup = new QActionGroup(this);
+	for (int i=4; i<10; i++) {
+		m_actions[i]->setCheckable(true);
+		m_ratePhaseActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletFlashQMenu::setModeChecked(int n)
+{
+	m_actions[n]->setChecked(true);
+}
+
+void TripletFlashQMenu::setRatePhaseChecked(int n)
+{
+	m_actions[n+4]->setChecked(true);
+}
+
+
+TripletDisplayAttrsQMenu::TripletDisplayAttrsQMenu(QWidget *parent): QMenu(parent)
+{
+	QMenu *sizeMenu = this->addMenu(tr("Text size"));
+	m_actions[0] = sizeMenu->addAction(tr("Normal size"));
+	m_actions[1] = sizeMenu->addAction(tr("Double height"));
+	m_actions[2] = sizeMenu->addAction(tr("Double width"));
+	m_actions[3] = sizeMenu->addAction(tr("Double size"));
+	m_sizeActionGroup = new QActionGroup(this);
+	for (int i=0; i<4; i++) {
+		m_actions[i]->setCheckable(true);
+		m_sizeActionGroup->addAction(m_actions[i]);
+	}
+
+	m_actions[4] = this->addAction(tr("Boxing/Window"));
+	m_actions[5] = this->addAction(tr("Conceal"));
+	m_actions[6] = this->addAction(tr("Invert"));
+	m_actions[7] = this->addAction(tr("Underline/Separated"));
+	m_otherActionGroup = new QActionGroup(this);
+	m_otherActionGroup->setExclusive(false);
+	for (int i=4; i<8; i++) {
+		m_actions[i]->setCheckable(true);
+		m_otherActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletDisplayAttrsQMenu::setTextSizeChecked(int n)
+{
+	m_actions[n]->setChecked(true);
+}
+
+void TripletDisplayAttrsQMenu::setOtherAttrChecked(int n, bool b)
+{
+	m_actions[n+4]->setChecked(b);
+}
+
+
+TripletFontStyleQMenu::TripletFontStyleQMenu(QWidget *parent): QMenu(parent)
+{
+	m_actions[0] = this->addAction(tr("Proportional"));
+	m_actions[1] = this->addAction(tr("Bold"));
+	m_actions[2] = this->addAction(tr("Italic"));
+	m_styleActionGroup = new QActionGroup(this);
+	m_styleActionGroup->setExclusive(false);
+	for (int i=0; i<3; i++) {
+		m_actions[i]->setCheckable(true);
+		m_styleActionGroup->addAction(m_actions[i]);
+	}
+
+	QMenu *rowsMenu = this->addMenu(tr("Next rows"));
+	m_rowsActionGroup = new QActionGroup(this);
+	for (int i=3; i<11; i++) {
+		m_actions[i] = rowsMenu->addAction(QString("%1").arg(i-3));
+		m_actions[i]->setCheckable(true);
+		m_rowsActionGroup->addAction(m_actions[i]);
+	}
+}
+
+void TripletFontStyleQMenu::setStyleChecked(int n, bool b)
+{
+	m_actions[n]->setChecked(b);
+}
+
+void TripletFontStyleQMenu::setRowsChecked(int n)
+{
+	m_actions[n+3]->setChecked(true);
+}

x26menus.h

@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2020-2024 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 X26MENUS_H
+#define X26MENUS_H
+
+#include <QActionGroup>
+#include <QColor>
+#include <QMenu>
+#include <QString>
+
+#include "render.h"
+
+class ModeTripletNames
+{
+public:
+	static const QString modeName(int i) { return m_modeTripletName[i]; }
+
+private:
+	static inline const QString m_modeTripletName[64] {
+		// Row triplet modes
+		"Full screen colour",
+		"Full row colour",
+		"Reserved 0x02",
+		"Reserved 0x03",
+
+		"Set Active Position",
+		"Reserved 0x05",
+		"Reserved 0x06",
+		"Address row 0",
+
+		"PDC origin, source",
+		"PDC month and day",
+		"PDC cursor and start hour",
+		"PDC cursor and end hour",
+
+		"PDC cursor local offset",
+		"PDC series ID and code",
+		"Reserved 0x0e",
+		"Reserved 0x0f",
+
+		"Origin modifier",
+		"Invoke active object",
+		"Invoke adaptive object",
+		"Invoke passive object",
+
+		"Reserved 0x14",
+		"Define active object",
+		"Define adaptive object",
+		"Define passive object",
+
+		"DRCS mode",
+		"Reserved 0x19",
+		"Reserved 0x1a",
+		"Reserved 0x1b",
+
+		"Reserved 0x1c",
+		"Reserved 0x1d",
+		"Reserved 0x1e",
+		"Termination marker",
+
+		// Column triplet modes
+		"Foreground colour",
+		"G1 block mosaic",
+		"G3 smooth mosaic, level 1.5",
+		"Background colour",
+
+		"Reserved 0x04",
+		"Reserved 0x05",
+		"PDC cursor, start end min",
+		"Additional flash functions",
+
+		"Modified G0/G2 character set",
+		"G0 character",
+		"Reserved 0x0a",
+		"G3 smooth mosaic, level 2.5",
+
+		"Display attributes",
+		"DRCS character",
+		"Font style, level 3.5",
+		"G2 supplementary character",
+
+		"G0 character no diacritical",
+		"G0 character diacritical 1",
+		"G0 character diacritical 2",
+		"G0 character diacritical 3",
+		"G0 character diacritical 4",
+		"G0 character diacritical 5",
+		"G0 character diacritical 6",
+		"G0 character diacritical 7",
+		"G0 character diacritical 8",
+		"G0 character diacritical 9",
+		"G0 character diacritical A",
+		"G0 character diacritical B",
+		"G0 character diacritical C",
+		"G0 character diacritical D",
+		"G0 character diacritical E",
+		"G0 character diacritical F"
+	};
+};
+
+class TripletModeQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletModeQMenu(QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+
+private:
+	void addModeAction(QMenu *menu, int mode);
+
+	QAction *m_actions[64];
+	ModeTripletNames m_modeTripletNames;
+};
+
+class TripletCLUTQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletCLUTQMenu(bool rows, QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+	void setColour(int i, QColor c);
+
+private:
+	QAction *m_actions[34];
+};
+
+class TripletCharacterQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletCharacterQMenu(int charSet, bool mosaic, QWidget *parent = nullptr);
+	QAction *action(int n) const { return m_actions[n]; };
+
+private:
+	QAction *m_actions[96];
+	TeletextFontBitmap m_fontBitmap;
+};
+
+class TripletFlashQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletFlashQMenu(QWidget *parent = nullptr);
+	QAction *modeAction(int n) const { return m_actions[n]; };
+	QAction *ratePhaseAction(int n) const { return m_actions[n+4]; };
+	void setModeChecked(int n);
+	void setRatePhaseChecked(int n);
+
+private:
+	QAction *m_actions[10];
+	QActionGroup *m_modeActionGroup, *m_ratePhaseActionGroup;
+};
+
+class TripletDisplayAttrsQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletDisplayAttrsQMenu(QWidget *parent = nullptr);
+	QAction *textSizeAction(int n) const { return m_actions[n]; };
+	QAction *otherAttrAction(int n) const { return m_actions[n+4]; };
+	void setTextSizeChecked(int n);
+	void setOtherAttrChecked(int n, bool b);
+
+private:
+	QAction *m_actions[8];
+	QActionGroup *m_sizeActionGroup, *m_otherActionGroup;
+};
+
+class TripletFontStyleQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletFontStyleQMenu(QWidget *parent = nullptr);
+	QAction *styleAction(int n) const { return m_actions[n]; };
+	QAction *rowsAction(int n) const { return m_actions[n+3]; };
+	void setStyleChecked(int n, bool b);
+	void setRowsChecked(int n);
+
+private:
+	QAction *m_actions[11];
+	QActionGroup *m_styleActionGroup, *m_rowsActionGroup;
+};
+
+#endif

x26model.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -19,10 +19,11 @@
 
 #include "x26model.h"
 
+#include <QIcon>
 #include <QList>
 
-#include "render.h"
 #include "x26commands.h"
+#include "x26menus.h"
 
 X26Model::X26Model(TeletextWidget *parent): QAbstractListModel(parent)
 {
@@ -65,11 +66,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) {
+		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) {
+		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;
@@ -106,7 +115,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 
 	if (role == Qt::DisplayRole) {
 		if (index.column() == 2)
-			return (m_modeTripletName[triplet.modeExt()]);
+			return (m_modeTripletNames.modeName(triplet.modeExt()));
 		// Column 3 - describe effects of data/address triplet parameters in plain English
 		switch (triplet.modeExt()) {
 			case 0x01: // Full row colour
@@ -126,7 +135,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			case 0x10: // Origin Modifier
 				// For Set Active Position and Origin Modifier, data is the column, so return blank
 				return QVariant();
-			case 0x11 ... 0x13: // Invoke object
+			case 0x11: // Invoke Active Object
+			case 0x12: // Invoke Adaptive Object
+			case 0x13: // Invoke Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return QString("Local: d%1 t%2").arg((triplet.data() >> 4) | ((triplet.address() & 0x01) << 3)).arg(triplet.data() & 0x0f);
@@ -144,7 +155,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				else
 					result.append("1-9");
 				return result;
-			case 0x15 ... 0x17: // Define object
+			case 0x15: // Define Active Object
+			case 0x16: // Define Adaptive Object
+			case 0x17: // Define Passive Object
 				switch (triplet.address() & 0x18) {
 					case 0x08:
 						return "Local: L2.5 only";
@@ -204,7 +217,12 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 						break;
 				}
 				break;
-			case 0x08 ... 0x0d: // PDC
+			case 0x08: // PDC country of origin & programme source
+			case 0x09: // PDC month & day
+			case 0x0a: // PDC cursor row & announced start hour
+			case 0x0b: // PDC cursor row & announced finish hour
+			case 0x0c: // PDC cursor row & local time offset
+			case 0x0d: // PDC series ID & series code
 				return QString("0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 			case 0x20: // Foreground colour
 			case 0x23: // Background colour
@@ -215,7 +233,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			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
+			case 0x2f: // G2 character
 				if (triplet.data() >= 0x20)
 					return QString("0x%1").arg(triplet.data(), 2, 16);
 				break;
@@ -258,7 +276,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,10 +347,14 @@ 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
+			default:
+				if (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f && triplet.data() >= 0x20)
+					// G0 with diacritical
+					return QString("0x%1").arg(triplet.data(), 2, 16);
+				else
+					// Reserved
 					return QString("Reserved 0x%1").arg(triplet.data(), 2, 16, QChar('0'));
 		}
 		// Reserved mode or data
@@ -331,25 +376,26 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				break;
 			case 0x21: // G1 mosaic character
 				if (triplet.data() & 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 24*10, 12, 10);
+					return m_fontBitmap.charIcon(triplet.data(), 24);
+				else if (triplet.data() >= 0x20)
+					// Blast-through
+					return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
 				break;
 			case 0x22: // G3 mosaic character at level 1.5
 			case 0x2b: // G3 mosaic character at level >=2.5
 				if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 26*10, 12, 10);
+					return m_fontBitmap.charIcon(triplet.data(), 26);
 				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);
+					return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
 				break;
-			case 0x29: // G0 character
+			default:
-			case 0x30 ... 0x3f: // G0 diacritical mark
+				if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
-				// TODO non-Latin G0 character sets
+					// G0 character or G0 diacritical mark
 					if (triplet.data() >= 0x20)
-					return m_fontBitmap.rawBitmap()->copy((triplet.data()-32)*12, 0, 12, 10);
+						return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
-				break;
+		}
-		};
 
 	if (role == Qt::EditRole && index.column() == 2)
 		return triplet.modeExt();
@@ -369,7 +415,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 			if (role == Qt::UserRole+1) // Colour index
 				return triplet.data() & 0x1f;
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -393,7 +441,9 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return (triplet.data() & 0x10) >> 4;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					return ((triplet.address() & 0x18) >> 3) - 1;
@@ -421,6 +471,21 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return (triplet.data() & 0x01) == 0x01;
 			}
 			break;
+		case 0x21: // G1 character
+			// Qt::UserRole+1 is character number, returned by default below
+			switch (role) {
+				case Qt::UserRole+2: // G1 character set
+					return 24;
+				case Qt::UserRole+3: // G0 character set for blast-through
+					return m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
+			}
+			break;
+		case 0x22: // G3 character at Level 1.5
+		case 0x2b: // G3 character at Level 2.5
+			// Qt::UserRole+1 is character number, returned by default below
+			if (role == Qt::UserRole+2) // G3 character set
+				return 26;
+			break;
 		case 0x27: // Flash functions
 			switch (role) {
 				case Qt::UserRole+1: // Flash mode
@@ -463,9 +528,20 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 					return triplet.data() >> 4;
 			}
 			break;
+		case 0x2f: // G2 character
+			// Qt::UserRole+1 is character number, returned by default below
+			if (role == Qt::UserRole+2) // Character set
+				return m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
+			break;
+		default:
+			if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
+				// G0 character or G0 diacritical mark
+				// Qt::UserRole+1 is character number, returned by default below
+				if (role == Qt::UserRole+2) // Character set
+					return m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn());
 	};
 
-	// 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();
 
@@ -596,21 +672,12 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if (triplet.data() & 0x78)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x07, 0x00, role));
 						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
-						// Data range 0x20-0x7f
-						if (triplet.data() < 0x20)
-							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
-						break;
 					case 0x27: // Additional flash functions
 						// D6 and D5 must be clear, D4 and D3 set is reserved phase
 						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)
@@ -621,6 +688,20 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 						if ((triplet.data() & 0x3f) >= 48)
 							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x40, 0x77, role));
 						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: // G2 character
+						// Data range 0x20-0x7f
+						if (triplet.data() < 0x20)
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
+						break;
+					default:
+						if (intValue >= 0x30 && intValue <= 0x3f && triplet.data() < 0x20)
+						// G0 diacritical mark
+						// Data range 0x20-0x7f
+							m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0x20, role));
 				}
 				return true;
 		}
@@ -642,7 +723,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					break;
 			}
 			break;
-		case 0x11 ... 0x13: // Invoke object
+		case 0x11: // Invoke Active Object
+		case 0x12: // Invoke Adaptive Object
+		case 0x13: // Invoke Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Object source: Local, POP or GPOP
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));
@@ -672,7 +755,9 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 					return true;
 			}
 			break;
-		case 0x15 ... 0x17: // Define object
+		case 0x15: // Define Active Object
+		case 0x16: // Define Adaptive Object
+		case 0x17: // Define Passive Object
 			switch (role) {
 				case Qt::UserRole+1: // Required at which levels
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x27, (intValue+1) << 3, role));
@@ -797,13 +882,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 +893,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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -21,8 +21,9 @@
 #define X26MODEL_H
 
 #include <QAbstractListModel>
+
 #include "mainwidget.h"
-#include "render.h"
+#include "x26menus.h"
 
 class X26Model : public QAbstractListModel
 {
@@ -30,19 +31,17 @@ class X26Model : public QAbstractListModel
 
 public:
 	X26Model(TeletextWidget *parent);
-	void setX26ListLoaded(bool);
+	void setX26ListLoaded(bool newListLoaded);
 	int rowCount(const QModelIndex &parent = QModelIndex()) const override ;
 	int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 	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;
@@ -53,97 +52,21 @@ private:
 	TeletextWidget *m_parentMainWidget;
 	bool m_listLoaded;
 	TeletextFontBitmap m_fontBitmap;
-
+	ModeTripletNames m_modeTripletNames;
-	const QString m_modeTripletName[64] {
-		// Row triplet modes
-		"Full screen colour",
-		"Full row colour",
-		"Reserved 0x02",
-		"Reserved 0x03",
-
-		"Set Active Position",
-		"Reserved 0x05",
-		"Reserved 0x06",
-		"Address row 0",
-
-		"PDC origin, source",
-		"PDC month and day",
-		"PDC cursor and start hour",
-		"PDC cursor and end hour",
-
-		"PDC cursor local offset",
-		"PDC series ID and code",
-		"Reserved 0x0e",
-		"Reserved 0x0f",
-
-		"Origin modifier",
-		"Invoke active object",
-		"Invoke adaptive object",
-		"Invoke passive object",
-
-		"Reserved 0x14",
-		"Define active object",
-		"Define adaptive object",
-		"Define passive object",
-
-		"DRCS mode",
-		"Reserved 0x19",
-		"Reserved 0x1a",
-		"Reserved 0x1b",
-
-		"Reserved 0x1c",
-		"Reserved 0x1d",
-		"Reserved 0x1e",
-		"Termination marker",
-
-		// Column triplet modes
-		"Foreground colour",
-		"G1 block mosaic",
-		"G3 smooth mosaic, level 1.5",
-		"Background colour",
-
-		"Reserved 0x04",
-		"Reserved 0x05",
-		"PDC cursor, start end min",
-		"Additional flash functions",
-
-		"Modified G0/G2 character set",
-		"G0 character",
-		"Reserved 0x0a",
-		"G3 smooth mosaic, level 2.5",
-
-		"Display attributes",
-		"DRCS character",
-		"Font style, level 3.5",
-		"G2 supplementary character",
-
-		"G0 character no diacritical",
-		"G0 character diacritical 1",
-		"G0 character diacritical 2",
-		"G0 character diacritical 3",
-		"G0 character diacritical 4",
-		"G0 character diacritical 5",
-		"G0 character diacritical 6",
-		"G0 character diacritical 7",
-		"G0 character diacritical 8",
-		"G0 character diacritical 9",
-		"G0 character diacritical A",
-		"G0 character diacritical B",
-		"G0 character diacritical C",
-		"G0 character diacritical D",
-		"G0 character diacritical E",
-		"G0 character diacritical F"
-	};
 
 	struct tripletErrorShow {
 		QString message;
 		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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -69,83 +69,210 @@ void X26Triplet::setObjectLocalIndex(int i)
 }
 
 
-void X26TripletList::updateInternalData(int r)
+void X26TripletList::updateInternalData()
 {
 	ActivePosition activePosition;
 	X26Triplet *triplet;
 
-	if (r != 0) {
+	m_objects[0].clear();
-		activePosition.setRow(m_list[r-1].m_activePositionRow);
+	m_objects[1].clear();
-		activePosition.setColumn(m_list[r-1].m_activePositionColumn);
+	m_objects[2].clear();
-	}
 
-	for (int i=r; i < m_list.size(); i++) {
+	// Check for errors, and fill in where the Active Position goes for Level 2.5 and above
+	for (int i=0; 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 0x15 ... 0x17: // Define Object
+				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: // Invoke Active Object
+				case 0x12: // Invoke Adaptive Object
+				case 0x13: // Invoke Passive 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: // Define Active Object
+				case 0x16: // Define Adaptive Object
+				case 0x17: // Define Passive Object
+					m_objects[triplet->modeExt() - 0x15].append(i);
 					activePosition.reset();
 					// Make sure data field holds correct place of triplet
 					// otherwise the object won't appear
 					triplet->setObjectLocalIndex(i);
 					break;
+				case 0x18: // DRCS mode
+					if ((triplet->m_data & 0x30) == 0x00)
+						triplet->m_reservedData = true;
+				case 0x1f: // Termination marker
+				case 0x08: // PDC country of origin & programme source
+				case 0x09: // PDC month & day
+				case 0x0a: // PDC cursor row & announced start hour
+				case 0x0b: // PDC cursor row & announced finish hour
+				case 0x0c: // PDC cursor row & local time offset
+				case 0x0d: // PDC series ID & series code
+					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;
+		else if (triplet->modeExt() != 0x26 && !activePosition.setColumn(triplet->addressColumn()))
 			triplet->m_error = X26Triplet::ActivePositionMovedLeft;
+		else
+			switch (triplet->modeExt()) {
+				case 0x20: // Foreground colour
+				case 0x23: // Background colour
+					if (triplet->m_data & 0x60)
+						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;
+					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: // G2 character
+					if (triplet->m_data < 0x20)
+						triplet->m_reservedData = true;
+					break;
+				default:
+					if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f && triplet->m_data < 0x20)
+						// G0 diacritical mark
+						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: // G2 character
+				activePosition.setColumn(triplet->addressColumn());
+				break;
+			default:
+				if (triplet->modeExt() >= 0x30 && triplet->modeExt() <= 0x3f)
+					// G0 diacritical mark
+					activePosition.setColumn(triplet->addressColumn());
+		}
+
+		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-2022 Gavin MacGregor
+ * Copyright (C) 2020-2024 Gavin MacGregor
  *
  * This file is part of QTeletextMaker.
  *
@@ -25,14 +25,16 @@
 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);
 
 //	X26Triplet &operator=(const X26Triplet &other);
 
-	X26Triplet(int, int, int);
+	X26Triplet(int address, int mode, int data);
 
 	int address() const { return m_address; }
 	int mode() const { return m_mode; }
@@ -42,39 +44,51 @@ public:
 	int addressColumn() const { return (m_address); }
 	bool isRowTriplet() const { return (m_address >= 40); }
 
-	void setAddress(int);
+	void setAddress(int address);
-	void setMode(int);
+	void setMode(int mode);
-	void setData(int);
+	void setData(int data);
-	void setAddressRow(int);
+	void setAddressRow(int addressRow);
-	void setAddressColumn(int);
+	void setAddressColumn(int addressColumn);
+
+	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 setObjectLocalDesignationCode(int i);
-	void setObjectLocalTripletNumber(int);
+	void setObjectLocalTripletNumber(int i);
-	void setObjectLocalIndex(int);
+	void setObjectLocalIndex(int i);
 
 	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
 {
 public:
-	void append(const X26Triplet &);
+	void append(const X26Triplet &value);
-	void insert(int, const X26Triplet &);
+	void insert(int i, const X26Triplet &value);
-	void removeAt(int);
+	void removeAt(int i);
-	void replace(int, const X26Triplet &);
+	void replace(int i, const X26Triplet &value);
 
 	void removeLast() { m_list.removeLast(); }
 
@@ -82,11 +96,13 @@ public:
 	bool isEmpty() const { return m_list.isEmpty(); }
 	void reserve(int alloc) { m_list.reserve(alloc); }
 	int size() const { return m_list.size(); }
+	const QList<int> &objects(int t) const { return m_objects[t]; };
 
 private:
-	void updateInternalData(int);
+	void updateInternalData();
 
 	QList<X26Triplet> m_list;
+	QList<int> m_objects[3];
 
 	class ActivePosition
 	{

x28commands.cpp

@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2020-2024 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 "x28commands.h"
+
+#include "document.h"
+
+X28Command::X28Command(TeletextDocument *teletextDocument, QUndoCommand *parent) : QUndoCommand(parent)
+{
+	m_teletextDocument = teletextDocument;
+	m_subPageIndex = teletextDocument->currentSubPageIndex();
+}
+
+
+SetFullScreenColourCommand::SetFullScreenColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldColour = teletextDocument->currentSubPage()->defaultScreenColour();
+	m_newColour = newColour;
+
+	setText(QObject::tr("full screen colour"));
+}
+
+void SetFullScreenColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_newColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetFullScreenColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultScreenColour(m_oldColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetFullScreenColourCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetFullScreenColourCommand *newerCommand = static_cast<const SetFullScreenColourCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newColour = newerCommand->m_newColour;
+
+	return true;
+}
+
+
+SetFullRowColourCommand::SetFullRowColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldColour = teletextDocument->currentSubPage()->defaultRowColour();
+	m_newColour = newColour;
+
+	setText(QObject::tr("full row colour"));
+}
+
+void SetFullRowColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_newColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetFullRowColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDefaultRowColour(m_oldColour);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetFullRowColourCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetFullRowColourCommand *newerCommand = static_cast<const SetFullRowColourCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newColour = newerCommand->m_newColour;
+
+	return true;
+}
+
+
+SetCLUTRemapCommand::SetCLUTRemapCommand(TeletextDocument *teletextDocument, int newMap, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldMap = teletextDocument->currentSubPage()->colourTableRemap();
+	m_newMap = newMap;
+
+	setText(QObject::tr("CLUT remapping"));
+}
+
+void SetCLUTRemapCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setColourTableRemap(m_newMap);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetCLUTRemapCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setColourTableRemap(m_oldMap);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetCLUTRemapCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetCLUTRemapCommand *newerCommand = static_cast<const SetCLUTRemapCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	m_newMap = newerCommand->m_newMap;
+
+	return true;
+}
+
+
+SetBlackBackgroundSubstCommand::SetBlackBackgroundSubstCommand(TeletextDocument *teletextDocument, bool newSub, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_oldSub = teletextDocument->currentSubPage()->blackBackgroundSubst();
+	m_newSub = newSub;
+
+	setText(QObject::tr("black background substitution"));
+}
+
+void SetBlackBackgroundSubstCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_newSub);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+void SetBlackBackgroundSubstCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setBlackBackgroundSubst(m_oldSub);
+
+	emit m_teletextDocument->contentsChanged();
+	emit m_teletextDocument->pageOptionsChanged();
+}
+
+bool SetBlackBackgroundSubstCommand::mergeWith(const QUndoCommand *command)
+{
+	const SetBlackBackgroundSubstCommand *newerCommand = static_cast<const SetBlackBackgroundSubstCommand *>(command);
+
+	if (m_subPageIndex != newerCommand->m_subPageIndex)
+		return false;
+
+	setObsolete(true);
+	return true;
+}
+
+
+SetColourCommand::SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_colourIndex = colourIndex;
+	m_oldColour = teletextDocument->currentSubPage()->CLUT(colourIndex);
+	m_newColour = newColour;
+
+	setText(QObject::tr("colour change"));
+}
+
+void SetColourCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_newColour);
+
+	emit m_teletextDocument->colourChanged(m_colourIndex);
+	emit m_teletextDocument->contentsChanged();
+}
+
+void SetColourCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setCLUT(m_colourIndex, m_oldColour);
+
+	emit m_teletextDocument->colourChanged(m_colourIndex);
+	emit m_teletextDocument->contentsChanged();
+}
+
+
+ResetCLUTCommand::ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_colourTable = colourTable;
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++)
+		m_oldColourEntry[i&7] = teletextDocument->currentSubPage()->CLUT(i);
+
+	setText(QObject::tr("CLUT %1 reset").arg(m_colourTable));
+}
+
+void ResetCLUTCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
+		m_teletextDocument->currentSubPage()->setCLUT(i, m_teletextDocument->currentSubPage()->CLUT(i, 0));
+		emit m_teletextDocument->colourChanged(i);
+	}
+
+	emit m_teletextDocument->contentsChanged();
+}
+
+void ResetCLUTCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	for (int i=m_colourTable*8; i<m_colourTable*8+8; i++) {
+		m_teletextDocument->currentSubPage()->setCLUT(i, m_oldColourEntry[i&7]);
+		emit m_teletextDocument->colourChanged(i);
+	}
+
+	emit m_teletextDocument->contentsChanged();
+}

x28commands.h

@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020-2024 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 X28COMMANDS_H
+#define X28COMMANDS_H
+
+#include <QUndoCommand>
+
+#include "document.h"
+
+class X28Command : public QUndoCommand
+{
+public:
+	X28Command(TeletextDocument *teletextDocument, QUndoCommand *parent = 0);
+
+protected:
+	TeletextDocument *m_teletextDocument;
+	int m_subPageIndex;
+};
+
+class SetFullScreenColourCommand : public X28Command
+{
+public:
+	enum { Id = 301 };
+
+	SetFullScreenColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldColour, m_newColour;
+};
+
+class SetFullRowColourCommand : public X28Command
+{
+public:
+	enum { Id = 302 };
+
+	SetFullRowColourCommand(TeletextDocument *teletextDocument, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldColour, m_newColour;
+};
+
+class SetCLUTRemapCommand : public X28Command
+{
+public:
+	enum { Id = 303 };
+
+	SetCLUTRemapCommand(TeletextDocument *teletextDocument, int newMap, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldMap, m_newMap;
+};
+
+class SetBlackBackgroundSubstCommand : public X28Command
+{
+public:
+	enum { Id = 304 };
+
+	SetBlackBackgroundSubstCommand(TeletextDocument *teletextDocument, bool newSub, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+	bool mergeWith(const QUndoCommand *command) override;
+	int id() const override { return Id; }
+
+private:
+	int m_oldSub, m_newSub;
+};
+
+class SetColourCommand : public X28Command
+{
+public:
+	SetColourCommand(TeletextDocument *teletextDocument, int colourIndex, int newColour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+
+private:
+	int m_colourIndex, m_oldColour, m_newColour;
+};
+
+class ResetCLUTCommand : public X28Command
+{
+public:
+	ResetCLUTCommand(TeletextDocument *teletextDocument, int colourTable, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+
+private:
+	int m_colourTable;
+	int m_oldColourEntry[8];
+};
+
+#endif