From 22a33e055af1e4c9d647ecb24aa377fd8122a7d3 Mon Sep 17 00:00:00 2001 From: phil Date: Sun, 4 Feb 2007 16:12:02 +0000 Subject: [PATCH] * Loeschen der

tags entfernt, andernfalls muessen Absaetze in Lyx per Hand erzeugt werden * Grafik bearbeitet --- .../anonym_surfen_funktion.lyx | 24 + .../bilder/unbearbeitet/tor_funktion01.svg | 2096 +++++++---------- documents/mod_html_files.py | 5 - 3 files changed, 903 insertions(+), 1222 deletions(-) diff --git a/documents/common/anonym_surfen_funktion/anonym_surfen_funktion.lyx b/documents/common/anonym_surfen_funktion/anonym_surfen_funktion.lyx index f4f4555..748244c 100644 --- a/documents/common/anonym_surfen_funktion/anonym_surfen_funktion.lyx +++ b/documents/common/anonym_surfen_funktion/anonym_surfen_funktion.lyx @@ -141,6 +141,30 @@ immer die IP-Adresse des Rechners von dem sie verschickt wurden. \end_layout +\begin_layout Standard +\begin_inset Float figure +wide false +sideways false +status open + +\begin_layout Standard +\begin_inset Graphics + filename bilder/tor_funktion01.png + +\end_inset + + +\end_layout + +\begin_layout Caption +foo +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard \end_layout diff --git a/documents/common/anonym_surfen_funktion/bilder/unbearbeitet/tor_funktion01.svg b/documents/common/anonym_surfen_funktion/bilder/unbearbeitet/tor_funktion01.svg index 9f29888..f245f23 100644 --- a/documents/common/anonym_surfen_funktion/bilder/unbearbeitet/tor_funktion01.svg +++ b/documents/common/anonym_surfen_funktion/bilder/unbearbeitet/tor_funktion01.svg @@ -14,61 +14,65 @@ inkscape:version="0.44.1" sodipodi:version="0.32" id="svg1288" - height="48px" - width="48px"> + height="700" + width="600" + version="1.0" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/tmp/cryptocd_r870/doku/linux/anonym_surfen_funktion/tor_funktion01.png" + inkscape:export-xdpi="111.83" + inkscape:export-ydpi="111.83"> + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + style="fill-rule:evenodd;stroke:black;stroke-width:1pt;marker-start:none" + transform="scale(0.8,0.8)" /> + style="overflow:visible"> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + transform="matrix(1.1,0,0,1.1,1.1,0)" /> + d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z " + style="fill-rule:evenodd;stroke:black;stroke-width:1pt;marker-start:none" + transform="matrix(0.8,0,0,0.8,10,0)" /> @@ -188,141 +192,141 @@ xlink:href="#linearGradient4509" id="linearGradient4088" gradientUnits="userSpaceOnUse" - gradientTransform="translate(11.61632,-1.435348e-16)" - x1="16.364470" + gradientTransform="translate(11.61632,0)" + x1="16.36447" y1="39.918777" - x2="16.364470" + x2="16.36447" y2="30.928421" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> @@ -769,9 +773,9 @@ xlink:href="#linearGradient4386" inkscape:collect="always" /> + y2="117.8271" /> + y2="117.8271" /> + r="8.7662792" /> + y2="92.57093" /> @@ -1211,9 +1215,9 @@ gradientUnits="userSpaceOnUse" y2="53.734985" x2="24.418941" - y1="9.3235140" + y1="9.323514" x1="16.851954" - gradientTransform="matrix(1.208393,0.000000,0.000000,0.984410,-0.789284,-0.503380)" + gradientTransform="matrix(1.208393,0,0,0.98441,-0.789284,-0.50338)" id="linearGradient2313" xlink:href="#linearGradient2307" inkscape:collect="always" /> @@ -1223,7 +1227,7 @@ x2="34.784473" y1="7.2293582" x1="8.6116238" - gradientTransform="matrix(1.129863,0.000000,0.000000,0.885063,-1.625000,-1.304372)" + gradientTransform="matrix(1.129863,0,0,0.885063,-1.625,-1.304372)" id="linearGradient3814" xlink:href="#linearGradient2245" inkscape:collect="always" /> @@ -1417,8 +1421,8 @@ id="linearGradient4226" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.143634,0,0,0.466498,99.61964,-109.5922)" - x1="13.628710" - y1="101.28460" + x1="13.62871" + y1="101.2846" x2="8.6485014" y2="74.098007" /> + r="8.7662792" /> + r="8.7662792" /> + r="8.7662792" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + r="8.7662792" /> + r="8.7662792" /> + r="8.7662792" /> - - - - - - - - - - - - - - - - - - - - - - @@ -4074,7 +3860,7 @@ id="linearGradient12581" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.490236,0,0,0.534297,29.28263,21.67589)" - x1="6.7268200" + x1="6.72682" y1="32.161697" x2="40.938126" y2="32.161697" /> @@ -4114,7 +3900,7 @@ id="linearGradient12589" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.980472,0,0,0.490236,34.67523,22.83397)" - x1="11.500000" + x1="11.5" y1="20.579729" x2="11.779029" y2="14.259961" /> @@ -4124,7 +3910,7 @@ id="linearGradient12609" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.480246,0,0,0.497322,29.22711,23.01153)" - x1="12.886660" + x1="12.88666" y1="4.3602757" x2="20.087339" y2="18.414022" /> @@ -4144,7 +3930,7 @@ id="linearGradient12613" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.490236,0,0,0.534297,29.28263,21.67589)" - x1="6.7268200" + x1="6.72682" y1="32.161697" x2="40.938126" y2="32.161697" /> @@ -4184,7 +3970,7 @@ id="linearGradient12621" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.980472,0,0,0.490236,34.67523,22.83397)" - x1="11.500000" + x1="11.5" y1="20.579729" x2="11.779029" y2="14.259961" /> @@ -4194,7 +3980,7 @@ id="linearGradient12673" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.480246,0,0,0.497322,182.5849,23.01153)" - x1="12.886660" + x1="12.88666" y1="4.3602757" x2="20.087339" y2="18.414022" /> @@ -4214,7 +4000,7 @@ id="linearGradient12677" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.490236,0,0,0.534297,182.6404,21.67589)" - x1="6.7268200" + x1="6.72682" y1="32.161697" x2="40.938126" y2="32.161697" /> @@ -4254,7 +4040,7 @@ id="linearGradient12685" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.980472,0,0,0.490236,188.033,22.83397)" - x1="11.500000" + x1="11.5" y1="20.579729" x2="11.779029" y2="14.259961" /> @@ -4265,9 +4051,9 @@ gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.740165,0,0,0.364942,31.37799,77.64883)" x1="1.6422368" - y1="117.82710" + y1="117.8271" x2="15.343062" - y2="117.82710" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + y2="117.8271" /> + y2="117.8271" /> + y2="26.7868" /> + y2="26.7868" /> + inkscape:grid-points="false" + width="600px" + height="700px" /> @@ -5005,7 +4793,10 @@ id="layer1"> + id="use5658" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> + transform="translate(39.00001,-138)" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> + id="g28509" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> @@ -6009,7 +5806,10 @@ + transform="translate(160,80)" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> @@ -6381,7 +6181,10 @@ + transform="translate(80.00001,160)" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> @@ -6758,12 +6561,20 @@ id="use10621" transform="translate(-80.00001,-1.974087e-6)" width="48" - height="48" /> + height="48" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + id="use12695" + width="48" + height="48" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + height="48" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + height="48" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + height="48" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + sodipodi:nodetypes="cz" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + sodipodi:nodetypes="cz" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + sodipodi:nodetypes="csz" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> + sodipodi:nodetypes="cz" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Alice - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bob - - + id="use11040" + transform="translate(-201.9973,-159.1376)" + inkscape:export-filename="/home/phil/daten/sao/svn/cryptocd/trunk/documents/common/anonym_surfen_funktion/bilder/tor_funktion01.png" + inkscape:export-xdpi="111.93401" + inkscape:export-ydpi="111.93401"> + + + + + + + y="30.703611" + x="17.472397" + height="2.7400389" + width="9.0396729" + id="rect11058" + style="color:black;fill:url(#linearGradient11106);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60872948;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + + + + + + + + + + + + + + + + + + + + + + Bob + + - - Torknoten Torknoten + + + unverschlüsselteVerbindung Verbindung + + + verschlüsselteVerbindung + Alice diff --git a/documents/mod_html_files.py b/documents/mod_html_files.py index c297fa9..59b660d 100644 --- a/documents/mod_html_files.py +++ b/documents/mod_html_files.py @@ -67,14 +67,9 @@ try: # ein Bug-Report ging an die l2html-Mailingliste (29.12.02006) content = string.replace(content, '\n', '\n') - content = string.replace(content, '\n\n

\n', '\n') - content = string.replace(content, '\n\n

\n', '\n') # leere Absaetze in Tabellenelementen entfernen content = string.replace(content, '\n

', '\n') - # Fussnoten finden und Ende ersetzen fussnoten = string.find(content,"


Fußnoten

") startoffset = string.find(content,"",fussnoten)