Revert "Bump version to 2015.03-3"

This reverts commit 9d8e9b5679.

.gitignore

@@ -1,22 +1,51 @@
-/*.scad
 *.dmg
 *~
 *.tar*
+*.new
+out.*
 Makefile
 objects
 .gdbinit
-/*.stl
-/*.dxf
-/lexer_lex.cpp
-/parser_yacc.cpp
+.qmake.stash
 parser_yacc.h
-/tmp
-/OpenSCAD.app
-*/#*#
-/nbproject
-/openscad
-/tests/openscad_nogui
+**/#*#
 testdata/scad/features/import_dxf-tests.scad
 testdata/scad/features/import_stl-tests.scad
 testdata/scad/misc/include-tests.scad
 testdata/scad/misc/use-tests.scad
+**/project.xcworkspace
+**/xcuserdata
+/*.scad
+/*.stl
+/*.dxf
+/*.off
+/*.amf
+/*.png
+/*.csg
+/*.nef3
+/*.blend
+/*.obj
+/*.rcad
+/*.xml
+/*.dat
+/*.gcode
+/*.py
+/*.svg
+/*.h
+/*.dump
+/*.pl
+/lexer_lex.cpp
+/parser_yacc.cpp
+/OpenSCAD.app
+/openscad.pro.user
+/openscad
+/locale/*/*/*.mo
+/locale/*.mo
+/locale/POTFILES
+/tmp
+/nbproject
+/mingw32
+/mingw64
+src/*.org
+src/*.old
+src/*.debug

.travis.yml

@@ -2,16 +2,88 @@ language: cpp
 cache: apt
 compiler: gcc
 
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#openscad"
+    on_success: change
+    use_notice: true
+    skip_join: true
+
 before_install:
  - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
  - sudo apt-get update -qq
- - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
+ - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev curl imagemagick libfontconfig-dev
  - sudo apt-get install -qq libopencsg-dev
-
-env: OPENSCAD_UPLOAD_TESTS=yes 
+ - echo 'yes' | sudo add-apt-repository ppa:mapnik/nightly-trunk
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq libharfbuzz-dev
+ - echo 'yes' | sudo add-apt-repository ppa:oibaf/graphics-drivers
+ - sudo apt-get update -qq
+ - sudo apt-get install --install-recommends libgl1-mesa-dev-lts-quantal
 
 branches:
   only:
     - master
 
-script: ./scripts/travis-ci.sh
+before_script:
+ - echo -e "Host files.openscad.org\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+ - echo -n $openscad_rsa_{00..40} >> ~/.ssh/openscad_rsa_base64
+ - base64 --decode --ignore-garbage ~/.ssh/openscad_rsa_base64 > ~/.ssh/id_rsa
+ - chmod 600 ~/.ssh/id_rsa
+
+script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./scripts/travis-ci.sh ; fi
+
+env:
+ global:
+ - OPENSCAD_UPLOAD_TESTS=yes 
+ - secure: "mBWdnkXe8BL1SqYRBnOOpXn60xtHGfpeVOh+HrK8xZPflLyJLdgAz3jsrgPaaMibfuygOEfn86jm8dFZPDJSeGh+gGbcjbtOywvYtr0d/KJPk2ccCavlGEBsTSdfWVBMH2hqZ+OXrSn4amx12fmcF/rnpRZu0jHxRWrL4SbouXM="
+ - secure: "gYPUvQekTxYW4bNIDvL6MFdPihd0HFGIq2saEbcOVyGYuZTdyBIzoh3tLIdG6jJNLWb/Nn2iWEsbsSsSIVk9UowW2qmuKVmzOyezKiu7wO2bdk08zeNtZLdFU4f8NsPz/ODXGQBCbjrBr8csnczQ9DKcxQeG2Lr9z1PjpJE43zY="
+ - secure: "N4tu1zJPq4tDrfArXawiQZ/oAb3jZ1xEonxH2WWMnUXj6CGMSrRbkUD7h7Yx5WcIgxkDE87Q+mMgKDNDhDQuK4RiTngwokXKSCHYn0odo10o1SWiNE42czLpbCTWJeM/5m+nyPhE1Hn8StTwiwqiA2YkBUICh/z+s6cmqV5JaEU="
+ - secure: "hfkGLUH90vkYIIQlBjAlYRxl/KJE/d5Z8cGnXGN77+RuvmGN2vMspSTXdvIe7KXesLs3ly96iA/mx3LLzW4YQu1qlwaAtffXiX2GBUFgRAHQV4Ty6PJzwRjzTxqZTh2jE+lZukB/6oh0ZlF4lpFYRFIMwLQMP64gGN0aqdQwc0I="
+ - secure: "UBH3ATAhykSH4su70oG6vmnOfV62ghNDLO/Y5dZwZvZVkKdERdddtpP8tPmJrkeqZp6nZs2DPA1ufgifaShZgv5eo5U1pdg4zFRA8UuOlK51QWdPYdk4/kTbifqeKhiQlNpvMXGnRPfk0a2HdAiaAHk0FKIPBRPAgwJlE03zKf4="
+ - secure: "YAMu566rDdaAHflMlvBdwkb7F4DNoDa6nJ1/d0bbaPDDk2onxzt5Nos9P3LMMya9XDo/+/8XZWUhdU2t8fwKfKiAanaIPiDYFaS7gZDohu7TI41rqJnnHFF1KNtG624PbABIgKBu8AEHsF1op7EG31SD8ZFyYTBdFOlgVruNWEA="
+ - secure: "cLVNa1aAtGyO7nHumphZRcNmMnFp+Ts4Bqh6WlclZ3RljEp5rKqHP3knHVgE6T0jC6zMTdNDwKHkyW2jlETRa0l7SGblZI1iuAATnNMwH14FPJgfHP2g30dYu714J6ik6UWUyFNex6o5ZlrVnTnrTuQpTQmF/Ehb4xBcFh780S8="
+ - secure: "VXa5G1ow1YND0Ap7jTH6oewSlgE3bQz0ZRKPz/bMEQhmImitAW24LG+kLi1RWfvtwJdHBOExlwh/yGpe508WXLF5F/Hv9LKTeAFixUSpFXt1Llsx1/LuApy7i4bq9nmx30Of5GiFvUARTr0wa1a3BbH5E0Sj963vVLwy+FZDiS8="
+ - secure: "K9pzYAsFc9rvFVz12Y80uFpruH7R5tJpurtGxQJpgSRCr4kRlJO+ODt4/Voq7lzFCiMuhbBiE0G4f8SzylyyiyJaZshAxqRBteEdDEMEnx1ND4FbqDnB9apWnWRoY1AbqBx1ckEy3jCvw1Tn9bRvvvcnOI6qXFxLpTJMP3eY6R4="
+ - secure: "Oa/blQENesTANzJbqzdQPQ1Hg99DaUVCekms1xkymLBUCSzqPL44KVdz3cxVGYBl/Om7mBwENEQ9BOUI6vGq+CZ7aaTYrYfEUokgvhGUgku0iLjxpHrIH04TH4XwpDXRg/iLwdQZO3d+xq7Q4XTBLOEyHVdzn5uDGP+cNoW9NbM="
+ - secure: "L3vKi+0gahSm8DF2GGp98FPhuWtUlqRRpCXjAUsSVNCPtru01tI4i6Kls7yqq2L+31FtkyWqBIlm1S1OZw8uiPyis3eUDqMRgASs4tOx/q2Xj2TEK8p+TKK+d3A8mct/y0e806GwdH5JIIppGSPOknPtxT92jZMrv0PnGnPAJSQ="
+ - secure: "fZzEs4GUtK494s63as9K72kmw0taicfouk2NDym58wHqS88UeRVjvrAkwoIGLJS6rCrh/4NkKhxPkd6JNVRVHy3KH8j2FYoIwtLStEC7YZfT25gi8EiN+O6MrTVre1WA9RT52v5gQ+a2v2YPUU6fBJAy6Xgy372PzoQrXF4iYOA="
+ - secure: "fNSoCKmJQUJJn4rFxsX0YXHIEtF3JCIixBkM8sCmuzOxjUPFLEjD/5D4x/t+FJfGwb1PR4194L3Tys7AK4IrpIDDXBO8vF3PYK1/evoPLPgj4IkPOReoX2zDUhxsvnEVlF3pGMK6erB6QZoDFCYD6OvqeQUxDDDuEvG8UEvNUgc="
+ - secure: "apJEmAnp5Ome0UJk+UEsdlVNBOX4bXE9FjBp6yYVrSeAEASFZTZbnIQXP9N8XwFc+TBa5aBlV9s7GZaieVW1/uNZg9njGUsbxPLtqpyHqJTDBgw3edcs7V12jGl+quRJoYVOtbyMQyr5VwCPzV6MmaLOoEtJM75yoSUoerkyNiI="
+ - secure: "AnXGOWlfhnxEuwqfnir411x/Z2Kvd/R37F8Jcv60+3dugCTLsOL/9i7rY5mwwm2ZFx4uwbCDXEC+UlW/vUhLhvdh8sCYocpghxY+WQye1cib+voqkP6Tgi1AtZL2CxBTJ2Kvyr+kNGTl0TvQC/uv3qI/D+ePijn89KFt9Z2NQEk="
+ - secure: "KPpkgyXr1mpbNOtxn0NAH2iS0NSy/LC6/DBoR9PBmK80LmHqhQkcB+OAwHy5q4RvRpeNIm2zg49OvV7RgzXQD3NXIy7Eik3uM6IzrcHXlDO6zPye/EAMYt/C0tJylR6ESDfp1+pEI0VyFz6pjFFs7FAX5m9UinaEJns7vucb8SA="
+ - secure: "Hf1TNzMMPw7msFCttHoF0V2wOFQERbGwYsZSMUac8njBXDjbsP+S/iYNkqoqJIfBjknXbn1U0RDfiDwvs/71lhV0FEoF2zPbOWitO7+ZeqpNcP2oMqnPBLCuCldKWxbsjKLwE5Qgd9KflPh49ZlnHe/cZZdzeDCIpAmHk+Ey/4U="
+ - secure: "cG7qndC1YAHa05QSLD8CzAZJOyJsHj4+I8OKvv+nfKFO/pQVZzKfF84v0ZVxpqdFNRRUwdH4n7zYCNAaMSoeSQmk++jyf+w8cu+x1MZ9HcnfqduuyirZR5iehmlIy1v/c1CsxAQeovDMulnFJOXGf7q7tUqB3rw/WlZZHn6Fpfc="
+ - secure: "NHym8MhLToBE5dlldCKTBn8NuLQg9jhjdB/9Gnn0h5j0G3x3O9yx3XbBtVSKNdvtqfGog6NG6XT2UhCYGtv59lTcWVR5tPulYkJV1vqeHfY21QeDYIESr/JOZaAIZ0RQaT/jWnoIghQNe38VMozWdwZ3ulKQ2HnzFagTbftfF5A="
+ - secure: "mClAXQOm9gc7UXuXpyqfNWp7JJU4n6n3pd792VK8K8ioXKVSySZLbJOFul5KY8ZLePCvdliZ0yfKqyBR7XqbzPFwH/0R3pppaI+T/0mZRi5SqcJ9KnJdf7jkTLsQI73wU25YC/T6ZHodEfANYTaP06Ex7QnY/djWsTvAH3Ga2dA="
+ - secure: "BdYq/BztHLp4TGExfjAxRW9Qtnpi7aizY6fyQNqOBorF6aYKNLOaaN8i7bURL7I5B+WT2vR/NFDv8Ehz096HFjnDZ8vVFn4tQQgGlxf+BcYrBOeA+AIxA9XR/yp9v6ljONasD7PQ8uDJoyUy9FOimet6T5GAOTy8LO8SRQDvxoY="
+ - secure: "iHb3IwbyrCKW884oVvckz7BR8F9YhLQXkEUvufc/5oKtsn/zMflHQ1+OV04q4j7B5hdu9/ur8T0q80YysJL8btHT0vnR7kx/uDx/S8tqXlMMb0Tr1JUGLFIHBZWRPUCayXTcBk06BrYRA1wB8cLQnLxqI4OfgMAN+rOv60CGR8k="
+ - secure: "XzK4KXCtcu5B1Flyiq9jl7hxnsUXXTYcmSq7bmIM4g8dsRz6EdDWrSBJUIstKCLckmoeQcfyCyXYjy2dvGgv7FX+Hu1nNGCZGy/rOIaciiinHf9mQZVTTwUZv1gGPZo2jdue15NvvCLwJt/N6SSZYor8fRyPyuVnK8/PBj4jcao="
+ - secure: "YFEbESe4qlFKXsgYgST3Z9NRMyNEj2oVYEzgcB+dWsVnfDufhtjUhQ+AGw+vsbYg2g2TIQzyVSWMG+mQo41SX4bLFH0Rwgial4ZnpWP7NHrkCgjIeeZRP/f81KIdGnCyabatOkJPQQ5qS0cZVRpQaXq8Zsxk+aDmYc2kZwWA3xc="
+ - secure: "Tv1OUgeQDBPwnL5GsEBiKjr1HdMrvsedk5I6ckbpBa6S1dKCzirOJRRHr9ZP4/TiZYEBd84nQZ5fKTIrCxU18CQzrs/gsS2hHyN+Nr8cpWpa6IovKOpMKxCYryLJFpX69cihcOVzp1xQq+a7sZq/yhZJmKaUBFlZchyPtJ1ysmg="
+ - secure: "iYz1GPvgcYpue6CKaW/O8iEolwC0UFztsZWzJZyrpZGrsw0fZbqpcn9ACEc+LQKYmvTo3hdBj9ewZB4+Bj4VMVIjgTlYsP0rYESsPd7njgpll+WfslRd5WNJLioUiPeb29yC4woiGa+/YHy2ACJI+ix7F6NyHk+2ri0MCOa4BnQ="
+ - secure: "Xwco3s7JM7hsAuDrAKuaYBjMccNTKWCXsoE48kQsKGlBM/iQ849nGTmImIKvdh0tZG5LDXgc04rbldhnpvMfWmty0hrQZuwjPaHBqHQ7zWXeNl3/CpAIGTBsefO7hTRoT2+xw1I6f4n8a5U7FICaGmWkR/MvykPOJyR+ms/hOQM="
+ - secure: "lNW2JDlel5MC9kwRu9lvNPWdlkbhAmkLo/YovVsrKyXPZfETWZO6IU2dDfKQvetIB2zQQnplbozdyiRBMywBnAk27FqLRAjbBqlKTC1jPlU4W29SBCMf+kJlVcQHvh0feeJChBZrVb2GQIAiHEkloDFX03E7RhOPAE5GqzvYow0="
+ - secure: "ZCfE5sS+70M4MVDOxVMlYcge7LewYbHIm0DE7QFfkwJ9sobaVr+uQMWe+9bA3DhxhdvQQ9p6lGE36ST+WYWopO7SHW6Ly+WvH1kM1nOZfY4w5R+BlAJ9QPcudnPUuFMOBXM0Wm8XccPuld2D5Jg7SalmS1F6mdArXsuL55CXxco="
+ - secure: "G4MDFYa3BbzqUGMfrABOjEjIa/pXHR8/jgOIQxY3FK2/0bYr//2YU/bw1gJBPQc8Ef243LzhTKvfFhntTecSfH2pS0Ezm2HWwtaF+lBg/A5bYCJX5Tek6HAOv1+aajTRZAjjj4X28T0NCqJI6u1WvbHwYFmW8wsfZtYZKB8JFuo="
+ - secure: "Py01+IBxGWKG7lyV10bZPYnqvLxNNBE+L6i1hvvvQmx078LfKtVr3tdDSZJVjf3H+gMXW0qnEhBYWJlzKPO5zCMhX314s43yxW3a5N+QZ74ucCO0Yvc4JXA8y7+g4lgsihJmzLSGQZziT+xnn0Q4iNpB8G0kXcl7zVT/ZsLFooQ="
+ - secure: "lkkLCzuHhR1Z3zzV/8me/PbzMConA8kdxUQ6mQb4VZE8h3wsRDh9P8yKciluV/ZVgqZtLG8VbVnLHgVzzu2zDTqf1t/Gsb5u8Rq5w/sTZyqMpB9qpRjHmq+uPds+ScvAplyoPH4oskXS8xQ8G1ykJwPBbRETyZzAU2/JoOgWiOs="
+ - secure: "KQlczojVt3jfMtsnl1GFiKsCxkPOaIr95MxopGYqqOVxzRDeNvtJcA/xQU1ouibJlx9B/EHZx0K+/DIk6dyr+irAVzgPGdT5pRxmjSREONPDaGEj9f4D6GWS3AtUJW2AqTMdtI3+d6o7oaYFGGXTCeW+qFMcsxEpn3eT1HMJs1A="
+ - secure: "XeqXuqqHPAW6/5WukY8y3n1PmaP7ASuNvMTd/Xv3sXzcci11ZKWNEOQDxZeRUwuEot4v2WG+m4HuvIqGWbz6mi8+4OaWUynLRitlGWj7JBu1igN9awmOw+HOcM32v2UcxUdsUSB5AdEOs7hafjodbshxrWQbo05ruk6Au4+jrd4="
+ - secure: "Ej8RRGUT95llMPDUtbx/lF7D9bKGxTCGdKZbTKFdIPjUzTJgE0pm89vIxKvq7y//oMCposX5DjcVolF+dS2Ya2031MTUto3mUwFq+sx3t2knWt812mQ6p2Ow/l6/uOlr2FHxUJKOxPeWqLRB6NYd9YnUiC3OJNlERr8nyHkCx4c="
+ - secure: "JsOTX5JsRAY3zyKa/5yYkd48Nejt9CAEraXVpN1NDW25jJmsOynyW5d2WYazJ1H0x1oR6Fhc4gstNxaj1MNh/gVM9O3UM2tyFnSxDY6fZnEGWaf17ln4dqi3KHXWU7h2Gdg1ah19NS0nWytooW6VcEXmk+cYSheTqyfc5gK7Sdo="
+ - secure: "mMc9MyopIjvzpDg3eN6owSmr2PI58JiPnlLhMNvOWW9axUzup5tthfqM+tvR/AqdLQSSMUC9JXwwQK0d543Q4YyoQ0jwVY2RT56VdEywxD5+yWRfXD+ANlJhdQWmlPVc3KsavKYmfQPBLbwe0nyhtQTWGeAgKTYvYT+k1/PD4rg="
+ - secure: "X7KDSiSOR3XcePJgTXNzwE1wU285yFsxB7crMLskD08wU8xdRqS8NL+1++/Lju6pypOkospI2AYH1JAJ7JK3Sx5QYM4MxgRJcrMHiTMirN3cm3KzkWUuv3iEZNJ7q6ANi5oFfHh3k0D4JhCEnA1ICTDPdq+r9+mOvgkrly8V0Dw="
+ # scan.coverity token
+ - secure: "CGHkiv3Aki3HF2xiNPbPEqB66Xcz8HrdhSpFYjQFqHsrseIXOmZGLaIdnkwCqoIHUMFVtqGVGSxRhhrSOrAq+uOgc6Wyst8u6ThN3HhRbvQgF2v7XvtGsTiAObxLvj5V91gqQwHxWPHf948Cm12QQgmEd+dbhyjPWsmVMDb4gNk="
+ 
+addons:
+  coverity_scan:
+    project:
+      name: "openscad/openscad"
+      description: "The Programmers Solid 3D CAD Modeller"
+    notification_email: dev@openscad.org
+    build_command_prepend: qmake
+    build_command: make
+    branch_pattern: coverity_scan

Info.plist

@@ -18,6 +18,11 @@
 	<string>@SHORT_VERSION@</string>
 	<key>CFBundleShortVersionString</key>
 	<string>@SHORT_VERSION@</string>
+	<key>LSEnvironment</key>
+	<dict>
+	  <key>GUI_LAUNCHED</key>
+	  <string></string>
+	</dict>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -77,5 +82,15 @@
 	<string>OpenSCAD.sdef</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
+	<key>SUFeedURL</key>
+	<string>http://files.openscad.org/appcast.xml</string>
+        <key>NSExceptionDomains</key>  
+        <dict>  
+          <key>files.openscad.org</key>
+          <dict>  
+            <key>NSExceptionAllowsInsecureHTTPLoads</key><true/>  
+            <key>NSExceptionRequiresForwardSecrecy</key><false/>  
+          </dict>  
+        </dict>
 </dict>
 </plist>

README.md

@@ -1,4 +1,6 @@
-![Travis CI](https://api.travis-ci.org/openscad/openscad.png)
+[![Travis CI](https://api.travis-ci.org/openscad/openscad.png)](https://travis-ci.org/openscad/openscad)
+[![Coverity Status](https://scan.coverity.com/projects/2510/badge.svg)](https://scan.coverity.com/projects/2510)
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/openscad/openscad/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 # What is OpenSCAD?
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=openscad&url=http://openscad.org&title=OpenSCAD&language=&tags=github&category=software)
@@ -86,20 +88,23 @@ libraries from aptitude. If you're using Mac, or an older Linux/BSD, there
 are build scripts that download and compile the libraries from source. 
 Follow the instructions for the platform you're compiling on below.
 
-* [Qt4 (4.4 - 4.8)](http://www.qt.nokia.com/)
-* [CGAL (3.6 - 4.1)](http://www.cgal.org/)
+* [Qt4 (4.4 - 5.4)](http://www.qt.nokia.com/)
+* [QScintilla2 (2.7 - 2.8)](http://www.riverbankcomputing.co.uk/software/qscintilla/)
+* [CGAL (3.6 - 4.5)](http://www.cgal.org/)
  * [GMP (5.x)](http://www.gmplib.org/)
- * [cmake (2.8, required by CGAL and the test framework)](http://www.cmake.org/)
  * [MPFR (3.x)](http://www.mpfr.org/)
- * [boost (1.35 - 1.53)](http://www.boost.org/)
-* [OpenCSG (1.3.2)](http://www.opencsg.org/)
+* [cmake (2.8 - 3.0, required by CGAL and the test framework)](http://www.cmake.org/)
+* [boost (1.35 - 1.57)](http://www.boost.org/)
+* [OpenCSG (1.3.2 ->)](http://www.opencsg.org/)
 * [GLEW (1.5.4 ->)](http://glew.sourceforge.net/)
-* [Eigen (3.0 - 3.2)](http://eigen.tuxfamily.org/)
-* [glib2 (2.2.0)](https://developer.gnome.org/glib/)
-* [GCC C++ Compiler (4.2 ->)](http://gcc.gnu.org/)
-* [Bison (2.4)](http://www.gnu.org/software/bison/)
-* [Flex (2.5.35)](http://flex.sourceforge.net/)
-* [pkg-config (0.26)](http://www.freedesktop.org/wiki/Software/pkg-config/)
+* [Eigen (3.x)](http://eigen.tuxfamily.org/)
+* [glib2 (2.x)](https://developer.gnome.org/glib/)
+* [fontconfig (2.10 -> )](http://fontconfig.org/)
+* [freetype2 (2.4 -> )](http://freetype.org/)
+* [harfbuzz (0.9.19 -> )](http://harfbuzz.org/)
+* [Bison (2.4 -> )](http://www.gnu.org/software/bison/)
+* [Flex (2.5.35 -> )](http://flex.sourceforge.net/)
+* [pkg-config (0.26 -> )](http://www.freedesktop.org/wiki/Software/pkg-config/)
 
 ### Getting the source code
 
@@ -117,26 +122,41 @@ To pull the MCAD library (http://reprap.org/wiki/MCAD), do the following:
 ### Building for Mac OS X
 
 Prerequisites:
-* XCode, including XCode command-line tools (install from XCode Preferences).
-* [CMake](http://cmake.org) and [pkg-config](http://www.freedesktop.org/wiki/Software/pkg-config/),
-   both can be installed manually or through MacPorts/homebrew.
 
-Then after you've cloned this git repository, run the script that sets up the
-environment variables.
+* XCode, including XCode command-line tools.
 
-    source setenv_mac-gcc.sh
+Install Dependencies:
 
-(or setenv_mac-clang.sh if you want to use the clang compiler instead of gcc).
-Then run the script to compile all the prerequisite libraries above:
+Run the script that sets up the environment variables:
+    ```source setenv_mac-qt5.sh```
 
-    ./scripts/macosx-build-dependencies.sh
+Then run the script to compile all the dependencies:
+    ```./scripts/macosx-build-dependencies.sh```
 
-You can also install the prerequisites using
-[MacPorts](http://www.macports.org).  Unfortunately,
-[brew](http://mxcl.github.com/homebrew/) doesn't yet support CGAL and
-OpenCSG.
 
-After that, follow the Compilation instructions below.
+After building dependencies, follow the instructions in the *Compilation* section.
+
+For the adventurous, it might be possible to build OpenSCAD using _MacPorts_ or _Homebrew_. The main challenge is that both these systems have partially broken libraries, but that tends to change from time to time.
+
+1. **MacPorts** (assumes [MacPorts](http://macports.org) is already installed)
+
+    NB! MacPorts currently doesn't support Qt5 very well, so using Qt4
+    is the only working option at the moment. However, MacPorts' Qt4
+    has a broken ```moc``` command, causing OpenSCAD compilation to
+    break. This may be fixed in MacPorts by the time you read this.
+
+    ```sudo port install opencsg qscintilla boost cgal pkgconfig eigen3 harfbuzz fontconfig```
+
+1. **Homebrew** (assumes [Homebrew](http://brew.sh)) is already installed)
+
+    NB! Homebrew's ```qscintilla2``` component doesn't support Qt5, so using Qt4 is currently necessary.
+    However, Homebrew's Qt4 has a broken ```moc``` command, causing OpenSCAD compilation to
+    break. This may be fixed in Homebrew by the time you read this.
+    NB! Homebrew's ```harfbuzz``` package requires X11, so you may have to install an X11 server.
+    NB! Homebrew doesnt have an OpenCSG package
+
+    ```brew install cgal qscintilla2 eigen harfbuzz```
+
 
 ### Building for Linux/BSD
 
@@ -146,7 +166,7 @@ the dependency packages listed above using your system's package
 manager. A convenience script is provided that can help with this 
 process on some systems:
 
-    ./scripts/uni-get-dependencies.sh
+    sudo ./scripts/uni-get-dependencies.sh
 
 After installing dependencies, check their versions. You can run this 
 script to help you:
@@ -170,17 +190,9 @@ Then run the script to compile all the prerequisite libraries above:
 
     ./scripts/uni-build-dependencies.sh
 
-This may take an hour or more, depending on your network and system. It 
-is recommended to have at least 1 gigabyte of free disk space. As a 
-special timesaver if you are only missing CGAL and OpenCSG, you can do 
-this instead:
-
-    ./scripts/uni-build-dependencies.sh opencsg
-    ./scripts/uni-build-dependencies.sh cgal
-
-Note that huge dependencies like gcc or qt are not included here, only 
-the smaller ones (boost, CGAL, opencsg, etc). After the build, again 
-check dependencies.
+Note that huge dependencies like gcc, qt, or glib2 are not included 
+here, only the smaller ones (boost, CGAL, opencsg, etc). After the 
+build, again check dependencies.
 
     ./scripts/check-dependencies.sh
 
@@ -212,15 +224,16 @@ complete, build OpenSCAD and package it to an installer:
 If you wish you can only build the openscad.exe binary:
 
     cd mingw32
-    qmake .. CONFIG+=mingw-cross-env
+    qmake ../openscad.pro CONFIG+=mingw-cross-env
     make
 
 For a 64-bit Windows cross-build, replace 32 with 64 in the above instructions. 
 
 ### Compilation
 
-First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to
-run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool.
+First, run 'qmake openscad.pro' from Qt4 to generate a Makefile.
+
+On some systems, depending on which version(s) of Qt you have installed, you may need to specify which version you want to use, e.g. by running 'qmake4', 'qmake-qt4' or something alike.
 
 Then run make. Finally you might run 'make install' as root or simply copy the
 'openscad' binary (OpenSCAD.app on Mac OS X) to the bin directory of your choice.

RELEASE_NOTES

@@ -1,247 +1,325 @@
-OpenSCAD YYYY.MM
-================
 
-Language Features:
-o Added diameter argument: circle(d), cylinder(d, d1, d2) and sphere(d)
-o Added parent_module() and $parent_modules
-o Added children() as a replacement for child()
-o FIXME: Unicode support
-o FIXME: Ranges with negative steps
-o FIXME: Experimental concat()
+# OpenSCAD 2015.03
 
-Program Features:
-o Added --info parameter to the cmd-line for system/library info
-o Added --enable parameter to enable experimental features
-o Added Reset View in GUI
-o Added Feature tab in Preferences 
+## 2015.03-3
 
-Bugfixes:
-o polyhedron() is now much more robust handling almost planar polygons
-o Automatic reloads of large designs are more robust
-o Boolean logic in if() statements are now correctly short-circuited
-o rands() with zero range caused an infinite loop
-o resize(, auto=true) didn't work when shrinking objects
-o The $children variable sometimes misbehaved due to dynamic scoping
-o The --camera cmd-line option behaved differently then the corresponding GUI function
-o PNG export now doesn't leak transparency settings into the target image
-o Improved performance of OpenCSG (F5) compilation in some cases
-o Some editor misbehaviors were fixed
-o Stability fixes of CGAL-related crashes
+**OS X only: Auto-update vulnerability fix**
 
-Deprecations:
-o child() is no longer supported. Use children() instead.
-o polyhedron(triangles=[...]): Use polyhedron(faces=[...]) instead.
+## 2015.03-2
 
-Misc:
-o We now use CGAL's EPEC kernel
-o Additional output formats: .ast, .term, null (these are most useful for testing)
-o Test framework now shares more code with the GUI app
-o Test report can now be automatically uploaded to dinkypage.com
-o Better compatibility with BSD systems
+**Bugfixes**
+* \#1483 - Fix Z-fighting in Ortho view
+* \#1479 - No check for infinite $fn
+* \#1472 - "nan" in list comprehension causes crash
+* \#452 - rands() fails when the seed is a floating point number
+* \#1407 - Recursive module crash
+* \#1425 - Animate Filename Generation - Duplicate/Missing Filenames
+* \#1420 - expression-evaluation-tests fails on arm64
+* \#1410 - Crash when a polygon contains NaN
+* \#1378 - Linear extrude plus infinite twist causes crash instead of just an error
+* \#1358 - Add more detailed installer information including version number
+* \#1356 - Crash when multiplying matrices with undefined elements
+* \#1350 - Saving file when HD is full ends up in data loss
+* \#1342 - Syntax Highlighting Does Not Work on Linux Mint 17.1
+* \#1337 - Simple detection of script and direction based on given text
+* \#1325 - Crash when polygons with > 3 indices turn out to be degenerate
+* \#1329 - version() returned ```[0,0,0]```
 
-OpenSCAD 2013.06
-================
+## 2015.03-1
 
-Language Features:
-o linear_extrude now takes a scale parameter:
+**Bugfixes**
+* \#1203 - Linux: Missing icons on Xfce
+* \#1258 - Occasional crash when exporting STL
+* \#1260 - Minimal window width too large
+* \#1264 - Replace All sometimes caused a hang
+* \#1274 - Fixed some preview bugs on Intel GPUs (OpenCSG 1.4.0)
+* \#1276 - Module recursion sometimes caused a crash
+* \#1277 - Automatic reload sometimes messed up camera position
+* \#1284 - Animation flicker eliminated
+* \#1294 - Support reproducible builds
+* \#1317 - Normals vectors in STL were sometimes 0 0 0
+
+## 2015.03
+
+**Language Features:**
+* Added text() module for 2D text
+* Added offset() module for 2D offsets
+* Added list comprehensions and let()
+* Added concat() function
+* Added chr() function
+* surface() can now take PNG images as input
+* min() and max() can now take a vector argument
+* 2D minkowski can now handle polygons with holes
+* Variables can now be assigned in local blocks without using assign()
+
+**Program Features:**
+* Added Toolbar icons
+* New code editor based on QScintilla
+* Added Splash screen
+* Added SVG export
+* Added AMF export
+* Added --viewall and --autocenter cmd-line parameters
+* GUI is now translated into German, Czech, Spanish, French and Russian
+* MDI (Multiple Document Interface) is now available on all platforms
+* Color schemes for viewer and editor can be user-edited using JSON files
+* GUI components are now dockable
+* Added Tickmarks on axes
+
+**Bugfixes/improvements:**
+* Performance improvement: 2D (clipper), preview, hull, minkowski, surface
+* Performance improvement: Reduce duplicate evaluation of identical expressions
+* Better recursion behavior
+* STL export and import is now more robust
+* Internal cavities are better supported
+* New examples
+* Windows cmd-line behaves better
+* Better mirror() and scale() behavior when using negative factors
+
+**Deprecations:**
+* polyhedron() now takes a faces= argument rather than triangles=
+* assign() is no longer needed. Local variables can be created in any scope
+# OpenSCAD 2014.03
+
+**Language Features:**
+* Added diameter argument: circle(d), cylinder(d, d1, d2) and sphere(d)
+* Added parent_module() and $parent_modules
+* Added children() as a replacement for child()
+* Unicode strings (using UTF-8) are now correctly handled
+* Ranges can have a negative step value
+* Added norm() and cross() functions
+
+**Program Features:**
+* Cmd-line: --info parameter prints system/library info
+* Cmd-line: --csglimit parameter to change CSG rendering limit
+* Cmd-line: Better handling of cmd-line arguments under Windows
+* GUI: Added Reset View
+* GUI: Added Search&Replace in editor
+* GUI: Syntax highlighting now has a dark background theme
+* GUI: We now create a backup file before rendering to allow for recovery if OpenSCAD crashes/freezes
+* GUI: Accessibility features enabled (e.g. screenreading)
+
+**Bugfixes/improvements:**
+* Reading empty STL files sometimes caused a crash
+* OPENSCADPATH now uses semicolon as path separator under Windows
+* polyhedron() is now much more robust handling almost planar polygons
+* Automatic reloads of large designs are more robust
+* Boolean logic in if() statements are now correctly short-circuited
+* rands() with zero range caused an infinite loop
+* resize(, auto=true) didn't work when shrinking objects
+* The $children variable sometimes misbehaved due to dynamic scoping
+* The --camera cmd-line option behaved differently then the corresponding GUI function
+* PNG export now doesn't leak transparency settings into the target image
+* Improved performance of 3D hull() operations
+* Some editor misbehaviors were fixed
+* Stability fixes of CGAL-related crashes
+* Windows cmd-line can now handle spaces in filenames
+* Default CSG rendering limit is now 100K elements
+* Fixed a crash reading DXF files using comma as decimal separator
+* Fixed a crash running the cmd-line without a HOME env. variable
+* Intersecting something with nothing now correctly results in an empty object
+
+**Deprecations:**
+* child() is no longer supported. Use children() instead.
+* polyhedron(triangles=[...]): Use polyhedron(faces=[...]) instead.
+
+**Misc:**
+* Test framework now shares more code with the GUI app
+* Test report can now be automatically uploaded to dinkypage.com
+* Better compatibility with BSD systems
+* Qt5 support
+
+# OpenSCAD 2013.06
+
+**Language Features:**
+* linear_extrude now takes a scale parameter:
   linear_extrude(height=a, slices=b, twist=c, scale=[x,y])
-o Recursive use of modules is now supported (including cascading child() operations):
+* Recursive use of modules is now supported (including cascading child() operations):
   https://github.com/openscad/openscad/blob/master/examples/example024.scad
-o Parameter list values can now depend on earlier values, e.g. for (i=[0:2], j=[0:i]) ..
-o value assignments in parameters can now depend on already declared parameters
-o Added resize() module: 
+* Parameter list values can now depend on earlier values, e.g. for (i=[0:2], j=[0:i]) ..
+* value assignments in parameters can now depend on already declared parameters
+* Added resize() module: 
   http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Transformations#resize
 
-Program Features:
-o Added basic syntax highlighting in the editor
-o There is now a built-in library path in user-space:
+**Program Features:**
+* Added basic syntax highlighting in the editor
+* There is now a built-in library path in user-space:
   http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Libraries#Library_Locations
-o Commandline output to PNG, with various camera and rendering settings.        
+* Commandline output to PNG, with various camera and rendering settings.        
   Run openscad -h to see usage info or see the OpenSCAD wiki user manual.
-o Attempting to open dxf, off or stl files in the GUI will now create an import statement.
-o The preview operator (%) will now preserve any manually set color
-o The highlight operator (#) will now color the object in transparent red
-o Mac: Added document icon
-o Mac: Added auto-update check
-o Windows: Better cmd-line support using the openscad.com executable
+* Attempting to open dxf, off or stl files in the GUI will now create an import statement.
+* The preview operator (%) will now preserve any manually set color
+* The highlight operator (#) will now color the object in transparent red
+* Mac: Added document icon
+* Mac: Added auto-update check
+* Windows: Better cmd-line support using the openscad.com executable
 
-Bugfixes:
-o Importing files is now always relative to the importing script, also for libraries
-o We didn't always print a warning when CSG normalization created too many elements
-o Binary STLs can now be read on big endian architectures
-o Some binary STLs couldn't be read
-o Fixed some issues related to ARM builds
-o CGAL triangulation more lenient- enables partial rendering of 'bad' DXF data
-o The Automatic Reload feature is now more robust
-o If a file couldn't be saved it no longer fails silently
-o Fixed a number of crashes related to CGAL and OpenCSG rendering or complex models
-o The lookup() function had bad boundary condition behavior
-o The surface() module failed when the .dat file lacked a trailing newline
-o The hull() module could crash if any of the children were empty objects
-o Some problems using unicode filenames have been fixed
+**Bugfixes:**
+* Importing files is now always relative to the importing script, also for libraries
+* We didn't always print a warning when CSG normalization created too many elements
+* Binary STLs can now be read on big endian architectures
+* Some binary STLs couldn't be read
+* Fixed some issues related to ARM builds
+* CGAL triangulation more lenient- enables partial rendering of 'bad' DXF data
+* The Automatic Reload feature is now more robust
+* If a file couldn't be saved it no longer fails silently
+* Fixed a number of crashes related to CGAL and OpenCSG rendering or complex models
+* The lookup() function had bad boundary condition behavior
+* The surface() module failed when the .dat file lacked a trailing newline
+* The hull() module could crash if any of the children were empty objects
+* Some problems using unicode filenames have been fixed
 
-Misc:
-o Build scripts have been further improved
-o Regression test now creates single monolithic .html file for easier uploading
-o Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine
-o The backend is finally independent of Qt
-o Windows: We now have a 64-bit version
+**Misc:**
+* Build scripts have been further improved
+* Regression test now creates single monolithic .html file for easier uploading
+* Regression test auto-starts & stops Xvfb / Xvnc if on headless unix machine
+* The backend is finally independent of Qt
+* Windows: We now have a 64-bit version
 
-Known Bugs:
-o Linux: command-line png rendering on Gallium is flaky. 
+**Known Bugs:**
+* Linux: command-line png rendering on Gallium is flaky. 
   Workaround: use CGAL --render or hardware rendering.
 
-OpenSCAD 2013.01
-================
+# OpenSCAD 2013.01
 
-Features:
-o Snappier GUI while performing CGAL computations (computations running in separate thread)
-o The size of the misc. caches can now be adjusted from Preferences
-o The limit for when to disable OpenCSG can now be adjusted from Preferences
-o Added Dot product operator: vec * vec
-o Added Matrix multiplication operator: vec * mat, mat * mat
-o Added search() function
-o Dependencies are now tracked - any changes in uses/included files will be detected and cause a recompile
-o The OPENSCADPATH environment variable is now implemented will have precedence when searching for libraries
-o .csg files can now be opened from the GUI
-o linear_extrude() will now assume that the first parameter means 'height' if it's a number
+**Features:**
+* Snappier GUI while performing CGAL computations (computations running in separate thread)
+* The size of the misc. caches can now be adjusted from Preferences
+* The limit for when to disable OpenCSG can now be adjusted from Preferences
+* Added Dot product operator: vec * vec
+* Added Matrix multiplication operator: vec * mat, mat * mat
+* Added search() function
+* Dependencies are now tracked - any changes in uses/included files will be detected and cause a recompile
+* The OPENSCADPATH environment variable is now implemented will have precedence when searching for libraries
+* .csg files can now be opened from the GUI
+* linear_extrude() will now assume that the first parameter means 'height' if it's a number
 
-Bugfixes:
-o use'ing an non-existing file sometimes crashed under Windows
-o Better font handling: Ensure a monospace font is chosen as default
-o Division by zero caused hang in some cases (e.g. sin(1/0))
-o Larger minkowski operations sometimes caused a crash after a CGAL assert was thrown
-o Fixed crashes in shared_ptr.hpp (or similar places) due bugs in cache management and CSG normalization
-o scale() with a scale factor of zero could cause a crash
-o Fixed a number of issues related to use/include
-o Providing an unknown parameter on the cmd-line caused a crash
-o cmd-line overrides using -D now also work for USEd modules
-o Modifier characters can now be used in front of if statements
-o rotate() with a vector argument with less that 3 elements used uninitialized variables, ending up being non-deterministic.
-o .csg files will now have relative filenames whenever possible
-o Don't just ignore geometric nodes having zero volume/area - when doing difference/intersection, they tend to turn negative objects into positive ones.
-o Always use utf-8 file encoding, also under Windows
-o A lot of build script fixes
-o Some other crash bugs fixes
+**Bugfixes:**
+* use'ing an non-existing file sometimes crashed under Windows
+* Better font handling: Ensure a monospace font is chosen as default
+* Division by zero caused hang in some cases (e.g. sin(1/0))
+* Larger minkowski operations sometimes caused a crash after a CGAL assert was thrown
+* Fixed crashes in shared_ptr.hpp (or similar places) due bugs in cache management and CSG normalization
+* scale() with a scale factor of zero could cause a crash
+* Fixed a number of issues related to use/include
+* Providing an unknown parameter on the cmd-line caused a crash
+* cmd-line overrides using -D now also work for USEd modules
+* Modifier characters can now be used in front of if statements
+* rotate() with a vector argument with less that 3 elements used uninitialized variables, ending up being non-deterministic.
+* .csg files will now have relative filenames whenever possible
+* Don't just ignore geometric nodes having zero volume/area - when doing difference/intersection, they tend to turn negative objects into positive ones.
+* Always use utf-8 file encoding, also under Windows
+* A lot of build script fixes
+* Some other crash bugs fixes
 
-Deprecations:
-o The old include syntax "<filename.scad>" without the include keyword is no
+**Deprecations:**
+* The old include syntax "<filename.scad>" without the include keyword is no
   longer supported and will cause a syntax error.
 
-OpenSCAD 2011.12
-================
+# OpenSCAD 2011.12
 
-Features:
-o The MCAD library is now bundled with OpenSCAD
-o Added len() function. Takes one vector or string parameter and returns its length.
-o The index operator [] now works on strings
-o The version() function will return the OpenSCAD version as a vector, e.g. [2011, 09]
-o The version_num() function will return the OpenSCAD version as a number, e.g. 20110923
-o hull() Now supports 3D objects
-o hull() with 2D object can now use for loops and boolean operations as children
-o New import() statement reads the correct file format based on the filename extension
+**Features:**
+* The MCAD library is now bundled with OpenSCAD
+* Added len() function. Takes one vector or string parameter and returns its length.
+* The index operator [] now works on strings
+* The version() function will return the OpenSCAD version as a vector, e.g. [2011, 09]
+* The version_num() function will return the OpenSCAD version as a number, e.g. 20110923
+* hull() Now supports 3D objects
+* hull() with 2D object can now use for loops and boolean operations as children
+* New import() statement reads the correct file format based on the filename extension
   (.stl, .dxf and .off is supported)
-o The color() statement now supports an alpha parameter, e.g. color(c=[1,0,0], alpha=0.4)
-o The color() statement now supports specifying colors as strings, e.g. color("Red")
-o The color() statement now overrides colors specified further down in the tree
-o if()/else() and the ternary operator can now take any value type as parameter. false, 0, empty string and empty vector or illegal value type will evaluate as false, everything else as true.
-o Strings can now be lexographically compared using the <, <=, >, >= operators
-o Added PI constant.
-o Number literals in scientific notation are now accepted by the parser
-o Added import and export of the OFF file format
-o Now uses standard shortcuts for save, reload and quit on Linux and Windows. F2/F3 will still work but is deprecated.
+* The color() statement now supports an alpha parameter, e.g. color(c=[1,0,0], alpha=0.4)
+* The color() statement now supports specifying colors as strings, e.g. color("Red")
+* The color() statement now overrides colors specified further down in the tree
+* if()/else() and the ternary operator can now take any value type as parameter. false, 0, empty string and empty vector or illegal value type will evaluate as false, everything else as true.
+* Strings can now be lexographically compared using the <, <=, >, >= operators
+* Added PI constant.
+* Number literals in scientific notation are now accepted by the parser
+* Added import and export of the OFF file format
+* Now uses standard shortcuts for save, reload and quit on Linux and Windows. F2/F3 will still work but is deprecated.
 
-Bugfixes:
-o Complex CSG models sometimes took extremely long time to normalize before OpenCSG preview
-o square() crashed if any of the dimensions were zero
-o Flush Caches didn't flush cached USE'd modules
-o STL export should be a bit more robust
-o Dropping a file into the editor under Windows didn't work (double C:/C:/ problem)
-o On some platforms it was possible to insertion rich text in the editor, causing confusion.
-o Less crashes due to CGAL assertions
-o OpenCSG should now work on systems with OpenGL 1.x, given that the right extensions are available
-o include now searches librarydir
-o The $fs parameter yielded only half the number of segments it should have
-o surface(center=true) is now correctly centered in the XY plane
+**Bugfixes:**
+* Complex CSG models sometimes took extremely long time to normalize before OpenCSG preview
+* square() crashed if any of the dimensions were zero
+* Flush Caches didn't flush cached USE'd modules
+* STL export should be a bit more robust
+* Dropping a file into the editor under Windows didn't work (double C:/C:/ problem)
+* On some platforms it was possible to insertion rich text in the editor, causing confusion.
+* Less crashes due to CGAL assertions
+* OpenCSG should now work on systems with OpenGL 1.x, given that the right extensions are available
+* include now searches librarydir
+* The $fs parameter yielded only half the number of segments it should have
+* surface(center=true) is now correctly centered in the XY plane
 
-Deprecations:
-o dxf_linear_extrude() and dxf_rotate_extrude() are now deprecated.
+**Deprecations:**
+* dxf_linear_extrude() and dxf_rotate_extrude() are now deprecated.
   Use linear_extrude() and rotate_extrude() instead.
-o The file, layer, origin and scale parameters to linear_extrude() and rotate_extrude()
+* The file, layer, origin and scale parameters to linear_extrude() and rotate_extrude()
   are now deprecated. Use an import() child instead.
-o import_dxf(), import_stl() and import_off() are now deprecated. Use import() instead.
-o When exporting geometry from the cmd-line, use the universal -o option. It will export to the correct file format based on the given suffix (dxf, stl, off). The -x and -s parameters are still working but deprecated.
-o F2 and F3 for Save and Reload is now deprecated
+* import_dxf(), import_stl() and import_off() are now deprecated. Use import() instead.
+* When exporting geometry from the cmd-line, use the universal -o option. It will export to the correct file format based on the given suffix (dxf, stl, off). The -x and -s parameters are still working but deprecated.
+* F2 and F3 for Save and Reload is now deprecated
 
-OpenSCAD 2011.06
-================
+# OpenSCAD 2011.06
 
-o Added "Export as Image" menu.
+* Added "Export as Image" menu.
 
-Bugfixes:
-o Cylinder tesselation broke existing models which are using cylinders
+**Bugfixes:**
+* Cylinder tesselation broke existing models which are using cylinders
   for e.g. captured nut slots and are dependent on the orientation not
   changing.
-o DXF output couldn't be imported into e.g. AutoCAD and Solidworks after updating
+* DXF output couldn't be imported into e.g. AutoCAD and Solidworks after updating
   to using the AutoCAD 2000 (AC1015) format. Reverted to the old entity-only output,
   causing LWPOLYLINES to not exported allowed anymore.
 
+# OpenSCAD 2011.04
 
+* Added hull() for convex hulls (2D object only)
+* minkowski() now supports 2D objects
+* Added functions: rands(), sign()
+* Now supports escaping of the following characters in strings: \n, \t, \r, \\, \"
+* Support nested includes
+* Improved parsing of numbers
+* DXF: output LWPOLYLINE instead of just LINE entities
+* Bugfixes: More robust DXF export, setting $fs/$fa to 0 caused a crash
+* Some bugs fixed, maybe some new bugs added
 
-OpenSCAD 2011.04
-================
+# OpenSCAD 2010.05
 
-o Added hull() for convex hulls (2D object only)
-o minkowski() now supports 2D objects
-o Added functions: rands(), sign()
-o Now supports escaping of the following characters in strings: \n, \t, \r, \\, \"
-o Support nested includes
-o Improved parsing of numbers
-o DXF: output LWPOLYLINE instead of just LINE entities
-o Bugfixes: More robust DXF export, setting $fs/$fa to 0 caused a crash
-o Some bugs fixed, maybe some new bugs added
+* Added functions and statements
+  * Added abs() function
+  * Added exp(x), log(b, x), log(x) and ln(x) functions
+  * Added minkowski() statement for 3d minkowski sums
+* Added 'include <filename>' and 'use <filename>' statements
+  * Old implicit '<filename>' include statement is now obsolete
+* Some bugs fixed, maybe some new bugs added
 
-OpenSCAD 2010.05
-================
+# OpenSCAD 2010.02
 
- o Added functions and statements
-  - Added abs() function
-  - Added exp(x), log(b, x), log(x) and ln(x) functions
-  - Added minkowski() statement for 3d minkowski sums
- o Added 'include <filename>' and 'use <filename>' statements
-  - Old implicit '<filename>' include statement is now obsolete
- o Some bugs fixed, maybe some new bugs added
+* Added functions and statements
+  * Added sqrt() function
+  * Added round(), ceil() and floor() functions
+  * Added lookup() function for linear interpolation in value list
+  * Added projection(cut = true/false) statement
+  * Added child() statement for accessing child nodes of module instances
+  * Added mirror() statement
+* Improved DXF import code (more entities and some bugs fixed)
+* Added feature for dumping animation as PNG files
+* Added a preferences dialog
+* Now using CGAL's delaunay tesselator
+* Now using eigen2 for linear algebra
+* Reorganisation of the source tree
+* Some bugs fixed, maybe some new bugs added
 
-OpenSCAD 2010.02
-================
-
- o Added functions and statements
-  - Added sqrt() function
-  - Added round(), ceil() and floor() functions
-  - Added lookup() function for linear interpolation in value list
-  - Added projection(cut = true/false) statement
-  - Added child() statement for accessing child nodes of module instances
-  - Added mirror() statement
- o Improved DXF import code (more entities and some bugs fixed)
- o Added feature for dumping animation as PNG files
- o Added a preferences dialog
- o Now using CGAL's delaunay tesselator
- o Now using eigen2 for linear algebra
- o Reorganisation of the source tree
- o Some bugs fixed, maybe some new bugs added
-
-OpenSCAD 2010.01
-================
-
- o Added functions and statements
-  - Added intersection_for()
-  - Added str function
-  - Added min and max function
-  - Added color() statement
- o Added 2D Subsystem
-  - New primitives: circle(), square() and polygon()
-  - 2D->3D path: linear_extrude() and rotate_extrude()
-  - Import of DXF to 2d subsystem: import_dxf()
-  - Export of 2D data as DXF files
- o Some bugs fixed, maybe some new bugs added
+# OpenSCAD 2010.01
 
+* Added functions and statements
+  * Added intersection_for()
+  * Added str function
+  * Added min and max function
+  * Added color() statement
+* Added 2D Subsystem
+  * New primitives: circle(), square() and polygon()
+  * 2D->3D path: linear_extrude() and rotate_extrude()
+  * Import of DXF to 2d subsystem: import_dxf()
+  * Export of 2D data as DXF files
+* Some bugs fixed, maybe some new bugs added

appcast-snapshots.xml.in

@@ -7,8 +7,9 @@
     <item>
       <title>OpenSCAD @VERSION@</title>
       <pubDate>@VERSIONDATE@</pubDate>
-      <sparkle:releaseNotesLink>https://raw.github.com/openscad/openscad/master/RELEASE_NOTES</sparkle:releaseNotesLink>
-      <enclosure url="http://files.openscad.org/OpenSCAD-@VERSION@.dmg"
+      <sparkle:releaseNotesLink>https://raw.githubusercontent.com/openscad/openscad/master/releases/2015.XX.md</sparkle:releaseNotesLink>
+      <sparkle:minimumSystemVersion>10.7.0</sparkle:minimumSystemVersion>
+      <enclosure url="http://files.openscad.org/snapshots/OpenSCAD-@VERSION@.dmg"
                  sparkle:version="@VERSIONDATE@"
                  sparkle:shortVersionString="@VERSION@"
                  sparkle:dsaSignature="@DSASIGNATURE@"

appcast.xml.in

@@ -7,7 +7,8 @@
     <item>
       <title>OpenSCAD @VERSION@</title>
       <pubDate>@VERSIONDATE@</pubDate>
-      <sparkle:releaseNotesLink>https://raw.github.com/openscad/openscad/openscad-@VERSION@/RELEASE_NOTES</sparkle:releaseNotesLink>
+      <sparkle:releaseNotesLink>https://raw.githubusercontent.com/openscad/openscad/openscad-@VERSION@/releases/@SHORTVERSION@.md</sparkle:releaseNotesLink>
+      <sparkle:minimumSystemVersion>10.7.0</sparkle:minimumSystemVersion>
       <enclosure url="http://files.openscad.org/OpenSCAD-@VERSION@.dmg"
                  sparkle:version="@VERSIONDATE@"
                  sparkle:shortVersionString="@VERSION@"

boost.pri

@@ -9,15 +9,23 @@ boost {
     win*: QMAKE_LIBDIR += -L$$BOOST_DIR/lib
   }
 
+  # See https://svn.boost.org/trac/boost/ticket/6219
+  macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
+
+  # MXE cross build
   CONFIG(mingw-cross-env) {
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
     DEFINES += Boost_USE_STATIC_LIBS
     BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt -lboost_chrono-mt
-  } 
+  }
 
-  isEmpty(BOOST_LINK_FLAGS):win* {
-    BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 -llibboost_filesystem-vc90-mt-s-1_46_1 -llibboost_system-vc90-mt-s-1_46_1 -llibboost_regex-vc90-mt-s-1_46_1
+  # MSYS2
+  isEmpty(BOOST_LINK_FLAGS):win32-g++ {
+    DEFINES += BOOST_STATIC
+    DEFINES += BOOST_THREAD_USE_LIB
+    DEFINES += Boost_USE_STATIC_LIBS
+    BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
   } 
 
   # check for OPENSCAD_LIBDIR + multithread
@@ -53,7 +61,9 @@ boost {
       BMT_TEST1 = /usr/lib64/libboost*thread-mt*
       BMT_TEST2 = /usr/lib/libboost*thread-mt*
       BMT_TEST3 = /usr/pkg/lib/libboost*thread-mt* # netbsd
-      exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) {
+      BMT_TEST4 = /usr/local/lib/libboost*thread-mt* # homebrew
+      BMT_TEST5 = /opt/local/lib/libboost*thread-mt* # macports
+      exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3)|exists($$BMT_TEST4)|exists($$BMT_TEST5) {
         BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
       }
     }

cgal.pri

@@ -6,7 +6,6 @@ cgal {
   CGAL_DIR = $$(CGALDIR)
   !isEmpty(CGAL_DIR) {
     QMAKE_INCDIR += $$CGAL_DIR/include
-    win*: QMAKE_INCDIR += $$CGAL_DIR/auxiliary/gmp/include
     QMAKE_LIBDIR += $$CGAL_DIR/lib
     message("CGAL location: $$CGAL_DIR")
   }
@@ -19,14 +18,13 @@ cgal {
       *-g++* { 
         QMAKE_CXXFLAGS += -frounding-math 
       }
-      LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc110-mt-gd
     } else {
-      LIBS += -lgmp -lmpfr -lCGAL
       QMAKE_CXXFLAGS += -frounding-math 
     }
+    LIBS += -lCGAL -lmpfr -lgmp
   }
 
-	*clang* {
-		QMAKE_CXXFLAGS -= -frounding-math
-	}
+  *clang* {
+    QMAKE_CXXFLAGS -= -frounding-math
+  }
 }

cgal/.gitignore

@@ -0,0 +1,8 @@
+/*.stl
+/*.scad
+/*.polygon
+polyhole-tessellator
+polyhole-tessellator-libtess2
+minkowski
+decompose
+export_nef

cgal/README.md

@@ -0,0 +1,6 @@
+This folder contains some CGAL test programs to easier develop and debug CGAL-based components.
+
+## polyhole-tessellator
+
+Tessellate an almost planar 3D polygon with holes into a vector of double precision 3D triangles.
+

cgal/data/collinear-axis-aligned.polygon

@@ -0,0 +1,4 @@
+-76.547562539078825239,38.705110299157155396,5.353092412611622386
+-76.547562541749158527,38.705110304107662955,5.3530924135499766692
+-76.5475616455078125,38.705108642578125,0
+-76.5475616455078125,38.705108642578125,0.020000000000000000416

cgal/data/cubes.stl

@@ -0,0 +1,198 @@
+solid OpenSCAD_Model
+  facet normal -1 0 0
+    outer loop
+      vertex 0 10 0
+      vertex 0 0 0
+      vertex 0 0 10
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+      vertex 0 10 10
+      vertex 0 10 0
+      vertex 0 0 10
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+      vertex 0 0 10
+      vertex 0 0 0
+      vertex 10 0 0
+    endloop
+  endfacet
+  facet normal -0 -1 -0
+    outer loop
+      vertex 10 0 10
+      vertex 0 0 10
+      vertex 10 0 0
+    endloop
+  endfacet
+  facet normal -0 0 -1
+    outer loop
+      vertex 5 10 0
+      vertex 0 0 0
+      vertex 0 10 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+      vertex 5 15 0
+      vertex 15 15 0
+      vertex 5 10 0
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+      vertex 5 10 0
+      vertex 10 5 0
+      vertex 0 0 0
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+      vertex 15 15 0
+      vertex 15 5 0
+      vertex 10 5 0
+    endloop
+  endfacet
+  facet normal 0 -0 -1
+    outer loop
+      vertex 10 5 0
+      vertex 10 0 0
+      vertex 0 0 0
+    endloop
+  endfacet
+  facet normal 0 0 -1
+    outer loop
+      vertex 15 15 0
+      vertex 10 5 0
+      vertex 5 10 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+      vertex 5 10 0
+      vertex 0 10 0
+      vertex 0 10 10
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+      vertex 5 10 10
+      vertex 5 10 0
+      vertex 0 10 10
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+      vertex 10 5 10
+      vertex 0 0 10
+      vertex 10 0 10
+    endloop
+  endfacet
+  facet normal 0 -0 1
+    outer loop
+      vertex 15 5 10
+      vertex 15 15 10
+      vertex 10 5 10
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+      vertex 10 5 10
+      vertex 5 10 10
+      vertex 0 0 10
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+      vertex 15 15 10
+      vertex 5 15 10
+      vertex 5 10 10
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+      vertex 5 10 10
+      vertex 0 10 10
+      vertex 0 0 10
+    endloop
+  endfacet
+  facet normal 0 0 1
+    outer loop
+      vertex 15 15 10
+      vertex 5 10 10
+      vertex 10 5 10
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+      vertex 10 0 10
+      vertex 10 0 0
+      vertex 10 5 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+      vertex 10 5 10
+      vertex 10 0 10
+      vertex 10 5 0
+    endloop
+  endfacet
+  facet normal -1 0 0
+    outer loop
+      vertex 5 15 0
+      vertex 5 10 0
+      vertex 5 10 10
+    endloop
+  endfacet
+  facet normal -1 -0 -0
+    outer loop
+      vertex 5 15 10
+      vertex 5 15 0
+      vertex 5 10 10
+    endloop
+  endfacet
+  facet normal 0 -1 0
+    outer loop
+      vertex 10 5 10
+      vertex 10 5 0
+      vertex 15 5 0
+    endloop
+  endfacet
+  facet normal -0 -1 -0
+    outer loop
+      vertex 15 5 10
+      vertex 10 5 10
+      vertex 15 5 0
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+      vertex 15 15 0
+      vertex 5 15 0
+      vertex 5 15 10
+    endloop
+  endfacet
+  facet normal 0 1 0
+    outer loop
+      vertex 15 15 10
+      vertex 15 15 0
+      vertex 5 15 10
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+      vertex 15 5 10
+      vertex 15 5 0
+      vertex 15 15 0
+    endloop
+  endfacet
+  facet normal 1 0 0
+    outer loop
+      vertex 15 15 10
+      vertex 15 5 10
+      vertex 15 15 0
+    endloop
+  endfacet
+endsolid OpenSCAD_Model

cgal/data/degenerate-L.polygon

@@ -0,0 +1,4 @@
+0,0,0
+0,1,0
+1,1,1
+0,1,0

cgal/data/degenerate-L2.polygon

@@ -0,0 +1,4 @@
+0,1,0
+0,0,0
+0,1,0
+1,1,0

cgal/data/duplicate-vertex.polygon

@@ -0,0 +1,4 @@
+0 0 0
+1 0 0
+1 1 0
+1 1 0

cgal/data/hourglass.polygon

@@ -0,0 +1,4 @@
+0 0 0
+1 0 0
+0 1 0
+1 1 0

cgal/data/issue1105.polygon

@@ -0,0 +1,4 @@
+6, -25,  29.285714285714285
+6, -26.732050855686023,  29.020513307787397
+6, -26.732050855686026,  29.020513307787397
+6, -26,  29.132600433972414

cgal/data/issue1105c.polygon

@@ -0,0 +1,8 @@
+11.8244953852727654464160877978,-33.4423534623057960857295256574,28
+11.8244953852727654464160877978,-34,28
+11.8244953852727654464160877978,-36.5576465376941897034157591406,28
+7.99999999999999911182158029987,-35.6847304231704427479598962236,23.516743531220182461538570351
+8,-35,23.516743531220182461538570351
+5.99999999999999911182158029987,-35,21.1722478437400596362749638502
+6,-35,21.1722478437400596362749638502
+5.8577590289166048265201425238,-34.8042220990505484223831444979,21.0055061720960587479112291476

cgal/data/issue1210.polygon

@@ -0,0 +1,4 @@
+9.5,7.5,-0.5
+9.5,2,-0.5
+9.5,2,-0.4999999701976776123
+9.5,7.5,-0.4999999701976776123

cgal/data/out-of-range.polygon

@@ -0,0 +1,5 @@
+50.9504,53.0377,9.35305
+50.2251,53.0492,9.4122
+50.9537,53.0376,9.35278
+55.2851,53.5142,9.35278
+50.9537,53.0376,9.35278

cgal/data/out-of-range2.polygon

@@ -0,0 +1,5 @@
+50.95040130615234375,53.037654876708984375,9.35305023193359375
+50.225086212158203125,53.049152374267578125,9.4121952056884765625
+50.953746795654296875,53.037601470947265625,9.3527774810791015625
+55.285125732421875,53.514209747314453125,9.3527774810791015625
+50.953746795654296875,53.037601470947265625,9.3527774810791015625

cgal/data/quads.polygon

@@ -0,0 +1,10 @@
+0,0,0
+2,0,0
+2,2,0
+0,2,0
+
+0.5,0.5,0
+1.5,0.5,0
+1.5,1.5,0
+0.5,1.5,0
+

cgal/data/self-intersecting.polygon

@@ -0,0 +1,4 @@
+10,10,0
+0,10,0
+0,0,0
+-1,0,0

cgal/data/tri.polygon

@@ -0,0 +1,3 @@
+0,0,0
+2,0,0
+2,2,0

cgal/decompose.cpp

@@ -0,0 +1,667 @@
+#include <boost/foreach.hpp>
+#include <boost/regex.hpp>
+#include <sstream>
+#include <iostream>
+#include <locale.h>
+
+#include "cgalutils.h"
+#include "export.h"
+#include "polyset.h"
+#include "CGAL_Nef_polyhedron.h"
+
+using namespace CGALUtils;
+
+// Nef polyhedron are using CGAL_Kernel3 (Cartesian<Gmpq>)
+// Triangulation will use Epick
+typedef CGAL::Epick K;
+typedef CGAL::Polyhedron_3<K> PolyhedronK;
+
+#include <boost/assign/std/vector.hpp>
+#include <boost/assign/list_of.hpp>
+using namespace boost::assign; // bring 'operator+=()' into scope
+std::vector<Color4f> colors = boost::assign::list_of
+  (Color4f(240, 248, 255))
+  (Color4f(250, 235, 215))
+  (Color4f(0, 255, 255))
+  (Color4f(127, 255, 212))
+  (Color4f(240, 255, 255))
+  (Color4f(245, 245, 220))
+  (Color4f(255, 228, 196))
+  (Color4f(0, 0, 0))
+  (Color4f(255, 235, 205))
+  (Color4f(0, 0, 255))
+  (Color4f(138, 43, 226))
+  (Color4f(165, 42, 42))
+  (Color4f(222, 184, 135))
+  (Color4f(95, 158, 160))
+  (Color4f(127, 255, 0))
+  (Color4f(210, 105, 30))
+  (Color4f(255, 127, 80))
+  (Color4f(100, 149, 237))
+  (Color4f(255, 248, 220))
+  (Color4f(220, 20, 60))
+  (Color4f(0, 255, 255))
+  (Color4f(0, 0, 139))
+  (Color4f(0, 139, 139))
+  (Color4f(184, 134, 11))
+  (Color4f(169, 169, 169))
+  (Color4f(0, 100, 0))
+  (Color4f(169, 169, 169))
+  (Color4f(189, 183, 107))
+  (Color4f(139, 0, 139))
+  (Color4f(85, 107, 47))
+  (Color4f(255, 140, 0))
+  (Color4f(153, 50, 204))
+  (Color4f(139, 0, 0))
+  (Color4f(233, 150, 122))
+  (Color4f(143, 188, 143))
+  (Color4f(72, 61, 139))
+  (Color4f(47, 79, 79))
+  (Color4f(47, 79, 79))
+  (Color4f(0, 206, 209))
+  (Color4f(148, 0, 211))
+  (Color4f(255, 20, 147))
+  (Color4f(0, 191, 255))
+  (Color4f(105, 105, 105))
+  (Color4f(105, 105, 105))
+  (Color4f(30, 144, 255))
+  (Color4f(178, 34, 34))
+  (Color4f(255, 250, 240))
+  (Color4f(34, 139, 34))
+  (Color4f(255, 0, 255))
+  (Color4f(220, 220, 220))
+  (Color4f(248, 248, 255))
+  (Color4f(255, 215, 0))
+  (Color4f(218, 165, 32))
+  (Color4f(128, 128, 128))
+  (Color4f(0, 128, 0))
+  (Color4f(173, 255, 47))
+  (Color4f(128, 128, 128))
+  (Color4f(240, 255, 240))
+  (Color4f(255, 105, 180))
+  (Color4f(205, 92, 92))
+  (Color4f(75, 0, 130))
+  (Color4f(255, 255, 240))
+  (Color4f(240, 230, 140))
+  (Color4f(230, 230, 250))
+  (Color4f(255, 240, 245))
+  (Color4f(124, 252, 0))
+  (Color4f(255, 250, 205))
+  (Color4f(173, 216, 230))
+  (Color4f(240, 128, 128))
+  (Color4f(224, 255, 255))
+  (Color4f(250, 250, 210))
+  (Color4f(211, 211, 211))
+  (Color4f(144, 238, 144))
+  (Color4f(211, 211, 211))
+  (Color4f(255, 182, 193))
+  (Color4f(255, 160, 122))
+  (Color4f(32, 178, 170))
+  (Color4f(135, 206, 250))
+  (Color4f(119, 136, 153))
+  (Color4f(119, 136, 153))
+  (Color4f(176, 196, 222))
+  (Color4f(255, 255, 224))
+  (Color4f(0, 255, 0))
+  (Color4f(50, 205, 50))
+  (Color4f(250, 240, 230))
+  (Color4f(255, 0, 255))
+  (Color4f(128, 0, 0))
+  (Color4f(102, 205, 170))
+  (Color4f(0, 0, 205))
+  (Color4f(186, 85, 211))
+  (Color4f(147, 112, 219))
+  (Color4f(60, 179, 113))
+  (Color4f(123, 104, 238))
+  (Color4f(0, 250, 154))
+  (Color4f(72, 209, 204))
+  (Color4f(199, 21, 133))
+  (Color4f(25, 25, 112))
+  (Color4f(245, 255, 250))
+  (Color4f(255, 228, 225))
+  (Color4f(255, 228, 181))
+  (Color4f(255, 222, 173))
+  (Color4f(0, 0, 128))
+  (Color4f(253, 245, 230))
+  (Color4f(128, 128, 0))
+  (Color4f(107, 142, 35))
+  (Color4f(255, 165, 0))
+  (Color4f(255, 69, 0))
+  (Color4f(218, 112, 214))
+  (Color4f(238, 232, 170))
+  (Color4f(152, 251, 152))
+  (Color4f(175, 238, 238))
+  (Color4f(219, 112, 147))
+  (Color4f(255, 239, 213))
+  (Color4f(255, 218, 185))
+  (Color4f(205, 133, 63))
+  (Color4f(255, 192, 203))
+  (Color4f(221, 160, 221))
+  (Color4f(176, 224, 230))
+  (Color4f(128, 0, 128))
+  (Color4f(255, 0, 0))
+  (Color4f(188, 143, 143))
+  (Color4f(65, 105, 225))
+  (Color4f(139, 69, 19))
+  (Color4f(250, 128, 114))
+  (Color4f(244, 164, 96))
+  (Color4f(46, 139, 87))
+  (Color4f(255, 245, 238))
+  (Color4f(160, 82, 45))
+  (Color4f(192, 192, 192))
+  (Color4f(135, 206, 235))
+  (Color4f(106, 90, 205))
+  (Color4f(112, 128, 144))
+  (Color4f(112, 128, 144))
+  (Color4f(255, 250, 250))
+  (Color4f(0, 255, 127))
+  (Color4f(70, 130, 180))
+  (Color4f(210, 180, 140))
+  (Color4f(0, 128, 128))
+  (Color4f(216, 191, 216))
+  (Color4f(255, 99, 71))
+  (Color4f(0, 0, 0, 0))
+  (Color4f(64, 224, 208))
+  (Color4f(238, 130, 238))
+  (Color4f(245, 222, 179))
+  (Color4f(255, 255, 255))
+  (Color4f(245, 245, 245))
+  (Color4f(255, 255, 0))
+  (Color4f(154, 205, 50));
+
+#include <boost/unordered_set.hpp>
+#include <CGAL/convex_hull_3.h>
+template<typename Polyhedron>
+bool is_weakly_convex(Polyhedron const& p) {
+  for (typename Polyhedron::Edge_const_iterator i = p.edges_begin(); i != p.edges_end(); ++i) {
+    typename Polyhedron::Plane_3 p(i->opposite()->vertex()->point(), i->vertex()->point(), i->next()->vertex()->point());
+    if (p.has_on_positive_side(i->opposite()->next()->vertex()->point()) &&
+        CGAL::squared_distance(p, i->opposite()->next()->vertex()->point()) > 1e-8) {
+      return false;
+    }
+  }
+  // Also make sure that there is only one shell:
+  boost::unordered_set<typename Polyhedron::Facet_const_handle, typename CGAL::Handle_hash_function> visited;
+  // c++11
+  // visited.reserve(p.size_of_facets());
+  
+  std::queue<typename Polyhedron::Facet_const_handle> to_explore;
+  to_explore.push(p.facets_begin()); // One arbitrary facet
+  visited.insert(to_explore.front());
+  
+  while (!to_explore.empty()) {
+    typename Polyhedron::Facet_const_handle f = to_explore.front();
+    to_explore.pop();
+    typename Polyhedron::Facet::Halfedge_around_facet_const_circulator he, end;
+    end = he = f->facet_begin();
+    CGAL_For_all(he,end) {
+      typename Polyhedron::Facet_const_handle o = he->opposite()->facet();
+      
+      if (!visited.count(o)) {
+        visited.insert(o);
+        to_explore.push(o);
+      }
+    }
+  }
+  
+  return visited.size() == p.size_of_facets();
+}
+
+class Shell_explorer
+{
+public:
+  std::vector<K::Point_3> vertices;
+
+  Shell_explorer() {}
+  void visit(CGAL_Nef_polyhedron3::Vertex_const_handle v) {
+    vertices.push_back(K::Point_3(to_double(v->point()[0]),
+                                            to_double(v->point()[1]),
+                                            to_double(v->point()[2])));
+  }
+  void visit(CGAL_Nef_polyhedron3::Halfedge_const_handle ) {}
+  void visit(CGAL_Nef_polyhedron3::Halffacet_const_handle ) {}
+  void visit(CGAL_Nef_polyhedron3::SHalfedge_const_handle ) {}
+  void visit(CGAL_Nef_polyhedron3::SHalfloop_const_handle ) {}
+  void visit(CGAL_Nef_polyhedron3::SFace_const_handle ) {}
+};
+
+template<class Output>
+void decompose(const CGAL_Nef_polyhedron3 *N, Output out_iter)
+{
+  int parts = 0;
+  assert(N);
+  CGAL_Polyhedron poly;
+  if (N->is_simple()) {
+    nefworkaround::convert_to_Polyhedron<CGAL_Kernel3>(*N, poly);
+  }
+  if (is_weakly_convex(poly)) {
+    PRINTD("Minkowski: Object is convex and Nef");
+    PolyhedronK poly2;
+    CGALUtils::copyPolyhedron(poly, poly2);
+    *out_iter++ = poly2;
+    return;
+  }
+  else {
+    PRINTD("Minkowski: Object is nonconvex Nef, decomposing...");
+    CGAL_Nef_polyhedron3 decomposed_nef = *N;
+    CGAL::convex_decomposition_3(decomposed_nef);
+    
+    // the first volume is the outer volume, which ignored in the decomposition
+    CGAL_Nef_polyhedron3::Volume_const_iterator ci = ++decomposed_nef.volumes_begin();
+    // Convert each convex volume to a Polyhedron
+    for(; ci != decomposed_nef.volumes_end(); ++ci) {
+      if(ci->mark()) {
+        //        CGAL_Polyhedron poly;
+        //        decomposed_nef.convert_inner_shell_to_polyhedron(ci->shells_begin(), poly);
+        //        P.push_back(poly);
+
+
+        auto s = CGAL_Nef_polyhedron3::SFace_const_handle(ci->shells_begin());
+
+        CGAL_Nef_polyhedron3::SFace_const_iterator sf = ci->shells_begin();
+        Shell_explorer SE;
+        decomposed_nef.visit_shell_objects(CGAL_Nef_polyhedron3::SFace_const_handle(sf),SE);
+
+        PolyhedronK poly;
+        CGAL::convex_hull_3(SE.vertices.begin(), SE.vertices.end(), poly);
+        *out_iter++ = poly;
+        parts++;
+      }
+    }
+    
+    PRINTDB("Minkowski: decomposed into %d convex parts", parts);
+  }
+}
+
+Geometry const * minkowskitest(const Geometry::ChildList &children)
+{
+  CGAL::Timer t,t_tot;
+  assert(children.size() >= 2);
+  // Iterate over children, perform pairwise minkowski on children:
+  //   operands = [ch, ch+1]
+  Geometry::ChildList::const_iterator minkowski_ch_it = children.begin();
+  t_tot.start();
+  Geometry const *operands[2] = {minkowski_ch_it->second.get(), NULL};
+  try {
+    while (++minkowski_ch_it != children.end()) {
+      operands[1] = minkowski_ch_it->second.get();
+
+      std::vector<PolyhedronK> convexP[2]; // Stores decomposed operands 
+      std::list<PolyhedronK> result_parts;
+
+      for (int i = 0; i < 2; i++) {
+        shared_ptr<const CGAL_Nef_polyhedron> N;
+        if (const PolySet *ps = dynamic_cast<const PolySet *>(operands[i])) {
+          if (ps->is_convex()) {
+            PRINTDB("Minkowski: child %d is convex and PolySet", i);
+            PolyhedronK poly;
+            CGALUtils::createPolyhedronFromPolySet(*ps, poly);
+            convexP[i].push_back(poly);
+          }
+          else {
+            PRINTDB("Minkowski: child %d is nonconvex PolySet, transforming to Nef", i);
+            N.reset(createNefPolyhedronFromGeometry(*ps));
+          }
+        }
+        else if (const CGAL_Nef_polyhedron *n = dynamic_cast<const CGAL_Nef_polyhedron *>(operands[i])) {
+          CGAL_Polyhedron poly;
+          if (n->p3->is_simple()) {
+            nefworkaround::convert_to_Polyhedron<CGAL_Kernel3>(*n->p3, poly);
+            // FIXME: Can we calculate weakly_convex on a PolyhedronK instead?
+            if (is_weakly_convex(poly)) {
+              PRINTDB("Minkowski: child %d is convex and Nef", i);
+              PolyhedronK poly2;
+              CGALUtils::copyPolyhedron(poly, poly2);
+              convexP[i].push_back(poly2);
+            }
+            else {
+              PRINTDB("Minkowski: child %d is nonconvex Nef",i);
+              N.reset(n);
+            }
+          }
+          else throw 0; // We cannot handle this, fall back to CGAL's minkowski
+        }
+
+        // If not convex...
+        if (N && N->p3) {
+          PRINTD("Decomposing...");
+          decompose(N->p3.get(), std::back_inserter(convexP[i]));
+        }
+
+        PRINTD("Hulling convex parts...");
+        std::vector<K::Point_3> points[2];
+        std::vector<K::Point_3> minkowski_points;
+        
+        // For each permutation of convex operands..
+        BOOST_FOREACH(const PolyhedronK &p0, convexP[0]) {
+          BOOST_FOREACH(const PolyhedronK &p1, convexP[1]) {
+            t.start();
+            
+            // Create minkowski pointcloud
+            minkowski_points.clear();
+            minkowski_points.reserve(p0.size_of_vertices() * p0.size_of_vertices());
+            BOOST_FOREACH(const K::Point_3 &p0p, std::make_pair(p0.points_begin(), p0.points_end())) {
+              BOOST_FOREACH(const K::Point_3 &p1p, std::make_pair(p1.points_begin(), p1.points_end())) {
+                minkowski_points.push_back(p0p+(p1p-CGAL::ORIGIN));
+              }
+            }
+            
+            t.stop();
+            
+            // Ignore empty volumes
+            if (minkowski_points.size() <= 3) continue;
+            
+            // Hull point cloud
+            PolyhedronK result;
+            PRINTDB("Minkowski: Point cloud creation (%d ⨉ %d -> %d) took %f ms",
+                    points[0].size() % points[1].size() % minkowski_points.size() % (t.time()*1000));
+            t.reset();
+            t.start();
+            CGAL::convex_hull_3(minkowski_points.begin(), minkowski_points.end(), result);
+            
+            std::vector<K::Point_3> strict_points;
+            strict_points.reserve(minkowski_points.size());
+            
+            for (PolyhedronK::Vertex_iterator i = result.vertices_begin(); i != result.vertices_end(); ++i) {
+              K::Point_3 const &p = i->point();
+              
+              PolyhedronK::Vertex::Halfedge_handle h,e;
+              h = i->halfedge();
+              e = h;
+              bool collinear = false;
+              bool coplanar = true;
+              
+              do {
+                K::Point_3 const& q = h->opposite()->vertex()->point();
+                if (coplanar && !CGAL::coplanar(p,q,
+                                                h->next_on_vertex()->opposite()->vertex()->point(),
+                                                h->next_on_vertex()->next_on_vertex()->opposite()->vertex()->point())) {
+                  coplanar = false;
+                }
+                
+                
+                for (PolyhedronK::Vertex::Halfedge_handle j = h->next_on_vertex();
+                     j != h && !collinear && ! coplanar;
+                     j = j->next_on_vertex()) {
+                  
+                  K::Point_3 const& r = j->opposite()->vertex()->point();
+                  if (CGAL::collinear(p,q,r)) {
+                    collinear = true;
+                  }
+                }
+                
+                h = h->next_on_vertex();
+              } while (h != e && !collinear);
+              
+              if (!collinear && !coplanar) strict_points.push_back(p);
+            }
+            
+            result.clear();
+            CGAL::convex_hull_3(strict_points.begin(), strict_points.end(), result);
+            
+            t.stop();
+            PRINTDB("Minkowski: Computing convex hull took %f s", t.time());
+            t.reset();
+            
+            result_parts.push_back(result);
+          }
+        }
+      }
+      
+      if (minkowski_ch_it != boost::next(children.begin())) delete operands[0];
+      
+      if (result_parts.size() == 1) {
+        PolySet *ps = new PolySet(3,true);
+        createPolySetFromPolyhedron(*result_parts.begin(), *ps);
+        operands[0] = ps;
+      } else if (!result_parts.empty()) {
+        t.start();
+        PRINTDB("Minkowski: Computing union of %d parts",result_parts.size());
+        Geometry::ChildList fake_children;
+        for (std::list<PolyhedronK>::iterator i = result_parts.begin(); i != result_parts.end(); ++i) {
+          PolySet ps(3,true);
+          createPolySetFromPolyhedron(*i, ps);
+          fake_children.push_back(std::make_pair((const AbstractNode*)NULL,
+                                                 shared_ptr<const Geometry>(createNefPolyhedronFromGeometry(ps))));
+        }
+        CGAL_Nef_polyhedron *N = CGALUtils::applyOperator(fake_children, OPENSCAD_UNION);
+        t.stop();
+        if (N) PRINTDB("Minkowski: Union done: %f s",t.time());
+        else PRINTDB("Minkowski: Union failed: %f s",t.time());
+        t.reset();
+        operands[0] = N;
+      } else {
+        operands[0] = new CGAL_Nef_polyhedron();
+      }
+    }
+    
+    t_tot.stop();
+    PRINTDB("Minkowski: Total execution time %f s", t_tot.time());
+    t_tot.reset();
+    return operands[0];
+  }
+  catch (...) {
+    // If anything throws we simply fall back to Nef Minkowski
+    PRINTD("Minkowski: Falling back to Nef Minkowski");
+    
+    CGAL_Nef_polyhedron *N = applyOperator(children, OPENSCAD_MINKOWSKI);
+    return N;
+  }
+}
+
+#define STL_FACET_NUMBYTES 4*3*4+2
+// as there is no 'float32_t' standard, we assume the systems 'float'
+// is a 'binary32' aka 'single' standard IEEE 32-bit floating point type
+union stl_facet {
+	uint8_t data8[ STL_FACET_NUMBYTES ];
+	uint32_t data32[4*3];
+	struct facet_data {
+	  float i, j, k;
+	  float x1, y1, z1;
+	  float x2, y2, z2;
+	  float x3, y3, z3;
+	  uint16_t attribute_byte_count;
+	} data;
+};
+
+void uint32_byte_swap( uint32_t &x )
+{
+#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3
+	x = __builtin_bswap32( x );
+#elif defined(__clang__)
+	x = __builtin_bswap32( x );
+#elif defined(_MSC_VER)
+	x = _byteswap_ulong( x );
+#else
+	uint32_t b1 = ( 0x000000FF & x ) << 24;
+	uint32_t b2 = ( 0x0000FF00 & x ) << 8;
+	uint32_t b3 = ( 0x00FF0000 & x ) >> 8;
+	uint32_t b4 = ( 0xFF000000 & x ) >> 24;
+	x = b1 | b2 | b3 | b4;
+#endif
+}
+
+void read_stl_facet( std::ifstream &f, stl_facet &facet )
+{
+	f.read( (char*)facet.data8, STL_FACET_NUMBYTES );
+#ifdef BOOST_BIG_ENDIAN
+	for ( int i = 0; i < 12; i++ ) {
+		uint32_byte_swap( facet.data32[ i ] );
+	}
+	// we ignore attribute byte count
+#endif
+}
+
+PolySet *import_stl(const std::string &filename)
+{
+  PolySet *p = new PolySet(3);
+
+  // Open file and position at the end
+  std::ifstream f(filename.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
+  if (!f.good()) {
+    PRINTB("WARNING: Can't open import file '%s'.", filename);
+    return NULL;
+  }
+
+  boost::regex ex_sfe("solid|facet|endloop");
+  boost::regex ex_outer("outer loop");
+  boost::regex ex_vertex("vertex");
+  boost::regex ex_vertices("\\s*vertex\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)");
+
+  bool binary = false;
+  std::streampos file_size = f.tellg();
+  f.seekg(80);
+  if (f.good() && !f.eof()) {
+    uint32_t facenum = 0;
+    f.read((char *)&facenum, sizeof(uint32_t));
+#ifdef BOOST_BIG_ENDIAN
+    uint32_byte_swap( facenum );
+#endif
+    if (file_size ==  static_cast<std::streamoff>(80 + 4 + 50*facenum)) {
+      binary = true;
+    }
+  }
+  f.seekg(0);
+
+  char data[5];
+  f.read(data, 5);
+  if (!binary && !f.eof() && f.good() && !memcmp(data, "solid", 5)) {
+    int i = 0;
+    double vdata[3][3];
+    std::string line;
+    std::getline(f, line);
+    while (!f.eof()) {
+      std::getline(f, line);
+      boost::trim(line);
+      if (boost::regex_search(line, ex_sfe)) {
+        continue;
+      }
+      if (boost::regex_search(line, ex_outer)) {
+        i = 0;
+        continue;
+      }
+      boost::smatch results;
+      if (boost::regex_search(line, results, ex_vertices)) {
+        try {
+          for (int v=0;v<3;v++) {
+            vdata[i][v] = boost::lexical_cast<double>(results[v+1]);
+          }
+        }
+        catch (const boost::bad_lexical_cast &blc) {
+          PRINTB("WARNING: Can't parse vertex line '%s'.", line);
+          i = 10;
+          continue;
+        }
+        if (++i == 3) {
+          p->append_poly();
+          p->append_vertex(vdata[0][0], vdata[0][1], vdata[0][2]);
+          p->append_vertex(vdata[1][0], vdata[1][1], vdata[1][2]);
+          p->append_vertex(vdata[2][0], vdata[2][1], vdata[2][2]);
+        }
+      }
+    }
+  }
+  else if (binary && !f.eof() && f.good())
+    {
+      f.ignore(80-5+4);
+      while (1) {
+        stl_facet facet;
+        read_stl_facet( f, facet );
+        if (f.eof()) break;
+        p->append_poly();
+        p->append_vertex(facet.data.x1, facet.data.y1, facet.data.z1);
+        p->append_vertex(facet.data.x2, facet.data.y2, facet.data.z2);
+        p->append_vertex(facet.data.x3, facet.data.y3, facet.data.z3);
+      }
+    }
+  return p;
+}
+
+/*!
+  file format: 
+  1. polygon coordinates (x,y,z) are comma separated (+/- spaces) and 
+  each coordinate is on a separate line
+  2. each polygon is separated by one or more blank lines
+*/
+bool import_polygon(PolyholeK &polyhole, const std::string &filename)
+{
+  std::ifstream ifs(filename.c_str());
+  if (!ifs) return false;
+
+  std::string line;
+  PolygonK polygon;
+  while (std::getline(ifs, line)) {
+    std::stringstream ss(line);
+    double X = 0.0, Y = 0.0, Z = 0.0;
+    if (!(ss >> X)) {
+      //ie blank lines => flag start of next polygon 
+      if (polygon.size() > 0) polyhole.push_back(polygon);
+      polygon.clear();
+      continue;
+    }
+    char c = ss.peek();  
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Y)) {
+      std::cerr << "Y error\n";
+      return false;
+    }
+    c = ss.peek();
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Z)) {
+      std::cerr << "Z error\n";
+      return false;
+    }
+    polygon.push_back(Vertex3K(X, Y, Z));
+  }
+  if (polygon.size() > 0) polyhole.push_back(polygon);
+  ifs.close();
+  return true;
+}
+//------------------------------------------------------------------------------
+
+int main(int argc, char *argv[])
+{
+
+  OpenSCAD::debug = "decompose";
+
+  PolySet *ps = NULL;
+  if (argc == 2) {
+    if (!(ps = import_stl(argv[1]))) {
+      std::cerr << "Error importing STL " << argv[1] << std::endl;
+      exit(1);
+    }
+    std::cerr << "Imported " << ps->numPolygons() << " polygons" << std::endl;
+  }
+  else {
+    std::cerr << "Usage: " << argv[0] << " <file.stl> <file.stl>" << std::endl;
+    exit(1);
+  }
+
+  Geometry::ChildList children;
+
+  CGAL_Nef_polyhedron *N = createNefPolyhedronFromGeometry(*ps);
+
+  std::vector<PolyhedronK> result;
+  decompose(N->p3.get(), std::back_inserter(result));
+
+  std::cerr << "Decomposed into " << result.size() << " convex parts" << std::endl;
+
+  int idx = 0;
+  BOOST_FOREACH(const PolyhedronK &P, result) {
+    PolySet result_ps(3);
+    if (CGALUtils::createPolySetFromPolyhedron(P, result_ps)) {
+      std::cerr << "Error converting to PolySet\n";
+    }
+    else {
+      std::stringstream ss;
+      ss << "out" << idx++ << ".stl";
+      exportFileByName(&result_ps, OPENSCAD_STL, ss.str().c_str(), ss.str().c_str());
+      std::cout << "color([" << colors[idx%147][0] << "," << colors[idx%147][1] << "," << colors[idx%147][2] << "]) " << "import(\"" << ss.str() << "\");\n";
+    }
+  }
+  std::cerr << "Done." << std::endl;
+}

