From dcfe13a60d4b22e8d1da061da18e5a2e42687c82 Mon Sep 17 00:00:00 2001
From: hackbard <hackbard>
Date: Fri, 21 Mar 2003 01:18:26 +0000
Subject: [PATCH] added shell parser (unfinished) & added resolution info to
 content files

---
 cont2xml            | 103 +++++++++++++++++++++++++++++++++++
 img/bg.png          | Bin 8035 -> 4084 bytes
 img/bg1.png         | Bin 4084 -> 0 bytes
 img/bullet.png      | Bin 178 -> 442 bytes
 wlan1/wlan1-content |   3 ++
 wlan1/wlan1.xml     | 129 ++++++++++++++++++++------------------------
 wlan2/wlan2-content |   2 +
 7 files changed, 166 insertions(+), 71 deletions(-)
 create mode 100755 cont2xml
 delete mode 100644 img/bg1.png

diff --git a/cont2xml b/cont2xml
new file mode 100755
index 0000000..dac9a51
--- /dev/null
+++ b/cont2xml
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+if [ -z "$1" -o -z "$2" ]; then
+	echo "usage: $0 <name.xml> <metafile>"
+	exit 
+fi
+trgfile=$1 ; srcfile=$2
+
+# general
+topic=`grep '#\ T' $srcfile | awk -F^ '{ print $2 }'`
+desc=`grep '#\ D' $srcfile | awk -F^ '{ print $2 }'`
+author=`grep '#\ A' $srcfile | awk -F^ '{ print $2 }'`
+email=`grep '#\ M' $srcfile | awk -F^ '{ print $2 }'`
+event=`grep '#\ E' $srcfile | awk -F^ '{ print $2 }'`
+location=`grep '#\ L' $srcfile | awk -F^ '{ print $2 }'`
+xwidth=`grep '#\ X' $srcfile | awk -F^ '{ print $2 }'`
+ywidth=`grep '#\ Y' $srcfile | awk -F^ '{ print $2 }'`
+
+# information needed to parse contents
+total=`grep '^[0-9]' $srcfile | tail -1 | awk '{ print $1 }'`
+echo "found $total chapters ..."
+((count = 0))
+
+# print normal header
+cat > $trgfile << EOF
+<?xml version='1.0'?>
+
+<slides effect="slide top left, blend"
+        bgcolor="#000000" fgcolor="#FFFFFF" 
+        face="../ttf/decker.ttf" size="15" 
+        bgimage="../img/bg.png" 
+        bullet="../img/bullet.png"
+        screen_width="$xwidth" screen_height="$ywidth">
+
+<slide effect="none">
+<header size="10"></header>
+<header fgcolor="#5080FF" size="80">$topic</header>
+<header size="20"></header>
+<header fgcolor="#5080FF" size="35">$desc</header>
+<header size="40"></header>
+<text>$author</text>
+<text/>
+<text>email: $email</text>
+<text>event: $event</text>
+<text>location: $location</text>
+</slide>
+
+EOF
+
+# contents overview page
+cat >> $trgfile << EOF
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">Inhalt</header>
+<header size="20"></header>
+
+EOF
+while [ "1" ]; do
+	((j = 0))
+	((count += 1))
+	cat >> $trgfile << EOF
+<text size="20">`grep ^${count} $srcfile | awk -F^ '{ print $0 }'`</text>
+<text/>
+EOF
+	grep ^\ ${count}\.[0-9] $srcfile | awk '{ print "<text size=\"20\">"$0"</text>" }' >> $trgfile
+	cat >> $trgfile << EOF
+<text/>
+EOF
+	[ "$count" = "$total" ] && break
+done
+cat >> $trgfile << EOF
+</slide>
+
+EOF
+
+# the conetent
+# to be continued ... ;)
+((count = 0))
+while [ "1" ]; do 
+	((j = 0))
+	((count += 1))
+	echo "creating content chapter $count ..."
+	cat >> $trgfile << EOF
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">`grep ^${count} $srcfile`</header>
+<header size="20"></header>
+</slide>
+
+EOF
+
+#	total_2
+
+# hunz's 1337.pl inserts content here ;)
+
+[ "$count" = "$total" ] && break
+done
+
+
+cat >> $trgfile << EOF
+</slides>
+EOF
+echo "done ..."
diff --git a/img/bg.png b/img/bg.png
index 2846684c462d743bf0f342464596814677560c6a..842e0ca4c12644b1992a62e86b91e999471082ce 100644
GIT binary patch
literal 4084
zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j8911Ll<AG8C?Lg_<n8Xl@E-&h>|H(?D8gCb
z5n0T@z%2yAjF;}#{Q(NHmw5WRvR`JB7S~spy7yH-0|S4fr;B4q#hka-4H*w8FdW!m
z7`-Rs;C_~v0~cK!@AvKe#?HWC@@G9W14BbK572}b2_V5?2qXlOfP}&kAmPx#2$U88
zs$o!M0}@W73P*!yG*OIZh0&5?w0s<`6-Fz~(Wb&^18KBbINE9+?JJD-kVZR@z+8aT
bES$jnDuC_j#www$Kye07S3j3^P6<r_L7A?4

literal 8035
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
J)Du^K{~z*2#0mfa

diff --git a/img/bg1.png b/img/bg1.png
deleted file mode 100644
index 842e0ca4c12644b1992a62e86b91e999471082ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4084
zcmeAS@N?(olHy`uVBq!ia0y~yU;#3j8911Ll<AG8C?Lg_<n8Xl@E-&h>|H(?D8gCb
z5n0T@z%2yAjF;}#{Q(NHmw5WRvR`JB7S~spy7yH-0|S4fr;B4q#hka-4H*w8FdW!m
z7`-Rs;C_~v0~cK!@AvKe#?HWC@@G9W14BbK572}b2_V5?2qXlOfP}&kAmPx#2$U88
zs$o!M0}@W73P*!yG*OIZh0&5?w0s<`6-Fz~(Wb&^18KBbINE9+?JJD-kVZR@z+8aT
bES$jnDuC_j#www$Kye07S3j3^P6<r_L7A?4

diff --git a/img/bullet.png b/img/bullet.png
index 64e562cbf139b218b617c91c74fe1e4dee53f5d8..7e9d445c7a315e881337aac6e63f77024eaf9e07 100644
GIT binary patch
delta 416
zcmV;R0bl;I0lEW_B!32COGiWi{{a60|De66lK=n!32;bRa{vGi!vFvd!vV){sAK>D
z00(qQO+^RO0}dB23uC68(f|MfM@d9MRCt_?(=kh2Q4j^-Pgx;|u%t4jU?-v=Mz=61
zF)1ts?G#JFN(iK}7KCjVF`fQ`)FKAK(k>8K_D_h#TD)S%;(tEZm$z@#fq}=HnRD-%
zdk+6c4Go;J+@_PUm7$&fY2-bXQAZ11M9OBoe2cu+%6t1K;%}Y(-#n~g<OOpQGsQ#3
zaX@{BUz^N5)Dp<<G4rKin8ITDrXyHOGY;jv3fC^?0EIH0hI}~{4J$zeTd#qfkv2S7
z+!l83!?iFr6n~%%S!MAur?4*k914(C1I!A|ji8e#T)qx4Na2U@y|BbD!cjGaQQVZ@
z$!A=x;w!#!iv>&!bl%i(j$KJ4DL%qoA+d*x0>}rC{y8V9v4tMOC*k5v9rW^<zAx(d
zgPv*O^jQa;DjoFl-o77-AT1}lmfmlsa@54LowaFZ(iu|?weu6Ah`KwYpoaVa0000<
KMNUMnLSTZ~X}hKX

delta 150
zcmV;H0BQfa1F`{-B!78HL_t(|+O3nl4Z}bPM&F&3RWgG!jmPpTuH0sZOXEH4;-$ID
za()DU5)Fb65C8|%L7mj5Zrxh<4Sb^q{bKr*Jo`U$r1EJerO)*w#-jowamJ!H;2sos
z6?Fq{L4m!JqylRqf33ih5LnV{OdrxUr+mpXMc?@irM_z?@DB{~y#N3J07*qoM6N<$
Ef~Q_YA^-pY

diff --git a/wlan1/wlan1-content b/wlan1/wlan1-content
index aa59055..3a6aa9a 100644
--- a/wlan1/wlan1-content
+++ b/wlan1/wlan1-content
@@ -5,6 +5,9 @@
 # E^Linuxinfotag 2003
 # L^FH-Augsburg
 
+# X^1024
+# Y^768
+
 1 Einfuehrung
  1.1 Was ist Wireless LAN?
   + Drahtlose Netzwerk Technologie
diff --git a/wlan1/wlan1.xml b/wlan1/wlan1.xml
index 0d43d3f..9e145cb 100644
--- a/wlan1/wlan1.xml
+++ b/wlan1/wlan1.xml
@@ -7,82 +7,69 @@
         bullet="../img/bullet.png"
         screen_width="1024" screen_height="768">
 
-  <slide effect="none">
-    <header size="10"></header>
-    <header fgcolor="#5080FF" size="80">WaveLAN</header>
-    <header size="20"></header>
-    <header fgcolor="#5080FF" size="35">Teil 1: Wireless LAN unter Linux</header>
-    <header size="40"></header>
-    <text>Benedict 'Hunz' Heinz, Frank Zirkelbach</text>
-    <text/>
-    <text>email: hunz@hunz.org, frank@luga.de</text>
-    <text>event: Linuxinfotag 2003</text>
-    <text>location: FH-Augsburg</text>
-  </slide>
+<slide effect="none">
+<header size="10"></header>
+<header fgcolor="#5080FF" size="80">WaveLAN</header>
+<header size="20"></header>
+<header fgcolor="#5080FF" size="35">Teil 1: Wireless LAN unter Linux</header>
+<header size="40"></header>
+<text>Benedikt 'Hunz' Heinz, Frank Zirkelbach</text>
+<text/>
+<text>email: hunz@hunz.org, frank@luga.de</text>
+<text>event: Linuxinfotag 2003</text>
+<text>location: FH-Augsburg</text>
+</slide>
 
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">Inhalt</header>
-    <header size="20"></header>
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">Inhalt</header>
+<header size="20"></header>
 
-   <text size="20">Einleitung</text>
-       <text/>
-        <listitem size="20">Equipment</listitem>
-        <listitem size="20">Reichweite</listitem>
-        <text/>
-   <text size="20">Funktionsweise</text>
-       <text/>
-        <listitem size="20">Channels</listitem>
-        <listitem size="20">Managed Mode</listitem>
-        <listitem size="20">Ad-Hoc Mode</listitem>
-        <listitem size="20">WDS</listitem>
-        <text/>
-   <text size="20">WaveLAN unter Linux</text>
-       <text/>
-        <listitem size="20">Vorraussetzungen</listitem>
-        <listitem size="20">Konfiguration</listitem>
-        <listitem size="20">Master</listitem>
-        <text/>
-   <text size="20">Sicherheit</text>
-       <text/>
-        <text/>
-  </slide>
+<text size="20">1 Einfuehrung</text>
+<text/>
+<text size="20"> 1.1 Was ist Wireless LAN?</text>
+<text size="20"> 1.2 WaveLAN Hardware</text>
+<text/>
+<text size="20">2 Funktionsweise </text>
+<text/>
+<text size="20"> 2.1 Begriffserklaerungen</text>
+<text size="20"> 2.2 Managed Mode</text>
+<text size="20"> 2.3 AdHoc Mode</text>
+<text size="20"> 2.4 WDS</text>
+<text/>
+<text size="20">3 WaveLAN unter Linux</text>
+<text/>
+<text size="20"> 3.1 Vorraussetzungen</text>
+<text size="20"> 3.2 Client Setup</text>
+<text size="20"> 3.3 AP Setup</text>
+<text/>
+<text size="20">4 Sicherheit</text>
+<text/>
+<text/>
+</slide>
 
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">1 Einfuehrung</header>
+<header size="20"></header>
+</slide>
 
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">Einleitung</header>
-    <header size="20"></header>
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">2 Funktionsweise </header>
+<header size="20"></header>
+</slide>
 
-    <text size="20">Equipment</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">Reichweite</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-  </slide>
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">3 WaveLAN unter Linux</header>
+<header size="20"></header>
+</slide>
 
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">Funktionsweise</header>
-    <header size="20"></header>
+<slide>
+<header size="10"></header>
+<header fgcolor="#8080FF" size="35">4 Sicherheit</header>
+<header size="20"></header>
+</slide>
 
-    <text size="20">Channels</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">Managed Mode</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">Ad-Hoc Mode</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">WDS</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-  </slide>
-
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">WaveLAN unter Linux</header>
-    <header size="20"></header>
-
-    <text size="20">Vorraussetzungen</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">Konfiguration</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-    <text size="20">Master</text>         <text/>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <listitem size="20">muster</listitem>         <text/>
-  </slide>
-
-  <slide>
-    <header size="10"></header>
-    <header fgcolor="#8080FF" size="35">Sicherheit</header>
-    <header size="20"></header>
-
-  </slide>
 </slides>
diff --git a/wlan2/wlan2-content b/wlan2/wlan2-content
index 1e90075..7079761 100644
--- a/wlan2/wlan2-content
+++ b/wlan2/wlan2-content
@@ -4,6 +4,8 @@
 # M^hunz@hunz.org, frank@luga.de
 # E^Linuxinfotag 2003
 # L^FH-Augsburg
+# X^1024
+# Y^768
 
 1 802.11b Aufbau
  1.1 Unterschied zu traditionellen Festnetzen 
-- 
2.39.2