diff --git a/bin/extract-glyph.sh b/bin/extract-glyph.sh index 601d9ef..35393ac 100755 --- a/bin/extract-glyph.sh +++ b/bin/extract-glyph.sh @@ -1,35 +1,85 @@ #!/bin/bash . setenv.sh - -if [ -z "$1" ]; then - echo "please give a .svg file of a glyph as input" +if [ -z "$PICCREATE" ]; then + echo "please source the environment" exit 1 fi -if [ -s "$1" ]; then - export BASE=`basename $1 .svg` + +O_ARGS=0 +E_OPTERROR=85 + +USAGE="create a jpg file with the purl inside +Usage: `basename $0` [-hie] + -i id + -e extract + Examples: + to test the glyph later with inkscape: + `basename $0` -i ../in/buchstabe_a.svg + to extract the points and text from the glyph: + `basename $0` -i ../in/buchstabe_a.svg -e " + + +while getopts "i:eu:" Option +do + case $Option in + i) ID=$OPTARG;; + e) EXTRACT=$OPTARG;; + *) echo "$USAGE" >&2; exit 1; # Default. + esac +done + +shift $(($OPTIND - 1)) + +if [ -z $ID ] ; then + echo "-> no id/filename given" + echo "$USAGE" >&2 + exit 1 +fi + +if [ -z "$ID" ]; then + echo "please give a .svg file of a glyph as input" + echo "$USAGE" >&2 + exit 1 +fi +if [ -s "$ID" ]; then + export BASE=`basename $ID .svg` export TARGET=$PICCREATE_OUT/$BASE.svg else echo "input file does not exist" + echo "$USAGE" >&2 exit 1 fi # extrahiere die wichtigen Zeilen aus dem Font -cat $1 | egrep '<\|x1|x2|y1|y2|/>|style' | egrep -v '\|id=|http:' > line-$BASE.svg -cat $1 | egrep 'circle|translate|\' > circles-$BASE.svg -cat $1 | egrep '<\>|\=|\=|tspan' | egrep -v '\|\=' > text-$BASE.svg +cat $ID | egrep '<\|x1|x2|y1|y2|/>|style' | egrep -v '\|id=|http:' > line-$BASE.svg +cat $ID | egrep 'circle|translate|\' > circles-$BASE.svg +cat $ID | egrep '<\>|\=|\=|tspan|style|preserve' | egrep -v '\|\=' > text-$BASE.svg # reduziere einige Zeilen um bestimmte Muster cat line-$BASE.svg | sed -e 's/inkscape:transform-center-x=".*"//g' > $$; mv $$ line-$BASE.svg cat text-$BASE.svg | sed -e 's/inkscape:transform-center-y=".*"//g' > $$; mv $$ text-$BASE.svg -# schreib einen neuen Buchstaben - echo '' > $TARGET -cat text-$BASE.svg >> $TARGET -cat circles-$BASE.svg >> $TARGET -cat line-$BASE.svg >> $TARGET - echo '' >> $TARGET + +if [ -z "$EXTRACT" ]; +then + # schreib einen kompletten neuen Buchstaben zum testen + echo '' > $TARGET + cat text-$BASE.svg >> $TARGET + cat circles-$BASE.svg >> $TARGET + cat line-$BASE.svg >> $TARGET + echo '' >> $TARGET +else + # schreib nur das extract zur Verwertung als Font in die Ausgabe + touch $TARGET + cat text-$BASE.svg >> $TARGET + cat circles-$BASE.svg >> $TARGET + cat line-$BASE.svg >> $TARGET +fi rm line-$BASE.svg rm circles-$BASE.svg rm text-$BASE.svg + + + diff --git a/bin/fontgen.sh b/bin/fontgen.sh index 341a2ff..dbe7774 100755 --- a/bin/fontgen.sh +++ b/bin/fontgen.sh @@ -5,8 +5,8 @@ if [ -z "$1" ]; then echo "please give a directory in the templates folder with .svg glyphs as input" exit 1 fi -if [ -d "$PICCREATE_TEMPLATES/$1" ]; then - export SOURCE="$PICCREATE_TEMPLATES/$1" +if [ -d "$PICCREATE_IN/$1" ]; then + export SOURCE="$PICCREATE_IN/$1" elif [ ! -d "$1" ]; then export SOURCE="$1" else @@ -19,6 +19,6 @@ export TARGET=$PICCREATE_OUT for i in `ls $SOURCE/*.svg` do echo `basename $i .svg` - $PICCREATE_BIN/extract-glyph.sh $i + $PICCREATE_BIN/extract-glyph.sh -i $i -e done diff --git a/bin/fonttest.sh b/bin/fonttest.sh new file mode 100755 index 0000000..b666235 --- /dev/null +++ b/bin/fonttest.sh @@ -0,0 +1,24 @@ +#!/bin/bash +. setenv.sh + +if [ -z "$1" ]; then + echo "please give a directory in the templates folder with .svg glyphs as input" + exit 1 +fi +if [ -d "$PICCREATE_IN/$1" ]; then + export SOURCE="$PICCREATE_IN/$1" +elif [ ! -d "$1" ]; then + export SOURCE="$1" +else + echo "directory does not exist" + echo "please give a directory with .svg files as input" + exit 1 +fi +export TARGET=$PICCREATE_OUT + +for i in `ls $SOURCE/*.svg` +do + echo `basename $i .svg` + $PICCREATE_BIN/extract-glyph.sh -i $i +done + diff --git a/bin/meltpics.sh b/bin/meltpics.sh deleted file mode 100755 index a5ffa73..0000000 --- a/bin/meltpics.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -. setenv.sh - -# Startet das Programm -python $MAPSGEN_LIBS/melt.py "$@" diff --git a/bin/setenv.sh b/bin/setenv.sh index f89f450..5631615 100755 --- a/bin/setenv.sh +++ b/bin/setenv.sh @@ -12,7 +12,7 @@ echo setting environment to $PICCREATE export PICCREATE_BIN=$PICCREATE/bin export PICCREATE_CFG=$PICCREATE/cfg export PICCREATE_LIBS=$PICCREATE/libs -export PICCREATE_TEMPLATES=$PICCREATE/templates +export PICCREATE_FONTS=$PICCREATE/fonts export PICCREATE_IN=$PICCREATE/in export PICCREATE_OUT=$PICCREATE/out export PICCREATE_BACKGROUNDS=$PICCREATE/backgrounds diff --git a/cfg/punkteraetsel.cfg b/cfg/punkteraetsel.cfg new file mode 100644 index 0000000..82664ae --- /dev/null +++ b/cfg/punkteraetsel.cfg @@ -0,0 +1,18 @@ +# wie gross soll das Bild werden +[globals] +width=1200 +height=1200 +content=PunkteName + + +# Die Eingabedatei sieht so aus +[translation] +customerid=Kennummer +name = Name + +# das ist der erste und einzige Inhalt +[PunkteName] +content=${name} +x=10 +y=20 +font=ausgangsschrift diff --git a/templates/ausgangsschrift/A.svg b/fonts/ausgangsschrift/A.svg old mode 100755 new mode 100644 similarity index 55% rename from templates/ausgangsschrift/A.svg rename to fonts/ausgangsschrift/A.svg index d7e3053..b2f29c5 --- a/templates/ausgangsschrift/A.svg +++ b/fonts/ausgangsschrift/A.svg @@ -1,66 +1,10 @@ - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -69,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="200.89583" y="158.22198" - id="text3015-47" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 @@ -82,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="221.76686" y="163.20168" - id="text3015-9" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -95,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="225.31007" y="174.13638" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -108,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="228.12384" y="98.253494" - id="text3015-48" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -121,73 +49,34 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="252.39076" y="142.54791" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 - + inkscape:window-maximized="1" /> + diff --git a/templates/ausgangsschrift/a-mit-strichen-gruppe.svg b/fonts/ausgangsschrift/a-mit-strichen-gruppe.svg old mode 100755 new mode 100644 similarity index 62% rename from templates/ausgangsschrift/a-mit-strichen-gruppe.svg rename to fonts/ausgangsschrift/a-mit-strichen-gruppe.svg index 1baef95..6180872 --- a/templates/ausgangsschrift/a-mit-strichen-gruppe.svg +++ b/fonts/ausgangsschrift/a-mit-strichen-gruppe.svg @@ -1,89 +1,6 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - + x7 x5 x4 x1 x6 x11 x2 x3 x10 x9 x8 + style="stroke:#000000;stroke-width:0.13342249;stroke-miterlimit:0;stroke-dasharray:0.13342249, 0.26684497;stroke-dashoffset:0.106738" + style="stroke:#000000;stroke-width:0.15235361;stroke-miterlimit:0;stroke-dasharray:0.1523536, 0.3047072;stroke-dashoffset:0.12188288" + style="stroke:#000000;stroke-width:0.10166549;stroke-miterlimit:0;stroke-dasharray:0.10166548, 0.20333097;stroke-dashoffset:0.08133238" + style="stroke:#000000;stroke-width:0.125;stroke-miterlimit:0;stroke-dasharray:0.5,1;stroke-dashoffset:0.4125" + style="stroke:#000000;stroke-width:0.0988466;stroke-miterlimit:0;stroke-dasharray:0.0988466, 0.19769319;stroke-dashoffset:0.07907728" + style="stroke:#000000;stroke-width:0.11192988;stroke-miterlimit:0;stroke-dasharray:0.11192986, 0.22385973;stroke-dashoffset:0.08954389" + + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + transform="translate(82.909293,126.34101)" /> + transform="translate(67.427682,129.29941)" /> + transform="translate(49.497475,129.29941)" /> + transform="translate(40.670943,115.19316)" /> + transform="translate(47.603439,97.389219)" /> + transform="translate(57.578696,90.933613)" /> + transform="translate(69.953064,99.78833)" /> transform="translate(66.038723,116.70839)" /> - - diff --git a/templates/ausgangsschrift/a-mit-strichen.svg b/fonts/ausgangsschrift/a-mit-strichen.svg old mode 100755 new mode 100644 similarity index 59% rename from templates/ausgangsschrift/a-mit-strichen.svg rename to fonts/ausgangsschrift/a-mit-strichen.svg index bde7390..2db7e7a --- a/templates/ausgangsschrift/a-mit-strichen.svg +++ b/fonts/ausgangsschrift/a-mit-strichen.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x7 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="37.793247" y="119.00378" - id="text3015" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="40.912228" y="135.10689" - id="text3015-47" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="50.013733" y="82.1017" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x1 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="45.571537" y="95.718819" - id="text3015-48" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -148,11 +49,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="86.71936" y="132.11322" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x11 @@ -161,11 +58,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="70.697723" y="94.033546" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -174,11 +67,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="63.370907" y="112.04263" - id="text3015-47-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -187,11 +76,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="69.013687" y="141.04482" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x10 @@ -200,11 +85,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="51.226109" y="123.90285" - id="text3015-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x9 @@ -213,92 +94,46 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="73.631706" y="109.43014" - id="text3015-0-98" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 + style="stroke:#000000;stroke-width:0.13342249;stroke-miterlimit:0;stroke-dasharray:0.13342249, 0.26684497;stroke-dashoffset:0.106738" + style="stroke:#000000;stroke-width:0.15235361;stroke-miterlimit:0;stroke-dasharray:0.1523536, 0.3047072;stroke-dashoffset:0.12188288" + style="stroke:#000000;stroke-width:0.10166549;stroke-miterlimit:0;stroke-dasharray:0.10166548, 0.20333097;stroke-dashoffset:0.08133238" + style="stroke:#000000;stroke-width:0.12528136;stroke-miterlimit:0;stroke-dasharray:0.12528135, 0.25056272;stroke-dashoffset:0.10022508" + style="stroke:#000000;stroke-width:0.0988466;stroke-miterlimit:0;stroke-dasharray:0.0988466, 0.19769319;stroke-dashoffset:0.07907728" + style="stroke:#000000;stroke-width:0.11192988;stroke-miterlimit:0;stroke-dasharray:0.11192986, 0.22385973;stroke-dashoffset:0.08954389" + /> + /> + /> + /> + /> - + /> diff --git a/templates/ausgangsschrift/a.svg b/fonts/ausgangsschrift/a.svg old mode 100755 new mode 100644 similarity index 54% rename from templates/ausgangsschrift/a.svg rename to fonts/ausgangsschrift/a.svg index e28e7ac..8f88075 --- a/templates/ausgangsschrift/a.svg +++ b/fonts/ausgangsschrift/a.svg @@ -1,308 +1,146 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x7 - x5 x4 x1 x6 x11 x2 x3 x10 x9 x8 - - + + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" diff --git a/templates/ausgangsschrift/b.svg b/fonts/ausgangsschrift/b.svg old mode 100755 new mode 100644 similarity index 52% rename from templates/ausgangsschrift/b.svg rename to fonts/ausgangsschrift/b.svg index 56855f2..bd70636 --- a/templates/ausgangsschrift/b.svg +++ b/fonts/ausgangsschrift/b.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="44.467243" y="65.683235" - id="text3015-47" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="68.881508" y="58.597641" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.712204" y="103.54487" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="68.122353" y="92.069016" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -148,11 +49,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="67.458855" y="135.68361" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -161,11 +58,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="57.620213" y="116.49208" - id="text3015-9" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -174,93 +67,40 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="48.905933" y="140.7778" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - diff --git a/fonts/ausgangsschrift/b_.svg b/fonts/ausgangsschrift/b_.svg new file mode 100644 index 0000000..63d398b --- /dev/null +++ b/fonts/ausgangsschrift/b_.svg @@ -0,0 +1,90 @@ + + x1 + x3 + x2 + x8 + x7 + x6 + x4 + x5 + + + + + + + + + diff --git a/templates/ausgangsschrift/c.svg b/fonts/ausgangsschrift/c.svg old mode 100755 new mode 100644 similarity index 51% rename from templates/ausgangsschrift/c.svg rename to fonts/ausgangsschrift/c.svg index 29d4eb9..e9dd1e9 --- a/templates/ausgangsschrift/c.svg +++ b/fonts/ausgangsschrift/c.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x2 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="56.807961" y="86.146469" - id="text3015-48" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x1 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="25.357141" y="106.33372" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="74.175804" y="135.74025" - id="text3015-0-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="56.23893" y="141.27596" - id="text3015-0-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -148,11 +49,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="40.798058" y="130.35782" - id="text3015-48-3-0-1" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 @@ -161,73 +58,32 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="45.395027" y="101.70953" - id="text3015-3-1" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 - diff --git a/templates/ausgangsschrift/d.svg b/fonts/ausgangsschrift/d.svg old mode 100755 new mode 100644 similarity index 54% rename from templates/ausgangsschrift/d.svg rename to fonts/ausgangsschrift/d.svg index 00baab2..a3957d6 --- a/templates/ausgangsschrift/d.svg +++ b/fonts/ausgangsschrift/d.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="60.629684" y="87.654053" - id="text3015-47" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.528717" y="59.102718" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="73.989487" y="132.11322" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x9 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="56.5056" y="109.24161" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 @@ -148,11 +49,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="58.746288" y="135.68361" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -161,11 +58,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="37.857143" y="116.87089" - id="text3015-9" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -174,96 +67,46 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="48.905933" y="140.7778" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 - - - - - - - x7 - + + + + + + + + diff --git a/templates/ausgangsschrift/e.svg b/fonts/ausgangsschrift/e.svg old mode 100755 new mode 100644 similarity index 53% rename from templates/ausgangsschrift/e.svg rename to fonts/ausgangsschrift/e.svg index a15a849..69ed804 --- a/templates/ausgangsschrift/e.svg +++ b/fonts/ausgangsschrift/e.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.528717" y="59.102718" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="67.112206" y="102.29681" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="58.746288" y="135.68361" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="37.857143" y="112.45147" - id="text3015-9" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -148,84 +49,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="48.905933" y="140.7778" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 - - - - - - x5 @@ -234,13 +67,33 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="66.863441" y="87.56366" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 - + + + + + + + diff --git a/templates/ausgangsschrift/f.svg b/fonts/ausgangsschrift/f.svg old mode 100755 new mode 100644 similarity index 51% rename from templates/ausgangsschrift/f.svg rename to fonts/ausgangsschrift/f.svg index ed6d5b4..fb8dce2 --- a/templates/ausgangsschrift/f.svg +++ b/fonts/ausgangsschrift/f.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.528717" y="59.102718" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="62.286747" y="62.648319" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="88.293251" y="104.87395" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,84 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="39.857143" y="116.53414" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 - - - - - - x5 @@ -221,13 +58,33 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="60.971832" y="90.933609" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 - + + + + + + + diff --git a/templates/ausgangsschrift/g.svg b/fonts/ausgangsschrift/g.svg old mode 100755 new mode 100644 similarity index 55% rename from templates/ausgangsschrift/g.svg rename to fonts/ausgangsschrift/g.svg index 35f00c8..96dd41a --- a/templates/ausgangsschrift/g.svg +++ b/fonts/ausgangsschrift/g.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="62.288277" y="120.21695" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="55.483986" y="86.933609" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="75.161263" y="95.206451" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,84 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="37.857143" y="116.2816" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - - - - - - x4 @@ -221,44 +58,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="76.124123" y="102.55037" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - - x9 @@ -267,11 +76,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="78.218689" y="128.59799" - id="text3015-0-6-8-8" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x10 @@ -280,13 +85,41 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="64.460518" y="161.93614" - id="text3015-0-6-8-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 - + + + + + + + + + diff --git a/templates/ausgangsschrift/h.svg b/fonts/ausgangsschrift/h.svg old mode 100755 new mode 100644 similarity index 53% rename from templates/ausgangsschrift/h.svg rename to fonts/ausgangsschrift/h.svg index ffbd1d1..0fdbae9 --- a/templates/ausgangsschrift/h.svg +++ b/fonts/ausgangsschrift/h.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="56.4799" y="61.880642" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="68.868507" y="89.16584" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="80.285904" y="104.04529" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,84 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="53.390858" y="110.72576" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - - - - - - x4 @@ -221,46 +58,50 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="73.59874" y="63.912037" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - - x8 - + + + + + + + + + diff --git a/fonts/ausgangsschrift/i.svg b/fonts/ausgangsschrift/i.svg new file mode 100644 index 0000000..2f35653 --- /dev/null +++ b/fonts/ausgangsschrift/i.svg @@ -0,0 +1,45 @@ + + x1 + x3 + x2 + + + + + + diff --git a/fonts/ausgangsschrift/j.svg b/fonts/ausgangsschrift/j.svg new file mode 100644 index 0000000..affcb8e --- /dev/null +++ b/fonts/ausgangsschrift/j.svg @@ -0,0 +1,58 @@ + + x1 + x3 + x4 + x2 + + + + + + + diff --git a/templates/ausgangsschrift/k.svg b/fonts/ausgangsschrift/k.svg old mode 100755 new mode 100644 similarity index 54% rename from templates/ausgangsschrift/k.svg rename to fonts/ausgangsschrift/k.svg index 4c3bb5b..76298a0 --- a/templates/ausgangsschrift/k.svg +++ b/fonts/ausgangsschrift/k.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="56.4799" y="61.880642" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="68.868507" y="89.16584" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="80.285904" y="104.04529" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,84 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="53.390858" y="110.72576" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - - - - - - x4 @@ -221,44 +58,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="73.59874" y="63.912037" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - - x9 @@ -267,23 +76,45 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="64.109138" y="120.27287" - id="text3015-0-6-8-6-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 + + + + + + + + - + diff --git a/fonts/ausgangsschrift/l.svg b/fonts/ausgangsschrift/l.svg new file mode 100644 index 0000000..d1f70be --- /dev/null +++ b/fonts/ausgangsschrift/l.svg @@ -0,0 +1,68 @@ + + x1 + x3 + x4 + x2 + x5 + + + + + + + diff --git a/fonts/ausgangsschrift/m.svg b/fonts/ausgangsschrift/m.svg new file mode 100644 index 0000000..1ee8187 --- /dev/null +++ b/fonts/ausgangsschrift/m.svg @@ -0,0 +1,81 @@ + + x1 + x5 + x2 + x3 + x4 + x6 + + + + + + + + diff --git a/fonts/ausgangsschrift/n.svg b/fonts/ausgangsschrift/n.svg new file mode 100644 index 0000000..6b39c95 --- /dev/null +++ b/fonts/ausgangsschrift/n.svg @@ -0,0 +1,55 @@ + + x1 + x2 + x3 + x4 + + + + + + diff --git a/templates/ausgangsschrift/o.svg b/fonts/ausgangsschrift/o.svg old mode 100755 new mode 100644 similarity index 51% rename from templates/ausgangsschrift/o.svg rename to fonts/ausgangsschrift/o.svg index 3d9ea49..b19cd66 --- a/templates/ausgangsschrift/o.svg +++ b/fonts/ausgangsschrift/o.svg @@ -1,136 +1,19 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 - - - x5 @@ -139,34 +22,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="75.81842" y="98.106209" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - x3 @@ -175,34 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="48.303738" y="139.80078" - id="text3015-0-6-8-64" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 - x6 @@ -211,13 +58,29 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="81.794159" y="111.978" - id="text3015-7-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 - + + + + + + diff --git a/fonts/ausgangsschrift/p.svg b/fonts/ausgangsschrift/p.svg new file mode 100644 index 0000000..9fab960 --- /dev/null +++ b/fonts/ausgangsschrift/p.svg @@ -0,0 +1,81 @@ + + x6 + x4 + x3 + x2 + x1 + x5 + + + + + + + + diff --git a/fonts/ausgangsschrift/punkt.svg b/fonts/ausgangsschrift/punkt.svg new file mode 100644 index 0000000..ede3993 --- /dev/null +++ b/fonts/ausgangsschrift/punkt.svg @@ -0,0 +1,4 @@ + + + + diff --git a/templates/ausgangsschrift/q.svg b/fonts/ausgangsschrift/q.svg old mode 100755 new mode 100644 similarity index 54% rename from templates/ausgangsschrift/q.svg rename to fonts/ausgangsschrift/q.svg index 738910b..55711a8 --- a/templates/ausgangsschrift/q.svg +++ b/fonts/ausgangsschrift/q.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="62.288277" y="120.21695" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="55.483986" y="86.933609" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="75.161263" y="95.206451" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -135,84 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="37.857143" y="116.2816" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - - - - - - x4 @@ -221,34 +58,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="76.124123" y="102.55037" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - x9 @@ -257,13 +76,37 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="53.096302" y="174.81558" - id="text3015-0-6-8-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 - + + + + + + + + diff --git a/fonts/ausgangsschrift/r.svg b/fonts/ausgangsschrift/r.svg new file mode 100644 index 0000000..0a2ecca --- /dev/null +++ b/fonts/ausgangsschrift/r.svg @@ -0,0 +1,69 @@ + + x4 + x3 + x2 + x1 + x5 + sodipodi:docname="r.svg"> + + + + + + + diff --git a/templates/ausgangsschrift/s.svg b/fonts/ausgangsschrift/s.svg old mode 100755 new mode 100644 similarity index 55% rename from templates/ausgangsschrift/s.svg rename to fonts/ausgangsschrift/s.svg index de76e49..a5281a4 --- a/templates/ausgangsschrift/s.svg +++ b/fonts/ausgangsschrift/s.svg @@ -1,146 +1,19 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - + x2 - x3 @@ -149,34 +22,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="41.566429" y="131.83252" - id="text3015-0-6-8-64" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 - x1 @@ -185,34 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.634636" y="116.73307" - id="text3015-7-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x5 - x4 @@ -221,11 +58,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="66.592079" y="139.12689" - id="text3015-7-5-2" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 @@ -234,11 +67,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="66.056366" y="126.26976" - id="text3015-7-5-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -247,13 +76,33 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.199226" y="132.11322" - id="text3015-7-5-4" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-34.999992">x9 - + + + + + + + diff --git a/fonts/ausgangsschrift/t.svg b/fonts/ausgangsschrift/t.svg new file mode 100644 index 0000000..f01e77c --- /dev/null +++ b/fonts/ausgangsschrift/t.svg @@ -0,0 +1,81 @@ + + x1 + x3 + x2 + x5 + x6 + x4 + + + + + + + + diff --git a/fonts/ausgangsschrift/u.svg b/fonts/ausgangsschrift/u.svg new file mode 100644 index 0000000..748c243 --- /dev/null +++ b/fonts/ausgangsschrift/u.svg @@ -0,0 +1,81 @@ + + x1 + x3 + x6 + x2 + x4 + x5 + + + + + + + + diff --git a/fonts/ausgangsschrift/v.svg b/fonts/ausgangsschrift/v.svg new file mode 100644 index 0000000..18a1072 --- /dev/null +++ b/fonts/ausgangsschrift/v.svg @@ -0,0 +1,42 @@ + + x1 + x2 + x3 + + + + + diff --git a/templates/ausgangsschrift/vorlage.svg b/fonts/ausgangsschrift/vorlage.svg old mode 100755 new mode 100644 similarity index 53% rename from templates/ausgangsschrift/vorlage.svg rename to fonts/ausgangsschrift/vorlage.svg index 4511d79..674e56e --- a/templates/ausgangsschrift/vorlage.svg +++ b/fonts/ausgangsschrift/vorlage.svg @@ -1,106 +1,14 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - xml:space="preserve" - id="flowRoot3012" style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - transform="translate(-12.344632,-34.238497)">f x1 @@ -109,11 +17,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="83.528717" y="59.102718" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -122,11 +26,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="62.286747" y="62.648319" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -135,11 +35,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="88.293251" y="104.87395" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -148,84 +44,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="39.857143" y="116.53414" - id="text3015-5" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 - - - - - - x5 @@ -234,13 +62,34 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="60.971832" y="90.933609" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 - + transform="translate(-12.344632,-34.238497)"> + + + + + + ry="8.2142859" /> diff --git a/fonts/ausgangsschrift/w.svg b/fonts/ausgangsschrift/w.svg new file mode 100644 index 0000000..00fb006 --- /dev/null +++ b/fonts/ausgangsschrift/w.svg @@ -0,0 +1,68 @@ + + x1 + x2 + x3 + x4 + x5 + + + + + + + diff --git a/fonts/ausgangsschrift/x.svg b/fonts/ausgangsschrift/x.svg new file mode 100644 index 0000000..f65754d --- /dev/null +++ b/fonts/ausgangsschrift/x.svg @@ -0,0 +1,68 @@ + + x1 + x4 + x5 + x2 + x3 + + + + + + + diff --git a/templates/ausgangsschrift/y.svg b/fonts/ausgangsschrift/y.svg old mode 100755 new mode 100644 similarity index 53% rename from templates/ausgangsschrift/y.svg rename to fonts/ausgangsschrift/y.svg index 8ae3917..d9683e8 --- a/templates/ausgangsschrift/y.svg +++ b/fonts/ausgangsschrift/y.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 @@ -96,54 +13,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="36.222397" y="125.5405" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - - - x5 @@ -152,89 +31,26 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="51.011871" y="140.05333" - id="text3015-0-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 - - x4 - - - + /> x6 @@ -243,11 +59,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="46.32843" y="168.1265" - id="text3015-9-7-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -256,13 +68,42 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="79.825592" y="125.38918" - id="text3015-9-7-1" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 - + + + + + + + + + inkscape:transform-center-y="-22.223356" /> diff --git a/fonts/ausgangsschrift/z.svg b/fonts/ausgangsschrift/z.svg new file mode 100644 index 0000000..5f54797 --- /dev/null +++ b/fonts/ausgangsschrift/z.svg @@ -0,0 +1,55 @@ + + x1 + x3 + x2 + x4 + + + + + + diff --git a/templates/ausgangsschrift/ä.svg b/fonts/ausgangsschrift/ä.svg old mode 100755 new mode 100644 similarity index 55% rename from templates/ausgangsschrift/ä.svg rename to fonts/ausgangsschrift/ä.svg index f6089e3..55642f2 --- a/templates/ausgangsschrift/ä.svg +++ b/fonts/ausgangsschrift/ä.svg @@ -1,93 +1,10 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x5 @@ -96,11 +13,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="40.912228" y="135.10689" - id="text3015-47" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 @@ -109,11 +22,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="58.049446" y="87.458839" - id="text3015-0" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x1 @@ -122,11 +31,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="45.571537" y="95.718819" - id="text3015-48" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x6 @@ -135,11 +40,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="86.71936" y="132.11322" - id="text3015-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x11 @@ -148,11 +49,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="70.20665" y="96.44426" - id="text3015-0-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 @@ -161,11 +58,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="63.623444" y="120.25014" - id="text3015-47-3" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x3 @@ -174,11 +67,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="69.013687" y="141.04482" - id="text3015-47-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x10 @@ -187,11 +76,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="69.282585" y="120.74612" - id="text3015-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x9 @@ -200,11 +85,7 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="60.527813" y="100.06429" - id="text3015-0-9" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 @@ -213,113 +94,46 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="72.470993" y="106.48371" - id="text3015-0-98" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x8 - diff --git a/templates/ausgangsschrift/ö.svg b/fonts/ausgangsschrift/ö.svg old mode 100755 new mode 100644 similarity index 50% rename from templates/ausgangsschrift/ö.svg rename to fonts/ausgangsschrift/ö.svg index ce32338..4c4a041 --- a/templates/ausgangsschrift/ö.svg +++ b/fonts/ausgangsschrift/ö.svg @@ -1,136 +1,19 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - + x1 - - - x5 @@ -139,34 +22,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="75.81842" y="98.106209" - id="text3015-9-7" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x2 - x3 @@ -175,34 +40,16 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="48.303738" y="139.80078" - id="text3015-0-6-8-64" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x4 - x6 @@ -211,33 +58,35 @@ style="font-size:40px;font-style:normal;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="81.794159" y="111.978" - id="text3015-7-6" - sodipodi:linespacing="125%" - inkscape:transform-center-y="-35">x7 + + + + + - + diff --git a/fonts/ausgangsschrift/ü.svg b/fonts/ausgangsschrift/ü.svg new file mode 100644 index 0000000..7cff8fe --- /dev/null +++ b/fonts/ausgangsschrift/ü.svg @@ -0,0 +1,87 @@ + + x1 + x3 + x6 + x2 + x4 + x5 + + + + + + + + + + diff --git a/libs/piccreate.py b/libs/piccreate.py index 770bb4a..8d593b9 100644 --- a/libs/piccreate.py +++ b/libs/piccreate.py @@ -9,117 +9,44 @@ __license__ = 'BSD' import optparse import os import ConfigParser -import jiffys from utils import CSVImport -from datetime import datetime from django.utils.encoding import smart_unicode, smart_str -def logger_init(logfile): - import logging - log = logging.getLogger('master') - - now = datetime.now() - timestr = now.strftime("%d-%m-%Y_%H-%M-%S") - hdlr = logging.FileHandler(logfile) - formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - hdlr.setFormatter(formatter) - log.addHandler(hdlr) - log.setLevel(logging.INFO) - - log.info('now: '+str(now)) - return log - - #now = datetime.now() - - #logfile = 'mapsgen_'+ now.strftime("%d-%m-%Y.log") - #log_path = os.path.normpath( - #os.path.expandvars(os.path.join('$MAPSGEN_LOG', logfile )) - #) - - ##if not os.path.exists(log_path): parser.error('\"'+ log_path +'\" does not exist.') - #log = logger_init(log_path) - #log.debug('template: '+template) def main( config ): + infile = options.infile + config = options.config - now = datetime.now() - ids=[] + config_path = os.path.expandvars(os.path.join('$PICCREATE_CFG', config+'.cfg' )) + in_path = os.path.expandvars(os.path.join('$PICCREATE_IN', infile+'.csv' )) - config_path = os.path.expandvars(os.path.join('$MASTER_CFG', config+'.cfg' )) + if not config: config = 'default' + if not infile: infile = 'default' + out_path = options.outdir + config_path = os.path.expandvars(os.path.join('$PICCREATE_CFG', CompleteEnding( config, 'cfg'))) + in_path = os.path.expandvars(os.path.join('$PICCREATE_IN', CompleteEnding( infile, 'csv'))) if not os.path.exists(config_path): - parser.error('\"'+ config_path +'\" does not exist. Please give the name to a config file for the rows!') + print '\"'+ config_path +'\" does not exist. Please give the name of a config file!' + return None + if not os.path.exists(in_path): + print '\"'+ in_path +'\" does not exist. Please give the name to a input file!' + return None + if not os.path.exists(out_path): + print '\"'+ out_path +'\" does not exist. Please give the path to the directory for the pictures!' + return None config = ConfigParser.RawConfigParser() config.read(config_path) - globalsec = dict(config.items('globals')) + targets = config.get('globals', 'targets') - # Setup: - # gewünschte Box(en) auftauen, wenn noch nicht passiert - # Boxen skalieren - if options.setup: - ids = setup(globalsec) - - if config.has_section('IDs'): - oldids = config.get('IDs', 'Ids') - ids = [oldids, ids] - else: - config.add_section('IDs') - # die Ids der neuen in die Config schreiben - for i in ids: config.set('IDs', i, 'True') - with open(config_path, 'wb') as configfile: - config.write(configfile) - - # - # Arbeiten durchführen: - # Daten auf Boxen verteilen und Arbeiten anstossen - # - # Status des Systems anzeigen: - # - wieviel Boxen sind am Leben und aktiv? - # - welche macht gerade was? - # - wieviel % der Aufgaben sind fertig? - # - wieviel % der jobs sind erledigt? - # - wieviele Packete sind schon ausgeliefert? - - # wenn alles fertig ist, Teardown: - # alle Boxen bis auf den Ursprung löschen - # Box(en) einfrieren - if options.teardown: - ids = dict(config.items('IDs')).keys() - teardown(globalsec['token'], ids) - - -def setup( jiffyinfos ): - ''' Erstellt aus einem Backup mehrere Jiffy boxen und started diese - ''' - - token = jiffyinfos['token'] - boxid = jiffyinfos['boxid'] - num_boxes = jiffyinfos['num_boxes'] - backupid = jiffyinfos['backupid'] - planid = jiffyinfos['planid'] - name = jiffyinfos['name'] - password = jiffyinfos['password'] - - ids = jiffys.rebuild_backup(token, boxid, num_boxes, backupid, name, - planid, password) - jiffys.start_boxes(ids, token, planid) - return ids - - # Ausgabe einer Zeile in der Konsole - ##!/bin/python - #import sys - - #for i in xrange(1000000): - #print i, "\r", - #sys.stdout.flush() - # z.B. build image "engine" (3/5) started (1/5) - -def teardown( token, ids ): - ''' killt die Jiffy boxen die angegeben sind - ''' - jiffys.delete_boxes(ids,token) + Trans = get_translation(config_path, 'translation') + Rows = CSVImport(in_path, translate=Trans) + for data in Rows: + filename = data.customerid + pic_path = os.path.join(out_path, filename )) + create_picture(data, ) if __name__ == '__main__': @@ -141,19 +68,12 @@ Read Confg, create wakeup and scale this kind of jiffy box parser.add_option("-c", "--cfg", dest="config", default="test", help="name of the config file with the Name of the rows to be used.", metavar="CONFIG_FILE") - parser.add_option("-k", "--check", dest="check", - help="check before creation, whether a map of this type exists already", + parser.add_option("-i", "--infile", dest="infile", + help="csv file with input of names/content", action='store') - parser.add_option("-o", "--outdir", dest="outdir", + parser.add_option("-o", "--outdir", dest="outdir", default=os.path.expandvars('$PICCREATE_OUT'), help="path to the directory where the maps will be generated", action='store') - parser.add_option("-s", "--setup", dest="setup", help="setup the used boxes", - action='store_true') - parser.add_option("-t", "--teardown", dest="teardown", - help="teardown the used boxes of that project", - action='store_true') - parser.add_option("-v", "--view-status", dest="view", - help="show the status of that project: Boxes, jobs, etc.") parser.add_option("-y", "--dry", dest="dry", help="dont generate images. Just ask the coordinates and fill database.", action='store_true' ) diff --git a/libs/utils.py b/libs/utils.py index b0f02dd..fc6c6bb 100644 --- a/libs/utils.py +++ b/libs/utils.py @@ -4,6 +4,9 @@ from django.utils.encoding import smart_unicode from django.template.defaultfilters import slugify import csv +import ConfigParser +import os.path +import re def csv_open(csvfile, dialect=None): fh = open(csvfile, 'rb') @@ -43,13 +46,13 @@ class CSVImport(object): self.firstrow = self.rows[0] self.field_definition = [] for i, field in enumerate(self.rows[0]): + if not field: + field = 'column_%d' % i if translate: if field in translate: print field + ' -> '+ translate[field] field = translate[field] field = slugify(field.strip()).replace('-', '_') - if not field: - field = 'column_%d' % i self.field_definition.append(field) def __getitem__(self, key): @@ -65,4 +68,30 @@ class CSVImport(object): def firstrow(self): return self.firstrow +def get_translation(cfg_path, sec_name): + """ lädt die Zuordnung zwischen einem .csv Eingabefile und den + Attributen """ + config = ConfigParser.RawConfigParser() + config.read(cfg_path) + trans = dict(config.items(sec_name)) + return dict([[v,k] for k,v in trans.items()]) + +def CompleteEnding(path, newext): + ''' Fügt die gegebene File Extension an den Filename/Pfad + ''' + if not path: raise Csv2CouchError('no path given') + path, ext = os.path.splitext(path) + if not re.match(newext, ext): + path = path +'.'+newext + return path + +def RemoveEnding(path, oldext): + ''' entfernt die File Extension vom Filename/Pfad + ''' + newpath, ext = os.path.splitext(path) + if not re.match(oldext, ext): + path = newpath + return path + +# vim: set tw=75 ft=python ts=4 sw=4: diff --git a/libs/utils.pyc b/libs/utils.pyc new file mode 100644 index 0000000..28d9b0a Binary files /dev/null and b/libs/utils.pyc differ diff --git a/templates/.keep b/templates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/templates/ausgangsschrift/i.svg b/templates/ausgangsschrift/i.svg deleted file mode 100755 index faa9de9..0000000 --- a/templates/ausgangsschrift/i.svg +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - - - - x2 - - - diff --git a/templates/ausgangsschrift/j.svg b/templates/ausgangsschrift/j.svg deleted file mode 100755 index 6e320cc..0000000 --- a/templates/ausgangsschrift/j.svg +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - - - - x4 - - - x2 - - diff --git a/templates/ausgangsschrift/l.svg b/templates/ausgangsschrift/l.svg deleted file mode 100755 index 4fb7102..0000000 --- a/templates/ausgangsschrift/l.svg +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - - - - - x4 - x2 - - x5 - - diff --git a/templates/ausgangsschrift/m.svg b/templates/ausgangsschrift/m.svg deleted file mode 100755 index fd19eb4..0000000 --- a/templates/ausgangsschrift/m.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x5 - - - - - x2 - x3 - - x4 - - x6 - - diff --git a/templates/ausgangsschrift/n.svg b/templates/ausgangsschrift/n.svg deleted file mode 100755 index 60c1c3d..0000000 --- a/templates/ausgangsschrift/n.svg +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - - - - x2 - x3 - - x4 - - diff --git a/templates/ausgangsschrift/p.svg b/templates/ausgangsschrift/p.svg deleted file mode 100755 index 604e86f..0000000 --- a/templates/ausgangsschrift/p.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - x6 - x4 - - x3 - x2 - - x1 - x5 - - - diff --git a/templates/ausgangsschrift/punkt.svg b/templates/ausgangsschrift/punkt.svg deleted file mode 100755 index dc70d8b..0000000 --- a/templates/ausgangsschrift/punkt.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/templates/ausgangsschrift/r.svg b/templates/ausgangsschrift/r.svg deleted file mode 100755 index 8673af4..0000000 --- a/templates/ausgangsschrift/r.svg +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - x4 - - x3 - x2 - - x1 - x5 - - diff --git a/templates/ausgangsschrift/t.svg b/templates/ausgangsschrift/t.svg deleted file mode 100755 index c291c95..0000000 --- a/templates/ausgangsschrift/t.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - x2 - x5 - - - - - - x6 - x4 - - - diff --git a/templates/ausgangsschrift/u.svg b/templates/ausgangsschrift/u.svg deleted file mode 100755 index f691a8a..0000000 --- a/templates/ausgangsschrift/u.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - x6 - x2 - - - - - - x4 - x5 - - - diff --git a/templates/ausgangsschrift/v.svg b/templates/ausgangsschrift/v.svg deleted file mode 100755 index 8fbaec1..0000000 --- a/templates/ausgangsschrift/v.svg +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x2 - - - - x3 - - diff --git a/templates/ausgangsschrift/w.svg b/templates/ausgangsschrift/w.svg deleted file mode 100755 index 7824fc5..0000000 --- a/templates/ausgangsschrift/w.svg +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x2 - - - - x3 - x4 - - - x5 - - diff --git a/templates/ausgangsschrift/x.svg b/templates/ausgangsschrift/x.svg deleted file mode 100755 index 250d960..0000000 --- a/templates/ausgangsschrift/x.svg +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x4 - - - - x5 - x2 - - - x3 - - diff --git a/templates/ausgangsschrift/z.svg b/templates/ausgangsschrift/z.svg deleted file mode 100755 index f7ac496..0000000 --- a/templates/ausgangsschrift/z.svg +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - - - - x2 - - x4 - - diff --git a/templates/ausgangsschrift/ü.svg b/templates/ausgangsschrift/ü.svg deleted file mode 100755 index 262ab65..0000000 --- a/templates/ausgangsschrift/ü.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - x1 - x3 - x6 - x2 - - - - - - x4 - x5 - - - - -