cgal/decompose.pro

@@ -0,0 +1,108 @@
+CONFIG += debug
+CONFIG -= qt
+debug: DEFINES += DEBUG
+
+TEMPLATE = app
+
+INCLUDEPATH += ../src
+DEPENDPATH += ../src
+
+# Handle custom library location.
+# Used when manually installing 3rd party libraries
+isEmpty(OPENSCAD_LIBDIR) OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
+macx:isEmpty(OPENSCAD_LIBDIR) {
+  exists(/opt/local):exists(/usr/local/Cellar) {
+    error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
+  } else {
+    exists(/opt/local) {
+      #Default to MacPorts on Mac OS X
+      message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /opt/local
+    } else:exists(/usr/local/Cellar) {
+      message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /usr/local
+    }
+  }
+}
+!isEmpty(OPENSCAD_LIBDIR) {
+  QMAKE_INCDIR = $$OPENSCAD_LIBDIR/include
+  QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib
+}
+
+TARGET = decompose
+mac {
+  CONFIG -= app_bundle
+}
+
+macx {
+  # Mac needs special care to link against the correct C++ library
+  # We attempt to auto-detect it by inspecting Boost
+  dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+  for(dir, dirs) {
+    system(grep -q __112basic_string $${dir}/libboost_thread* >& /dev/null) {
+      message("Detected libc++-linked boost in $${dir}")
+      CONFIG += libc++
+    }
+  }
+
+  libc++ {
+    QMAKE_CXXFLAGS += -stdlib=libc++
+    QMAKE_LFLAGS += -stdlib=libc++
+    QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
+    # libc++ on requires Mac OS X 10.7+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+  }
+}
+
+# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
+*g++* {
+  QMAKE_CXXFLAGS *= -fno-strict-aliasing
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
+}
+
+*clang* {
+  # http://llvm.org/bugs/show_bug.cgi?id=9182
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
+  # disable enormous amount of warnings about CGAL / boost / etc
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+  # might want to actually turn this on once in a while
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
+}
+
+# Application configuration
+CONFIG += cgal
+CONFIG += boost
+CONFIG += eigen
+CONFIG += gettext
+
+mac: {
+   LIBS += -framework OpenGL
+}
+
+include(../common.pri)
+
+HEADERS += ../src/cgal.h \
+           ../src/cgalutils.h \
+           ../src/linalg.h \
+           ../src/polyset.h \
+           ../src/polyset-utils.h \
+           ../src/printutils.h
+
+SOURCES += decompose.cpp \
+           ../src/polygon2d.cc \
+           ../src/polygon2d-CGAL.cc \
+           ../src/CGAL_Nef_polyhedron.cc \
+           ../src/CGAL_Nef_polyhedron_DxfData.cc \
+           ../src/cgalutils.cc \
+           ../src/cgalutils-tess.cc \
+           ../src/cgalutils-polyhedron.cc \
+           ../src/polyset.cc \
+           ../src/svg.cc \
+           ../src/node.cc \
+           ../src/export.cc \
+           ../src/polyset-utils.cc \
+           ../src/progress.cc \
+           ../src/printutils.cc

cgal/export_nef.cpp

@@ -0,0 +1,180 @@
+#include <boost/foreach.hpp>
+#include <boost/regex.hpp>
+#include <sstream>
+#include <iostream>
+#include <fstream>
+#include <locale.h>
+
+#include "cgalutils.h"
+#include "export.h"
+#include "polyset.h"
+#include "CGAL_Nef_polyhedron.h"
+#include "boosty.h"
+
+#include <CGAL/IO/Nef_polyhedron_iostream_3.h>
+
+using namespace CGALUtils;
+
+#define STL_FACET_NUMBYTES 4*3*4+2
+// as there is no 'float32_t' standard, we assume the systems 'float'
+// is a 'binary32' aka 'single' standard IEEE 32-bit floating point type
+union stl_facet {
+	uint8_t data8[ STL_FACET_NUMBYTES ];
+	uint32_t data32[4*3];
+	struct facet_data {
+	  float i, j, k;
+	  float x1, y1, z1;
+	  float x2, y2, z2;
+	  float x3, y3, z3;
+	  uint16_t attribute_byte_count;
+	} data;
+};
+
+void uint32_byte_swap( uint32_t &x )
+{
+#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3
+	x = __builtin_bswap32( x );
+#elif defined(__clang__)
+	x = __builtin_bswap32( x );
+#elif defined(_MSC_VER)
+	x = _byteswap_ulong( x );
+#else
+	uint32_t b1 = ( 0x000000FF & x ) << 24;
+	uint32_t b2 = ( 0x0000FF00 & x ) << 8;
+	uint32_t b3 = ( 0x00FF0000 & x ) >> 8;
+	uint32_t b4 = ( 0xFF000000 & x ) >> 24;
+	x = b1 | b2 | b3 | b4;
+#endif
+}
+
+void read_stl_facet( std::ifstream &f, stl_facet &facet )
+{
+	f.read( (char*)facet.data8, STL_FACET_NUMBYTES );
+#ifdef BOOST_BIG_ENDIAN
+	for ( int i = 0; i < 12; i++ ) {
+		uint32_byte_swap( facet.data32[ i ] );
+	}
+	// we ignore attribute byte count
+#endif
+}
+
+PolySet *import_stl(const std::string &filename)
+{
+  PolySet *p = new PolySet(3);
+
+  // Open file and position at the end
+  std::ifstream f(filename.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
+  if (!f.good()) {
+    PRINTB("WARNING: Can't open import file '%s'.", filename);
+    return NULL;
+  }
+
+  boost::regex ex_sfe("solid|facet|endloop");
+  boost::regex ex_outer("outer loop");
+  boost::regex ex_vertex("vertex");
+  boost::regex ex_vertices("\\s*vertex\\s+([^\\s]+)\\s+([^\\s]+)\\s+([^\\s]+)");
+
+  bool binary = false;
+  std::streampos file_size = f.tellg();
+  f.seekg(80);
+  if (f.good() && !f.eof()) {
+    uint32_t facenum = 0;
+    f.read((char *)&facenum, sizeof(uint32_t));
+#ifdef BOOST_BIG_ENDIAN
+    uint32_byte_swap( facenum );
+#endif
+    if (file_size ==  static_cast<std::streamoff>(80 + 4 + 50*facenum)) {
+      binary = true;
+    }
+  }
+  f.seekg(0);
+
+  char data[5];
+  f.read(data, 5);
+  if (!binary && !f.eof() && f.good() && !memcmp(data, "solid", 5)) {
+    int i = 0;
+    double vdata[3][3];
+    std::string line;
+    std::getline(f, line);
+    while (!f.eof()) {
+      std::getline(f, line);
+      boost::trim(line);
+      if (boost::regex_search(line, ex_sfe)) {
+        continue;
+      }
+      if (boost::regex_search(line, ex_outer)) {
+        i = 0;
+        continue;
+      }
+      boost::smatch results;
+      if (boost::regex_search(line, results, ex_vertices)) {
+        try {
+          for (int v=0;v<3;v++) {
+            vdata[i][v] = boost::lexical_cast<double>(results[v+1]);
+          }
+        }
+        catch (const boost::bad_lexical_cast &blc) {
+          PRINTB("WARNING: Can't parse vertex line '%s'.", line);
+          i = 10;
+          continue;
+        }
+        if (++i == 3) {
+          p->append_poly();
+          p->append_vertex(vdata[0][0], vdata[0][1], vdata[0][2]);
+          p->append_vertex(vdata[1][0], vdata[1][1], vdata[1][2]);
+          p->append_vertex(vdata[2][0], vdata[2][1], vdata[2][2]);
+        }
+      }
+    }
+  }
+  else if (binary && !f.eof() && f.good())
+    {
+      f.ignore(80-5+4);
+      while (1) {
+        stl_facet facet;
+        read_stl_facet( f, facet );
+        if (f.eof()) break;
+        p->append_poly();
+        p->append_vertex(facet.data.x1, facet.data.y1, facet.data.z1);
+        p->append_vertex(facet.data.x2, facet.data.y2, facet.data.z2);
+        p->append_vertex(facet.data.x3, facet.data.y3, facet.data.z3);
+      }
+    }
+  return p;
+}
+
+int main(int argc, char *argv[])
+{
+
+  OpenSCAD::debug = "export_nef";
+  CGAL_Nef_polyhedron *N = NULL;
+
+  PolySet *ps = NULL;
+  if (argc == 2) {
+    std::string filename(argv[1]);
+    std::string suffix = boosty::extension_str(filename);
+    boost::algorithm::to_lower(suffix);
+    if (suffix == ".stl") {
+      if (!(ps = import_stl(filename))) {
+        std::cerr << "Error importing STL " << argv[1] << std::endl;
+        exit(1);
+      }
+      std::cerr << "Imported " << ps->numPolygons() << " polygons" << std::endl;
+    }
+    else if (suffix == ".nef3") {
+      N = new CGAL_Nef_polyhedron(new CGAL_Nef_polyhedron3);
+      std::ifstream stream(filename.c_str());
+      stream >> *N->p3;
+      std::cerr << "Imported Nef polyhedron" << std::endl;
+    }
+  }
+  else {
+    std::cerr << "Usage: " << argv[0] << " <file.stl>" << std::endl;
+    exit(1);
+  }
+
+  if (ps && !N) N = createNefPolyhedronFromGeometry(*ps);
+
+  export_stl(N, std::cout);
+  std::cerr << "Done." << std::endl;
+}

cgal/export_nef.pro

@@ -0,0 +1,109 @@
+CONFIG += debug
+CONFIG -= qt
+debug: DEFINES += DEBUG
+
+TEMPLATE = app
+
+INCLUDEPATH += ../src
+DEPENDPATH += ../src
+
+# Handle custom library location.
+# Used when manually installing 3rd party libraries
+isEmpty(OPENSCAD_LIBDIR) OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
+macx:isEmpty(OPENSCAD_LIBDIR) {
+  exists(/opt/local):exists(/usr/local/Cellar) {
+    error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
+  } else {
+    exists(/opt/local) {
+      #Default to MacPorts on Mac OS X
+      message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /opt/local
+    } else:exists(/usr/local/Cellar) {
+      message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /usr/local
+    }
+  }
+}
+!isEmpty(OPENSCAD_LIBDIR) {
+  QMAKE_INCDIR = $$OPENSCAD_LIBDIR/include
+  QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib
+}
+
+TARGET = export_nef
+mac {
+  CONFIG -= app_bundle
+}
+
+macx {
+  # Mac needs special care to link against the correct C++ library
+  # We attempt to auto-detect it by inspecting Boost
+  dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+  for(dir, dirs) {
+    system(grep -q __112basic_string $${dir}/libboost_thread* >& /dev/null) {
+      message("Detected libc++-linked boost in $${dir}")
+      CONFIG += libc++
+    }
+  }
+
+  libc++ {
+    QMAKE_CXXFLAGS += -stdlib=libc++
+    QMAKE_LFLAGS += -stdlib=libc++
+    QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
+    # libc++ on requires Mac OS X 10.7+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+  }
+}
+
+# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
+*g++* {
+  QMAKE_CXXFLAGS *= -fno-strict-aliasing
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
+}
+
+*clang* {
+  # http://llvm.org/bugs/show_bug.cgi?id=9182
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
+  # disable enormous amount of warnings about CGAL / boost / etc
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+  # might want to actually turn this on once in a while
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
+}
+
+# Application configuration
+CONFIG += cgal
+CONFIG += boost
+CONFIG += eigen
+CONFIG += gettext
+
+mac: {
+   LIBS += -framework OpenGL
+}
+
+include(../common.pri)
+
+HEADERS += ../src/cgal.h \
+           ../src/cgalutils.h \
+           ../src/linalg.h \
+           ../src/polyset.h \
+           ../src/polyset-utils.h \
+           ../src/printutils.h
+
+SOURCES += export_nef.cpp \
+           ../src/polygon2d.cc \
+           ../src/polygon2d-CGAL.cc \
+           ../src/CGAL_Nef_polyhedron.cc \
+           ../src/CGAL_Nef_polyhedron_DxfData.cc \
+           ../src/cgalutils.cc \
+           ../src/cgalutils-tess.cc \
+           ../src/cgalutils-polyhedron.cc \
+           ../src/polyset.cc \
+           ../src/svg.cc \
+           ../src/node.cc \
+           ../src/export.cc \
+           ../src/polyset-utils.cc \
+           ../src/progress.cc \
+           ../src/printutils.cc \
+           ../src/grid.cc

cgal/polyhole-tessellator-libtess2.cpp

@@ -0,0 +1,159 @@
+#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <sstream>
+#include <fstream>
+#include <iostream>
+#include <locale.h>
+
+#include "GeometryUtils.h"
+#include "Reindexer.h"
+#include "linalg.h"
+#include "grid.h"
+#include "printutils.h"
+
+static void export_stl(const IndexedTriangleMesh &trimesh, std::ostream &output)
+{
+  setlocale(LC_NUMERIC, "C"); // Ensure radix is . (not ,) in output
+  output << "solid OpenSCAD_Model\n";
+  const Vector3f *verts = &trimesh.vertices.front();
+  BOOST_FOREACH(const IndexedTriangle &t, trimesh.triangles) {
+    assert(t[0] < trimesh.vertices.size());
+    assert(t[1] < trimesh.vertices.size());
+    assert(t[2] < trimesh.vertices.size());
+
+    Vector3f p[3];
+    p[0] = verts[t[0]];
+    p[1] = verts[t[1]];
+    p[2] = verts[t[2]];
+    std::stringstream stream;
+    stream << p[0][0] << " " << p[0][1] << " " << p[0][2];
+    std::string vs1 = stream.str();
+    stream.str("");
+    stream << p[1][0] << " " << p[1][1] << " " << p[1][2];
+    std::string vs2 = stream.str();
+    stream.str("");
+    stream << p[2][0] << " " << p[2][1] << " " << p[2][2];
+    std::string vs3 = stream.str();
+    //    if (vs1 != vs2 && vs1 != vs3 && vs2 != vs3) {
+      // The above condition ensures that there are 3 distinct vertices, but
+      // they may be collinear. If they are, the unit normal is meaningless
+      // so the default value of "1 0 0" can be used. If the vertices are not
+      // collinear then the unit normal must be calculated from the
+      // components.
+      Vector3f normal = (p[1] - p[0]).cross(p[2] - p[0]);
+      normal.normalize();
+      output << "  facet normal " << normal[0] << " " << normal[1] << " " << normal[2] << "\n";
+      output << "    outer loop\n";
+		
+      for (int i=0;i<3;i++) {
+        output << "      vertex " << p[i][0] << " " << p[i][1] << " " << p[i][2] << "\n";
+      }
+      output << "    endloop\n";
+      output << "  endfacet\n";
+      //    }
+  }
+  output << "endsolid OpenSCAD_Model\n";
+  setlocale(LC_NUMERIC, "");      // Set default locale
+}
+
+
+/*!
+  file format: 
+  1. polygon coordinates (x,y,z) are comma separated (+/- spaces) and 
+  each coordinate is on a separate line
+  2. each polygon is separated by one or more blank lines
+*/
+bool import_polygon(IndexedPolygons &polyhole, const std::string &filename)
+{
+  Reindexer<Vector3f> uniqueVertices;
+  std::ifstream ifs(filename.c_str());
+  if (!ifs) return false;
+
+  std::string line;
+  IndexedFace polygon;
+  while (std::getline(ifs, line)) {
+    std::stringstream ss(line);
+    double X = 0.0, Y = 0.0, Z = 0.0;
+    if (!(ss >> X)) {
+      //ie blank lines => flag start of next polygon 
+      if (polygon.size() > 0) polyhole.faces.push_back(polygon);
+      polygon.clear();
+      continue;
+    }
+    char c = ss.peek();  
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Y)) {
+      std::cerr << "Y error\n";
+      return false;
+    }
+    c = ss.peek();
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Z)) {
+      std::cerr << "Z error\n";
+      return false;
+    }
+    polygon.push_back(uniqueVertices.lookup(Vector3f(X, Y, Z)));
+  }
+  if (polygon.size() > 0) polyhole.faces.push_back(polygon);
+  ifs.close();
+  uniqueVertices.copy(std::back_inserter(polyhole.vertices));
+  return true;
+}
+
+int main(int argc, char *argv[])
+{
+  OpenSCAD::debug = "GeometryUtils";
+
+  IndexedPolygons polyhole;
+  Vector3f *normal = NULL;
+  if (argc >= 2) {
+    if (!import_polygon(polyhole, argv[1])) {
+      std::cerr << "Error importing polygon" << std::endl;
+      exit(1);
+    }
+    std::cerr << "Imported " << polyhole.faces.size() << " polygons" << std::endl;
+
+    if (argc == 3) {
+      std::vector<std::string> strs;
+      std::vector<double> normalvec;
+      std::string arg(argv[2]);
+      boost::split(strs, arg, boost::is_any_of(","));
+      assert(strs.size() == 3);
+      BOOST_FOREACH(const std::string &s, strs) normalvec.push_back(boost::lexical_cast<double>(s));
+      normal = new Vector3f(normalvec[0], normalvec[1], normalvec[2]);
+      
+   }
+  }
+  else {
+    //construct two non-intersecting nested polygons  
+    Reindexer<Vector3f> uniqueVertices;
+    IndexedFace polygon1;
+    polygon1.push_back(uniqueVertices.lookup(Vector3f(0,0,0)));
+    polygon1.push_back(uniqueVertices.lookup(Vector3f(2,0,0)));
+    polygon1.push_back(uniqueVertices.lookup(Vector3f(2,2,0)));
+    polygon1.push_back(uniqueVertices.lookup(Vector3f(0,2,0)));
+    IndexedFace polygon2;
+    polygon2.push_back(uniqueVertices.lookup(Vector3f(0.5,0.5,0)));
+    polygon2.push_back(uniqueVertices.lookup(Vector3f(1.5,0.5,0)));
+    polygon2.push_back(uniqueVertices.lookup(Vector3f(1.5,1.5,0)));
+    polygon2.push_back(uniqueVertices.lookup(Vector3f(0.5,1.5,0)));
+    polyhole.faces.push_back(polygon1);
+    polyhole.faces.push_back(polygon2);
+    uniqueVertices.copy(std::back_inserter(polyhole.vertices));
+  }
+
+  std::vector<IndexedTriangle> triangles;
+  bool ok = GeometryUtils::tessellatePolygonWithHoles(&polyhole.vertices.front(), polyhole.faces, triangles, normal);
+  std::cerr << "Tessellated into " << triangles.size() << " triangles" << std::endl;
+
+  IndexedTriangleMesh trimesh;
+  trimesh.vertices = polyhole.vertices;
+  trimesh.triangles = triangles;
+
+  export_stl(trimesh, std::cout);
+}

cgal/polyhole-tessellator-libtess2.pro

@@ -0,0 +1,107 @@
+debug: DEFINES += DEBUG
+
+TEMPLATE = app
+
+INCLUDEPATH += ../src ../src/libtess2/Include
+DEPENDPATH += ../src
+
+# Handle custom library location.
+# Used when manually installing 3rd party libraries
+isEmpty(OPENSCAD_LIBDIR) OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
+macx:isEmpty(OPENSCAD_LIBDIR) {
+  exists(/opt/local):exists(/usr/local/Cellar) {
+    error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
+  } else {
+    exists(/opt/local) {
+      #Default to MacPorts on Mac OS X
+      message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /opt/local
+    } else:exists(/usr/local/Cellar) {
+      message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /usr/local
+    }
+  }
+}
+!isEmpty(OPENSCAD_LIBDIR) {
+  QMAKE_INCDIR = $$OPENSCAD_LIBDIR/include
+  QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib
+}
+
+TARGET = polyhole-tessellator-libtess2
+CONFIG -= qt
+mac {
+  CONFIG -= app_bundle
+}
+
+macx {
+  # Mac needs special care to link against the correct C++ library
+  # We attempt to auto-detect it by inspecting Boost
+  dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+  for(dir, dirs) {
+    system(grep -q __112basic_string $${dir}/libboost_thread* >& /dev/null) {
+      message("Detected libc++-linked boost in $${dir}")
+      CONFIG += libc++
+    }
+  }
+
+  libc++ {
+    QMAKE_CXXFLAGS += -stdlib=libc++
+    QMAKE_LFLAGS += -stdlib=libc++
+    QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
+    # libc++ on requires Mac OS X 10.7+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+  }
+}
+
+# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
+*g++* {
+  QMAKE_CXXFLAGS *= -fno-strict-aliasing
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
+}
+
+*clang* {
+  # http://llvm.org/bugs/show_bug.cgi?id=9182
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
+  # disable enormous amount of warnings about CGAL / boost / etc
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+  # might want to actually turn this on once in a while
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-format-security
+}
+
+
+
+# Application configuration
+CONFIG += cgal
+CONFIG += boost
+CONFIG += eigen
+CONFIG += gettext
+
+include(../common.pri)
+
+HEADERS += ../src/GeometryUtils.cc \
+           ../src/linalg.h \
+           ../src/printutils.h \
+           ../src/grid.h \
+           ../src/libtess2/Include/tesselator.h \
+           ../src/libtess2/Source/bucketalloc.h \
+           ../src/libtess2/Source/dict.h \
+           ../src/libtess2/Source/geom.h \
+           ../src/libtess2/Source/mesh.h \
+           ../src/libtess2/Source/priorityq.h \
+           ../src/libtess2/Source/sweep.h \
+           ../src/libtess2/Source/tess.h
+
+SOURCES += polyhole-tessellator-libtess2.cpp \
+           ../src/GeometryUtils.cc \
+           ../src/printutils.cc \
+           ../src/grid.cc \
+           ../src/libtess2/Source/bucketalloc.c \
+           ../src/libtess2/Source/dict.c \
+           ../src/libtess2/Source/geom.c \
+           ../src/libtess2/Source/mesh.c \
+           ../src/libtess2/Source/priorityq.c \
+           ../src/libtess2/Source/sweep.c \
+           ../src/libtess2/Source/tess.c

cgal/polyhole-tessellator.cpp

@@ -0,0 +1,140 @@
+#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+#include <sstream>
+#include <iostream>
+#include <locale.h>
+
+#include "cgalutils.h"
+
+
+
+// Nef polyhedron are using CGAL_Kernel3 (Cartesian<Gmpq>)
+// Triangulation will use Epick
+
+static void export_stl(const Polygons &triangles, std::ostream &output)
+{
+  setlocale(LC_NUMERIC, "C"); // Ensure radix is . (not ,) in output
+  output << "solid OpenSCAD_Model\n";
+  BOOST_FOREACH(const Polygon &p, triangles) {
+    assert(p.size() == 3); // STL only allows triangles
+    std::stringstream stream;
+    stream << p[0][0] << " " << p[0][1] << " " << p[0][2];
+    std::string vs1 = stream.str();
+    stream.str("");
+    stream << p[1][0] << " " << p[1][1] << " " << p[1][2];
+    std::string vs2 = stream.str();
+    stream.str("");
+    stream << p[2][0] << " " << p[2][1] << " " << p[2][2];
+    std::string vs3 = stream.str();
+    if (vs1 != vs2 && vs1 != vs3 && vs2 != vs3) {
+      // The above condition ensures that there are 3 distinct vertices, but
+      // they may be collinear. If they are, the unit normal is meaningless
+      // so the default value of "1 0 0" can be used. If the vertices are not
+      // collinear then the unit normal must be calculated from the
+      // components.
+      Vector3d normal = (p[1] - p[0]).cross(p[2] - p[0]);
+      normal.normalize();
+      output << "  facet normal " << normal[0] << " " << normal[1] << " " << normal[2] << "\n";
+      output << "    outer loop\n";
+		
+      BOOST_FOREACH(const Vector3d &v, p) {
+        output << "      vertex " << v[0] << " " << v[1] << " " << v[2] << "\n";
+      }
+      output << "    endloop\n";
+      output << "  endfacet\n";
+    }
+  }
+  output << "endsolid OpenSCAD_Model\n";
+  setlocale(LC_NUMERIC, "");      // Set default locale
+}
+
+
+/*!
+  file format: 
+  1. polygon coordinates (x,y,z) are comma separated (+/- spaces) and 
+  each coordinate is on a separate line
+  2. each polygon is separated by one or more blank lines
+*/
+bool import_polygon(PolyholeK &polyhole, const std::string &filename)
+{
+  std::ifstream ifs(filename.c_str());
+  if (!ifs) return false;
+
+  std::string line;
+  PolygonK polygon;
+  while (std::getline(ifs, line)) {
+    std::stringstream ss(line);
+    double X = 0.0, Y = 0.0, Z = 0.0;
+    if (!(ss >> X)) {
+      //ie blank lines => flag start of next polygon 
+      if (polygon.size() > 0) polyhole.push_back(polygon);
+      polygon.clear();
+      continue;
+    }
+    char c = ss.peek();  
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Y)) {
+      std::cerr << "Y error\n";
+      return false;
+    }
+    c = ss.peek();
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces before comma
+    if (c == ',') {ss.read(&c, 1); c = ss.peek();} //gobble comma
+    while (c == ' ') {ss.read(&c, 1); c = ss.peek();} //gobble spaces after comma
+    if (!(ss >> Z)) {
+      std::cerr << "Z error\n";
+      return false;
+    }
+    polygon.push_back(Vertex3K(X, Y, Z));
+  }
+  if (polygon.size() > 0) polyhole.push_back(polygon);
+  ifs.close();
+  return true;
+}
+//------------------------------------------------------------------------------
+
+int main(int argc, char *argv[])
+{
+  PolyholeK polyhole;
+  K::Vector_3 *normal = NULL;
+  if (argc >= 2) {
+    if (!import_polygon(polyhole, argv[1])) {
+      std::cerr << "Error importing polygon" << std::endl;
+      exit(1);
+    }
+    std::cerr << "Imported " << polyhole.size() << " polygons" << std::endl;
+
+    if (argc == 3) {
+      std::vector<std::string> strs;
+      std::vector<double> normalvec;
+      std::string arg(argv[2]);
+      boost::split(strs, arg, boost::is_any_of(","));
+      assert(strs.size() == 3);
+      BOOST_FOREACH(const std::string &s, strs) normalvec.push_back(boost::lexical_cast<double>(s));
+      normal = new K::Vector_3(normalvec[0], normalvec[1], normalvec[2]);
+   }
+  }
+  else {
+    //construct two non-intersecting nested polygons  
+    PolygonK polygon1;
+    polygon1.push_back(Vertex3K(0,0,0));
+    polygon1.push_back(Vertex3K(2,0,0));
+    polygon1.push_back(Vertex3K(2,2,0));
+    polygon1.push_back(Vertex3K(0,2,0));
+    PolygonK polygon2;
+    polygon2.push_back(Vertex3K(0.5,0.5,0));
+    polygon2.push_back(Vertex3K(1.5,0.5,0));
+    polygon2.push_back(Vertex3K(1.5,1.5,0));
+    polygon2.push_back(Vertex3K(0.5,1.5,0));
+    polyhole.push_back(polygon1);
+    polyhole.push_back(polygon2);
+  }
+
+  Polygons triangles;
+  bool ok = CGALUtils::tessellatePolygonWithHoles(polyhole, triangles, normal);
+  std::cerr << "Tessellated into " << triangles.size() << " triangles" << std::endl;
+
+  export_stl(triangles, std::cout);
+}

