Tag version 0.8.2-beta

Closes GH-14 where flashing text in Mix mode would not flash to the
transparent background.

The bundled QtGifImage does not expose a way to change the DisposalMode in
giflib and thus it is fixed at 0 or DISPOSAL_UNSPECIFIED. This is a quick and
dirty change to fix it to 2 or DISPOSAL_BACKGROUND for our needs.

A proper fix would be to fork QtGifImage and add a more accessible API call
to choose the DisposalMode value.

3rdparty/QtGifImage/CMakeLists.txt

@@ -13,7 +13,7 @@ set(GIF_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/3rdparty/giflib)
 
 # Next line was "add_library(${PROJECT_NAME} SHARED"
 # but it breaks MXE static compilation
-add_library(${PROJECT_NAME}
+add_library(${PROJECT_NAME} STATIC
     ${GIF_IMAGE_DIR}/qgifglobal.h ${GIF_IMAGE_DIR}/qgifimage.cpp
     ${GIF_IMAGE_DIR}/qgifimage.h  ${GIF_IMAGE_DIR}/qgifimage_p.h
 

3rdparty/QtGifImage/include/gifimage/qgifimage.cpp

@@ -306,7 +306,7 @@ bool QGifImagePrivate::save(QIODevice *device) const {
 	}
 
 	GraphicsControlBlock gcbBlock;
-	gcbBlock.DisposalMode = 0;
+	gcbBlock.DisposalMode = 2;
 	gcbBlock.UserInputFlag = false;
 	gcbBlock.TransparentColor = getFrameTransparentColorIndex(frameInfo);
 

CMakeLists.txt

@@ -11,14 +11,11 @@ set(CMAKE_AUTOUIC ON)
 
 find_package(Qt6 COMPONENTS Core Widgets REQUIRED)
 
-qt_standard_project_setup()
-
 add_subdirectory(src/qteletextdecoder)
-
 add_subdirectory(3rdparty/QtGifImage)
 
 file (GLOB SOURCES src/qteletextmaker/*.cpp)
-qt_add_executable(qteletextmaker ${SOURCES} src/qteletextmaker/actionicons.qrc)
+add_executable(qteletextmaker ${SOURCES} src/qteletextmaker/actionicons.qrc)
 
 target_link_libraries(qteletextmaker PRIVATE QtGifImage::QtGifImage qteletextdecoder Qt::Widgets)
 
@@ -54,9 +51,9 @@ install(DIRECTORY
 	DESTINATION ${EXAMPLES_INSTALL_DIR}
 )
 
-qt_generate_deploy_app_script(
+if(UNIX AND NOT APPLE)
-	TARGET qteletextmaker
+	install(FILES
-	FILENAME_VARIABLE deploy_script
+		${CMAKE_CURRENT_LIST_DIR}/share/qteletextmaker.desktop
-	NO_UNSUPPORTED_PLATFORM_ERROR
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
-)
+	)
-install(SCRIPT ${deploy_script})
+endif()

README.md

@@ -4,17 +4,17 @@ QTeletextMaker is a teletext page editor with an emphasis on Level 2.5 enhanceme
 It is written in C++ using the Qt 6 widget libraries.
 
 Features
-- Load and save teletext pages in .tti format.
+- Load and save pages in TTI format.
-- Rendering of teletext pages in Levels 1, 1.5, 2.5 and 3.5
+- Rendering of pages in Levels 1, 1.5, 2.5 and 3.5 including Local Objects and side panels.
-- Rendering of Local Objects and side panels.
+- Rendering of DRCS characters imported from DRCS downloading pages.
-- Import and export of single pages in .t42 format.
+- Import and export of single pages in t42, EP1 and HTT formats.
-- Export PNG and animated GIF images of teletext pages.
+- Export PNG and animated GIF images of pages.
 - Undo and redo of editing actions.
 - Interactive X/26 Local Enhancement Data triplet editor.
 - Editing of X/27/4 and X/27/5 compositional links to enhancement data pages.
 - Palette editor.
-- Configurable zoom.
+- View pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios with configurable zoom level.
-- View teletext pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios.
+- View pages in mix and attribute-less monochrome modes.
 
 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://web.archive.org/web/20230606021352/https://blog.8bitbuddhism.com/2018/08/22/cross-compiling-windows-applications-with-mxe/). After MXE is installed `make qt6-qtbase` should build and install the required dependencies to build QTeletextMaker.
 
@@ -37,7 +37,6 @@ Optionally, type `cmake --install .` 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.
 - Proportional font spacing on Level 3.5
 
 ## Using the X/26 triplet editor

examples/Level2p5-DRCS/DRCS-CardSuits-MainPage.tti

@@ -0,0 +1,157 @@
+DE,Level 2.5 DRCS card suits demo display page
+PN,22001
+SC,0001
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@}@@@A}@@@B}@@@OPhD@@H}@@@H}@@@@@@
+OL,28,@@@|gpCUC@TpK@PA`Ub{~Ls_w}ww]_}_wMPv
+OL,26,@kD@PM`Rm`TMaVmamD@JAPKKYMMuOMuQMuSMu\KQ
+OL,26,A]APnD@hS|TMtUIPoD@hS|LM`NM`PM`RM`TM`UMd
+OL,26,BVmdYMdZmdpD@hS|UMeVmeWMdXmdYMeZmeqD@hS|
+OL,26,CUMdVmdWMeXmeYMdZmdrD@hS|UMeVmeYMeZmesD@
+OL,26,DhS|UMfVmfYMfZmftD@hS|UMgVmgWMfXmfYMgZmg
+OL,26,EuD@hS|UMfVmfWMgXmgYMfZmfvD@hS|UMgVmgYMg
+OL,26,FZmg[MbwD@hS|ZIP[mtxD@JAPKK|MmuOmuQmuSmu
+OL,26,G\Kt]APzD@PMbRmbTMcVmc_CxW|JcKJ@IJaKaZ
+OL,26,HMKhOKhQKhSKh\Au]aBBBBBBB
+OL,1,R]                                G(1/4)
+OL,2,R]           Wppspppppppp               
+OL,3,R]           W]TCQHTSQD R]              
+OL,4,R]           W##s########               
+OL,5,R]       W||||||||||||||||||||          
+OL,6,R]       W]DA K Q J 10       R]         
+OL,7,R]       W]T! ! ! ! !n$  n$  R]         
+OL,8,R]       W]T         .$n$.$  R]         
+OL,9,R]       W]T         n$.$n$  R]         
+OL,10,R]       W]T         .$  .$  R]         
+OL,11,R]       W]T         l$  l$  R]         
+OL,12,R]       W]T         n$l$n$  R]         
+OL,13,R]       W]T         l$n$l$  R]         
+OL,14,R]       W]T         n$  n$` R]         
+OL,15,R]       W]D              01 R]         
+OL,16,R]       W////////////////////          
+OL,17,R]           Wppspppppppp               
+OL,18,R]           W]TCQHTSQD R]              
+OL,19,R]           W##s########               
+OL,20,R]                                      
+OL,21,R]                                      
+OL,22,R]                                      
+OL,23,R]                                      
+PN,22002
+SC,0002
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@}@@@A}@@@B}@@@OPhD@@H}@@@H}@@@@@@
+OL,28,@@@|gpCUC@TpK@PA`Ub{~Ls_w}ww]_}_wMPv
+OL,26,@kD@PM`Rm`TMaVmamD@JAPKKYMMuOMuQMuSMu\KQ
+OL,26,A]APnD@hS|TMtUIPoD@hS|Lm`Nm`Pm`Rm`Tm`UMh
+OL,26,BVmhYMhZmhpD@hS|UMiVmiWMhXmhYMiZmiqD@hS|
+OL,26,CUMhVmhWMiXmiYMhZmhrD@hS|UMiVmiYMiZmisD@
+OL,26,DhS|UMjVmjYMjZmjtD@hS|UMkVmkWMjXmjYMkZmk
+OL,26,EuD@hS|UMjVmjWMkXmkYMjZmjvD@hS|UMkVmkYMk
+OL,26,FZmk[mbwD@hS|ZIP[mtxD@JAPKK|MmuOmuQmuSmu
+OL,26,G\Kt]APzD@PMbRmbTMcVmc_CxW|JcKJ@IJaKaZ
+OL,26,HMKhOKhQKhSKh\Au]aBBBBBBB
+OL,1,R]                                G(2/4)
+OL,2,R]           Wppppspppppp               
+OL,3,R]           W]TCQHTSQD R]              
+OL,4,R]           W####s######               
+OL,5,R]       W||||||||||||||||||||          
+OL,6,R]       W]AA K Q J 10       R]         
+OL,7,R]       W]Q! ! ! ! !}5  }5  R]         
+OL,8,R]       W]Q         * }5*   R]         
+OL,9,R]       W]Q         }5* }5  R]         
+OL,10,R]       W]Q         *   *   R]         
+OL,11,R]       W]Q         h   h   R]         
+OL,12,R]       W]Q         ?5h ?5  R]         
+OL,13,R]       W]Q         h ?5h   R]         
+OL,14,R]       W]Q         ?5  ?5` R]         
+OL,15,R]       W]A              01 R]         
+OL,16,R]       W////////////////////          
+OL,17,R]           Wppppspppppp               
+OL,18,R]           W]TCQHTSQD R]              
+OL,19,R]           W####s######               
+OL,20,R]                                      
+OL,21,R]                                      
+OL,22,R]                                      
+OL,23,R]                                      
+PN,22003
+SC,0003
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@}@@@A}@@@B}@@@OPhD@@H}@@@H}@@@@@@
+OL,28,@@@|gpCUC@TpK@PA`Ub{~Ls_w}ww]_}_wMPv
+OL,26,@kD@PM`Rm`TMaVmamD@JAPKKYMMuOMuQMuSMu\KQ
+OL,26,A]APnD@hS|TMtUIPoD@hS|LMaNMaPMaRMaTMaUMl
+OL,26,BVmlYMlZmlpD@hS|UMmVmmWMlXmlYMmZmmqD@hS|
+OL,26,CUMlVmlWMmXmmYMlZmlrD@hS|UMmVmmYMmZmmsD@
+OL,26,DhS|UMnVmnYMnZmntD@hS|UMoVmoWMnXmnYMoZmo
+OL,26,EuD@hS|UMnVmnWMoXmoYMnZmnvD@hS|UMoVmoYMo
+OL,26,FZmo[McwD@hS|ZIP[mtxD@JAPKK|MmuOmuQmuSmu
+OL,26,G\Kt]APzD@PMbRmbTMcVmc_CxW|JcKJ@IJaKaZ
+OL,26,HMKhOKhQKhSKh\Au]aBBBBBBB
+OL,1,R]                                G(3/4)
+OL,2,R]           Wppppppspppp               
+OL,3,R]           W]TCQHTSQD R]              
+OL,4,R]           W######s####               
+OL,5,R]       W||||||||||||||||||||          
+OL,6,R]       W]DA K Q J 10       R]         
+OL,7,R]       W]T! ! ! ! !~4  ~4  R]         
+OL,8,R]       W]T         .$~4.$  R]         
+OL,9,R]       W]T         ~4.$~4  R]         
+OL,10,R]       W]T         .$  .$  R]         
+OL,11,R]       W]T         l$  l$  R]         
+OL,12,R]       W]T         o%l$o%  R]         
+OL,13,R]       W]T         l$o%l$  R]         
+OL,14,R]       W]T         o%  o%` R]         
+OL,15,R]       W]D              01 R]         
+OL,16,R]       W////////////////////          
+OL,17,R]           Wppppppspppp               
+OL,18,R]           W]TCQHTSQD R]              
+OL,19,R]           W######s####               
+OL,20,R]                                      
+OL,21,R]                                      
+OL,22,R]                                      
+OL,23,R]                                      
+PN,22004
+SC,0004
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@}@@@A}@@@B}@@@OPhD@@H}@@@H}@@@@@@
+OL,28,@@@|gpCUC@TpK@PA`Ub{~Ls_w}ww]_}_wMPv
+OL,26,@kD@PM`Rm`TMaVmamD@JAPKKYMMuOMuQMuSMu\KQ
+OL,26,A]APnD@hS|TMtUIPoD@hS|LmaNmaPmaRmaTmaUMp
+OL,26,BVmpYMpZmppD@hS|UMqVmqWMpXmpYMqZmqqD@hS|
+OL,26,CUMpVmpWMqXmqYMpZmprD@hS|UMqVmqYMqZmqsD@
+OL,26,DhS|UMrVmrYMrZmrtD@hS|UMsVmsWMrXmrYMsZms
+OL,26,EuD@hS|UMrVmrWMsXmsYMrZmrvD@hS|UMsVmsYMs
+OL,26,FZms[mcwD@hS|ZIP[mtxD@JAPKK|MmuOmuQmuSmu
+OL,26,G\Kt]APzD@PMbRmbTMcVmc_CxW|JcKJ@IJaKaZ
+OL,26,HMKhOKhQKhSKh\Au]aBBBBBBB
+OL,1,R]                                G(4/4)
+OL,2,R]           Wppppppppspp               
+OL,3,R]           W]TCQHTSQD R]              
+OL,4,R]           W########s##               
+OL,5,R]       W||||||||||||||||||||          
+OL,6,R]       W]AA K Q J 10       R]         
+OL,7,R]       W]Q! ! ! ! !~4  ~4  R]         
+OL,8,R]       W]Q         +!~4+!  R]         
+OL,9,R]       W]Q         ~4+!~4  R]         
+OL,10,R]       W]Q         +!  +!  R]         
+OL,11,R]       W]Q         x0  x0  R]         
+OL,12,R]       W]Q         o%x0o%  R]         
+OL,13,R]       W]Q         x0o%x0  R]         
+OL,14,R]       W]Q         o%  o%` R]         
+OL,15,R]       W]A              01 R]         
+OL,16,R]       W////////////////////          
+OL,17,R]           Wppppppppspp               
+OL,18,R]           W]TCQHTSQD R]              
+OL,19,R]           W########s##               
+OL,20,R]                                      
+OL,21,R]                                      
+OL,22,R]                                      
+OL,23,R]                                      

examples/Level2p5-DRCS/DRCS-CardSuits-Nptus.tti

@@ -0,0 +1,27 @@
+DE,Level 2.5 DRCS card suits demo PTU page
+PN,2a000
+SC,0000
+PS,8010
+PF,5,0
+OL,1,C`GpGpC`Ox_|_|MXA@C`LX^|_|_|_|OxOxGpC`A@
+OL,2,A@C`C`GpGpOxOxEPA@C`A@C`C`GpGpOxGpC`C`A@
+OL,3,C`A@MX_|_|OxC`GpGpC`A@C`GpOxOx_|_|_|^|LX
+OL,4,C`A@EPOxOxGpGpC`C`A@A@C`C`GpOxGpGpC`C`A@
+OL,5,@G@O@_@_@_@_@O@GAwCx@|@~@~@~@~@|@x@{`p
+OL,6,GGGGC}Ay@A@C@C@@xxxxopg``@p@p@@@
+OL,7,@@@C@C@AAyC}GGGG@@p@p@`@g`opxxxx
+OL,8,CAw@G@O@_@_@_@_@O@Gp{`x@|@~@~@~@~@|@x@
+OL,9,AxC|C~GGGGGCCG`Op_pxxxxxpp
+OL,10,AA@@@_@O@G@C@A@@``@@~@|@x@p@`@@@
+OL,11,@@@A@C@G@O@_@@AA@@`@p@x@|@~@@@``
+OL,12,CCGGGGGC~C|Axppxxxxx_pOpG`
+OL,13,@A@A@C@C@G@O@_@_@@`@`@p@p@x@|@~@~@@@
+OL,14,AAAA}@y@A@A@C@G@@```o`g@`@`@p@x@@@
+OL,15,@@@G@C@A@A@yA}AAA@@x@p@`@`@g@o````
+OL,16,@@@_@_@O@G@C@C@A@A@@~@~@|@x@p@p@`@`@
+OL,17,@A@A@C@C@G@G@O@_@C`@`@p@p@x@x@|@~@@p
+OL,18,@@_@O@G@G@C@C@A@A@@@~@|@x@x@p@p@`@`@@@
+OL,19,@@@A@A@C@C@G@G@O@_@@@`@`@p@p@x@x@|@~@@
+OL,20,C@@_@O@G@G@C@C@A@Ap@~@|@x@x@p@p@`@`@
+OL,21,@@Y|[F[F[F[F[FY|@@@@@@OfXvXvXvXvXvOf@@@@
+OL,22,@@@@@@~|ysgO~_~_Ogsy|~@@@@@@

examples/Level2p5-DRCS/DRCS-Parrot-MainPage.tti

@@ -0,0 +1,21 @@
+DE,Level 2.5 DRCS parrot demo display page
+PN,21000
+SC,0000
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@_|@@@A_|@@@B_|@@@OPlD@@H_|@@@H_|@@@@@@
+OL,28,@@@|gpCu_@|wKpZA`UB_wLs_w}ww]_}_wM@G
+OL,26,@rD@^C@^M`_m``MaamasD@^C@^Mb_mb`McamctD@
+OL,26,A^C@^Md_md`MeameuD@^C@^Mf_mf`MgamgvD@^C@
+OL,26,B^Mh_mh`MiamiwD@^C@^Mj_mj`MkamkCCC
+OL,7, Level 2.5 DRCS                         
+OL,9, Mode 0 characters                      
+OL,10,  12x10 pixels of                 \     
+OL,11,  1 bitplane                      \     
+OL,12,                                  \     
+OL,13,                                  \     
+OL,14, 24 DRCS characters               \     
+OL,15,  over 24 PTUs                    \     
+OL,17, 6 rows of 4 columns                    
+OL,18,  or 48x60 pixels                       

examples/Level2p5-DRCS/DRCS-Parrot-Nptus.tti

@@ -0,0 +1,17 @@
+DE,Level 2.5 DRCS parrot demo PTU page
+PN,2b000
+SC,0000
+PS,8010
+PF,5,0
+OL,1,@@@@@@@@@@@C@O@O@O@@@@@@@@@@|{
+OL,2,@@@@@@@@~@||@@@@@@@@@@@@@@@@`@p@
+OL,3,@N@N@N@N@L@M@D@@@Gp____OOC@@p
+OL,4,_Op@x@~@`xx|~~
+OL,5,@A~A{C^B~C~Sn@NB^F~xOPF@@`@@@p@@@@@@C@B
+OL,6,oD{@G@_AA@|__~nztfbr}z}z
+OL,7,F~E^E^E~GxAxCxCxCpI`@F@O@O@O@O@_@_@^@~@|
+OL,8,~yyagO~@H}xx~|v\tLt@d@@@@@@@
+OL,9,I`L@@@@@@@D@d@@C@N@\@@@@@@@HA`L@x@`@@@@@
+OL,10,p@`@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,11,ApC`G@N@X@p@`@@@@@@@@@@@@@@AAAA`A`AaAaA`
+OL,12,@@D@l@x@p@p@A@A@A@@@@@@@@@@@@@@@@@@@@@@@

examples/Level2p5-DRCS/README-drcs.md

@@ -0,0 +1,22 @@
+# DRCS examples
+## Viewing the examples
+Each example is in two page files: the main display page and the DRCS downloading page.
+- From the "File" menu select "Open".
+- Select the TTI file you wish to view with the `MainPage` extension.
+- From the "View" menu go to the "DRCS pages" submenu and under "Normal DRCS" select "Open file".
+- Select the TTI file with the same name but with the `Nptus` extension.
+
+## DRCS downloading pages
+A teletext page can use X/26 triplets to invoke downloaded DRCS characters, but the Pattern Transfer Units (or bitmaps) of the DRCS characters themselves are stored on a separate hidden DRCS downloading page. Any teletext page for display can reference up to two DRCS downloading pages: one "Global" table and one "Normal" table.
+
+## Viewing pages with DRCS characters in QTeletextMaker
+Since QTeletextMaker is a single page editor and does not see an entire teletext service, the DRCS downloading page(s) must be loaded manually after the main display page has been loaded in.
+
+All the examples supplied with QTeletextMaker use DRCS characters from the "Normal" table only. For other pages it is required to check whether the page invokes DRCS characters from the "Global" or "Normal" table using the X/26 triplets dockwindow. Where an enhancement triplet mode is listed as "DRCS character" the data will either say "Global" or "Normal". Some pages may use DRCS characters from *both* tables.
+
+From the "View" menu go to the "DRCS pages" submenu where there are two headings: "Global DRCS" and "Normal DRCS". Under each heading is a "Load file" option to load in the DRCS downloading page into that corresponding table, along with a "Clear" option.
+
+If a Global DRCS page is accidentally loaded into the Normal DRCS table or vice versa, the "DRCS pages" submenu has a "Swap Global and Normal" option to correct this.
+
+## Defining DRCS characters
+QTeletextMaker does not feature DRCS character bitmap *editing*. The Python script [image2drcs](https://github.com/gkthemac/image2drcs) can be used to convert small bitmaps in various image formats to DRCS downloading pages.

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode1-MainPage.tti

@@ -0,0 +1,34 @@
+DE,Level 3.5 DRCS mode 1 parrot demo display page
+PN,21100
+SC,0000
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@_|@@@A_|@@@B_|@@@OQlD@@H_|@@@H_|@@@@@@
+OL,28,@@@|g@@`Jq[tnIpZA`UB_wLs_w}ww]_}_wM@G
+OL,28,A@@@@@@@crI@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,26,@mD@\M`]Ma^Mb_Mc`MdaMebMfcMgdMheMinD@\Mj
+OL,26,A]Mk^Ml_Mm`MnaMobMpcMqdMreMsoD@\Mt]Mu^Mv
+OL,26,B_Mwixp`M`aMabMbcMcdMdeMepD@\Mf]Mg^Mh_Mi
+OL,26,C`MjaMkbMlcMmdMneMoqD@\Mp]Mq^Mr_Ms`MtaMu
+OL,26,DbMvcMwiXqdM`eMarD@\Mb]Mc^Md_Me`MfaMgbMh
+OL,26,EcMidMjeMksD@\Ml]Mm^Mn_Mo`MpaMqbMrcMsdMt
+OL,26,FeMutD@\Mv]Mwixq^M`_Ma`MbaMcbMdcMedMfeMg
+OL,26,GuD@\Mh]Mi^Mj_Mk`MlaMmbMncModMpeMqvD@\Mr
+OL,26,H]Ms^Mt_Mu`MvaMwiXrbM`cMadMbeMcwD@\Md]Me
+OL,26,I^Mf_Mg`MhaMibMjcMkdMleMmxD@\Mn]Mo^Mp_Mq
+OL,26,J`MraMsbMtcMudMveMwyD@ixr\M`]Ma^Mb_Mc`Md
+OL,26,KaMebMfcMgdMheMizD@\Mj]Mk^Ml_Mm`MnaMobMp
+OL,26,LcMqdMreMs{D@\Mt]Mu^Mv_MwiXs`M`aMabMbcMc
+OL,26,MdMdeMe|D@\Mf]Mg^Mh_Mi`MjaMkbMlcMmdMneMo
+OL,26,NCCCCCCCCCCCCC
+OL,6, Level 3.5 DRCS                         
+OL,8, Mode 1 characters                      
+OL,9,  12x10 pixels of                       
+OL,10,  2 bitplanes                           
+OL,11,  or 4 colours                          
+OL,13, 160 DRCS characters                    
+OL,14,  over 320 PTUs stored                  
+OL,15,  across 7 subtables                    
+OL,17, 16 rows of 10 columns                  
+OL,18,  or 120x160 pixels                     

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode1-Nptus.tti

@@ -0,0 +1,196 @@
+DE,Level 3.5 DRCS mode 1 parrot demo PTU page
+PN,2b100
+SC,0000
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,2,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,3,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,4,@@@@@@@@@@@@@@@@@@_x@@@@@@@@@@@@@@@@@@NP
+OL,5,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,6,@G@C@@@@@@@@@F@@@@@@@G@@@@@@@@@@@B@@@@@@
+OL,7,`C@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@
+OL,8,@@@@@@@@AfAAA@@_@@@@@@@@AbAA@@@_
+OL,9,@@@@@A@A@@@@@@`A@A@A@@@@@@@A@@@@@@@@@A@A
+OL,10,qpyp~~_OGvG|F|F|@Qpyp|~~ONGDFxF|@|@
+OL,11,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,12,@@@@@@@@@A@B@D@@@P@P@@@@@@@@@@@A@C@O@O@O
+OL,13,@G@_AB}Br@@@@@@@@@@@C@O@O
+OL,14,owM|_@AG@A@A
+OL,15,x@acx@`
+OL,16,A|}O~_@@O
+OL,17,@`eppp}wp{@@a``p
+OL,18,@ND@F@F@`@p@p@p@~@@@ND@F@F@@@`@p@`@|@@
+OL,19,@A@A@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@
+OL,20,|@x@@@@D@@@@@@@@@@@]|@x@@@@@@@@@@@@@@@@Y
+OL,21,@@`@p@p@`@@@@@@@@@@@@@`@p@`@@@@@@@@@@@@@
+OL,22,@P@P@Z@O@O@C@G@G@O@O@O@O@E@@@@@C@G@G@O@O
+OL,23,@@H@p@OoowOp_@_`_`_p_x_|_
+OL,24,@@G@Op~{
+PN,2b101
+SC,0001
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,@`@N@^@~@\|@x@xsys{q
+OL,2,_G@z@xHx@x@@@`@pG`A
+OL,3,sss_C@@C@C@@Gx`
+OL,4,`px|yx^po@A|@A`pp|~~~~
+OL,5,@\@@_@_CC@_@G@A@@@X@_@_@_AC@O@G@A@@
+OL,6,\_x^_@x|||xxL\x^_@~x||xx_x
+OL,7,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,8,@_@_@_@_@_@_@_@_@_@_@O@O@_@_@_@_@_@_@_@_
+OL,9,}|_|_|O~__O|GxG|G~_|_|_|O~_~_}GxGxGxC
+OL,10,
+OL,11,x@x@p`qApApEpG|C|@~@
+OL,12,@A@@@@x@x@y@x@`@@@@@
+OL,13,~@x@`@@@@@@@@@@@@@@@
+OL,14,@A@K@O@G@O@O@O@_@@
+OL,15,x@x@|@p|rucnG`Ax@x@x@``f
+OL,16,OY@AAAFwNH@{AAA@g
+OL,17,@@@@@@@@@@@@@@@@@@O`@@@@@@@@@@@@@@@@@@G`
+OL,18,@_@O@OHGHG@C@C@C@B@J@O@O@G@GHC@C@C@@@C@G
+OL,19,s|S}g~_~~|otg@@pAdxC{crCpJrXwDw@\@@~X
+OL,20,_GA@~@N@F@D_GA@_@O@A@C
+OL,21,~@~@x@`@@@@@@@@@@@@@
+OL,22,@@@@@@@@@@@@@@@@@@@@
+OL,23,@@@@@@@@@@@@F@GwOOryxOpOpO
+OL,24,@_@O@GHG^G~C^Ak@@@@@
+PN,2b102
+SC,0002
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,`ApAx@x@x@~@@~@\AL@
+OL,2,y{}SWCGGqBpGDfpbHYCpx||~
+OL,3,xx||xp~@~@~@x@px|xx`~@~@~@`@
+OL,4,@x@|A|G|GrODOl\Ht@@@@_@ACGOO_[
+OL,5,CxAC@@@@@@BFAcCsAyp}|@~|}y~\|L~FOB
+OL,6,@Xxppy_~OOo@G@G@O@O@F`@p@@@@@@@
+OL,7,@@@@`@`DPFXFlgtgw__{OyGyCXCX@@@@
+OL,8,@@@@D@F@C@K`[a}{y|t_d^B@@@@@
+OL,9,O@F@@@@@@@xBxC~G~pyG}G|Ax@@@A
+OL,10,@@@@@@@@@@@@l@|@p@@@SCO
+OL,11,@@@@@H@L@D@D@@@@@@@@ws{{
+OL,12,`Q@P@A@A@A@C@E@DXFxF~}||g|G~
+OL,13,C@pz}~~xN|DDC@_aq{xOxG~C
+OL,14,\CzCv@l@\@X@P@`@`@`q|}|yscgo___N
+OL,15,x|~]~_CCCGGCaCqc{G@A`A`|@|@|@xx|^|N\D
+OL,16,OOo@@@@@@@@@@@@@@@@@@@@
+OL,17,ooK@@@@@@@@@@@@@@@@@@@@
+OL,18,@@@@@@@@@@@@@@@@@@@@
+OL,19,|x`|@p@p@p@p@x@|@@C@G@_COOOOGC
+OL,20,@@@@@@@@@@@@@@@@@@@@
+OL,21,@@@@@@@@@@@@@`ApAq@q_~O~NN
+OL,22,pFYFYF]]]]|~O~f~f~c~ava~a~@~@~@z
+OL,23,aakO~Gw_gFggG~G|cwOG
+OL,24,@|q|}~y|s|t|dXlX|DxcC~CrApCpCcCggogo{o\
+PN,2b103
+SC,0003
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,cCGOOGGgGwG~G|\@|@x@p@p@x@xXzH{@x@
+OL,2,o~tx~@@@@@@@@@@@@@@@@@@@@
+OL,3,KGGOoykc@@@@@@@@@@@@@@@F@T@\
+OL,4,w~_`O`C`C@@@@@@@@@@H@A`_p_|_|
+OL,5,t||pppv|oG@K@C@C@O@O@O@I@CP@x@
+OL,6,@@@@@@@@@@@@@@@@`@@@_
+OL,7,@A@@@@A`A@A@C`C@C@C@~~_~~|_|||
+OL,8,~~~~~~~W~WzC{O{GC~@z@z@z@zhzhz|{p{xz|z
+OL,9,a`^@_P]|_~~~s~`^@_@\@\|\
+OL,10,`aq`cAC@G@G@G@F@B@B@_^^_\~|z~|y}}
+OL,11,G|g|ClC|CrCxCxGxGx|x@X@|@|@|@|@|@~@~@O@
+OL,12,__OCA@{@G@G@G@G@@@@@@@@@@@@@@@@@@@@
+OL,13,cgnN~\~H~@x@x@x@@\@X@Q@qAcAwAGGG
+OL,14,@@@@@@@@@@@@@A@@@@@A~~
+OL,15,C@CAAOAG@G@_@_@_|@@|@~@~p~xx```
+OL,16,E@E@f~~N~B|B|_n|xzzYAAqA}C}C`@Q@C@G
+OL,17,C`G`G`O`y|p~P^`|`~`~|_x_x_p_FCOAoa_C_A_A
+OL,18,C~AAwAw@@@O@_@_@_|z~s~w~ggkoo
+OL,19,|^~\~\\\|_|]|]|\|]|Y|[~[~[~[|Q|S|SxS|S
+OL,20,C@O@|AdA`A`A`C`C`C`C|pC~[~~~}}_}}
+OL,21,|wxZ~~ov~w~O@OdGdGfgvs~q~q~yy
+OL,22,@O@O@_@_@_@@@wAA@@@@@@@@@P@P@@@X@pAp
+OL,23,x@x@p@`@b@h@p@pD`F`GGGO_]WOO{_y_x
+OL,24,@A@Q@Y@Y@J@_@_AC}cy~nffu``~@|B\F
+PN,2b104
+SC,0004
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,D_D_DOFGD~~w{`{`{py@x@{@@@A@A@H@
+OL,2,`acg_~|~y|@_@^@\@X@`@@@@@@C@F@
+OL,3,Qo]o_hWcC`C`SDS@[C^GN@B@@@H@\@\@L@L@DC@C
+OL,4,@_p_xGHgGyGWwooOGgGCGaC|C~wgg
+OL,5,||p||~z{}}Hsps{yy_x}|||
+OL,6,PCPOPGRGSqp_Hloo}ouo}m}l]N\O~w~Sq
+OL,7,{~}_~}}~~||||_|OxNx
+OL,8,acsC`AAaa@A`A`A@@@@@@@@@@@@@a@
+OL,9,`G`O`pw~}_x_p_@O@@A@O@O@_AC
+OL,10,x~ov_~y``@G@A@I@Ap@x@|@@@`
+OL,11,BD@@@@@@`A{{qBAC}{_~@D@@@@@fBw
+OL,12,i|A|G|O||||C|C|@DV@~@x@p@@@@@@@@@@@@@
+OL,13,PG@C@N@\BXF_NONG^G]s@C@B@H@H@PBNFGNGLCUs
+OL,14,O~O~O|GxGxCxspqpx@x@G~O~OxGxGxCxapqpp@x@
+OL,15,~yOqOqyyqy}~~yOaGqpppx{|
+OL,16,_}|~~}owo_y}|_|_|K~K~
+OL,17,g_gn{kr~O}_K~Ovooa``w`wasqrspwpwxW|[
+OL,18,a_Aqqp`@COa`a`A`A`@|@_@_AO
+OL,19,}GGxOoO
+OL,20,D@coO@@
+OL,21,yCODOCw}}}}p_@G@F
+OL,22,pG@C@G^@A@@@@
+OL,23,_x|~~gOx||~~C
+OL,24,x@@@@@@@@@@@@p|X@@@@@@@@@~@@@px
+PN,2b105
+SC,0005
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,{~~~~_@N@@@@y~~~~~\^@N@@@@
+OL,2,{W|_|_|O~O~E@c_H^hNlNlNLO~@_@A_G_
+OL,3,qi{IXY[
+OL,4,}e~rJ@~@
+OL,5,~x`~@{@{@}`|`|x||~p~@z@b@@@@@@@@H@H
+OL,6,_@O`O`O`Gq@\_\_N@~@O@O@O`O`Fp@@_@F@@F@
+OL,7,DOY^XLx@x@p@`@@@@@`@@N@NX@X@p@p@`@@@@@@@
+OL,8,@O@O@[@[@wAwAoCfG@F@@A@A@C@C@G@G@G@B@@@@
+OL,9,`_pGx@swOOOO`_pCp@swgOOOO
+OL,10,Ow|Ocyx~Gq|_~Gcpx
+OL,11,@@x@xA|C|C|C\GXO@Op_@@X@x@|C|C|C\GHG@O`O
+OL,12,___oOOGo
+OL,13,yapx|~^|p`pxxc\CH
+OL,14,cca`@@@@@@oc@APAp@p@@@@@@@@@@@P
+OL,15,|n|_|_|O|_|~o~_~o@L@O@O@O@O@O@O@O@G@O
+OL,16,wS{_~~}}}WAsWy~~~||x
+OL,17,@@B@B@G@Oawacg}NL@@@@@@@@A@A@A`A@C@C@
+OL,18,N@\@X@x@p@h@d@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,19,O@_@_@O@G@@@@@@@@@@N@_@_@O@G@@@@@@@@@@
+OL,20,wxqpp@`@@@@@@@@@@@@@wxpp`@@@@@@@@@@@@@@@
+OL,21,|wO_|_gGO_
+OL,22,~~_~_~_~_~xx``@````
+OL,23,~ld`Ppp}x~p||AH@@@`@`@@@@@@@@@@@@
+OL,24,@o@_A_AuquqeqeQdS`S`@P@@@@@Z@z@z@z@{@@
+PN,2b106
+SC,0006
+PS,8010
+PF,5,0
+OL,28,CE@@aG^xaG^xaG^xaG^xaG^xaG^xaG^xaG^x@@@@
+OL,1,__oo@_@_@_@_@_@_A_AOAOAO
+OL,2,{{xxpdl|\||x
+OL,3,XP``aggC@C@C@B@F@FGG__~
+OL,4,@@@@@@@@`@|@@@g@Ct@@@@@@@@`@p@~@@c@C`
+OL,5,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,6,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,7,{p``@~A|A{p`@~@|A|A
+OL,8,~_~o~o~o^w_wOekKH`PPP[H[HOHGDdzf
+OL,9,|~~~~~~@@@@@@@@@@@@@@@@@@@@
+OL,10,S`C`C`G`E`g`G`G`GhGh@@@BBDDDDwDw
+OL,11,o}}_}}}AOAOAGCGCgCgCgCcCcCc
+OL,12,www}o~~zppxsxwr`p}}
+OL,13,op_pO`OpO~__^^__po`@`z~O~
+OL,14,C|A|Ax@|@~|gg|CA|Ax@x@|@|xgC|C
+OL,15,@@@@@@@@^@@@@|@x@@@@@@@@@\@~@@~@p@p@
+OL,16,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode2-MainPage.tti

@@ -0,0 +1,28 @@
+DE,Level 3.5 DRCS mode 2 parrot demo display page
+PN,21200
+SC,0000
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@_|@@@A_|@@@B_|@@@ORlD@@H_|@@@H_|@@@@@@
+OL,28,@@@|g@@`DsIBGqXaUSUwSC^MfziDcxgUoywvOpF
+OL,28,A@@@@@@@@@@LJgtj}bszMo{ph\RkvKNkw|nC@@
+OL,26,@oD@^M`_Mb`MdaMfbMhcMjdMleMnpD@^Mp_Mr`Mt
+OL,26,AaMvixpbM`cMbdMdeMfqD@^Mh_Mj`MlaMnbMpcMr
+OL,26,BdMteMvrD@iXq^M`_Mb`MdaMfbMhcMjdMleMnsD@
+OL,26,C^Mp_Mr`MtaMvixqbM`cMbdMdeMftD@^Mh_Mj`Ml
+OL,26,DaMnbMpcMrdMteMvuD@iXr^M`_Mb`MdaMfbMhcMj
+OL,26,EdMleMnvD@^Mp_Mr`MtaMvixrbM`cMbdMdeMfwD@
+OL,26,F^Mh_Mj`MlaMnbMpcMrdMteMvxD@iXs^M`_Mb`Md
+OL,26,GaMfbMhcMjdMleMnyD@^Mp_Mr`MtaMvixsbM`cMb
+OL,26,HdMdeMfzD@^Mh_Mj`MlaMnbMpcMrdMteMvCC
+OL,7, Level 3.5 DRCS                         
+OL,9, Mode 2 characters                      
+OL,10,  12x10 pixels of                       
+OL,11,  4 bitplanes                           
+OL,12,  or 16 colours                         
+OL,14, 96 DRCS characters                     
+OL,15,  over 384 PTUs stored                  
+OL,16,  across 8 subtables                    
+OL,18, 12 rows of 8 columns                   
+OL,19,  or 96x120 pixels                      

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode2-Nptus.tti

@@ -0,0 +1,233 @@
+DE,Level 3.5 DRCS mode 2 parrot demo PTU page
+PN,2b200
+SC,0000
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,2,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,3,@@@@@@@@@@@@@@@@@@@C@@@@@@@@@@@@@@@@@@@E
+OL,4,@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@A
+OL,5,@~@xOxGx@H@@@XOop@@@@@@@@@@@@@@@@@AWO
+OL,6,@p@pOxCX@@@@@HFx_@@@@@@@@@@@@@@AO
+OL,7,H`@@L@D@@@@@@@^@n@@@@@@@@@@@@@@@`@AqA
+OL,8,@@@@D@@@@@@@@@^@~@@@@@@@@@@@@@@@`@p
+OL,9,@pD\LDH@LX@\ApCp~w|`@H@@@@@@@@@@@@@@MLS_
+OL,10,@T@LD@D@@H@X@pA`sr@H@@@@@@@@@@@@@@O|
+OL,11,HI@A@A@@B@G`EbKxwH@@@@@@@@@@@@@@B@@@H@|@
+OL,12,Os@@@@@A@AAACaCOLGxG@@@@@@@@@@@@@@@@@@|@
+OL,13,`^az@X@@A@@@A@@@@@`@@@@@@@@@@@@@@@@@@@@@
+OL,14,@L~\`~@~@@~@~@l@@@@@@@@@@@@@@@@@@@@@@@
+OL,15,@@@FPO@W@@PD@b@@A@DD@@@@F@@I@B@B@@@@@@@@
+OL,16,NxO~I{OjGgOc_@_@N@@C@@@@FD@G@@@@@@@@@@@@
+OL,17,@@@@@@@@@@@@p@p@`@@@@@@@@@@@@@@@@@@@@@@@
+OL,18,@@@@@@@@@@@@P@P@@@@@@@@@@@@@@@@@`@`@@@@@
+OL,19,@HAxA~CCCCG@oAw@S@yC~GGGGCC@
+OL,20,@O@ACCC@C@H@@A`@G@G@A@@@@@@@@@@@`Ap
+OL,21,@@@@@@`@`@pBp~ooB`{`@pBpb^xow
+OL,22,]@G____O}O_o
+OL,23,@C@@@@@@@@@@@@p@x@~@|_Y@_p`_zA
+OL,24,O}
+PN,2b201
+SC,0001
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,`@@@@@@@@@@@@@@@@O@B_f}t|OxB
+OL,2,p}
+OL,3,@@BM@K@B@E@O@G@@@@@@{p}pxd{pxGAy
+OL,4,|Gys{~`px|
+OL,5,@@`@@@`@`AqD[dOnCqCP@@@@@@@@@@`@pAx@|@~@
+OL,6,@@@@`@@@@@@CaBwGN|O@@@@@@@@@@`@pAx@|A~@
+OL,7,I@GCLC@K@|Pp@@@@@X@X@@@@@@@@@@@L`@~@@`
+OL,8,PGXB@@@ACOo_A@|@F@@@@@@@@@@@@`@~@@x
+OL,9,@@@@@PBPA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,10,@@@@@`A`@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,11,A{CGs}}G}G|G|G{CzCACG~C~C~C@DtDL
+OL,12,CpCxC|G~C~G~GGC~GvAxC|C~C|G|G|G|G|GxCx
+OL,13,oOGoOwtgx_W_OGGC
+OL,14,OoO_oWOG_____O_OGG
+OL,15,~@~@|@|@x@|@|@|@@@z{]{yzP~a{CxGxGxCx@
+OL,16,}
+OL,17,@@@@@@@@@@@A@G@X@PL@p@t_`A_`FxA{G{XcPLB
+OL,18,~xgos
+OL,19,@@@@B@N@\@x@@~@\HXXQa~Az@n@\@x@@~@\HXX
+OL,20,}qcG@Acwgg
+OL,21,CFC`CbGwGoOO{_xrF|@x@y`[@_P@B@v@F^J^F
+OL,22,~C@~@fo}}|@|@}``p~~}y
+OL,23,@r@@HBB@WdGw_pH`N@O@_HAp@@@@@[@I`ODNsxqH
+OL,24,`D^LG}O_N`{b_p{q|G~w_xAp@@@@@_@_`O|NxH
+PN,2b202
+SC,0002
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,@@@@@C@C@A@ABA@@|Pp@@@@@@@@@@@@@@@N@C`O`
+OL,2,@@@@@@@A@@@@@@q`|@pP@@@@@@@@@@@@@@N@``
+OL,3,G}CC{`|a~q}xO^G\C~I@CBSA~A@y@NAoBGCC@I
+OL,4,GtAeBAACaEa{P]~O~_CxCxAx@x@z@DApCxG|Ov
+OL,5,_WAG_{ow~xC~ck~_xG`G@Ap@xA
+OL,6,W[~|Oxd@@H@@@P@|@GGA@_@C@A@@@@@@@@
+OL,7,@~A|CxGpGuGmgmox@AApCHGpGuGMgmo
+OL,8,wOO_w~|xxzxRXRP@@@@
+OL,9,|@hxoqgw|@hxoqgw
+OL,10,~~~^sC@W@GPNXH@@@@@@@@@@
+OL,11,Pxqayoo^OG`XH~N}_Pxqayom\|{`xH~N}_
+OL,12,q_r_cDCD_GO_oGN^F^@_@CCGwAqB`
+OL,13,_NogoegwaA{@q@QNGgNNgGaeagbw@cAA@ANGg
+OL,14,~q_x_z_x_x|~~qx@X
+OL,15,_ropbpqxq}om{~YpI|@Aaaab_p@p`}dlzvXpI|A
+OL,16,~^~^}`\~[sE{gv_a_a_OpOxC|_~M~OC
+OL,17,@ABa@C@C@GHG\NM@N@O`|@x@|C@C@BsDFioG
+OL,18,@PCADA@@|AGElkOW@R@|`|@xA|C@B@C_Gnl@
+OL,19,Oq_z^z~[y_WsaP_u_{m`o@_@_x[y_osp_u_{o
+OL,20,_}~G~f~WoA_|_|xp``@dG`@L`O`J`DP
+OL,21,~Mo`Ix\XDHg@qHp_x|_ooox~
+OL,22,~@s@X@\@D@@@`@@@@@@@@@P@P@@@@@@@@@@@@@@@
+OL,23,wwkEC@o@@HpHp`r@{ww{}
+OL,24,s}Ax@h@H@@@@@@@@@@@@@H@@@@@@@@@@@@@@@@@@
+PN,2b203
+SC,0003
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,}wCAA__
+OL,2,{|i|`p@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@
+OL,3,
+OL,4,___^A@A@O@CO@@@@@@@@@@@@@@@@@@@@
+OL,5,sqtsqt
+OL,6,@L@N@K@@@@@@@@@@@@@@
+OL,7,~D~Fev~r|szV|WKC~E~Gftzpxp~u~B~@~@
+OL,8,__}yy{u_ykyHy@y@A{A{@^@NCNCNA^A@@
+OL,9,DKWfNT^N@OBX@pAHqqAspK`FPDlN~A|AxA[qBBn@
+OL,10,Iu[n__QAXFQGQdqMCQcpLpI\K~_~^xNxN[NC|o|
+OL,11,S~OKs~C}wikono_}SOOOo_moml_~
+OL,12,x|qlp|@XAxazYzY{~Yl@p@p@@@@@@PPPpP`P`@
+OL,13,~]MXx|x|~}v}Y`]
+OL,14,X@H@@@@@@@@@@@@@@@`@@@@@@@@@@@@@@@@@@@@@
+OL,15,@_@VDVHgPoLO@@_@~g~{scs_
+OL,16,@@@@@@@@@@@@@`@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,17,__
+OL,18,@@@@@@@@@@@@@@B@H@P@@@@@@@@@@@@@@@@@@@@@
+OL,19,
+OL,20,[@@_@@_@_@O@G@C@@@@@@@@@@@@@@@@@@@@
+OL,21,
+OL,22,yxy{{sssCc@@@@@@@@@@@@@@@@@@@@
+OL,23,{Fr@rE{A}dDaa``~Aa`dAadddf
+OL,24,qA`a@apdpaxAxE|E|E~G@~@^@^@Z@^@^@Z@Z@Z@X
+PN,2b204
+SC,0004
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,Ar@bAa@cCaA@HG@KSO@_x@}F|E`C@A@HAOqK@OqN
+OL,2,GcBECG_G`G@OqKMGmGOIy}}{|z`|@~@w@tp|Pppp
+OL,3,w||xznojgsgo{gXgo{{oo_iwqwu{~x~
+OL,4,wLgl|G~W~g~oojOa_a@@@@@DpD`P@THLHEDGGG
+OL,5,@sBCC`JHV@LIL@FAL@L@}||_tGhOpFp@x@xAPA
+OL,6,@@@@@@@@P@L@L@D@L@l@@@@@@@@@@@@@@@@@`@`@
+OL,7,GGGOO___OO
+OL,8,@D@D@A@A@S@_@[@{@@@@@@@@@@@@@@@@@@@@@@
+OL,9,
+OL,10,_|~qscc~CB@@@@@@@@@@@@@@@@@@@@
+OL,11,
+OL,12,@@@@@A`A`@`@`@P@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,13,}~|~|~|
+OL,14,sCaC`@@@P@HDHLH\@X@@@@@@@@@@@@@@@@@@@@@
+OL,15,`hbp|xxoxC`GPffmmpv{g{Q
+OL,16,GGnOnOoOyOtOpCxAn@X@X@Q@Q@P@F@K@O@W@q
+OL,17,ROpWXOP]DGFYDoAoACgi_IOa_A]AWA[a_~_^O\Y
+OL,18,W]OQmI}KyIyM^MAmaecwxbpfPf@f@n@da``_`_`
+OL,19,xw|w{Oom{~}xo|KGKOOnGnGzC}By@
+OL,20,_Ptxtpx}xm|b}fGgCC@C@KpOPGPGFCGCCA
+OL,21,ZBjBoGgFGIcgowdADAT@xAhA`G`O`KPC@C
+OL,22,x@zBzCVFWF_L_L_lotdd@t@t@x@x@x@x@x@x@h@
+OL,23,O__~~|~}x
+OL,24,@]A|AxBxC@C`C@@@@C@@@@@@@@@@@@@@@@@@@@@G
+PN,2b205
+SC,0005
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,GgSx_O
+OL,2,DB|@\@X@@A@G@G`@P@@@@@@@@@@@@@@@@@P@x@
+OL,3,xQ@
+OL,4,@@@@@@@@@@@@~XpG@@@@@@@@@@@@@@@@@@@@@@@
+OL,5,~}||{y{ygxpOpO@_A\~|||||xx@x@xAx@x@
+OL,6,@`@p@s@R@@@B@E@L@K@[@@@@@@@@@@@@@@@A@@@@
+OL,7,K`f@DB`CP@x@p@`@HBA@Q@@@`dLtIpApApAx@x@X
+OL,8,BAG[SIrO~O~O~GsE|dA@@@@dLvIpApApAx@x@X
+OL,9,CmB_@n@O@[`O`GXA@@@Llu}s_spsE@AS@sFCGgc
+OL,10,SGBD`L@OLd_`laLg|gXWorp_ppsC@GSFs@C@g`
+OL,11,~_OOowoowG}@z`K`Ipm@m`ohghCPAp
+OL,12,sE_tvoRR_PWXW|o~OO@O`O`OpopopoxgxCXAH
+OL,13,sgkw{~}\juG~Go~HGXG@G@CACcDJ@@@@PA@
+OL,14,w`g`jd~d\guC|D|PCH@X@@D@@@@`A@@@C@O@
+OL,15,}}roag_p`B~M|^\@`@@@@@@@
+OL,16,@D@l@B@m@^`LapN@p@@@@O@_A}ApCaG_
+OL,17,~@~g_}\_mCMAC@P@@@@@B@@@c`R|r@
+OL,18,n@BR@Y@M@G`@@c`R~r@|@~@@}\_l@L@
+OL,19,o|tP_MfOfo~Am}CPCKc@`rYpYP@A@~@R@B`
+OL,20,I`O`BxvYpYR@C@~@fAba@@@@]@MfOfo~AA`A@
+OL,21,G|Gxv`_p_|sWox@x@IP`@`B@@@@@@L@HP
+OL,22,A}BC``y@C@@@@|@Gp@@@@@@_@_~C@O
+OL,23,@A@@@@P@@@`@|P`x~@P@@@@@@@@P@@@@@@@@@
+OL,24,~h~ssn@v@~@C`Bp@h@@@P@@@@@@@@`@|@@p|
+PN,2b206
+SC,0006
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,@@@@`M@A@EpEdS@C@C@GswqwXryzXz@R@@@@@@@@
+OL,2,LONogNVVeRHjxBxBx@|\spqpxqyyXy@Q@A@A@A@A
+OL,3,O___oyAxaD`d@@@PPC^DXP``[@
+OL,4,~E~yZ_x{qoSblbX]`{@AHAD@e`G`Opy
+OL,5,~zn~|}w|@@@@@@X@`A@E@QAC@BHC
+OL,6,xXa`F@X@pA@G@]ACO~G_~x`~@|@p@
+OL,7,|g|CyAlA|a\`XphpHP@C@XC|F~_~o^o_oO_OO
+OL,8,@C@\C|I~p~P_X_P_`O@O|`|@p@@@@@@@@@@@@@
+OL,9,g_O\_Fyzn}a_@^BVBLAX@PCBAFEQB@^`~a|i|s~
+OL,10,XOSCBA^eiB}~~~|w||F@N@OBAB@|@@@@@@@@@@
+OL,11,Ud}hrJPP@H@`@E|AlCOVBCBF@D@H@Q@S@B@FPLpH
+OL,12,z@b@@@@@@@@@@A@AHCHFA`A@@@@@@@@@@@@@@@@@
+OL,13,TNLQh@P@P@p@r@`@DX@BHAP@P@`@`A@S@_@S@A@A
+OL,14,GOgOo__~~ll`@l@BL@@@@@@@@@@A@S@_@S@A@A
+OL,15,EA_@W@]@C@CAD@@@@@@B@@`wHwbsxyxx@x@
+OL,16,@@p@~@`HxHVLEFDDxDPOA@_wGwasxyxx@x@
+OL,17,PADKaOA_EcgG_@FHGHF@I@^@|AxKpO`O@
+OL,18,|xXvXox~]|_xp_`@@A@C@O@_@acGO_
+OL,19,~{ws~C|CxC|At@d@xApD@H@LA|C|G|C~S
+OL,20,|@xApG@O@SACBCDCLAL@~xp`~@|@x@p@x@
+OL,21,_|_p}|t~|vv}s`C`C@C@A@A@A@C@G@C@C
+OL,22,{zYrxz|r|f|rnrt{dd@@`@@@@@@@@@@A@C@C@C
+OL,23,HphpXSx{X{XcXsXsxs`qO_Oh_@D\LL_LoL
+OL,24,@_`_@X`x@|@|@|@|p|p|@@@@@G@G@C@C@C@C@CPC
+PN,2b207
+SC,0007
+PS,8010
+PF,5,0
+OL,28,CE@@b{nxnKn{b{nxnKn{b{nxnKn{b{nxnKn{@@@@
+OL,1,t]~QqAIIo[o{n~dKbAn@N@N@V@V@d@EAQAy
+OL,2,O`Ai@I@A@Y@Y@{@zAnAFpX~Ppp``@A~P~y
+OL,3,JfJLXLZPX`y@r@p@uB`@tXtpepa`s@V@l@|@x@x
+OL,4,HDHHXDX@H@`@@@@@FxPG@@@@@@@@P@P@p@p@p@ox
+OL,5,@AH@@H@@@@@D@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+OL,6,L@@@@@@L@F@B@@@@@@x@@@@@@@@@@@@@@@@@@@@@
+OL,7,@@``@@B`@@@@@`@@@@@@p@@@@@@@@@@@@@@@@@@@
+OL,8,HXPX@x@P@@@`@@@@@@@@p@@@@@@@@@@@@@@@@@@@
+OL,9,|xp`P~@@~H|@\@hBPDpH`P@`A@@@@@@@
+OL,10,~@|CxGpO`_@oAC@A@G@O|xp`@~@~@|@x@
+OL,11,T@v@~@^@@@_@_p_`]`sQ]uTZZZOKOKW
+OL,12,l@N@f@n@o@g@g@cpqpqhX@x@X@P@P@X@X@X@HPHH
+OL,13,_wOGwGwCA@o@_@_@C`KpCxKxO|C~G___
+OL,14,t_|O|G|GxC|AX@P@@@@@C@C@C@C@G@C@G@O@_@_
+OL,15,`QHq@y@qAqIqIpC`GpK{onONGFGjGhOhOhExC~O}
+OL,16,P^x~x~xZxXxXpXzX|FpBpApAxAxeygqgygyg{q{q
+OL,17,`accgO_AyCsC{_s_w__w_
+OL,18,AFBL@D\LXHP@@H@@@@@@~y}s{csgwow
+OL,19,`H`H`LbDTNPd`Fx@p@p@p`x@p@`@`@|@f@abdx
+OL,20,@O@_GoLCxEAC}YN][Gp`x@p@@@@@|@f@abdx
+OL,21,@@@@B@@B@@Cx@x@@P@@@@@@@@@@@@@@@P@@@@@@@
+OL,22,x@|@|@~@~@|poL|o|`@@@@@@@@@@@@Pp@@@@@@
+OL,23,@@@@@@B@A@B@@@@@@@@A@@@@@@@@@@@@@@@@@@@@
+OL,24,@@@@@@@@B@@@@@@@@\@\@@@@@@@@@@@@@@@@@@@@

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode3-MainPage.tti

@@ -0,0 +1,23 @@
+DE,Level 3.5 DRCS mode 3 parrot demo display page
+PN,21300
+SC,0000
+PS,8000
+RE,0
+CT,20,T
+OL,27,D@_|@@@A_|@@@B_|@@@OSlD@@H_|@@@H_|@@@@@@
+OL,28,@@@|g@@`DsIBGqXaUSUwSC^MfziDcxgUoywvOpF
+OL,28,A@@@@@@@@@@LJgtj}bszMo{ph\RkvKNkw|nC@@
+OL,26,@qD@^M`_m``MaamabMbcmbrD@^Mc_mc`MdamdbMe
+OL,26,AcmesD@^Mf_mf`MgamgbMhcmhtD@^Mi_mi`Mjamj
+OL,26,BbMkcmkuD@^Ml_ml`MmammbMncmnvD@^Mo_mo`Mp
+OL,26,CampbMqcmqwD@^Mr_mr`MsamsbMtcmtxD@^Mu_mu
+OL,26,D`MvamvbMwcmwCCCCCCCCC
+OL,7, Level 3.5 DRCS                         
+OL,9, Mode 3 characters                      
+OL,10,  6x5 pixels of                         
+OL,11,  4 bitplanes                           
+OL,12,  or 16 colours                         
+OL,14, 48 DRCS characters                     
+OL,15,  over 48 PTUs                          
+OL,17, 8 rows of 6 columns                    
+OL,18,  or 36x40 pixels                       

examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode3-Nptus.tti

@@ -0,0 +1,30 @@
+DE,Level 3.5 DRCS mode 3 parrot demo PTU page
+PN,2b300
+SC,0000
+PS,8010
+PF,5,0
+OL,28,CE@@sLsLsLsLsLsLsLsLsLsLsLsLsLsLsLsL@@@@
+OL,1,@@@@@@@@@@@@@@@@@@@@C@A@C@@@@FACpWOOxxG
+OL,2,h@@@`@@@vxFxA~@_Y@D@\@@@uHtH`_@
+OL,3,y@F@`@N@p@n@P`X`Dxpxa@o@BAM@A@L@H@A@G@@@
+OL,4,A``@@@@@K@@@@AA@@AA@}|C^Cwsssw[{s
+OL,5,`Cxsx~xy|y@@`@NAa~AA~
+OL,6,Otx|A|~~CD~C@GB@PoPC\`^p@O@tc\cHFy~
+OL,7,B@@@B@B@ApIpKpKqFbQcyEswXmPMNxp~_~`[_x`
+OL,8,|xqA_~_O@F@G@@ppO}@}@m@@@
+OL,9,GF{[Yg@@@O@lgx_WR}nZZuoXXg}}~C
+OL,10,GYvVf[e}EKvXcZdKSa^|h@p@p@uP@}wx@
+OL,11,B@@s@@c@@kw@@w@@O@@C@@@@@@@
+OL,12,@@_@_@O@~xGy||Cx}AB|}YB|}YB
+OL,13,OcRl]EcNwGgHGo_`gO{Dpp@z|x@z|rH^Lrl~hvL
+OL,14,_@@OA@O_C@O_C@o_f@|@z@z@p@p@
+OL,15,C@@@@@@@}@@|}]B~MBnFA~`G@YbMB
+OL,16,_gWhKByGyFycG|CCtOpHvLwlSl@`~qNp~qOp
+OL,17,_d@_~BA^}AFwHxG@@_C@Op`pOOp@@QnoP
+OL,18,||@@c|A@Ez@@@a^^axFyFaB|BB@}@pHLp}BB|
+OL,19,EjWhGhUjCA`CSDoCODfO@xG@l_~AQ~{DGxoP]`
+OL,20,}BC|d[W`pOs@pOs@i^BA}BfPrL|@sL|@A~}@{DCx
+OL,21,Hdc@\@G@FHA@jP@@P`@@GXxGA^b]AZdZ@@Z@B@`@
+OL,22,_hl_QP{efysINqaPW`oPo@GxG@C|C@a^a@QnQ@
+OL,23,yNrAy^bQ\{oP|~Ju}~B}sLKp^KD{~O@~^A~~~A~
+OL,24,`@@@@pLp@@~@PAo@@PoP@@@@@@@@@@@@d@@@A@b@

examples/Level3p5-Joseph.tti

@@ -0,0 +1,22 @@
+DE,The colours of Joseph's dreamcoat
+PN,19900
+SC,0000
+PS,8000
+CT,20,T
+OL,28,@@@|g`VrO@_r{kGFBooWk}M`ooGDsL`ORrs}c@@@
+OL,28,D@@|g@@pC@|p@@CH|O@pwp}]@@wAws]G@@
+OL,26,@lD@`CHnD@AcHTCI`cIpD@ACJJcEL`CTcJ`CKrD@
+OL,26,AhQRAcKTCL`cLtD@JCMTcM`cBvD@ACNTcN`cGxD@
+OL,26,BAcFTCO`cO_CpURJcDjD@ACElD@JCGBBB
+OL,2, It was...                              
+OL,4,A]GRed   C]DYellow B]DGreen  MLA]GBrown 
+OL,6,A]GScarlet\ Black  A]GOchre  MLC]DPeach 
+OL,8,E]GRuby  C]DOlive  E]GViolet MLC]DFawn  
+OL,10,E]DLilac C]DGold MLA]GChocolateE]DMauve 
+OL,12, ]DCream A]GCrimson ]DSilver MLE]GRose  
+OL,14,D]GAzure C]DLemon  A]GRusset ML \ Grey  
+OL,16,E]GPurple ]DWhite  E]DPink   MLA]GOrange
+OL,18,                            andD]GBlue!M
+OL,21,  FRose is CLUT 0:5. Gold, Cream and    
+OL,22,  FLemon are in CLUT 1 and applied with 
+OL,23,  Fa Level 3.5 only Object.             

share/qteletextmaker.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=QTeletextMaker
+GenericName=Teletext page editor
+Exec=qteletextmaker %F
+TryExec=qteletextmaker
+Categories=Graphics;
+Keywords=teletext;
+MimeType=text/x.teletext.tti;text/x-softel-teletext;

src/qteletextdecoder/CMakeLists.txt

@@ -1,6 +1,6 @@
 file (GLOB SOURCES *.cpp)
 
-add_library(qteletextdecoder ${SOURCES} teletextfonts.qrc)
+add_library(qteletextdecoder STATIC ${SOURCES} teletextfonts.qrc)
 
 target_include_directories(qteletextdecoder PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 

src/qteletextdecoder/decode.cpp

@@ -19,9 +19,16 @@
 
 #include "decode.h"
 
+#include <QByteArray>
+#include <QImage>
 #include <QList>
 #include <QMultiMap>
 
+#include "drcspage.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+
 TeletextPageDecode::Invocation::Invocation()
 {
 	m_tripletList = nullptr;
@@ -113,6 +120,21 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 				if (targetRow == 0)
 					m_fullRowCLUTMap.insert(targetRow, triplet);
 				break;
+			case 0x18: // DRCS mode
+				// If a DRCS character is already in this cell, move this DRCS mode attribute to the next cell.
+				// Need this workaround in the event of "DRCS character" immediately followed by "DRCS mode" in
+				// the X/26 list as the Active Position for the just-placed DRCS character and the mode-change
+				// for further characters is on the same cell.
+				for (int i=0; i<m_characterMap.values(qMakePair(targetRow, targetColumn)).size(); i++)
+					if (m_characterMap.values(qMakePair(targetRow, targetColumn)).at(i).modeExt() == 0x2d) {
+						targetColumn++;
+						if (targetColumn == 40 || targetColumn == 56 || targetColumn == 72) {
+							if (targetRow == 25)
+								break;
+							targetRow++;
+						}
+					}
+				// fall-through
 			case 0x20: // Foreground colour
 			case 0x23: // Background colour
 			case 0x27: // Additional flash functions
@@ -128,6 +150,7 @@ void TeletextPageDecode::Invocation::buildMap(int level)
 			case 0x22: // G3 character at Level 1.5
 			case 0x29: // G0 character
 			case 0x2b: // G3 character at Level 2.5
+			case 0x2d: // DRCS character
 			case 0x2f: // G2 character
 				m_characterMap.insert(qMakePair(targetRow, targetColumn), triplet);
 				m_rightMostColumn.insert(targetRow, targetColumn);
@@ -184,6 +207,9 @@ TeletextPageDecode::TeletextPageDecode()
 		m_fullRowQColor[r].setRgb(0, 0, 0);
 	}
 	m_leftSidePanelColumns = m_rightSidePanelColumns = 0;
+
+	m_drcsPage[GlobalDRCSPage] = nullptr;
+	m_drcsPage[NormalDRCSPage] = nullptr;
 }
 
 TeletextPageDecode::~TeletextPageDecode()
@@ -203,6 +229,28 @@ void TeletextPageDecode::setTeletextPage(LevelOnePage *newCurrentPage)
 	updateSidePanels();
 }
 
+void TeletextPageDecode::setDRCSPage(DRCSPageType pageType, QList<DRCSPage> *pages)
+{
+	m_drcsPage[pageType] = pages;
+
+	bool refreshRequired = false;
+
+	for (int r=0; r<25; r++)
+		for (int c=0; c<72; c++)
+			if (m_cell[r][c].character.drcsSource != NoDRCS) {
+				m_refresh[r][c] = true;
+				refreshRequired = true;
+			}
+
+	if (refreshRequired)
+		decodePage();
+}
+
+void TeletextPageDecode::clearDRCSPage(DRCSPageType pageType)
+{
+	setDRCSPage(pageType, nullptr);
+}
+
 void TeletextPageDecode::setLevel(int level)
 {
 	if (level == m_level)
@@ -218,6 +266,117 @@ void TeletextPageDecode::setLevel(int level)
 	decodePage();
 }
 
+QImage TeletextPageDecode::drcsImage(DRCSSource pageType, int subTable, int chr, bool flashPhOn)
+{
+	if (pageType == NoDRCS)
+		return QImage();
+
+	// Check if page is loaded and if the subpage exists
+	const QList<DRCSPage>* drcsPage = m_drcsPage[pageType-1];
+	if (drcsPage == nullptr || subTable >= drcsPage->size())
+		return QImage();
+
+	// Level 2.5: only and always mode 0 (12x10x1) and doesn't use X/28/3
+	// Level 3.5: if X/28/3 is absent, drcsMode below returns mode 0
+	if (m_level == 2 || drcsPage->at(subTable).drcsMode(chr) == 0) {
+		uchar rawData[20];
+
+		if (!drcsPage->at(subTable).ptu(chr, rawData))
+			return QImage();
+
+		QImage result = QImage(rawData, 12, 10, 2, QImage::Format_Mono);
+		return result.copy();
+	}
+
+	// Level 3.5: obey X/28/3 "subsequent PTU" and "no data" values, ignore reserved values
+	const int drcsMode = drcsPage->at(subTable).drcsMode(chr);
+	if (drcsMode > 3)
+		return QImage();
+
+	uchar rawData[120];
+
+	if (drcsMode != 3) {
+		// mode 1 (12x10x2) or mode 2 (12x10x4)
+		// Each complete bitplane stored sequentially across multiple PTUs
+
+		uchar bitplaneArr[4][20] = { };
+
+		// Get the PTUs for each bitplane
+		drcsPage->at(subTable).ptu(chr, bitplaneArr[0]);
+		if (chr < 47)
+			drcsPage->at(subTable).ptu(chr+1, bitplaneArr[1]);
+		if (drcsMode == 2) {
+			if (chr < 46)
+				drcsPage->at(subTable).ptu(chr+2, bitplaneArr[2]);
+			if (chr < 45)
+				drcsPage->at(subTable).ptu(chr+3, bitplaneArr[3]);
+		}
+
+		// Now assemble the bitplanes into byte-per-pixel data
+		for (int x=0; x<12; x++)
+			for (int y=0; y<10; y++) {
+				const int scanByte = y*2 + (x > 7);
+				const int scanBit = 7 - x%8;
+
+				rawData[x + y*12] = bitplaneArr[0][scanByte] >> scanBit & 1;
+				rawData[x + y*12] |= (bitplaneArr[1][scanByte] >> scanBit & 1) << 1;
+				if (drcsMode == 2) {
+					rawData[x + y*12] |= (bitplaneArr[2][scanByte] >> scanBit & 1) << 2;
+					rawData[x + y*12] |= (bitplaneArr[3][scanByte] >> scanBit & 1) << 3;
+				}
+			}
+	} else {
+		// mode 3 (6x5x4)
+		// Interleaved: First row of six pixels is stored four times sequentially, one for
+		// each bitplane, then second row of pixels four times, and so on
+		const int pktNo = (chr+2)/2;
+
+		if (!drcsPage->at(subTable).packetExists(pktNo))
+			return QImage();
+
+		QByteArray pkt;
+
+		if (chr % 2 == 0)
+			pkt = drcsPage->at(subTable).packet(pktNo).first(20);
+		else
+			pkt = drcsPage->at(subTable).packet(pktNo).last(20);
+
+		for (int x=0; x<6; x++)
+			for (int y=0; y<5; y++) {
+				const int scanByte = y * 4;
+				const int scanBit = 5 - x;
+				uchar pixel;
+
+				pixel = pkt.at(scanByte) >> scanBit & 1;
+				pixel |= (pkt.at(scanByte+1) >> scanBit & 1) << 1;
+				pixel |= (pkt.at(scanByte+2) >> scanBit & 1) << 2;
+				pixel |= (pkt.at(scanByte+3) >> scanBit & 1) << 3;
+
+				rawData[x*2   + y*24   ] = pixel;
+				rawData[x*2+1 + y*24   ] = pixel;
+				rawData[x*2   + y*24+12] = pixel;
+				rawData[x*2+1 + y*24+12] = pixel;
+			}
+	}
+
+	QImage result = QImage(rawData, 12, 10, 12, QImage::Format_Indexed8);
+
+	// Now put in the colours
+	for (int i=0; i<16; i++) {
+		const int clr = m_levelOnePage->dCLUT(pageType-1, drcsMode, i);
+
+		if (flashPhOn)
+			result.setColor(i, m_levelOnePage->CLUTtoQColor(clr).rgb());
+		else
+			result.setColor(i, m_levelOnePage->CLUTtoQColor(clr ^ 8).rgb());
+
+		if (i == 3 && drcsMode == 1)
+			break;
+	}
+
+	return result.copy();
+}
+
 void TeletextPageDecode::updateSidePanels()
 {
 	int oldLeftSidePanelColumns = m_leftSidePanelColumns;
@@ -315,7 +474,8 @@ TeletextPageDecode::textCharacter TeletextPageDecode::characterFromTriplets(cons
 	for (int a=triplets.size()-1; a>=0; a--) {
 		const X26Triplet triplet = triplets.at(a);
 
-		if (triplet.data() < 0x20)
+		// Data values below 0x20 are reserved, except for DRCS character
+		if (triplet.data() < 0x20 && triplet.modeExt() != 0x2d)
 			continue;
 
 		const unsigned char charCode = triplet.data();
@@ -353,6 +513,9 @@ TeletextPageDecode::textCharacter TeletextPageDecode::characterFromTriplets(cons
 			case 0x2b: // G3 character at Level 2.5
 				result = { charCode, 26, 0 };
 				break;
+			case 0x2d: // DRCS character
+				result.drcsSource = (charCode & 0x40) == 0x40 ? NormalDRCS : GlobalDRCS;
+				result.drcsChar = charCode & 0x3f;
 		}
 	}
 
@@ -631,6 +794,7 @@ void TeletextPageDecode::decodeRow(int r)
 
 						bool applyAdapt = false;
 
+						drcsMode *drcsModePtr;
 						// Adaptive Invocation that is applying an attribute
 						// If we're not tracking an Adaptive Invocation yet, start tracking this one
 						// Otherwise check if this Invocation is the the same one as we are tracking
@@ -645,6 +809,16 @@ void TeletextPageDecode::decodeRow(int r)
 						}
 
 						switch (triplet.modeExt()) {
+							case 0x18: // DRCS mode
+								drcsModePtr = (triplet.data() & 0x40) == 0x40 ? &painter->nDrcs : &painter->gDrcs;
+								if ((triplet.data() & 0x30) != 0x00) {
+									drcsModePtr->level2p5 = triplet.data() & 0x10;
+									drcsModePtr->level3p5 = triplet.data() & 0x20;
+									// "used" is never set to true on Level 3.5, to allow all 16 sub-tables
+									if (!drcsModePtr->used)
+										drcsModePtr->subTable = triplet.data() & 0x0f;
+								}
+								break;
 							case 0x20: // Foreground colour
 								if (applyAdapt)
 									adapForeground = true;
@@ -733,6 +907,7 @@ void TeletextPageDecode::decodeRow(int r)
 
 		if (c < 40 && m_rowHeight[r] != BottomHalf) {
 			m_level1ActivePainter.result.character.diacritical = 0;
+			m_level1ActivePainter.result.character.drcsSource = NoDRCS;
 			if (m_levelOnePage->character(r, c) >= 0x20) {
 				m_level1ActivePainter.result.character.code = m_levelOnePage->character(r, c);
 				if (m_cellLevel1MosaicChar[r][c]) {
@@ -773,7 +948,36 @@ void TeletextPageDecode::decodeRow(int r)
 				for (int i=0; i<m_invocations[t].size(); i++) {
 					painter = (t == 0) ? &m_level1ActivePainter : &m_adapPassPainter[t-1][i];
 
-					const textCharacter result = characterFromTriplets(m_invocations[t].at(i).charactersMappedAt(r, c));
+					textCharacter result = characterFromTriplets(m_invocations[t].at(i).charactersMappedAt(r, c));
+
+					if (result.drcsSource) {
+						drcsMode *drcsModePtr = result.drcsSource == NormalDRCS ? &painter->nDrcs : &painter->gDrcs;
+
+						if ((m_level == 2 && drcsModePtr->level2p5) || (m_level == 3 && drcsModePtr->level3p5)) {
+							// "code" is zero if an X/26 character is NOT invoked in the same cell
+							if (result.code == 0x00)
+								result.code = 0x20;
+							result.drcsSubTable = drcsModePtr->subTable;
+							if (m_level < 3)
+								drcsModePtr->used = true;
+						} else
+							// DRCS character not required at the current level
+							result.drcsSource = NoDRCS;
+					}
+
+					// If the DRCS character in question is not downloaded, scrap all that hard work
+					// looking it up.
+					// Ideally we'd leave it in case somebody wants to find which character was meant
+					// to be invoked, but things like underlying Level 1 characters still needing to
+					// appear when the DRCS characters are not (yet) downloaded are too complex to
+					// figure out with this too complex decoder.
+					if (result.drcsSource) {
+						const QList<DRCSPage>* drcsPage = m_drcsPage[result.drcsSource-1];
+						if (drcsPage == nullptr || result.drcsSubTable >= drcsPage->size() || !drcsPage->at(result.drcsSubTable).ptu(result.drcsChar, nullptr)) {
+							result.drcsSource = NoDRCS;
+							result.code = 0x00;
+						}
+					}
 
 					if (t == 0 && result.code == 0x00)
 						continue;

src/qteletextdecoder/decode.h

@@ -20,11 +20,14 @@
 #ifndef DECODE_H
 #define DECODE_H
 
+#include <QImage>
 #include <QList>
 #include <QMap>
 #include <QMultiMap>
 
+#include "drcspage.h"
 #include "levelonepage.h"
+#include "pagebase.h"
 
 class TeletextPageDecode : public QObject
 {
@@ -32,15 +35,22 @@ class TeletextPageDecode : public QObject
 
 public:
 	enum CharacterFragment { NormalSize, DoubleHeightTopHalf, DoubleHeightBottomHalf, DoubleWidthLeftHalf, DoubleWidthRightHalf, DoubleSizeTopLeftQuarter, DoubleSizeTopRightQuarter, DoubleSizeBottomLeftQuarter, DoubleSizeBottomRightQuarter };
+	enum DRCSPageType { NormalDRCSPage, GlobalDRCSPage };
+//	enum ObjectPageType { NormalPOPage = 2, GlobalPOPage };
+	enum DRCSSource { NoDRCS, NormalDRCS, GlobalDRCS };
 	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);
+	int level() const { return m_level; }
 	void decodePage();
 	LevelOnePage *teletextPage() const { return m_levelOnePage; };
 	void setTeletextPage(LevelOnePage *newCurrentPage);
+	QList<DRCSPage> *drcsPage(DRCSPageType pageType) const { return m_drcsPage[pageType]; };
+	void setDRCSPage(DRCSPageType pageType, QList<DRCSPage> *pages);
+	void clearDRCSPage(DRCSPageType pageType);
 	void updateSidePanels();
 
 	unsigned char cellCharacterCode(int r, int c) const { return m_cell[r][c].character.code; };
@@ -48,6 +58,13 @@ public:
 	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; };
+
+	DRCSSource cellDrcsSource(int r, int c) const { return m_cell[r][c].character.drcsSource; };
+	int cellDrcsSubTable(int r, int c) const { return m_cell[r][c].character.drcsSubTable; };
+	int cellDrcsCharacter(int r, int c) const { return m_cell[r][c].character.drcsChar; };
+
+	QImage drcsImage(DRCSSource pageType, int subTable, int chr, bool flashPhOn = true);
+
 	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);
@@ -102,13 +119,19 @@ private:
 		unsigned char code=0x20;
 		int set=0;
 		int diacritical=0;
+		DRCSSource drcsSource=NoDRCS;
+		int drcsSubTable=0;
+		int drcsChar=0;
 	};
 
 	friend inline bool operator!=(const textCharacter &lhs, const textCharacter &rhs)
 	{
-		return lhs.code        != rhs.code ||
+		return lhs.code         != rhs.code         ||
-	           lhs.set         != rhs.set  ||
+		       lhs.set          != rhs.set          ||
-	           lhs.diacritical != rhs.diacritical;
+		       lhs.diacritical  != rhs.diacritical  ||
+		       lhs.drcsSource   != rhs.drcsSource   ||
+		       lhs.drcsSubTable != rhs.drcsSubTable ||
+		       lhs.drcsChar     != rhs.drcsChar;
 	}
 
 	struct flashFunctions {
@@ -178,12 +201,21 @@ private:
 		       lhs.fragment  != rhs.fragment;
 	}
 
+	struct drcsMode {
+		bool level2p5=true;
+		bool level3p5=true;
+		bool used=false;
+		int subTable=0;
+	};
+
 	struct textPainter {
 		textAttributes attribute;
 		textCell result;
 		textCell rightHalfCell;
 		textCell bottomHalfCell[72];
 
+		drcsMode gDrcs, nDrcs;
+
 		int styleSpreadRows=0;
 		int setProportionalRows[72], clearProportionalRows[72];
 		int setBoldRows[72], clearBoldRows[72];
@@ -266,6 +298,7 @@ private:
 	bool m_cellLevel1MosaicChar[25][40];
 	int m_cellLevel1CharSet[25][40];
 	LevelOnePage* m_levelOnePage;
+	QList<DRCSPage>* m_drcsPage[2];
 	int m_fullRowColour[25];
 	QColor m_fullRowQColor[25];
 	QList<Invocation> m_invocations[3];

src/qteletextdecoder/drcspage.cpp

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2020-2025 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 <QByteArray>
+
+#include "drcspage.h"
+
+DRCSPage::DRCSPage(const PageBase &other)
+{
+	for (int y=0; y<26; y++)
+		if (other.packetExists(y))
+			setPacket(y, other.packet(y));
+
+	for (int y=26; y<29; y++)
+		for (int d=0; d<16; d++)
+			if (other.packetExists(y, d))
+				setPacket(y, d, other.packet(y, d));
+
+	for (int b=PageBase::C4ErasePage; b<=PageBase::C14NOS; b++)
+		setControlBit(b, other.controlBit(b));
+}
+
+PageBase::PageFunctionEnum DRCSPage::pageFunction() const
+{
+	return PFGlobalPOP;
+}
+
+int DRCSPage::drcsMode(int c) const
+{
+	if (!packetExists(28, 3))
+		return 0;
+
+	const QByteArray pkt = packet(28, 3);
+
+	// Some tricky bit juggling to extract 4 bits from part of a 6-bit triplet
+	switch (c % 3) {
+		case 0:
+			return pkt.at(c/3*2 + 4) & 0xf;
+		case 1:
+			return ((pkt.at((c-1)/3*2 + 4) & 0x30) >> 4) | ((pkt.at((c-1)/3*2 + 5) & 0x3) << 2);
+		case 2:
+			return pkt.at(((c-2)/3*2 + 5) & 0x3f) >> 2;
+	}
+
+	return 0; // Won't get here; used to suppress a compiler warning
+}
+
+bool DRCSPage::ptu(int c, uchar *data) const
+{
+	const int pktNo = (c+2)/2;
+
+	if (!packetExists(pktNo))
+		return false;
+
+	const int start = c%2 * 20;
+
+	// FIXME should we check all 20 D-bytes for SPACE instead of just the first D-byte?
+	if (packet(pktNo).at(start) < 0x40)
+		return false;
+
+	if (data != nullptr) {
+		const int end = start + 20;
+
+		for (int i=start, j=0; i<end; i+=2, j+=2) {
+			data[j] = ((packet(pktNo).at(i) & 0x3f) << 2) | ((packet(pktNo).at(i+1) & 0x30) >> 4);
+			data[j+1] = (packet(pktNo).at(i+1) & 0x0f) << 4;
+		}
+	}
+
+	return true;
+}

src/qteletextdecoder/drcspage.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020-2025 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 DRCSPAGE_H
+#define DRCSPAGE_H
+
+#include <QByteArray>
+
+#include "pagebase.h"
+
+class DRCSPage : public PageBase
+{
+public:
+	DRCSPage(const PageBase &other);
+
+	// TODO PFNormalPOP as well?
+	PageFunctionEnum pageFunction() const;
+
+	int drcsMode(int c) const;
+	bool ptu(int c, uchar *data) const;
+};
+
+#endif

src/qteletextdecoder/levelonepage.cpp

@@ -33,32 +33,29 @@ LevelOnePage::LevelOnePage()
 	clearPage();
 }
 
-// BUG this copy constructor isn't used? Parameter should be LevelOnePage
 LevelOnePage::LevelOnePage(const PageBase &other)
 {
 	m_enhancements.reserve(maxEnhancements());
 	clearPage();
 
-	for (int i=0; i<26; i++)
+	for (int y=0; y<26; y++)
-		if (other.packetExists(i))
+		if (other.packetExists(y))
-			setPacket(i, other.packet(i));
+			setPacket(y, other.packet(y));
-	for (int i=26; i<30; i++)
-		for (int j=0; j<16; j++)
-			if (other.packetExists(i, j))
-				setPacket(i, j, other.packet(i));
 
-	for (int i=PageBase::C4ErasePage; i<=PageBase::C14NOS; i++)
+	for (int y=26; y<29; y++)
-		setControlBit(i, other.controlBit(i));
+		for (int d=0; d<16; d++)
+			if (other.packetExists(y, d))
+				setPacket(y, d, other.packet(y, d));
+
+	for (int b=PageBase::C4ErasePage; b<=PageBase::C14NOS; b++)
+		setControlBit(b, other.controlBit(b));
 }
 
 // So far we only call clearPage() once, within the constructor
 void LevelOnePage::clearPage()
 {
-	for (int r=0; r<25; r++)
+	for (int b=C4ErasePage; b<=C14NOS; b++)
-		for (int c=0; c<40; c++)
+		setControlBit(b, false);
-			m_level1Page[r][c] = 0x20;
-	for (int i=C4ErasePage; i<=C14NOS; i++)
-		setControlBit(i, false);
 	for (int i=0; i<8; i++)
 		m_composeLink[i] = { (i<4) ? i : 0, false, i>=4, 0x0ff, 0x0000 };
 	for (int i=0; i<6; i++)
@@ -92,38 +89,24 @@ bool LevelOnePage::isEmpty() const
 		return false;
 
 	for (int r=0; r<25; r++)
-		for (int c=0; c<40; c++)
+		if (!PageX26Base::packet(r).isEmpty())
-			if (m_level1Page[r][c] != 0x20)
+			return false;
-				return false;
 
 	return true;
 }
 
-QByteArray LevelOnePage::packet(int packetNumber) const
+QByteArray LevelOnePage::packet(int y, int d) const
 {
 	QByteArray result(40, 0x00);
 
-	if (packetNumber <= 24) {
+	if (y == 26) {
-		for (int c=0; c<40; c++)
+		if (!packetFromEnhancementListNeeded(d))
-			result[c] = m_level1Page[packetNumber][c];
-		return result;
-	}
-
-	return PageBase::packet(packetNumber);
-}
-
-QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
-{
-	QByteArray result(40, 0x00);
-
-	if (packetNumber == 26) {
-		if (!packetFromEnhancementListNeeded(designationCode))
 			return result; // Blank result
 
-		return packetFromEnhancementList(designationCode);
+		return packetFromEnhancementList(d);
 	}
 
-	if (packetNumber == 27 && designationCode == 0) {
+	if (y == 27 && d == 0) {
 		for (int i=0; i<6; i++) {
 			result[i*6+1] = m_fastTextLink[i].pageNumber & 0x00f;
 			result[i*6+2] = (m_fastTextLink[i].pageNumber & 0x0f0) >> 4;
@@ -138,9 +121,9 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
+	if (y == 27 && (d == 4 || d == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
 
 			result[i*6+1] = (m_composeLink[pageLinkNumber].level3p5 << 3) | (m_composeLink[pageLinkNumber].level2p5 << 2) | m_composeLink[pageLinkNumber].function;
 			result[i*6+2] = ((m_composeLink[pageLinkNumber].pageNumber & 0x100) >> 3) | 0x10 | (m_composeLink[pageLinkNumber].pageNumber & 0x00f);
@@ -154,8 +137,8 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	if (packetNumber == 28 && (designationCode == 0 || designationCode == 4)) {
+	if (y == 28 && (d == 0 || d == 4)) {
-		int CLUToffset = (designationCode == 0) ? 16 : 0;
+		int CLUToffset = (d == 0) ? 16 : 0;
 
 		result[1] = 0x00;
 		result[2] = ((m_defaultCharSet & 0x3) << 4) | (m_defaultNOS << 1);
@@ -175,36 +158,32 @@ QByteArray LevelOnePage::packet(int packetNumber, int designationCode) const
 		return result;
 	}
 
-	return PageBase::packet(packetNumber, designationCode);
+	return PageX26Base::packet(y, d);
 }
 
-bool LevelOnePage::setPacket(int packetNumber, QByteArray packetContents)
+/*
+bool LevelOnePage::setPacket(int y, QByteArray pkt)
 {
-	if (packetNumber <= 24) {
+	if (y == 25)
-		for (int c=0; c<40; c++)
+		qDebug("LevelOnePage unhandled setPacket X/25");
-			m_level1Page[packetNumber][c] = packetContents.at(c);
+
+	return PageX26Base::setPacket(y, pkt);
+}
+*/
+
+bool LevelOnePage::setPacket(int y, int d, QByteArray pkt)
+{
+	if (y == 26) {
+		setEnhancementListFromPacket(d, pkt);
 		return true;
 	}
 
-	qDebug("LevelOnePage unhandled setPacket X/%d", packetNumber);
+	if (y == 27 && d == 0) {
-	// BUG can't store unhandled packets as default copy constructor uses pointers
-	//return PageBase::setPacket(packetNumber, packetContents);
-	return false;
-}
-
-bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray packetContents)
-{
-	if (packetNumber == 26) {
-		setEnhancementListFromPacket(designationCode, packetContents);
-		return true;
-	}
-
-	if (packetNumber == 27 && designationCode == 0) {
 		for (int i=0; i<6; i++) {
-			int relativeMagazine = (packetContents.at(i*6+4) >> 3) | ((packetContents.at(i*6+6) & 0xc) >> 1);
+			int relativeMagazine = (pkt.at(i*6+4) >> 3) | ((pkt.at(i*6+6) & 0xc) >> 1);
-			int pageNumber = (packetContents.at(i*6+2) << 4) | packetContents.at(i*6+1);
+			int pageNumber = (pkt.at(i*6+2) << 4) | pkt.at(i*6+1);
 			m_fastTextLink[i].pageNumber = (relativeMagazine << 8) | pageNumber;
-			m_fastTextLink[i].subPageNumber = packetContents.at(i*6+3) | ((packetContents.at(i*6+4) & 0x7) << 4) | (packetContents.at(i*6+5) << 8) | ((packetContents.at(i*6+6) & 0x3) << 12);
+			m_fastTextLink[i].subPageNumber = pkt.at(i*6+3) | ((pkt.at(i*6+4) & 0x7) << 4) | (pkt.at(i*6+5) << 8) | ((pkt.at(i*6+6) & 0x3) << 12);
 			// TODO remove this warning when we can preserve FastText subpage links
 			if (m_fastTextLink[i].subPageNumber != 0x3f7f)
 				qDebug("FastText link %d has custom subPageNumber %x - will NOT be saved!", i, m_fastTextLink[i].subPageNumber);
@@ -212,73 +191,58 @@ bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray p
 		return true;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
+	if (y == 27 && (d == 4 || d == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
-			int pageFunction = packetContents.at(i*6+1) & 0x03;
+			int pageFunction = pkt.at(i*6+1) & 0x03;
 			if (i >= 4)
 				m_composeLink[pageLinkNumber].function = pageFunction;
 			else if (i != pageFunction)
 				qDebug("X/27/4 link number %d fixed at function %d. Attempted to set to %d.", pageLinkNumber, pageLinkNumber, pageFunction);
 
-			m_composeLink[pageLinkNumber].level2p5 = packetContents.at(i*6+1) & 0x04;
+			m_composeLink[pageLinkNumber].level2p5 = pkt.at(i*6+1) & 0x04;
-			m_composeLink[pageLinkNumber].level3p5 = packetContents.at(i*6+1) & 0x08;
+			m_composeLink[pageLinkNumber].level3p5 = pkt.at(i*6+1) & 0x08;
 
-			m_composeLink[pageLinkNumber].pageNumber = ((packetContents.at(i*6+3) & 0x03) << 9) | ((packetContents.at(i*6+2) & 0x20) << 3) | ((packetContents.at(i*6+3) & 0x3c) << 2) | (packetContents.at(i*6+2) & 0x0f);
+			m_composeLink[pageLinkNumber].pageNumber = ((pkt.at(i*6+3) & 0x03) << 9) | ((pkt.at(i*6+2) & 0x20) << 3) | ((pkt.at(i*6+3) & 0x3c) << 2) | (pkt.at(i*6+2) & 0x0f);
 
-			m_composeLink[pageLinkNumber].subPageCodes = (packetContents.at(i*6+4) >> 2) | (packetContents.at(i*6+5) << 4) | (packetContents.at(i*6+6) << 10);
+			m_composeLink[pageLinkNumber].subPageCodes = (pkt.at(i*6+4) >> 2) | (pkt.at(i*6+5) << 4) | (pkt.at(i*6+6) << 10);
 		}
 		return true;
 	}
 
-	if (packetNumber == 28 && (designationCode == 0 || designationCode == 4)) {
+	if (y == 28 && (d == 0 || d == 4)) {
-		int CLUToffset = (designationCode == 0) ? 16 : 0;
+		int CLUToffset = (d == 0) ? 16 : 0;
 
-		m_defaultCharSet = ((packetContents.at(2) >> 4) & 0x3) | ((packetContents.at(3) << 2) & 0xc);
+		m_defaultCharSet = ((pkt.at(2) >> 4) & 0x3) | ((pkt.at(3) << 2) & 0xc);
-		m_defaultNOS = (packetContents.at(2) >> 1) & 0x7;
+		m_defaultNOS = (pkt.at(2) >> 1) & 0x7;
-		m_secondCharSet = ((packetContents.at(3) >> 5) & 0x1) | ((packetContents.at(4) << 1) & 0xe);
+		m_secondCharSet = ((pkt.at(3) >> 5) & 0x1) | ((pkt.at(4) << 1) & 0xe);
-		m_secondNOS = (packetContents.at(3) >> 2) & 0x7;
+		m_secondNOS = (pkt.at(3) >> 2) & 0x7;
 
-		m_leftSidePanelDisplayed = (packetContents.at(4) >> 3) & 1;
+		m_leftSidePanelDisplayed = (pkt.at(4) >> 3) & 1;
-		m_rightSidePanelDisplayed = (packetContents.at(4) >> 4) & 1;
+		m_rightSidePanelDisplayed = (pkt.at(4) >> 4) & 1;
-		m_sidePanelStatusL25 = (packetContents.at(4) >> 5) & 1;
+		m_sidePanelStatusL25 = (pkt.at(4) >> 5) & 1;
-		m_sidePanelColumns = packetContents.at(5) & 0xf;
+		m_sidePanelColumns = pkt.at(5) & 0xf;
 
 		for (int c=0; c<16; c++)
-			m_CLUT[CLUToffset+c] = ((packetContents.at(c*2+5) << 4) & 0x300) | ((packetContents.at(c*2+6) << 10) & 0xc00) | ((packetContents.at(c*2+6) << 2) & 0x0f0) | (packetContents.at(c*2+7) & 0x00f);
+			m_CLUT[CLUToffset+c] = ((pkt.at(c*2+5) << 4) & 0x300) | ((pkt.at(c*2+6) << 10) & 0xc00) | ((pkt.at(c*2+6) << 2) & 0x0f0) | (pkt.at(c*2+7) & 0x00f);
 
-		m_defaultScreenColour = (packetContents.at(37) >> 4) | ((packetContents.at(38) << 2) & 0x1c);
+		m_defaultScreenColour = (pkt.at(37) >> 4) | ((pkt.at(38) << 2) & 0x1c);
-		m_defaultRowColour = ((packetContents.at(38)) >> 3) | ((packetContents.at(39) << 3) & 0x18);
+		m_defaultRowColour = ((pkt.at(38)) >> 3) | ((pkt.at(39) << 3) & 0x18);
-		m_blackBackgroundSubst = (packetContents.at(39) >> 2) & 1;
+		m_blackBackgroundSubst = (pkt.at(39) >> 2) & 1;
-		m_colourTableRemap = (packetContents.at(39) >> 3) & 7;
+		m_colourTableRemap = (pkt.at(39) >> 3) & 7;
 
 		return true;
 	}
 
-	qDebug("LevelOnePage unhandled setPacket X/%d/%d", packetNumber, designationCode);
+	return PageX26Base::setPacket(y, d, pkt);
-	// BUG can't store unhandled packets as default copy constructor uses pointers
-	//return PageBase::setPacket(packetNumber, designationCode, packetContents);
-	return false;
 }
 
-bool LevelOnePage::packetExists(int packetNumber) const
+bool LevelOnePage::packetExists(int y, int d) const
 {
-	if (packetNumber <= 24) {
+	if (y == 26)
-		for (int c=0; c<40; c++)
+		return packetFromEnhancementListNeeded(d);
-			if (m_level1Page[packetNumber][c] != 0x20)
-				return true;
-		return false;
-	}
 
-	return PageBase::packetExists(packetNumber);
+	if (y == 27 && d == 0) {
-}
-
-bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
-{
-	if (packetNumber == 26)
-		return packetFromEnhancementListNeeded(designationCode);
-
-	if (packetNumber == 27 && designationCode == 0) {
 		for (int i=0; i<6; i++)
 			if ((m_fastTextLink[i].pageNumber & 0x0ff) != 0xff)
 				return true;
@@ -286,73 +250,105 @@ bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
 		return false;
 	}
 
-	if (packetNumber == 27 && (designationCode == 4 || designationCode == 5)) {
+	if (y == 27 && (d == 4 || d == 5)) {
-		for (int i=0; i<(designationCode == 4 ? 6 : 2); i++) {
+		for (int i=0; i<(d == 4 ? 6 : 2); i++) {
-			int pageLinkNumber = i+(designationCode == 4 ? 0 : 6);
+			int pageLinkNumber = i+(d == 4 ? 0 : 6);
 			if ((m_composeLink[pageLinkNumber].pageNumber & 0x0ff) != 0x0ff)
 				return true;
 		}
 		return false;
 	}
 
-	if (packetNumber == 28) {
+	if (y == 28) {
-		if (designationCode == 0) {
+		if (d == 0) {
-			if (m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf)
+			if (m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour != 0 || m_defaultRowColour != 0 || m_blackBackgroundSubst || m_colourTableRemap != 0 || m_secondCharSet != 0xf)
 				return true;
 			return !isPaletteDefault(16, 31);
 		}
-		if (designationCode == 4)
+		if (d == 4)
 			return !isPaletteDefault(0, 15);
 	}
 
-	return PageBase::packetExists(packetNumber, designationCode);
+	return PageX26Base::packetExists(y, d);
 }
 
-bool LevelOnePage::controlBit(int bitNumber) const
+bool LevelOnePage::setControlBit(int b, bool active)
 {
-	switch (bitNumber) {
+	switch (b) {
 		case C12NOS:
-			return (m_defaultNOS & 1) == 1;
+			m_defaultNOS &= 0x6;
+			if (active)
+				m_defaultNOS |= 0x1;
+			break;
 		case C13NOS:
-			return (m_defaultNOS & 2) == 2;
+			m_defaultNOS &= 0x5;
+			if (active)
+				m_defaultNOS |= 0x2;
+			break;
 		case C14NOS:
-			return (m_defaultNOS & 4) == 4;
+			m_defaultNOS &= 0x3;
-		default:
+			if (active)
-			return PageBase::controlBit(bitNumber);
+				m_defaultNOS |= 0x4;
+			break;
 	}
+
+	return PageX26Base::setControlBit(b, active);
 }
 
-bool LevelOnePage::setControlBit(int bitNumber, bool active)
+int LevelOnePage::maxEnhancements() const
 {
-	switch (bitNumber) {
+	return 208;
-		case C12NOS:
-			m_defaultNOS &= 0x06;
-			if (active)
-				m_defaultNOS |= 0x01;
-			return true;
-		case C13NOS:
-			m_defaultNOS &= 0x05;
-			if (active)
-				m_defaultNOS |= 0x02;
-			return true;
-		case C14NOS:
-			m_defaultNOS &= 0x03;
-			if (active)
-				m_defaultNOS |= 0x04;
-			return true;
-		default:
-			return PageBase::setControlBit(bitNumber, active);
-	}
 }
 
 /* void LevelOnePage::setSubPageNumber(int newSubPageNumber) { m_subPageNumber = newSubPageNumber; } */
-void LevelOnePage::setCycleValue(int newValue) { m_cycleValue = newValue; };
+
-void LevelOnePage::setCycleType(CycleTypeEnum newType) { m_cycleType = newType; }
+int LevelOnePage::cycleValue() const
-void LevelOnePage::setDefaultCharSet(int newDefaultCharSet) { m_defaultCharSet = newDefaultCharSet; }
+{
+	return m_cycleValue;
+}
+
+void LevelOnePage::setCycleValue(int newValue)
+{
+	m_cycleValue = newValue;
+}
+
+LevelOnePage::CycleTypeEnum LevelOnePage::cycleType() const
+{
+	return m_cycleType;
+}
+
+void LevelOnePage::setCycleType(CycleTypeEnum newType)
+{
+	m_cycleType = newType;
+}
+
+int LevelOnePage::defaultCharSet() const
+{
+	return m_defaultCharSet;
+}
+
+void LevelOnePage::setDefaultCharSet(int newDefaultCharSet)
+{
+	m_defaultCharSet = newDefaultCharSet;
+}
+
+int LevelOnePage::defaultNOS() const
+{
+	return m_defaultNOS;
+}
 
 void LevelOnePage::setDefaultNOS(int defaultNOS)
 {
 	m_defaultNOS = defaultNOS;
+
+	PageX26Base::setControlBit(C12NOS, m_defaultNOS & 0x1);
+	PageX26Base::setControlBit(C13NOS, m_defaultNOS & 0x2);
+	PageX26Base::setControlBit(C14NOS, m_defaultNOS & 0x4);
+}
+
+int LevelOnePage::secondCharSet() const
+{
+	return m_secondCharSet;
 }
 
 void LevelOnePage::setSecondCharSet(int newSecondCharSet)
@@ -362,12 +358,77 @@ void LevelOnePage::setSecondCharSet(int newSecondCharSet)
 		m_secondNOS = 0x7;
 }
 
+int LevelOnePage::secondNOS() const
+{
+	return m_secondNOS;
+}
+
 void LevelOnePage::setSecondNOS(int newSecondNOS) { m_secondNOS = newSecondNOS; }
-void LevelOnePage::setCharacter(int row, int column, unsigned char newCharacter) { m_level1Page[row][column] = newCharacter; }
+
-void LevelOnePage::setDefaultScreenColour(int newDefaultScreenColour) { m_defaultScreenColour = newDefaultScreenColour; }
+unsigned char LevelOnePage::character(int r, int c) const
-void LevelOnePage::setDefaultRowColour(int newDefaultRowColour) { m_defaultRowColour = newDefaultRowColour; }
+{
-void LevelOnePage::setColourTableRemap(int newColourTableRemap) { m_colourTableRemap = newColourTableRemap; }
+	return PageX26Base::packetExists(r) ? PageX26Base::packet(r).at(c) : 0x20;
-void LevelOnePage::setBlackBackgroundSubst(bool newBlackBackgroundSubst) { m_blackBackgroundSubst = newBlackBackgroundSubst; }
+}
+
+void LevelOnePage::setCharacter(int r, int c, unsigned char newCharacter)
+{
+	QByteArray pkt;
+
+	if (!packetExists(r)) {
+		if (newCharacter == 0x20)
+			return;
+		pkt = QByteArray(40, 0x20);
+		pkt[c] = newCharacter;
+		setPacket(r, pkt);
+	} else {
+		pkt = packet(r);
+		pkt[c] = newCharacter;
+		if (pkt == QByteArray(40, 0x20))
+			clearPacket(r);
+		else
+			setPacket(r, pkt);
+	}
+}
+
+int LevelOnePage::defaultScreenColour() const
+{
+	return m_defaultScreenColour;
+}
+
+void LevelOnePage::setDefaultScreenColour(int newDefaultScreenColour)
+{
+	m_defaultScreenColour = newDefaultScreenColour;
+}
+
+int LevelOnePage::defaultRowColour() const
+{
+	return m_defaultRowColour;
+}
+
+void LevelOnePage::setDefaultRowColour(int newDefaultRowColour)
+{
+	m_defaultRowColour = newDefaultRowColour;
+}
+
+int LevelOnePage::colourTableRemap() const
+{
+	return m_colourTableRemap;
+}
+
+void LevelOnePage::setColourTableRemap(int newColourTableRemap)
+{
+	m_colourTableRemap = newColourTableRemap;
+}
+
+bool LevelOnePage::blackBackgroundSubst() const
+{
+	return m_blackBackgroundSubst;
+}
+
+void LevelOnePage::setBlackBackgroundSubst(bool newBlackBackgroundSubst)
+{
+	m_blackBackgroundSubst = newBlackBackgroundSubst;
+}
 
 int LevelOnePage::CLUT(int index, int renderLevel) const
 {
@@ -408,13 +469,103 @@ bool LevelOnePage::isPaletteDefault(int fromColour, int toColour) const
 	return true;
 }
 
+int LevelOnePage::dCLUT(bool globalDrcs, int mode, int index) const
+{
+	if (!packetExists(28, 1))
+		// Return default DCLUT as per D.1.6 and D.2.2 in the ETSI spec
+		return index;
+
+	const QByteArray pkt = packet(28, 1);
+
+	if (mode == 1) {
+		if (!globalDrcs)
+			index += 4;
+	} else if (mode == 2 || mode == 3)
+		index += globalDrcs ? 8 : 24;
+	else
+		return 0;
+
+	// Some tricky bit juggling to extract 5 bits from parts of a 6-bit triplet
+	const int l = index/6*5 + 4;
+
+	switch (index % 6) {
+		case 0:
+			return pkt.at(l) & 0x1f;
+		case 1:
+			return ((pkt.at(l+1) & 0x0f) << 1) | (pkt.at(l) >> 5);
+		case 2:
+			return ((pkt.at(l+2) & 0x07) << 2) | (pkt.at(l+1) >> 4);
+		case 3:
+			return ((pkt.at(l+3) & 0x03) << 3) | (pkt.at(l+2) >> 3);
+		case 4:
+			return ((pkt.at(l+4) & 0x01) << 4) | (pkt.at(l+3) >> 2);
+		case 5:
+			return pkt.at(l+4) >> 1;
+	}
+	return 0; // Won't get here; used to suppress a compiler warning
+}
+
+void LevelOnePage::setDCLUT(bool globalDrcs, int mode, int index, int colour)
+{
+	// Default DCLUT as per D.1.6 and D.2.2 in the ETSI spec
+	const QByteArray defaultPkt = QByteArrayLiteral("\x01\x00\x00\x00\x20\x20\x18\x00\x02\x22\x01\x08\x08\x06\x24\x22\x39\x20\x12\x2a\x05\x2b\x39\x1e\x20\x20\x18\x10\x0a\x26\x03\x0a\x29\x16\x2c\x26\x3b\x01\x00\x00");
+
+	if (!packetExists(28, 1))
+		setPacket(28, 1, defaultPkt);
+
+	if (mode == 1) {
+		if (!globalDrcs)
+			index += 4;
+	} else if (mode == 2 || mode == 3)
+		index += globalDrcs ? 8 : 24;
+	else
+		return;
+
+	QByteArray pkt = packet(28, 1);
+
+	// Some tricky bit juggling to set 5 bits within parts of a 6-bit triplet
+	const int l = index/6*5 + 4;
+
+	switch (index % 6) {
+		case 0:
+			pkt[l] = pkt.at(l) & 0x20 | colour;
+			break;
+		case 1:
+			pkt[l+1] = (pkt.at(l+1) & 0x30) | (colour >> 1);
+			pkt[l] = (pkt.at(l) & 0x1f) | ((colour << 5) & 0x3f);
+			break;
+		case 2:
+			pkt[l+2] = (pkt.at(l+2) & 0x38) | (colour >> 2);
+			pkt[l+1] = (pkt.at(l+1) & 0x0f) | ((colour << 4) & 0x3f);
+			break;
+		case 3:
+			pkt[l+3] = (pkt.at(l+3) & 0x3c) | (colour >> 3);
+			pkt[l+2] = (pkt.at(l+2) & 0x07) | ((colour << 3) & 0x3f);
+			break;
+		case 4:
+			pkt[l+4] = (pkt.at(l+4) & 0x3e) | (colour >> 4);
+			pkt[l+3] = (pkt.at(l+3) & 0x03) | ((colour << 2) & 0x3f);
+			break;
+		case 5:
+			pkt[l+4] = (pkt.at(l+4) & 0x01) | (colour << 1);
+			break;
+	}
+
+	if (pkt == defaultPkt)
+		clearPacket(28, 1);
+	else
+		setPacket(28, 1, pkt);
+}
+
 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
+	// X/28/1 present i.e. DCLUTs for mode 1-3 DRCS characters - Level 3.5
+	if (packetExists(28, 1))
+		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;
@@ -489,36 +640,101 @@ int LevelOnePage::levelRequired() const
 	return levelSeen;
 }
 
-void LevelOnePage::setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed) { m_leftSidePanelDisplayed = newLeftSidePanelDisplayed; }
+bool LevelOnePage::leftSidePanelDisplayed() const
-void LevelOnePage::setRightSidePanelDisplayed(bool newRightSidePanelDisplayed) { m_rightSidePanelDisplayed = newRightSidePanelDisplayed; }
+{
-void LevelOnePage::setSidePanelColumns(int newSidePanelColumns) { m_sidePanelColumns = newSidePanelColumns; }
+	return m_leftSidePanelDisplayed;
-void LevelOnePage::setSidePanelStatusL25(bool newSidePanelStatusL25) { m_sidePanelStatusL25 = newSidePanelStatusL25; }
+}
+
+void LevelOnePage::setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed)
+{
+	m_leftSidePanelDisplayed = newLeftSidePanelDisplayed;
+}
+
+bool LevelOnePage::rightSidePanelDisplayed() const
+{
+	return m_rightSidePanelDisplayed;
+}
+
+void LevelOnePage::setRightSidePanelDisplayed(bool newRightSidePanelDisplayed)
+{
+	m_rightSidePanelDisplayed = newRightSidePanelDisplayed;
+}
+
+int LevelOnePage::sidePanelColumns() const
+{
+	return m_sidePanelColumns;
+}
+
+void LevelOnePage::setSidePanelColumns(int newSidePanelColumns)
+{
+	m_sidePanelColumns = newSidePanelColumns;
+}
+
+bool LevelOnePage::sidePanelStatusL25() const
+{
+	return m_sidePanelStatusL25;
+}
+
+void LevelOnePage::setSidePanelStatusL25(bool newSidePanelStatusL25)
+{
+	m_sidePanelStatusL25 = newSidePanelStatusL25;
+}
+
+int LevelOnePage::fastTextLinkPageNumber(int linkNumber) const
+{
+	return m_fastTextLink[linkNumber].pageNumber;
+}
 
 void LevelOnePage::setFastTextLinkPageNumber(int linkNumber, int pageNumber)
 {
 	m_fastTextLink[linkNumber].pageNumber = pageNumber;
 }
 
+int LevelOnePage::composeLinkFunction(int linkNumber) const
+{
+	return m_composeLink[linkNumber].function;
+}
+
 void LevelOnePage::setComposeLinkFunction(int linkNumber, int newFunction)
 {
 	m_composeLink[linkNumber].function = newFunction;
 }
 
+bool LevelOnePage::composeLinkLevel2p5(int linkNumber) const
+{
+	return m_composeLink[linkNumber].level2p5;
+}
+
 void LevelOnePage::setComposeLinkLevel2p5(int linkNumber, bool newRequired)
 {
 	m_composeLink[linkNumber].level2p5 = newRequired;
 }
 
+bool LevelOnePage::composeLinkLevel3p5(int linkNumber) const
+{
+	return m_composeLink[linkNumber].level3p5;
+}
+
 void LevelOnePage::setComposeLinkLevel3p5(int linkNumber, bool newRequired)
 {
 	m_composeLink[linkNumber].level3p5 = newRequired;
 }
 
+int LevelOnePage::composeLinkPageNumber(int linkNumber) const
+{
+	return m_composeLink[linkNumber].pageNumber;
+}
+
 void LevelOnePage::setComposeLinkPageNumber(int linkNumber, int newPageNumber)
 {
 	m_composeLink[linkNumber].pageNumber = newPageNumber;
 }
 
+int LevelOnePage::composeLinkSubPageCodes(int linkNumber) const
+{
+	return m_composeLink[linkNumber].subPageCodes;
+}
+
 void LevelOnePage::setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes)
 {
 	m_composeLink[linkNumber].subPageCodes = newSubPageCodes;

src/qteletextdecoder/levelonepage.h

@@ -33,80 +33,80 @@ class LevelOnePage : public PageX26Base //: public QObject
 	//Q_OBJECT
 
 public:
+	using PageX26Base::packet;
+	using PageX26Base::setPacket;
+	using PageX26Base::packetExists;
+
 	enum CycleTypeEnum { CTcycles, CTseconds };
 
 	LevelOnePage();
-	// BUG this copy constructor isn't used? Parameter should be LevelOnePage
 	LevelOnePage(const PageBase &other);
 
 	bool isEmpty() const override;
 
-	QByteArray packet(int packetNumber) const override;
+	QByteArray packet(int y, int d) const override;
-	QByteArray packet(int packetNumber, int designationCode) const override;
+	bool setPacket(int y, int d, QByteArray pkt) override;
-	bool packetExists(int packetNumber) const override;
+	bool packetExists(int y, int d) const override;
-	bool packetExists(int packetNumber, int designationCode) const override;
-	bool setPacket(int packetNumber, QByteArray packetContents) override;
-	bool setPacket(int packetNumber, int designationCode, QByteArray packetContents) override;
 
-	bool controlBit(int bitNumber) const override;
+	bool setControlBit(int b, bool active) override;
-	bool setControlBit(int bitNumber, bool active) override;
 
 	void clearPage();
 
-	int maxEnhancements() const override { return 208; };
+	int maxEnhancements() const override;
 
 /*	void setSubPageNumber(int); */
-	int cycleValue() const { return m_cycleValue; };
+	int cycleValue() const;
 	void setCycleValue(int newValue);
-	CycleTypeEnum cycleType() const { return m_cycleType; };
+	CycleTypeEnum cycleType() const;
 	void setCycleType(CycleTypeEnum newType);
-	int defaultCharSet() const { return m_defaultCharSet; }
+	int defaultCharSet() const;
 	void setDefaultCharSet(int newDefaultCharSet);
-	int defaultNOS() const { return m_defaultNOS; }
+	int defaultNOS() const;
 	void setDefaultNOS(int defaultNOS);
-	int secondCharSet() const { return m_secondCharSet; }
+	int secondCharSet() const;
 	void setSecondCharSet(int newSecondCharSet);
-	int secondNOS() const { return m_secondNOS; }
+	int secondNOS() const;
 	void setSecondNOS(int newSecondNOS);
-	unsigned char character(int row, int column) const { return m_level1Page[row][column]; }
+	unsigned char character(int r, int c) const;
-	void setCharacter(int row, int column, unsigned char newCharacter);
+	void setCharacter(int r, int c, unsigned char newChar);
-	int defaultScreenColour() const { return m_defaultScreenColour; }
+	int defaultScreenColour() const;
 	void setDefaultScreenColour(int newDefaultScreenColour);
-	int defaultRowColour() const { return m_defaultRowColour; }
+	int defaultRowColour() const;
 	void setDefaultRowColour(int newDefaultRowColour);
-	int colourTableRemap() const { return m_colourTableRemap; }
+	int colourTableRemap() const;
 	void setColourTableRemap(int newColourTableRemap);
-	bool blackBackgroundSubst() const { return m_blackBackgroundSubst; }
+	bool blackBackgroundSubst() const;
 	void setBlackBackgroundSubst(bool newBlackBackgroundSubst);
 	int CLUT(int index, int renderLevel=3) const;
 	void setCLUT(int index, int newColour);
 	QColor CLUTtoQColor(int index, int renderlevel=3) const;
 	bool isPaletteDefault(int colour) const;
 	bool isPaletteDefault(int fromColour, int toColour) const;
+	int dCLUT(bool globalDrcs, int mode, int index) const;
+	void setDCLUT(bool globalDrcs, int mode, int index, int colour);
 	int levelRequired() const;
-	bool leftSidePanelDisplayed() const { return m_leftSidePanelDisplayed; }
+	bool leftSidePanelDisplayed() const;
 	void setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed);
-	bool rightSidePanelDisplayed() const { return m_rightSidePanelDisplayed; }
+	bool rightSidePanelDisplayed() const;
 	void setRightSidePanelDisplayed(bool newRightSidePanelDisplayed);
-	int sidePanelColumns() const { return m_sidePanelColumns; }
+	int sidePanelColumns() const;
 	void setSidePanelColumns(int newSidePanelColumns);
-	bool sidePanelStatusL25() const { return m_sidePanelStatusL25; }
+	bool sidePanelStatusL25() const;
 	void setSidePanelStatusL25(bool newSidePanelStatusL25);
-	int fastTextLinkPageNumber(int linkNumber) const { return m_fastTextLink[linkNumber].pageNumber; }
+	int fastTextLinkPageNumber(int linkNumber) const;
 	void setFastTextLinkPageNumber(int linkNumber, int pageNumber);
-	int composeLinkFunction(int linkNumber) const { return m_composeLink[linkNumber].function; }
+	int composeLinkFunction(int linkNumber) const;
 	void setComposeLinkFunction(int linkNumber, int newFunction);
-	bool composeLinkLevel2p5(int linkNumber) const { return m_composeLink[linkNumber].level2p5; }
+	bool composeLinkLevel2p5(int linkNumber) const;
 	void setComposeLinkLevel2p5(int linkNumber, bool newRequired);
-	bool composeLinkLevel3p5(int linkNumber) const { return m_composeLink[linkNumber].level3p5; }
+	bool composeLinkLevel3p5(int linkNumber) const;
 	void setComposeLinkLevel3p5(int linkNumber, bool newRequired);
-	int composeLinkPageNumber(int linkNumber) const { return m_composeLink[linkNumber].pageNumber; }
+	int composeLinkPageNumber(int linkNumber) const;
 	void setComposeLinkPageNumber(int linkNumber, int newPageNumber);
-	int composeLinkSubPageCodes(int linkNumber) const { return m_composeLink[linkNumber].subPageCodes; }
+	int composeLinkSubPageCodes(int linkNumber) const;
 	void setComposeLinkSubPageCodes(int linkNumber, int newSubPageCodes);
 
 private:
-	unsigned char m_level1Page[25][40];
 /*	int m_subPageNumber; */
 	int m_cycleValue;
 	CycleTypeEnum m_cycleType;
@@ -124,7 +124,7 @@ private:
 		int pageNumber, subPageCodes;
 	} m_composeLink[8];
 
-	const int m_defaultCLUT[32] = {
+	static constexpr int m_defaultCLUT[32] = {
 		0x000, 0xf00, 0x0f0, 0xff0, 0x00f, 0xf0f, 0x0ff, 0xfff,
 		0x000, 0x700, 0x070, 0x770, 0x007, 0x707, 0x077, 0x777,
 		0xf05, 0xf70, 0x0f7, 0xffb, 0x0ca, 0x500, 0x652, 0xc77,

src/qteletextdecoder/pagebase.cpp

@@ -23,100 +23,105 @@
 
 PageBase::PageBase()
 {
-	// We use nullptrs to keep track of allocated packets, so initialise them this way
+	for (int b=PageBase::C4ErasePage; b<=PageBase::C14NOS; b++)
-	for (int i=0; i<26; i++)
+		m_controlBits[b] = false;
-		m_displayPackets[i] = nullptr;
-	for (int i=0; i<4; i++)
-		for (int j=0; j<16; j++)
-			m_designationPackets[i][j] = nullptr;
-
-	for (int i=PageBase::C4ErasePage; i<=PageBase::C14NOS; i++)
-		m_controlBits[i] = false;
 }
 
-PageBase::~PageBase()
+PageBase::PageFunctionEnum PageBase::pageFunction() const
 {
-	for (int i=0; i<26; i++)
+	return PFLevelOnePage;
-		if (m_displayPackets[i] != nullptr)
+}
-			delete m_displayPackets[i];
+
-	for (int i=0; i<4; i++)
+PageBase::PacketCodingEnum PageBase::packetCoding() const
-		for (int j=0; j<16; j++)
+{
-			if (m_designationPackets[i][j] != nullptr)
+	return Coding7bit;
-				delete m_designationPackets[i][j];
+}
+
+PageBase::PacketCodingEnum PageBase::packetCoding(int y, int d) const
+{
+	if (y == 27 && d < 4)
+		return Coding4bit;
+	else
+		return Coding18bit;
 }
 
 bool PageBase::isEmpty() const
 {
-	for (int i=0; i<26; i++)
+	for (int y=0; y<26; y++)
-		if (m_displayPackets[i] != nullptr)
+		if (!m_displayPackets[y].isEmpty())
 			return false;
-	for (int i=0; i<4; i++)
+	for (int y=0; y<3; y++)
-		for (int j=0; j<16; j++)
+		for (int d=0; d<16; d++)
-			if (m_designationPackets[i][j] != nullptr)
+			if (!m_designationPackets[y][d].isEmpty())
 				return false;
 
 	return true;
 }
 
-QByteArray PageBase::packet(int i) const
+QByteArray PageBase::packet(int y) const
 {
-	if (m_displayPackets[i] == nullptr)
+	return m_displayPackets[y];
-		return QByteArray(); // Blank result
-
-	return *m_displayPackets[i];
 }
 
-QByteArray PageBase::packet(int i, int j) const
+QByteArray PageBase::packet(int y, int d) const
 {
-	if (m_designationPackets[i-26][j] == nullptr)
+	return m_designationPackets[y-26][d];
-		return QByteArray(); // Blank result
-
-	return *m_designationPackets[i-26][j];
 }
 
-
+bool PageBase::setPacket(int y, QByteArray pkt)
-bool PageBase::setPacket(int i, QByteArray packetContents)
 {
-	if (m_displayPackets[i] == nullptr)
+	m_displayPackets[y] = pkt;
-		m_displayPackets[i] = new QByteArray(40, 0x00);
-	*m_displayPackets[i] = packetContents;
 
 	return true;
 }
 
-bool PageBase::setPacket(int i, int j, QByteArray packetContents)
+bool PageBase::setPacket(int y, int d, QByteArray pkt)
 {
-	if (m_designationPackets[i-26][j] == nullptr)
+	m_designationPackets[y-26][d] = pkt;
-		m_designationPackets[i-26][j] = new QByteArray(40, 0x00);
-	*m_designationPackets[i-26][j] = packetContents;
 
 	return true;
 }
 
-/*
+bool PageBase::packetExists(int y) const
-bool PageBase::deletePacket(int i)
 {
-	if (m_displayPackets[i] != nullptr) {
+	return !m_displayPackets[y].isEmpty();
-		delete m_displayPackets[i];
+}
-		m_displayPackets[i] = nullptr;
+
-	}
+bool PageBase::packetExists(int y, int d) const
+{
+	return !m_designationPackets[y-26][d].isEmpty();
+}
+
+bool PageBase::clearPacket(int y)
+{
+	m_displayPackets[y] = QByteArray();
 
 	return true;
 }
 
-bool PageBase::deletePacket(int i)
+bool PageBase::clearPacket(int y, int d)
 {
-	if (m_designationPackets[i-26][j] != nullptr) {
+	m_designationPackets[y-26][d] = QByteArray();
-		delete m_designationPackets[i-26][j];
-		m_designationPackets[i-26][j] = nullptr;
-	}
 
 	return true;
 }
-*/
 
-bool PageBase::setControlBit(int bitNumber, bool active)
+void PageBase::clearAllPackets()
 {
-	m_controlBits[bitNumber] = active;
+	for (int y=0; y<26; y++)
+		clearPacket(y);
+	for (int y=0; y<3; y++)
+		for (int d=0; d<16; d++)
+			clearPacket(y, d);
+}
+
+bool PageBase::controlBit(int b) const
+{
+	return m_controlBits[b];
+}
+
+bool PageBase::setControlBit(int b, bool active)
+{
+	m_controlBits[b] = active;
 	return true;
 }

src/qteletextdecoder/pagebase.h

@@ -22,34 +22,39 @@
 
 #include <QByteArray>
 
-// If we inherit from QObject then we can't copy construct, so "make a new subpage that's a copy of this one" wouldn't work
+class PageBase
-class PageBase //: public QObject
 {
-	//Q_OBJECT
-
 public:
 	enum ControlBitsEnum { C4ErasePage, C5Newsflash, C6Subtitle, C7SuppressHeader, C8Update, C9InterruptedSequence, C10InhibitDisplay, C11SerialMagazine, C12NOS, C13NOS, C14NOS };
+	// Available Page Functions according to 9.4.2.1 of the spec
+	enum PageFunctionEnum { PFLevelOnePage, PFDataBroadcasting, PFGlobalPOP, PFNormalPOP, PFGlobalDRCS, PFNormalDRCS, PFMOT, PFMIP, PFBasicTOPTable, PFAdditionalInformationTable, PFMultiPageTable, PFMultiPageExtensionTable, PFTriggerMessages };
+	// Available Page Codings of X/1 to X/25 according to 9.4.2.1 of the spec
+	enum PacketCodingEnum { Coding7bit, Coding8bit, Coding18bit, Coding4bit, Coding4bitThen7bit, CodingPerPacket };
 
 	PageBase();
-	virtual ~PageBase();
+
+	virtual PageFunctionEnum pageFunction() const;
+	virtual PacketCodingEnum packetCoding() const;
+	virtual PacketCodingEnum packetCoding(int y, int d) const;
 
 	virtual bool isEmpty() const;
 
-	virtual QByteArray packet(int i) const;
+	virtual QByteArray packet(int y) const;
-	virtual QByteArray packet(int i, int j) const;
+	virtual QByteArray packet(int y, int d) const;
-	virtual bool packetExists(int i) const { return m_displayPackets[i] != nullptr; }
+	virtual bool setPacket(int y, QByteArray pkt);
-	virtual bool packetExists(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; }
+	virtual bool setPacket(int y, int d, QByteArray pkt);
-	virtual bool setPacket(int i, QByteArray packetContents);
+	virtual bool packetExists(int y) const;
-	virtual bool setPacket(int i, int j, QByteArray packetContents);
+	virtual bool packetExists(int y, int d) const;
-//	bool deletePacket(int);
+	virtual bool clearPacket(int y);
-//	bool deletePacket(int, int);
+	virtual bool clearPacket(int y, int d);
+	virtual void clearAllPackets();
 
-	virtual bool controlBit(int bitNumber) const { return m_controlBits[bitNumber]; }
+	virtual bool controlBit(int b) const;
-	virtual bool setControlBit(int bitNumber, bool active);
+	virtual bool setControlBit(int b, bool active);
 
 private:
 	bool m_controlBits[11];
-	QByteArray *m_displayPackets[26], *m_designationPackets[4][16];
+	QByteArray m_displayPackets[26], m_designationPackets[3][16];
 };
 
 #endif

src/qteletextdecoder/pagex26base.cpp

@@ -21,20 +21,28 @@
 
 #include "pagex26base.h"
 
-QByteArray PageX26Base::packetFromEnhancementList(int packetNumber) const
+X26TripletList *PageX26Base::enhancements()
+{
+	return &m_enhancements;
+}
+
+QByteArray PageX26Base::packetFromEnhancementList(int p) const
 {
 	QByteArray result(40, 0x00);
 
-	int enhanceListPointer;
 	X26Triplet lastTriplet;
 
-	for (int i=0; i<13; i++) {
+	for (int t=0; t<13; t++) {
-		enhanceListPointer = packetNumber*13+i;
+		const int enhanceListPointer = p*13+t;
 
 		if (enhanceListPointer < m_enhancements.size()) {
-			result[i*3+1] = m_enhancements.at(enhanceListPointer).address();
+			if (!m_enhancements.at(enhanceListPointer).isValid())
-			result[i*3+2] = m_enhancements.at(enhanceListPointer).mode() | ((m_enhancements.at(enhanceListPointer).data() & 1) << 5);
+				result[t*3+1] = result[t*3+2] = result[t*3+3] = 0xff;
-			result[i*3+3] = m_enhancements.at(enhanceListPointer).data() >> 1;
+			else {
+				result[t*3+1] = m_enhancements.at(enhanceListPointer).address();
+				result[t*3+2] = m_enhancements.at(enhanceListPointer).mode() | ((m_enhancements.at(enhanceListPointer).data() & 1) << 5);
+				result[t*3+3] = m_enhancements.at(enhanceListPointer).data() >> 1;
+			}
 
 			// If this is the last triplet, get a copy to repeat to the end of the packet
 			if (enhanceListPointer == m_enhancements.size()-1) {
@@ -48,32 +56,36 @@ QByteArray PageX26Base::packetFromEnhancementList(int packetNumber) const
 			}
 		} else {
 			// We've gone past the end of the triplet list, so repeat the Termination Marker to the end
-			result[i*3+1] = lastTriplet.address();
+			result[t*3+1] = lastTriplet.address();
-			result[i*3+2] = lastTriplet.mode() | ((lastTriplet.data() & 1) << 5);
+			result[t*3+2] = lastTriplet.mode() | ((lastTriplet.data() & 1) << 5);
-			result[i*3+3] = lastTriplet.data() >> 1;
+			result[t*3+3] = lastTriplet.data() >> 1;
 		}
 	}
 
 	return result;
 }
 
-void PageX26Base::setEnhancementListFromPacket(int packetNumber, QByteArray packetContents)
+void PageX26Base::setEnhancementListFromPacket(int p, QByteArray pkt)
 {
 	// Preallocate entries in the m_enhancements list to hold our incoming triplets.
-	// We write "dummy" reserved 11110 Row Triplets in the allocated entries which then get overwritten by the packet contents.
+	// We write invalid triplets in the allocated entries which then get overwritten by the packet contents.
 	// This is in case of missing packets so we can keep Local Object pointers valid.
-	while (m_enhancements.size() < (packetNumber+1)*13)
+	while (m_enhancements.size() < (p+1)*13)
-		m_enhancements.append(m_paddingX26Triplet);
+		m_enhancements.append( X26Triplet{ 0xff, 0xff, 0xff } );
 
-	int enhanceListPointer;
 	X26Triplet newX26Triplet;
 
-	for (int i=0; i<13; i++) {
+	for (int t=0; t<13; t++) {
-		enhanceListPointer = packetNumber*13+i;
+		const int enhanceListPointer = p*13+t;
 
-		newX26Triplet.setAddress(packetContents.at(i*3+1) & 0x3f);
+		// Need the "& 0xff" since QByteArray.at() returns (signed) chars
-		newX26Triplet.setMode(packetContents.at(i*3+2) & 0x1f);
+		if ((pkt.at(t*3+2) & 0xff) == 0xff)
-		newX26Triplet.setData(((packetContents.at(i*3+3) & 0x3f) << 1) | ((packetContents.at(i*3+2) & 0x20) >> 5));
+			newX26Triplet.setInvalid();
+		else {
+			newX26Triplet.setAddress(pkt.at(t*3+1) & 0x3f);
+			newX26Triplet.setMode(pkt.at(t*3+2) & 0x1f);
+			newX26Triplet.setData(((pkt.at(t*3+3) & 0x3f) << 1) | ((pkt.at(t*3+2) & 0x20) >> 5));
+		}
 		m_enhancements.replace(enhanceListPointer, newX26Triplet);
 	}
 	if (newX26Triplet.mode() == 0x1f && newX26Triplet.address() == 0x3f && newX26Triplet.data() & 0x01)
@@ -81,3 +93,8 @@ void PageX26Base::setEnhancementListFromPacket(int packetNumber, QByteArray pack
 		while (m_enhancements.size()>1 && m_enhancements.at(m_enhancements.size()-2).mode() == 0x1f && m_enhancements.at(m_enhancements.size()-2).address() == 0x3f && m_enhancements.at(m_enhancements.size()-2).data() == newX26Triplet.data())
 			m_enhancements.removeLast();
 }
+
+bool PageX26Base::packetFromEnhancementListNeeded(int n) const
+{
+	return ((m_enhancements.size()+12) / 13) > n;
+}

src/qteletextdecoder/pagex26base.h

@@ -26,21 +26,18 @@
 #include "pagebase.h"
 #include "x26triplets.h"
 
-class PageX26Base : public PageBase //: public QObject
+class PageX26Base : public PageBase
 {
-	//Q_OBJECT
-
 public:
-	X26TripletList *enhancements() { return &m_enhancements; };
+	X26TripletList *enhancements();
 	virtual int maxEnhancements() const =0;
 
 protected:
-	QByteArray packetFromEnhancementList(int packetNumber) const;
+	QByteArray packetFromEnhancementList(int p) const;
-	void setEnhancementListFromPacket(int packetNumber, QByteArray packetContents);
+	void setEnhancementListFromPacket(int p, QByteArray pkt);
-	bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; };
+	bool packetFromEnhancementListNeeded(int n) const;
 
 	X26TripletList m_enhancements;
-	const X26Triplet m_paddingX26Triplet { 41, 0x1e, 0 };
 };
 
 #endif

src/qteletextdecoder/render.cpp

@@ -154,14 +154,24 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u
 	if (dontUnderline)
 		characterCode = 0x20;
 
+	// Set 24 has reduced height Latin G0 capital letters for diacritical marks to sit on top of
+	if (characterDiacritical != 0  && // Not for no-diacritical-mark
+	    characterDiacritical != 9  && // Not for these diacriticals that go under the letter
+	    characterDiacritical != 11 &&
+	    characterDiacritical != 12 &&
+	    characterDiacritical != 14 &&
+	    (characterSet == 0 || characterSet == 6) &&     // Only for Latin G0 and Hebrew G0
+	    characterCode >= 0x41 && characterCode <= 0x5a) // and only for the capital letters A-Z
+		characterSet = 24;
+
 	if (characterCode == 0x20 && characterSet < 25 && characterDiacritical == 0)
 		painter.fillRect(c*12, r*10, 12, 10, m_backgroundQColor);
 	else if (characterCode == 0x7f && characterSet == 24)
 		painter.fillRect(c*12, r*10, 12, 10, m_foregroundQColor);
-	else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)) && characterSet < 24)
+	else if ((m_decoder->cellBold(r, c) || m_decoder->cellItalic(r, c)))
 		drawBoldOrItalicCharacter(painter, r, c, characterCode, characterSet, characterFragment);
 	else {
-		m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+		m_fontBitmap.image()->setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 		drawFromFontBitmap(painter, r, c, characterCode, characterSet, characterFragment);
 	}
 
@@ -185,21 +195,45 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u
 
 	if (characterDiacritical != 0) {
 		painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		m_fontBitmap.image()->setColorTable(QList<QRgb>{0x00000000, m_foregroundQColor.rgba()});
 		drawFromFontBitmap(painter, r, c, characterDiacritical+64, 7, characterFragment);
 		painter.setCompositionMode(QPainter::CompositionMode_Source);
 	}
 }
 
+inline bool TeletextPageRender::drawDRCSCharacter(QPainter &painter, int r, int c, TeletextPageDecode::DRCSSource drcsSource, int drcsSubTable, int drcsChar, TeletextPageDecode::CharacterFragment characterFragment, bool flashPhOn)
+{
+	QImage drcsImage = m_decoder->drcsImage(drcsSource, drcsSubTable, drcsChar, flashPhOn);
+
+	if (drcsImage.isNull())
+		return false;
+
+	if (drcsImage.format() == QImage::Format_Mono)
+		// mode 0 (12x10x1) returned here has no colours of its own
+		// so apply the foreground and background colours of the cell it appears in
+		drcsImage.setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	else if (m_renderMode >= RenderWhiteOnBlack)
+		// modes 1-3: crudely convert colours to monochrome
+		for (int i=0; i<16; i++)
+			drcsImage.setColor(i, qGray(drcsImage.color(i)) > 127 ? 0xffffffff : 0xff000000);
+
+	drawFromBitmap(painter, r, c, drcsImage, characterFragment);
+
+	return true;
+}
+
 inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment)
 {
 	QImage styledImage = QImage(12, 10, QImage::Format_Mono);
 	QPainter styledPainter;
 
-	m_fontBitmap.image()->setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	// Don't apply style to mosaics
-	styledImage.setColorTable(QVector<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	const bool mosaic = characterSet > 24 || (characterSet == 24 && (characterCode < 0x41 || characterCode > 0x5a));
 
-	if (m_decoder->cellItalic(r, c)) {
+	m_fontBitmap.image()->setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+	styledImage.setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
+
+	if (!mosaic && m_decoder->cellItalic(r, c)) {
 		styledImage.fill(0);
 
 		styledPainter.begin(&styledImage);
@@ -211,13 +245,14 @@ inline void TeletextPageRender::drawBoldOrItalicCharacter(QPainter &painter, int
 	} else
 		styledImage = m_fontBitmap.image()->copy((characterCode-32)*12, characterSet*10, 12, 10);
 
-	if (m_decoder->cellBold(r, c)) {
+	// We have either an unstyled or italic character. Now bolden if needed.
+	if (!mosaic && m_decoder->cellBold(r, c)) {
 		QImage boldeningImage;
 
 		boldeningImage = styledImage.copy();
 		styledPainter.begin(&styledImage);
 		styledPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-		boldeningImage.setColorTable(QVector<QRgb>{0x00000000, m_foregroundQColor.rgba()});
+		boldeningImage.setColorTable(QList<QRgb>{0x00000000, m_foregroundQColor.rgba()});
 		styledPainter.drawImage(1, 0, boldeningImage);
 		styledPainter.end();
 	}
@@ -272,46 +307,26 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 		// and since the refresh and controlCodeChanged variables will be false at this point
 		// only flashing cells will be drawn
 		if (m_decoder->refresh(r, c) || force || controlCodeChanged) {
-			unsigned char characterCode;
+			bool flashPhOn = true; // Must remain "true" on non-flashing cell
-			int characterSet, characterDiacritical;
+			const bool concealed = !m_reveal && m_decoder->cellConceal(r, c);
 
 			rowRefreshed = true;
 
-			if (!m_reveal && m_decoder->cellConceal(r, c)) {
-				characterCode = 0x20;
-				characterSet = 0;
-				characterDiacritical = 0;
-			} else {
-				characterCode = m_decoder->cellCharacterCode(r, c);
-				characterSet = m_decoder->cellCharacterSet(r, c);
-				characterDiacritical = m_decoder->cellCharacterDiacritical(r, c);
-			}
-
 			if (m_renderMode < RenderWhiteOnBlack) {
 				if (m_decoder->cellFlashMode(r, c) == 0)
 					m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
 				else {
 					// Flashing cell, decide if phase in this cycle is on or off
-					bool phaseOn;
-
 					if (m_decoder->cellFlashRatePhase(r, c) == 0)
-						phaseOn = (ph < 3) ^ (m_decoder->cellFlashMode(r, c) == 2);
+						flashPhOn = (ph < 3) ^ (m_decoder->cellFlashMode(r, c) == 2);
 					else
-						phaseOn = ((ph == m_decoder->cellFlash2HzPhaseNumber(r, c)-1) || (ph == m_decoder->cellFlash2HzPhaseNumber(r, c)+2)) ^ (m_decoder->cellFlashMode(r, c) == 2);
+						flashPhOn = ((ph == m_decoder->cellFlash2HzPhaseNumber(r, c)-1) || (ph == m_decoder->cellFlash2HzPhaseNumber(r, c)+2)) ^ (m_decoder->cellFlashMode(r, c) == 2);
 
 					// If flashing to adjacent CLUT select the appropriate foreground colour
-					if (m_decoder->cellFlashMode(r, c) == 3 && !phaseOn)
+					if (m_decoder->cellFlashMode(r, c) == 3 && !flashPhOn)
 						m_foregroundQColor = m_decoder->cellFlashForegroundQColor(r, c);
 					else
 						m_foregroundQColor = m_decoder->cellForegroundQColor(r, c);
-
-					// If flashing mode is Normal or Invert, draw a space instead of a character on phase
-					if ((m_decoder->cellFlashMode(r, c) == 1 || m_decoder->cellFlashMode(r, c) == 2) && !phaseOn) {
-						// Character 0x00 draws space without underline
-						characterCode = 0x00;
-						characterSet = 0;
-						characterDiacritical = 0;
-					}
 				}
 
 				if (m_renderMode != RenderMix || m_decoder->cellBoxed(r, c))
@@ -320,11 +335,18 @@ void TeletextPageRender::renderRow(int r, int ph, bool force)
 					m_backgroundQColor = Qt::transparent;
 			}
 
-			drawCharacter(painter, r, c, characterCode, characterSet, characterDiacritical, m_decoder->cellCharacterFragment(r, c));
+			if (((m_decoder->cellFlashMode(r, c) == 1 || m_decoder->cellFlashMode(r, c) == 2) && !flashPhOn))
+				// If flashing mode is Normal or Invert, draw a space instead of a character on phase
+				// Character 0x00 draws space without underline
+				drawCharacter(painter, r, c, 0x00, 0, 0, m_decoder->cellCharacterFragment(r, c));
+			else if (concealed)
+				drawCharacter(painter, r, c, 0x20, 0, 0, m_decoder->cellCharacterFragment(r, c));
+			else if (m_decoder->cellDrcsSource(r, c) == TeletextPageDecode::NoDRCS || !drawDRCSCharacter(painter, r, c, m_decoder->cellDrcsSource(r, c), m_decoder->cellDrcsSubTable(r, c), m_decoder->cellDrcsCharacter(r, c), m_decoder->cellCharacterFragment(r, c), flashPhOn))
+				drawCharacter(painter, r, c, m_decoder->cellCharacterCode(r, c), m_decoder->cellCharacterSet(r, c), m_decoder->cellCharacterDiacritical(r, c), m_decoder->cellCharacterFragment(r, c));
 
 			if (m_showControlCodes && c < 40 && m_decoder->teletextPage()->character(r, c) < 0x20) {
 				painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
-				m_fontBitmap.image()->setColorTable(QVector<QRgb>{0x7f000000, 0xe0ffffff});
+				m_fontBitmap.image()->setColorTable(QList<QRgb>{0x7f000000, 0xe0ffffff});
 				painter.drawImage(c*12, r*10, *m_fontBitmap.image(), (m_decoder->teletextPage()->character(r, c)+32)*12, 250, 12, 10);
 				painter.setCompositionMode(QPainter::CompositionMode_Source);
 			}
@@ -435,6 +457,13 @@ void TeletextPageRender::colourChanged(int index)
 			if (m_decoder->cellFlashMode(r, c) == 3 && ((m_decoder->cellForegroundCLUT(r, c) ^ 8) == index || (m_decoder->cellForegroundCLUT(r, c) ^ 8) == 8))
 				m_decoder->setRefresh(r, c, true);
 		}
+
+	if (m_decoder->level() == 3)
+		// TODO don't refresh mode 0 DRCS
+		for (int r=0; r<25; r++)
+			for (int c=0; c<72; c++)
+				if (m_decoder->cellDrcsSource(r, c) != TeletextPageDecode::NoDRCS)
+					m_decoder->setRefresh(r, c, true);
 }
 
 void TeletextPageRender::setReveal(bool reveal)

src/qteletextdecoder/render.h

@@ -79,9 +79,10 @@ protected:
 	int m_flashingRow[25];
 
 private:
-	inline void drawFromBitmap(QPainter &, int, int, const QImage, TeletextPageDecode::CharacterFragment);
+	inline void drawFromBitmap(QPainter &painter, int r, int c, const QImage image, TeletextPageDecode::CharacterFragment characterFragment);
 	inline void drawFromFontBitmap(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
 	inline void drawCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, int characterDiacritical, TeletextPageDecode::CharacterFragment characterFragment);
+	inline bool drawDRCSCharacter(QPainter &painter, int r, int c, TeletextPageDecode::DRCSSource drcsSource, int drcsSubTable, int drcsChar, TeletextPageDecode::CharacterFragment characterFragment, bool flashPhOn = true);
 	inline void drawBoldOrItalicCharacter(QPainter &painter, int r, int c, unsigned char characterCode, int characterSet, TeletextPageDecode::CharacterFragment characterFragment);
 	void renderRow(int r, int ph, bool force=false);
 	void setRowFlashStatus(int r, int rowFlashHz);

src/qteletextdecoder/x26triplets.cpp

@@ -26,6 +26,51 @@ X26Triplet::X26Triplet(int address, int mode, int data)
 	m_data = data;
 }
 
+bool X26Triplet::isValid() const
+{
+	return m_mode != 0xff;
+}
+
+int X26Triplet::address() const
+{
+	return m_address;
+}
+
+int X26Triplet::mode() const
+{
+	return m_mode;
+}
+
+int X26Triplet::modeExt() const
+{
+	return (m_address >= 40) ? m_mode : (m_mode | 0x20);
+}
+
+int X26Triplet::data() const
+{
+	return m_data;
+}
+
+int X26Triplet::addressRow() const
+{
+	return (m_address == 40) ? 24 :m_address-40;
+}
+
+int X26Triplet::addressColumn() const
+{
+	return (m_address);
+}
+
+bool X26Triplet::isRowTriplet() const
+{
+	return (m_address >= 40);
+}
+
+void X26Triplet::setInvalid()
+{
+	m_address = m_mode = m_data = 0xff;
+}
+
 void X26Triplet::setAddress(int address)
 {
 	m_address = address;
@@ -51,6 +96,26 @@ void X26Triplet::setAddressColumn(int addressColumn)
 	m_address = addressColumn;
 }
 
+int X26Triplet::objectSource() const
+{
+	return (m_address & 0x18) >> 3;
+}
+
+int X26Triplet::objectLocalDesignationCode() const
+{
+	return (((m_address & 0x01) << 3) | (m_data >> 4));
+}
+
+int X26Triplet::objectLocalTripletNumber() const
+{
+	return m_data & 0x0f;
+}
+
+int X26Triplet::objectLocalIndex() const
+{
+	return objectLocalDesignationCode() * 13 + objectLocalTripletNumber();
+}
+
 void X26Triplet::setObjectLocalDesignationCode(int i)
 {
 	m_address = (m_address & 0x38) | (i >> 3);
@@ -68,6 +133,46 @@ void X26Triplet::setObjectLocalIndex(int i)
 	m_data = (((i / 13) & 0x07) << 4) | (i % 13);
 }
 
+int X26Triplet::activePositionRow() const
+{
+	return m_activePositionRow;
+}
+
+int X26Triplet::activePositionColumn() const
+{
+	return m_activePositionColumn;
+}
+
+int X26Triplet::activePositionRow1p5() const
+{
+	return m_activePositionRow1p5;
+}
+
+int X26Triplet::activePositionColumn1p5() const
+{
+	return m_activePositionColumn1p5;
+}
+
+X26Triplet::X26TripletError X26Triplet::error() const
+{
+	return m_error;
+}
+
+bool X26Triplet::reservedMode() const
+{
+	return m_reservedMode;
+}
+
+bool X26Triplet::reservedData() const
+{
+	return m_reservedData;
+}
+
+bool X26Triplet::activePosition1p5Differs() const
+{
+	return m_activePosition1p5Differs;
+}
+
 
 void X26TripletList::updateInternalData()
 {
@@ -85,7 +190,9 @@ void X26TripletList::updateInternalData()
 		triplet->m_reservedMode = false;
 		triplet->m_reservedData = false;
 
-		if (triplet->isRowTriplet()) {
+		if (!triplet->isValid())
+			triplet->m_error = X26Triplet::ErrorDecodingTriplet;
+		else if (triplet->isRowTriplet()) {
 			switch (triplet->modeExt()) {
 				case 0x00: // Full screen colour
 					if (activePosition.isDeployed())
@@ -282,6 +389,35 @@ void X26TripletList::replace(int i, const X26Triplet &value)
 	updateInternalData();
 }
 
+void X26TripletList::removeLast()
+{
+	m_list.removeLast();
+}
+
+const X26Triplet &X26TripletList::at(int i) const
+{
+	return m_list.at(i);
+}
+
+bool X26TripletList::isEmpty() const
+{
+	return m_list.isEmpty();
+}
+
+void X26TripletList::reserve(int alloc)
+{
+	m_list.reserve(alloc);
+}
+
+int X26TripletList::size() const
+{
+	return m_list.size();
+}
+
+const QList<int> &X26TripletList::objects(int t) const
+{
+	return m_objects[t];
+};
 
 X26TripletList::ActivePosition::ActivePosition()
 {
@@ -293,6 +429,21 @@ void X26TripletList::ActivePosition::reset()
 	m_row = m_column = -1;
 }
 
+int X26TripletList::ActivePosition::row() const
+{
+	return m_row; // return (m_row == -1) ? 0 : m_row;
+}
+
+int X26TripletList::ActivePosition::column() const
+{
+	return m_column; // return (m_column == -1) ? 0 : m_column;
+}
+
+bool X26TripletList::ActivePosition::isDeployed() const
+{
+	return m_row != -1;
+}
+
 bool X26TripletList::ActivePosition::setRow(int row)
 {
 	if (row < m_row)

src/qteletextdecoder/x26triplets.h

@@ -26,7 +26,7 @@ class X26Triplet
 {
 public:
 	// x26model.h has the Plain English descriptions of these errors
-	enum X26TripletError { NoError, ActivePositionMovedUp, ActivePositionMovedLeft, InvokePointerInvalid, InvokeTypeMismatch, OriginModifierAlone };
+	enum X26TripletError { NoError, ErrorDecodingTriplet, ActivePositionMovedUp, ActivePositionMovedLeft, InvokePointerInvalid, InvokeTypeMismatch, OriginModifierAlone };
 	enum ObjectSource { InvalidObjectSource, LocalObject, POPObject, GPOPObject };
 
 	X26Triplet() {}
@@ -36,37 +36,39 @@ public:
 
 	X26Triplet(int address, int mode, int data);
 
-	int address() const { return m_address; }
+	bool isValid() const;
-	int mode() const { return m_mode; }
+	int address() const;
-	int modeExt() const { return (m_address >= 40) ? m_mode : (m_mode | 0x20); }
+	int mode() const;
-	int data() const { return m_data; }
+	int modeExt() const;
-	int addressRow() const { return (m_address == 40) ? 24 :m_address-40; }
+	int data() const;
-	int addressColumn() const { return (m_address); }
+	int addressRow() const;
-	bool isRowTriplet() const { return (m_address >= 40); }
+	int addressColumn() const;
+	bool isRowTriplet() const;
 
+	void setInvalid();
 	void setAddress(int address);
 	void setMode(int mode);
 	void setData(int data);
 	void setAddressRow(int addressRow);
 	void setAddressColumn(int addressColumn);
 
-	int objectSource() const { return (m_address & 0x18) >> 3; }
+	int objectSource() const;
 
-	int objectLocalDesignationCode() const { return (((m_address & 0x01) << 3) | (m_data >> 4)); }
+	int objectLocalDesignationCode() const;
-	int objectLocalTripletNumber() const { return m_data & 0x0f; }
+	int objectLocalTripletNumber() const;
-	int objectLocalIndex() const { return objectLocalDesignationCode() * 13 + objectLocalTripletNumber(); }
+	int objectLocalIndex() const;
 	void setObjectLocalDesignationCode(int i);
 	void setObjectLocalTripletNumber(int i);
 	void setObjectLocalIndex(int i);
 
-	int activePositionRow() const { return m_activePositionRow; }
+	int activePositionRow() const;
-	int activePositionColumn() const { return m_activePositionColumn; }
+	int activePositionColumn() const;
-	int activePositionRow1p5() const { return m_activePositionRow1p5; }
+	int activePositionRow1p5() const;
-	int activePositionColumn1p5() const { return m_activePositionColumn1p5; }
+	int activePositionColumn1p5() const;
-	X26TripletError error() const { return m_error; }
+	X26TripletError error() const;
-	bool reservedMode() const { return m_reservedMode; }
+	bool reservedMode() const;
-	bool reservedData() const { return m_reservedData; }
+	bool reservedData() const;
-	bool activePosition1p5Differs() const { return m_activePosition1p5Differs; }
+	bool activePosition1p5Differs() const;
 
 	friend class X26TripletList;
 
@@ -91,14 +93,13 @@ public:
 	void insert(int i, const X26Triplet &value);
 	void removeAt(int i);
 	void replace(int i, const X26Triplet &value);
+	void removeLast();
+	const X26Triplet &at(int i) const;
+	bool isEmpty() const;
+	void reserve(int alloc);
+	int size() const;
 
-	void removeLast() { m_list.removeLast(); }
+	const QList<int> &objects(int t) const;
-
-	const X26Triplet &at(int i) const { return m_list.at(i); }
-	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();
@@ -111,11 +112,9 @@ private:
 	public:
 		ActivePosition();
 		void reset();
-//		int row() const { return (m_row == -1) ? 0 : m_row; }
+		int row() const;
-//		int column() const { return (m_column == -1) ? 0 : m_column; }
+		int column() const;
-		int row() const { return m_row; }
+		bool isDeployed() const;
-		int column() const { return m_column; }
-		bool isDeployed() const { return m_row != -1; }
 		bool setRow(int);
 		bool setColumn(int);
 //		bool setRowAndColumn(int, int);

src/qteletextmaker/dclutdockwidget.cpp

@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2020-2025 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 <QApplication>
+#include <QComboBox>
+#include <QDockWidget>
+#include <QGridLayout>
+#include <QMenu>
+#include <QPainter>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+
+#include "dclutdockwidget.h"
+
+#include "mainwidget.h"
+#include "x26menus.h"
+#include "x28commands.h"
+
+DClutDockWidget::DClutDockWidget(TeletextWidget *parent): QDockWidget(parent)
+{
+	QVBoxLayout *dClutLayout = new QVBoxLayout;
+	QWidget *dClutWidget = new QWidget;
+
+	m_parentMainWidget = parent;
+
+	this->setObjectName("DClutWidget");
+	this->setWindowTitle("Level 3.5 DCLUTs");
+
+	QStackedWidget *stackedWidget = new QStackedWidget;
+	QGridLayout *pageLayout[4];
+
+	for (int p=0; p<4; p++) {
+		pageLayout[p] = new QGridLayout;
+
+		for (int i=0; i<16; i++) {
+			m_dClutButton[p][i] = new QPushButton;
+			m_dClutButton[p][i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+			pageLayout[p]->addWidget(m_dClutButton[p][i], i/4, i%4);
+
+			m_dClutMenu[p][i] = new TripletCLUTQMenu(false, this);
+			m_dClutButton[p][i]->setMenu(m_dClutMenu[p][i]);
+
+			for (int c=0; c<32; c++)
+				connect(static_cast<TripletCLUTQMenu *>(m_dClutMenu[p][i])->action(c), &QAction::triggered, [=]() { m_parentMainWidget->document()->undoStack()->push(new SetDCLUTCommand(m_parentMainWidget->document(), (p % 2 == 0), p/2 + 1, i, c)); });
+
+			connect(m_dClutMenu[p][i], &QMenu::aboutToShow, [=]() { updateDClutMenu(p, i); });
+
+			if (i == 3 && p < 2)
+				break;
+		}
+
+		QWidget *pageWidget = new QWidget;
+		pageWidget->setLayout(pageLayout[p]);
+		stackedWidget->addWidget(pageWidget);
+	}
+
+	QComboBox *dClutPageSelect = new QComboBox;
+	dClutPageSelect->addItem(tr("Global DRCS mode 1"));
+	dClutPageSelect->addItem(tr("Normal DRCS mode 1"));
+	dClutPageSelect->addItem(tr("Global DRCS modes 2 & 3"));
+	dClutPageSelect->addItem(tr("Normal DRCS modes 2 & 3"));
+	dClutLayout->addWidget(dClutPageSelect);
+
+	dClutLayout->addWidget(stackedWidget);
+
+	dClutWidget->setLayout(dClutLayout);
+	this->setWidget(dClutWidget);
+
+	connect(dClutPageSelect, &QComboBox::activated, stackedWidget, &QStackedWidget::setCurrentIndex);
+
+	connect(m_parentMainWidget->document(), &TeletextDocument::dClutChanged, this, &DClutDockWidget::dClutChanged);
+	connect(m_parentMainWidget->document(), &TeletextDocument::colourChanged, this, &DClutDockWidget::colourChanged);
+}
+
+void DClutDockWidget::updateDClutMenu(int p, int i)
+{
+	for (int c=0; c<32; c++)
+		static_cast<TripletCLUTQMenu *>(m_dClutMenu[p][i])->setColour(c, m_parentMainWidget->document()->currentSubPage()->CLUTtoQColor(c));
+}
+
+void DClutDockWidget::updateColourButton(int p, int i)
+{
+	const int dIndex = m_parentMainWidget->document()->currentSubPage()->dCLUT((p % 2 == 0), p/2 + 1, i);
+	m_dClutButton[p][i]->setText(QString("%1:%2").arg(dIndex / 8).arg(dIndex % 8));
+	const QString colourString = QString("%1").arg(m_parentMainWidget->document()->currentSubPage()->CLUT(dIndex), 3, 16, QChar('0'));
+
+	if (dIndex != 8) {
+		// FIXME duplicated in palettedockwidget.cpp
+		const int r = m_parentMainWidget->document()->currentSubPage()->CLUT(dIndex) >> 8;
+		const int g = (m_parentMainWidget->document()->currentSubPage()->CLUT(dIndex) >> 4) & 0xf;
+		const int b = m_parentMainWidget->document()->currentSubPage()->CLUT(dIndex) & 0xf;
+		// Set text itself to black or white so it can be seen over background colour - http://alienryderflex.com/hsp.html
+		const char blackOrWhite = (sqrt(r*r*0.299 + g*g*0.587 + b*b*0.114) > 7.647) ? '0' : 'f';
+
+		m_dClutButton[p][i]->setStyleSheet(QString("background-color: #%1; color: #%2%2%2; border: none").arg(colourString).arg(blackOrWhite));;
+	} else
+		m_dClutButton[p][i]->setStyleSheet("border: none");
+}
+
+void DClutDockWidget::updateAllColourButtons()
+{
+	for (int p=0; p<4; p++)
+		for (int i=0; i<16; i++) {
+			updateColourButton(p, i);
+
+			if (i == 3 && p < 2)
+				break;
+		}
+}
+
+void DClutDockWidget::dClutChanged(bool g, int m, int i)
+{
+	updateColourButton(!g + m*2-2, i);
+
+	if (m_parentMainWidget->pageDecode()->level() == 3)
+		for (int r=0; r<25; r++)
+			for (int c=0; c<72; c++)
+				if (m_parentMainWidget->pageDecode()->cellDrcsSource(r, c) != TeletextPageDecode::NoDRCS)
+					m_parentMainWidget->pageDecode()->setRefresh(r, c, true);
+
+	emit m_parentMainWidget->document()->contentsChanged();
+}
+
+void DClutDockWidget::colourChanged(int c)
+{
+	const QString searchString = QString("%1:%2").arg(c / 8).arg(c % 8);
+
+	for (int p=0; p<4; p++)
+		for (int i=0; i<16; i++) {
+			if (m_dClutButton[p][i]->text() == searchString)
+				updateColourButton(p, i);
+
+			if (i == 3 && p < 2)
+				break;
+		}
+}

src/qteletextmaker/dclutdockwidget.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020-2025 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 DCLUTDOCKWIDGET_H
+#define DCLUTDOCKWIDGET_H
+
+#include <QComboBox>
+#include <QDockWidget>
+#include <QMenu>
+#include <QPainter>
+#include <QPushButton>
+
+#include "mainwidget.h"
+
+class DClutDockWidget : public QDockWidget
+{
+	Q_OBJECT
+
+public:
+	DClutDockWidget(TeletextWidget *parent);
+	void updateAllColourButtons();
+
+public slots:
+	void updateColourButton(int p, int i);
+	void dClutChanged(bool g, int m, int i);
+	void colourChanged(int c);
+
+private:
+	void updateDClutMenu(int p, int i);
+
+	TeletextWidget *m_parentMainWidget;
+	QPushButton *m_dClutButton[4][16];
+	QMenu *m_dClutMenu[4][16];
+};
+
+#endif

src/qteletextmaker/document.cpp

@@ -18,7 +18,8 @@
  */
 
 #include <QAbstractListModel>
-#include <vector>
+#include <QList>
+#include <QVariant>
 
 #include "document.h"
 
@@ -52,7 +53,7 @@ void ClutModel::setSubPage(LevelOnePage *subPage)
 {
 	if (subPage != m_subPage) {
 		m_subPage = subPage;
-		emit dataChanged(createIndex(0, 0), createIndex(31, 0), QVector<int>(Qt::DecorationRole));
+		emit dataChanged(createIndex(0, 0), createIndex(31, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -61,13 +62,12 @@ TeletextDocument::TeletextDocument()
 {
 	m_pageNumber = 0x199;
 	m_description.clear();
-	m_pageFunction = PFLevelOnePage;
+	m_subPages.append(new LevelOnePage);
-	m_packetCoding = Coding7bit;
-	m_subPages.push_back(new LevelOnePage);
 	m_currentSubPageIndex = 0;
 	m_undoStack = new QUndoStack(this);
 	m_cursorRow = 1;
 	m_cursorColumn = 0;
+	m_rowZeroAllowed = false;
 	m_selectionCornerRow = m_selectionCornerColumn = -1;
 	m_selectionSubPage = nullptr;
 
@@ -96,9 +96,7 @@ bool TeletextDocument::isEmpty() const
 
 void TeletextDocument::clear()
 {
-	LevelOnePage *blankSubPage = new LevelOnePage;
+	m_subPages.prepend(new LevelOnePage);
-
-	m_subPages.insert(m_subPages.begin(), blankSubPage);
 
 	emit aboutToChangeSubPage();
 	m_currentSubPageIndex = 0;
@@ -109,22 +107,10 @@ void TeletextDocument::clear()
 
 	for (int i=m_subPages.size()-1; i>0; i--) {
 		delete(m_subPages[i]);
-		m_subPages.erase(m_subPages.begin()+i);
+		m_subPages.remove(i);
 	}
 }
 
-/*
-void TeletextDocument::setPageFunction(PageFunctionEnum newPageFunction)
-{
-	m_pageFunction = newPageFunction;
-}
-
-void TeletextDocument::setPacketCoding(PacketCodingEnum newPacketEncoding)
-{
-	m_packetCoding = newPacketEncoding;
-}
-*/
-
 void TeletextDocument::selectSubPageIndex(int newSubPageIndex, bool forceRefresh)
 {
 	// forceRefresh overrides "beyond the last subpage" check, so inserting a subpage after the last one still shows - dangerous workaround?
@@ -176,9 +162,9 @@ void TeletextDocument::insertSubPage(int beforeSubPageIndex, bool copySubPage)
 		insertedSubPage = new LevelOnePage;
 
 	if (beforeSubPageIndex == m_subPages.size())
-		m_subPages.push_back(insertedSubPage);
+		m_subPages.append(insertedSubPage);
 	else
-		m_subPages.insert(m_subPages.begin()+beforeSubPageIndex, insertedSubPage);
+		m_subPages.insert(beforeSubPageIndex, insertedSubPage);
 }
 
 void TeletextDocument::deleteSubPage(int subPageToDelete)
@@ -186,19 +172,64 @@ void TeletextDocument::deleteSubPage(int subPageToDelete)
 	m_clutModel->setSubPage(nullptr);
 
 	delete(m_subPages[subPageToDelete]);
-	m_subPages.erase(m_subPages.begin()+subPageToDelete);
+	m_subPages.remove(subPageToDelete);
 }
 
 void TeletextDocument::deleteSubPageToRecycle(int subPageToRecycle)
 {
-	m_recycleSubPages.push_back(m_subPages[subPageToRecycle]);
+	m_recycleSubPages.append(m_subPages[subPageToRecycle]);
-	m_subPages.erase(m_subPages.begin()+subPageToRecycle);
+	m_subPages.remove(subPageToRecycle);
 }
 
 void TeletextDocument::unDeleteSubPageFromRecycle(int subPage)
 {
-	m_subPages.insert(m_subPages.begin()+subPage, m_recycleSubPages.back());
+	m_subPages.insert(subPage, m_recycleSubPages.last());
-	m_recycleSubPages.pop_back();
+	m_recycleSubPages.removeLast();
+}
+
+void TeletextDocument::loadFromList(QList<PageBase> const &subPageList)
+{
+	*m_subPages[0] = subPageList.at(0);
+
+	for (int i=1; i<subPageList.size(); i++)
+		m_subPages.append(new LevelOnePage(subPageList.at(i)));
+}
+
+void TeletextDocument::loadMetaData(QVariantHash const &metadata)
+{
+	bool valueOk;
+
+	if (const QString description = metadata.value("description").toString(); !description.isEmpty())
+		m_description = description;
+
+	if (const int pageNumber = metadata.value("pageNumber").toInt(&valueOk); valueOk)
+		m_pageNumber = pageNumber;
+
+	if (metadata.value("fastextAbsolute").toBool()) {
+		const int magazineFlip = m_pageNumber & 0x700;
+
+		for (auto &subPage : m_subPages)
+			for (int i=0; i<6; i++)
+				subPage->setFastTextLinkPageNumber(i, subPage->fastTextLinkPageNumber(i) ^ magazineFlip);
+	}
+
+	for (int i=0; i<numberOfSubPages(); i++) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+		const QString subPageStr = QString("%1").arg(i, 3, '0');
+#else
+		const QString subPageStr = QString("%1").arg(i, 3, QChar('0'));
+#endif
+
+		if (int region = metadata.value("region" + subPageStr).toInt(&valueOk); valueOk)
+			subPage(i)->setDefaultCharSet(region);
+		if (int cycleValue = metadata.value("cycleValue" + subPageStr).toInt(&valueOk); valueOk)
+			subPage(i)->setCycleValue(cycleValue);
+		QChar cycleType = metadata.value("cycleType" + subPageStr).toChar();
+		if (cycleType == 'C')
+			subPage(i)->setCycleType(LevelOnePage::CTcycles);
+		else if (cycleType == 'T')
+			subPage(i)->setCycleType(LevelOnePage::CTseconds);
+	}
 }
 
 void TeletextDocument::setPageNumber(int pageNumber)
@@ -252,7 +283,7 @@ void TeletextDocument::cursorUp(bool shiftKey)
 	if (shiftKey && !selectionActive())
 		setSelectionCorner(m_cursorRow, m_cursorColumn);
 
-	if (--m_cursorRow == 0)
+	if (--m_cursorRow == 0 - (int)m_rowZeroAllowed)
 		m_cursorRow = 24;
 
 	if (shiftKey)
@@ -269,7 +300,7 @@ void TeletextDocument::cursorDown(bool shiftKey)
 		setSelectionCorner(m_cursorRow, m_cursorColumn);
 
 	if (++m_cursorRow == 25)
-		m_cursorRow = 1;
+		m_cursorRow = (int)!m_rowZeroAllowed;
 
 	if (shiftKey)
 		emit selectionMoved();
@@ -333,6 +364,13 @@ void TeletextDocument::moveCursor(int cursorRow, int cursorColumn, bool selectio
 	emit cursorMoved();
 }
 
+void TeletextDocument::setRowZeroAllowed(bool allowed)
+{
+	m_rowZeroAllowed = allowed;
+	if (m_cursorRow == 0 && !allowed)
+		cursorDown();
+}
+
 void TeletextDocument::setSelectionCorner(int row, int column)
 {
 	if (m_selectionCornerRow != row || m_selectionCornerColumn != column) {

src/qteletextmaker/document.h

@@ -21,9 +21,10 @@
 #define DOCUMENT_H
 
 #include <QAbstractListModel>
+#include <QList>
 #include <QObject>
 #include <QUndoStack>
-#include <vector>
+#include <QVariant>
 
 #include "levelonepage.h"
 
@@ -47,22 +48,12 @@ class TeletextDocument : public QObject
 	Q_OBJECT
 
 public:
-	// Available Page Functions according to 9.4.2.1 of the spec
-	enum PageFunctionEnum { PFLevelOnePage, PFDataBroadcasting, PFGlobalPOP, PFNormalPOP, PFGlobalDRCS, PFNormalDRCS, PFMOT, PFMIP, PFBasicTOPTable, PFAdditionalInformationTable, PFMultiPageTable, PFMultiPageExtensionTable, PFTriggerMessages };
-	// Available Page Codings of X/1 to X/25 according to 9.4.2.1 of the spec
-	enum PacketCodingEnum { Coding7bit, Coding8bit, Coding18bit, Coding4bit, Coding4bitThen7bit, CodingPerPacket };
-
 	TeletextDocument();
 	~TeletextDocument();
 
 	bool isEmpty() const;
 	void clear();
 
-	PageFunctionEnum pageFunction() const { return m_pageFunction; }
-//	void setPageFunction(PageFunctionEnum);
-	PacketCodingEnum packetCoding() const { return m_packetCoding; }
-//	void setPacketCoding(PacketCodingEnum);
-
 	int numberOfSubPages() const { return m_subPages.size(); }
 	LevelOnePage* subPage(int p) const { return m_subPages[p]; }
 	LevelOnePage* currentSubPage() const { return m_subPages[m_currentSubPageIndex]; }
@@ -74,6 +65,8 @@ public:
 	void deleteSubPage(int subPageToDelete);
 	void deleteSubPageToRecycle(int subPageToRecycle);
 	void unDeleteSubPageFromRecycle(int subPage);
+	void loadFromList(QList<PageBase> const &subPageList);
+	void loadMetaData(QVariantHash const &metadata);
 	int pageNumber() const { return m_pageNumber; }
 	void setPageNumber(int pageNumber);
 	void setPageNumberFromString(QString pageNumberString);
@@ -89,6 +82,8 @@ public:
 	void cursorLeft(bool shiftKey=false);
 	void cursorRight(bool shiftKey=false);
 	void moveCursor(int cursorRow, int cursorColumn, bool selectionInProgress=false);
+	bool rowZeroAllowed() const { return m_rowZeroAllowed; };
+	void setRowZeroAllowed(bool allowed);
 	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); }
@@ -107,6 +102,7 @@ signals:
 	void cursorMoved();
 	void selectionMoved();
 	void colourChanged(int i);
+	void dClutChanged(bool g, int m, int i);
 	void pageOptionsChanged();
 	void aboutToChangeSubPage();
 	void subPageSelected();
@@ -117,12 +113,11 @@ signals:
 private:
 	QString m_description;
 	int m_pageNumber, m_currentSubPageIndex;
-	PageFunctionEnum m_pageFunction;
+	QList<LevelOnePage *> m_subPages;
-	PacketCodingEnum m_packetCoding;
+	QList<LevelOnePage *> m_recycleSubPages;
-	std::vector<LevelOnePage *> m_subPages;
-	std::vector<LevelOnePage *> m_recycleSubPages;
 	QUndoStack *m_undoStack;
 	int m_cursorRow, m_cursorColumn, m_selectionCornerRow, m_selectionCornerColumn;
+	bool m_rowZeroAllowed;
 	LevelOnePage *m_selectionSubPage;
 	ClutModel *m_clutModel;
 };

src/qteletextmaker/hashformats.cpp

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2020-2025 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 "hashformats.h"
+
+#include <QByteArray>
+#include <QString>
+
+#include "levelonepage.h"
+#include "pagebase.h"
+
+QString exportHashStringPage(LevelOnePage *subPage)
+{
+	int hashDigits[1167]={0};
+	int totalBits, charBit;
+	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	QString hashString;
+	QByteArray rowPacket;
+
+	// TODO int editTFCharacterSet = 5;
+	bool blackForeground = false;
+
+	for (int r=0; r<25; r++) {
+		if (subPage->packetExists(r))
+			rowPacket = subPage->packet(r);
+		else
+			rowPacket = QByteArray(40, 0x20).constData();
+
+		for (int c=0; c<40; c++) {
+			if (rowPacket.at(c) == 0x00 || rowPacket.at(c) == 0x10)
+				blackForeground = true;
+			for (int b=0; b<7; b++) {
+				totalBits = (r * 40 + c) * 7 + b;
+				charBit = ((rowPacket.at(c)) >> (6 - b)) & 0x01;
+				hashDigits[totalBits / 6] |= charBit << (5 - (totalBits % 6));
+			}
+		}
+	}
+
+	hashString.append(QString("#%1:").arg(blackForeground ? 8 : 0, 1, 16));
+
+	for (int i=0; i<1167; i++)
+		hashString.append(base64[hashDigits[i]]);
+
+	return hashString;
+}
+
+QString exportHashStringPackets(LevelOnePage *subPage)
+{
+	auto colourToHexString=[&](int whichCLUT)
+	{
+		QString resultHexString;
+
+		for (int i=whichCLUT*8; i<whichCLUT*8+8; i++)
+			resultHexString.append(QString("%1").arg(subPage->CLUT(i), 3, 16, QChar('0')));
+		return resultHexString;
+	};
+
+	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+	QString result;
+
+	// Assemble PS
+	// C4 Erase page is stored in bit 14
+	int pageStatus = 0x8000 | (subPage->controlBit(PageBase::C4ErasePage) << 14);
+	// C5 to C11 stored in order from bits 1 to 6
+	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
+		pageStatus |= subPage->controlBit(i) << (i-1);
+	// Apparently the TTI format stores the NOS bits backwards
+	pageStatus |= subPage->controlBit(PageBase::C12NOS) << 9;
+	pageStatus |= subPage->controlBit(PageBase::C13NOS) << 8;
+	pageStatus |= subPage->controlBit(PageBase::C14NOS) << 7;
+
+	result.append(QString(":PS=%1:RE=%2").arg(0x8000 | pageStatus, 0, 16, QChar('0')).arg(subPage->defaultCharSet(), 1, 16));
+
+	if (subPage->packetExists(28,0) || subPage->packetExists(28,4)) {
+		// X/28/0 and X/28/4 are duplicates apart from the CLUT definitions
+		// Assemble the duplicate beginning and ending of both packets
+		QString x28StringBegin, x28StringEnd;
+
+		x28StringBegin.append(QString("00%1").arg((subPage->defaultCharSet() << 3) | subPage->defaultNOS(), 2, 16, QChar('0')).toUpper());
+		x28StringBegin.append(QString("%1").arg((subPage->secondCharSet() << 3) | subPage->secondNOS(), 2, 16, QChar('0')).toUpper());
+		x28StringBegin.append(QString("%1%2%3%4").arg(subPage->leftSidePanelDisplayed(), 1, 10).arg(subPage->rightSidePanelDisplayed(), 1, 10).arg(subPage->sidePanelStatusL25(), 1, 10).arg(subPage->sidePanelColumns(), 1, 16));
+
+		x28StringEnd = QString("%1%2%3%4").arg(subPage->defaultScreenColour(), 2, 16, QChar('0')).arg(subPage->defaultRowColour(), 2, 16, QChar('0')).arg(subPage->blackBackgroundSubst(), 1, 10).arg(subPage->colourTableRemap(), 1, 10);
+
+		if (subPage->packetExists(28,0))
+			result.append(":X280=" + x28StringBegin + colourToHexString(2) + colourToHexString(3) + x28StringEnd);
+		if (subPage->packetExists(28,4))
+			result.append(":X284=" + x28StringBegin + colourToHexString(0) + colourToHexString(1) + x28StringEnd);
+	}
+
+	if (!subPage->enhancements()->isEmpty()) {
+		result.append(":X26=");
+		for (int i=0; i<subPage->enhancements()->size(); i++) {
+			result.append(base64[subPage->enhancements()->at(i).data() >> 1]);
+			result.append(base64[subPage->enhancements()->at(i).mode() | ((subPage->enhancements()->at(i).data() & 1) << 5)]);
+			result.append(base64[subPage->enhancements()->at(i).address()]);
+		}
+	}
+
+	return result;
+}

src/qteletextmaker/hashformats.h

@@ -17,30 +17,15 @@
  * along with QTeletextMaker.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef LOADSAVE_H
+#ifndef HASHFORMATS_H
-#define LOADSAVE_H
+#define HASHFORMATS_H
 
 #include <QByteArray>
-#include <QFile>
-#include <QSaveFile>
 #include <QString>
-#include <QTextStream>
 
-#include "document.h"
 #include "levelonepage.h"
 #include "pagebase.h"
 
-void loadTTI(QFile *inFile, TeletextDocument *document);
-void importT42(QFile *inFile, TeletextDocument *document);
-
-int controlBitsToPS(PageBase *subPage);
-
-void saveTTI(QSaveFile &file, const TeletextDocument &document);
-void exportT42File(QSaveFile &file, const TeletextDocument &document);
-void exportM29File(QSaveFile &file, const TeletextDocument &document);
-
-QByteArray rowPacketAlways(PageBase *subPage, int packetNumber);
-
 QString exportHashStringPage(LevelOnePage *subPage);
 QString exportHashStringPackets(LevelOnePage *subPage);
 

src/qteletextmaker/levelonecommands.cpp

@@ -810,7 +810,7 @@ PasteCommand::PasteCommand(TeletextDocument *teletextDocument, int pageCharSet,
 			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});
+			imageData = imageData.convertToFormat(QImage::Format_MonoLSB, QList<QRgb>{0x000000ff, 0xffffffff});
 
 		for (int r=0; r<m_clipboardDataHeight; r++)
 			m_pastingCharacters.append(QByteArray(m_clipboardDataWidth, 0x00));

src/qteletextmaker/loadformats.cpp

@@ -0,0 +1,656 @@
+/*
+ * Copyright (C) 2020-2025 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 "loadformats.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QFile>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+#include "hamming.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+bool LoadTTIFormat::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash *metadata)
+{
+	m_warnings.clear();
+	m_error.clear();
+
+	QByteArray inLine;
+	int pageNum = 0;
+	int currentSubPageNum = 0;
+	bool firstSubPageAlreadyFound = false;
+	bool pageBodyPacketsFound = false;
+
+//	subPages.clear();
+	subPages.append(PageBase { } );
+
+	PageBase* loadingPage = &subPages[0];
+
+	for (;;) {
+		inLine = inFile->readLine(160).trimmed();
+		if (inLine.isEmpty())
+			break;
+		if (inLine.startsWith("DE,") && metadata != nullptr)
+			metadata->insert("description", QString(inLine.remove(0, 3)));
+		if (inLine.startsWith("PN,")) {
+			if (!firstSubPageAlreadyFound) {
+				// First PN command found, set the page number
+				bool valueOk;
+
+				if (int pageNumRead = inLine.mid(3, 3).toInt(&valueOk, 16); valueOk)
+					if (pageNumRead >= 0x100 && pageNumRead <= 0x8ff) {
+						// Keep page number: to check if page is xFF if we load M/29
+						pageNum = pageNumRead;
+						if (metadata != nullptr)
+							metadata->insert("pageNumber", pageNum);
+					}
+
+				firstSubPageAlreadyFound = true;
+			} else {
+				// Subsequent PN command found; this assumes that PN is the first command of a new subpage
+				currentSubPageNum++;
+				subPages.append(PageBase { } );
+				loadingPage = &subPages[subPages.size()-1];
+			}
+		}
+/*		if (lineType == "SC,") {
+			bool subPageNumberOk;
+			int subPageNumberRead = inLine.mid(3, 4).toInt(&subPageNumberOk, 16);
+			if ((!subPageNumberOk) || subPageNumberRead > 0x3f7f)
+				subPageNumberRead = 0;
+			loadingPage->setSubPageNumber(subPageNumberRead);
+		}*/
+		if (inLine.startsWith("PS,")) {
+			bool pageStatusOk;
+			const int pageStatusRead = inLine.mid(3, 4).toInt(&pageStatusOk, 16);
+			if (pageStatusOk) {
+				loadingPage->setControlBit(PageBase::C4ErasePage, pageStatusRead & 0x4000);
+
+				for (int i=PageBase::C5Newsflash, pageStatusBit=0x0001; i<=PageBase::C11SerialMagazine; i++, pageStatusBit<<=1)
+					loadingPage->setControlBit(i, pageStatusRead & pageStatusBit);
+
+				loadingPage->setControlBit(PageBase::C12NOS, pageStatusRead & 0x0200);
+				loadingPage->setControlBit(PageBase::C13NOS, pageStatusRead & 0x0100);
+				loadingPage->setControlBit(PageBase::C14NOS, pageStatusRead & 0x0080);
+			}
+		}
+		if (inLine.startsWith("RE,")) {
+			bool regionValueOk;
+			const int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk);
+			if (regionValueOk && metadata != nullptr && regionValueRead >= 0 && regionValueRead <= 15)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+				metadata->insert(QString("region%1").arg(currentSubPageNum, 3, '0'), regionValueRead);
+#else
+				metadata->insert(QString("region%1").arg(currentSubPageNum, 3, QChar('0')), regionValueRead);
+#endif
+		}
+		if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
+			bool cycleValueOk;
+			const int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
+			if (cycleValueOk && metadata != nullptr && cycleValueRead >= 1 && cycleValueRead <= 99) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+				metadata->insert(QString("cycleValue%1").arg(currentSubPageNum, 3, '0'), cycleValueRead);
+				metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, '0'), inLine.at(inLine.size()-1));
+#else
+				metadata->insert(QString("cycleValue%1").arg(currentSubPageNum, 3, QChar('0')), cycleValueRead);
+				metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, QChar('0')), inLine.at(inLine.size()-1));
+#endif
+			}
+		}
+		if (inLine.startsWith("FL,")) {
+			const QString flLine = QString(inLine.remove(0, 3));
+			if (flLine.count(',') == 5) {
+				// Init packet to all 0xf's as page xFF:3F7F means no page is specified
+				QByteArray fastTextPacket(40, 0xf);
+				fastTextPacket[0] = 0x0;  // Designation code
+				fastTextPacket[38] = 0x0; // CRC word
+				fastTextPacket[39] = 0x0; // CRC word
+
+				for (int i=0; i<6; i++) {
+					bool fastTextLinkOk;
+					int fastTextLinkRead = flLine.section(',', i, i).toInt(&fastTextLinkOk, 16);
+
+					if (fastTextLinkOk) {
+						if (fastTextLinkRead == 0)
+							fastTextLinkRead = 0x8ff;
+						else if (fastTextLinkRead >= 0x100 && fastTextLinkRead <= 0x8ff) {
+							fastTextPacket[i*6+1] = fastTextLinkRead & 0x00f;
+							fastTextPacket[i*6+2] = (fastTextLinkRead & 0x0f0) >> 4;
+							fastTextPacket[i*6+4] = 0x7 | ((fastTextLinkRead & 0x100) >> 5);
+							fastTextPacket[i*6+6] = 0x3 | ((fastTextLinkRead & 0x600) >> 7);
+						}
+					}
+				}
+				loadingPage->setPacket(27, 0, fastTextPacket);
+
+				if (metadata != nullptr)
+					metadata->insert(QString("fastextAbsolute"), true);
+			}
+		}
+		if (inLine.startsWith("OL,")) {
+			bool lineNumberOk;
+			int lineNumber;
+
+			const int secondCommaPosition = inLine.indexOf(',', 3);
+			if (secondCommaPosition != 4 && secondCommaPosition != 5)
+				continue;
+
+			lineNumber = inLine.mid(3, secondCommaPosition-3).toInt(&lineNumberOk, 10);
+			if (lineNumberOk && lineNumber >= 0 && lineNumber <= 29) {
+				inLine.remove(0, secondCommaPosition+1);
+				if (lineNumber <= 25) {
+					for (int c=0; c<40; c++) {
+						// trimmed() helpfully removes CRLF line endings from the just-read line for us
+						// But it also (un)helpfully removes spaces at the end of a 40 character line, so put them back
+						if (c >= inLine.size())
+							inLine.append(' ');
+						if (inLine.at(c) & 0x80)
+							inLine[c] = inLine.at(c) & 0x7f;
+						else if (inLine.at(c) == 0x10)
+							inLine[c] = 0x0d;
+						else if (inLine.at(c) == 0x1b) {
+							inLine.remove(c, 1);
+							inLine[c] = inLine.at(c) & 0xbf;
+						}
+					}
+					pageBodyPacketsFound = true;
+					loadingPage->setPacket(lineNumber, inLine);
+				} else if (inLine.at(0) >= 0x40 && inLine.at(0) <= 0x4f) {
+					const int designationCode = inLine.at(0) & 0x3f;
+					if (inLine.size() < 40) {
+						// OL is too short!
+						if (lineNumber == 26) {
+							// For a too-short enhancement triplets OL, first trim the line down to nearest whole triplet
+							inLine.resize((inLine.size() / 3 * 3) + 1);
+							// Then use "dummy" enhancement triplets to extend the line to the proper length
+							for (int i=inLine.size(); i<40; i+=3)
+								inLine.append("i^@"); // Address 41, Mode 0x1e, Data 0
+						} else
+							// For other triplet OLs and Hamming 8/4 OLs, just pad with zero data
+							for (int i=inLine.size(); i<40; i++)
+								inLine.append("@");
+					}
+					for (int i=1; i<=39; i++)
+						inLine[i] = inLine.at(i) & 0x3f;
+					// Import M/29 whole-magazine packets as X/28 per-page packets
+					if (lineNumber == 29) {
+						if ((pageNum & 0xff) != 0xff)
+							m_warnings.append(QString("M/29/%1 packet found, but page number was not xFF.").arg(designationCode));
+						lineNumber = 28;
+					}
+					pageBodyPacketsFound = true;
+					loadingPage->setPacket(lineNumber, designationCode, inLine);
+				}
+			}
+		}
+	}
+
+	if (!pageBodyPacketsFound) {
+		m_error = "No OL lines found";
+		return false;
+	}
+
+	return true;
+}
+
+
+bool LoadT42Format::readPacket()
+{
+	return m_inFile->read((char *)m_inLine, 42) == 42;
+}
+
+bool LoadT42Format::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash *metadata)
+{
+	int readMagazineNumber, readPacketNumber;
+	int foundMagazineNumber = -1;
+	int foundPageNumber = -1;
+	bool firstPacket0Found = false;
+	bool pageBodyPacketsFound = false;
+	bool errorEnhancements = false;
+	bool errorLinks = false;
+	bool errorPresentation = false;
+
+	m_inFile = inFile;
+
+	m_warnings.clear();
+	m_error.clear();
+	m_reExportWarning = false;
+
+//	subPages.clear();
+	subPages.append(PageBase { });
+
+	PageBase* loadingPage = &subPages[0];
+
+	for (;;) {
+		if (!readPacket())
+			// Reached end of .t42 file, or less than 42 bytes left
+			break;
+
+		// Magazine and packet numbers
+		m_inLine[0] = hamming_8_4_decode[m_inLine[0]];
+		m_inLine[1] = hamming_8_4_decode[m_inLine[1]];
+		if (m_inLine[0] == 0xff || m_inLine[1] == 0xff)
+			// Error decoding magazine or packet number
+			continue;
+		readMagazineNumber = m_inLine[0] & 0x07;
+		readPacketNumber = (m_inLine[0] >> 3) | (m_inLine[1] << 1);
+
+		if (readPacketNumber == 0) {
+			// Hamming decode page number, subcodes and control bits
+			for (int i=2; i<10; i++)
+				m_inLine[i] = hamming_8_4_decode[m_inLine[i]];
+			// See if the page number is valid
+			if (m_inLine[2] == 0xff || m_inLine[3] == 0xff)
+				// Error decoding page number
+				continue;
+
+			const int readPageNumber = (m_inLine[3] << 4) | m_inLine[2];
+
+			if (readPageNumber == 0xff)
+				// Time filling header
+				continue;
+
+			// A second or subsequent X/0 has been found
+			if (firstPacket0Found) {
+				if (readMagazineNumber != foundMagazineNumber)
+					// Packet from different magazine broadcast in parallel mode
+					continue;
+				if ((readPageNumber == foundPageNumber) && pageBodyPacketsFound)
+					// X/0 with same page number found after page body packets loaded - assume end of page
+					break;
+				if (readPageNumber != foundPageNumber) {
+					// More than one page in .t42 file - end of current page reached
+					m_warnings.append("More than one page in .t42 file, only first full page loaded.");
+					m_reExportWarning = true;
+					break;
+				}
+				// Could get here if X/0 with same page number was found with no body packets inbetween
+				continue;
+			} else {
+				// First X/0 found
+				foundMagazineNumber = readMagazineNumber;
+				foundPageNumber = readPageNumber;
+				firstPacket0Found = true;
+
+				if (metadata != nullptr) {
+					if (foundMagazineNumber == 0)
+						metadata->insert("pageNumber", 0x800 | foundPageNumber);
+					else
+						metadata->insert("pageNumber", (foundMagazineNumber << 8) | foundPageNumber);
+				}
+
+				loadingPage->setControlBit(PageBase::C4ErasePage, m_inLine[5] & 0x08);
+				loadingPage->setControlBit(PageBase::C5Newsflash, m_inLine[7] & 0x04);
+				loadingPage->setControlBit(PageBase::C6Subtitle, m_inLine[7] & 0x08);
+				for (int i=0; i<4; i++)
+					loadingPage->setControlBit(PageBase::C7SuppressHeader+i, m_inLine[8] & (1 << i));
+				loadingPage->setControlBit(PageBase::C11SerialMagazine, m_inLine[9] & 0x01);
+				loadingPage->setControlBit(PageBase::C12NOS, m_inLine[9] & 0x08);
+				loadingPage->setControlBit(PageBase::C13NOS, m_inLine[9] & 0x04);
+				loadingPage->setControlBit(PageBase::C14NOS, m_inLine[9] & 0x02);
+
+				// See if there's text in the header row
+				bool headerText = false;
+
+				for (int i=10; i<42; i++)
+					if (m_inLine[i] != 0x20) {
+						// TODO - obey odd parity?
+						m_inLine[i] &= 0x7f;
+						headerText = true;
+					}
+				if (headerText) {
+					// Clear the page address and control bits to spaces before putting the row in
+					for (int i=0; i<10; i++)
+						m_inLine[i] = 0x20;
+
+					loadingPage->setPacket(0, QByteArray((const char *)&m_inLine[2], 40));
+				}
+				continue;
+			}
+		}
+
+		// No X/0 has been found yet, keep looking for one
+		if (!firstPacket0Found)
+			continue;
+
+		// Disregard whole-magazine packets
+		if (readPacketNumber > 28)
+			continue;
+
+		// We get here when a page-body packet belonging to the found X/0 header was found
+		pageBodyPacketsFound = true;
+
+		// At the moment this only loads a Level One Page properly
+		// because it assumes X/1 to X/25 is odd partity
+		if (readPacketNumber < 25) {
+			for (int i=2; i<42; i++)
+				// TODO - obey odd parity?
+				m_inLine[i] &= 0x7f;
+			loadingPage->setPacket(readPacketNumber, QByteArray((const char *)&m_inLine[2], 40));
+			continue;
+		}
+
+		// X/26, X/27 or X/28
+		int readDesignationCode = hamming_8_4_decode[m_inLine[2]];
+
+		if (readDesignationCode == 0xff)
+			// Error decoding designation code
+			continue;
+
+		if (readPacketNumber == 27 && readDesignationCode < 4) {
+			// X/27/0 to X/27/3 for Editorial Linking
+			// Decode Hamming 8/4 on each of the six links, checking for errors on the way
+			for (int i=0; i<6; i++) {
+				bool decodingError = false;
+				const int b = 3 + i*6; // First byte of this link
+
+				for (int j=0; j<6; j++) {
+					m_inLine[b+j] = hamming_8_4_decode[m_inLine[b+j]];
+					if (m_inLine[b+j] == 0xff) {
+						decodingError = true;
+						break;
+					}
+				}
+
+				if (decodingError) {
+					// Error found in at least one byte of the link
+					// Neutralise the whole link to same magazine, page FF, subcode 3F7F
+					qDebug("X/27/%d link %d decoding error", readDesignationCode, i);
+					errorLinks = true;
+					m_inLine[b]   = 0xf;
+					m_inLine[b+1] = 0xf;
+					m_inLine[b+2] = 0xf;
+					m_inLine[b+3] = 0x7;
+					m_inLine[b+4] = 0xf;
+					m_inLine[b+5] = 0x3;
+				}
+			}
+			loadingPage->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+
+			continue;
+		}
+
+		// X/26, or X/27/4 to X/27/15, or X/28
+		// Decode Hamming 24/18
+		for (int i=0; i<13; i++) {
+			const int b = 3 + i*3; // First byte of triplet
+
+			const int p0 = m_inLine[b];
+			const int p1 = m_inLine[b+1];
+			const int p2 = m_inLine[b+2];
+
+			unsigned int D1_D4;
+			unsigned int D5_D11;
+			unsigned int D12_D18;
+			unsigned int ABCDEF;
+			int32_t d;
+
+			D1_D4 = hamming_24_18_decode_d1_d4[p0 >> 2];
+			D5_D11 = p1 & 0x7f;
+			D12_D18 = p2 & 0x7f;
+
+			d = D1_D4 | (D5_D11 << 4) | (D12_D18 << 11);
+
+			ABCDEF = (hamming_24_18_parities[0][p0] ^ hamming_24_18_parities[1][p1]  ^ hamming_24_18_parities[2][p2]);
+
+			d ^= (int)hamming_24_18_decode_correct[ABCDEF];
+
+			if ((d & 0x80000000) == 0x80000000) {
+				// Error decoding Hamming 24/18
+				qDebug("X/%d/%d triplet %d decoding error", readPacketNumber, readDesignationCode, i);
+				if (readPacketNumber == 26) {
+					// Enhancements packet, set to invalid triplet
+					m_inLine[b]   = 0xff;
+					m_inLine[b+1] = 0xff;
+					m_inLine[b+2] = 0xff;
+					errorEnhancements = true;
+				} else {
+					// Zero out whole decoded triplet, bound to make things go wrong...
+					m_inLine[b]   = 0x00;
+					m_inLine[b+1] = 0x00;
+					m_inLine[b+2] = 0x00;
+					errorPresentation = true;
+				}
+			} else {
+				m_inLine[b]   = d & 0x0003f;
+				m_inLine[b+1] = (d & 0x00fc0) >> 6;
+				m_inLine[b+2] = d >> 12;
+			}
+		}
+		loadingPage->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+	}
+
+	if (!firstPacket0Found) {
+		m_error = "No X/0 found.";
+		return false;
+	} else if (!pageBodyPacketsFound) {
+		m_error = "X/0 found, but no page body packets were found.";
+		return false;
+	}
+
+	if (errorEnhancements)
+		m_warnings.append("Error decoding triplet(s) in enhancement data.");
+	if (errorLinks)
+		m_warnings.append("Error decoding FLOF links.");
+	if (errorPresentation)
+		m_warnings.append("Error decoding triplet(s) in presentation data.");
+	return true;
+}
+
+
+bool LoadHTTFormat::readPacket()
+{
+	unsigned char httLine[45];
+
+	if (m_inFile->read((char *)httLine, 45) != 45)
+		return false;
+
+	if (httLine[0] != 0xaa || httLine[1] != 0xaa || httLine[2] != 0xe4)
+		return false;
+
+	for (int i=0; i<42; i++) {
+		unsigned char b = httLine[i+3];
+		b = (b & 0xf0) >> 4 | (b & 0x0f) << 4;
+		b = (b & 0xcc) >> 2 | (b & 0x33) << 2;
+		b = (b & 0xaa) >> 1 | (b & 0x55) << 1;
+		m_inLine[i] = b;
+	}
+
+	return true;
+}
+
+
+bool LoadEP1Format::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash *metadata)
+{
+	m_warnings.clear();
+	m_error.clear();
+	m_reExportWarning = false;
+
+	unsigned char inLine[42];
+	unsigned char numOfSubPages = 1;
+
+//	subPages.clear();
+	subPages.append(PageBase { } );
+
+	PageBase* loadingPage = &subPages[0];
+
+	for (;;) {
+		// Read six bytes, will either be a header for a (sub)page
+		// or a start header indicating multiple subpages are within
+		if (inFile->read((char *)inLine, 6) != 6)
+			return false;
+		if (inLine[0] == 'J' || inLine[1] == 'W' || inLine[2] == 'C') {
+			// Multiple subpages: get number of subpages then read
+			// next six bytes that really will be the header of the first subpage
+			numOfSubPages = inLine[3];
+			if (inFile->read((char *)inLine, 6) != 6)
+				return false;
+
+			m_warnings.append("More than one page in EP1/EPX file, only first full page loaded.");
+			m_reExportWarning = true;
+		}
+
+		// Check for header of a (sub)page
+		if (inLine[0] != 0xfe || inLine[1] != 0x01)
+			return false;
+
+		// Deal with language code unique to EP1 - unknown values are mapped to English
+		if (metadata != nullptr)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+			metadata->insert(QString("region%1").arg(0, 3, '0'), m_languageCode.key(inLine[2], 0x09) >> 3);
+#else
+			metadata->insert(QString("region%1").arg(0, 3, QChar('0')), m_languageCode.key(inLine[2], 0x09) >> 3);
+#endif
+
+		const int nationalOption = m_languageCode.key(inLine[2], 0x09) & 0x7;
+
+		loadingPage->setControlBit(PageBase::C12NOS, nationalOption & 0x1);
+		loadingPage->setControlBit(PageBase::C13NOS, nationalOption & 0x2);
+		loadingPage->setControlBit(PageBase::C14NOS, nationalOption & 0x4);
+
+		// If fourth byte is 0xca then "X/26 enhancements header" follows
+		// Otherwise Level 1 page data follows
+		if (inLine[3] == 0xca) {
+			// Read next four bytes that form the "X/26 enhancements header"
+			if (inFile->read((char *)inLine, 4) != 4)
+				return false;
+			// Third and fourth bytes are little-endian length of enhancement data
+			const int numOfX26Bytes = inLine[2] | (inLine[3] << 8);
+			const int numOfX26Packets = (numOfX26Bytes + 39) / 40;
+
+			QByteArray packet(40, 0x00);
+			packet[0] = 0;
+
+			for (int i=0; i<numOfX26Packets; i++) {
+				bool terminatorFound = false;
+				unsigned char terminatorTriplet[3];
+
+				if (inFile->read((char *)inLine, 40) != 40)
+					return false;
+
+				// Assumes that X/26 packets are saved with ascending designation codes...
+				for (int c=1; c<39; c+=3) {
+					if (!terminatorFound) {
+						// Shuffle triplet bits from 6 bit address, 5 bit mode, 7 bit data
+						packet[c] = inLine[c];
+						packet[c+1] = inLine[c+1] | ((inLine[c+2] & 1) << 5);
+						packet[c+2] = inLine[c+2] >> 1;
+						// Address of termination marker is 7f instead of 3f
+						if (inLine[c+1] == 0x1f && inLine[c] == 0x7f) {
+							packet[c] = 0x3f;
+
+							if (inLine[c+2] & 0x01) {
+								// If a termination marker was found, stop reading the packet
+								// and repeat the marker ourselves to the end
+								terminatorFound = true;
+								terminatorTriplet[0] = packet[c+1];
+								terminatorTriplet[1] = packet[c+2];
+							}
+						}
+					} else {
+						packet[c] = 0x3f;
+						packet[c+1] = terminatorTriplet[0];
+						packet[c+2] = terminatorTriplet[1];
+					}
+				}
+
+				loadingPage->setPacket(26, i, packet);
+			}
+		}
+
+		// Level 1 rows
+		for (int r=0; r<24; r++) {
+			if (inFile->read((char *)inLine, 40) != 40)
+				return false;
+
+			for (int c=0; c<40; c++)
+				if (inLine[c] != 0x20) {
+					loadingPage->setPacket(r, QByteArray((const char *)&inLine, 40));
+					break;
+				}
+		}
+
+		numOfSubPages--;
+
+		// FIXME uncomment "if" statement when we're ready to save multi-page EPX files
+		//if (numOfSubPages == 0)
+		break;
+
+		// There are more subpages coming up so skip over the 40 byte buffer and 2 byte terminator
+		if (inFile->read((char *)inLine, 42) != 42)
+			return false;
+
+		subPages.append(PageBase { } );
+		loadingPage = &subPages[subPages.size()-1];
+	}
+	return true;
+}
+
+
+int LoadFormats::s_instances = 0;
+
+LoadFormats::LoadFormats()
+{
+	if (s_instances == 0) {
+		s_fileFormat[0] = new LoadTTIFormat;
+		s_fileFormat[1] = new LoadT42Format;
+		s_fileFormat[2] = new LoadEP1Format;
+		s_fileFormat[3] = new LoadHTTFormat;
+
+		s_filters = "All Supported Files (*.";
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_filters.append(" *.");
+			s_filters.append(s_fileFormat[i]->extensions().join(" *."));
+		}
+		s_filters.append(");;");
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_filters.append(";;");
+			s_filters.append(s_fileFormat[i]->fileDialogFilter());
+		}
+	}
+
+	s_instances++;
+}
+
+LoadFormats::~LoadFormats()
+{
+	s_instances--;
+
+	if (s_instances == 0)
+		for (int i=s_size-1; i>=0; i--)
+			delete s_fileFormat[i];
+}
+
+LoadFormat *LoadFormats::findFormat(const QString &suffix) const
+{
+	for (int i=0; i<s_size; i++)
+		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+			return s_fileFormat[i];
+
+	return nullptr;
+}

src/qteletextmaker/loadformats.h

@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020-2025 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 LOADFORMATS_H
+#define LOADFORMATS_H
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QFile>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+#include "pagebase.h"
+
+class LoadFormat
+{
+public:
+	virtual ~LoadFormat() {};
+
+	virtual bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) =0;
+
+	virtual QString description() const =0;
+	virtual QStringList extensions() const =0;
+	QString fileDialogFilter() const { return QString(description() + " (*." + extensions().join(" *.") + ')'); };
+	QStringList warningStrings() const { return m_warnings; };
+	QString errorString() const { return m_error; };
+	bool reExportWarning() const { return m_reExportWarning; };
+
+protected:
+	QStringList m_warnings;
+	QString m_error;
+	bool m_reExportWarning = false;
+};
+
+class LoadTTIFormat : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
+
+	QString description() const override { return QString("MRG Systems TTI"); };
+	QStringList extensions() const override { return QStringList { "tti", "ttix" }; };
+};
+
+class LoadT42Format : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
+
+	QString description() const override { return QString("t42 packet stream"); };
+	QStringList extensions() const override { return QStringList { "t42" }; };
+
+protected:
+	virtual bool readPacket();
+
+	QFile *m_inFile;
+	unsigned char m_inLine[42];
+};
+
+class LoadHTTFormat : public LoadT42Format
+{
+public:
+	QString description() const override { return QString("HMS SD-Teletext HTT"); };
+	QStringList extensions() const override { return QStringList { "htt" }; };
+
+protected:
+	bool readPacket() override;
+};
+
+class LoadEP1Format : public LoadFormat
+{
+public:
+	bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
+
+	QString description() const override { return QString("Softel EP1"); };
+	QStringList extensions() const override { return QStringList { "ep1", "epx" }; };
+
+protected:
+	// Language codes unique to EP1
+	// FIXME duplicated in saveformats.h
+	const QMap<int, int> m_languageCode {
+		{ 0x00, 0x09 }, { 0x01, 0x0d }, { 0x02, 0x18 }, { 0x03, 0x11 }, { 0x04, 0x0b }, { 0x05, 0x17 }, { 0x06, 0x07 },
+		{ 0x08, 0x14 }, { 0x09, 0x0d }, { 0x0a, 0x18 }, { 0x0b, 0x11 }, { 0x0c, 0x0b }, { 0x0e, 0x07 },
+		{ 0x10, 0x09 }, { 0x11, 0x0d }, { 0x12, 0x18 }, { 0x13, 0x11 }, { 0x14, 0x0b }, { 0x15, 0x17 }, { 0x16, 0x1c },
+		{ 0x1d, 0x1e }, { 0x1f, 0x16 },
+		{ 0x21, 0x0d }, { 0x22, 0xff }, { 0x23, 0xff }, { 0x26, 0x07 },
+		{ 0x36, 0x1c }, { 0x37, 0x0e },
+		{ 0x40, 0x09 }, { 0x44, 0x0b }
+	};
+};
+
+
+class LoadFormats
+{
+public:
+	LoadFormats();
+	~LoadFormats();
+
+	LoadFormat *findFormat(const QString &suffix) const;
+	QString filters() const { return s_filters; };
+
+private:
+	static const inline int s_size = 4;
+	static int s_instances;
+	inline static LoadFormat *s_fileFormat[s_size];
+	inline static QString s_filters;
+};
+
+#endif

src/qteletextmaker/loadsave.cpp

@@ -1,811 +0,0 @@
-/*
- * Copyright (C) 2020-2025 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 "loadsave.h"
-
-#include <QByteArray>
-#include <QDataStream>
-#include <QFile>
-#include <QSaveFile>
-#include <QString>
-#include <QTextStream>
-
-#include "document.h"
-#include "hamming.h"
-#include "levelonepage.h"
-#include "pagebase.h"
-
-void loadTTI(QFile *inFile, TeletextDocument *document)
-{
-	QByteArray inLine;
-	bool firstSubPageAlreadyFound = false;
-	int cycleCommandsFound = 0;
-	int mostRecentCycleValue = -1;
-	LevelOnePage::CycleTypeEnum mostRecentCycleType;
-
-	LevelOnePage* loadingPage = document->subPage(0);
-
-	for (;;) {
-		inLine = inFile->readLine(160).trimmed();
-		if (inLine.isEmpty())
-			break;
-		if (inLine.startsWith("DE,"))
-			document->setDescription(QString(inLine.remove(0, 3)));
-		if (inLine.startsWith("PN,")) {
-			// When second and subsequent PN commands are found, firstSubPageAlreadyFound==true at this point
-			// This assumes that PN is the first command of a new subpage...
-			if (firstSubPageAlreadyFound) {
-				document->insertSubPage(document->numberOfSubPages(), false);
-				loadingPage = document->subPage(document->numberOfSubPages()-1);
-			} else {
-				document->setPageNumberFromString(inLine.mid(3,3));
-				firstSubPageAlreadyFound = true;
-			}
-		}
-/*		if (lineType == "SC,") {
-			bool subPageNumberOk;
-			int subPageNumberRead = inLine.mid(3, 4).toInt(&subPageNumberOk, 16);
-			if ((!subPageNumberOk) || subPageNumberRead > 0x3f7f)
-				subPageNumberRead = 0;
-			loadingPage->setSubPageNumber(subPageNumberRead);
-		}*/
-		if (inLine.startsWith("PS,")) {
-			bool pageStatusOk;
-			int pageStatusRead = inLine.mid(3, 4).toInt(&pageStatusOk, 16);
-			if (pageStatusOk) {
-				loadingPage->setControlBit(PageBase::C4ErasePage, pageStatusRead & 0x4000);
-				for (int i=PageBase::C5Newsflash, pageStatusBit=0x0001; i<=PageBase::C11SerialMagazine; i++, pageStatusBit<<=1)
-					loadingPage->setControlBit(i, pageStatusRead & pageStatusBit);
-				loadingPage->setDefaultNOS(((pageStatusRead & 0x0200) >> 9) | ((pageStatusRead & 0x0100) >> 7) | ((pageStatusRead & 0x0080) >> 5));
-			}
-		}
-		if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
-			bool cycleValueOk;
-			int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
-			if (cycleValueOk) {
-				cycleCommandsFound++;
-				// House-keep CT command values, in case it's the only one within multiple subpages
-				mostRecentCycleValue = cycleValueRead;
-				loadingPage->setCycleValue(cycleValueRead);
-				mostRecentCycleType = inLine.endsWith("C") ? LevelOnePage::CTcycles : LevelOnePage::CTseconds;
-				loadingPage->setCycleType(mostRecentCycleType);
-			}
-		}
-		if (inLine.startsWith("FL,")) {
-			bool fastTextLinkOk;
-			int fastTextLinkRead;
-			QString flLine = QString(inLine.remove(0, 3));
-			if (flLine.count(',') == 5)
-				for (int i=0; i<6; i++) {
-					fastTextLinkRead = flLine.section(',', i, i).toInt(&fastTextLinkOk, 16);
-					if (fastTextLinkOk) {
-						if (fastTextLinkRead == 0)
-							fastTextLinkRead = 0x8ff;
-						// Stored as page link with relative magazine number, convert from absolute page number that was read
-						fastTextLinkRead ^= document->pageNumber() & 0x700;
-						fastTextLinkRead &= 0x7ff; // Fixes magazine 8 to 0
-						loadingPage->setFastTextLinkPageNumber(i, fastTextLinkRead);
-					}
-				}
-		}
-		if (inLine.startsWith("OL,")) {
-			bool lineNumberOk;
-			int lineNumber, secondCommaPosition;
-
-			secondCommaPosition = inLine.indexOf(",", 3);
-			if (secondCommaPosition != 4 && secondCommaPosition != 5)
-				continue;
-
-			lineNumber = inLine.mid(3, secondCommaPosition-3).toInt(&lineNumberOk, 10);
-			if (lineNumberOk && lineNumber>=0 && lineNumber<=29) {
-				inLine.remove(0, secondCommaPosition+1);
-				if (lineNumber <= 25) {
-					for (int c=0; c<40; c++) {
-						// trimmed() helpfully removes CRLF line endings from the just-read line for us
-						// But it also (un)helpfully removes spaces at the end of a 40 character line, so put them back
-						if (c >= inLine.size())
-							inLine.append(' ');
-						if (inLine.at(c) & 0x80)
-							inLine[c] = inLine.at(c) & 0x7f;
-						else if (inLine.at(c) == 0x10)
-							inLine[c] = 0x0d;
-						else if (inLine.at(c) == 0x1b) {
-							inLine.remove(c, 1);
-							inLine[c] = inLine.at(c) & 0xbf;
-						}
-					}
-					loadingPage->setPacket(lineNumber, inLine);
-				} else {
-					int designationCode = inLine.at(0) & 0x3f;
-					if (inLine.size() < 40) {
-						// OL is too short!
-						if (lineNumber == 26) {
-							// For a too-short enhancement triplets OL, first trim the line down to nearest whole triplet
-							inLine.resize((inLine.size() / 3 * 3) + 1);
-							// Then use "dummy" enhancement triplets to extend the line to the proper length
-							for (int i=inLine.size(); i<40; i+=3)
-								inLine.append("i^@"); // Address 41, Mode 0x1e, Data 0
-						} else
-							// For other triplet OLs and Hamming 8/4 OLs, just pad with zero data
-							for (int i=inLine.size(); i<40; i++)
-								inLine.append("@");
-					}
-					for (int i=1; i<=39; i++)
-						inLine[i] = inLine.at(i) & 0x3f;
-					// Import M/29 whole-magazine packets as X/28 per-page packets
-					if (lineNumber == 29) {
-						if ((document->pageNumber() & 0xff) != 0xff)
-							qDebug("M/29/%d packet found, but page number is not xFF!", designationCode);
-						lineNumber = 28;
-					}
-					loadingPage->setPacket(lineNumber, designationCode, inLine);
-				}
-			}
-		}
-	}
-	// If there's more than one subpage but only one valid CT command was found, apply it to all subpages
-	// I don't know if this is correct
-	if (cycleCommandsFound == 1 && document->numberOfSubPages()>1)
-		for (int i=0; i<document->numberOfSubPages(); i++) {
-			document->subPage(i)->setCycleValue(mostRecentCycleValue);
-			document->subPage(i)->setCycleType(mostRecentCycleType);
-		}
-}
-
-void importT42(QFile *inFile, TeletextDocument *document)
-{
-	unsigned char inLine[42];
-	int readMagazineNumber, readPacketNumber;
-	int foundMagazineNumber = -1;
-	int foundPageNumber = -1;
-	bool firstPacket0Found = false;
-	bool pageBodyPacketsFound = false;
-
-	for (;;) {
-		if (inFile->read((char *)inLine, 42) != 42)
-			// Reached end of .t42 file, or less than 42 bytes left
-			break;
-
-		// Magazine and packet numbers
-		inLine[0] = hamming_8_4_decode[inLine[0]];
-		inLine[1] = hamming_8_4_decode[inLine[1]];
-		if (inLine[0] == 0xff || inLine[1] == 0xff)
-			// Error decoding magazine or packet number
-			continue;
-		readMagazineNumber = inLine[0] & 0x07;
-		readPacketNumber = (inLine[0] >> 3) | (inLine[1] << 1);
-
-		if (readPacketNumber == 0) {
-			// Hamming decode page number, subcodes and control bits
-			for (int i=2; i<10; i++)
-				inLine[i] = hamming_8_4_decode[inLine[i]];
-			// See if the page number is valid
-			if (inLine[2] == 0xff || inLine[3] == 0xff)
-				// Error decoding page number
-				continue;
-
-			const int readPageNumber = (inLine[3] << 4) | inLine[2];
-
-			if (readPageNumber == 0xff)
-				// Time filling header
-				continue;
-
-			// A second or subsequent X/0 has been found
-			if (firstPacket0Found) {
-				if (readMagazineNumber != foundMagazineNumber)
-					// Packet from different magazine broadcast in parallel mode
-					continue;
-				if ((readPageNumber == foundPageNumber) && pageBodyPacketsFound)
-					// X/0 with same page number found after page body packets loaded - assume end of page
-					break;
-				if (readPageNumber != foundPageNumber) {
-					// More than one page in .t42 file - end of current page reached
-					qDebug("More than one page in .t42 file");
-					break;
-				}
-				// Could get here if X/0 with same page number was found with no body packets inbetween
-				continue;
-			} else {
-				// First X/0 found
-				foundMagazineNumber = readMagazineNumber;
-				foundPageNumber = readPageNumber;
-				firstPacket0Found = true;
-
-				if (foundMagazineNumber == 0)
-					document->setPageNumber(0x800 | foundPageNumber);
-				else
-					document->setPageNumber((foundMagazineNumber << 8) | foundPageNumber);
-
-				document->subPage(0)->setControlBit(PageBase::C4ErasePage, inLine[5] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C5Newsflash, inLine[7] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C6Subtitle, inLine[7] & 0x08);
-				for (int i=0; i<4; i++)
-					document->subPage(0)->setControlBit(PageBase::C7SuppressHeader+i, inLine[8] & (1 << i));
-				document->subPage(0)->setControlBit(PageBase::C11SerialMagazine, inLine[9] & 0x01);
-				document->subPage(0)->setControlBit(PageBase::C12NOS, inLine[9] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C13NOS, inLine[9] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C14NOS, inLine[9] & 0x02);
-
-				continue;
-			}
-		}
-
-		// No X/0 has been found yet, keep looking for one
-		if (!firstPacket0Found)
-			continue;
-
-		// Disregard whole-magazine packets
-		if (readPacketNumber > 28)
-			continue;
-
-		// We get here when a page-body packet belonging to the found X/0 header was found
-		pageBodyPacketsFound = true;
-
-		// At the moment this only loads a Level One Page properly
-		// because it assumes X/1 to X/25 is odd partity
-		if (readPacketNumber < 25) {
-			for (int i=2; i<42; i++)
-				// TODO - obey odd parity?
-				inLine[i] &= 0x7f;
-			document->subPage(0)->setPacket(readPacketNumber, QByteArray((const char *)&inLine[2], 40));
-			continue;
-		}
-
-		// X/26, X/27 or X/28
-		int readDesignationCode = hamming_8_4_decode[inLine[2]];
-
-		if (readDesignationCode == 0xff)
-			// Error decoding designation code
-			continue;
-
-		if (readPacketNumber == 27 && readDesignationCode < 4) {
-			// X/27/0 to X/27/3 for Editorial Linking
-			// Decode Hamming 8/4 on each of the six links, checking for errors on the way
-			for (int i=0; i<6; i++) {
-				bool decodingError = false;
-				const int b = 3 + i*6; // First byte of this link
-
-				for (int j=0; j<6; j++) {
-					inLine[b+j] = hamming_8_4_decode[inLine[b+j]];
-					if (inLine[b+j] == 0xff) {
-						decodingError = true;
-						break;
-					}
-				}
-
-				if (decodingError) {
-					// Error found in at least one byte of the link
-					// Neutralise the whole link to same magazine, page FF, subcode 3F7F
-					qDebug("X/27/%d link %d decoding error", readDesignationCode, i);
-					inLine[b]   = 0xf;
-					inLine[b+1] = 0xf;
-					inLine[b+2] = 0xf;
-					inLine[b+3] = 0x7;
-					inLine[b+4] = 0xf;
-					inLine[b+5] = 0x3;
-				}
-			}
-			document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
-
-			continue;
-		}
-
-		// X/26, or X/27/4 to X/27/15, or X/28
-		// Decode Hamming 24/18
-		for (int i=0; i<13; i++) {
-			const int b = 3 + i*3; // First byte of triplet
-
-			const int p0 = inLine[b];
-			const int p1 = inLine[b+1];
-			const int p2 = inLine[b+2];
-
-			unsigned int D1_D4;
-			unsigned int D5_D11;
-			unsigned int D12_D18;
-			unsigned int ABCDEF;
-			int32_t d;
-
-			D1_D4 = hamming_24_18_decode_d1_d4[p0 >> 2];
-			D5_D11 = p1 & 0x7f;
-			D12_D18 = p2 & 0x7f;
-
-			d = D1_D4 | (D5_D11 << 4) | (D12_D18 << 11);
-
-			ABCDEF = (hamming_24_18_parities[0][p0] ^ hamming_24_18_parities[1][p1]  ^ hamming_24_18_parities[2][p2]);
-
-			d ^= (int)hamming_24_18_decode_correct[ABCDEF];
-
-			if ((d & 0x80000000) == 0x80000000) {
-				// Error decoding Hamming 24/18
-				qDebug("X/%d/%d triplet %d decoding error", readPacketNumber, readDesignationCode, i);
-				if (readPacketNumber == 26) {
-					// Enhancements packet, set to "dummy" Address 41, Mode 0x1e, Data 0
-					inLine[b]   = 41;
-					inLine[b+1] = 0x1e;
-					inLine[b+2] = 0;
-				} else {
-					// Zero out whole decoded triplet, bound to make things go wrong...
-					inLine[b]   = 0x00;
-					inLine[b+1] = 0x00;
-					inLine[b+2] = 0x00;
-				}
-			} else {
-				inLine[b]   = d & 0x0003f;
-				inLine[b+1] = (d & 0x00fc0) >> 6;
-				inLine[b+2] = d >> 12;
-			}
-		}
-		document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&inLine[2], 40));
-	}
-
-	if (!firstPacket0Found)
-		qDebug("No X/0 found");
-	else if (!pageBodyPacketsFound)
-		qDebug("X/0 found, but no page body packets were found");
-}
-
-// Used by saveTTI and HashString
-int controlBitsToPS(PageBase *subPage)
-{
-	// C4 Erase page is stored in bit 14
-	int pageStatus = 0x8000 | (subPage->controlBit(PageBase::C4ErasePage) << 14); 
-	// C5 to C11 stored in order from bits 1 to 6
-	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
-		pageStatus |= subPage->controlBit(i) << (i-1);
-	// Apparently the TTI format stores the NOS bits backwards
-	pageStatus |= subPage->controlBit(PageBase::C12NOS) << 9;
-	pageStatus |= subPage->controlBit(PageBase::C13NOS) << 8;
-	pageStatus |= subPage->controlBit(PageBase::C14NOS) << 7;
-	return pageStatus;
-}
-
-void saveTTI(QSaveFile &file, const TeletextDocument &document)
-{
-	int p;
-	QTextStream outStream(&file);
-
-	auto write7bitPacket=[&](int packetNumber)
-	{
-		if (document.subPage(p)->packetExists(packetNumber)) {
-			QByteArray outLine = document.subPage(p)->packet(packetNumber);
-
-			outStream << QString("OL,%1,").arg(packetNumber);
-			for (int c=0; c<outLine.size(); c++)
-				if (outLine.at(c) < 0x20) {
-					// TTI files are plain text, so put in escape followed by control code with bit 6 set
-					outLine[c] = outLine.at(c) | 0x40;
-					outLine.insert(c, 0x1b);
-					c++;
-				}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-	auto writeHammingPacket=[&](int packetNumber, int designationCode=0)
-	{
-		if (document.subPage(p)->packetExists(packetNumber, designationCode)) {
-			QByteArray outLine = document.subPage(p)->packet(packetNumber, designationCode);
-
-			outStream << QString("OL,%1,").arg(packetNumber);
-			// TTI stores raw values with bit 6 set, doesn't do Hamming encoding
-			outLine[0] = designationCode | 0x40;
-			for (int c=1; c<outLine.size(); c++)
-				outLine[c] = outLine.at(c) | 0x40;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-#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)
-		outStream << "DE," << document.description() << Qt::endl;
-#else
-		outStream << "DE," << document.description() << endl;
-#endif
-
-	// TODO DS and SP commands
-
-	// If there's just one subpage then we save it with a subcode of 0000
-	// otherwise start with a subcode of 0001
-	int subPageNumber = document.numberOfSubPages() > 1;
-
-	for (p=0; p<document.numberOfSubPages(); p++) {
-
-		// Page number
-		outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 10, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-
-		// Subpage
-		// Magazine Organisation Table and Magazine Inventory Page don't have subpages
-		if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) {
-			outStream << QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-		}
-
-		// Status bits
-		outStream << QString("PS,%1").arg(0x8000 | controlBitsToPS(document.subPage(p)), 4, 16, QChar('0'));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-		outStream << Qt::endl;
-#else
-		outStream << endl;
-#endif
-
-		// Cycle time
-		if (document.pageFunction() == TeletextDocument::PFLevelOnePage)
-			// Assume that only Level One Pages have configurable cycle times
-			outStream << QString("CT,%1,%2").arg(document.subPage(p)->cycleValue()).arg(document.subPage(p)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T');
-		else
-			// X/28/0 specifies page function and coding but the PF command
-			// should make it obvious to a human that this isn't a Level One Page
-			outStream << QString("PF,%1,%2").arg(document.pageFunction()).arg(document.packetCoding());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-		outStream << Qt::endl;
-#else
-		outStream << endl;
-#endif
-
-		// FastText links
-		bool writeFLCommand = false;
-		if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetExists(27,0)) {
-			// Subpage has FastText links - if any link to a specific subpage, we need to write X/27/0 as raw
-			// otherwise we write the links as a human-readable FL command later on
-			writeFLCommand = true;
-			// TODO uncomment this when we can edit FastText subpage links
-			/*for (int i=0; i<6; i++)
-				if (document.subPage(p)->fastTextLinkSubPageNumber(i) != 0x3f7f) {
-					writeFLCommand = false;
-					break;
-				}*/
-		}
-
-		// X/27 then X/28 always come first
-		for (int i=(writeFLCommand ? 1 : 0); i<16; i++)
-			writeHammingPacket(27, i);
-		for (int i=0; i<16; i++)
-			writeHammingPacket(28, i);
-
-		if (document.packetCoding() == TeletextDocument::Coding7bit) {
-			// For 7 bit coding i.e. Level One Pages, X/26 are written before X/1 to X/25
-			for (int i=0; i<16; i++)
-				writeHammingPacket(26, i);
-			for (int i=1; i<=24; i++)
-				write7bitPacket(i);
-		} else {
-			// For others (especially (G)POP pages) X/1 to X/25 are written before X/26
-			for (int i=1; i<=25; i++)
-				writeHammingPacket(i);
-			for (int i=0; i<16; i++)
-				writeHammingPacket(26, i);
-		}
-
-		if (writeFLCommand) {
-			outStream << "FL,";
-			for (int i=0; i<6; i++) {
-				// Stored as page link with relative magazine number, convert to absolute page number for display
-				int absoluteLinkPageNumber = document.subPage(p)->fastTextLinkPageNumber(i) ^ (document.pageNumber() & 0x700);
-				// Fix magazine 0 to 8
-				if ((absoluteLinkPageNumber & 0x700) == 0x000)
-					absoluteLinkPageNumber |= 0x800;
-
-				outStream << QString("%1").arg(absoluteLinkPageNumber, 3, 16, QChar('0'));
-				if (i<5)
-					outStream << ',';
-			}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << Qt::endl;
-#else
-			outStream << endl;
-#endif
-		}
-
-		subPageNumber++;
-	}
-}
-
-void exportM29File(QSaveFile &file, const TeletextDocument &document)
-{
-	const PageBase &subPage = *document.currentSubPage();
-	QTextStream outStream(&file);
-
-	auto writeM29Packet=[&](int designationCode)
-	{
-		if (subPage.packetExists(28, designationCode)) {
-			QByteArray outLine = subPage.packet(28, designationCode);
-
-			outStream << QString("OL,29,");
-			// TTI stores raw values with bit 6 set, doesn't do Hamming encoding
-			outLine[0] = designationCode | 0x40;
-			for (int c=1; c<outLine.size(); c++)
-				outLine[c] = outLine.at(c) | 0x40;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-			outStream << outLine << Qt::endl;
-#else
-			outStream << outLine << endl;
-#endif
-		}
-	};
-
-#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)
-	outStream << "DE," << document.description() << Qt::endl;
-#else
-	outStream << "DE," << document.description() << endl;
-#endif
-
-	// Force page number to xFF
-	outStream << QString("PN,%1ff00").arg(document.pageNumber() >> 8, 1, 16);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	outStream << Qt::endl;
-#else
-	outStream << endl;
-#endif
-
-	outStream << "PS,8000";
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-	outStream << Qt::endl;
-#else
-	outStream << endl;
-#endif
-
-	writeM29Packet(0);
-	writeM29Packet(1);
-	writeM29Packet(4);
-}
-
-void exportT42File(QSaveFile &file, const TeletextDocument &document)
-{
-	const PageBase &subPage = *document.currentSubPage();
-
-	QDataStream outStream(&file);
-	// Displayable row header we export as spaces, hence the (odd parity valid) 0x20 init value
-	QByteArray outLine(42, 0x20);
-	int magazineNumber = (document.pageNumber() & 0xf00) >> 8;
-
-	auto write7bitPacket=[&](int packetNumber)
-	{
-		if (subPage.packetExists(packetNumber)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber));
-
-			// Odd parity encoding
-			for (int c=0; c<outLine.size(); c++) {
-				char p = outLine.at(c);
-
-				// Recursively divide integer into two equal halves and take their XOR until only 1 bit is left
-				p ^= p >> 4;
-				p ^= p >> 2;
-				p ^= p >> 1;
-				// If last bit left is 0 then it started with an even number of bits, so do the odd parity
-				if (!(p & 1))
-					outLine[c] = outLine.at(c) | 0x80;
-			}
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-	auto writeHamming8_4Packet=[&](int packetNumber, int designationCode=0)
-	{
-		if (subPage.packetExists(packetNumber, designationCode)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
-			outLine[2] = hamming_8_4_encode[designationCode];
-
-			for (int c=3; c<outLine.size(); c++)
-				outLine[c] = hamming_8_4_encode[(int)outLine.at(c)];
-
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-	auto writeHamming24_18Packet=[&](int packetNumber, int designationCode=0)
-	{
-		if (subPage.packetExists(packetNumber, designationCode)) {
-			outLine[0] = hamming_8_4_encode[magazineNumber | ((packetNumber & 0x01) << 3)];
-			outLine[1] = hamming_8_4_encode[packetNumber >> 1];
-			outLine.replace(2, 40, subPage.packet(packetNumber, designationCode));
-			outLine[2] = hamming_8_4_encode[designationCode];
-
-			for (int c=3; c<outLine.size(); c+=3) {
-				unsigned int D5_D11;
-				unsigned int D12_D18;
-				unsigned int P5, P6;
-				unsigned int Byte_0;
-
-				const unsigned int toEncode = outLine[c] | (outLine[c+1] << 6) | (outLine[c+2] << 12);
-
-				Byte_0 = (hamming_24_18_forward[0][(toEncode >> 0) & 0xff] ^ hamming_24_18_forward[1][(toEncode >> 8) & 0xff] ^ hamming_24_18_forward_2[(toEncode >> 16) & 0x03]);
-				outLine[c] = Byte_0;
-
-				D5_D11 = (toEncode >> 4) & 0x7f;
-				D12_D18 = (toEncode >> 11) & 0x7f;
-
-				P5 = 0x80 & ~(hamming_24_18_parities[0][D12_D18] << 2);
-				outLine[c+1] = D5_D11 | P5;
-
-				P6 = 0x80 & ((hamming_24_18_parities[0][Byte_0] ^ hamming_24_18_parities[0][D5_D11]) << 2);
-				outLine[c+2] = D12_D18 | P6;
-			}
-
-			outStream.writeRawData(outLine.constData(), 42);
-		}
-	};
-
-
-	if (magazineNumber == 8)
-		magazineNumber = 0;
-
-	// Write X/0 separately as it features both Hamming 8/4 and 7-bit odd parity within
-	outLine[0] = magazineNumber & 0x07;
-	outLine[1] = 0; // Packet number 0
-	outLine[2] = document.pageNumber() & 0x00f;
-	outLine[3] = (document.pageNumber() & 0x0f0) >> 4;
-	outLine[4] = 0; // Subcode S1 - always export as 0
-	outLine[5] = subPage.controlBit(PageBase::C4ErasePage) << 3;
-	outLine[6] = 0; // Subcode S3 - always export as 0
-	outLine[7] = (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3);
-	outLine[8] = subPage.controlBit(PageBase::C7SuppressHeader) | (subPage.controlBit(PageBase::C8Update) << 1) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
-	outLine[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 1) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 3);
-
-	for (int i=0; i<10; i++)
-		outLine[i] = hamming_8_4_encode[(int)outLine.at(i)];
-
-	// If we allow text in the row header, we'd odd-parity encode it here
-
-	outStream.writeRawData(outLine.constData(), 42);
-
-	// After X/0, X/27 then X/28 always come next
-	for (int i=0; i<4; i++)
-		writeHamming8_4Packet(27, i);
-	for (int i=4; i<16; i++)
-		writeHamming24_18Packet(27, i);
-	for (int i=0; i<16; i++)
-		writeHamming24_18Packet(28, i);
-
-	if (document.packetCoding() == TeletextDocument::Coding7bit) {
-		// For 7 bit coding i.e. Level One Pages, X/26 are written before X/1 to X/25
-		for (int i=0; i<16; i++)
-			writeHamming24_18Packet(26, i);
-		for (int i=1; i<=24; i++)
-			write7bitPacket(i);
-	} else {
-		// For others (especially (G)POP pages) X/1 to X/25 are written before X/26
-		if (document.packetCoding() == TeletextDocument::Coding18bit)
-			for (int i=1; i<=25; i++)
-				writeHamming24_18Packet(i);
-		else if (document.packetCoding() == TeletextDocument::Coding4bit)
-			for (int i=1; i<=25; i++)
-				writeHamming8_4Packet(i);
-		else
-			qDebug("Exported broken file as page coding is not supported");
-		for (int i=0; i<16; i++)
-			writeHamming24_18Packet(26, i);
-	}
-}
-
-QByteArray rowPacketAlways(PageBase *subPage, int packetNumber)
-{
-	if (subPage->packetExists(packetNumber))
-		return subPage->packet(packetNumber);
-	else
-		return QByteArray(40, ' ');
-}
-
-QString exportHashStringPage(LevelOnePage *subPage)
-{
-	int hashDigits[1167]={0};
-	int totalBits, charBit;
-	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-	QString hashString;
-
-	// TODO int editTFCharacterSet = 5;
-	bool blackForeground = false;
-
-	for (int r=0; r<25; r++) {
-		QByteArray rowPacket = rowPacketAlways(subPage, r);
-		for (int c=0; c<40; c++) {
-			if (rowPacket.at(c) == 0x00 || rowPacket.at(c) == 0x10)
-				blackForeground = true;
-			for (int b=0; b<7; b++) {
-				totalBits = (r * 40 + c) * 7 + b;
-				charBit = ((rowPacket.at(c)) >> (6 - b)) & 0x01;
-				hashDigits[totalBits / 6] |= charBit << (5 - (totalBits % 6));
-			}
-		}
-	}
-
-	hashString.append(QString("#%1:").arg(blackForeground ? 8 : 0, 1, 16));
-
-	for (int i=0; i<1167; i++)
-		hashString.append(base64[hashDigits[i]]);
-
-	return hashString;
-}
-
-QString exportHashStringPackets(LevelOnePage *subPage)
-{
-	auto colourToHexString=[&](int whichCLUT)
-	{
-		QString resultHexString;
-
-		for (int i=whichCLUT*8; i<whichCLUT*8+8; i++)
-			resultHexString.append(QString("%1").arg(subPage->CLUT(i), 3, 16, QChar('0')));
-		return resultHexString;
-	};
-
-	const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-	QString result;
-
-	if (subPage->packetExists(28,0) || subPage->packetExists(28,4)) {
-		// X/28/0 and X/28/4 are duplicates apart from the CLUT definitions
-		// Assemble the duplicate beginning and ending of both packets
-		QString x28StringBegin, x28StringEnd;
-
-		x28StringBegin.append(QString("00%1").arg((subPage->defaultCharSet() << 3) | subPage->defaultNOS(), 2, 16, QChar('0')).toUpper());
-		x28StringBegin.append(QString("%1").arg((subPage->secondCharSet() << 3) | subPage->secondNOS(), 2, 16, QChar('0')).toUpper());
-		x28StringBegin.append(QString("%1%2%3%4").arg(subPage->leftSidePanelDisplayed(), 1, 10).arg(subPage->rightSidePanelDisplayed(), 1, 10).arg(subPage->sidePanelStatusL25(), 1, 10).arg(subPage->sidePanelColumns(), 1, 16));
-
-		x28StringEnd = QString("%1%2%3%4").arg(subPage->defaultScreenColour(), 2, 16, QChar('0')).arg(subPage->defaultRowColour(), 2, 16, QChar('0')).arg(subPage->blackBackgroundSubst(), 1, 10).arg(subPage->colourTableRemap(), 1, 10);
-
-		if (subPage->packetExists(28,0))
-			result.append(":X280=" + x28StringBegin + colourToHexString(2) + colourToHexString(3) + x28StringEnd);
-		if (subPage->packetExists(28,4))
-			result.append(":X284=" + x28StringBegin + colourToHexString(0) + colourToHexString(1) + x28StringEnd);
-	}
-
-	if (!subPage->enhancements()->isEmpty()) {
-		result.append(":X26=");
-		for (int i=0; i<subPage->enhancements()->size(); i++) {
-			result.append(base64[subPage->enhancements()->at(i).data() >> 1]);
-			result.append(base64[subPage->enhancements()->at(i).mode() | ((subPage->enhancements()->at(i).data() & 1) << 5)]);
-			result.append(base64[subPage->enhancements()->at(i).address()]);
-		}
-	}
-
-	result.append(QString(":PS=%1").arg(0x8000 | controlBitsToPS(subPage), 0, 16, QChar('0')));
-	return result;
-}

src/qteletextmaker/main.cpp

@@ -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.7.1-beta");
+	QApplication::setApplicationVersion("0.8.2-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

src/qteletextmaker/mainwidget.cpp

@@ -539,12 +539,19 @@ void TeletextWidget::paste()
 	m_teletextDocument->undoStack()->push(new PasteCommand(m_teletextDocument, m_pageDecode.level1CharSet(m_teletextDocument->cursorRow(), m_teletextDocument->cursorColumn())));
 }
 
+void TeletextWidget::selectAll()
+{
+	m_teletextDocument->setSelection((int)!m_teletextDocument->rowZeroAllowed(), 0, 24, 39);
+}
+
 QPair<int, int> TeletextWidget::mouseToRowAndColumn(const QPoint &mousePosition)
 {
 	int row = mousePosition.y() / 10;
 	int column = mousePosition.x() / 12 - m_pageDecode.leftSidePanelColumns();
-	if (row < 1)
+	const int topRow = (int)!m_teletextDocument->rowZeroAllowed();
-		row = 1;
+
+	if (row < topRow)
+		row = topRow;
 	if (row > 24)
 		row = 24;
 	if (column < 0)
@@ -647,6 +654,9 @@ LevelOneScene::LevelOneScene(QWidget *levelOneWidget, QObject *parent) : QGraphi
 	m_mainGridItemGroup = new QGraphicsItemGroup;
 	m_mainGridItemGroup->setVisible(false);
 	addItem(m_mainGridItemGroup);
+	m_rowZeroGridItemGroup = new QGraphicsItemGroup;
+	m_rowZeroGridItemGroup->setVisible(false);
+	addItem(m_rowZeroGridItemGroup);
 	// Additional vertical pieces of grid for side panels
 	for (int i=0; i<32; i++) {
 		m_sidePanelGridNeeded[i] = false;
@@ -654,14 +664,17 @@ LevelOneScene::LevelOneScene(QWidget *levelOneWidget, QObject *parent) : QGraphi
 		m_sidePanelGridItemGroup[i]->setVisible(false);
 		addItem(m_sidePanelGridItemGroup[i]);
 	}
-	for (int r=1; r<25; r++) {
+	for (int r=0; r<25; r++) {
 		for (int c=0; c<40; c++) {
 			QGraphicsRectItem *gridPiece = new QGraphicsRectItem(c*12, r*10, 12, 10);
-			gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, r<24 ? 192 : 128)), 0));
+			gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, (r != 0 && r != 24) ? 192 : 128)), 0));
-			m_mainGridItemGroup->addToGroup(gridPiece);
+			if (r == 0)
+				m_rowZeroGridItemGroup->addToGroup(gridPiece);
+			else
+				m_mainGridItemGroup->addToGroup(gridPiece);
 		}
 
-		if (r < 24)
+		if (r != 0 && r != 24)
 			for (int c=0; c<32; c++) {
 				QGraphicsRectItem *gridPiece = new QGraphicsRectItem(0, r*10, 12, 10);
 				gridPiece->setPen(QPen(QBrush(QColor(128, 128, 128, 64)), 0));
@@ -686,6 +699,7 @@ void LevelOneScene::setBorderDimensions(int sceneWidth, int sceneHeight, int wid
 
 	// Position grid to cover central 40 columns
 	m_mainGridItemGroup->setPos(leftRightBorders + leftSidePanelColumns*12, topBottomBorders);
+	m_rowZeroGridItemGroup->setPos(leftRightBorders + leftSidePanelColumns*12, topBottomBorders);
 
 	updateCursor();
 	updateSelection();
@@ -746,17 +760,21 @@ void LevelOneScene::setRenderMode(TeletextPageRender::RenderMode renderMode)
 
 	switch (renderMode) {
 		case TeletextPageRender::RenderNormal:
+			setBackgroundBrush(Qt::NoBrush);
 			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));
 			return;
 		case TeletextPageRender::RenderMix:
+			setBackgroundBrush(QColor(40, 54, 96));
 			fullColour = Qt::transparent;
 			break;
 		case TeletextPageRender::RenderWhiteOnBlack:
+			setBackgroundBrush(Qt::black);
 			fullColour = Qt::black;
 			break;
 		case TeletextPageRender::RenderBlackOnWhite:
+			setBackgroundBrush(Qt::white);
 			fullColour = Qt::white;
 			break;
 	}
@@ -772,12 +790,23 @@ void LevelOneScene::setRenderMode(TeletextPageRender::RenderMode renderMode)
 void LevelOneScene::toggleGrid(bool gridOn)
 {
 	m_grid = gridOn;
+
 	m_mainGridItemGroup->setVisible(gridOn);
+	if (static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->rowZeroAllowed())
+		m_rowZeroGridItemGroup->setVisible(gridOn);
 	for (int i=0; i<32; i++)
 		if (m_sidePanelGridNeeded[i])
 			m_sidePanelGridItemGroup[i]->setVisible(gridOn);
 }
 
+void LevelOneScene::toggleRowZeroAllowed(bool allowed)
+{
+	static_cast<TeletextWidget *>(m_levelOneProxyWidget->widget())->document()->setRowZeroAllowed(allowed);
+
+	if (m_grid)
+		m_rowZeroGridItemGroup->setVisible(allowed);
+}
+
 void LevelOneScene::hideGUIElements(bool hidden)
 {
 	if (hidden) {

src/qteletextmaker/mainwidget.h

@@ -82,6 +82,8 @@ public slots:
 	void copy();
 	void paste();
 
+	void selectAll();
+
 	void changeSize();
 
 protected:
@@ -125,6 +127,7 @@ public slots:
 	void updateSelection();
 	void setRenderMode(TeletextPageRender::RenderMode renderMode);
 	void toggleGrid(bool gridOn);
+	void toggleRowZeroAllowed(bool allowed);
 	void hideGUIElements(bool hidden);
 	void setFullScreenColour(const QColor &newColor);
 	void setFullRowColour(int row, const QColor &newColor);
@@ -143,7 +146,7 @@ private:
 	QGraphicsRectItem *m_fullRowLeftRectItem[25], *m_fullRowRightRectItem[25];
 	QGraphicsProxyWidget *m_levelOneProxyWidget;
 	QGraphicsRectItem *m_cursorRectItem, *m_selectionRectItem;
-	QGraphicsItemGroup *m_mainGridItemGroup, *m_sidePanelGridItemGroup[32];
+	QGraphicsItemGroup *m_mainGridItemGroup, *m_rowZeroGridItemGroup, *m_sidePanelGridItemGroup[32];
 	bool m_grid, m_sidePanelGridNeeded[32];
 };
 

src/qteletextmaker/mainwindow.cpp

@@ -19,8 +19,10 @@
 
 #include <QActionGroup>
 #include <QApplication>
+#include <QClipboard>
 #include <QDesktopServices>
 #include <QFileDialog>
+#include <QFileSystemWatcher>
 #include <QImage>
 #include <QList>
 #include <QMenuBar>
@@ -37,17 +39,22 @@
 #include <QStatusBar>
 #include <QToolBar>
 #include <QToolButton>
+#include <QVariant>
 #include <iostream>
 
 #include "mainwindow.h"
 
+#include "dclutdockwidget.h"
+#include "drcspage.h"
+#include "hashformats.h"
 #include "levelonecommands.h"
-#include "loadsave.h"
+#include "loadformats.h"
 #include "mainwidget.h"
 #include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
+#include "saveformats.h"
 #include "x26dockwidget.h"
 
 #include "gifimage/qgifimage.h"
@@ -84,7 +91,7 @@ void MainWindow::newFile()
 
 void MainWindow::open()
 {
-	const QString fileName = QFileDialog::getOpenFileName(this);
+	const QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QString(), m_loadFormats.filters());
 	if (!fileName.isEmpty())
 		openFile(fileName);
 }
@@ -114,39 +121,37 @@ void MainWindow::openFile(const QString &fileName)
 	other->show();
 }
 
-static inline bool hasTTISuffix(const QString &filename)
-{
-	return filename.endsWith(".tti", Qt::CaseInsensitive) || filename.endsWith(".ttix", Qt::CaseInsensitive);
-}
-
-static inline void changeSuffixFromTTI(QString &filename, const QString &newSuffix)
-{
-	if (filename.endsWith(".tti", Qt::CaseInsensitive)) {
-		filename.chop(4);
-		filename.append("." + newSuffix);
-	} else if (filename.endsWith(".ttix", Qt::CaseInsensitive)) {
-		filename.chop(5);
-		filename.append("." + newSuffix);
-	}
-}
-
 bool MainWindow::save()
 {
-	// If imported from non-.tti, force "Save As" so we don't clobber the original imported file
+	// If imported from a format we only export, force "Save As" so we don't clobber the original imported file
-	return m_isUntitled || !hasTTISuffix(m_curFile) ? saveAs() : saveFile(m_curFile);
+	if (m_isUntitled || m_saveFormats.isExportOnly(QFileInfo(m_curFile).suffix()))
+		return saveAs();
+	else
+		return saveFile(m_curFile);
 }
 
 bool MainWindow::saveAs()
 {
 	QString suggestedName = m_curFile;
 
-	// If imported from non-.tti, change extension so we don't clobber the original imported file
+	// If imported from a format we only export, change suffix so we don't clobber the original imported file
-	if (suggestedName.endsWith(".t42", Qt::CaseInsensitive)) {
+	if (m_saveFormats.isExportOnly(QFileInfo(suggestedName).suffix())) {
-		suggestedName.chop(4);
+		const int pos = suggestedName.lastIndexOf(QChar('.'));
+		if (pos != -1)
+			suggestedName.truncate(pos);
+
 		suggestedName.append(".tti");
 	}
 
-	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), suggestedName, "TTI teletext page (*.tti *.ttix)");
+	// Set the filter in the file dialog to the same as the current filename extension
+	QString dialogFilter;
+
+	SaveFormat *savingFormat = m_saveFormats.findExportFormat(QFileInfo(suggestedName).suffix());
+
+	if (savingFormat != nullptr)
+		dialogFilter = savingFormat->fileDialogFilter();
+
+	QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), suggestedName, m_saveFormats.filters(), &dialogFilter);
 	if (fileName.isEmpty())
 		return false;
 
@@ -181,6 +186,66 @@ void MainWindow::reload()
 	m_textWidget->document()->selectSubPageIndex(subPageIndex, true);
 }
 
+void MainWindow::extractImages(QImage sceneImage[], bool smooth, bool flashExtract)
+{
+	// Prepare widget image for extraction
+	m_textScene->hideGUIElements(true);
+
+	if (m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderMix)
+		m_textScene->setBackgroundBrush(Qt::NoBrush);
+
+	const int flashTiming = flashExtract ? m_textWidget->flashTiming() : 0;
+
+	// Allocate initial image, with additional images for flashing if necessary
+	QImage interImage[6];
+
+	interImage[0] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+	if (flashTiming != 0) {
+		interImage[3] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+		if (flashTiming == 2) {
+			interImage[1] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+			interImage[2] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+			interImage[4] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+			interImage[5] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_ARGB32);
+		}
+	}
+
+	// Now extract the image(s) from the scene
+	for (int p=0; p<6; p++)
+		if (!interImage[p].isNull()) {
+			m_textWidget->pauseFlash(p);
+			// Alpha'd parts of image copied leave uninitialised pixels as uninitialised
+			// so prefill with the transparent "colour" first.
+			// When extracting flashing images, assume we're going to write a GIF
+			// which doesn't have alpha but instead swaps a selected colour for transparency.
+			interImage[p].fill(flashExtract ? QColor(1, 1, 1) : QColor(0, 0, 0, 0));
+			QPainter interPainter(&interImage[p]);
+			m_textScene->render(&interPainter);
+		}
+
+	// Now we've extracted the image we can put the GUI things back
+	if (m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderMix)
+		m_textScene->setBackgroundBrush(QColor(40, 54, 96));
+
+	m_textScene->hideGUIElements(false);
+	m_textWidget->resumeFlash();
+
+	// Now scale the extracted image(s) to the selected aspect ratio
+	for (int p=0; p<6; p++)
+		if (!interImage[p].isNull()) {
+			if (m_viewAspectRatio == 3)
+				// Aspect ratio is Pixel 1:2 so we only need to double the vertical height
+				sceneImage[p] = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+			else {
+				// Scale the image in two steps so that smoothing only occurs on vertical lines
+				// Double the vertical height first
+				const QImage doubleHeightImage = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+				// then scale it horizontally to the selected aspect ratio
+				sceneImage[p] = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, (smooth) ? Qt::SmoothTransformation : Qt::FastTransformation);
+			}
+		}
+}
+
 void MainWindow::exportImage()
 {
 	QString exportFileName, selectedFilter, gifFilter;
@@ -219,64 +284,9 @@ void MainWindow::exportImage()
 		return;
 	}
 
-	// Disable flash exporting if extension is not GIF
-	const int flashTiming = suffix == "gif" ? m_textWidget->flashTiming() : 0;
-
-	// Prepare widget image for extraction
-	m_textScene->hideGUIElements(true);
-	// Disable exporting in Mix mode as it corrupts the background
-	bool reMix = m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderMix;
-	if (reMix)
-		m_textScene->setRenderMode(TeletextPageRender::RenderNormal);
-
-	// Allocate initial image, with additional images for flashing if necessary
-	QImage interImage[6];
-
-	interImage[0] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-	if (flashTiming != 0) {
-		interImage[3] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-		if (flashTiming == 2) {
-			interImage[1] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-			interImage[2] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-			interImage[4] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-			interImage[5] = QImage(m_textScene->sceneRect().size().toSize(), QImage::Format_RGB32);
-		}
-	}
-
-	// Now extract the image(s) from the scene
-	for (int p=0; p<6; p++)
-		if (!interImage[p].isNull()) {
-			m_textWidget->pauseFlash(p);
-			//	This ought to make the background transparent in Mix mode, but it doesn't
-			//	if (m_textWidget->pageDecode()->mix())
-			//		interImage.fill(QColor(0, 0, 0, 0));
-			QPainter interPainter(&interImage[p]);
-			m_textScene->render(&interPainter);
-		}
-
-	// Now we've extracted the image we can put the GUI things back
-	m_textScene->hideGUIElements(false);
-	if (reMix)
-		m_textScene->setRenderMode(TeletextPageRender::RenderMix);
-	m_textWidget->resumeFlash();
-
-	// Now scale the extracted image(s) to the selected aspect ratio
 	QImage scaledImage[6];
-
+	// Really could simplify the suffix parameter here...
-	for (int p=0; p<6; p++)
+	extractImages(scaledImage, suffix != "gif", suffix == "gif");
-		if (!interImage[p].isNull()) {
-			if (m_viewAspectRatio == 3)
-				// Aspect ratio is Pixel 1:2 so we only need to double the vertical height
-				scaledImage[p] = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
-			else {
-				// Scale the image in two steps so that smoothing only occurs on vertical lines
-				// Double the vertical height first
-				const QImage doubleHeightImage = interImage[p].scaled(interImage[p].width(), interImage[p].height()*2, Qt::IgnoreAspectRatio, Qt::FastTransformation);
-				// then scale it horizontally to the selected aspect ratio
-				// Don't smooth GIF as it's bound to break the 256 colour limit
-				scaledImage[p] = doubleHeightImage.scaled((int)((float)doubleHeightImage.width() * aspectRatioHorizontalScaling[m_viewAspectRatio] * 2), doubleHeightImage.height(), Qt::IgnoreAspectRatio, (suffix == "gif") ? Qt::FastTransformation : Qt::SmoothTransformation);
-			}
-		}
 
 	if (suffix == "png") {
 		if (scaledImage[0].save(exportFileName, "PNG"))
@@ -288,10 +298,38 @@ void MainWindow::exportImage()
 	if (suffix == "gif") {
 		QGifImage gif(scaledImage[0].size());
 
+		// Set a colourmap so we don't end up dithering into the default libgif palette
+		QList<QRgb> cTable;
+
+		if (m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderWhiteOnBlack)
+			gif.setGlobalColorTable(QList<QRgb>{ qRgb(0, 0, 0), qRgb(255, 255, 255) }, QColor(0, 0, 0));
+		else if (m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderBlackOnWhite)
+			gif.setGlobalColorTable(QList<QRgb>{ qRgb(255, 255, 255), qRgb(0, 0, 0) }, QColor(255, 255, 255));
+		else {
+			for (int i=0; i<32; i++)
+				if (i == 8) {
+					// Transparent colour mandatory for CLUT 1:0 on Level 2.5
+					// and optional on Level 1 for newsflash/subtitle or mix rendering
+					if (m_textWidget->pageDecode()->level() >= 2 ||
+					    m_textWidget->pageRender()->renderMode() == TeletextPageRender::RenderMix ||
+					    m_textWidget->document()->currentSubPage()->controlBit(PageBase::C5Newsflash) ||
+					    m_textWidget->document()->currentSubPage()->controlBit(PageBase::C6Subtitle));
+						cTable.append(qRgb(1, 1, 1));
+					if (m_textWidget->pageDecode()->level() < 2)
+						break;
+				} else
+					cTable.append(m_textWidget->document()->currentSubPage()->CLUTtoQColor(i).rgb());
+
+			gif.setGlobalColorTable(cTable, QColor(0, 0, 0));
+			// QColor(1, 1, 1) won't always be present. Here's hoping that setting transparent
+			// colour to one that isn't in the colour table doesn't have any side effects...
+			gif.setDefaultTransparentColor(QColor(1, 1, 1));
+		}
+
 		if (scaledImage[3].isNull())
 			// No flashing
 			gif.addFrame(scaledImage[0], 0);
-		else if (interImage[1].isNull()) {
+		else if (scaledImage[1].isNull()) {
 			// 1Hz flashing
 			gif.addFrame(scaledImage[0], 500);
 			gif.addFrame(scaledImage[3], 500);
@@ -307,6 +345,17 @@ void MainWindow::exportImage()
 	}
 }
 
+#ifndef QT_NO_CLIPBOARD
+void MainWindow::imageToClipboard()
+{
+	QImage scaledImage[1];
+	QClipboard *clipboard = QApplication::clipboard();
+
+	extractImages(scaledImage, true);
+	clipboard->setImage(scaledImage[0]);
+}
+#endif // !QT_NO_CLIPBOARD
+
 void MainWindow::exportZXNet()
 {
 	QDesktopServices::openUrl(QUrl("http://zxnet.co.uk/teletext/editor/" + exportHashStringPage(m_textWidget->document()->currentSubPage()) + exportHashStringPackets(m_textWidget->document()->currentSubPage())));
@@ -332,6 +381,7 @@ void MainWindow::init()
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	m_isUntitled = true;
+	m_reExportWarning = false;
 
 	m_textWidget = new TeletextWidget;
 
@@ -345,23 +395,74 @@ void MainWindow::init()
 	addDockWidget(Qt::RightDockWidgetArea, m_paletteDockWidget);
 	m_pageComposeLinksDockWidget = new PageComposeLinksDockWidget(m_textWidget);
 	addDockWidget(Qt::RightDockWidgetArea, m_pageComposeLinksDockWidget);
+	m_dClutDockWidget = new DClutDockWidget(m_textWidget);
+	addDockWidget(Qt::RightDockWidgetArea, m_dClutDockWidget);
 
 	m_textScene = new LevelOneScene(m_textWidget, this);
 
 	createActions();
 	createStatusBar();
 
-	readSettings();
+	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
+	const int settingsSchema = settings.value("schema", 1).toInt();
+
+	// Don't restore geometry/states from pre 0.8.1 versions: they had a bug which sometimes squashed the
+	// page view unusably small and forgetting the layout could be the only way out of it
+	const QByteArray geometry = settingsSchema >= 2 ? settings.value("geometry", QByteArray()).toByteArray() : QByteArray();
+	const QByteArray windowState = settingsSchema >= 2 ? settings.value("windowState", QByteArray()).toByteArray() : QByteArray();
+
+	m_viewBorder = settings.value("border", 1).toInt();
+	m_viewBorder = (m_viewBorder < 0 || m_viewBorder > 2) ? 1 : m_viewBorder;
+	m_borderActs[m_viewBorder]->setChecked(true);
+	m_viewAspectRatio = settings.value("aspectratio", 0).toInt();
+	m_viewAspectRatio = (m_viewAspectRatio < 0 || m_viewAspectRatio > 3) ? 0 : m_viewAspectRatio;
+	m_aspectRatioActs[m_viewAspectRatio]->setChecked(true);
+	m_viewSmoothTransform = settings.value("smoothTransform", 0).toBool();
+	m_smoothTransformAction->blockSignals(true);
+	m_smoothTransformAction->setChecked(m_viewSmoothTransform);
+	m_smoothTransformAction->blockSignals(false);
+	int zoomSliderInit = settings.value("zoom", 2).toInt();
+	zoomSliderInit = (zoomSliderInit < 0 || zoomSliderInit > 8) ? 2 : zoomSliderInit;
 
 	m_textView = new QGraphicsView(this);
 	m_textView->setScene(m_textScene);
 	if (m_viewSmoothTransform)
 		m_textView->setRenderHints(QPainter::SmoothPixmapTransform);
-	m_textView->setBackgroundBrush(QBrush(QColor(32, 48, 96)));
+	m_zoomSlider->setValue(zoomSliderInit);
-	m_zoomSlider->setValue(m_viewZoom);
 	setSceneDimensions();
 	setCentralWidget(m_textView);
 
+	// zoom 0 = 430,385px, 1 = 500,530px, 2 = 650,670px
+	if (geometry.isEmpty()) {
+		const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
+		if (availableGeometry.width() < 500 || availableGeometry.height() < 530) {
+			resize(430, 385);
+			m_viewZoom = 0;
+		} else if (availableGeometry.width() < 650 || availableGeometry.height() < 670) {
+			resize(500, 530);
+			m_viewZoom = 1;
+		} else
+			resize(650, 670);
+//			m_viewZoom = 2;
+		move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2);
+	} else
+		restoreGeometry(geometry);
+	if (windowState.isEmpty()) {
+		m_pageOptionsDockWidget->hide();
+		m_pageOptionsDockWidget->setFloating(true);
+		m_pageEnhancementsDockWidget->hide();
+		m_pageEnhancementsDockWidget->setFloating(true);
+		m_x26DockWidget->hide();
+		m_x26DockWidget->setFloating(true);
+		m_paletteDockWidget->hide();
+		m_paletteDockWidget->setFloating(true);
+		m_dClutDockWidget->hide();
+		m_dClutDockWidget->setFloating(true);
+		m_pageComposeLinksDockWidget->hide();
+		m_pageComposeLinksDockWidget->setFloating(true);
+	} else
+		restoreState(windowState);
+
 	connect(m_textWidget->document(), &TeletextDocument::cursorMoved, this, &MainWindow::updateCursorPosition);
 	connect(m_textWidget->document(), &TeletextDocument::selectionMoved, m_textScene, &LevelOneScene::updateSelection);
 	connect(m_textWidget->document()->undoStack(), &QUndoStack::cleanChanged, this, [=]() { setWindowModified(!m_textWidget->document()->undoStack()->isClean()); } );
@@ -376,6 +477,8 @@ void MainWindow::init()
 	connect(m_textScene, &LevelOneScene::mouseZoomIn, this, &MainWindow::zoomIn);
 	connect(m_textScene, &LevelOneScene::mouseZoomOut, this, &MainWindow::zoomOut);
 
+	connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &MainWindow::updateWatchedFile);
+
 	QShortcut *blockShortCut = new QShortcut(QKeySequence(Qt::Key_Escape, Qt::Key_J), m_textView);
 	connect(blockShortCut, &QShortcut::activated, [=]() { m_textWidget->setCharacter(0x7f); });
 
@@ -405,6 +508,8 @@ void MainWindow::createActions()
 	QToolBar *fileToolBar = addToolBar(tr("File"));
 	fileToolBar->setObjectName("fileToolBar");
 
+	connect(fileMenu, &QMenu::aboutToShow, this, &MainWindow::updateRecentFileActions);
+
 	const QIcon newIcon = QIcon::fromTheme("document-new", QIcon(":/images/new.png"));
 	QAction *newAct = new QAction(newIcon, tr("&New"), this);
 	newAct->setShortcuts(QKeySequence::New);
@@ -421,6 +526,18 @@ void MainWindow::createActions()
 	fileMenu->addAction(openAct);
 	fileToolBar->addAction(openAct);
 
+	const QIcon recentIcon = QIcon::fromTheme("document-open-recent");
+	QMenu *recentMenu = fileMenu->addMenu(recentIcon, tr("Open recent"));
+	m_recentFileSubMenuAct = recentMenu->menuAction();
+
+	for (int i = 0; i < m_MaxRecentFiles; ++i) {
+		m_recentFileActs[i] = recentMenu->addAction(QString(), this, &MainWindow::openRecentFile);
+		m_recentFileActs[i]->setVisible(false);
+	}
+	recentMenu->addSeparator();
+	const QIcon clearRecentIcon = QIcon::fromTheme("edit-clear-history");
+	recentMenu->addAction(clearRecentIcon, tr("Clear list"), this, &MainWindow::clearRecentFiles);
+
 	const QIcon saveIcon = QIcon::fromTheme("document-save", QIcon(":/images/save.png"));
 	QAction *saveAct = new QAction(saveIcon, tr("&Save"), this);
 	saveAct->setShortcuts(QKeySequence::Save);
@@ -441,19 +558,6 @@ void MainWindow::createActions()
 
 	fileMenu->addSeparator();
 
-	QMenu *recentMenu = fileMenu->addMenu(tr("Recent"));
-	connect(recentMenu, &QMenu::aboutToShow, this, &MainWindow::updateRecentFileActions);
-	m_recentFileSubMenuAct = recentMenu->menuAction();
-
-	for (int i = 0; i < m_MaxRecentFiles; ++i) {
-		m_recentFileActs[i] = recentMenu->addAction(QString(), this, &MainWindow::openRecentFile);
-		m_recentFileActs[i]->setVisible(false);
-	}
-
-	m_recentFileSeparator = fileMenu->addSeparator();
-
-	setRecentFilesVisible(MainWindow::hasRecentFiles());
-
 	m_exportAutoAct = fileMenu->addAction(tr("Export subpage..."));
 	m_exportAutoAct->setEnabled(false);
 	m_exportAutoAct->setShortcut(tr("Ctrl+E"));
@@ -461,9 +565,9 @@ void MainWindow::createActions()
 	connect(fileMenu, &QMenu::aboutToShow, this, &MainWindow::updateExportAutoAction);
 	connect(m_exportAutoAct, &QAction::triggered, this, &MainWindow::exportAuto);
 
-	QAction *exportT42Act = fileMenu->addAction(tr("Export subpage as t42..."));
+	QAction *exportFileAct = fileMenu->addAction(tr("Export subpage as..."));
-	exportT42Act->setStatusTip("Export this subpage as a t42 file");
+	exportFileAct->setStatusTip("Export this subpage to various formats");
-	connect(exportT42Act, &QAction::triggered, this, [=]() { exportT42(false); });
+	connect(exportFileAct, &QAction::triggered, this, [=]() { exportFile(false); });
 
 	QMenu *exportHashStringSubMenu = fileMenu->addMenu(tr("Export subpage to online editor"));
 
@@ -539,6 +643,18 @@ void MainWindow::createActions()
 	editMenu->addAction(pasteAct);
 	editToolBar->addAction(pasteAct);
 
+	const QIcon selectAllIcon = QIcon::fromTheme("edit-select-all");
+	QAction *selectAllAct = new QAction(selectAllIcon, tr("Select &all"), this);
+	selectAllAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_A));
+	selectAllAct->setStatusTip(tr("Select the whole subpage"));
+	connect(selectAllAct, &QAction::triggered, m_textWidget, &TeletextWidget::selectAll);
+	editMenu->addAction(selectAllAct);
+
+	QAction *copyImageAct = editMenu->addAction(tr("Copy as image"));
+	copyImageAct->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_C));
+	copyImageAct->setStatusTip(tr("Copy this subpage as an image to the clipboard"));
+	connect(copyImageAct, &QAction::triggered, this, &MainWindow::imageToClipboard);
+
 	editMenu->addSeparator();
 #endif // !QT_NO_CLIPBOARD
 
@@ -575,6 +691,13 @@ void MainWindow::createActions()
 	m_deleteSubPageAction->setStatusTip(tr("Delete this subpage"));
 	connect(m_deleteSubPageAction, &QAction::triggered, this, &MainWindow::deleteSubPage);
 
+	editMenu->addSeparator();
+
+	m_rowZeroAct = editMenu->addAction(tr("Edit header row"));
+	m_rowZeroAct->setCheckable(true);
+	m_rowZeroAct->setStatusTip(tr("Allow editing of header row"));
+	connect(m_rowZeroAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleRowZeroAllowed);
+
 	QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
 
 	QAction *revealAct = viewMenu->addAction(tr("&Reveal"));
@@ -589,7 +712,7 @@ void MainWindow::createActions()
 	gridAct->setStatusTip(tr("Toggle the text grid"));
 	connect(gridAct, &QAction::toggled, m_textScene, &LevelOneScene::toggleGrid);
 
-	QAction *showControlCodesAct = viewMenu->addAction(tr("Show control codes"));
+	QAction *showControlCodesAct = viewMenu->addAction(tr("Control codes"));
 	showControlCodesAct->setCheckable(true);
 	showControlCodesAct->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_T));
 	showControlCodesAct->setStatusTip(tr("Toggle showing of control codes"));
@@ -669,21 +792,68 @@ void MainWindow::createActions()
 	zoomResetAct->setStatusTip(tr("Reset zoom level"));
 	connect(zoomResetAct, &QAction::triggered, this, &MainWindow::zoomReset);
 
+	viewMenu->addSeparator();
+
+	QMenu *drcsSubMenu = viewMenu->addMenu(tr("DRCS pages"));
+	// Apparently Qt on non-Unix GUIs won't show text on separators or sections
+	// so use a disabled menu entry instead
+#ifndef Q_OS_UNIX
+	m_drcsSection[1] = drcsSubMenu->addAction("Global DRCS");
+	m_drcsSection[1]->setEnabled(false);
+#else
+	m_drcsSection[1] = drcsSubMenu->addSection("Global DRCS");
+#endif
+	QAction *gDrcsFileSelect = drcsSubMenu->addAction(tr("Load file..."));
+	gDrcsFileSelect->setStatusTip(tr("Load a file to use for Global DRCS definitions"));
+	connect(gDrcsFileSelect, &QAction::triggered, [=]() { loadDRCSFile(1); });
+	m_drcsClear[1] = drcsSubMenu->addAction(tr("Clear"));
+	m_drcsClear[1]->setStatusTip(tr("Clear Global DRCS definitions"));
+	m_drcsClear[1]->setEnabled(false);
+	connect(m_drcsClear[1], &QAction::triggered, [=]() { clearDRCSFile(1); });
+
+#ifndef Q_OS_UNIX
+	QAction *separator = drcsSubMenu->addSeparator();
+	m_drcsSection[0] = drcsSubMenu->addAction("Normal DRCS");
+	m_drcsSection[0]->setEnabled(false);
+#else
+	m_drcsSection[0] = drcsSubMenu->addSection("Normal DRCS");
+#endif
+	QAction *nDrcsFileSelect = drcsSubMenu->addAction(tr("Load file..."));
+	nDrcsFileSelect->setStatusTip(tr("Load a file to use for Normal DRCS definitions"));
+	connect(nDrcsFileSelect, &QAction::triggered, [=]() { loadDRCSFile(0); });
+	m_drcsClear[0] = drcsSubMenu->addAction(tr("Clear"));
+	m_drcsClear[0]->setStatusTip(tr("Clear Normal DRCS definitions"));
+	m_drcsClear[0]->setEnabled(false);
+	connect(m_drcsClear[0], &QAction::triggered, [=]() { clearDRCSFile(0); });
+
+	drcsSubMenu->addSeparator();
+	m_drcsSwap = drcsSubMenu->addAction(tr("Swap Global and Normal"));
+	m_drcsSwap->setStatusTip(tr("Swap the files used for Global and Normal DRCS definitions"));
+	m_drcsSwap->setEnabled(false);
+	connect(m_drcsSwap, &QAction::triggered, this, &MainWindow::swapDRCS);
+
 	QMenu *insertMenu = menuBar()->addMenu(tr("&Insert"));
 
 	QMenu *alphaColourSubMenu = insertMenu->addMenu(tr("Alphanumeric colour"));
 	QMenu *mosaicColourSubMenu = insertMenu->addMenu(tr("Mosaic colour"));
 	for (int i=0; i<=7; i++) {
-		const char *colours[] = { "Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White" };
+		const char *colourNames[] = { "Black", "Red", "Green", "Yellow", "Blue", "Magenta", "Cyan", "White" };
+		const QChar azertyKeys[] = { 'P', 'A', 'Z', 'E', 'R', 'T', 'Y', 'U' };
 
-		QAction *alphaColour = alphaColourSubMenu->addAction(tr(colours[i]));
+		QAction *alphaColour = alphaColourSubMenu->addAction(tr(colourNames[i]));
-		alphaColour->setShortcut(QKeySequence(QString("Esc, %1").arg(i)));
+		alphaColour->setShortcuts(QList<QKeySequence> {
-		alphaColour->setStatusTip(QString("Insert alphanumeric %1 attribute").arg(QString(colours[i]).toLower()));
+			QKeySequence(QString("Esc, %1").arg(i)),
+			QKeySequence(QString("Esc, %1").arg(azertyKeys[i]))
+		} );
+		alphaColour->setStatusTip(QString("Insert alphanumeric %1 attribute").arg(QString(colourNames[i]).toLower()));
 		connect(alphaColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i); });
 
-		QAction *mosaicColour = mosaicColourSubMenu->addAction(tr(colours[i]));
+		QAction *mosaicColour = mosaicColourSubMenu->addAction(tr(colourNames[i]));
-		mosaicColour->setShortcut(QKeySequence(QString("Esc, Shift+%1").arg(i)));
+		mosaicColour->setShortcuts(QList<QKeySequence> {
-		mosaicColour->setStatusTip(QString("Insert mosaic %1 attribute").arg(QString(colours[i]).toLower()));
+			QKeySequence(QString("Esc, Shift+%1").arg(i)),
+			QKeySequence(QString("Esc, Shift+%1").arg(azertyKeys[i]))
+		} );
+		mosaicColour->setStatusTip(QString("Insert mosaic %1 attribute").arg(QString(colourNames[i]).toLower()));
 		connect(mosaicColour, &QAction::triggered, [=]() { m_textWidget->setCharacter(i+0x10); });
 	}
 
@@ -771,6 +941,7 @@ void MainWindow::createActions()
 	toolsMenu->addAction(m_x26DockWidget->toggleViewAction());
 	toolsMenu->addAction(m_pageEnhancementsDockWidget->toggleViewAction());
 	toolsMenu->addAction(m_paletteDockWidget->toggleViewAction());
+	toolsMenu->addAction(m_dClutDockWidget->toggleViewAction());
 	toolsMenu->addAction(m_pageComposeLinksDockWidget->toggleViewAction());
 
 	//FIXME is this main menubar separator to put help menu towards the right?
@@ -891,6 +1062,119 @@ void MainWindow::zoomReset()
 	m_zoomSlider->setValue(2);
 }
 
+void MainWindow::loadDRCSFile(int drcsType, QString fileName)
+{
+	const QString drcsTypeName = drcsType == 1 ? "Global DRCS" : "Normal DRCS";
+
+	const bool updatingWatched = !fileName.isEmpty();
+
+	if (!updatingWatched)
+		fileName = QFileDialog::getOpenFileName(this, tr("Select %1 file").arg(drcsTypeName), m_drcsFileName[drcsType], m_loadFormats.filters());
+
+	if (!fileName.isEmpty()) {
+		QFile file(fileName);
+
+		LoadFormat *loadingFormat = m_loadFormats.findFormat(QFileInfo(fileName).suffix());
+		if (loadingFormat == nullptr) {
+			if (updatingWatched)
+				clearDRCSFile(drcsType);
+			else
+				QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(fileName)));
+
+			return;
+		}
+
+		if (!file.open(QFile::ReadOnly)) {
+			if (updatingWatched)
+				clearDRCSFile(drcsType);
+			else
+				QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
+
+			return;
+		}
+
+		QList<PageBase> loadedPages;
+
+		if (loadingFormat->load(&file, loadedPages, nullptr)) {
+			if (!m_drcsFileName[drcsType].isEmpty())
+				m_fileWatcher.removePath(m_drcsFileName[drcsType]);
+
+			m_textWidget->pageDecode()->clearDRCSPage((TeletextPageDecode::DRCSPageType)drcsType);
+			m_drcsPage[drcsType].clear();
+
+			for (int i=0; i<loadedPages.size(); i++)
+				m_drcsPage[drcsType].append(loadedPages.at(i));
+
+			m_textWidget->pageDecode()->setDRCSPage((TeletextPageDecode::DRCSPageType)drcsType, &m_drcsPage[drcsType]);
+			m_textWidget->refreshPage();
+
+			m_fileWatcher.addPath(fileName);
+			m_drcsFileName[drcsType] = fileName;
+			m_drcsSection[drcsType]->setText(QString("%1: %2").arg(drcsTypeName).arg(QFileInfo(fileName).fileName()));
+			m_drcsClear[drcsType]->setEnabled(true);
+			m_drcsSwap->setEnabled(true);
+		} else {
+			if (updatingWatched)
+				clearDRCSFile(drcsType);
+			else
+				QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1\n%2").arg(QDir::toNativeSeparators(fileName), loadingFormat->errorString()));
+
+			return;
+		}
+	}
+}
+
+void MainWindow::clearDRCSFile(int drcsType)
+{
+	m_fileWatcher.removePath(m_drcsFileName[drcsType]);
+
+	m_textWidget->pageDecode()->clearDRCSPage((TeletextPageDecode::DRCSPageType)drcsType);
+	m_drcsPage[drcsType].clear();
+
+	m_textWidget->refreshPage();
+
+	m_drcsFileName[drcsType].clear();
+	m_drcsSection[drcsType]->setText(drcsType == 1 ? "Global DRCS" : "Normal DRCS");
+	m_drcsClear[drcsType]->setEnabled(false);
+	m_drcsSwap->setEnabled(m_drcsClear[0]->isEnabled() || m_drcsClear[1]->isEnabled());
+}
+
+void MainWindow::swapDRCS()
+{
+	m_drcsPage[0].swap(m_drcsPage[1]);
+	m_drcsFileName[0].swap(m_drcsFileName[1]);
+
+	for (int i=0; i<2; i++) {
+		const QString drcsTypeName = i == 1 ? "Global DRCS" : "Normal DRCS";
+
+		if (m_drcsPage[i].isEmpty()) {
+			m_textWidget->pageDecode()->clearDRCSPage((TeletextPageDecode::DRCSPageType)i);
+			m_drcsSection[i]->setText(drcsTypeName);
+		} else {
+			m_textWidget->pageDecode()->setDRCSPage((TeletextPageDecode::DRCSPageType)i, &m_drcsPage[i]);
+			m_drcsSection[i]->setText(QString("%1: %2").arg(drcsTypeName).arg(QFileInfo(m_drcsFileName[i]).fileName()));
+		}
+
+		m_drcsClear[i]->setEnabled(!m_drcsPage[i].isEmpty());
+	}
+
+	m_textWidget->refreshPage();
+}
+
+void MainWindow::updateWatchedFile(const QString &path)
+{
+	int drcsType;
+
+	if (path == m_drcsFileName[1])
+		drcsType = 1;
+	else if (path == m_drcsFileName[0])
+		drcsType = 0;
+	else
+		return;
+
+	loadDRCSFile(drcsType, path);
+}
+
 void MainWindow::toggleInsertMode()
 {
 	m_textWidget->setInsertMode(!m_textWidget->insertMode());
@@ -960,65 +1244,16 @@ void MainWindow::createStatusBar()
 	connect(m_levelRadioButton[3], &QAbstractButton::clicked, [=]() { m_textWidget->pageDecode()->setLevel(3); m_textWidget->update(); m_paletteDockWidget->setLevel3p5Accepted(true);});
 }
 
-void MainWindow::readSettings()
-{
-	//TODO window sizing
-	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
-	const QByteArray geometry = settings.value("geometry", QByteArray()).toByteArray();
-	const QByteArray windowState = settings.value("windowState", QByteArray()).toByteArray();
-
-	m_viewBorder = settings.value("border", 1).toInt();
-	m_viewBorder = (m_viewBorder < 0 || m_viewBorder > 2) ? 1 : m_viewBorder;
-	m_borderActs[m_viewBorder]->setChecked(true);
-	m_viewAspectRatio = settings.value("aspectratio", 0).toInt();
-	m_viewAspectRatio = (m_viewAspectRatio < 0 || m_viewAspectRatio > 3) ? 0 : m_viewAspectRatio;
-	m_aspectRatioActs[m_viewAspectRatio]->setChecked(true);
-	m_viewSmoothTransform = settings.value("smoothTransform", 0).toBool();
-	m_smoothTransformAction->blockSignals(true);
-	m_smoothTransformAction->setChecked(m_viewSmoothTransform);
-	m_smoothTransformAction->blockSignals(false);
-	m_viewZoom = settings.value("zoom", 2).toInt();
-	m_viewZoom = (m_viewZoom < 0 || m_viewZoom > 12) ? 2 : m_viewZoom;
-
-	// zoom 0 = 430,385px, 1 = 500,530px, 2 = 650,670px
-	if (geometry.isEmpty()) {
-		const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
-		if (availableGeometry.width() < 500 || availableGeometry.height() < 530) {
-			resize(430, 385);
-			m_viewZoom = 0;
-		} else if (availableGeometry.width() < 650 || availableGeometry.height() < 670) {
-			resize(500, 530);
-			m_viewZoom = 1;
-		} else
-			resize(650, 670);
-//			m_viewZoom = 2;
-		move((availableGeometry.width() - width()) / 2, (availableGeometry.height() - height()) / 2);
-	} else
-		restoreGeometry(geometry);
-	if (windowState.isEmpty()) {
-		m_pageOptionsDockWidget->hide();
-		m_pageOptionsDockWidget->setFloating(true);
-		m_pageEnhancementsDockWidget->hide();
-		m_pageEnhancementsDockWidget->setFloating(true);
-		m_x26DockWidget->hide();
-		m_x26DockWidget->setFloating(true);
-		m_paletteDockWidget->hide();
-		m_paletteDockWidget->setFloating(true);
-		m_pageComposeLinksDockWidget->hide();
-		m_pageComposeLinksDockWidget->setFloating(true);
-	} else
-		restoreState(windowState);
-}
-
 void MainWindow::writeSettings()
 {
 	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
+	settings.setValue("schema", 2);
 	settings.setValue("geometry", saveGeometry());
 	settings.setValue("windowState", saveState());
 	settings.setValue("border", m_viewBorder);
 	settings.setValue("aspectratio", m_viewAspectRatio);
 	settings.setValue("smoothTransform", m_viewSmoothTransform);
-	settings.setValue("zoom", m_viewZoom);
+	settings.setValue("zoom", m_zoomSlider->value());
 }
 
 bool MainWindow::maybeSave()
@@ -1042,28 +1277,41 @@ void MainWindow::loadFile(const QString &fileName)
 	int levelSeen;
 
 	QFile file(fileName);
-	const QFileInfo fileInfo(file);
-	QIODevice::OpenMode fileOpenMode;
 
-	if (fileInfo.suffix() == "t42")
+	LoadFormat *loadingFormat = m_loadFormats.findFormat(QFileInfo(fileName).suffix());
-		fileOpenMode = QFile::ReadOnly;
+	if (loadingFormat == nullptr) {
-	else
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(fileName)));
-		fileOpenMode = QFile::ReadOnly | QFile::Text;
+		setCurrentFile(QString());
 
-	if (!file.open(fileOpenMode)) {
+		return;
+	}
+
+	if (!file.open(QFile::ReadOnly)) {
 		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString()));
 		setCurrentFile(QString());
+
 		return;
 	}
 
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 
-	if (fileInfo.suffix() == "t42") {
+	QList<PageBase> subPages;
-		importT42(&file, m_textWidget->document());
+	QVariantHash metadata;
-		m_exportAutoFileName = fileName;
+
+	if (loadingFormat->load(&file, subPages, &metadata)) {
+		m_textWidget->document()->loadFromList(subPages);
+		m_textWidget->document()->loadMetaData(metadata);
+
+		if (m_saveFormats.isExportOnly(QFileInfo(file).suffix()))
+			m_exportAutoFileName = fileName;
+		else
+			m_exportAutoFileName.clear();
 	} else {
-		loadTTI(&file, m_textWidget->document());
+		QApplication::restoreOverrideCursor();
-		m_exportAutoFileName.clear();
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot load file %1\n%2").arg(QDir::toNativeSeparators(fileName), loadingFormat->errorString()));
+		setCurrentFile(QString());
+
+		return;
 	}
 
 	levelSeen = m_textWidget->document()->levelRequired();
@@ -1075,16 +1323,21 @@ void MainWindow::loadFile(const QString &fileName)
 
 	QApplication::restoreOverrideCursor();
 
+	if (!loadingFormat->warningStrings().isEmpty())
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The following issues were encountered when loading<br>%1:<ul><li>%2</li></ul>").arg(QDir::toNativeSeparators(fileName), loadingFormat->warningStrings().join("</li><li>")));
+
+	m_reExportWarning = loadingFormat->reExportWarning();
+
+	for (int i=0; i<m_textWidget->document()->numberOfSubPages(); i++)
+		if (m_textWidget->document()->subPage(i)->packetExists(0)) {
+			m_rowZeroAct->setChecked(true);
+			break;
+		}
+
 	setCurrentFile(fileName);
 	statusBar()->showMessage(tr("File loaded"), 2000);
 }
 
-void MainWindow::setRecentFilesVisible(bool visible)
-{
-	m_recentFileSubMenuAct->setVisible(visible);
-	m_recentFileSeparator->setVisible(visible);
-}
-
 static inline QString recentFilesKey() { return QStringLiteral("recentFileList"); }
 static inline QString fileKey() { return QStringLiteral("file"); }
 
@@ -1111,14 +1364,6 @@ static void writeRecentFiles(const QStringList &files, QSettings &settings)
 	settings.endArray();
 }
 
-bool MainWindow::hasRecentFiles()
-{
-	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
-	const int count = settings.beginReadArray(recentFilesKey());
-	settings.endArray();
-	return count > 0;
-}
-
 void MainWindow::prependToRecentFiles(const QString &fileName)
 {
 	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
@@ -1130,7 +1375,7 @@ void MainWindow::prependToRecentFiles(const QString &fileName)
 	if (oldRecentFiles != recentFiles)
 		writeRecentFiles(recentFiles, settings);
 
-	setRecentFilesVisible(!recentFiles.isEmpty());
+	m_recentFileSubMenuAct->setEnabled(!recentFiles.isEmpty());
 }
 
 void MainWindow::updateRecentFileActions()
@@ -1148,6 +1393,15 @@ void MainWindow::updateRecentFileActions()
 	}
 	for ( ; i < m_MaxRecentFiles; ++i)
 		m_recentFileActs[i]->setVisible(false);
+
+	m_recentFileSubMenuAct->setEnabled(recentFiles.size() != 0);
+}
+
+void MainWindow::clearRecentFiles()
+{
+	QSettings settings(QCoreApplication::organizationName(), QCoreApplication::applicationName());
+
+	writeRecentFiles(QStringList(), settings);
 }
 
 void MainWindow::updateExportAutoAction()
@@ -1172,14 +1426,23 @@ bool MainWindow::saveFile(const QString &fileName)
 {
 	QString errorMessage;
 
+	SaveFormat *savingFormat = m_saveFormats.findFormat(QFileInfo(fileName).suffix());
+	if (savingFormat == nullptr) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot save file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(fileName)));
+		return false;
+	}
+
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(fileName);
-	if (file.open(QFile::WriteOnly | QFile::Text)) {
+	if (file.open(QFile::WriteOnly)) {
-		saveTTI(file, *m_textWidget->document());
+		savingFormat->saveAllPages(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
 	} else
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(fileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty()) {
@@ -1198,33 +1461,66 @@ void MainWindow::exportAuto()
 	if (m_exportAutoFileName.isEmpty())
 		return;
 
-	exportT42(true);
+	exportFile(true);
 }
 
-void MainWindow::exportT42(bool fromAuto)
+void MainWindow::exportFile(bool fromAuto)
 {
 	QString errorMessage;
 	QString exportFileName;
+	SaveFormat *exportFormat = nullptr;
 
-	if (fromAuto)
+	if (fromAuto) {
+		if (m_reExportWarning) {
+			QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Will not overwrite imported file %1:\nAll other subpages in that file would be erased.\nPlease save or export to a different file.").arg(strippedName(m_exportAutoFileName)));
+
+			return;
+		}
 		exportFileName = m_exportAutoFileName;
-	else {
+	} else {
-		exportFileName = m_curFile;
+		if (m_exportAutoFileName.isEmpty())
-		changeSuffixFromTTI(exportFileName, "t42");
+			exportFileName = m_curFile;
+		else
+			exportFileName = m_exportAutoFileName;
 
-		exportFileName = QFileDialog::getSaveFileName(this, tr("Export t42"), exportFileName, "t42 stream (*.t42)");
+		// Set the filter in the file dialog to the same as the current filename extension
+		QString dialogFilter;
+
+		exportFormat = m_saveFormats.findExportFormat(QFileInfo(exportFileName).suffix());
+
+		if (exportFormat != nullptr)
+			dialogFilter = exportFormat->fileDialogFilter();
+
+		exportFileName = QFileDialog::getSaveFileName(this, tr("Export subpage"), exportFileName, m_saveFormats.exportFilters(), &dialogFilter);
 		if (exportFileName.isEmpty())
 			return;
 	}
 
+	exportFormat = m_saveFormats.findExportFormat(QFileInfo(exportFileName).suffix());
+	if (exportFormat == nullptr) {
+		QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("Cannot export file %1:\nUnknown file format or extension").arg(QDir::toNativeSeparators(exportFileName)));
+		return;
+	}
+
+	if (!fromAuto && exportFormat->getWarnings(*m_textWidget->document()->currentSubPage())) {
+		const QMessageBox::StandardButton ret = QMessageBox::warning(this, QApplication::applicationDisplayName(), tr("The following issues will be encountered when exporting<br>%1:<ul><li>%2</li></ul>Do you want to export?").arg(strippedName(exportFileName)).arg(exportFormat->warningStrings().join("</li><li>")), QMessageBox::Yes | QMessageBox::No);
+
+		if (ret != QMessageBox::Yes)
+			return;
+	}
+
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(exportFileName);
+
 	if (file.open(QFile::WriteOnly)) {
-		exportT42File(file, *m_textWidget->document());
+		exportFormat->saveCurrentSubPage(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
 	} else
-		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+			errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty()) {
@@ -1235,6 +1531,7 @@ void MainWindow::exportT42(bool fromAuto)
 	MainWindow::prependToRecentFiles(exportFileName);
 
 	m_exportAutoFileName = exportFileName;
+	m_reExportWarning = false;
 	statusBar()->showMessage(tr("File exported"), 2000);
 }
 
@@ -1271,18 +1568,23 @@ void MainWindow::exportM29()
 		exportFileName = QDir(QFileInfo(m_curFile).absoluteDir()).filePath(exportFileName);
 	}
 
-	exportFileName = QFileDialog::getSaveFileName(this, tr("Export M/29 tti"), exportFileName, "TTI teletext page (*.tti *.ttix)");
+	exportFileName = QFileDialog::getSaveFileName(this, tr("Export M/29 tti"), exportFileName, "MRG Systems TTI (*.tti *.ttix)");
 	if (exportFileName.isEmpty())
 		return;
 
 	QApplication::setOverrideCursor(Qt::WaitCursor);
+
 	QSaveFile file(exportFileName);
-	if (file.open(QFile::WriteOnly | QFile::Text)) {
+	if (file.open(QFile::WriteOnly)) {
-		exportM29File(file, *m_textWidget->document());
+		SaveM29Format saveM29Format;
+
+		saveM29Format.saveCurrentSubPage(file, *m_textWidget->document());
+
 		if (!file.commit())
 			errorMessage = tr("Cannot write file %1:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
 	} else
 		errorMessage = tr("Cannot open file %1 for writing:\n%2.").arg(QDir::toNativeSeparators(exportFileName), file.errorString());
+
 	QApplication::restoreOverrideCursor();
 
 	if (!errorMessage.isEmpty())
@@ -1357,4 +1659,5 @@ void MainWindow::updatePageWidgets()
 	m_x26DockWidget->loadX26List();
 	m_paletteDockWidget->updateAllColourButtons();
 	m_pageComposeLinksDockWidget->updateWidgets();
+	m_dClutDockWidget->updateAllColourButtons();
 }

src/qteletextmaker/mainwindow.h

@@ -21,20 +21,27 @@
 #define MAINWINDOW_H
 
 #include <QCheckBox>
+#include <QFileSystemWatcher>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QMainWindow>
+#include <QImage>
 #include <QLabel>
+#include <QList>
+#include <QMainWindow>
 #include <QPushButton>
 #include <QSlider>
 #include <QToolButton>
 
+#include "dclutdockwidget.h"
+#include "drcspage.h"
+#include "loadformats.h"
 #include "mainwidget.h"
 #include "pagecomposelinksdockwidget.h"
 #include "pageenhancementsdockwidget.h"
 #include "pageoptionsdockwidget.h"
 #include "palettedockwidget.h"
+#include "saveformats.h"
 #include "x26dockwidget.h"
 
 class QAction;
@@ -61,18 +68,22 @@ private slots:
 	bool saveAs();
 	void reload();
 	void exportAuto();
-	void exportT42(bool fromAuto);
+	void exportFile(bool fromAuto);
 	void exportZXNet();
 	void exportEditTF();
 	void exportImage();
 	void exportM29();
 	void updateRecentFileActions();
+	void clearRecentFiles();
 	void updateExportAutoAction();
 	void openRecentFile();
 	void about();
 	void updatePageWidgets();
 	void updateCursorPosition();
 
+#ifndef QT_NO_CLIPBOARD
+	void imageToClipboard();
+#endif // !QT_NO_CLIPBOARD
 	void insertRow(bool copyRow);
 	void deleteRow();
 	void insertSubPage(bool afterCurrentSubPage, bool copyCurrentSubPage);
@@ -87,6 +98,12 @@ private slots:
 	void zoomSet(int viewZoom);
 	void zoomReset();
 
+	void loadDRCSFile(int drcsType, QString fileName = "");
+	void clearDRCSFile(int drcsType);
+	void swapDRCS();
+
+	void updateWatchedFile(const QString &path);
+
 	void toggleInsertMode();
 
 private:
@@ -96,14 +113,12 @@ private:
 	void init();
 	void createActions();
 	void createStatusBar();
-	void readSettings();
 	void writeSettings();
 	bool maybeSave();
 	void openFile(const QString &fileName);
 	void loadFile(const QString &fileName);
-	static bool hasRecentFiles();
+	void extractImages(QImage sceneImage[], bool smooth = false, bool flashExtract = false);
 	void prependToRecentFiles(const QString &fileName);
-	void setRecentFilesVisible(bool visible);
 	bool saveFile(const QString &fileName);
 	void setCurrentFile(const QString &fileName);
 	static QString strippedName(const QString &fullFileName);
@@ -113,6 +128,10 @@ private:
 	LevelOneScene *m_textScene;
 	QGraphicsView *m_textView;
 
+	QList<DRCSPage> m_drcsPage[2];
+	QString m_drcsFileName[2];
+	QFileSystemWatcher m_fileWatcher;
+
 	int m_viewBorder, m_viewAspectRatio, m_viewZoom;
 	bool m_viewSmoothTransform;
 	PageOptionsDockWidget *m_pageOptionsDockWidget;
@@ -120,15 +139,17 @@ private:
 	X26DockWidget *m_x26DockWidget;
 	PaletteDockWidget *m_paletteDockWidget;
 	PageComposeLinksDockWidget *m_pageComposeLinksDockWidget;
+	DClutDockWidget *m_dClutDockWidget;
 
 	QAction *m_recentFileActs[m_MaxRecentFiles];
-	QAction *m_recentFileSeparator;
 	QAction *m_recentFileSubMenuAct;
 	QAction *m_exportAutoAct;
 	QAction *m_deleteSubPageAction;
+	QAction *m_rowZeroAct;
 	QAction *m_borderActs[3];
 	QAction *m_aspectRatioActs[4];
 	QAction *m_smoothTransformAction;
+	QAction *m_drcsSection[2], *m_drcsClear[2], *m_drcsSwap;
 
 	QLabel *m_subPageLabel, *m_cursorPositionLabel;
 	QToolButton *m_previousSubPageButton, *m_nextSubPageButton;
@@ -137,7 +158,10 @@ private:
 	QRadioButton *m_levelRadioButton[4];
 
 	QString m_curFile, m_exportAutoFileName, m_exportImageFileName;
-	bool m_isUntitled;
+	bool m_isUntitled, m_reExportWarning;
+
+	LoadFormats m_loadFormats;
+	SaveFormats m_saveFormats;
 };
 
 #endif

src/qteletextmaker/saveformats.cpp

@@ -0,0 +1,614 @@
+/*
+ * Copyright (C) 2020-2025 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 "saveformats.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QSaveFile>
+#include <QString>
+
+#include "document.h"
+#include "hamming.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+void SaveFormat::saveAllPages(QSaveFile &outFile, const TeletextDocument &document)
+{
+	m_document = &document;
+	m_outFile = &outFile;
+	m_outStream.setDevice(m_outFile);
+	m_warnings.clear();
+	m_error.clear();
+
+	writeDocumentStart();
+	writeAllPages();
+	writeDocumentEnd();
+}
+
+void SaveFormat::saveCurrentSubPage(QSaveFile &outFile, const TeletextDocument &document)
+{
+	m_document = &document;
+	m_outFile = &outFile;
+	m_outStream.setDevice(m_outFile);
+	m_warnings.clear();
+	m_error.clear();
+
+	writeDocumentStart();
+	writeSubPage(*m_document->currentSubPage());
+	writeDocumentEnd();
+}
+
+void SaveFormat::writeAllPages()
+{
+	for (int p=0; p<m_document->numberOfSubPages(); p++)
+		writeSubPage(*m_document->subPage(p), (m_document->numberOfSubPages() == 1) ? 0 : p+1);
+}
+
+void SaveFormat::writeSubPage(const PageBase &subPage, int subPageNumber)
+{
+	writeSubPageStart(subPage, subPageNumber);
+	writeSubPageBody(subPage);
+	writeSubPageEnd(subPage);
+}
+
+void SaveFormat::writeSubPageBody(const PageBase &subPage)
+{
+	writeX27Packets(subPage);
+	writeX28Packets(subPage);
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage) {
+		writeX26Packets(subPage);
+		writeX1to25Packets(subPage);
+	} else {
+		qDebug("Not LevelOnePage, assuming 7-bit packets!");
+		writeX1to25Packets(subPage);
+		writeX26Packets(subPage);
+	}
+}
+
+void SaveFormat::writeX27Packets(const PageBase &subPage)
+{
+	for (int i=0; i<4; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format4BitPacket(subPage.packet(27, i)), 27, i);
+	for (int i=4; i<16; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format18BitPacket(subPage.packet(27, i)), 27, i);
+}
+
+void SaveFormat::writeX28Packets(const PageBase &subPage)
+{
+	for (int i=0; i<16; i++)
+		if (subPage.packetExists(28, i))
+			writePacket(format18BitPacket(subPage.packet(28, i)), 28, i);
+}
+
+void SaveFormat::writeX26Packets(const PageBase &subPage)
+{
+	for (int i=0; i<16; i++)
+		if (subPage.packetExists(26, i))
+			writePacket(format18BitPacket(subPage.packet(26, i)), 26, i);
+}
+
+void SaveFormat::writeX1to25Packets(const PageBase &subPage)
+{
+	for (int i=1; i<26; i++)
+		if (subPage.packetExists(i))
+			// BUG must check m_document->packetCoding() !!
+			writePacket(format7BitPacket(subPage.packet(i)), i);
+}
+
+int SaveFormat::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	return writeRawData(packet, packet.size());
+}
+
+int SaveFormat::writeRawData(const char *s, int len)
+{
+	return m_outStream.writeRawData(s, len);
+}
+
+
+inline void SaveTTIFormat::writeString(const QString &command)
+{
+	QByteArray result = command.toUtf8() + "\r\n";
+
+	writeRawData(result, result.size());
+}
+
+void SaveTTIFormat::writeDocumentStart()
+{
+	if (!m_document->description().isEmpty())
+		writeString(QString("DE,%1").arg(m_document->description()));
+
+	// TODO DS and SP commands
+}
+
+QByteArray SaveTTIFormat::format7BitPacket(QByteArray packet)
+{
+	for (int i=0; i<packet.size(); i++)
+		if (packet.at(i) < 0x20) {
+			// TTI files are plain text, so put in escape followed by control code with bit 6 set
+			packet[i] = packet.at(i) | 0x40;
+			packet.insert(i, 0x1b);
+			i++;
+		}
+
+	return packet;
+}
+
+// format4BitPacket in this class calls this method as the encoding is the same
+// i.e. the bytes as-is with bit 6 set to make them ASCII friendly
+QByteArray SaveTTIFormat::format18BitPacket(QByteArray packet)
+{
+	// TTI stores the triplets 6 bits at a time like we do, without Hamming encoding
+	// We don't touch the first byte; the caller replaces it with the designation code
+	// unless it's X/1-X/25 used in (G)POP pages
+	for (int i=1; i<packet.size(); i++) {
+		// Save invalid triplets as address 41, mode 0x1e, data 0
+		// which hopefully won't do anything when parsed as X/26 enhancements
+		if ((packet.at(i) & 0xff) == 0xff)
+			switch (i % 3) {
+				case 1:
+					packet[i] = 41;
+					break;
+				case 2:
+					packet[i] = 0x1e;
+					break;
+				case 0:
+					packet[i] = 0;
+					break;
+			}
+		packet[i] = packet.at(i) | 0x40;
+	}
+
+	return packet;
+}
+
+void SaveTTIFormat::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	// Page number
+	writeString(QString("PN,%1%2").arg(m_document->pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 10, QChar('0')));
+
+	// Subpage
+	// Magazine Organisation Table and Magazine Inventory Page don't have subpages
+	if (subPage.pageFunction() != PageBase::PFMOT && subPage.pageFunction() != PageBase::PFMIP)
+		writeString(QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0')));
+
+	// Status bits
+	// We assume that bit 15 "transmit page" is always wanted
+	// C4 stored in bit 14
+	int statusBits = 0x8000 | (subPage.controlBit(PageBase::C4ErasePage) << 14);
+	// C5 to C11 stored in order from bits 1 to 6
+	for (int i=PageBase::C5Newsflash; i<=PageBase::C11SerialMagazine; i++)
+		statusBits |= subPage.controlBit(i) << (i-1);
+	// NOS in bits 7 to 9
+	statusBits |= subPage.controlBit(PageBase::C12NOS) << 9;
+	statusBits |= subPage.controlBit(PageBase::C13NOS) << 8;
+	statusBits |= subPage.controlBit(PageBase::C14NOS) << 7;
+
+	writeString(QString("PS,%1").arg(0x8000 | statusBits, 4, 16, QChar('0')));
+
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage) {
+		// Level One Page: page region and cycle
+		writeString(QString("RE,%1").arg(static_cast<const LevelOnePage *>(&subPage)->defaultCharSet()));
+		writeString(QString("CT,%1,%2").arg(static_cast<const LevelOnePage *>(&subPage)->cycleValue()).arg(static_cast<const LevelOnePage *>(&subPage)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T'));
+	} else
+		// Not a Level One Page: X/28/0 specifies page function and coding but the PF command
+		// should make it obvious to a human that this is not a Level One Page
+		writeString(QString("PF,%1,%2").arg(subPage.pageFunction()).arg(subPage.packetCoding()));
+}
+
+void SaveTTIFormat::writeSubPageBody(const PageBase &subPage)
+{
+	// Header row
+	if (subPage.packetExists(0))
+		writePacket(format7BitPacket(subPage.packet(0)), 0);
+
+	// FLOF links
+	bool writeFLCommand = false;
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage && subPage.packetExists(27,0)) {
+		// Subpage has FLOF links - if any link to a specific subpage we need to write X/27/0
+		// as raw, otherwise we write the links as a human-readable FL command later on
+		writeFLCommand = true;
+		// TODO uncomment this when we can edit FLOF subpage links
+		/*for (int i=0; i<6; i++)
+			if (document.subPage(p)->fastTextLinkSubPageNumber(i) != 0x3f7f) {
+				writeFLCommand = false;
+				break;
+			}*/
+	}
+
+	// Don't write X/27/0 if FL command will be written
+	// but write the rest of the X/27 packets
+	for (int i=(writeFLCommand ? 1 : 0); i<4; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format4BitPacket(subPage.packet(27, i)), 27, i);
+	for (int i=4; i<16; i++)
+		if (subPage.packetExists(27, i))
+			writePacket(format18BitPacket(subPage.packet(27, i)), 27, i);
+
+	// Now write the other packets like the rest of writeSubPageBody does
+	writeX28Packets(subPage);
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage) {
+		writeX26Packets(subPage);
+		writeX1to25Packets(subPage);
+	} else {
+		qDebug("Not LevelOnePage, assuming 7-bit packets!");
+		writeX1to25Packets(subPage);
+		writeX26Packets(subPage);
+	}
+
+	if (writeFLCommand) {
+		QString flofLine;
+		flofLine.reserve(26);
+		flofLine="FL,";
+
+		for (int i=0; i<6; i++) {
+			// Stored as page link with relative magazine number, convert to absolute page number for display
+			int absoluteLinkPageNumber = static_cast<const LevelOnePage *>(&subPage)->fastTextLinkPageNumber(i) ^ (m_document->pageNumber() & 0x700);
+			// Fix magazine 0 to 8
+			if ((absoluteLinkPageNumber & 0x700) == 0x000)
+				absoluteLinkPageNumber |= 0x800;
+
+			flofLine.append(QString("%1").arg(absoluteLinkPageNumber, 3, 16, QChar('0')));
+			if (i < 5)
+				flofLine.append(',');
+		}
+
+		writeString(flofLine);
+	}
+}
+
+int SaveTTIFormat::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	if (designationCode != -1)
+		packet[0] = designationCode | 0x40;
+
+	packet.prepend("OL," + QByteArray::number(packetNumber) + ",");
+	packet.append("\r\n");
+
+	return(writeRawData(packet, packet.size()));
+}
+
+
+void SaveM29Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	Q_UNUSED(subPageNumber);
+
+	// Force page number to 0xFF and subpage to 0
+	writeString(QString("PN,%1ff00").arg(m_document->pageNumber() >> 8, 1, 16));
+	// Not sure if this PS forcing is necessary
+	writeString("PS,8000");
+}
+
+void SaveM29Format::writeSubPageBody(const PageBase &subPage)
+{
+	if (subPage.packetExists(28, 0))
+		writePacket(format18BitPacket(subPage.packet(28, 0)), 29, 0);
+	if (subPage.packetExists(28, 1))
+		writePacket(format18BitPacket(subPage.packet(28, 1)), 29, 1);
+	if (subPage.packetExists(28, 4))
+		writePacket(format18BitPacket(subPage.packet(28, 4)), 29, 4);
+}
+
+
+QByteArray SaveT42Format::format7BitPacket(QByteArray packet)
+{
+	// Odd parity encoding
+	for (int c=0; c<packet.size(); c++) {
+		char p = packet.at(c);
+
+		// Recursively divide integer into two equal halves and take their XOR until only 1 bit is left
+		p ^= p >> 4;
+		p ^= p >> 2;
+		p ^= p >> 1;
+		// If last bit left is 0 then it started with an even number of bits, so do the odd parity
+		if (!(p & 1))
+			packet[c] = packet.at(c) | 0x80;
+	}
+
+	return packet;
+}
+
+QByteArray SaveT42Format::format4BitPacket(QByteArray packet)
+{
+	for (int c=0; c<packet.size(); c++)
+		packet[c] = hamming_8_4_encode[(int)packet.at(c)];
+
+	return packet;
+}
+
+QByteArray SaveT42Format::format18BitPacket(QByteArray packet)
+{
+	for (int c=1; c<packet.size(); c+=3)
+		// For invalid packets, save as all zeroes which will fail Hamming 24/18 decoding
+		if ((packet.at(c) & 0xff) == 0xff)
+			packet[c] = packet[c+1] = packet[c+2] = 0;
+		else {
+			unsigned int D5_D11;
+			unsigned int D12_D18;
+			unsigned int P5, P6;
+			unsigned int Byte_0;
+
+			const unsigned int toEncode = packet[c] | (packet[c+1] << 6) | (packet[c+2] << 12);
+
+			Byte_0 = (hamming_24_18_forward[0][(toEncode >> 0) & 0xff] ^ hamming_24_18_forward[1][(toEncode >> 8) & 0xff] ^ hamming_24_18_forward_2[(toEncode >> 16) & 0x03]);
+			packet[c] = Byte_0;
+
+			D5_D11 = (toEncode >> 4) & 0x7f;
+			D12_D18 = (toEncode >> 11) & 0x7f;
+
+			P5 = 0x80 & ~(hamming_24_18_parities[0][D12_D18] << 2);
+			packet[c+1] = D5_D11 | P5;
+
+			P6 = 0x80 & ((hamming_24_18_parities[0][Byte_0] ^ hamming_24_18_parities[0][D5_D11]) << 2);
+			packet[c+2] = D12_D18 | P6;
+		}
+
+	return packet;
+}
+
+int SaveT42Format::writePacket(QByteArray packet, int packetNumber, int designationCode)
+{
+	// Byte 2 - designation code
+	if (designationCode != - 1)
+		packet[0] = hamming_8_4_encode[designationCode];
+
+	// Byte 1 of MRAG
+	packet.prepend(hamming_8_4_encode[packetNumber >> 1]);
+	// Byte 0 of MRAG
+	packet.prepend(hamming_8_4_encode[m_magazineNumber | ((packetNumber & 0x01) << 3)]);
+
+	return(writeRawData(packet, packet.size()));
+}
+
+void SaveT42Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	QByteArray packet;
+
+	// Convert integer to Binary Coded Decimal
+	subPageNumber = QString::number(subPageNumber).toInt(nullptr, 16);
+
+	m_magazineNumber = (m_document->pageNumber() & 0xf00) >> 8;
+	if (m_magazineNumber == 8)
+		m_magazineNumber = 0;
+
+	// Retrieve and apply odd parity to header row if there's text there,
+	// otherwise create an initial packet of (odd parity valid) spaces
+	if (subPage.packetExists(0))
+		packet = format7BitPacket(subPage.packet(0));
+	else
+		packet.fill(0x20, 40);
+
+	// Byte 1 of MRAG - packet number 0
+	packet.prepend((char)0);
+	// Byte 0 of MRAG - magazine number, and packet number 0
+	packet.prepend(m_magazineNumber & 0x07);
+
+	packet[2] = m_document->pageNumber() & 0x00f;
+	packet[3] = (m_document->pageNumber() & 0x0f0) >> 4;
+	packet[4] = subPageNumber & 0xf;
+	packet[5] = ((subPageNumber >> 4) & 0x7) | (subPage.controlBit(PageBase::C4ErasePage) << 3);
+	packet[6] = ((subPageNumber >> 8) & 0xf);
+	packet[7] = ((subPageNumber >> 12) & 0x3) | (subPage.controlBit(PageBase::C5Newsflash) << 2) | (subPage.controlBit(PageBase::C6Subtitle) << 3);
+	packet[8] = subPage.controlBit(PageBase::C7SuppressHeader) | (subPage.controlBit(PageBase::C8Update) << 1) | (subPage.controlBit(PageBase::C9InterruptedSequence) << 2) | (subPage.controlBit(PageBase::C10InhibitDisplay) << 3);
+	packet[9] = subPage.controlBit(PageBase::C11SerialMagazine) | (subPage.controlBit(PageBase::C14NOS) << 1) | (subPage.controlBit(PageBase::C13NOS) << 2) | (subPage.controlBit(PageBase::C12NOS) << 3);
+
+	for (int i=0; i<10; i++)
+		packet[i] = hamming_8_4_encode[(int)packet.at(i)];
+
+	writeRawData(packet.constData(), 42);
+}
+
+
+int SaveHTTFormat::writeRawData(const char *s, int len)
+{
+	char httLine[45];
+
+	httLine[0] = 0xaa;
+	httLine[1] = 0xaa;
+	httLine[2] = 0xe4;
+
+	for (int i=0; i<42; i++) {
+		unsigned char b = s[i];
+		b = (b & 0xf0) >> 4 | (b & 0x0f) << 4;
+		b = (b & 0xcc) >> 2 | (b & 0x33) << 2;
+		b = (b & 0xaa) >> 1 | (b & 0x55) << 1;
+		httLine[i+3] = b;
+	}
+
+	return m_outStream.writeRawData(httLine, len+3);
+}
+
+
+bool SaveEP1Format::getWarnings(const PageBase &subPage)
+{
+	m_warnings.clear();
+
+	if (!m_languageCode.contains((static_cast<const LevelOnePage *>(&subPage)->defaultCharSet() << 3) | static_cast<const LevelOnePage *>(&subPage)->defaultNOS()))
+		m_warnings.append("Page language not supported, will be exported as English.");
+
+	if (subPage.packetExists(24) || subPage.packetExists(27, 0))
+		m_warnings.append("FLOF display row and page links will not be exported.");
+
+	if (subPage.packetExists(27, 4) || subPage.packetExists(27, 5))
+		m_warnings.append("X/27/4-5 compositional links will not be exported.");
+
+	if (subPage.packetExists(28, 0) || subPage.packetExists(28, 4))
+		m_warnings.append("X/28 page enhancements will not be exported.");
+
+	return (!m_warnings.isEmpty());
+}
+
+QByteArray SaveEP1Format::format18BitPacket(QByteArray packet)
+{
+	for (int c=1; c<packet.size(); c+=3)
+		if ((packet.at(c+1) & 0xff) == 0xff) {
+			// Save invalid triplets as address 41, mode 0x1e, data 0
+			// which hopefully won't do anything when parsed as X/26 enhancements
+			packet[c]   = 41;
+			packet[c+1] = 0x1e;
+			packet[c+2] = 0;
+		} else {
+			// Shuffle triplet bits to 6 bit address, 5 bit mode, 7 bit data
+			packet[c+2] = ((packet.at(c+2) & 0x3f) << 1) | ((packet.at(c+1) & 0x20) >> 5);
+			packet[c+1] = packet.at(c+1) & 0x1f;
+			// Address of termination marker is 7f instead of 3f
+			if (packet.at(c+1) == 0x1f && packet.at(c) == 0x3f)
+				packet[c] = 0x7f;
+		}
+
+	return packet;
+}
+
+void SaveEP1Format::writeSubPageStart(const PageBase &subPage, int subPageNumber)
+{
+	Q_UNUSED(subPageNumber);
+
+	QByteArray pageStart(3, 0x00);
+
+	// First two bytes always 0xfe, 0x01
+	pageStart[0] = 0xfe;
+	pageStart[1] = 0x01;
+	// Next byte is language code unique to EP1
+	// Unknown values are mapped to English, after warning the user
+	pageStart[2] = m_languageCode.value((static_cast<const LevelOnePage *>(&subPage)->defaultCharSet() << 3) | static_cast<const LevelOnePage *>(&subPage)->defaultNOS(), 0x09);
+
+	writeRawData(pageStart.constData(), 3);
+}
+
+void SaveEP1Format::writeSubPageBody(const PageBase &subPage)
+{
+	// Following the first three bytes already written by writeSubPageStart,
+	// the next three bytes for pages with X/26 packets are 0xca
+	// then little-endian offset to start of Level 1 page data.
+	// For pages with no X/26 packets, just three zeroes.
+	QByteArray offsetData(4, 0x00);
+
+	int numOfX26Packets = 0;
+
+	if (subPage.packetExists(26, 0)) {
+		offsetData[0] = 0xca;
+
+		while (subPage.packetExists(26, numOfX26Packets))
+			numOfX26Packets++;
+
+		const int level1Offset = numOfX26Packets * 40 + 4;
+		offsetData[1] = level1Offset & 0xff;
+		offsetData[2] = level1Offset >> 8;
+	}
+
+	writeRawData(offsetData.constData(), 3);
+
+	// We should really re-implement writeX26Packets but I can't be bothered
+	// to count the number of X/26 packets twice...
+	if (numOfX26Packets > 0) {
+		// Reuse offsetData for this 4-byte header of the enhancement data
+		// Bytes are 0xc2, 0x00, then little-endian length of enhancement data
+		offsetData[0] = 0xc2;
+		offsetData[1] = 0x00;
+		offsetData[2] = (numOfX26Packets * 40) & 0xff;
+		offsetData[3] = (numOfX26Packets * 40) >> 8;
+		writeRawData(offsetData.constData(), 4);
+
+		for (int i=0; i<numOfX26Packets; i++) {
+			QByteArray packet = format18BitPacket(subPage.packet(26, i));
+			packet[0] = i;
+			writeRawData(packet.constData(), 40);
+		}
+	}
+
+	writeX1to25Packets(subPage);
+}
+
+void SaveEP1Format::writeSubPageEnd(const PageBase &subPage)
+{
+	// 40 byte buffer for undo purposes or something? Just write a blank row of spaces
+	writeRawData(QByteArray(40, 0x20).constData(), 40);
+
+	// Last two bytes always 0x00, 0x00
+	writeRawData(QByteArray(2, 0x00).constData(), 2);
+}
+
+void SaveEP1Format::writeX1to25Packets(const PageBase &subPage)
+{
+	for (int i=0; i<24; i++)
+		if (subPage.packetExists(i))
+			writePacket(format7BitPacket(subPage.packet(i)), i, 0);
+		else
+			writeRawData(QByteArray(40, 0x20).constData(), 40);
+}
+
+
+int SaveFormats::s_instances = 0;
+
+SaveFormats::SaveFormats()
+{
+	if (s_instances == 0) {
+		s_fileFormat[0] = new SaveTTIFormat;
+		s_fileFormat[1] = new SaveT42Format;
+		s_fileFormat[2] = new SaveEP1Format;
+		s_fileFormat[3] = new SaveHTTFormat;
+
+		for (int i=0; i<s_size; i++) {
+			if (i != 0)
+				s_exportFilters.append(";;");
+			s_exportFilters.append(s_fileFormat[i]->fileDialogFilter());
+			if (i < s_nativeSize) {
+				if (i != 0)
+					s_filters.append(";;");
+				s_filters.append(s_fileFormat[i]->fileDialogFilter());
+			}
+		}
+	}
+
+	s_instances++;
+}
+
+SaveFormats::~SaveFormats()
+{
+	s_instances--;
+
+	if (s_instances == 0)
+		for (int i=s_size-1; i>=0; i--)
+			delete s_fileFormat[i];
+}
+
+SaveFormat *SaveFormats::findFormat(const QString &suffix) const
+{
+	// TTI is the only official save format at the moment...
+//	for (int i=0; i<s_nativeSize; i++)
+//		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+//			return s_fileFormat[i];
+
+	if (s_fileFormat[0]->extensions().contains(suffix, Qt::CaseInsensitive))
+		return s_fileFormat[0];
+
+	return nullptr;
+}
+
+SaveFormat *SaveFormats::findExportFormat(const QString &suffix) const
+{
+	for (int i=0; i<s_size; i++)
+		if (s_fileFormat[i]->extensions().contains(suffix, Qt::CaseInsensitive))
+			return s_fileFormat[i];
+
+	return nullptr;
+}

src/qteletextmaker/saveformats.h

@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2020-2025 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 SAVEFORMATS_H
+#define SAVEFORMATS_H
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QSaveFile>
+#include <QString>
+
+#include "document.h"
+#include "levelonepage.h"
+#include "pagebase.h"
+
+class SaveFormat
+{
+public:
+	virtual ~SaveFormat() { };
+
+	virtual void saveAllPages(QSaveFile &outFile, const TeletextDocument &document);
+	virtual void saveCurrentSubPage(QSaveFile &outFile, const TeletextDocument &document);
+
+	virtual QString description() const =0;
+	virtual QStringList extensions() const =0;
+	QString fileDialogFilter() const { return QString(description() + " (*." + extensions().join(" *.") + ')'); };
+	virtual bool getWarnings(const PageBase &subPage) { return false; };
+	QStringList warningStrings() const { return m_warnings; };
+	QString errorString() const { return m_error; };
+
+protected:
+	virtual void writeDocumentStart() { };
+	virtual void writeAllPages();
+	virtual void writeSubPage(const PageBase &subPage, int subPageNumber=0);
+	virtual void writeSubPageStart(const PageBase &subPage, int subPageNumber=0) { };
+	virtual void writeSubPageBody(const PageBase &subPage);
+	virtual void writeSubPageEnd(const PageBase &subPage) { };
+	virtual void writeDocumentEnd() { };
+
+	virtual void writeX27Packets(const PageBase &subPage);
+	virtual void writeX28Packets(const PageBase &subPage);
+	virtual void writeX26Packets(const PageBase &subPage);
+	virtual void writeX1to25Packets(const PageBase &subPage);
+
+	virtual QByteArray format7BitPacket(QByteArray packet) { return packet; };
+	virtual QByteArray format4BitPacket(QByteArray packet) { return packet; };
+	virtual QByteArray format18BitPacket(QByteArray packet) { return packet; };
+
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+	virtual int writeRawData(const char *s, int len);
+
+	TeletextDocument const *m_document;
+	QSaveFile *m_outFile;
+	QDataStream m_outStream;
+	QStringList m_warnings;
+	QString m_error;
+};
+
+class SaveTTIFormat : public SaveFormat
+{
+public:
+	QString description() const override { return QString("MRG Systems TTI"); };
+	QStringList extensions() const override { return QStringList { "tti", "ttix" }; };
+
+protected:
+	virtual void writeDocumentStart();
+	virtual void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	virtual void writeSubPageBody(const PageBase &subPage);
+
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+	void writeString(const QString &command);
+
+	QByteArray format7BitPacket(QByteArray packet);
+	QByteArray format4BitPacket(QByteArray packet) { return format18BitPacket(packet); };
+	QByteArray format18BitPacket(QByteArray packet);
+};
+
+class SaveM29Format : public SaveTTIFormat
+{
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	void writeSubPageBody(const PageBase &subPage);
+};
+
+class SaveT42Format : public SaveFormat
+{
+public:
+	QString description() const override { return QString("t42 packet stream"); };
+	QStringList extensions() const override { return QStringList { "t42" }; };
+
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	virtual int writePacket(QByteArray packet, int packetNumber, int designationCode = -1);
+
+	virtual QByteArray format7BitPacket(QByteArray packet);
+	virtual QByteArray format4BitPacket(QByteArray packet);
+	virtual QByteArray format18BitPacket(QByteArray packet);
+
+	int m_magazineNumber;
+};
+
+class SaveHTTFormat : public SaveT42Format
+{
+public:
+	QString description() const override { return QString("HMS SD-Teletext HTT"); };
+	QStringList extensions() const override { return QStringList { "htt" }; };
+
+protected:
+	int writeRawData(const char *s, int len) override;
+};
+
+class SaveEP1Format : public SaveFormat
+{
+public:
+	QString description() const override { return QString("Softel EP1"); };
+	QStringList extensions() const override { return QStringList { "ep1" }; };
+	virtual bool getWarnings(const PageBase &subPage);
+
+protected:
+	void writeSubPageStart(const PageBase &subPage, int subPageNumber=0);
+	void writeSubPageBody(const PageBase &subPage);
+	void writeSubPageEnd(const PageBase &subPage);
+
+	virtual void writeX1to25Packets(const PageBase &subPage);
+
+	virtual QByteArray format18BitPacket(QByteArray packet);
+
+	// Language codes unique to EP1
+	// FIXME duplicated in loadformats.h
+	const QMap<int, int> m_languageCode {
+		{ 0x00, 0x09 }, { 0x01, 0x0d }, { 0x02, 0x18 }, { 0x03, 0x11 }, { 0x04, 0x0b }, { 0x05, 0x17 }, { 0x06, 0x07 },
+		{ 0x08, 0x14 }, { 0x09, 0x0d }, { 0x0a, 0x18 }, { 0x0b, 0x11 }, { 0x0c, 0x0b }, { 0x0e, 0x07 },
+		{ 0x10, 0x09 }, { 0x11, 0x0d }, { 0x12, 0x18 }, { 0x13, 0x11 }, { 0x14, 0x0b }, { 0x15, 0x17 }, { 0x16, 0x1c },
+		{ 0x1d, 0x1e }, { 0x1f, 0x16 },
+		{ 0x21, 0x0d }, { 0x22, 0xff }, { 0x23, 0xff }, { 0x26, 0x07 },
+		{ 0x36, 0x1c }, { 0x37, 0x0e },
+		{ 0x40, 0x09 }, { 0x44, 0x0b }
+	};
+};
+
+
+class SaveFormats
+{
+public:
+	SaveFormats();
+	~SaveFormats();
+
+	SaveFormat *findFormat(const QString &suffix) const;
+	SaveFormat *findExportFormat(const QString &suffix) const;
+	QString filters() const { return s_filters; };
+	QString exportFilters() const { return s_exportFilters; };
+	bool isExportOnly(const QString &suffix) const { return findFormat(suffix) == nullptr; };
+
+private:
+	static const inline int s_size = 4;
+	static const inline int s_nativeSize = 1;
+	static int s_instances;
+	inline static SaveFormat *s_fileFormat[s_size];
+	inline static QString s_filters, s_exportFilters;
+};
+
+#endif

src/qteletextmaker/x26dockwidget.cpp

@@ -74,7 +74,7 @@ void CharacterListModel::setCharacterSet(int 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));
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -83,7 +83,7 @@ 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));
+		emit dataChanged(createIndex(0, 0), createIndex(95, 0), QList<int>(Qt::DecorationRole));
 	}
 }
 
@@ -398,7 +398,7 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	DRCSModeLayout->addWidget(m_DRCSModeNormalRadioButton);
 	connect(m_DRCSModeGlobalRadioButton, &QAbstractButton::clicked, this, [=] { updateModelFromCookedWidget(0, Qt::UserRole+3); } );
 	connect(m_DRCSModeNormalRadioButton, &QAbstractButton::clicked, this, [=] { updateModelFromCookedWidget(1, Qt::UserRole+3); } );
-	DRCSModeLayout->addWidget(new QLabel(tr("Subpage")));
+	DRCSModeLayout->addWidget(new QLabel(tr("Subtable")));
 	m_DRCSModeSubPageSpinBox = new QSpinBox;
 	m_DRCSModeSubPageSpinBox->setMaximum(15);
 	m_DRCSModeSubPageSpinBox->setWrapping(true);
@@ -417,7 +417,7 @@ X26DockWidget::X26DockWidget(TeletextWidget *parent): QDockWidget(parent)
 	DRCSCharacterLayout->addWidget(m_DRCSCharacterNormalRadioButton);
 	connect(m_DRCSCharacterGlobalRadioButton, &QAbstractButton::clicked, this, [=] { updateModelFromCookedWidget(0, Qt::UserRole+1); } );
 	connect(m_DRCSCharacterNormalRadioButton, &QAbstractButton::clicked, this, [=] { updateModelFromCookedWidget(1, Qt::UserRole+1); } );
-	DRCSCharacterLayout->addWidget(new QLabel(tr("Character")));
+	DRCSCharacterLayout->addWidget(new QLabel(tr("PTU")));
 	m_DRCSCharacterCodeSpinBox = new QSpinBox;
 	m_DRCSCharacterCodeSpinBox->setMaximum(47);
 	m_DRCSCharacterCodeSpinBox->setWrapping(true);
@@ -678,6 +678,13 @@ void X26DockWidget::updateAllCookedTripletWidgets(const QModelIndex &index)
 {
 	const int modeExt = index.model()->data(index.model()->index(index.row(), 2), Qt::EditRole).toInt();
 
+	if (modeExt == 0xff) {
+		disableTripletWidgets();
+		m_cookedModePushButton->setEnabled(true);
+		m_cookedModePushButton->setText("Replace...");
+		return;
+	}
+
 	m_cookedModePushButton->setEnabled(true);
 	m_cookedModePushButton->setText(m_modeTripletNames.modeName(modeExt));
 
@@ -1034,7 +1041,7 @@ void X26DockWidget::insertTriplet(int modeExt, int row)
 			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)
+				if (existingTripletModeExt >= 0x20 && existingTripletModeExt <= 0x3f && 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,
@@ -1059,16 +1066,31 @@ void X26DockWidget::insertTriplet(int modeExt, int row)
 	} else
 		row = 0;
 
-	// For character triplets, ensure Data is not reserved
+	// Avoid reserved bits
-	if (modeExt == 0x21 || modeExt == 0x22 || modeExt == 0x29 || modeExt == 0x2b || modeExt >= 0x2f)
+	switch (modeExt) {
-		newTriplet.setData(0x20);
+		case 0x07: // Address Row 0
-	// For Address Row 0, set Address
+			newTriplet.setAddress(63); // set Address to notreserved
-	if (modeExt == 0x07)
+			break;
-		newTriplet.setAddress(63);
+		case 0x18: // DRCS mode
-	// For Termination Marker, set Address and Mode
+			newTriplet.setData(0x70); // Normal DRCS at Levels 2.5 and 3.5
-	if (modeExt == 0x1f) {
+			break;
-		newTriplet.setAddress(63);
+		case 0x1f: // Termination Marker
-		newTriplet.setData(7);
+			newTriplet.setAddress(63); // set all bits to 1
+			newTriplet.setData(7);
+			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
+			newTriplet.setData(0x20); // ensure Data is not reserved
+			break;
+		case 0x2d: // DRCS character
+			newTriplet.setData(0x40); // Normal DRCS
+			break;
+		default:
+			if (modeExt >= 0x30) // G0 diacritical
+				newTriplet.setData(0x65); // Lower case "e"
 	}
 
 	m_x26Model->insertRows(row, 1, QModelIndex(), newTriplet);
@@ -1144,6 +1166,19 @@ void X26DockWidget::customMenuRequested(QPoint pos)
 					connect(static_cast<TripletCLUTQMenu *>(customMenu)->action(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
 				}
 				break;
+			case 0x18: // DRCS mode
+				customMenu = new TripletDRCSModeQMenu(this);
+
+				static_cast<TripletDRCSModeQMenu *>(customMenu)->setSourceChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+3).toInt());
+				static_cast<TripletDRCSModeQMenu *>(customMenu)->setSubTableChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+4).toInt());
+				static_cast<TripletDRCSModeQMenu *>(customMenu)->setLevelsChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				for (int i=0; i<2; i++)
+					connect(static_cast<TripletDRCSModeQMenu *>(customMenu)->sourceAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+3); updateAllCookedTripletWidgets(index); });
+				for (int i=0; i<16; i++)
+					connect(static_cast<TripletDRCSModeQMenu *>(customMenu)->subTableAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+4); updateAllCookedTripletWidgets(index); });
+				for (int i=0; i<3; i++)
+					connect(static_cast<TripletDRCSModeQMenu *>(customMenu)->levelsAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				break;
 			case 0x27: // Additional flash functions
 				customMenu = new TripletFlashQMenu(this);
 
@@ -1165,6 +1200,16 @@ void X26DockWidget::customMenuRequested(QPoint pos)
 					connect(static_cast<TripletDisplayAttrsQMenu *>(customMenu)->otherAttrAction(i), &QAction::toggled, [=](const int checked) { updateModelFromCookedWidget(checked, Qt::UserRole+i+2); updateAllCookedTripletWidgets(index); });
 				}
 				break;
+			case 0x2d: // DRCS character
+				customMenu = new TripletDRCSCharacterQMenu(this);
+
+				static_cast<TripletDRCSCharacterQMenu *>(customMenu)->setSourceChecked(index.model()->data(index.model()->index(index.row(), 0), Qt::UserRole+1).toInt());
+				for (int i=0; i<50; i++)
+					if (i < 48)
+						connect(static_cast<TripletDRCSCharacterQMenu *>(customMenu)->characterAction(i), &QAction::triggered, [=]() { updateModelFromCookedWidget(i, Qt::UserRole+2); updateAllCookedTripletWidgets(index); });
+					else
+						connect(static_cast<TripletDRCSCharacterQMenu *>(customMenu)->sourceAction(i-48), &QAction::triggered, [=]() { updateModelFromCookedWidget(i-48, Qt::UserRole+1); updateAllCookedTripletWidgets(index); });
+				break;
 			case 0x2e: // Font style
 				customMenu = new TripletFontStyleQMenu(this);
 

src/qteletextmaker/x26menus.cpp

@@ -219,6 +219,78 @@ void TripletDisplayAttrsQMenu::setOtherAttrChecked(int n, bool b)
 }
 
 
+TripletDRCSModeQMenu::TripletDRCSModeQMenu(QWidget *parent): QMenu(parent)
+{
+	m_actions[16] = this->addAction(tr("Global DRCS"));
+	m_actions[17] = this->addAction(tr("Normal DRCS"));
+	m_sourceActionGroup = new QActionGroup(this);
+	for (int i=0; i<2; i++) {
+		m_actions[16+i]->setCheckable(true);
+		m_sourceActionGroup->addAction(m_actions[16+i]);
+	}
+
+	QMenu *subTable = this->addMenu(tr("Subtable"));
+	m_subTableActionGroup = new QActionGroup(this);
+	for (int i=0; i<16; i++) {
+		m_actions[i] = subTable->addAction(QString("%1").arg(i));
+		m_actions[i]->setCheckable(true);
+		m_subTableActionGroup->addAction(m_actions[i]);
+	}
+
+	QMenu *levels = this->addMenu(tr("Required at"));
+	m_actions[18] = levels->addAction("Level 2.5 only");
+	m_actions[19] = levels->addAction("Level 3.5 only");
+	m_actions[20] = levels->addAction("Level 2.5 and 3.5");
+	m_levelsActionGroup = new QActionGroup(this);
+	for (int i=0; i<3; i++) {
+		m_actions[18+i]->setCheckable(true);
+		m_levelsActionGroup->addAction(m_actions[18+i]);
+	}
+}
+
+void TripletDRCSModeQMenu::setSubTableChecked(int n)
+{
+	m_actions[n]->setChecked(true);
+}
+
+void TripletDRCSModeQMenu::setSourceChecked(int n)
+{
+	m_actions[16+n]->setChecked(true);
+}
+
+void TripletDRCSModeQMenu::setLevelsChecked(int n)
+{
+	m_actions[18+n]->setChecked(true);
+}
+
+
+
+TripletDRCSCharacterQMenu::TripletDRCSCharacterQMenu(QWidget *parent): QMenu(parent)
+{
+	QMenu *charRange[4];
+
+	m_actions[48] = this->addAction(tr("Global DRCS"));
+	m_actions[49] = this->addAction(tr("Normal DRCS"));
+	m_sourceActionGroup = new QActionGroup(this);
+	for (int i=0; i<2; i++) {
+		m_actions[48+i]->setCheckable(true);
+		m_sourceActionGroup->addAction(m_actions[48+i]);
+	}
+
+	for (int r=0; r<4; r++) {
+		charRange[r] = this->addMenu(QString("%1-%2").arg(r*12).arg(r*12+11));
+
+		for (int c=0; c<12; c++)
+			m_actions[r*12+c] = charRange[r]->addAction(QString("%1").arg(r*12+c));
+	}
+}
+
+void TripletDRCSCharacterQMenu::setSourceChecked(int n)
+{
+	m_actions[48+n]->setChecked(true);
+}
+
+
 TripletFontStyleQMenu::TripletFontStyleQMenu(QWidget *parent): QMenu(parent)
 {
 	m_actions[0] = this->addAction(tr("Proportional"));

src/qteletextmaker/x26menus.h

@@ -188,6 +188,39 @@ private:
 	QActionGroup *m_sizeActionGroup, *m_otherActionGroup;
 };
 
+class TripletDRCSModeQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletDRCSModeQMenu(QWidget *parent = nullptr);
+	QAction *subTableAction(int n) const { return m_actions[n]; }
+	QAction *sourceAction(int n) const { return m_actions[n+16]; }
+	QAction *levelsAction(int n) const { return m_actions[n+18]; }
+	void setSubTableChecked(int n);
+	void setSourceChecked(int n);
+	void setLevelsChecked(int n);
+
+private:
+	QAction *m_actions[21];
+	QActionGroup *m_subTableActionGroup, *m_sourceActionGroup, *m_levelsActionGroup;
+};
+
+class TripletDRCSCharacterQMenu : public QMenu
+{
+	Q_OBJECT
+
+public:
+	TripletDRCSCharacterQMenu(QWidget *parent = nullptr);
+	QAction *characterAction(int n) const { return m_actions[n]; };
+	QAction *sourceAction(int n) const { return m_actions[n+48]; };
+	void setSourceChecked(int n);
+
+private:
+	QAction *m_actions[50];
+	QActionGroup *m_sourceActionGroup;
+};
+
 class TripletFontStyleQMenu : public QMenu
 {
 	Q_OBJECT

src/qteletextmaker/x26model.cpp

@@ -108,7 +108,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				else
 					return QVariant();
 			case 1:
-				if (!triplet.isRowTriplet())
+				if (triplet.isValid() && !triplet.isRowTriplet())
 					return triplet.addressColumn();
 				// For Set Active Position and Origin Modifier, data is the column
 				else if (triplet.modeExt() == 0x04)
@@ -122,9 +122,14 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 	QString result;
 
 	if (role == Qt::DisplayRole) {
-		if (index.column() == 2)
+		if (index.column() == 2) {
+			if (!triplet.isValid())
+				return "Error decoding triplet";
 			return (m_modeTripletNames.modeName(triplet.modeExt()));
+		}
 		// Column 3 - describe effects of data/address triplet parameters in plain English
+		if (!triplet.isValid())
+			return QVariant();
 		switch (triplet.modeExt()) {
 			case 0x01: // Full row colour
 			case 0x07: // Address row 0
@@ -181,7 +186,7 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
 				break;
 			case 0x18: // DRCS mode
 				result = (triplet.data() & 0x40) == 0x40 ? "Normal" : "Global";
-				result.append(QString(": subpage %1, ").arg(triplet.data() & 0x0f));
+				result.append(QString(": subtable %1, ").arg(triplet.data() & 0x0f));
 				switch (triplet.data() & 0x30) {
 					case 0x10:
 						result.append("L2.5 only");
@@ -609,12 +614,15 @@ bool X26Model::setData(const QModelIndex &index, const QVariant &value, int role
 				return true;
 
 			case 2: // Cooked triplet mode
-				if (intValue < 0x20 && !triplet.isRowTriplet()) {
+				if (!triplet.isValid()) {
+					// Changing from invalid triplet
+					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x00, intValue < 0x20 ? 41 : 0, role));
+					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 32, role));
+				} else if (intValue < 0x20 && !triplet.isRowTriplet()) {
 					// Changing mode from column triplet to row triplet
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x00, 41, role));
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0, role));
-				}
+				} else if (intValue >= 0x20 && triplet.isRowTriplet()) {
-				if (intValue >= 0x20 && triplet.isRowTriplet()) {
 					// Changing mode from row triplet to column triplet
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETaddress, 0x00, 0, role));
 					m_parentMainWidget->document()->undoStack()->push(new EditTripletCommand(m_parentMainWidget->document(), this, index.row(), EditTripletCommand::ETdata, 0x00, 0, role));

src/qteletextmaker/x26model.h

@@ -60,8 +60,9 @@ private:
 	};
 
 	// Needs to be in the same order as enum X26TripletError in x26triplets.h
-	const tripletErrorShow m_tripletErrors[6] {
+	const tripletErrorShow m_tripletErrors[7] {
 		{ "", 0 }, // No error
+		{ "Error decoding triplet", 2 },
 		{ "Active Position can't move up", 0 },
 		{ "Active Position can't move left within row", 1 },
 		{ "Invocation not pointing to Object Definition", 3 },

src/qteletextmaker/x28commands.cpp

@@ -241,3 +241,34 @@ void ResetCLUTCommand::undo()
 
 	emit m_teletextDocument->contentsChanged();
 }
+
+
+SetDCLUTCommand::SetDCLUTCommand(TeletextDocument *teletextDocument, bool globalDrcs, int mode, int index, int colour, QUndoCommand *parent) : X28Command(teletextDocument, parent)
+{
+	m_globalDrcs = globalDrcs;
+	m_mode = mode;
+	m_index = index;
+	m_oldColour = teletextDocument->currentSubPage()->dCLUT(globalDrcs, mode, index);
+	m_newColour = colour;
+
+	setText(QObject::tr("DCLUT"));
+}
+
+void SetDCLUTCommand::redo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDCLUT(m_globalDrcs, m_mode, m_index, m_newColour);
+
+	emit m_teletextDocument->dClutChanged(m_globalDrcs, m_mode, m_index);
+	emit m_teletextDocument->contentsChanged();
+}
+
+void SetDCLUTCommand::undo()
+{
+	m_teletextDocument->selectSubPageIndex(m_subPageIndex);
+	m_teletextDocument->currentSubPage()->setDCLUT(m_globalDrcs, m_mode, m_index, m_oldColour);
+
+	emit m_teletextDocument->dClutChanged(m_globalDrcs, m_mode, m_index);
+	// We don't emit contentsChanged() here, dClutChanged does that after
+	// marking DRCS character cells for refresh
+}

src/qteletextmaker/x28commands.h

@@ -123,4 +123,17 @@ private:
 	int m_oldColourEntry[8];
 };
 
+class SetDCLUTCommand : public X28Command
+{
+public:
+	SetDCLUTCommand(TeletextDocument *teletextDocument, bool globalDrcs, int mode, int index, int colour, QUndoCommand *parent = 0);
+
+	void redo() override;
+	void undo() override;
+
+private:
+	bool m_globalDrcs;
+	int m_mode, m_index, m_oldColour, m_newColour;
+};
+
 #endif