added shell parser (unfinished) & added resolution info to content files

diff --git a/cont2xml b/cont2xml
new file mode 100755 (executable)
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 (file)
Binary files a/img/bg.png and b/img/bg.png differ

diff --git a/img/bg1.png b/img/bg1.png
deleted file mode 100644 (file)
index 842e0ca..0000000
Binary files a/img/bg1.png and /dev/null differ

diff --git a/img/bullet.png b/img/bullet.png
index 64e562cbf139b218b617c91c74fe1e4dee53f5d8..7e9d445c7a315e881337aac6e63f77024eaf9e07 100644 (file)
Binary files a/img/bullet.png and b/img/bullet.png differ

diff --git a/wlan1/wlan1-content b/wlan1/wlan1-content
index aa59055bafa84427cdc9371766701884283a92f7..3a6aa9a7c18eb124e431adc4bcec22ba3bf3249b 100644 (file)
--- 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 0d43d3f4936135d0988ba1db9be9c5f96d4e16eb..9e145cb5ed5b7b616e092886ede2be48ada40f13 100644 (file)
--- 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 1e90075f9f4b2a7ab8cc9e1f47a4234fc6774ce1..70797615a1caeadceb4960cfc18a4dae6bd23e41 100644 (file)
--- 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