cgal/polyhole-tessellator.pro

@@ -0,0 +1,90 @@
+debug: DEFINES += DEBUG
+
+TEMPLATE = app
+
+INCLUDEPATH += ../src
+DEPENDPATH += ../src
+
+# Handle custom library location.
+# Used when manually installing 3rd party libraries
+isEmpty(OPENSCAD_LIBDIR) OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
+macx:isEmpty(OPENSCAD_LIBDIR) {
+  exists(/opt/local):exists(/usr/local/Cellar) {
+    error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
+  } else {
+    exists(/opt/local) {
+      #Default to MacPorts on Mac OS X
+      message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /opt/local
+    } else:exists(/usr/local/Cellar) {
+      message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
+      OPENSCAD_LIBDIR = /usr/local
+    }
+  }
+}
+!isEmpty(OPENSCAD_LIBDIR) {
+  QMAKE_INCDIR = $$OPENSCAD_LIBDIR/include
+  QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib
+}
+
+TARGET = polyhole-tessellator
+mac {
+  CONFIG -= app_bundle
+}
+
+macx {
+  # Mac needs special care to link against the correct C++ library
+  # We attempt to auto-detect it by inspecting Boost
+  dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
+  for(dir, dirs) {
+    system(grep -q __112basic_string $${dir}/libboost_thread* >& /dev/null) {
+      message("Detected libc++-linked boost in $${dir}")
+      CONFIG += libc++
+    }
+  }
+
+  libc++ {
+    QMAKE_CXXFLAGS += -stdlib=libc++
+    QMAKE_LFLAGS += -stdlib=libc++
+    QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
+    # libc++ on requires Mac OS X 10.7+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
+  }
+}
+
+# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
+*g++* {
+  QMAKE_CXXFLAGS *= -fno-strict-aliasing
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
+}
+
+*clang* {
+  # http://llvm.org/bugs/show_bug.cgi?id=9182
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
+  # disable enormous amount of warnings about CGAL / boost / etc
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
+  # might want to actually turn this on once in a while
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-format-security
+}
+
+
+
+# Application configuration
+CONFIG += cgal
+CONFIG += boost
+CONFIG += eigen
+CONFIG += gettext
+
+include(../common.pri)
+
+HEADERS += ../src/cgal.h \
+           ../src/cgalutils.h \
+           ../src/linalg.h \
+           ../src/printutils.h
+
+SOURCES += polyhole-tessellator.cpp \
+           ../src/cgalutils-tess.cc \
+           ../src/printutils.cc

