From 536bdf96a8a34be7f84a661af146415b1080383f Mon Sep 17 00:00:00 2001 From: acn Date: Fri, 1 Jun 2018 15:00:57 +0200 Subject: [PATCH 1/3] Dateierweiterung .cept wird jetzt auch akzeptiert --- rtxPage.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rtxPage.py b/rtxPage.py index d1240af..686ac33 100644 --- a/rtxPage.py +++ b/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 From 002774a493d6f07b6855e1b4450daeaf68011b9a Mon Sep 17 00:00:00 2001 From: acn Date: Fri, 1 Jun 2018 15:30:50 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Tag=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/tagliste.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/tagliste.py b/tools/tagliste.py index a6e4d0c..fedc4af 100644 --- a/tools/tagliste.py +++ b/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 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: <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"), ] From a9e0a14158808289cac82c2fc2849d55a93151bd Mon Sep 17 00:00:00 2001 From: acn Date: Fri, 1 Jun 2018 15:35:45 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Seiten=C3=A4nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/0a | 8 +++++++- pages/orig/0a.txt | 7 +++++++ pages/{ => orig}/192111a.txt | 0 pages/{ => orig}/192112a.txt | 0 pages/{ => orig}/192113a.txt | 0 pages/{ => orig}/19211a.txt | 0 pages/{ => orig}/192121a.txt | 0 pages/{ => orig}/192122a.txt | 0 pages/{ => orig}/192123a.txt | 0 pages/{ => orig}/192124a.txt | 0 pages/{ => orig}/192125a.txt | 0 pages/{ => orig}/192126a.txt | 0 pages/{ => orig}/192127a.txt | 0 pages/{ => orig}/192128a.txt | 0 pages/{ => orig}/1921291a.txt | 0 pages/{ => orig}/1921292a.txt | 0 pages/{ => orig}/192129a.txt | 0 pages/{ => orig}/19212a.txt | 0 pages/{ => orig}/192131a.txt | 0 pages/{ => orig}/19213a.txt | 0 pages/{ => orig}/192141a.txt | 0 pages/{ => orig}/192142a.txt | 0 pages/{ => orig}/192143a.txt | 0 pages/{ => orig}/19214a.txt | 0 pages/{ => orig}/1921a.txt | 0 25 files changed, 14 insertions(+), 1 deletion(-) mode change 120000 => 100644 pages/0a create mode 100644 pages/orig/0a.txt rename pages/{ => orig}/192111a.txt (100%) rename pages/{ => orig}/192112a.txt (100%) rename pages/{ => orig}/192113a.txt (100%) rename pages/{ => orig}/19211a.txt (100%) rename pages/{ => orig}/192121a.txt (100%) rename pages/{ => orig}/192122a.txt (100%) rename pages/{ => orig}/192123a.txt (100%) rename pages/{ => orig}/192124a.txt (100%) rename pages/{ => orig}/192125a.txt (100%) rename pages/{ => orig}/192126a.txt (100%) rename pages/{ => orig}/192127a.txt (100%) rename pages/{ => orig}/192128a.txt (100%) rename pages/{ => orig}/1921291a.txt (100%) rename pages/{ => orig}/1921292a.txt (100%) rename pages/{ => orig}/192129a.txt (100%) rename pages/{ => orig}/19212a.txt (100%) rename pages/{ => orig}/192131a.txt (100%) rename pages/{ => orig}/19213a.txt (100%) rename pages/{ => orig}/192141a.txt (100%) rename pages/{ => orig}/192142a.txt (100%) rename pages/{ => orig}/192143a.txt (100%) rename pages/{ => orig}/19214a.txt (100%) rename pages/{ => orig}/1921a.txt (100%) diff --git a/pages/0a b/pages/0a deleted file mode 120000 index 3de59f1..0000000 --- a/pages/0a +++ /dev/null @@ -1 +0,0 @@ -190a \ No newline at end of file diff --git a/pages/0a b/pages/0a new file mode 100644 index 0000000..bc526e0 --- /dev/null +++ b/pages/0a @@ -0,0 +1,7 @@ +/B=1 190a=2 1921a=3 200961a/ +AA 1@# T0@RetroTextBA#!TCA#!T +RetroText Leitseite *0# +EARetroPulsiv ... 1 +FAStadtbibliothek Karlsruhe ... 2 +FAAmiga-Demoseiten ... 3 +WA#!TXg0aXA diff --git a/pages/orig/0a.txt b/pages/orig/0a.txt new file mode 100644 index 0000000..5ec46e2 --- /dev/null +++ b/pages/orig/0a.txt @@ -0,0 +1,7 @@ +1 190a2 1921a3 200961a +<01><01>RetroText<02><01><03><01><2h> +RetroText Leitseite *0# +<05><01>RetroPulsiv ... 1 +<06><01>Stadtbibliothek Karlsruhe ... 2 +<06><01>Amiga-Demoseiten ... 3 +<23><01><24><39>0a diff --git a/pages/192111a.txt b/pages/orig/192111a.txt similarity index 100% rename from pages/192111a.txt rename to pages/orig/192111a.txt diff --git a/pages/192112a.txt b/pages/orig/192112a.txt similarity index 100% rename from pages/192112a.txt rename to pages/orig/192112a.txt diff --git a/pages/192113a.txt b/pages/orig/192113a.txt similarity index 100% rename from pages/192113a.txt rename to pages/orig/192113a.txt diff --git a/pages/19211a.txt b/pages/orig/19211a.txt similarity index 100% rename from pages/19211a.txt rename to pages/orig/19211a.txt diff --git a/pages/192121a.txt b/pages/orig/192121a.txt similarity index 100% rename from pages/192121a.txt rename to pages/orig/192121a.txt diff --git a/pages/192122a.txt b/pages/orig/192122a.txt similarity index 100% rename from pages/192122a.txt rename to pages/orig/192122a.txt diff --git a/pages/192123a.txt b/pages/orig/192123a.txt similarity index 100% rename from pages/192123a.txt rename to pages/orig/192123a.txt diff --git a/pages/192124a.txt b/pages/orig/192124a.txt similarity index 100% rename from pages/192124a.txt rename to pages/orig/192124a.txt diff --git a/pages/192125a.txt b/pages/orig/192125a.txt similarity index 100% rename from pages/192125a.txt rename to pages/orig/192125a.txt diff --git a/pages/192126a.txt b/pages/orig/192126a.txt similarity index 100% rename from pages/192126a.txt rename to pages/orig/192126a.txt diff --git a/pages/192127a.txt b/pages/orig/192127a.txt similarity index 100% rename from pages/192127a.txt rename to pages/orig/192127a.txt diff --git a/pages/192128a.txt b/pages/orig/192128a.txt similarity index 100% rename from pages/192128a.txt rename to pages/orig/192128a.txt diff --git a/pages/1921291a.txt b/pages/orig/1921291a.txt similarity index 100% rename from pages/1921291a.txt rename to pages/orig/1921291a.txt diff --git a/pages/1921292a.txt b/pages/orig/1921292a.txt similarity index 100% rename from pages/1921292a.txt rename to pages/orig/1921292a.txt diff --git a/pages/192129a.txt b/pages/orig/192129a.txt similarity index 100% rename from pages/192129a.txt rename to pages/orig/192129a.txt diff --git a/pages/19212a.txt b/pages/orig/19212a.txt similarity index 100% rename from pages/19212a.txt rename to pages/orig/19212a.txt diff --git a/pages/192131a.txt b/pages/orig/192131a.txt similarity index 100% rename from pages/192131a.txt rename to pages/orig/192131a.txt diff --git a/pages/19213a.txt b/pages/orig/19213a.txt similarity index 100% rename from pages/19213a.txt rename to pages/orig/19213a.txt diff --git a/pages/192141a.txt b/pages/orig/192141a.txt similarity index 100% rename from pages/192141a.txt rename to pages/orig/192141a.txt diff --git a/pages/192142a.txt b/pages/orig/192142a.txt similarity index 100% rename from pages/192142a.txt rename to pages/orig/192142a.txt diff --git a/pages/192143a.txt b/pages/orig/192143a.txt similarity index 100% rename from pages/192143a.txt rename to pages/orig/192143a.txt diff --git a/pages/19214a.txt b/pages/orig/19214a.txt similarity index 100% rename from pages/19214a.txt rename to pages/orig/19214a.txt diff --git a/pages/1921a.txt b/pages/orig/1921a.txt similarity index 100% rename from pages/1921a.txt rename to pages/orig/1921a.txt