Tag version 0.8.1-beta

Fix deeper zooms not being saved properly
Restore geometry and state after central widget creation
2025-10-26 14:20:04 +00:00 · 2025-10-26 10:53:13 +00:00 · 2025-10-24 22:49:35 +01:00 · 2025-10-21 14:43:02 +01:00 · 2025-10-19 16:17:52 +01:00 · 2025-10-14 15:57:49 +01:00
46 changed files with 2339 additions and 347 deletions
--- a/3rdparty/QtGifImage/CMakeLists.txt
+++ b/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

--- a/CMakeLists.txt
+++ b/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(
-	TARGET qteletextmaker
-	FILENAME_VARIABLE deploy_script
-	NO_UNSUPPORTED_PLATFORM_ERROR
+if(UNIX AND NOT APPLE)
+	install(FILES
+		${CMAKE_CURRENT_LIST_DIR}/share/qteletextmaker.desktop
+		DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
 	)
-install(SCRIPT ${deploy_script})
+endif()
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@ It is written in C++ using the Qt 6 widget libraries.
 Features
 - Load and save pages in TTI format.
 - Rendering of pages in Levels 1, 1.5, 2.5 and 3.5 including Local Objects and side panels.
+- Rendering of DRCS characters imported from DRCS downloading pages.
 - Import and export of single pages in t42, EP1 and HTT formats.
 - 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.
+- View pages in 4:3, 16:9 pillar-box and 16:9 stretch aspect ratios with configurable zoom level.
 - 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
--- a/examples/Level2p5-DRCS/DRCS-CardSuits-MainPage.tti
+++ b/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]                                      
--- a/examples/Level2p5-DRCS/DRCS-CardSuits-Nptus.tti
+++ b/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|~@@@@@@
--- a/examples/Level2p5-DRCS/DRCS-Parrot-MainPage.tti
+++ b/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                       
--- a/examples/Level2p5-DRCS/DRCS-Parrot-Nptus.tti
+++ b/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@@@@@@@@@@@@@@@@@@@@@@@
--- a/examples/Level2p5-DRCS/README-drcs.md
+++ b/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.
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode1-MainPage.tti
+++ b/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                     
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode1-Nptus.tti
+++ b/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,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode2-MainPage.tti
+++ b/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                      
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode2-Nptus.tti
+++ b/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@@@@@@@@\@\@@@@@@@@@@@@@@@@@@@@
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode3-MainPage.tti
+++ 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                       
--- a/examples/Level3p5-DRCS/Level3p5DRCS-ParrotMode3-Nptus.tti
+++ b/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@
--- a/share/qteletextmaker.desktop
+++ b/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;
--- a/src/qteletextdecoder/CMakeLists.txt
+++ b/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})

--- a/src/qteletextdecoder/decode.cpp
+++ b/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;
--- a/src/qteletextdecoder/decode.h
+++ b/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         ||
 		       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];
