apply some (forgotten) changes to generator as they were applied to the data
apply some (forgotten) changes to generator as they were applied to the data

b6542eb2 - Thierry Bastian) fix to exported symbol
2e429e40 - Lars Knoll) N'Ko support

Merge-request: 480
Reviewed-by: Thiago Macieira <0ed1648d92ca0373297a182b1dba1b974ad10d88@nokia.com>

igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt