more work on copter pages. added previously missing pages, even though they are unfinished.

input/projects/quadcopters/aurora100.md

@@ -23,7 +23,8 @@ In real-life, the picture doesn't look *that* bad.
 <!--%
 lightgallery([
     [ "https://www.youtube.com/watch?v=MnF7B3rD5VM", "img/xyaurora100_crash_thumb.jpg", "Aurora100 flight with crash" ],
-    [ "https://www.youtube.com/watch?v=798ncBkBHos", "img/xyaurora100_owl_thumb.jpg", "Micro Quadcopter attacked by Owl" ]
+    [ "https://www.youtube.com/watch?v=798ncBkBHos", "img/xyaurora100_owl_thumb.jpg", "Micro Quadcopter attacked by Owl" ],
+    [ "https://www.youtube.com/watch?v=KEHhSCol_AY", "img/xybeast_prop_break_thumb.jpg", "Brushless 100mm 3S Quadcopter Test, 5-blade prop breaking in-flight" ]
 ])
 %-->
 
@@ -39,18 +40,18 @@ These are the prices as recorded by Rotorbuilds.
 To be honest, I have no clue if they are what I paid back when I built this copter.
 
 <!--%
-tableHelper([ "align-right", "align-last-right", "align-right"],
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
     [ "Part", "Description", "Cost" ], [
         [ "Frame", ("Eachine Aurora 100 100MM Mini Brushless FPV Multirotor Racing Frame 14.5g Carbon Fiber", "https://www.banggood.com/Eachine-Aurora-100-100MM-Mini-Brushless-FPV-Multirotor-Racing-Frame-14_5g-Carbon-Fiber-p-1133462.html?p=3F201911077692015010"), "11.99$" ],
         [ "Spare", ("Eachine Aurora 100 Mini Brushless FPV Racer Spare Part 2mm 2.5mm Bottom Plate 3K Carbon Fiber", "https://www.banggood.com/Eachine-Aurora-100-Mini-Brushless-FPV-Racer-Spare-Part-2mm-2_5mm-Bottom-Plate-3K-Carbon-Fiber-p-1144532.html?p=3F201911077692015010&cur_warehouse=CN&ID=529763"), "5.39$" ],
         [ "FC", ("Eachine Minicube 20x20mm F4 OSD Compatible Frsky Flysky DSM RX Blheli_S 10A For Aurora 68 90 100", "https://www.banggood.com/Eachine-Minicube-20x20mm-F4-OSD-Compatible-Frsky-Flysky-DSM-RX-Blheli_S-10A-For-Aurora-68-90-100-p-1165366.html?p=3F201911077692015010"), "60.99$" ],
         [ "Motors", ("4 x Eachine Upgrade Motor 1104 6500KV Brushless Motor 1-3S For Eachine Aurora 90 100 RC Drone FPV Racing", "https://www.banggood.com/Eachine-1104-6500KV-1-3S-Brushless-Motor-For-Eachine-Aurora-90-100-Mini-FPV-Racer-p-1138072.html?p=3F201911077692015010&cur_warehouse=CN"), "35.56$" ],
         [ "Props", ("10 Pairs Racerstar 1935 50mm 5 Blade Racing Propeller 1.5mm Mounting Hole For Micro FPV Frame", "https://www.banggood.com/10-Pairs-Racerstar-1935-50mm-5-Blade-Racing-Propeller-1_5mm-Mounting-Hole-For-Micro-FPV-Frame-p-1129109.html?p=3F201911077692015010"), "8.29$" ],
-        [ "Cam", ("", ""), "$" ],
-        [ "VTx", ("", ""), "$" ],
+        [ "Cam", ("RunCam Micro Sparrow 2.1mm", "https://shop.runcam.com/runcam-micro-sparrow/"), "31.97$" ],
+        [ "VTx", ("TBS Unify Pro V3 5V", "https://www.team-blacksheep.com/products/prod:unify_pro"), "54.74$" ],
         [ "Bats", ("Tattu 450mAh 11.1V 75C 3S1P Lipo Battery Pack- Long Size for H Frame", "https://www.gensace.de/tattu-450mah-11-1v-75c-3s1p-lipo-battery-pack-long-size-for-h-frame.html"), "15.89$" ],
         [ "Misc", ("4 PCS Eachine Propeller Guard For Aurora 100 Mini FPV Racing RC Drone 1102 1103 1104 1105 Brushless Motor", "https://www.banggood.com/4-PCS-Eachine-Propeller-Guard-For-Aurora-100-Mini-FPV-Racing-RC-Drone-1102-1103-1104-1105-Brushless-Motor-p-1143685.html?akmClientCountry=DE&p=3F201911077692015010&cur_warehouse=CN&ID=224"), "2.49$" ],
-        [ "", "Sum", "$" ]
+        [ "", "Sum", "227.31$" ]
     ]
 )
 %-->