--- a/src/qteletextdecoder/drcspage.cpp
+++ b/src/qteletextdecoder/drcspage.cpp
@@ -0,0 +1,82 @@
+/*
+ * 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));
+}
+
+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;
+}
--- a/src/qteletextdecoder/drcspage.h
+++ b/src/qteletextdecoder/drcspage.h
@@ -0,0 +1,40 @@
+/*
+ * 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 { return PFGlobalPOP; }
+	PacketCodingEnum packetCoding() const override { return Coding7bit; }
+
+	int drcsMode(int c) const;
+	bool ptu(int c, uchar *data) const;
+};
+
+#endif
--- a/src/qteletextdecoder/fontimages/teletextfont.png
+++ b/src/qteletextdecoder/fontimages/teletextfont.png
--- a/src/qteletextdecoder/levelonepage.cpp
+++ b/src/qteletextdecoder/levelonepage.cpp
@@ -33,6 +33,24 @@ LevelOnePage::LevelOnePage()
 	clearPage();
 }

+LevelOnePage::LevelOnePage(const PageBase &other)
+{
+	m_enhancements.reserve(maxEnhancements());
+	clearPage();
+
+	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));
+}
+
 // So far we only call clearPage() once, within the constructor
 void LevelOnePage::clearPage()
 {
@@ -216,7 +234,6 @@ bool LevelOnePage::setPacket(int y, int d, QByteArray pkt)
 		return true;
 	}

-	qDebug("LevelOnePage unhandled setPacket X/%d/%d", y, d);
 	return PageX26Base::setPacket(y, d, pkt);
 }

@@ -365,13 +382,102 @@ 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)
+{
+	const QByteArray defaultPkt = QByteArray("\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", 40);
+
+	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;
--- a/src/qteletextdecoder/levelonepage.h
+++ b/src/qteletextdecoder/levelonepage.h
@@ -40,6 +40,10 @@ public:
 	enum CycleTypeEnum { CTcycles, CTseconds };

 	LevelOnePage();
+	LevelOnePage(const PageBase &other);
+
+	PageFunctionEnum pageFunction() const override { return PFLevelOnePage; }
+	PacketCodingEnum packetCoding() const override { return Coding7bit; }

 	bool isEmpty() const override;

@@ -81,6 +85,8 @@ public:
 	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; }
 	void setLeftSidePanelDisplayed(bool newLeftSidePanelDisplayed);
@@ -121,7 +127,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,
--- a/src/qteletextdecoder/pagebase.h
+++ b/src/qteletextdecoder/pagebase.h
@@ -29,9 +29,16 @@ class PageBase //: public QObject

 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 { PFUnknown = -1, 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 { CodingUnknown = -1, Coding7bit, Coding8bit, Coding18bit, Coding4bit, Coding4bitThen7bit, CodingPerPacket };

 	PageBase();

+	virtual PageFunctionEnum pageFunction() const { return PFUnknown; }
+	virtual PacketCodingEnum packetCoding() const { return CodingUnknown; }
+
 	virtual bool isEmpty() const;

 	virtual QByteArray packet(int y) const { return m_displayPackets[y]; }
@@ -40,9 +47,9 @@ public:
 	virtual bool setPacket(int y, int d, QByteArray pkt);
 	virtual bool packetExists(int y) const { return !m_displayPackets[y].isEmpty(); }
 	virtual bool packetExists(int y, int d) const { return !m_designationPackets[y-26][d].isEmpty(); }
-	bool clearPacket(int y);
-	bool clearPacket(int y, int d);
-	void clearAllPackets();
+	virtual bool clearPacket(int y);
+	virtual bool clearPacket(int y, int d);
+	virtual void clearAllPackets();

 	virtual bool controlBit(int b) const { return m_controlBits[b]; }
 	virtual bool setControlBit(int b, bool active);
--- a/src/qteletextdecoder/pagex26base.cpp
+++ b/src/qteletextdecoder/pagex26base.cpp
@@ -62,7 +62,7 @@ void PageX26Base::setEnhancementListFromPacket(int p, QByteArray pkt)
 	// We write "dummy" reserved 11110 Row 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() < (p+1)*13)
-		m_enhancements.append(m_paddingX26Triplet);
+		m_enhancements.append( X26Triplet{ 41, 0x1e, 0 } );

 	X26Triplet newX26Triplet;

--- a/src/qteletextdecoder/pagex26base.h
+++ b/src/qteletextdecoder/pagex26base.h
@@ -40,7 +40,6 @@ protected:
 	bool packetFromEnhancementListNeeded(int n) const { return ((m_enhancements.size()+12) / 13) > n; };

 	X26TripletList m_enhancements;
-	const X26Triplet m_paddingX26Triplet { 41, 0x1e, 0 };
 };

 #endif
--- a/src/qteletextdecoder/render.cpp
+++ b/src/qteletextdecoder/render.cpp
@@ -154,11 +154,21 @@ 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(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
@@ -191,15 +201,39 @@ inline void TeletextPageRender::drawCharacter(QPainter &painter, int r, int c, u
 	}
 }

+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;

+	// Don't apply style to mosaics
+	const bool mosaic = characterSet > 24 || (characterSet == 24 && (characterCode < 0x41 || characterCode > 0x5a));
+
 	m_fontBitmap.image()->setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});
 	styledImage.setColorTable(QList<QRgb>{m_backgroundQColor.rgba(), m_foregroundQColor.rgba()});

-	if (m_decoder->cellItalic(r, c)) {
+	if (!mosaic && m_decoder->cellItalic(r, c)) {
 		styledImage.fill(0);

 		styledPainter.begin(&styledImage);
@@ -211,7 +245,8 @@ 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();
@@ -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;
-			int characterSet, characterDiacritical;
+			bool flashPhOn = true; // Must remain "true" on non-flashing cell
+			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,7 +335,14 @@ 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);
@@ -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)
--- a/src/qteletextdecoder/render.h
+++ b/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);
--- a/src/qteletextmaker/dclutdockwidget.cpp
+++ b/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;
+		}
+}
--- a/src/qteletextmaker/dclutdockwidget.h
+++ b/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
--- a/src/qteletextdecoder/document.cpp
+++ b/src/qteletextdecoder/document.cpp
@@ -19,6 +19,7 @@

 #include <QAbstractListModel>
 #include <QList>
+#include <QVariant>

 #include "document.h"

@@ -61,8 +62,6 @@ TeletextDocument::TeletextDocument()
 {
 	m_pageNumber = 0x199;
 	m_description.clear();
-	m_pageFunction = PFLevelOnePage;
-	m_packetCoding = Coding7bit;
 	m_subPages.append(new LevelOnePage);
 	m_currentSubPageIndex = 0;
 	m_undoStack = new QUndoStack(this);
@@ -112,18 +111,6 @@ void TeletextDocument::clear()
 	}
 }

-/*
-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?
@@ -200,6 +187,51 @@ void TeletextDocument::unDeleteSubPageFromRecycle(int subPage)
 	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)
 {
 	// If the magazine number was changed, we need to update the relative magazine numbers in FastText
--- a/src/qteletextdecoder/document.h
+++ b/src/qteletextdecoder/document.h
@@ -24,6 +24,7 @@
 #include <QList>
 #include <QObject>
 #include <QUndoStack>
+#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);
@@ -109,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();
@@ -119,8 +113,6 @@ signals:
 private:
 	QString m_description;
 	int m_pageNumber, m_currentSubPageIndex;
-	PageFunctionEnum m_pageFunction;
-	PacketCodingEnum m_packetCoding;
 	QList<LevelOnePage *> m_subPages;
 	QList<LevelOnePage *> m_recycleSubPages;
 	QUndoStack *m_undoStack;
--- a/src/qteletextmaker/hashformats.cpp
+++ b/src/qteletextmaker/hashformats.cpp
@@ -75,6 +75,19 @@ QString exportHashStringPackets(LevelOnePage *subPage)
 	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
@@ -101,17 +114,5 @@ QString exportHashStringPackets(LevelOnePage *subPage)
 		}
 	}

-	// 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").arg(0x8000 | pageStatus, 0, 16, QChar('0')));
 	return result;
 }
--- a/src/qteletextmaker/loadformats.cpp
+++ b/src/qteletextmaker/loadformats.cpp
@@ -22,44 +22,56 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <QFile>
+#include <QList>
 #include <QString>
 #include <QStringList>
-#include <QTextStream>
+#include <QVariant>

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

-bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
+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;
-	int cycleCommandsFound = 0;
-	int mostRecentCycleValue = -1;
-	LevelOnePage::CycleTypeEnum mostRecentCycleType;

-	LevelOnePage* loadingPage = document->subPage(0);
+//	subPages.clear();
+	subPages.append(PageBase { } );
+
+	PageBase* loadingPage = &subPages[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("DE,") && metadata != nullptr)
+			metadata->insert("description", 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));
+			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,") {
@@ -71,61 +83,81 @@ bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
 		}*/
 		if (inLine.startsWith("PS,")) {
 			bool pageStatusOk;
-			int pageStatusRead = inLine.mid(3, 4).toInt(&pageStatusOk, 16);
+			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->setDefaultNOS(((pageStatusRead & 0x0200) >> 9) | ((pageStatusRead & 0x0100) >> 7) | ((pageStatusRead & 0x0080) >> 5));
+
+				loadingPage->setControlBit(PageBase::C12NOS, pageStatusRead & 0x0200);
+				loadingPage->setControlBit(PageBase::C13NOS, pageStatusRead & 0x0100);
+				loadingPage->setControlBit(PageBase::C14NOS, pageStatusRead & 0x0080);
 			}
 		}
 		if (inLine.startsWith("RE,")) {
 			bool regionValueOk;
-			int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk);
-			if (regionValueOk)
-				loadingPage->setDefaultCharSet(regionValueRead);
+			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;
-			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);
+			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,")) {
-			bool fastTextLinkOk;
-			int fastTextLinkRead;
-			QString flLine = QString(inLine.remove(0, 3));
-			if (flLine.count(',') == 5)
+			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++) {
-					fastTextLinkRead = flLine.section(',', i, i).toInt(&fastTextLinkOk, 16);
+					bool fastTextLinkOk;
+					int 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);
+						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, secondCommaPosition;
+			int lineNumber;