color-schemes/editor/dark-background.json

@@ -0,0 +1,36 @@
+{
+    "name" : "For Dark Background",
+    "index" : 1100,
+    "paper" : "#222222",
+    "text" : "#e0e0e0",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#ffff00",
+        "line-background" : "#303030"
+    },
+    "colors" : {
+        "keyword1" : "#90ee90",
+        "keyword2" : "#56dbf0",
+        "keyword3" : "#add8e6",
+        "comment" : "#808080",
+        "commentline" : "#808080",
+        "commentdoc" : "#808080",
+        "commentdockeyword" : "#808080",
+        "number" : "#ff0000",
+        "string" : "#e6db74",
+        "operator" : "#e8b609",
+        "whitespace-foreground" : "#e0e0e0",
+        "selection-foreground" : "#ffffff",
+        "selection-background" : "#4a90d9",
+        "margin-background" : "#272822",
+        "margin-foreground" : "Gray",
+        "matched-brace-background" : "#505050",
+        "matched-brace-foreground" : "#ffffff",
+        "unmatched-brace-background" : "#dc322f",
+        "unmatched-brace-foreground" : "#fdf6e3",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#60ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#ffffff"
+    }
+}

color-schemes/editor/light-background.json

@@ -0,0 +1,36 @@
+{
+    "name" : "For Light Background",
+    "index" : 1000,
+    "paper" : "#ffffff",
+    "text" : "#272822",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#000000",
+        "line-background" : "#f8f8f8"
+    },
+    "colors" : {
+        "keyword1" : "Green",
+        "keyword2" : "Green",
+        "keyword3" : "DarkBlue",
+        "comment" : "DarkCyan",
+        "commentline" : "DarkCyan",
+        "commentdoc" : "DarkCyan",
+        "commentdockeyword" : "DarkCyan",
+        "number" : "DarkRed",
+        "string" : "DarkMagenta",
+        "operator" : "Blue",
+        "whitespace-foreground" : "#272822",
+        "selection-foreground" : "#ffffff",
+        "selection-background" : "#4a90d9",
+        "margin-background" : "#f8f8f8",
+        "margin-foreground" : "Gray",
+        "matched-brace-background" : "#c7f6cb",
+        "matched-brace-foreground" : "Blue",
+        "unmatched-brace-background" : "#ffcdcc",
+        "unmatched-brace-foreground" : "Blue",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#60ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#ffffff"
+    }
+}

color-schemes/editor/monokai.json

@@ -0,0 +1,36 @@
+{
+    "name" : "Monokai",
+    "index" : 1200,
+    "paper" : "#272822",
+    "text" : "#f8f8f2",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#f8f8f2",
+        "line-background" : "#49483e"
+    },
+    "colors" : {
+        "keyword1" : "#f92672",
+        "keyword2" : "#a6e22e",
+        "keyword3" : "#66d9ef",
+        "comment" : "#75715e",
+        "commentline" : "#75715e",
+        "commentdoc" : "#75715e",
+        "commentdockeyword" : "#7b9a3c",
+        "number" : "#ae81ff",
+        "string" : "#e6db74",
+        "operator" : "#f8f8f2",
+        "whitespace-foreground" : "#f8f8f2",
+        "selection-foreground" : "#272822",
+        "selection-background" : "#f8f8f2",
+        "margin-background" : "#3e3d32",
+        "margin-foreground" : "DarkGray",
+        "matched-brace-background" : "#606060",
+        "matched-brace-foreground" : "#ffff00",
+        "unmatched-brace-background" : "#b06060",
+        "unmatched-brace-foreground" : "#ffff00",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#80ffe0e0",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#ffffff"
+    }
+}

color-schemes/editor/solarized-dark.json

@@ -0,0 +1,36 @@
+{
+    "name" : "Solarized (dark)",
+    "index" : 1310,
+    "paper" : "#002b36",
+    "text" : "#839496",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#fff070",
+        "line-background" : "#073642"
+    },
+    "colors" : {
+        "keyword1" : "#268ad1",
+        "keyword2" : "#2aa198",
+        "keyword3" : "#859900",
+        "comment" : "#657b83",
+        "commentline" : "#657b83",
+        "commentdoc" : "#657b83",
+        "commentdockeyword" : "#6c71c4",
+        "number" : "#d33682",
+        "string" : "#b58900",
+        "operator" : "#cb4b16",
+        "whitespace-foreground" : "#839496",
+        "selection-foreground" : "#fdf6e3",
+        "selection-background" : "#657b83",
+        "margin-background" : "#002b36",
+        "margin-foreground" : "#839496",
+        "matched-brace-background" : "#0c4e22",
+        "matched-brace-foreground" : "#fff070",
+        "unmatched-brace-background" : "#92211f",
+        "unmatched-brace-foreground" : "#fff070",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#90ff8080",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#d33682"
+    }
+}

color-schemes/editor/solarized-light.json

@@ -0,0 +1,36 @@
+{
+    "name" : "Solarized (light)",
+    "index" : 1300,
+    "paper" : "#fdf6e3",
+    "text" : "#657b83",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#000000",
+        "line-background" : "#eee8d5"
+    },
+    "colors" : {
+        "keyword1" : "#268ad1",
+        "keyword2" : "#2aa198",
+        "keyword3" : "#859900",
+        "comment" : "#93a1a1",
+        "commentline" : "#93a1a1",
+        "commentdoc" : "#93a1a1",
+        "commentdockeyword" : "#6c71c4",
+        "number" : "#d33682",
+        "string" : "#b58900",
+        "operator" : "#cb4b16",
+        "whitespace-foreground" : "#657b83",
+        "selection-foreground" : "#fdf6e3",
+        "selection-background" : "#657b83",
+        "margin-background" : "#eee8d5",
+        "margin-foreground" : "#657b83",
+        "matched-brace-background" : "#c7f6cb",
+        "matched-brace-foreground" : "#cb4b16",
+        "unmatched-brace-background" : "#ffcdcc",
+        "unmatched-brace-foreground" : "#cb4b16",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#80ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#d33682"
+    }
+}

color-schemes/editor/tomorrow-night.json

@@ -0,0 +1,36 @@
+{
+    "name" : "Tomorrow Night",
+    "index" : 1600,
+    "paper" : "#1d1f21",
+    "text" : "#c5c8c6",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#ffffff",
+        "line-background" : "#282a2e"
+    },
+    "colors" : {
+        "keyword1" : "#de935f",
+        "keyword2" : "#b294bb",
+        "keyword3" : "#81a2be",
+        "comment" : "#969896",
+        "commentline" : "#969896",
+        "commentdoc" : "#969896",
+        "commentdockeyword" : "#f0c674",
+        "number" : "#cc6666",
+        "string" : "#b5bd68",
+        "operator" : "#8abeb7",
+        "whitespace-foreground" : "#c5c8c6",
+        "selection-foreground" : "#373b41",
+        "selection-background" : "#c5c8c6",
+        "margin-background" : "#1d1f21",
+        "margin-foreground" : "#969896",
+        "matched-brace-background" : "#50545c",
+        "matched-brace-foreground" : "#e2e6e3",
+        "unmatched-brace-background" : "#8a1111",
+        "unmatched-brace-foreground" : "#e2e6e3",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#80ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#d33682"
+    }
+}

color-schemes/editor/tomorrow.json

@@ -0,0 +1,36 @@
+{
+    "name" : "Tomorrow",
+    "index" : 1500,
+    "paper" : "#f8f8f8",
+    "text" : "#4d4d4c",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#000000",
+        "line-background" : "#efefef"
+    },
+    "colors" : {
+        "keyword1" : "#f5871f",
+        "keyword2" : "#8959a8",
+        "keyword3" : "#4271ae",
+        "comment" : "#8e908c",
+        "commentline" : "#8e908c",
+        "commentdoc" : "#8e908c",
+        "commentdockeyword" : "#eab700",
+        "number" : "#c82829",
+        "string" : "#718c00",
+        "operator" : "#3e999f",
+        "whitespace-foreground" : "#4d4d4c",
+        "selection-foreground" : "#4d4d4c",
+        "selection-background" : "#d6d6d6",
+        "margin-background" : "#f8f8f8",
+        "margin-foreground" : "#4d4d4c",
+        "matched-brace-background" : "#c7f6cb",
+        "matched-brace-foreground" : "#4d4d4c",
+        "unmatched-brace-background" : "#ffcdcc",
+        "unmatched-brace-foreground" : "#4d4d4c",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#80ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#d33682"
+    }
+}