input/projects/quadcopters/aurora90.md

@@ -24,8 +24,9 @@ In real-life, the picture doesn't look *that* bad.
 
 <!--%
 lightgallery([
-    [ "https://www.youtube.com/watch?v=VFPxYdl7hg0", "img/xyaurora90_firsttest_thumb.jpg", "First Brushless 90mm Quadcopter Testflight" ],
+    [ "https://www.youtube.com/watch?v=QzE69e-Zd_w", "img/xyaurora90_garden_thumb.jpg", "Aurora90 garden flight" ],
     [ "https://www.youtube.com/watch?v=V3l-RCW24_U", "img/xyaurora90_robocup_thumb.jpg", "Robocup German Open 2017 @Home Area Flyaround" ],
+    [ "https://www.youtube.com/watch?v=VFPxYdl7hg0", "img/xyaurora90_firsttest_thumb.jpg", "First Brushless 90mm Quadcopter Testflight" ],
     [ "https://www.youtube.com/watch?v=NqrONv2KYJw", "img/xyaurora90_test_flight_thumb.jpg", "Aurora90 test flight, crash and prop loss" ],
     [ "https://www.youtube.com/watch?v=b4heuNomMTk", "img/xyaurora90_wrong_channel_thumb.jpg", "Wrong FPV Channel" ]
 ])
@@ -83,7 +84,7 @@ These are the prices as recorded by Rotorbuilds.
 To be honest, I have no clue if they are what I paid back when I built this copter.
 
 <!--%