-			secondCommaPosition = inLine.indexOf(",", 3);
+			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) {
-				pageBodyPacketsFound = true;
-
 				inLine.remove(0, secondCommaPosition+1);
 				if (lineNumber <= 25) {
 					for (int c=0; c<40; c++) {
@@ -142,9 +174,10 @@ bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
 							inLine[c] = inLine.at(c) & 0xbf;
 						}
 					}
+					pageBodyPacketsFound = true;
 					loadingPage->setPacket(lineNumber, inLine);
-				} else {
-					int designationCode = inLine.at(0) & 0x3f;
+				} 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) {
@@ -162,10 +195,11 @@ bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
 						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)
+						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);
 				}
 			}
@@ -177,14 +211,6 @@ bool LoadTTIFormat::load(QFile *inFile, TeletextDocument *document)
 		return false;
 	}

-	// 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);
-		}
-
 	return true;
 }

@@ -194,7 +220,7 @@ bool LoadT42Format::readPacket()
 	return m_inFile->read((char *)m_inLine, 42) == 42;
 }

-bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
+bool LoadT42Format::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash *metadata)
 {
 	int readMagazineNumber, readPacketNumber;
 	int foundMagazineNumber = -1;
@@ -208,6 +234,11 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 	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
@@ -259,20 +290,22 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 				foundPageNumber = readPageNumber;
 				firstPacket0Found = true;

+				if (metadata != nullptr) {
 					if (foundMagazineNumber == 0)
-					document->setPageNumber(0x800 | foundPageNumber);
+						metadata->insert("pageNumber", 0x800 | foundPageNumber);
 					else
-					document->setPageNumber((foundMagazineNumber << 8) | foundPageNumber);
+						metadata->insert("pageNumber", (foundMagazineNumber << 8) | foundPageNumber);
+				}

-				document->subPage(0)->setControlBit(PageBase::C4ErasePage, m_inLine[5] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C5Newsflash, m_inLine[7] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C6Subtitle, m_inLine[7] & 0x08);
+				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++)
-					document->subPage(0)->setControlBit(PageBase::C7SuppressHeader+i, m_inLine[8] & (1 << i));
-				document->subPage(0)->setControlBit(PageBase::C11SerialMagazine, m_inLine[9] & 0x01);
-				document->subPage(0)->setControlBit(PageBase::C12NOS, m_inLine[9] & 0x08);
-				document->subPage(0)->setControlBit(PageBase::C13NOS, m_inLine[9] & 0x04);
-				document->subPage(0)->setControlBit(PageBase::C14NOS, m_inLine[9] & 0x02);
+					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;
@@ -288,7 +321,7 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 					for (int i=0; i<10; i++)
 						m_inLine[i] = 0x20;