color-schemes/editor/visualstudio.json

@@ -0,0 +1,41 @@
+{
+    "name" : "Visual Studio",
+    "index" : 1400,
+    "paper" : "#ffffff",
+    "text" : "#101010",
+    "caret" : {
+        "width" : 2,
+        "foreground" : "#000000",
+        "line-background" : "#eeeeee"
+    },
+    "colors" : {
+        "keyword1" : "blue",
+        "keyword2" : "blue",
+        "keyword3" : "#2B91AF",
+        "comment" : "DarkGreen",
+        "commentline" : "DarkGreen",
+        "commentdoc" : "#DarkGreen",
+        "commentdockeyword" : "#DarkGreen",
+        "number" : "DarkRed",
+        "string" : "#A31515",
+        "operator" : "Blue",
+        "whitespace-foreground" : "#101010",
+        "selection-foreground" : "black",
+        "selection-background" : "lightblue",
+        "margin-background" : "white",
+        "margin-foreground" : "#2B91AF",
+        "matched-brace-background" : "darkgrey",
+        "matched-brace-foreground" : "black",
+        "unmatched-brace-background" : "red",
+        "unmatched-brace-foreground" : "#ffffff",
+        "error-marker" : "#ff0000",
+        "error-indicator" : "#60ff0000",
+        "error-indicator-outline" : "#ff000000",
+        "edge" : "#ffffff"
+    },
+    "keywords" : {
+        "keyword-set1" : "if else let for module function true false undef include use",
+        "keyword-set2" : "abs sign rands min max sin cos asin acos tan atan atan2 round ceil floor pow sqrt exp len log ln str chr concat lookup search version version_num norm cross parent_module dxf_dim dxf_cross",
+        "keyword-set3" : "cube sphere cylinder polyhedron square circle polygon text minkowski hull resize child echo union difference intersection linear_extrude rotate_extrude import group projection render surface scale rotate mirror translate multmatrix color offset"
+    }
+}

color-schemes/readme.txt

@@ -0,0 +1,44 @@
+Color Schemes
+=============
+
+Solarized
+---------
+
+http://ethanschoonover.com/solarized
+
+Monokai
+-------
+
+http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
+
+Tomorrow / Tomorrow Night
+-------------------------
+
+https://github.com/chriskempson/tomorrow-theme
+
+Editor:
+
+keyword1                Orange
+keyword2                Purple
+keyword3                Blue
+comment                 Comment
+commentline             Comment
+commentdoc              Comment
+commentdockeyword       Yellow
+number                  Red
+string                  Green
+operator                Aqua
+selection-foreground    Foreground
+selection-background    Selection
+
+Render:
+
+opencsg-face-front      Blue
+opencsg-face-back       Orange
+cgal-face-front         Aqua
+cgal-face-back          Yellow
+cgal-face-2d            Green
+cgal-edge-front         Foreground
+cgal-edge-back          Foreground
+cgal-edge-2d            Red
+crosshair               Purple

color-schemes/render/beforedawn.json

@@ -0,0 +1,18 @@
+{
+    "name" : "BeforeDawn",
+    "index" : 1400,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#333333",
+        "opencsg-face-front" : "#cccccc",
+        "opencsg-face-back" :  "#5563dd",
+        "cgal-face-front" :    "#cccccc",
+        "cgal-face-back" :     "#5563dd",
+        "cgal-face-2d" :       "#00bf99",
+        "cgal-edge-front" :    "#ff0000",
+        "cgal-edge-back" :     "#ff0000",
+        "cgal-edge-2d" :       "#ff0000",
+        "crosshair" :          "#f0f0f0"
+    }
+}

color-schemes/render/deepocean.json

@@ -0,0 +1,18 @@
+{
+    "name" : "DeepOcean",
+    "index" : 1600,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#333333",
+        "opencsg-face-front" : "#eeeeee",
+        "opencsg-face-back" :  "#0babc8",
+        "cgal-face-front" :    "#eeeeee",
+        "cgal-face-back" :     "#0babc8",
+        "cgal-face-2d" :       "#9370db",
+        "cgal-edge-front" :    "#0000ff",
+        "cgal-edge-back" :     "#0000ff",
+        "cgal-edge-2d" :       "#ff00ff",
+        "crosshair" :          "#f0f0f0"
+    }
+}

color-schemes/render/metallic.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Metallic",
+    "index" : 1100,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#aaaaff",
+        "opencsg-face-front" : "#ddddff",
+        "opencsg-face-back" :  "#dd22dd",
+        "cgal-face-front" :    "#ddddff",
+        "cgal-face-back" :     "#dd22dd",
+        "cgal-face-2d" :       "#00bf99",
+        "cgal-edge-front" :    "#ff0000",
+        "cgal-edge-back" :     "#ff0000",
+        "cgal-edge-2d" :       "#ff0000",
+        "crosshair" :          "#800000"
+    }
+}

color-schemes/render/monotone.json

@@ -0,0 +1,19 @@
+{
+    "name" : "Monotone",
+    "index" : 9999,
+    "show-in-gui" : false,
+    "description" : "Color scheme with no difference between 'back face' and 'front face'",
+
+    "colors" : {
+        "background" :         "#ffffe5",
+        "opencsg-face-front" : "#f9d72c",
+        "opencsg-face-back" :  "#f9d72c",
+        "cgal-face-front" :    "#f9d72c",
+        "cgal-face-back" :     "#f9d72c",
+        "cgal-face-2d" :       "#00bf99",
+        "cgal-edge-front" :    "#ff0000",
+        "cgal-edge-back" :     "#ff0000",
+        "cgal-edge-2d" :       "#ff0000",
+        "crosshair" :          "#800000"
+    }
+}

color-schemes/render/nature.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Nature",
+    "index" : 1500,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#fafafa",
+        "opencsg-face-front" : "#16a085",
+        "opencsg-face-back" :  "#dbf4da",
+        "cgal-face-front" :    "#16a085",
+        "cgal-face-back" :     "#dbf4da",
+        "cgal-face-2d" :       "#00bf99",
+        "cgal-edge-front" :    "#ff0000",
+        "cgal-edge-back" :     "#ff0000",
+        "cgal-edge-2d" :       "#ff0000",
+        "crosshair" :          "#111111"
+    }
+}

color-schemes/render/solarized.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Solarized",
+    "index" : 1700,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#fdf6e3",
+        "opencsg-face-front" : "#b58800",
+        "opencsg-face-back" :  "#882233",
+        "cgal-face-front" :    "#b58800",
+        "cgal-face-back" :     "#882233",
+        "cgal-face-2d" :       "#6c71c4",
+        "cgal-edge-front" :    "#b58800",
+        "cgal-edge-back" :     "#b58800",
+        "cgal-edge-2d" :       "#b58800",
+        "crosshair" :          "#800000"
+    }
+}

color-schemes/render/starnight.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Starnight",
+    "index" : 1300,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#000000",
+        "opencsg-face-front" : "#ffffe0",
+        "opencsg-face-back" :  "#00ffff",
+        "cgal-face-front" :    "#ffffe0",
+        "cgal-face-back" :     "#00ffff",
+        "cgal-face-2d" :       "#9370db",
+        "cgal-edge-front" :    "#0000ff",
+        "cgal-edge-back" :     "#0000ff",
+        "cgal-edge-2d" :       "#ff00ff",
+        "crosshair" :          "#f0f0f0"
+    }
+}

color-schemes/render/sunset.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Sunset",
+    "index" : 1200,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#aa4444",
+        "opencsg-face-front" : "#ffaaaa",
+        "opencsg-face-back" :  "#882233",
+        "cgal-face-front" :    "#ffaaaa",
+        "cgal-face-back" :     "#882233",
+        "cgal-face-2d" :       "#00bf99",
+        "cgal-edge-front" :    "#ff0000",
+        "cgal-edge-back" :     "#ff0000",
+        "cgal-edge-2d" :       "#ff0000",
+        "crosshair" :          "#800000"
+    }
+}

color-schemes/render/tomorrow-night.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Tomorrow Night",
+    "index" : 1900,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#1d1f21",
+        "opencsg-face-front" : "#81a2be",
+        "opencsg-face-back" :  "#de935f",
+        "cgal-face-front" :    "#8abeb7",
+        "cgal-face-back" :     "#f0c674",
+        "cgal-face-2d" :       "#b5bd68",
+        "cgal-edge-front" :    "#c5c8c6",
+        "cgal-edge-back" :     "#c5c8c6",
+        "cgal-edge-2d" :       "#cc6666",
+        "crosshair" :          "#b294bb"
+    }
+}

color-schemes/render/tomorrow.json

@@ -0,0 +1,18 @@
+{
+    "name" : "Tomorrow",
+    "index" : 1800,
+    "show-in-gui" : true,
+
+    "colors" : {
+        "background" :         "#f8f8f8",
+        "opencsg-face-front" : "#4271ae",
+        "opencsg-face-back" :  "#f5871f",
+        "cgal-face-front" :    "#3e999f",
+        "cgal-face-back" :     "#eab700",
+        "cgal-face-2d" :       "#718c00",
+        "cgal-edge-front" :    "#4d4d4c",
+        "cgal-edge-back" :     "#4d4d4c",
+        "cgal-edge-2d" :       "#c82829",
+        "crosshair" :          "#8959a8"
+    }
+}

common.pri

@@ -12,4 +12,9 @@ include(glew.pri)
 include(eigen.pri)
 include(boost.pri)
 include(glib-2.0.pri)
+include(gettext.pri)
 include(sparkle.pri)
+include(harfbuzz.pri)
+include(freetype.pri)
+include(fontconfig.pri)
+include(scintilla.pri)

contrib/OpenSCAD.plist

@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
+<!-- 
+	(cc) Michael Thomson <openscad.org@m-thomson.net>
+	
+	OpenSCAD syntax highlights in BBEdit/TextWrangler by Michael Thomson 
+	is licensed under a Creative Commons Attribution 4.0 International License.
+		http://creativecommons.org/licenses/by/4.0/
+	
+	Master copy in OpenSCAD Distribution:
+		https://github.com/openscad/openscad/tree/master/contrib
+	
+	Also Published on Thingiverse:
+		http://www.thingiverse.com/thing:15244/
+		
+	Based on OpenSCAD 2014.03, documented here:
+		http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/The_OpenSCAD_Language
+
+	Version History		
+		2011-12-31	Initial version
+		2014-05-24	Updated for OpenSCAD 2014.03
+-->
+
 <dict>
 	<key>BBEditDocumentType</key>
 	<string>CodelessLanguageModule</string>
@@ -8,54 +29,158 @@
 	<true/>
 	<key>BBLMColorsSyntax</key>
 	<true/>
+	<key>BBLMCommentLineDefault</key>
+	<string>//</string>
+	<key>BBLMCommentPrefixDefault</key>
+	<string>/*</string>
+	<key>BBLMCommentSuffixDefault</key>
+	<string>*/</string>
 	<key>BBLMIsCaseSensitive</key>
 	<true/>
+	<key>BBLMPredefinedNameList</key>
+	<array>
+		<!--	Special constants	 -->
+		<string>true</string>
+		<string>false</string>
+		<string>undef</string>
+		<string>PI</string>
+
+		<!--	Parameters	 -->
+		<string>auto</string>
+		<string>center</string>
+		<string>invert</string>
+		<string>size</string>
+		<string>points</string>
+		<string>faces</string>
+		<string>convexity</string>
+		<string>file</string>		
+		<string>layer</string>		
+		<string>origin</string>		
+
+		<!--	Modifier Characters	 -->
+		<string>%</string>
+		<string>#</string>	<!--	Not highlighted?	 -->
+		<string>!</string>
+		<string>*</string>
+		
+		<!--	Special Variables	 -->
+		<string>$fa</string>
+		<string>$fs</string>
+		<string>$fn</string>
+		<string>$t</string>
+		<string>$vpr</string>
+		<string>$vpt</string>
+	</array>
+
 	<key>BBLMKeywordList</key>
 	<array>
-		<string>!</string>
-		<string>#</string>
-		<string>$fa</string>
-		<string>$fn</string>
-		<string>$fs</string>
-		<string>$t</string>
-		<string>%</string>
-		<string>*</string>
-		<string>assign</string>
-		<string>center</string>
-		<string>circle</string>
-		<string>color</string>
-		<string>cube</string>
-		<string>cylinder</string>
-		<string>difference</string>
-		<string>echo</string>
-		<string>for</string>
-		<string>function</string>
-		<string>hull</string>
-		<string>if</string>
-		<string>import_dxf</string>
-		<string>import_stl</string>
-		<string>include</string>
-		<string>intersection</string>
-		<string>intersection_for</string>
-		<string>linear_extrude</string>
-		<string>minkowski</string>
-		<string>mirror</string>
-		<string>module</string>
-		<string>multmatrix</string>
-		<string>polygon</string>
-		<string>polyhedron</string>
-		<string>projection</string>
-		<string>render</string>
-		<string>rotate</string>
-		<string>rotate_extrude</string>
-		<string>scale</string>
-		<string>sphere</string>
+		<!--	
+			Based on OpenSCAD 2014.3, documented here:
+			http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/The_OpenSCAD_Language
+		 -->
+		<!--	2D Primitives	 -->
 		<string>square</string>
+		<string>circle</string>
+		<string>polygon</string>
+
+		<!--	Primitive Solids	 -->
+		<string>cube</string>
+		<string>sphere</string>
+		<string>cylinder</string>
+		<string>polyhedron</string>
+
+		<!--	Conditional and Iterator Functions	  -->
+		<string>for</string>
+		<string>intersection_for</string>
+		<string>if</string>
+		<string>else</string>
+		<string>assign</string>
+
+		<!--	Mathematical Operators	 -->
+		<string>?</string>		<!--	Not highlighted?	 -->
+
+		<!--	Trigonometric Functions	 -->
+		<string>cos</string>
+		<string>sin</string>
+		<string>tan</string>
+		<string>acos</string>
+		<string>asin</string>
+		<string>atan</string>
+		<string>atan2</string>
+
+		<!--	Other Mathematical Functions	 -->
+		<string>abs</string>
+		<string>ceil</string>
+		<string>cross</string>
+		<string>exp</string>
+		<string>floor</string>
+		<string>ln</string>
+		<string>len</string>
+		<string>log</string>
+		<string>lookup</string>
+		<string>max</string>
+		<string>min</string>
+		<string>norm</string>
+		<string>pow</string>
+		<string>rands</string>
+		<string>round</string>
+		<string>sign</string>
+		<string>sqrt</string>
+
+		<!--	String Functions	 -->
 		<string>str</string>
-		<string>surface</string>
+
+		<!--	Transformations	 -->
+		<string>scale</string>
+		<string>rotate</string>
 		<string>translate</string>
+		<string>resize</string>
+		<string>mirror</string>
+		<string>multmatrix</string>
+		<string>color</string>
+		<string>minkowski</string>
+		<string>hull</string>
+
+		<!--	CSG Modelling	 -->
 		<string>union</string>
+		<string>difference</string>
+		<string>intersection</string>
+		<string>linear_extrude</string>
+
+		<!--	Modules	 -->
+		<string>module</string>
+		<string>children</string>
+		<string>function</string>
+		
+		<!--	Importing Geometry	 -->
+		<string>import</string>
+		<string>include</string>
 		<string>use</string>
+		<string>dxf_cross</string>
+
+		<!--	Other Language Features	 -->
+		
+		<!--	Echo Statements	 -->
+		<string>echo</string>
+		
+		<!--	Render	 -->
+		<string>render</string>
+
+		<!--	Offset	 -->
+		<string>offset</string>		
+
+		<!--	Surface	 -->
+		<string>surface</string>
+		
+		<!--	Search	 -->
+		<string>search</string>
+
+		<!--	OpenSCAD Version	 -->
+		<string>version</string>
+		<string>version_num</string>
+		<string>parent_module</string>
+		<string>$parent_modules</string>
+		
 	</array>
 	<key>BBLMLanguageCode</key>
 	<string>Oscd</string>

contrib/scad-mode.el

@@ -1,12 +1,12 @@
-;;; scad-mode.el --- SCAD mode derived mode
+;;; scad-mode.el --- Major mode for editing SCAD files
 
 ;; Author:     Len Trigg
 ;; Maintainer: Len Trigg <lenbok@gmail.com>
 ;; Created:    March 2010
-;; Modified:   06 July 2012
+;; Modified:   24 May 2014
 ;; Keywords:   languages
 ;; URL:        https://raw.github.com/openscad/openscad/master/contrib/scad-mode.el