-tableHelper([ "align-right", "align-last-right", "align-right"],
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
     [ "Part", "Description", "Cost" ], [
         [ "Frame", ("Eachine Aurora 90 90MM Mini Brushless FPV Racing Frame RC Drone 27g", "https://www.banggood.com/Eachine-Aurora-90-90MM-Mini-Brushless-FPV-Multirotor-Racing-Frame-35g-Carbon-Fiber-Aluminium-Construction-p-1109742.html?p=3F201911077692015010"), "18.99$" ],
         [ "FC", ("PIKO BLX CleanFlight & BetaFlight Micro F3 Flight Controller Built-in PDB Buzzer Port 20X20mm For RC Drone FPV", "https://www.banggood.com/CleanFlight-BetaFlight-Micro-F3-Flight-Controller-Built-in-PDB-Buzzer-20X20mm-For-FPV-Racing-p-1094615.html?p=3F201911077692015010"), "15.99$" ],

input/projects/quadcopters/brushed_micro.md

@@ -0,0 +1,44 @@
+title: Brushed Micro
+description: 1S LiPo brushed copter with 3D printed frame
+parent: quadcopters
+position: 50
+date: 2016-10-09
+---
+
+<!--% backToParent() %-->
+
+Because I did not really feel comfortable with the large size of both [my first copter](x666.html) and [my tricopter](trifecta.html), I decided to build a very small and lightweight 1S brushed quadcopter.
+The frame is 3D printed, but because it did not fit [my 3D printer at the time](fabrikator-mini.html) I had to order it online.
+
+<!--%
+# TODO photos
+%-->
+
+Here are some recordings of the FPV footage.
+Be aware that these videos are recorded from the received signal on the ground.
+Not only can you see lots of interference and other HF problems, the loss of quality from the video recorder and the YouTube encoding is also very noticeable.
+In real-life, the picture doesn't look *that* bad.
+
+<!--%
+lightgallery([
+    [ "https://www.youtube.com/watch?v=t0mPxgY_MKY", "img/xybrushed_test_thumb.jpg", "Brushed Copter Test Flight" ]
+])
+%-->
+
+## Parts List
+
+The prices listed below are just what I found while doing this page some years later, not the real prices I paid back then.
+
+<!--%
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
+    [ "Part", "Description", "Cost" ], [
+        [ "Frame", ("Oskie Micro Frame v1", "https://oscarliang.com/oskie-micro-frame-v1/"), "10.00€" ],
+        [ "FC", ("", ""), "€" ],
+        [ "Motors", ("", ""), "€" ],
+        [ "Props", ("", ""), "€" ],
+        [ "Cam", ("", ""), "€" ],
+        [ "Battery", ("", ""), "€" ],
+        [ "", "Sum", "€" ]
+    ]
+)
+%-->

input/projects/quadcopters/flying_wing.md

@@ -0,0 +1,70 @@
+title: Flying Wing
+description: 2S LiPo, Soaring Wing, 2206 2200KV motor
+parent: quadcopters
+position: 40
+date: 2016-11-03
+---
+
+<!--% backToParent() %-->
+
+Only flying with quadcopters became a bit boring after a while, and I wanted to see if the skills I had aquired flying and building them could be transferred to other areas.
+So I decided to build a very simple FPV V-Tail Flying Wing model airplane.
+
+<!--%
+lightgallery([
+    [ "img/flying_wing_1.jpg", "" ],
+    [ "img/flying_wing_2.jpg", "" ],
+    [ "img/flying_wing_3.jpg", "" ],
+    [ "img/flying_wing_4.jpg", "" ],
+    [ "img/flying_wing_5.jpg", "" ]
+])
+%-->
+
+Here are some recordings of the FPV footage.
+Be aware that these videos are recorded from the received signal on the ground.
+Not only can you see lots of interference and other HF problems, the loss of quality from the video recorder and the YouTube encoding is also very noticeable.
+In real-life, the picture doesn't look *that* bad.
+
+<!--%
+lightgallery([
+    [ "https://www.youtube.com/watch?v=V5Z94si2BPE", "img/flying_wing_tree_crash_thumb.jpg", "Flying Wing Tree Landing" ],
+    [ "https://www.youtube.com/watch?v=w2eUHNWF4U8", "img/flying_wing_lowlight_thumb.jpg", "Flying Wing in low light situation" ]
+])
+%-->
+
+I pretty much used the parts suggested for the frame on the Hobbyking product page.
+For FPV, I added a FatShark camera and transmitter kit, also from HobbyKind.
+
+Because I did not really have any idea of what I am doing, the plane is very front-heavy.
+It's always a bit of a hassle to get it launched by hand, but after two or three tries it usually flies.
+I'm not using any Flight Controller on the plane, and I still haven't even set the trim on my transmitter properly, so I'm always holding the pitch pretty far back.
+But, for my limited airplane knowledge, it seems to work relatively fine.
+
+The power is not overwhelming, however, and because of the pusher configuration of the motor, it really is very loud.
+
+It is however very resilient to damage.
+I had a bad crash where my receiver just cut out completely, and it dropped straight down onto some unused train tracks.
+That caused a huge crack in the middle, basically splitting it in two parts.
+With some foam glue it was however very easy to repair.
+
+## Parts List
+
+The prices listed below are just what I found while doing this page some years later, not the real prices I paid back then.
+
+<!--%
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
+    [ "Part", "Description", "Cost" ], [
+        [ "Frame", ("Combat/Slope Soaring Wing Kit (EPP Foam w/CF Tube) 1000mm", "https://hobbyking.com/en_us/combat-slope-soaring-wing-kit-epp-foam-w-cf-tube-1000mm.html"), "22.14€" ],
+        [ "V-Mixer", ("TURNIGY Ultra Small V-Tail Mixer", "https://hobbyking.com/en_us/turnigy-v-tail-mixer-ultra-small.html?queryID=&objectID=23131"), "4.64€" ],
+        [ "ESC", ("HobbyKing 20A (2~4S) ESC 3A UBEC", "https://hobbyking.com/en_us/hobbyking-20a-2-4s-esc-3a-ubec.html"), "9.53€" ],
+        [ "Motor", ("rcINpower QAV 2206 2200KV Brushless Motor", "https://hobbyking.com/en_us/qav2206-2200kv-ccw.html"), "9.00€" ],
+        [ "Servos", ("2x HobbyKing HK15178 Analog Servo 1.4kg / 0.10sec / 10g", "https://hobbyking.com/en_us/hobbykingtm-hk15178-analog-servo-1-4kg-0-09sec-10g.html"), "4.08€" ],
+        [ "Prop", ("", ""), "€" ],
+        [ "Cam", ("", ""), "€" ],
+        [ "VTx", ("", ""), "€" ],
+        [ "Rx", ("FrSky D4R-II 4ch 2.4Ghz ACCST Receiver (w/telemetry)", "https://hobbyking.com/en_us/frsky-d4r-ii-4ch-2-4ghz-accst-receiver-w-telemetry.html"), "21.60€" ],
+        [ "Battery", ("", ""), "€" ],
+        [ "", "Sum", "€" ]
+    ]
+)
+%-->