-					document->subPage(0)->setPacket(0, QByteArray((const char *)&m_inLine[2], 40));
+					loadingPage->setPacket(0, QByteArray((const char *)&m_inLine[2], 40));
 				}
 				continue;
 			}
@@ -311,7 +344,7 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 			for (int i=2; i<42; i++)
 				// TODO - obey odd parity?
 				m_inLine[i] &= 0x7f;
-			document->subPage(0)->setPacket(readPacketNumber, QByteArray((const char *)&m_inLine[2], 40));
+			loadingPage->setPacket(readPacketNumber, QByteArray((const char *)&m_inLine[2], 40));
 			continue;
 		}

@@ -349,7 +382,7 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 					m_inLine[b+5] = 0x3;
 				}
 			}
-			document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+			loadingPage->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));

 			continue;
 		}
@@ -399,7 +432,7 @@ bool LoadT42Format::load(QFile *inFile, TeletextDocument *document)
 				m_inLine[b+2] = d >> 12;
 			}
 		}
-		document->subPage(0)->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
+		loadingPage->setPacket(readPacketNumber, readDesignationCode, QByteArray((const char *)&m_inLine[2], 40));
 	}

 	if (!firstPacket0Found) {
@@ -435,7 +468,7 @@ bool LoadHTTFormat::readPacket()
 }


