diff --git a/doc/DRCs.ods b/doc/DRCs.ods index ff42cec..2bdd301 100644 Binary files a/doc/DRCs.ods and b/doc/DRCs.ods differ diff --git a/makePages.sh b/makePages.sh new file mode 100755 index 0000000..4ad2669 --- /dev/null +++ b/makePages.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# makePages.sh: part of RetroText by Anna Christina Naß +# released under GPL +# +# erstellt für alle CEPT-Seiten (.cm) CEPT-Dateien (.cept) mit Hilfe von tools/makePage.py +# Quelldateien: pages/src/*.cm +# Zieldateien : pages/*.cept +# +# Dateien werden nur erstellt (und überschrieben), wenn die Zieldatei älter als die +# Quelldatei ist (ähnlich wie bei "make") + +for i in ./pages/src/*.cm; do + src=${i} + dst=./pages/$(basename ${i} .cm).cept + doit=no + if [[ $1 == "-f" ]]; then + doit=yes + fi + + echo -n "${src} -> ${dst}: " + + # Status sammeln und anzeigen + if [[ ( ! -e ${dst} ) ]]; then + echo -n "xx" + doit=yes + elif [[ ( ${src} -nt ${dst} ) ]]; then + echo -n "++" + doit=yes + else + echo -n "--" + fi + + # wenn Ziel nicht existiert oder älter ist, nun Datei neu erzeugen + if [[ ${doit} == "yes" ]]; then + ./tools/makePage.py -i ${src} -o ${dst} + echo " ." + else + echo "" + fi +done diff --git a/pages/0a b/pages/0a.cept similarity index 58% rename from pages/0a rename to pages/0a.cept index 5cc84d0..29189d7 100644 --- a/pages/0a +++ b/pages/0a.cept @@ -1 +1 @@ -/B=11 190a=12 1921a=13 200961a/AA 1@# T0@RetroTextBA#!TCA#!TRetroText LeitseiteCf*0#EARetroPulsiv ... 1FAStadtbibliothek Karlsruhe ... 2GAAmiga-Demoseiten ... 3WA#!TXg0aXA \ No newline at end of file +/B=11 190a=22 1921a=33 200961a/AA 1@# T0@RetroTextBA#!TCA#!TRetroText LeitseiteCf*0#EARetroPulsiv ... 1FAStadtbibliothek Karlsruhe ... 2GAAmiga-Demoseiten ... 3WA#!TXg0aXA \ No newline at end of file diff --git a/pages/19211a.cept b/pages/19211a.cept new file mode 100644 index 0000000..54a6d0d --- /dev/null +++ b/pages/19211a.cept @@ -0,0 +1,3 @@ +/B&!& &16@xxx@``# ( @GB& " 5@&0G&1I&2O&3C#00@@.1@A@C!@G!@O!@_!@0@@'B@G@1`@p@!x@!|@!x@!p@0@@(@A1@A!C!G~!O|O}_x0G@N@N`]p[pwpnHQ|o|~1p@`@``ApCpGpN@P@`@@@=11 192111a=22 192112a=33 192113a=44 192114a=50 1921a/AA 2@# Q0@Stadtbibliothek KarlsruheBA+ @#!W02 Stadt KarlsruheCA#!W46 Stadtbibliothek KAktuell EATermine und VeranstaltungenGARegelmHaig: +Wissen am Donnerstag N... 1E-Book-Reader Sprechstunde H... 2KATermine: +Blickkontakt Frau u. Beruf 16.6. B... 3Lesung Claus Koch 19.6. K... 4WA#!W1@00@ ... ZurHuckXc19211aXA \ No newline at end of file diff --git a/pages/1921a.cept b/pages/1921a.cept new file mode 100644 index 0000000..eb30066 --- /dev/null +++ b/pages/1921a.cept @@ -0,0 +1,3 @@ +/B&!& &16@xxx@``# ( @GB& " 5@&0G&1I&2O&3C#00@@.1@A@C!@G!@O!@_!@0@@'B@G@1`@p@!x@!|@!x@!p@0@@(@A1@A!C!G~!O|O}_x0G@N@N`]p[pwpnHQ|o|~1p@`@``ApCpGpN@P@`@@@# GA#.0'Yf =11 19211a=22 19212a=33 19213a=44 19214a=50 0a/AA 2@# Q0@Stadtbibliothek KarlsruheBA+ @#!W02 Stadt KarlsruheCA#!W46 Stadtbibliothek Cc*1921#EA I2@Herzlich Willkommen!0@GAAktuell .] 1IAStandorte und HOffnungszeiten .H 2Bibliotheksausweis .R 3LAHUber uns: +Stadtbibliothek im Neuen StHandehaus .. 4BibliothekspHadagogik .P 5PAUnsere Angebote: +Online-Medien .W 6Zeitschriften .W 7Vitrine .] 8WA#!W1@00@ . ZurHuckXd1921aXA \ No newline at end of file diff --git a/pages/orig/19211a.txt b/pages/orig/19211a.txt deleted file mode 100644 index 2a80729..0000000 --- a/pages/orig/19211a.txt +++ /dev/null @@ -1,13 +0,0 @@ -Stadtbibliothek Karlsruhe - -Aktuell - -Regelmäßig: -Wissen am Donnerstag ... 1 -E-Book-Reader Sprechstunde ... 2 - -Veranstaltungen: -Blickkontakt Frau u. Beruf 16.6. ... 3 -Lesung Claus Koch 19.6. ... 4 - -0 ... Zurück 19211a diff --git a/pages/orig/1921a.txt b/pages/orig/1921a.txt deleted file mode 100644 index 7152123..0000000 --- a/pages/orig/1921a.txt +++ /dev/null @@ -1,14 +0,0 @@ -Stadtbibliothek Karlsruhe - -Herzlich Willkommen! - -Aktuell ... 1 -Standorte und Öffnungszeiten ... 2 -Bibliotheksausweis ... 3 -Stadtbibliothek im Neuen Ständehaus ... 4 -Bibliothekspädagogik ... 5 -Online-Medien ... 6 -Zeitschriften ... 7 -Vitrine ... 8 - -1921a diff --git a/pages/orig/test1.txt b/pages/src/0a.cm similarity index 64% rename from pages/orig/test1.txt rename to pages/src/0a.cm index 0c34df1..1d03a60 100644 --- a/pages/orig/test1.txt +++ b/pages/src/0a.cm @@ -1,11 +1,7 @@ - - -11 190a12 1921a13 200961a +11 190a22 1921a33 200961a <01><01>RetroText<02><01><03><01><2h> RetroText Leitseite<03><38><2h>*0# <05><01>RetroPulsiv ... 1 <06><01>Stadtbibliothek Karlsruhe ... 2 <07><01>Amiga-Demoseiten ... 3 -<10><01><2w>02 -<11><01><2w>46 <23><01><24><39>0a diff --git a/pages/orig/192111a.txt b/pages/src/192111a.txt similarity index 100% rename from pages/orig/192111a.txt rename to pages/src/192111a.txt diff --git a/pages/orig/192112a.txt b/pages/src/192112a.txt similarity index 100% rename from pages/orig/192112a.txt rename to pages/src/192112a.txt diff --git a/pages/orig/192113a.txt b/pages/src/192113a.txt similarity index 100% rename from pages/orig/192113a.txt rename to pages/src/192113a.txt diff --git a/pages/src/19211a.cm b/pages/src/19211a.cm new file mode 100644 index 0000000..41ce4e1 --- /dev/null +++ b/pages/src/19211a.cm @@ -0,0 +1,14 @@ + +11 192111a22 192112a33 192113a44 192114a50 1921a +<01><01>Stadtbibliothek Karlsruhe +<02><01><2w>02 Stadt Karlsruhe +<03><01><2w>46 Stadtbibliothek <11><2h>Aktuell +<05><01>Termine und Veranstaltungen +<07><01>Regelmaig:
+Wissen am Donnerstag <14>... 1 +E-Book-Reader Sprechstunde <08>... 2 +<11><01>Termine:
+Blickkontakt Frau u. Beruf 16.6. <02>... 3 +Lesung Claus Koch 19.6. <11>... 4 +<23><01>0 ... Zuruck +<24><35>19211a diff --git a/pages/orig/192121a.txt b/pages/src/192121a.txt similarity index 100% rename from pages/orig/192121a.txt rename to pages/src/192121a.txt diff --git a/pages/orig/192122a.txt b/pages/src/192122a.txt similarity index 100% rename from pages/orig/192122a.txt rename to pages/src/192122a.txt diff --git a/pages/orig/192123a.txt b/pages/src/192123a.txt similarity index 100% rename from pages/orig/192123a.txt rename to pages/src/192123a.txt diff --git a/pages/orig/192124a.txt b/pages/src/192124a.txt similarity index 100% rename from pages/orig/192124a.txt rename to pages/src/192124a.txt diff --git a/pages/orig/192125a.txt b/pages/src/192125a.txt similarity index 100% rename from pages/orig/192125a.txt rename to pages/src/192125a.txt diff --git a/pages/orig/192126a.txt b/pages/src/192126a.txt similarity index 100% rename from pages/orig/192126a.txt rename to pages/src/192126a.txt diff --git a/pages/orig/192127a.txt b/pages/src/192127a.txt similarity index 100% rename from pages/orig/192127a.txt rename to pages/src/192127a.txt diff --git a/pages/orig/192128a.txt b/pages/src/192128a.txt similarity index 100% rename from pages/orig/192128a.txt rename to pages/src/192128a.txt diff --git a/pages/orig/1921291a.txt b/pages/src/1921291a.txt similarity index 100% rename from pages/orig/1921291a.txt rename to pages/src/1921291a.txt diff --git a/pages/orig/1921292a.txt b/pages/src/1921292a.txt similarity index 100% rename from pages/orig/1921292a.txt rename to pages/src/1921292a.txt diff --git a/pages/orig/192129a.txt b/pages/src/192129a.txt similarity index 100% rename from pages/orig/192129a.txt rename to pages/src/192129a.txt diff --git a/pages/orig/19212a.txt b/pages/src/19212a.txt similarity index 100% rename from pages/orig/19212a.txt rename to pages/src/19212a.txt diff --git a/pages/orig/192131a.txt b/pages/src/192131a.txt similarity index 100% rename from pages/orig/192131a.txt rename to pages/src/192131a.txt diff --git a/pages/orig/19213a.txt b/pages/src/19213a.txt similarity index 100% rename from pages/orig/19213a.txt rename to pages/src/19213a.txt diff --git a/pages/orig/192141a.txt b/pages/src/192141a.txt similarity index 100% rename from pages/orig/192141a.txt rename to pages/src/192141a.txt diff --git a/pages/orig/192142a.txt b/pages/src/192142a.txt similarity index 100% rename from pages/orig/192142a.txt rename to pages/src/192142a.txt diff --git a/pages/orig/192143a.txt b/pages/src/192143a.txt similarity index 100% rename from pages/orig/192143a.txt rename to pages/src/192143a.txt diff --git a/pages/orig/19214a.txt b/pages/src/19214a.txt similarity index 100% rename from pages/orig/19214a.txt rename to pages/src/19214a.txt diff --git a/pages/src/1921a.cm b/pages/src/1921a.cm new file mode 100644 index 0000000..dc46c37 --- /dev/null +++ b/pages/src/1921a.cm @@ -0,0 +1,23 @@ + +11 19211a22 19212a33 19213a44 19214a50 0a +<01><01>Stadtbibliothek Karlsruhe +<02><01><2w>02 Stadt Karlsruhe +<03><01><2w>46 Stadtbibliothek <03><35><2h>*1921# + +<05><01> <09>Herzlich Willkommen! + +<07><01>Aktuell .<29> 1 +<09><01>Standorte und Offnungszeiten .<08> 2 +Bibliotheksausweis .<18> 3 + +<12><01>Uber uns:
+Stadtbibliothek im Neuen Standehaus .. 4 +Bibliothekspadagogik .<16> 5 + +<16><01>Unsere Angebote:
+Online-Medien .<23> 6 +Zeitschriften .<23> 7 +Vitrine .<29> 8 + +<23><01>0 . Zuruck +<24><36>1921a diff --git a/pages/src/test1a.cm b/pages/src/test1a.cm new file mode 100644 index 0000000..d262886 --- /dev/null +++ b/pages/src/test1a.cm @@ -0,0 +1,9 @@ + +10 0a11 1921a +<01><01>RetroText<02><01><03><01><2h> +RetroText Testseite + +<10><02>: !"#$%&'()*+,-./0123456789:;: +<09><02>: !"#$%&'()*+,-./0123456789:;: + +<23><01><24><35>test1a diff --git a/pages/orig/0a.txt b/pages/templates/rtx.cm similarity index 100% rename from pages/orig/0a.txt rename to pages/templates/rtx.cm diff --git a/pages/templates/stadtbibliothek.cm b/pages/templates/stadtbibliothek.cm new file mode 100644 index 0000000..cf21bb0 --- /dev/null +++ b/pages/templates/stadtbibliothek.cm @@ -0,0 +1,9 @@ + +11 19211a22 19212a33 19213a44 19214a50 0a +<01><01>Stadtbibliothek Karlsruhe +<02><01><2w>02 Stadt Karlsruhe +<03><01><2w>46 Stadtbibliothek <03><35><2h>*1921# +<05><01> ... + +<23><01>0 . Zuruck +<24><36>1921a diff --git a/pages/test1a.cept b/pages/test1a.cept index 9c22790..656a1b3 100644 --- a/pages/test1a.cept +++ b/pages/test1a.cept @@ -1 +1 @@ -/B# ( @GB& " 5@&0G&1I&2O&3C#00@@.1@A@C!@G!@O!@_!@0@@'B@G@1`@p@!x@!|@!x@!p@0@@&@A"1@A!C!G~!O|O}_x0G@N@N`]p{pgp^Hq|O|~1p@`@!ApCpGp^@p@@@!=11 190a=12 1921a=13 200961a/AA 1@# T0@RetroTextBA#!TCA#!TRetroText LeitseiteCf*0#EARetroPulsiv ... 1FAStadtbibliothek Karlsruhe ... 2GAAmiga-Demoseiten ... 3JA* @n02KA46WA#!TXg0aXA \ No newline at end of file +/B# ( @GA#!0@@@@CL@p@pOpqp|p@0@@@@@@@@@@CpO|0@@@@p@L@C|CCcOC@C0pOppppp@L@C@@@@0O|O|ss|O@@@@@@@@0|CCCCC@C@Lp@@@@=10 0a=11 1921a/AA 1@# W0@RetroTextBA#!TCA#!TRetroText TestseiteJB:( @ !"#$%&'()*+,-./0123456789:;(@:IB: !"#$%&'()*+,-./0123456789:;:WA#!TXctest1aXA \ No newline at end of file diff --git a/tools/drcs.py b/tools/drcs.py index 4af61d1..7010a41 100644 --- a/tools/drcs.py +++ b/tools/drcs.py @@ -13,10 +13,10 @@ pyramide = ( # 4 Zeichen, 4farbig b"\x31" b"\x40\x41\x40\x43\x21\x40\x47\x21\x40\x4f\x21\x40\x5f\x21\x40\x7f" b"\x30" b"\x40\x40\x27\x42\x40\x47\x40" b"\x31" b"\x60\x40\x70\x40\x21\x78\x40\x21\x7c\x40\x21\x78\x40\x21\x70\x40" - b"\x30" b"\x40\x40\x26\x40\x41\x22" + b"\x30" b"\x40\x40\x28\x40\x41" b"\x31" b"\x40\x7f\x41\x7f\x21\x43\x7f\x21\x47\x7e\x21\x4f\x7c\x4f\x7d\x5f\x78" - b"\x30" b"\x47\x40\x4e\x40\x4e\x60\x5d\x70\x7b\x70\x67\x70\x5e\x48\x71\x7c\x4f\x7c\x7f\x7e" - b"\x31" b"\x70\x40\x60\x40\x21\x41\x70\x43\x70\x47\x70\x5e\x40\x70\x40\x40\x40\x21" + b"\x30" b"\x47\x40\x4E\x40\x4E\x60\x5D\x70\x5B\x70\x77\x70\x6E\x48\x51\x7C\x6F\x7C\x7F\x7E" + b"\x31" b"\x70\x40\x60\x40\x60\x60\x41\x70\x43\x70\x47\x70\x4E\x40\x50\x40\x60\x40\x40\x40" ) colorpyramide = ( @@ -25,12 +25,38 @@ colorpyramide = ( b"\x1f\x26\x32\x4f" b"\x1f\x26\x33\x43" ) + +btxlogo = ( + b"\x1F\x23\x21" + b"\x30\x40\x40\x40\x40\x43\x7F\x4C\x40\x70\x40\x70\x4F\x70\x7F\x71\x7F\x70\x7C\x70\x40" + b"\x30\x40\x40\x40\x40\x7F\x7F\x40\x40\x40\x40\x7F\x7F\x7F\x7F\x40\x40\x43\x70\x4F\x7C" + b"\x30\x40\x40\x40\x40\x7F\x70\x40\x4C\x40\x43\x7C\x43\x7F\x43\x7F\x63\x4F\x43\x40\x43" + b"\x30\x70\x4F\x70\x7F\x70\x7F\x70\x7F\x70\x7F\x70\x40\x4C\x40\x43\x7F\x40\x40\x40\x40" + b"\x30\x4F\x7C\x4F\x7C\x73\x73\x7C\x4F\x7F\x7F\x40\x40\x40\x40\x7F\x7F\x40\x40\x40\x40" + b"\x30\x7C\x43\x7F\x43\x7F\x43\x7F\x43\x7F\x43\x40\x43\x40\x4C\x7F\x70\x40\x40\x40\x40" +) + +# "..." auf "." (2e) +ellipse = ( b"\x1f\x23\x2e" b"\x30\x27\x59\x66\x20" ) + +# Farbtafel 2 (Farbe Nr. 16-19): +alternativefarben = ( + b"\x1F\x26\x20\x1F\x26\x31\x36" # init + Start ab 16 + b"\x7F\x40\x78\x78\x78\x40\x60\x60" # Farben 0-3 +) liste = [ (b"reset_12x10_4c", b"\x1f\x23\x20\x28\x20\x40\x47\x42"), (b"reset_12x10_2c", b"\x1f\x23\x20\x28\x20\x40\x47\x41"), - (b"Dcolorstart", b"\x1f\x26\x20\x22\x20\x35\x40"), - (b"Dcolorpyramide", colorpyramide), + (b"Dstart_12x10_4c", b"\x1f\x23\x20\x47\x42"), + (b"Dstart_12x10_2c", b"\x1f\x23\x20\x47\x41"), + (b"Dcolorstart", b"\x1f\x26\x20\x22\x20\x35\x40"), # Änderung der Farbtafel folgt + (b"Dcolorpyramide", colorpyramide), # ...hiermit (b"Dpyramide", pyramide), + (b"Dbtxlogo", btxlogo), + (b"Dellipse", ellipse), + + (b"Creset", b"\x1f\x26\x21"), + (b"Calt2", alternativefarben), ] diff --git a/tools/tagliste.py b/tools/tagliste.py index fedc4af..1860f46 100644 --- a/tools/tagliste.py +++ b/tools/tagliste.py @@ -52,14 +52,15 @@ 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: + ## Umlaute + Eszett: -- dafür muß G2 in G2 liegen! (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"CurL", b"\x08"), (b"CurR", b"\x09"), (b"CurU", b"\x0b"), (b"CurD", b"\x0a"), # Cursor bewegen (left/right/up/down) (b"cls", b"\x0c"), # Clear Screen (b"CR", b"\x0d"), # Cursor zum Zeilenanfang (CR) + (b"br", b"\x0d\x0a"), # "CRLF" (b"Cursor", b"\x11"), # Cursor sichtbar (b"/Cursor", b"\x14"), # Cursor unsichtbar (b"blink", b"\x88"), # Blinken an @@ -76,7 +77,7 @@ liste = [ (b"/u", b"\x99"), # Unterstreichen aus # Zeichenwiederholung: x<03> => wiederholt x 3x => xxxx # TODO: evtl. noch mehr Zahlenwerte einfügen - aktuell nur bis 40 (s.o.) - (b"Rep", b"\x12"), + (b"rep", b"\x12"), # für ganze Zeile gültige Attribute: (b"Lu", b"\x1b\x23\x21\x5a"), # unterstreichen @@ -96,12 +97,21 @@ liste = [ # Farben Vordergrund (par) / G1-Satz (ser) (b"black", b"\x80"), (b"red", b"\x81"), (b"green", b"\x82"), (b"yellow", b"\x83"), (b"blue", b"\x84"), (b"magenta", b"\x85"), (b"cyan", b"\x86"), (b"white", b"\x87"), + # Alternativ: Referenz per Nummer: + (b"c0", b"\x80"), (b"c1", b"\x81"), (b"c2", b"\x82"), (b"c3", b"\x83"), + (b"c4", b"\x84"), (b"c5", b"\x85"), (b"c6", b"\x86"), (b"c7", b"\x87"), # Farben Hintergrund (background; par) / L-Satz (ser) (b"Bblack", b"\x90"), (b"Bred", b"\x91"), (b"Bgreen", b"\x92"), (b"Byellow", b"\x93"), (b"Bblue", b"\x94"), (b"Bmagenta", b"\x95"), (b"Bcyan", b"\x96"), (b"Bwhite", b"\x97"), + # Alternativ: Referenz per Nummer: + (b"Bc0", b"\x90"), (b"Bc1", b"\x91"), (b"Bc2", b"\x92"), (b"Bc3", b"\x93"), + (b"Bc4", b"\x94"), (b"Bc5", b"\x95"), (b"Bc6", b"\x96"), (b"Bc7", b"\x97"), # Hintergrundfarbe für ganzen Bildschirm: (Screen) (b"Sblack", b"\x1b\x23\x20\x50"), (b"Sred", b"\x1b\x23\x20\x51"), (b"Sgreen", b"\x1b\x23\x20\x52"), (b"Syellow", b"\x1b\x23\x20\x53"), (b"Sblue", b"\x1b\x23\x20\x54"), (b"Smagenta", b"\x1b\x23\x20\x55"), (b"Scyan", b"\x1b\x23\x20\x56"), (b"Swhite", b"\x1b\x23\x20\x57"), + # Alternativ: Referenz per Nummer: + (b"Sc0", b"\x1b\x23\x20\x50"), (b"Sc1", b"\x1b\x23\x20\x51"), (b"Sc2", b"\x1b\x23\x20\x52"), (b"Sc3", b"\x1b\x23\x20\x53"), + (b"Sc4", b"\x1b\x23\x20\x54"), (b"Sc5", b"\x1b\x23\x20\x55"), (b"Sc6", b"\x1b\x23\x20\x56"), (b"Sc7", b"\x1b\x23\x20\x57"), # Hintergrundfarbe für ganze Zeile (mit Rand): (b"Rblack", b"\x1b\x23\x21\x50"), (b"Rred", b"\x1b\x23\x21\x51"), (b"Rgreen", b"\x1b\x23\x21\x52"), (b"Ryellow", b"\x1b\x23\x21\x53"), (b"Rblue", b"\x1b\x23\x21\x54"), (b"Rmagenta", b"\x1b\x23\x21\x55"), (b"Rcyan", b"\x1b\x23\x21\x56"), (b"Rwhite", b"\x1b\x23\x21\x57"),