input/projects/quadcopters/lx5.md

@@ -47,7 +47,7 @@ Everything else is mounted with rigid spacers.
 These are the original prices I paid back when I initially bought the parts.
 
 <!--%
-tableHelper([ "align-right", "align-last-right", "align-right"],
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
     [ "Part", "Description", "Cost" ], [
         [ "Frame", ("GEP-LX5 Leopard Frame, Green Color", "https://geprc.com/product/gep-lx5-frame/"), "47.20€" ],
         [ "FC", ("Hobbywing XRotor Omnibus F4 Flight Controller", "https://www.hobbywing.com/goods.php?id=590"), "34.08€" ],

input/projects/quadcopters/rc_equipment.md

@@ -0,0 +1,79 @@
+title: RC Equipment
+description: My gear and the modifications I did to it
+parent: quadcopters
+position: 80
+date: 2015-10-09
+update: 2021-05-28
+---
+
+<!--% backToParent() %-->
+
+Over the year I have grown quite the collection of self-made or customized gear.
+
+## Spectator Monitor
+
+When out flying alone or with a partner, often people walk their dogs nearby or families go on a walk together and see us.
+This often sparks a conversation.
+For these occasions, it turned out to be very useful to have some kind of second scree and receiver with me.
+
+A friend of mine even has a spare cheap set of FPV goggles with him most of the time.
+
+I decided to go a slightly different route.
+For my first experiments, I bought the [Quanum DIY FPV Goggle Set](https://hobbyking.com/de_de/quanum-diy-fpv-goggle-set-with-monitor-kit.html).
+I didn't really like the box-style of goggles, so I quickly took the monitor from the set and used it stand-alone.
+
+After I switched to proper FatShark goggles, I used the Quanum monitor again, this time for a spectator monitor.
+
+I built a simple wooden box out of left-over parts and hot-glue, with a large cut-out in the front for the monitor.
+
+Inside is not only a [FR632 Diversity Rx](https://hobbyking.com/en_us/fr632-diversity-5-8ghz-48ch-auto-scan-lcd-a-v-fpv-receiver.html) but also an [Eachine ProDVR](https://www.banggood.com/Eachine-ProDVR-Pro-DVR-Video-Audio-Mini-Recorder-for-FPV-Multicopters-for-RC-Drone-FPV-Racing-p-1061196.html?cur_warehouse=CN), 2x 18650 cells, voltage regulators, a fan and a voltmeter.
+The channel can be selected on the receiver, with cut-outs on the back.
+The DVR can be controlled using external push buttons.
+A power switch, as well as a switch to select either the Rx video feed or the DVR video feed, are on the top.
+
+The batteries hold up for maybe 3 sessions with spectators.
+I had to add the fan after the first tests because it simply got too hot inside the box and the first DVR died after a while.
+
+The quality of the Quanum monitor is great and it does not switch to a blue-screen when the signal is fading.
+The DVR does not work 100% reliable, but considering my FatShark Dominator v3 has a built-in DVR as well, I'm not really dependant on it.
+
+<!--%
+# TODO photos
+%-->
+
+## Customized Transmitter
+
+
+
+Also see [the article about my Arduino FrSky Telemetry display](2016_11_05_frsky_telemetry.html) and [the article about my Saitek X52 USB joystick experiments](2016_07_24_usb_host_cppm.html).
+
+<!--%
+lightgallery([
+    [ "img/arduino_frsky_telemetry_2.jpg", "Arduino FrSky Telemetry Photo 1" ],
+    [ "img/arduino_frsky_telemetry_3.jpg", "Arduino FrSky Telemetry Photo 2" ],
+    [ "img/arduino_frsky_telemetry_4.jpg", "Arduino FrSky Telemetry Photo 3" ],
+    [ "img/flysky4.jpg", "MP-26-DT back" ],
+    [ "img/flysky5.jpg", "MP-26-DT mod" ],
+    [ "img/flysky6.jpg", "MP-26-DT mod near" ],
+    [ "img/saitek8.jpg", "Modified RC Transmitter" ],
+    [ "img/saitek1.jpg", "Saitek X52 Whole Setup" ]
+])
+%-->
+
+## FPV Monitor
+
+
+
+<!--%
+# TODO photos
+%-->
+
+## Spectator Monitor 2
+
+
+
+<!--%
+# TODO photos
+%-->
+
+The files for the modified 3D printed case [can be found on my Thingiverse profile](https://www.thingiverse.com/thing:2003324).

input/projects/quadcopters/trifecta.md

@@ -7,7 +7,7 @@ date: 2016-05-25
 
 <!--% backToParent() %-->
 
-As a second attempt for a self-built copter I decided to try and build a Tricopter.
+As a second attempt for a self-built copter, after my [far too big X666](x666.html), I decided to try and build a Tricopter.
 These only have three motors, with the third degree of freedom (yaw) being provided by tilting the back rotor using a servo.
 
 <!--%
@@ -46,7 +46,7 @@ I had some problems with the first servo I tried, but after switching to the met
 The prices listed below are just what I found while doing this page some years later, not the real prices I paid back then.
 
 <!--%
-tableHelper([ "align-right", "align-last-right", "align-right"],
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
     [ "Part", "Description", "Cost" ], [
         [ "Frame", ("Quanum Trifecta Mini Foldable Tricopter Frame", "https://hobbyking.com/en_us/quanum-trifecta-mini-foldable-tricopter-frame-kit.html"), "27.67€" ],
         [ "Servo", ("Emax ES09MD Digital Metallgetriebe Mini Servo", "https://www.premium-modellbau.de/emax-es09md-digital-metallgetriebe-mini-servo-15g-0-08s-2-6kg-kugellager-es08md"), "12.90€" ],

input/projects/quadcopters/x666.md

@@ -0,0 +1,67 @@
+title: xy666
+description: 3S LiPo, HobbyKing X666 frame
+parent: quadcopters
+position: 70
+date: 2015-09-28
+---
+
+<!--% backToParent() %-->
+
+After my [failed attempts](xycontrol.html) of completely making my own Quadcopter (including Software) I kinda forgot about the whole topic for a while.
+But a couple of years later, shortly after starting my first real programming work as a student, a colleague of mine introduced me to the world of open-source racing copters.
+So, with his help, I started to build my first real, working, quadcopter.
+
+<!--%
+# TODO photos?
+%-->
+
+Here are some recordings of the FPV footage.
+Be aware that these videos are recorded from the received signal on the ground.
+Not only can you see lots of interference and other HF problems, the loss of quality from the video recorder and the YouTube encoding is also very noticeable.
+In real-life, the picture doesn't look *that* bad.
+
+<!--%
+lightgallery([
+    [ "https://www.youtube.com/watch?v=nU8ePJAclYo", "img/xy666_test_flight_thumb.jpg", "X666 Quadcopter Test Flight" ],
+    [ "https://www.youtube.com/watch?v=-IGvCzKaWF0", "img/xy666_test_thumb.jpg", "Quadcopter Test Flight" ],
+    [ "https://www.youtube.com/watch?v=iYFZvz2POkc", "img/xy666_crash2_thumb.jpg", "Quadcopter Crash" ],
+    [ "https://www.youtube.com/watch?v=JpmQ9mOIgUo", "img/xy666_crash_thumb.jpg", "Quadcopter FPV Crash" ],
+    [ "https://www.youtube.com/watch?v=98pcaFgXnbE", "img/xy666_crash1_thumb.jpg", "X666 Quadcopter Crash 1" ],
+    [ "https://www.youtube.com/watch?v=E-lgQe0WGOg", "img/xy666_crash3_thumb.jpg", "X666 Quadcopter Crash 2" ],
+])
+%-->
+
+Initially I got the [CC3D Flight Controller](https://opwiki.readthedocs.io/en/latest/user_manual/cc3d/cc3d.html), running the OpenPilot Software.
+This worked, but I had some problems with the hardware and/or software (I don't really remember), which caused me to switch to a [Naze32](http://abusemark.com/store/index.php?main_page=product_info&products_id=38), running on the [Baseflight](https://github.com/multiwii/baseflight) / [Cleanflight](http://cleanflight.com/) / [Betaflight](https://betaflight.com/) family of firmwares.
+
+Parts of the Hardware, mainly the Tx/Rx, Motors, ESCs and Battery, I reused from my previous xyCopter attempts.
+
+Of course, the huge X666 frame from HobbyKing, with a 666mm span, turned out to be far too huge for my first attempts.
+I also took spare arms from the X550 and X525 frames from HobbyKing, which were still too big.
+So after only a short time I tore down this copter and used the parts to build a smaller [Tricopter](trifecta.html).
+
+I also got carried away slightly with this build after looking at the features supported by Cleanflight.
+So it not only had the bare necessities but also GPS, a Compass, an Altimeter and an OLED display (that I all already had), which mostly never really worked, except for the display.
+I also mounted a Xiaomi Yi action cam to it and experimented a little bit with simple servo gimbals.
+
+## Parts List
+
+The prices listed below are just what I found while doing this page some years later, not the real prices I paid back then.
+
+<!--%
+tableHelper([ "align-right", "align-last-right", "align-right monospaced"],
+    [ "Part", "Description", "Cost" ], [
+        [ "Frame", ("HobbyKing X666 Glass Fiber Quadcopter Frame 666mm", "https://hobbyking.com/en_us/hobbyking-x666-glass-fiber-quadcopter-frame-666mm.html?___store=en_us"), "17.88€" ],
+        [ "FC", ("Openpilot CC3D Flight Controller With Cable Set", "https://hobbyking.com/en_us/openpilot-cc3d-flight-controller-with-cable-set-fully-authorized.html"), "17.39€" ],
+        [ "ESCs", ("", ""), "€" ],
+        [ "Motors", ("4x Robbe Roxxy 2824-34 1100KV", "https://www.hobbydirekt.de/Neuheiten-2016/Manufacturer/Robbe2/Robbe/Elektromotoren/ROXXY-BL-OUTRUNNER-2824-34-Robbe-1-477834-477834::78190.html"), "113.60€" ],
+        [ "Props", ("", ""), "€" ],
+        [ "Cam", ("Sony 700TVL PAL FPV Camera", "https://amzn.to/3i0cUh8"), "15.00€" ],
+        [ "VTx", ("Boscam 5.8Ghz 200mW FPV Transmitter", "https://hobbyking.com/de_de/boscam-5-8ghz-200mw-fpv-transmitter.html"), "22.79€" ],
+        [ "OSD", ("Minim OSD v1.1", "https://hobbyking.com/en_us/minim-osd-v1-1.html"), "19.79€" ],
+        [ "Rx", ("FrSky D8R-XP 2.4Ghz Receiver (w/telemetry & CPPM)", "https://hobbyking.com/en_us/frsky-d8r-xp-2-4ghz-receiver-w-telemetry-cppm.html"), "25.66€" ],
+        [ "Battery", ("Turnigy 4000mAh 3S 30C Lipo Pack w/XT-60", "https://hobbyking.com/en_us/turnigy-4000mah-3s-30c-lipo-pack-xt-60.html?queryID=&objectID=69420"), "26.09€" ],
+        [ "", "Sum", "€" ]
+    ]
+)
+%-->

macros.py

@@ -40,20 +40,28 @@ def tableHelper(style, header, content):
         print "<tr>"
         for i in range(0, len(style)):
             s = style[i]
+            td_style = ""
+
+            if "monospaced" in s:
+                td_style += " font-family: monospace;"
+
             if "align-last-right" in s:
                 if ci == (len(content) - 1):
-                    print "<td style=\"text-align: right;\">"
+                    td_style += " text-align: right;"
                 else:
                     if "align-center" in s:
-                        print "<td style=\"text-align: center;\">"
-                    else:
-                        print "<td>"
+                        td_style += " text-align: center;"
             elif "align-right" in s:
-                print "<td style=\"text-align: right;\">"
+                td_style += " text-align: right;"
             elif "align-center" in s:
-                print "<td style=\"text-align: center;\">"
-            else:
-                print "<td>"
+                td_style += " text-align: center;"
+
+            td_args = ""
+            if td_style != "":
+                td_args = " style=\"" + td_style + "\""
+
+            print "<td" + td_args + ">"
+
             if isinstance(content[ci][i], tuple):
                 text, link = content[ci][i]
                 print "<a href=\"" + link + "\">" + text + "</a>"