-bool LoadEP1Format::load(QFile *inFile, TeletextDocument *document)
+bool LoadEP1Format::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash *metadata)
 {
 	m_warnings.clear();
 	m_error.clear();
@@ -444,7 +477,10 @@ bool LoadEP1Format::load(QFile *inFile, TeletextDocument *document)
 	unsigned char inLine[42];
 	unsigned char numOfSubPages = 1;

-	LevelOnePage* loadingPage = document->subPage(0);
+//	subPages.clear();
+	subPages.append(PageBase { } );
+
+	PageBase* loadingPage = &subPages[0];

 	for (;;) {
 		// Read six bytes, will either be a header for a (sub)page
@@ -467,8 +503,18 @@ bool LoadEP1Format::load(QFile *inFile, TeletextDocument *document)
 			return false;

 		// Deal with language code unique to EP1 - unknown values are mapped to English
-		loadingPage->setDefaultCharSet(m_languageCode.key(inLine[2], 0x09) >> 3);
-		loadingPage->setDefaultNOS(m_languageCode.key(inLine[2], 0x09) & 0x7);
+		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
@@ -542,8 +588,8 @@ bool LoadEP1Format::load(QFile *inFile, TeletextDocument *document)
 		if (inFile->read((char *)inLine, 42) != 42)
 			return false;

-		document->insertSubPage(document->numberOfSubPages(), false);
-		loadingPage = document->subPage(document->numberOfSubPages()-1);
+		subPages.append(PageBase { } );
+		loadingPage = &subPages[subPages.size()-1];
 	}
 	return true;
 }
--- a/src/qteletextmaker/loadformats.h
+++ b/src/qteletextmaker/loadformats.h
@@ -23,12 +23,11 @@
 #include <QByteArray>
 #include <QDataStream>
 #include <QFile>
+#include <QList>
 #include <QString>
 #include <QStringList>
-#include <QTextStream>
+#include <QVariant>

-#include "document.h"
-#include "levelonepage.h"
 #include "pagebase.h"

 class LoadFormat
@@ -36,7 +35,7 @@ class LoadFormat
 public:
 	virtual ~LoadFormat() {};

-	virtual bool load(QFile *inFile, TeletextDocument *document) =0;
+	virtual bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) =0;

 	virtual QString description() const =0;
 	virtual QStringList extensions() const =0;
@@ -46,7 +45,6 @@ public:
 	bool reExportWarning() const { return m_reExportWarning; };

 protected:
-	TeletextDocument const *m_document;
 	QStringList m_warnings;
 	QString m_error;
 	bool m_reExportWarning = false;
@@ -55,7 +53,7 @@ protected:
 class LoadTTIFormat : public LoadFormat
 {
 public:
-	bool load(QFile *inFile, TeletextDocument *document) override;
+	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" }; };
@@ -64,7 +62,7 @@ public:
 class LoadT42Format : public LoadFormat
 {
 public:
-	bool load(QFile *inFile, TeletextDocument *document) override;
+	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" }; };
@@ -89,7 +87,7 @@ protected:
 class LoadEP1Format : public LoadFormat
 {
 public:
-	bool load(QFile *inFile, TeletextDocument *document) override;
+	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" }; };
--- a/src/qteletextmaker/main.cpp
+++ b/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.2-beta");
+	QApplication::setApplicationVersion("0.8.1-beta");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();
--- a/src/qteletextmaker/mainwidget.cpp
+++ b/src/qteletextmaker/mainwidget.cpp
@@ -755,17 +755,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;
 	}
--- a/src/qteletextmaker/mainwindow.cpp
+++ b/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,10 +39,13 @@
 #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 "loadformats.h"
@@ -181,6 +186,60 @@ 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);
+
+	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
+	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 +278,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];
-
-	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
-				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);
-			}
-		}
+	// Really could simplify the suffix parameter here...
+	extractImages(scaledImage, suffix != "gif", suffix == "gif");

 	if (suffix == "png") {
 		if (scaledImage[0].save(exportFileName, "PNG"))
@@ -288,10 +292,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 +339,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())));
@@ -346,23 +389,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(m_viewZoom);
+	m_zoomSlider->setValue(zoomSliderInit);
 	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()); } );