-;; Version:    90.0
+;; Version:    91.0
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -143,6 +143,7 @@
 (defvar scad-font-lock-keywords
   `(
     ("\\(module\\|function\\)[ \t]+\\(\\sw+\\)" (1 'font-lock-keyword-face nil) (2 'font-lock-function-name-face nil t))
+    ("\\(use\\|include\\)[ \t]*<\\([^>]+\\)>" (1 'font-lock-preprocessor-face nil) (2 'font-lock-type-face nil t))
     ("<\\(\\sw+\\)>" (1 'font-lock-builtin-face nil))
     ("$\\(\\sw+\\)" (1 'font-lock-builtin-face nil))
     (,scad-keywords-regexp . font-lock-keyword-face)
@@ -173,14 +174,24 @@
   )
 
 
+;; From: http://stackoverflow.com/questions/14520073/add-words-for-dynamic-expansion-to-emacs-mode
+(defun scad-prime-dabbrev ()
+  "Makes a hidden scad-mode buffer containing all the scad keywords, so dabbrev expansion just works."
+  (unless (get-buffer " *scad words*")
+    (with-current-buffer (get-buffer-create " *scad words*")
+      (scad-mode)
+      (insert "module function use include")  ; Explicitly add these -- they're not in the below vars
+      (insert (mapconcat 'identity (append scad-keywords scad-functions scad-modules) " ")))))
+(add-hook 'scad-mode-hook 'scad-prime-dabbrev)
+
+
 ;;; Indentation, based on http://www.emacswiki.org/emacs/download/actionscript-mode-haas-7.0.el
 
 (defun scad-indent-line ()
   "Indent current line of SCAD code."
   (interactive)
   (let ((savep (> (current-column) (current-indentation)))
-        (indent (condition-case nil (max (scad-calculate-indentation) 0)
-                  (error 0))))
+        (indent (max (scad-calculate-indentation) 0)))
     (if savep
         (save-excursion (indent-line-to indent))
       (indent-line-to indent))))
@@ -224,9 +235,9 @@
            ;; Don't count if in string or comment.
            ((scad-face-at-point (- (point) 1)))
            ((looking-back "\\s)")
-            (incf close-count))
+            (setq close-count (+ close-count 1)))
            ((looking-back "\\s(")
-            (incf open-count))
+            (setq open-count (+ open-count 1)))
            )))
       (- open-count close-count))))
 

doc/Python-LICENSE.txt

@@ -0,0 +1,259 @@
+Part of OpenSCAD is copied from Python (linalg.cc/hash_floating_point()),
+so the python license is included below. 
+
+----
+
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC.  Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com).  In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property.  Zope Corporation is a sponsoring member of
+the PSF.
+
+All Python releases are Open Source (see http://www.opensource.org for
+the Open Source Definition).  Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+    Release         Derived     Year        Owner       GPL-
+                    from                                compatible? (1)
+
+    0.9.0 thru 1.2              1991-1995   CWI         yes
+    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
+    1.6             1.5.2       2000        CNRI        no
+    2.0             1.6         2000        BeOpen.com  no
+    1.6.1           1.6         2001        CNRI        yes (2)
+    2.1             2.0+1.6.1   2001        PSF         no
+    2.0.1           2.0+1.6.1   2001        PSF         yes
+    2.1.1           2.1+2.0.1   2001        PSF         yes
+    2.1.2           2.1.1       2002        PSF         yes
+    2.1.3           2.1.2       2002        PSF         yes
+    2.2 and above   2.1.1       2001-now    PSF         yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+    the GPL.  All Python licenses, unlike the GPL, let you distribute
+    a modified version without making your changes open source.  The
+    GPL-compatible licenses make it possible to combine Python with
+    other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+    because its license has a choice of law clause.  According to
+    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+    is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved"
+are retained in Python alone or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

doc/TODO.txt

@@ -226,8 +226,6 @@ o Visitation refactoring
 DOCUMENTATION
 -------------
 o Auto-generate API documentation instead of, in addition to or combined with, the wikibooks docs.
-o Write checklists for typical extension work (add new module, add new function)
-  -> syntax highlighter, test files, examples, documentation (external editor modes)
 o Clarify include/use better in the wikibook docs (e.g. that use'd modules have to be self-contained)
 
 TESTING

doc/hacking.txt

@@ -0,0 +1,11 @@
+# Add new function/module
+
+* Implement
+* Add test
+* Modules: Add example
+* Document:
+   * wikibooks
+   * cheatsheet
+   * Modules: tooltips (editor.cc)
+   * External editor modes
+   * Add to RELEASE_NOTES

doc/openscad.1

@@ -1,4 +1,4 @@
-.TH OPENSCAD 1 "2013-06-xx"
+.TH OPENSCAD 1 "2015.03"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 openscad \- script file based graphical CAD environment
@@ -19,9 +19,9 @@ the OpenSCAD user manual at http://en.wikibooks.org/wiki/OpenSCAD_User_Manual.
 
 .TP
 \fB-o\fP \fIoutputfile\fP
-Export the given file to \fIoutputfile\fP in STL, OFF, DXF, or PNG format,
-depending on file extension of \fIoutputfile\fP (which has to be lower case).
-If this option is given, the GUI will not be started.
+Export the given file to \fIoutputfile\fP in STL, OFF, AMF, DXF, SVG, or PNG
+format, depending on file extension of \fIoutputfile\fP. If this
+option is given, the GUI will not be started.
 
 Additional formats, which are mainly used for debugging and testing (but can
 also be used in automation), are AST (the input file as parsed and serialized
@@ -46,12 +46,18 @@ read it again.
 This option can be used to assign constant values to OpenSCAD variables. The
 variable's value is an expression, so if this mechanism is used to assign
 strings, care has to be taken that the shell does not consume quotation marks.
-More than one \fB-D\fP options can be given.
+More than one \fB-D\fP option can be given.
 .TP
 .B \-\-render
-If exporting an image, use a full CGAL render. (Default is an OpenCSG compile)
+If exporting an image, render the model fully. (Default is preview)
 .TP
-.B \-\-camera=rotx,roty,rotz,transx,transy,transz,distance
+.B \-\-preview[=throwntogether]
+If exporting an image, use an OpenCSG preview (optionally in throwntogether mode for quicker rendering).
+.TP
+.B \-\-csglimit=limit
+If exporting an image as an OpenCSG preview, stop rendering after encountering \fIlimit\fP elements to avoid runaway resource usage.
+.TP
+.B \-\-camera=transx,transy,transz,rotx,roty,rotz,distance
 If exporting an image, use a Gimbal camera with the given parameters. 
 Rot is rotation around the x, y, and z axis, trans is the distance to 
 move the object in the x, y, and z directions, and distance is the 
@@ -63,13 +69,24 @@ The first three are for the Eye position, while the next three are for
 the Center (or target) that the camera will look at. The 'up' vector is 
 not currently supported.
 .TP
+.B \-\-viewall
+If exporting an image, adjust camera distance to fit the whole design in the frame
+.TP
+.B \-\-autocenter
+If exporting an image, center the design in the frame
+.TP
 .B \-\-imgsize=width,height
 If exporting an image, specify the pixel width and height 
 .TP
-.B \-\-projection=[o|p]
+.B \-\-projection=[o|ortho|p|perspective]
 If exporting an image, specify whether to use orthographic or perspective 
 projection
 .TP
+.B \-\-colorscheme=\fIscheme
+If exporting an image, use the specified color scheme for the rendering.
+\fIscheme\fP can be any of \fBCornfield\fP, \fBSunset\fP, \fBMetallic\fP,
+\fBStarnight\fP, \fBBeforeDawn\fP, \fBNature\fP or \fBDeepOcean\fP.
+.TP
 .B \-v, \-\-version
 Show version of program.
 .TP

doc/patchlevel-checklist.txt

@@ -0,0 +1,34 @@
+Given:
+ VERSION (e.g. 2015.03-1)
+
+o Make sure we have a $VERSION branch. If not, create one
+
+o Update releases/$VERSION.md
+o scripts/makereleasenotes.sh
+
+o Update VERSION and VERSIONDATE in
+  openscad.pro
+  scripts/publish-macosx.sh
+  scripts/release-common.sh
+  scripts/publish-mingw-x.sh
+  tests/CMakeLists.txt
+  
+o git tag "openscad-$VERSION"
+o ./scripts/git-archive-all.py --prefix=openscad-$VERSION/ openscad-$VERSION.src.tar.gz
+o git push --tags
+o Upload Source package
+  $ scp openscad-$VERSION.src.tar.gz openscad@files.openscad.org:www
+
+o Revert VERSION and VERSIONDATE in openscad.pro scripts/publish-macosx.sh scripts/release-common.sh scripts/publish-mingw-x.sh tests/CMakeLists.txt
+
+o Announce:
+  - Write short release email to mailing list
+  - Tweet as OpenSCAD
+  - Notify package managers
+    - Debian/Ubuntu: https://launchpad.net/~chrysn
+    - Ubuntu PPA: https://github.com/hyperair
+    - Fedora: Miro Hrončok <miro@hroncok.cz> or <mhroncok@redhat.com>
+    - OpenSUSE: Pavol Rusnak <prusnak@opensuse.org>
+    - Arch Linux: Kyle Keen <keenerd@gmail.com>
+    - MacPorts: https://svn.macports.org/repository/macports/trunk/dports/science/openscad/Portfile
+    - Homebrew: https://github.com/caskroom/homebrew-cask/blob/master/Casks/openscad.rb

doc/release-checklist.txt

@@ -2,6 +2,10 @@ OpenSCAD Release Checklist
 --------------------------
 
 o Pre-release preparations
+  - Update translations:
+    - Send emails to translation managers, see .po files:
+      https://github.com/openscad/openscad/tree/master/locale
+  - Update src/AboutDialog.html with new contributors etc.
   - Merge MCAD
     o In MCAD clone:
       $ git fetch upstream
@@ -11,44 +15,40 @@ o Pre-release preparations
       $ cd libraries/MCAD
       $ git pull
       $ cd ../..
-      $ git commit -m "Updated MCAD"
+      $ git commit -m "Updated MCAD" libraries/MCAD
       $ git push
 
 (See bottom of this file for how to build release binaries)
 
-o Set VERSION and VERSIONDATE environment variable
-  (VERSIONDATE is new and used to identify releases. VERSION is for humans.
-   For development builds, set VERSION and VERSIONDATE to the same value)
+o Update manpage: doc/openscad.1
+o Update releases/$VERSION.md
+o scripts/makereleasenotes.sh
 
-  export VERSION=2013.01
-  export VERSIONDATE=2013.01.17
-
-  It will be used by the commands below, as well as these files: 
-
-  scripts/release-common.sh
-  scripts/publish-macosx.sh
-  scripts/publish-mingw-x.sh
-
-o Update RELEASE_NOTES
+o Update version number in doc/openscad.1
 o Update copyright year in AboutDialog.html and mainwin.cc
+o Add VERSION and VERSIONDATE in openscad.pro, scripts/publish-macosx.sh, scripts/release-common.sh
+o Add VERSION in tests/CMakeLists.txt, scripts/publish-mingw-x.sh
 
 o Tag release
   git tag "openscad-$VERSION"
 
+o Revert VERSION and VERSIONDATE in
+  openscad.pro, scripts/publish-macosx.sh, scripts/release-common.sh, scripts/publish-mingw-x.sh
+
 o build source package
   scripts/git-archive-all.py --prefix=openscad-$VERSION/ openscad-$VERSION.src.tar.gz
 
 o Sanity check; build a binary or two and manually run some tests
 
-o git push --tags
+o git push --tags master
 
 o Upload Source package
-  $ ./scripts/googlecode_upload.py -s 'Source Code' -p openscad -l Featured,Type-Source openscad-$VERSION.src.tar.gz
   $ scp openscad-$VERSION.src.tar.gz openscad@files.openscad.org:www
 
-o Remove VERSION environment variable
-  $ unset VERSION
+o Build binaries for all platforms and wait for upload
 
+o Announce:
+o ./scripts/github-release.sh $VERSION
 o Write release email/blog entry
 o Update web page
   - news.html
@@ -56,18 +56,21 @@ o Update web page
 o Update external resources:
   - http://en.wikipedia.org/wiki/OpenSCAD
 o Write to mailing list
-o Tweet
+o Tweet as OpenSCAD
 o Notify package managers
-  - Ubuntu: https://launchpad.net/~chrysn
+  - Debian/Ubuntu: https://launchpad.net/~chrysn
+  - Ubuntu PPA: https://github.com/hyperair
   - Fedora: Miro Hrončok <miro@hroncok.cz> or <mhroncok@redhat.com>
   - OpenSUSE: Pavol Rusnak <prusnak@opensuse.org>
-  - MacPorts: Frank Schima <macports2000@gmail.com>
+  - Arch Linux: Kyle Keen <keenerd@gmail.com>
+  - MacPorts: https://svn.macports.org/repository/macports/trunk/dports/science/openscad/Portfile
+  - Homebrew: https://github.com/caskroom/homebrew-cask/blob/master/Casks/openscad.rb
+o Update dev version to release version in documentation
+  - https://en.wikibooks.org/wiki/OpenSCAD_User_Manual
 
 Build and Upload Release Binaries
 ---------------------------------
 
-$ export VERSIONDATE=<date of release in YYYY.MM.DD format, e.g. 2013.01.17>
-$ export VERSION=<openscad version, e.g. 2013.01> # If development snapshot, you don't need version is the same as VERSIONDATE
 $ tar xzf openscad-$VERSION.src.tar.gz
 $ cd openscad-$VERSION
 
@@ -81,7 +84,7 @@ Linux:
 
     $ ./scripts/release-common.sh -> openscad-$VERSION.x86-ARCH.tar.gz
     (where ARCH will be detected and set to 32 or 64)
-    $ ./scripts/googlecode_upload.py -s 'Linux Binaries' -p openscad openscad-$VERSION.x86-ARCH.tar.gz -l Featured,OpSys-Linux,Type-Archive openscad-$VERSION.x86-ARCH.tar.gz
+    $ scp openscad-$VERSION.x86-ARCH.tar.gz openscad@files.openscad.org:www
     o Update web page with download links
 
 Windows mingw cross-build:

doc/testing.txt

@@ -1,34 +1,50 @@
 Running regression tests:
 -------------------------
 
-Prerequisites: cmake, python, ImageMagick 6.5.9.3 or newer
+0) Prerequisites
 
-First, get a working qmake GUI build of the main openscad binary and install MCAD.
-See the main README.
+Install the prerequisite helper programs on your system:
+
+     cmake, python2 (not 3), ImageMagick 6.5.9.3 or newer, diff
+
+There are binary installer packages of these tools available for Mac, 
+Win, Linux, BSD, and other systems. (except maybe diff for Win)
+
+Next, get a working qmake GUI build of the main openscad binary working. 
+For Windows(TM) this means get a cross-build working from within linux. 
+See README.md for how to do this.
+
+Then, install MCAD under openscad/libraries.
+
+$ cd openscad
+$ git submodule update --init
 
 A) Building test environment
 
 Linux, Mac:
-$ cd tests
-$ cmake .
-$ make
 
-Windows + MSVC:
+    $ cd tests
+    $ cmake .
+    $ make
 
-From the QT command prompt:
+Windows(TM):
 
-> cd tests
-> cmake . -DCMAKE_BUILD_TYPE=Release
-> sed -i s/\/MD/\/MT/ CMakeCache.txt
-> cmake .
-> nmake -f Makefile
+Cross-build from within linux:
 
-Cross compiling Linux->Win32:
+64-bit:
+    $ source ./scripts/setenv-mingw-xbuild.sh 64
+    $ ./scripts/release-common.sh mingw64 tests
+    $ # result is .zip file under ./mingw64/
 
-Please see openscad/tests/CMingw-cross-env.cmake for instructions.
+32-bit: 
+    $ source ./scripts/setenv-mingw-xbuild.sh 32
+    $ ./scripts/release-common.sh mingw32 tests
+    $ # result is .zip file under ./mingw32/
 
 B) Running tests
 
+Linux, Mac:
+
 $ ctest               Runs tests enabled by default
 $ ctest -R <regex>    Runs only matching tests, e.g. ctest -R dxf
 $ ctest -C <configs>  Adds extended tests belonging to configs.
@@ -39,6 +55,22 @@ $ ctest -C <configs>  Adds extended tests belonging to configs.
                       Bugs     - test known bugs (tests will fail)
                       All      - test everything
 
+Win:
+
+Unzip the OpenSCAD-Tests-YYYY.MM.DD file onto a Windows(TM) machine. 
+There will be a script called OpenSCAD-Test-Console.py in the parent folder.
+Double-click it, and it will open a console, from which you can type the ctest
+commands listed above.
+
+C) Automatically upload test results (experimental)
+
+It's possible to automatically upload tests results to an external
+server. This is good for CI, as well as being able to easily report
+bugs.
+
+To enable this feature, add '-DOPENSCAD_UPLOAD_TESTS=1' to the cmake 
+cmd-line, e.g.: cmake -DOPENSCAD_UPLOAD_TESTS=1 .
+
 Adding a new test:
 ------------------
 
@@ -65,23 +97,6 @@ This is almost the same as adding a new regression test:
 4) run the test normally and verify that it passes:
   $ ctest -C Examples -R exampleNNN
 
-Migration away from dedicated regression tests:
------------------------------------------------
-
-This test still needs an intermediate script that mangles away timestamps and
-near-zero floating point numbers:
-
-* cgalstlsanitytest
-
-Some tests are yet to be converted:
-
-* csgtexttest -- verify whether this is not redundant with dumptest
-
-These look like tests, but are not actually in use:
-
-* modulecachetest
-* cgalcachetest
-
 Troubleshooting:
 ------------------------------
 
@@ -131,7 +146,7 @@ Imagemagick may have crashed while comparing the expected images to the
 test-run generated (actual) images. You can try using the alternate 
 ImageMagick comparison method by by erasing CMakeCache, and re-running 
 cmake with -DCOMPARATOR=ncc. This will enable the Normalized Cross 
-Comparison method.
+Comparison method which is less accurate but won't usually crash.
 
 4. Testing images fails with 'morphology not found" for ImageMagick in the log
 
@@ -143,14 +158,68 @@ cmake. The comparison will be of lowered reliability.
 "terminate called after throwing an instance of 'std::runtime_error'
   what():  locale::facet::_S_create_c_locale name not valid" 
 
-Is a boost/libstdc++ bug. Fix like so:
+Is a boost/libstdc++ bug. Fix like so before running:
 
   $ export LC_MESSAGES=
 
-6. Other issues
+6. I want to build without OpenGL
 
-The OpenSCAD User Manual has a section on buildling. Please check there 
-for updates:
+ There is an unsupported way to do this, by defining NULLGL to Cmake:
+
+  mkdir nullglbin
+  cd nullglbin && cmake .. -DNULLGL=1 && make
+ 
+ The resulting openscad_nogui binary will fail most tests, but may be
+ useful for debugging and outputting 3d-formats like STL on systems without GL.
+ This option may break in the future and require tweaking to get working again.
+
+7. Proprietary GL driver issues
+
+There are sporadic reports of problems running on remote machines with
+proprietary GL drivers. Try doing a web search for your exact error
+message to see solutions and workarounds that others have found.
+
+8. Windows + MSVC: 
+
+The MSVC build was last tested circa 2012. The last time it worked,
+these were the necessary commands to run.
+
+> Start the 'QT command prompt'
+> cd \where\you\installed\openscad
+> cd tests
+> cmake . -DCMAKE_BUILD_TYPE=Release
+> sed -i s/\/MD/\/MT/ CMakeCache.txt
+> cmake .
+> nmake -f Makefile
+
+9. Other issues
+
+The OpenSCAD User Manual Wiki has a section on buildling. Please check 
+there for possible updates and workarounds:
 
 http://en.wikibooks.org/wiki/OpenSCAD_User_Manual
 
+Please report build errors (after double checking the instructions) in 
+the github issue tracker
+
+http://github.com/openscad/openscad/issues
+
+10. Migration away from dedicated regression tests:
+
+In 2013 the test programs underwent a major change. The following notes 
+are leftover.
+
+"This test still needs an intermediate script that mangles away timestamps and
+near-zero floating point numbers:
+
+* cgalstlsanitytest
+
+Some tests are yet to be converted:
+
+* csgtexttest -- verify whether this is not redundant with dumptest
+
+These look like tests, but are not actually in use:
+
+* modulecachetest
+* cgalcachetest
+"

doc/translation.txt

@@ -0,0 +1,84 @@
+OpenSCAD human language translation
+===================================
+
+We use the GNU gettext system, both for c++ code as well as QT's .ui files.
+The latter is accomplished by the '-tr' feature of QT's uic to insert
+a gettext wrapper into the ui_xxxxx.h files. 
+
+For somewhat similar designs, see the source code of projects like celestia, 
+stellarium, licq, merkaartor, etc (although they typically use cmake).
+
+Currently the build system does not auto-update anything. The .mo files must
+be generated by running the gettext tools: xgettext, msgmerge, and msgfmt.
+There is a script included, translation-update.sh, that automates this process.
+
+File layout:
+============
+
+ ./locale/*.po - .po files, one per language
+ ./locale/openscad.pot - .pot template, generated by xgettext
+ ./locale/POTFILES - list of source files with translatable strings (generated)
+ ./locale/LINGUAS - list of language codes for which .po files exist
+ ./src/qtgettext.h - wrapper code between QT and GNU gettext
+ ./scripts/translation-update.sh - simple unix helper script
+ ./locale/xx/LC_MESSAGES/openscad.mo - 'binaries' of .po files, built by script
+
+To translate the strings:
+=========================
+
+Use a text editor or special program (poedit or lokalize) to edit the .po file.
+( See http://en.opensuse.org/SDB:Localization_work_with_po_files )
+Then submit your new .po file as an OpenSCAD github issue or pull request:
+
+https://github.com/openscad/openscad/issues/ 
+
+In the future there might be a site to allow translations in a browser:
+
+https://translations.launchpad.net/openscad 
+
+If all else fails, email the OpenSCAD mailing list with your new .po 
+file attached.
+
+To make source code changes:
+============================
+
+In .cc files, #include "printutils.h" and change each "text" into 
+_("text"). In .ui files, #include "qtgettext.h" first in the .h file 
+(see MainWindow.h). Then clean and rebuild to recreate the ui_xxxx.h 
+files.
+
+   $ make clean && qmake && make
+
+Then run the script to scan the source files, and regenerate .pot & .po files.
+
+   $ ./scripts/translation-update.sh
+
+This will create new .po files with any new untranslated strings you 
+added to the source code. These .po files can be distributed to 
+translators for translation. After the translated .po file is obtained, 
+overwrite the old .po and run the same script to update the .mo files.
+
+   $ ./scripts/translation-update.sh
+
+To add a new language:
+======================
+
+First add the language code to file ./locale/LINGUAS. Then run msginit,
+replacing $LANGCODE with the language code you want. 
+
+    $ msginit -l $LANGCODE -o ./locale/$LANGCODE.po -i ./locale/openscad.pot
+
+You will now have a new ./locale/xx.po file to edit and translate
+
+Testing:
+========
+
+On unix, set the locale related environment variables. For example in 
+French, run this:
+
+   $ LANGUAGE=fr ./openscad
+
+Linux system trace tools can help find errors. To show open()s on .mo files:
+
+   $ LANGUAGE=fr strace -f ./openscad 2>&1 | grep LC_MESSAGES
+

eigen.pri

@@ -1,18 +1,14 @@
-# Detect eigen3 + eigen2, then use this priority list to determine
-# which eigen to use:
+# Detect eigen3
 #
 # Priority
-# 0. EIGENDIR if set (also EIGEN2DIR for backwards compatability)
+# 0. EIGENDIR if set
 # 1. OPENSCAD_LIBRARIES eigen3
-# 2. OPENSCAD_LIBRARIES eigen2
 # 3. system's standard include paths for eigen3
-# 4. system's standard include paths for eigen2
 
 eigen {
 
 # read environment variables
 OPENSCAD_LIBRARIES_DIR = $$(OPENSCAD_LIBRARIES)
-EIGEN2_DIR = $$(EIGEN2DIR)
 EIGEN_DIR = $$(EIGENDIR)
 
 # Optionally specify location of Eigen3 using the 
@@ -23,41 +19,18 @@ EIGEN_DIR = $$(EIGENDIR)
       EIGEN_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen3
     } 
   }
-  isEmpty(EIGEN_INCLUDEPATH) {
-    exists($$OPENSCAD_LIBRARIES_DIR/include/eigen2) {
-      EIGEN_INCLUDEPATH = $$OPENSCAD_LIBRARIES_DIR/include/eigen2
-    } 
-  }
 }
 
-
-# Optionally specify location of Eigen using the 
-# EIGENDIR env. variable (EIGEN2 for backwards compatability)
-!isEmpty(EIGEN2_DIR) { 
-  EIGEN_INCLUDEPATH = $$EIGEN2_DIR
-  message("User set EIGEN location: $$EIGEN_INCLUDEPATH")
-}
 !isEmpty(EIGEN_DIR) { 
   EIGEN_INCLUDEPATH = $$EIGEN_DIR
   message("User set EIGEN location: $$EIGEN_INCLUDEPATH")
 }
 
 isEmpty(EIGEN_INCLUDEPATH) {
+  linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3
   freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
   netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
-  linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3
   macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
-  !exists($$EIGEN_INCLUDEPATH) {
-    freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2
-    netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2
-    linux*|hurd*|unix*: EIGEN_INCLUDEPATH = /usr/include/eigen2
-    macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2
-  }
-}
-
-!exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
-  EIGEN_CFLAGS = $$system("pkg-config --cflags eigen2")
-  EIGEN_INCLUDEPATH = $$replace(EIGEN_CFLAGS,"-I","")
 }
 
 !exists($$EIGEN_INCLUDEPATH/Eigen/Core) {
@@ -72,7 +45,7 @@ isEmpty(EIGEN_INCLUDEPATH) {
   }
 }
 
-# EIGEN being under 'include/eigen[2-3]' needs special prepending
+# EIGEN being under 'include/eigen3' needs special prepending
 contains(QT_VERSION, ^5\\..*) {
   QMAKE_INCDIR = $$EIGEN_INCLUDEPATH $$QMAKE_INCDIR
 } else {

examples/Advanced/GEB.scad

@@ -0,0 +1,61 @@
+font = "Liberation Sans";
+// Nicer, but not generally installed:
+// font = "Bank Gothic";
+
+module G() offset(0.3) text("G", size=10, halign="center", valign="center", font = font);
+module E() offset(0.3) text("E", size=10, halign="center", valign="center", font = font);
+module B() offset(0.5) text("B", size=10, halign="center", valign="center", font = font);
+
+$fn=64;
+
+module GEB() {
+intersection() {
+    linear_extrude(height = 20, convexity = 3, center=true) B();
+    
+    rotate([90, 0, 0])
+      linear_extrude(height = 20, convexity = 3, center=true) E();
+    
+    rotate([90, 0, 90])
+      linear_extrude(height = 20, convexity = 3, center=true) G();
+  }
+}
+
+color("Ivory") GEB();
+
+color("MediumOrchid") 
+  translate([0,0,-20])
+    linear_extrude(1) 
+      difference() {
+        square(40, center=true);
+        projection() GEB();
+      }
+
+color("DarkMagenta")
+  rotate([90,0,0]) 
+    translate([0,0,-20])
+      linear_extrude(1) 
+        difference() {
+          translate([0,0.5]) square([40,39], center=true);
+          projection() rotate([-90,0,0]) GEB();
+        }
+
+color("MediumSlateBlue")
+  rotate([90,0,90]) 
+    translate([0,0,-20])
+      linear_extrude(1)
+        difference() {
+          translate([-0.5,0.5]) square([39,39], center=true);
+          projection() rotate([0,-90,-90]) GEB();
+        }
+
+echo(version=version());
+// Written in 2015 by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/animation.scad

@@ -0,0 +1,89 @@
+// animation.scad - Demo of animation usage
+
+// The animation funtionality is based simply on a variable $t
+// that is changed automatically by OpenSCAD while repeatedly
+// showing the model.
+// To activate animation, select "View->Animation" from the
+// menu and enter values into the appearing FPS and Steps input
+// fields (e.g. 5 FPS and 200 Steps for this animation).
+// This is not intended to directly produce real-time animations
+// but the image sequence can be exported to generate videos of
+// the animation.
+
+// Length of the 2 arm segments, change to see the effects on
+// the arm movements.
+arm1_length = 70;
+arm2_length = 50;
+
+r = 2;
+$fn = 30;
+
+plate();
+pos = position($t);
+arm(pos[0], pos[1], arm1_length, arm2_length);
+
+// Function describing the X/Y position that should be traced
+// by the arm over time.
+// The $t variable will be used as parameter for this function
+// so the range for t is [0..1].
+function position(t) = t < 0.5
+    ? [ 200 * t - 50, 30 * sin(5 * 360 * t) + 60 ]
+    : [ 50 * cos(360 * (t - 0.5)), 100 * -sin(360 * (t- 0.5)) + 60 ];
+
+// Inverse kinematics functions for a scara style arm
+// See http://forums.reprap.org/read.php?185,283327
+function sq(x, y) = x * x + y * y;
+function angB(x, y, l1, l2) = 180 - acos((l2 * l2 + l1 * l1 - sq(x, y)) / (2 * l1 * l2));
+function ang2(x, y, l1, l2) = 90 - acos((l2 * l2 - l1 * l1 + sq(x, y)) / (2 * l2 * sqrt(sq(x, y)))) - atan2(x, y);
+function ang1(x, y, l1, l2) = ang2(x, y, l1, l2) + angB(x, y, l1, l2);
+
+// Draw an arm segment with the given color and length.
+module segment(col, l) {
+    color(col) {
+        hull() {
+            sphere(r);
+            translate([l, 0, 0]) sphere(r);
+        }
+    }
+}
+
+// Draw the whole 2 segmented arm trying to reach position x/y.
+// Parameters l1 and l2 are the length of the two arm segments.
+module arm(x, y, l1, l2) {
+    a1 = ang1(x, y, l1, l2);
+    a2 = ang2(x, y, l1, l2);
+    sphere(r = 2 * r);
+    cylinder(r = 2, h = 6 * r, center = true);
+    rotate([0, 0, a1]) segment("red", l1);
+    translate(l1 * [cos(a1), sin(a1), 0]) {
+        sphere(r = 2 * r);
+        rotate([0, 0, a2]) segment("green", l2);
+    }
+    translate([x, y, -r/2])
+        cylinder(r1 = 0, r2 = r, h = 4 * r, center = true);
+}
+
+module curve() polygon([for (a = [ 0 : 0.004 : 1]) position(a)]);
+
+// Draws the plate and the traced function using small black cubes.
+module plate() {
+    %translate([0, 0, -3*r]) {
+        translate([0,25,0]) cube([150, 150, 0.1], center = true);
+        color("Black") linear_extrude(0.1) difference() {
+            curve();
+            offset(-1) curve();
+        }
+    }
+}
+
+echo(version=version());
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/children.scad

@@ -0,0 +1,54 @@
+// children.scad - Usage of children()
+
+// The use of children() allows to write generic modules that
+// modify child modules regardless of how the child geometry
+// is created.
+
+color("red")
+    make_ring_of(radius = 15, count = 6)
+        cube(8, center = true);
+
+color("green")
+    make_ring_of(radius = 30, count = 12)
+        difference() {
+            sphere(5);
+            cylinder(r = 2, h = 12, center = true);
+        }
+
+color("cyan")
+    make_ring_of(radius = 50, count = 4)
+        something();
+
+module make_ring_of(radius, count)
+{
+    for (a = [0 : count - 1]) {
+        angle = a * 360 / count;
+        translate(radius * [sin(angle), -cos(angle), 0])
+            rotate([0, 0, angle])
+                children();
+    }
+}
+
+module something()
+{
+    cube(10, center = true);
+    cylinder(r = 2, h = 12, $fn = 40);
+    translate([0, 0, 12])
+        rotate([90, 0, 0])
+            linear_extrude(height = 2, center = true)
+                text("SCAD", 8, halign = "center");
+    translate([0, 0, 12])
+        cube([22, 1.6, 0.4], center = true);
+}
+
+echo(version=version());
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/children_indexed.scad

@@ -0,0 +1,62 @@
+// children_indexed.scad - Usage of indexed children()
+
+// children() with a parameter allows access to a specific child
+// object with children(0) being the first one. In addition the
+// $children variable is automatically set to the number of child
+// objects.
+
+color("red")
+    translate([-100, -20, 0])
+        align_in_grid_and_add_text();
+
+color("yellow")
+    translate([-50, -20, 0])
+        align_in_grid_and_add_text() {
+            cube(5, center = true);
+        }
+
+color("cyan")
+    translate([0, -20, 0])
+        align_in_grid_and_add_text() {
+            cube(5, center = true);
+            sphere(4);
+        }
+
+color("green")
+    translate([50, -20, 0])
+        align_in_grid_and_add_text() {
+            cube(5, center = true);
+            sphere(4);
+            cylinder(r = 4, h = 5);
+        }
+
+
+module align_in_grid_and_add_text()
+{
+    if ($children == 0) {
+        linear_extrude(height = 1, center = true)
+          text("Nothing...", 6, halign = "center");
+    } else {
+        t = $children == 1 ? "one object" : str($children, " objects ");
+        linear_extrude(height = 1, center = true)
+          text(t, 6, halign = "center");
+
+        for (y = [0 : $children - 1])
+            for (x = [0 : $children - 1])
+                translate([15 * (x - ($children - 1) / 2), 20 * y + 40, 0])
+                    scale(1 + x / $children)
+                        children(y);
+    }
+}
+
+echo(version=version());
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/module_recursion.scad

@@ -0,0 +1,51 @@
+// Recursive calls of modules can generate complex geometry, especially
+// fractal style objects.
+// The example uses a recursive module to generate a random tree as
+// described in http://natureofcode.com/book/chapter-8-fractals/
+
+levels = 10; // number of levels for the recursion
+
+len = 100; // length of the first segment
+thickness = 5; // thickness of the first segment
+
+// the identity matrix
+identity = [ [ 1, 0, 0, 0 ], [ 0, 1, 0, 0 ], [ 0, 0, 1, 0 ], [ 0, 0, 0, 1 ] ];
+
+// random generator, to generate always the same output for the example,
+// this uses a seed for rands() and stores the array of random values in
+// the random variable. To generate different output, remove the seed or
+// replace the function rnd() to just call rands(s, e, 1)[0].
+rcnt = 1000;
+random = rands(0, 1, rcnt, 18);
+function rnd(s, e, r) = random[r % rcnt] * (e - s) + s;
+
+// generate 4x4 translation matrix
+function mt(x, y) = [ [ 1, 0, 0, x ], [ 0, 1, 0, y ], [ 0, 0, 1, 0 ], [ 0, 0, 0, 1 ] ];
+
+// generate 4x4 rotation matrix around Z axis
+function mr(a) = [ [ cos(a), -sin(a), 0, 0 ], [ sin(a), cos(a), 0, 0 ], [ 0, 0, 1, 0 ], [ 0, 0, 0, 1 ] ];
+
+module tree(length, thickness, count, m = identity, r = 1) {
+    color([0, 1 - (0.8 / levels * count), 0])
+        multmatrix(m)
+            square([thickness, length]);
+
+    if (count > 0) {
+        tree(rnd(0.6, 0.8, r) * length, 0.8 * thickness, count - 1, m * mt(0, length) * mr(rnd(20, 35, r + 1)), 8 * r);
+        tree(rnd(0.6, 0.8, r + 1) * length, 0.8 * thickness, count - 1, m * mt(0, length) * mr(-rnd(20, 35, r + 3)), 8 * r + 4);
+    }
+}
+
+tree(len, thickness, levels);
+
+echo(version=version());
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/offset.scad

@@ -0,0 +1,43 @@
+// offset.scad - Example for offset() usage in OpenSCAD
+
+$fn = 40;
+
+foot_height = 20;
+
+echo(version=version());
+
+module outline(wall = 1) {
+  difference() {
+    offset(wall / 2) children();
+    offset(-wall / 2) children();
+  }
+}
+
+// offsetting with a positive value allows to create rounded corners easily
+linear_extrude(height = foot_height, scale = 0.5) {
+  offset(10) {
+    square(50, center = true);
+  }
+}
+
+translate([0, 0, foot_height]) {
+  linear_extrude(height = 20) {
+    outline(wall = 2) circle(15);
+  }
+}
+
+%cylinder(r = 14, h = 100);
+%translate([0, 0, 100]) sphere(r = 30);
+
+
+
+// Written in 2014 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Advanced/surface_image.scad

@@ -0,0 +1,26 @@
+echo(version=version());
+
+// surface() can import images, the pixel values are converted
+// to grayscale and converted to values between 0 and 100.
+// The example takes 3 cuts from the height map and displays
+// those as 3 stacked layers.
+
+for (a = [1, 2, 3])
+    color([a/6 + 0.5, 0, 0])
+       linear_extrude(height = 2 * a, convexity = 10)
+            projection(cut = true)
+                translate([0, 0, -30 * a])
+                    surface("surface_image.png", center = true);
+
+
+
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/CSG-modules.scad

@@ -0,0 +1,94 @@
+// CSG-modules.scad - Basic usage of modules, if, color, $fs/$fa
+
+// Change this to false to remove the helper geometry
+debug = true;
+
+// Global resolution
+$fs = 0.1;  // Don't generate smaller facets than 0.1 mm
+$fa = 5;    // Don't generate larger angles than 5 degrees
+
+// Main geometry
+difference() {
+    intersection() {
+        body();
+        intersector();
+    }
+    holes();
+}
+
+// Helpers
+if (debug) helpers();
+
+// Core geometric primitives.
+// These can be modified to create variations of the final object
+
+module body() {
+    color("Blue") sphere(10);
+}
+
+module intersector() {
+    color("Red") cube(15, center=true);
+}
+
+module holeObject() {
+    color("Lime") cylinder(h=20, r=5, center=true);
+}
+
+// Various modules for visualizing intermediate components
+
+module intersected() {
+    intersection() {
+        body();
+        intersector();
+    }
+}
+
+module holeA() rotate([0,90,0]) holeObject();
+module holeB() rotate([90,0,0]) holeObject();
+module holeC() holeObject();
+
+module holes() {
+    union() {
+        holeA();
+        holeB();
+        holeC();
+    }
+}
+
+module helpers() {
+    // Inner module since it's only needed inside helpers
+    module line() color("Black") cylinder(r=1, h=10, center=true);
+
+    scale(0.5) {
+        translate([-30,0,-40]) {
+            intersected();
+            translate([-15,0,-35]) body();
+            translate([15,0,-35]) intersector();
+            translate([-7.5,0,-17.5]) rotate([0,30,0]) line();
+            translate([7.5,0,-17.5]) rotate([0,-30,0]) line();
+        }
+        translate([30,0,-40]) {
+            holes();
+            translate([-10,0,-35]) holeA();
+            translate([10,0,-35]) holeB();
+            translate([30,0,-35]) holeC();
+            translate([5,0,-17.5]) rotate([0,-20,0]) line();
+            translate([-5,0,-17.5]) rotate([0,30,0]) line();
+            translate([15,0,-17.5]) rotate([0,-45,0]) line();
+        }
+        translate([-20,0,-22.5]) rotate([0,45,0]) line();
+        translate([20,0,-22.5]) rotate([0,-45,0]) line();
+    }
+}
+
+echo(version=version());
+// Written by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/CSG.scad

@@ -0,0 +1,32 @@
+// CSG.scad - Basic example of CSG usage
+
+translate([-24,0,0]) {
+    union() {
+        cube(15, center=true);
+        sphere(10);
+    }
+}
+
+intersection() {
+    cube(15, center=true);
+    sphere(10);
+}
+
+translate([24,0,0]) {
+    difference() {
+        cube(15, center=true);
+        sphere(10);
+    }
+}
+
+echo(version=version());
+// Written by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/LetterBlock.scad

@@ -0,0 +1,34 @@
+// LetterBlock.scad - Basic usage of text() and linear_extrude()
+
+// Module instantiation
+LetterBlock("M");
+
+// Module definition.
+// size=30 defines an optional parameter with a default value.
+module LetterBlock(letter, size=30) {
+    difference() {
+        translate([0,0,size/4]) cube([size,size,size/2], center=true);
+        translate([0,0,size/6]) {
+            // convexity is needed for correct preview
+            // since characters can be highly concave
+            linear_extrude(height=size, convexity=4)
+                text(letter, 
+                     size=size*22/30,
+                     font="Bitstream Vera Sans",
+                     halign="center",
+                     valign="center");
+        }
+    }
+}
+
+echo(version=version());
+// Written by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/linear_extrude.scad

@@ -0,0 +1,36 @@
+echo(version=version());
+
+// simple 2D -> 3D extrusion of a rectangle
+color("red")
+    translate([0, -30, 0])
+        linear_extrude(height = 20)
+            square([20, 10], center = true);
+
+// using the scale parameter a frustum can be constructed
+color("green")
+    translate([-30, 0, 0])
+        linear_extrude(height = 20, scale = 0.2)
+            square([20, 10], center = true);
+
+// with twist the extruded shape will rotate around the Z axis
+color("cyan")
+    translate([30, 0, 0])
+        linear_extrude(height = 20, twist = 90)
+            square([20, 10], center = true);
+
+// combining both relatively complex shapes can be created
+color("gray")
+    translate([0, 30, 0])
+        linear_extrude(height = 40, twist = -360, scale = 0, center = true, slices = 200)
+            square([20, 10], center = true);
+
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/logo.scad

@@ -0,0 +1,35 @@
+// logo.scad - Basic example of module, top-level variable and $fn usage
+
+Logo(50);
+
+// The $fn parameter will influence all objects inside this module
+// It can, optionally, be overridden when instantiating the module
+module Logo(size=50, $fn=100) {
+    // Temporary variables
+    hole = size/2;
+    cylinderHeight = size * 1.25;
+
+    // One positive object (sphere) and three negative objects (cylinders)
+    difference() {
+        sphere(d=size);
+        
+        cylinder(d=hole, h=cylinderHeight, center=true);
+        // The '#' operator highlights the object
+        #rotate([90, 0, 0]) cylinder(d=hole, h=cylinderHeight, center=true);
+        rotate([0, 90, 0]) cylinder(d=hole, h=cylinderHeight, center=true);
+    }
+}
+
+echo(version=version());
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+

examples/Basics/logo_and_text.scad

@@ -0,0 +1,42 @@
+// logo_and_text.scad - Example for use<> and text()
+
+use <logo.scad> // Imports the Logo() module from logo.scad into this namespace
+
+// Set the initial viewport parameters
+$vpr = [90, 0, 0];
+$vpt = [250, 0, 80];
+$vpd = 500;
+
+logosize = 120;
+
+
+translate([110, 0, 80]) {
+  translate([0, 0, 30]) rotate([25, 25, -40]) Logo(logosize);
+  translate([100, 0, 40]) green() t("Open", 42, ":style=Bold");
+  translate([247, 0, 40]) black() t("SCAD", 42, ":style=Bold");
+  translate([100, 0, 0]) black() t("The Programmers");
+  translate([160, 0, -30]) black() t("Solid 3D CAD Modeller");
+}
+
+// Helper to create 3D text with correct font and orientation
+module t(t, s = 18, style = "") {
+  rotate([90, 0, 0])
+    linear_extrude(height = 1)
+      text(t, size = s, font = str("Liberation Sans", style), $fn = 16);
+}
+
+// Color helpers
+module green() color([81/255, 142/255, 4/255]) children();
+module black() color([0, 0, 0]) children();
+
+echo(version=version());
+// Written in 2014 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/projection.scad

@@ -0,0 +1,64 @@
+echo(version=version());
+
+%import("projection.stl");
+
+// projection() without the cut = true parameter will project
+// the outline of the object onto the X/Y plane. The result is
+// a 2D shape.
+
+color("red")
+    translate([0, 0, -20])
+        linear_extrude(height = 2, center = true)
+            difference() {
+                square(30, center = true);
+                projection()
+                    import("projection.stl");
+            }
+
+color("green")
+    rotate([0, 90, 0])
+        translate([0, 0, -20])
+            linear_extrude(height = 2, center = true)
+                difference() {
+                    square(30, center = true);
+                    projection()
+                        rotate([0, 90, 0])
+                            import("projection.stl");
+                }
+
+color("cyan")
+    rotate([-90, 0, 0])
+        translate([0, 0, 20])
+            linear_extrude(height = 2, center = true)
+                difference() {
+                    square(30, center = true);
+                    projection()
+                        rotate([90, 0, 0])
+                            import("projection.stl");
+                }
+
+// Including the cut = true uses the outline of the cut at
+// the X/Y plane.at Z = 0. This can make internal features
+// of the model visible.
+
+color("yellow", 0.5)
+    translate([0, 0, 20])
+        linear_extrude(height = 2, center = true)
+            difference() {
+                square(30, center = true);
+                projection(cut = true)
+                    import("projection.stl");
+            }
+
+
+
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/rotate_extrude.scad

@@ -0,0 +1,35 @@
+echo(version=version());
+
+// rotate_extrude() always rotates the 2D shape 360 degrees
+// around the Z axis. Note that the 2D shape must be either
+// completely on the positive or negative side of the X axis.
+color("red")
+    rotate_extrude()
+        translate([10, 0])
+            square(5);
+
+// rotate_extrude() uses the global $fn/$fa/$fs settings, but
+// it's possible to give a different value as parameter.
+color("cyan")
+    translate([40, 0, 0])
+        rotate_extrude($fn = 80)
+            text("  J");
+
+// Using a shape that touches the X axis is allowed and produces
+// 3D objects that don't have a hole in the center.
+color("green")
+    translate([0, 30, 0])
+        rotate_extrude($fn = 80)
+            polygon( points=[[0,0],[8,4],[4,8],[4,12],[12,16],[0,20]] );
+
+
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Basics/text_on_cube.scad

@@ -0,0 +1,51 @@
+// text_on_cube.scad - Example for text() usage in OpenSCAD
+
+echo(version=version());
+
+font = "Liberation Sans";
+
+cube_size = 60;
+letter_size = 50;
+letter_height = 5;
+
+o = cube_size / 2 - letter_height / 2;
+
+module letter(l) {
+  // Use linear_extrude() to make the letters 3D objects as they
+  // are only 2D shapes when only using text()
+  linear_extrude(height = letter_height) {
+    text(l, size = letter_size, font = font, halign = "center", valign = "center", $fn = 16);
+  }
+}
+
+difference() {
+  union() {
+    color("gray") cube(cube_size, center = true);
+    translate([0, -o, 0]) rotate([90, 0, 0]) letter("C");
+    translate([o, 0, 0]) rotate([90, 0, 90]) letter("U");
+    translate([0, o, 0]) rotate([90, 0, 180]) letter("B");
+    translate([-o, 0, 0]) rotate([90, 0, -90]) letter("E");
+  }
+
+  // Put some symbols on top and bottom using symbols from the
+  // Unicode symbols table.
+  // (see https://en.wikipedia.org/wiki/Miscellaneous_Symbols)
+  //
+  // Note that depending on the font used, not all the symbols
+  // are actually available.
+  translate([0, 0, o])  letter("\u263A");
+  translate([0, 0, -o - letter_height])  letter("\u263C");
+}
+
+
+
+// Written in 2014 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/COPYING-CC0.txt

@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.

examples/Functions/functions.scad

@@ -0,0 +1,35 @@
+echo(version=version());
+
+// Functions can be defined to simplify code using lots of
+// calculations.
+
+// Simple example with a single function argument (which should
+// be a number) and returning a number calculated based on that.
+function f(x) = 0.5 * x + 1;
+
+color("red")
+    for (a = [ -100 : 5 : 100 ])
+        translate([a, f(a), 0]) cube(2, center = true);
+
+// Functions can call other functions and return complex values
+// too. In this case a 3 element vector is returned which can
+// be used as point in 3D space or as vector (in the mathematical
+// meaning) for translations and other transformations.
+function g(x) = [ 5 * x + 20, f(x) * f(x) - 50, 0 ];
+
+color("green")
+    for (a = [ -200 : 10 : 200 ])
+        translate(g(a / 8)) sphere(1);
+
+
+
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Functions/list_comprehensions.scad

@@ -0,0 +1,47 @@
+// list_comprehensions.scad - Examples of list comprehension usage
+
+// Basic list comprehension:
+// Returns a 2D vertex per iteration of the for loop
+// Note: subsequent assignments inside the for loop is allowed
+module ngon(num, r) {
+  polygon([for (i=[0:num-1], a=i*360/num) [ r*cos(a), r*sin(a) ]]);
+}
+
+ngon(3, 10);
+translate([20,0]) ngon(6, 8);
+translate([36,0]) ngon(10, 6);
+
+// More complex list comprehension:
+// Similar to ngon(), but uses an inner function to calculate
+// the vertices. the let() keyword allows assignment of temporary variables.
+module rounded_ngon(num, r, rounding = 0) {
+  function v(a) = let (d = 360/num, v = floor((a+d/2)/d)*d) (r-rounding) * [cos(v), sin(v)];
+  polygon([for (a=[0:360-1]) v(a) + rounding*[cos(a),sin(a)]]);
+}
+
+translate([0,22]) rounded_ngon(3, 10, 5);
+translate([20,22]) rounded_ngon(6, 8, 4);
+translate([36,22]) rounded_ngon(10, 6, 3);
+
+// Gear/star generator
+// Uses a list comprehension taking a list of radii to generate a star shape
+module star(num, radii) {
+  function r(a) = (floor(a / 10) % 2) ? 10 : 8;
+  polygon([for (i=[0:num-1], a=i*360/num, r=radii[i%len(radii)]) [ r*cos(a), r*sin(a) ]]);
+}
+
+translate([0,44]) star(20, [6,10]);
+translate([20,44]) star(40, [6,8,8,6]);
+translate([36,44]) star(30, [3,4,5,6,5,4]);
+
+echo(version=version());
+// Written by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Functions/polygon_areas.scad

@@ -0,0 +1,50 @@
+// polygon_areas.scad: Another recursion example 
+
+// Draw all geometry
+translate([0,20]) color("Red") text("Areas:", size=8, halign="center");
+translate([-44,0]) shapeWithArea(3, 10);
+translate([-22,0]) shapeWithArea(4, 10);
+translate([0,0]) shapeWithArea(6, 10);
+translate([22,0]) shapeWithArea(10, 10);
+translate([44,0]) shapeWithArea(360, 10);
+
+// One shape with corresponding text
+module shapeWithArea(num, r) {
+    polygon(ngon(num, r));
+    translate([0,-20]) 
+        color("Cyan") 
+            text(str(round(area(ngon(num, r)))), halign="center", size=8);
+}
+
+// Simple list comprehension for creating N-gon vertices
+function ngon(num, r) = 
+  [for (i=[0:num-1], a=i*360/num) [ r*cos(a), r*sin(a) ]];
+
+// Area of a triangle with the 3rd vertex in the origin
+function triarea(v0, v1) = cross(v0, v1) / 2;
+
+// Area of a polygon using the Shoelace formula
+function area(vertices) =
+  let (areas = [let (num=len(vertices))
+                  for (i=[0:num-1]) 
+                    triarea(vertices[i], vertices[(i+1)%num])
+               ])
+      sum(areas);
+
+// Recursive helper function: Sums all values in a list.
+// In this case, sum all partial areas into the final area.
+function sum(values,s=0) =
+  s == len(values) - 1 ? values[s] : values[s] + sum(values,s+1);
+
+
+echo(version=version());
+// Written in 2015 by Marius Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Functions/recursion.scad

@@ -0,0 +1,25 @@
+// recursionscad:  Basic recursion example 
+
+// Recursive functions are very powerful for calculating values.
+// A good number of algorithms make use of recursive definitions,
+// e.g the caluclation of the factorial of a number.
+// The ternary operator " ? : " is the easiest way to define the
+// termination condition.
+// Note how the following simple implementation will never terminate
+// when called with a negative value. This will produce an error after
+// some time when OpenSCAD detects the endless recursive call.
+function factorial(n) = n == 0 ? 1 : factorial(n - 1) * n;
+
+color("cyan") text(str("6! = ", factorial(6)), halign = "center");
+
+echo(version=version());
+// Written in 2015 by Torsten Paul <Torsten.Paul@gmx.de>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example001.scad

@@ -0,0 +1,38 @@
+module example001()
+{
+  function r_from_dia(d) = d / 2;
+
+  module rotcy(rot, r, h) {
+    rotate(90, rot)
+      cylinder(r = r, h = h, center = true);
+  }
+
+  difference() {
+    sphere(r = r_from_dia(size));
+    rotcy([0, 0, 0], cy_r, cy_h);
+    rotcy([1, 0, 0], cy_r, cy_h);
+    rotcy([0, 1, 0], cy_r, cy_h);
+  }
+
+  size = 50;
+  hole = 25;
+
+  cy_r = r_from_dia(hole);
+  cy_h = r_from_dia(size * 2.5);
+}
+
+echo(version=version());
+
+example001();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example002.scad

@@ -0,0 +1,36 @@
+
+module example002()
+{
+  intersection() {
+    difference() {
+      union() {
+        cube([30, 30, 30], center = true);
+        translate([0, 0, -25])
+          cube([15, 15, 50], center = true);
+      }
+      union() {
+        cube([50, 10, 10], center = true);
+        cube([10, 50, 10], center = true);
+        cube([10, 10, 50], center = true);
+      }
+    }
+    translate([0, 0, 5])
+      cylinder(h = 50, r1 = 20, r2 = 5, center = true);
+  }
+}
+
+echo(version=version());
+
+example002();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example003.scad

@@ -0,0 +1,33 @@
+
+module example003()
+{
+  difference() {
+    union() {
+      cube([30, 30, 30], center = true);
+      cube([40, 15, 15], center = true);
+      cube([15, 40, 15], center = true);
+      cube([15, 15, 40], center = true);
+    }
+    union() {
+      cube([50, 10, 10], center = true);
+      cube([10, 50, 10], center = true);
+      cube([10, 10, 50], center = true);
+    }
+  }
+}
+
+echo(version=version());
+
+example003();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example004.scad

@@ -0,0 +1,24 @@
+
+module example004()
+{
+  difference() {
+    cube(30, center = true);
+    sphere(20);
+  }
+}
+
+echo(version=version());
+
+example004();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example005.scad

@@ -0,0 +1,34 @@
+
+module example005()
+{
+  translate([0, 0, -120]) {
+    difference() {
+      cylinder(h = 50, r = 100);
+      translate([0, 0, 10]) cylinder(h = 50, r = 80);
+      translate([100, 0, 35]) cube(50, center = true);
+    }
+    for (i = [0:5]) {
+      echo(360*i/6, sin(360*i/6)*80, cos(360*i/6)*80);
+      translate([sin(360*i/6)*80, cos(360*i/6)*80, 0 ])
+        cylinder(h = 200, r=10);
+    }
+    translate([0, 0, 200])
+      cylinder(h = 80, r1 = 120, r2 = 0);
+  }
+}
+
+echo(version=version());
+
+example005();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example006.scad

@@ -0,0 +1,59 @@
+
+module example006()
+{
+  module edgeprofile()
+  {
+    render(convexity = 2) difference() {
+      cube([20, 20, 150], center = true);
+      translate([-10, -10, 0])
+        cylinder(h = 80, r = 10, center = true);
+      translate([-10, -10, +40])
+        sphere(r = 10);
+      translate([-10, -10, -40])
+        sphere(r = 10);
+    }
+  }
+
+  difference() {
+    cube(100, center = true);
+    for (rot = [ [0, 0, 0], [1, 0, 0], [0, 1, 0] ]) {
+      rotate(90, rot)
+        for (p = [[+1, +1, 0], [-1, +1, 90], [-1, -1, 180], [+1, -1, 270]]) {
+          translate([ p[0]*50, p[1]*50, 0 ])
+            rotate(p[2], [0, 0, 1])
+              edgeprofile();
+        }
+    }
+    for (i = [
+      [ 0, 0, [ [0, 0] ] ],
+      [ 90, 0, [ [-20, -20], [+20, +20] ] ],
+      [ 180, 0, [ [-20, -25], [-20, 0], [-20, +25], [+20, -25], [+20, 0], [+20, +25] ] ],
+      [ 270, 0, [ [0, 0], [-25, -25], [+25, -25], [-25, +25], [+25, +25] ] ],
+      [ 0, 90, [ [-25, -25], [0, 0], [+25, +25] ] ],
+      [ 0, -90, [ [-25, -25], [+25, -25], [-25, +25], [+25, +25] ] ]
+    ]) {
+    rotate(i[0], [0, 0, 1])
+      rotate(i[1], [1, 0, 0])
+        translate([0, -50, 0])
+          for (j = i[2]) {
+            translate([j[0], 0, j[1]]) sphere(10);
+          }
+    }
+  }
+}
+
+echo(version=version());
+
+example006();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example007.scad

@@ -0,0 +1,70 @@
+
+module cutout()
+{
+    intersection() {
+      rotate(90, [1, 0, 0])
+        translate([0, 0, -50])
+          linear_extrude(height = 100, convexity = 1)
+            import(file = "example007.dxf", layer = "cutout1");
+      
+      rotate(90, [0, 0, 1])
+        rotate(90, [1, 0, 0])
+          translate([0, 0, -50])
+            linear_extrude(height = 100, convexity = 2)
+              import(file = "example007.dxf", layer = "cutout2");
+    }
+}
+
+module clip()
+{
+  difference() {
+    rotate_extrude(convexity = 3, $fn = 0, $fa = 12, $fs = 2) {
+      import(file = "example007.dxf", layer = "dorn");
+    }
+    for (r = [0, 90])
+      rotate(r, [0, 0, 1])
+        cutout();
+  }
+}
+
+module cutview()
+{
+  difference() {
+    difference() {
+      translate([0, 0, -10]) clip();
+
+      rotate(20, [0, 0, 1])
+        rotate(-20, [0, 1, 0])
+          translate([18, 0, 0])
+            cube(30, center = true);
+    }
+
+    # render(convexity = 5) intersection() {
+      translate([0, 0, -10])
+        clip();
+    
+      rotate(20, [0, 0, 1])
+        rotate(-20, [0, 1, 0])
+          translate([18, 0, 0])
+            cube(30, center = true);
+    }
+  }
+}
+
+echo(version=version());
+
+translate([0, 0, -10]) clip();
+
+// cutview();
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.

examples/Old/example008.scad

@@ -0,0 +1,42 @@
+echo(version=version());
+
+difference() {
+  intersection() {
+    translate([ -25, -25, -25])
+      linear_extrude(height = 50, convexity = 3)
+        import(file = "example008.dxf", layer = "G");
+    
+    rotate(90, [1, 0, 0])
+      translate([ -25, -125, -25])
+        linear_extrude(height = 50, convexity = 3)
+          import(file = "example008.dxf", layer = "E");
+    
+    rotate(90, [0, 1, 0])
+      translate([ -125, -125, -25])
+        linear_extrude(height = 50, convexity = 3)
+          import(file = "example008.dxf", layer = "B");
+  }
+
+  intersection() {
+    translate([ -125, -25, -26])
+      linear_extrude(height = 52, convexity = 1)
+        import(file = "example008.dxf", layer = "X");
+
+    rotate(90, [0, 1, 0])
+      translate([ -125, -25, -26])
+        linear_extrude(height = 52, convexity = 1)
+          import(file = "example008.dxf", layer = "X");
+  }
+}
+
+// Written by Clifford Wolf <clifford@clifford.at> and Marius
+// Kintel <marius@kintel.net>
+//
+// To the extent possible under law, the author(s) have dedicated all
+// copyright and related and neighboring rights to this software to the
+// public domain worldwide. This software is distributed without any
+// warranty.
+//
+// You should have received a copy of the CC0 Public Domain
+// Dedication along with this software.
+// If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.