Merge branch 'master' of https://git.imzadi.de/acn/rtx

pages/0a

@@ -1 +0,0 @@
-190a

pages/0a

@@ -0,0 +1,7 @@
+/B=1 190a=2 1921a=3 200961a/
+AA›1@# T›0@RetroTextBA#!TCA#!T<>
+RetroText Leitseite                 *0#
+EARetroPulsiv               ... 1
+FAStadtbibliothek Karlsruhe ... 2
+FAAmiga-Demoseiten          ... 3
+WA#!T‡Xg0aXA

pages/orig/0a.txt

@@ -0,0 +1,7 @@
+<ResetPar><A>1 190a<A>2 1921a<A>3 200961a</A>
+<go><01><01><cls><ColTab1><Sblue><ColTab0>RetroText<go><02><01><Rblue><go><03><01><Rblue><2h>
+RetroText Leitseite                 *0#
+<go><05><01>RetroPulsiv               ... 1
+<go><06><01>Stadtbibliothek Karlsruhe ... 2
+<go><06><01>Amiga-Demoseiten          ... 3
+<go><23><01><Rblue><white><go><24><39>0a</CEPT>

rtxPage.py

@@ -36,7 +36,7 @@ class rtxPage:
     def exists(page):
         """ checks if the page (i.e. the file) exists """
         for path in config.PAGES:
-            if os.path.isfile(path + page):
+            if os.path.isfile(path + page) or os.path.isfile(path + page + ".cept"):
               return True
         return False
 
@@ -81,6 +81,10 @@ class rtxPage:
                 filename = path + page
                 """ page has been found, now exit the for loop """
                 break
+            if os.path.isfile(path + page + ".cept"):
+                filename = path + page + ".cept"
+                """ page has been found - with .cept extension """
+                break
         else:
             """ page does not exist anywhere, so exit the function """
             return False

tools/tagliste.py

@@ -52,6 +52,10 @@ liste = [
     ## DRCs ablegen:
     (b"DRCinG0", b"\x1b\x28\x20\x40"), (b"DRCinG1", b"\x1b\x29\x20\x40"), (b"DRCinG2", b"\x1b\x2a\x20\x40"), (b"DRCinG3", b"\x1b\x2b\x20\x40"),
 
+    ## Umlaute + Eszett:
+    (b"uml", b"\x19\x48"),  # folgendes Zeichen erhält Umlautpunkte <uml>a => ä
+    (b"sz", b"\x19\xfb"),   # ß
+
     # Steuerzeichen:
     (b"CurL", b"\x08"), (b"CurR", b"\x09"), (b"CurU", b"\x0a"), (b"CurD", b"\x0b"), # Cursor bewegen (left/right/up/down)
     (b"cls", b"\x0c"),      # Clear Screen
@@ -115,6 +119,9 @@ liste = [
     # setzt dort G0 links + G2 rechts, seriell, Farbtafel 0
     (b"Service", b"\x1f\x2f\x40"),  # Sprung in Zeile 24: <Service><24>
     (b"/Service", b"\x1f\x2f\x4f"), # Zurück vom Servicesprung
+
+    # Seite abschließen: gehe zu 24,01, Cursor an
+    (b"/CEPT", b"\x1f\x58\x41\x11\x1a"),
 ]