@@ -377,6 +471,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); });

@@ -406,6 +502,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);
@@ -422,6 +520,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);
@@ -442,19 +552,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"));
@@ -540,6 +637,11 @@ void MainWindow::createActions()
 	editMenu->addAction(pasteAct);
 	editToolBar->addAction(pasteAct);

+	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

@@ -677,6 +779,46 @@ 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"));
@@ -779,6 +921,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?
@@ -899,6 +1042,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());
@@ -968,65 +1224,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()
@@ -1068,7 +1275,13 @@ void MainWindow::loadFile(const QString &fileName)

 	QApplication::setOverrideCursor(Qt::WaitCursor);

-	if (loadingFormat->load(&file, m_textWidget->document())) {
+	QList<PageBase> subPages;
+	QVariantHash metadata;
+
+	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
@@ -1105,12 +1318,6 @@ void MainWindow::loadFile(const QString &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"); }

@@ -1137,14 +1344,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());
@@ -1156,7 +1355,7 @@ void MainWindow::prependToRecentFiles(const QString &fileName)
 	if (oldRecentFiles != recentFiles)
 		writeRecentFiles(recentFiles, settings);

-	setRecentFilesVisible(!recentFiles.isEmpty());
+	m_recentFileSubMenuAct->setEnabled(!recentFiles.isEmpty());
 }

 void MainWindow::updateRecentFileActions()
@@ -1174,6 +1373,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()
@@ -1431,4 +1639,5 @@ void MainWindow::updatePageWidgets()
 	m_x26DockWidget->loadX26List();
 	m_paletteDockWidget->updateAllColourButtons();
 	m_pageComposeLinksDockWidget->updateWidgets();
+	m_dClutDockWidget->updateAllColourButtons();
 }
--- a/src/qteletextmaker/mainwindow.h
+++ b/src/qteletextmaker/mainwindow.h
@@ -21,15 +21,20 @@
 #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"
@@ -69,12 +74,16 @@ private slots:
 	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);
@@ -89,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:
@@ -98,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);
@@ -115,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;
@@ -122,16 +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_rowZeroAct;
+	QAction *m_drcsSection[2], *m_drcsClear[2], *m_drcsSwap;

 	QLabel *m_subPageLabel, *m_cursorPositionLabel;
 	QToolButton *m_previousSubPageButton, *m_nextSubPageButton;
--- a/src/qteletextmaker/saveformats.cpp
+++ b/src/qteletextmaker/saveformats.cpp
@@ -72,7 +72,7 @@ void SaveFormat::writeSubPageBody(const PageBase &subPage)
 {
 	writeX27Packets(subPage);
 	writeX28Packets(subPage);
-	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage) {
 		writeX26Packets(subPage);
 		writeX1to25Packets(subPage);
 	} else {
@@ -173,7 +173,7 @@ void SaveTTIFormat::writeSubPageStart(const PageBase &subPage, int subPageNumber

 	// Subpage
 	// Magazine Organisation Table and Magazine Inventory Page don't have subpages
-	if (m_document->pageFunction() != TeletextDocument::PFMOT && m_document->pageFunction() != TeletextDocument::PFMIP)
+	if (subPage.pageFunction() != PageBase::PFMOT && subPage.pageFunction() != PageBase::PFMIP)
 		writeString(QString("SC,%1").arg(subPageNumber, 4, 10, QChar('0')));

 	// Status bits
@@ -190,14 +190,14 @@ void SaveTTIFormat::writeSubPageStart(const PageBase &subPage, int subPageNumber

 	writeString(QString("PS,%1").arg(0x8000 | statusBits, 4, 16, QChar('0')));

-	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+	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(m_document->pageFunction()).arg(m_document->packetCoding()));
+		writeString(QString("PF,%1,%2").arg(subPage.pageFunction()).arg(subPage.packetCoding()));
 }

 void SaveTTIFormat::writeSubPageBody(const PageBase &subPage)
@@ -208,7 +208,7 @@ void SaveTTIFormat::writeSubPageBody(const PageBase &subPage)

 	// FLOF links
 	bool writeFLCommand = false;
-	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage && subPage.packetExists(27,0)) {
+	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;
@@ -231,7 +231,7 @@ void SaveTTIFormat::writeSubPageBody(const PageBase &subPage)

 	// Now write the other packets like the rest of writeSubPageBody does
 	writeX28Packets(subPage);
-	if (m_document->pageFunction() == TeletextDocument::PFLevelOnePage) {
+	if (subPage.pageFunction() == PageBase::PFLevelOnePage) {
 		writeX26Packets(subPage);
 		writeX1to25Packets(subPage);
 	} else {
--- a/src/qteletextmaker/x26dockwidget.cpp
+++ b/src/qteletextmaker/x26dockwidget.cpp
@@ -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);
@@ -1059,16 +1059,31 @@ void X26DockWidget::insertTriplet(int modeExt, int row)
 	} else
 		row = 0;

-	// For character triplets, ensure Data is not reserved
-	if (modeExt == 0x21 || modeExt == 0x22 || modeExt == 0x29 || modeExt == 0x2b || modeExt >= 0x2f)
-		newTriplet.setData(0x20);
-	// For Address Row 0, set Address
-	if (modeExt == 0x07)
-		newTriplet.setAddress(63);
-	// For Termination Marker, set Address and Mode
-	if (modeExt == 0x1f) {
-		newTriplet.setAddress(63);
+	// Avoid reserved bits
+	switch (modeExt) {
+		case 0x07: // Address Row 0
+			newTriplet.setAddress(63); // set Address to notreserved
+			break;
+		case 0x18: // DRCS mode
+			newTriplet.setData(0x70); // Normal DRCS at Levels 2.5 and 3.5
+			break;
+		case 0x1f: // Termination Marker
+			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 +1159,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 +1193,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);

--- a/src/qteletextmaker/x26menus.cpp
+++ b/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"));
--- a/src/qteletextmaker/x26menus.h
+++ b/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
--- a/src/qteletextmaker/x26model.cpp
+++ b/src/qteletextmaker/x26model.cpp
@@ -181,7 +181,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");
--- a/src/qteletextmaker/x28commands.cpp
+++ b/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
+}
--- a/src/qteletextmaker/x28commands.h
+++ b/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
Author	SHA1	Message	Date
Gavin MacGregor	6c46aba687	Tag version 0.8.1-beta	2025-10-26 14:20:04 +00:00
Gavin MacGregor	07abbdf928	Fix deeper zooms not being saved properly	2025-10-26 10:53:13 +00:00
Gavin MacGregor	30bff43a14	Restore geometry and state after central widget creation Attempts to fix a bug where the central page editing widget was sometimes squashed to a tiny size in the corner. Also introduces a schema for settings storage. There are no changes in this schema; this is (mis)used to forget the geometry and state when version 0.8.1 is started for the first time to make sure the central widget is usuable again.	2025-10-24 22:49:35 +01:00
Gavin MacGregor	d9c93cfe66	Ensure decoder and gif library are built in	2025-10-21 14:43:02 +01:00
Gavin MacGregor	f18cf60b27	Add Clear Files option to Recent Files	2025-10-19 16:17:52 +01:00
Gavin MacGregor	877478859c	Tag version 0.8-beta	2025-10-14 15:57:49 +01:00
Gavin MacGregor	f4fe4aaa2e	Purge qt_* specific stuff from CMake Appears to solve a spurious qt.conf being installed in bin directory.	2025-10-14 13:22:55 +01:00
Gavin MacGregor	34bff3965b	Add DRCS examples	2025-10-13 21:22:16 +01:00
Gavin MacGregor	6d9c31e7bc	Select Level 3.5 if X/28/1 DCLUT packet is found	2025-10-12 19:14:05 +01:00
Gavin MacGregor	feffca85f8	Add a desktop entry file	2025-10-07 21:32:21 +01:00
Gavin MacGregor	b573ee52b1	Fix CMake deprecation warning Minimum Qt version is now 6.5	2025-10-06 15:45:33 +01:00
Gavin MacGregor	9a17a3624f	Change border from blue to GUI background colour	2025-10-05 21:48:11 +01:00
Gavin MacGregor	3a084e1561	Export region to zxnet editor	2025-09-11 21:14:39 +01:00
Gavin MacGregor	14ee3fb39a	Avoid reserved values when creating G0 diacriticals	2025-08-31 21:53:00 +01:00
Gavin MacGregor	06ca1e13ae	Rename a couple of DRCS widgets	2025-07-29 18:35:23 +01:00
Gavin MacGregor	5b250beedc	Ensure DRCS mode doesn't affect past DRCS characters	2025-07-29 18:04:47 +01:00
Gavin MacGregor	ead6700002	Add transparency to exported images	2025-07-27 14:10:06 +01:00
Gavin MacGregor	4ef0b016aa	Improve appearance of capital letters with diacriticals Added reduced-height Latin G0 capital letters to the font to make room for diacritical marks to sit on top.	2025-07-23 15:20:12 +01:00
Gavin MacGregor	d326748371	Add DCLUT editing	2025-07-20 15:32:13 +01:00
Gavin MacGregor	d8e0a2f3e2	Implement exporting subpage image to clipboard	2025-07-13 19:20:44 +01:00
Gavin MacGregor	dad86a80f4	Fix compiling with Qt 6.9	2025-06-29 13:46:22 +01:00
Gavin MacGregor	541654a7f7	Implement DRCS context menus	2025-06-19 16:10:41 +01:00
Gavin MacGregor	962d308b56	Avoid reserved values when creating DRCS Mode triplets	2025-06-19 11:56:36 +01:00
Gavin MacGregor	ebee613a22	Read DCLUTs from X/28/1 DCLUTs cannot be edited yet.	2025-06-18 12:28:00 +01:00
Gavin MacGregor	0fd581925a	Uncolour mode 1-3 PTUs on monochrome rendering modes	2025-06-16 20:22:37 +01:00
Gavin MacGregor	7f0de4410b	Do some checks for malformed tti files, wrt GH-10	2025-06-15 19:09:52 +01:00
Gavin MacGregor	e574526ca4	Workaround for DRCS menu sections on Windows	2025-06-10 12:45:53 +01:00
Gavin MacGregor	e1ba67484f	Implement DRCS rendering External pages with DRCS definitions can be loaded using the options in the "DRCS pages" submenu within the "View" menu. Two DRCS pages can be loaded, one for Global DRCS definitions and the other for Normal DRCS definitions. Level 2.5 mode 0 PTUs are fully supported. Partial support for Level 3.5 mode 1, 2 and 3 PTUs. DCLUTs defined in X/28/1 on the main page are not yet implemented; the characters currently appear in the default DCLUTs described in D.1.6 and D.2.2 of the ETSI spec.	2025-06-09 18:57:16 +01:00
Gavin MacGregor	519c961cff	Tweak flashing logic	2025-06-01 12:50:33 +01:00
Gavin MacGregor	07c6eed3fe	Add getter for decoder level	2025-05-27 18:39:19 +01:00
Gavin MacGregor	8675cef6c5	Load files into QList of PageBase objects A document is first loaded as a generic PageBase before being converted to level one pages afterwards. This is preparation for loading pages of other types such as DRCS and Public Object Pages. The latter will need further work as the non-TTI file loaders blindly assume X/1 to X/25 are 7-bit odd parity coded. This also reverts `0a1c018` putting back the copy constructor that allows a PageBase to be converted to a LevelOnePage.	2025-05-27 17:34:18 +01:00
Gavin MacGregor	42fd870749	Make setting NOS bits and Fastext links more agnostic Uses generic setControlBit and setPacket instead of the Level One document calls to set the NOS bits and FLOF links.	2025-05-25 22:01:42 +01:00
Gavin MacGregor	041a35a597	Move page function and packet coding	2025-05-25 14:42:03 +01:00
Gavin MacGregor	395f3769cb	Separate metadata loading "Metadata" is data which is stored in a teletext file format but is not part of the page itself, such as DE description and CT cycle time in the TTI file format.	2025-05-25 12:54:14 +01:00
Gavin MacGregor	3f93da8c1a	Fix copy assignment	2025-04-02 19:05:22 +01:00
Gavin MacGregor	cc5219a16b	Move document class	2025-04-02 14:44:30 +01:00