diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index f308f58ca82f601fa6f04c0416ad6bae283a3511..8406e2a3b53d951f251a89728299a7450ae7253a 100644 (file)
* Authors:
* Ted Gould <ted@gould.cx>
* Ulf Erikson <ulferikson@users.sf.net>
+ * Johan Engelen <goejendaagh@zonnet.nl>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
- * Copyright (C) 2004-2006 Authors
+ * Copyright (C) 2004-2010 Authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include "cairo-renderer-pdf-out.h"
#include "cairo-render-context.h"
#include "cairo-renderer.h"
-#include "pdflatex-renderer.h"
+#include "latex-text-renderer.h"
#include <print.h>
#include "extension/system.h"
#include "extension/print.h"
bool texttopath, bool omittext, bool filtertobitmap, int resolution,
const gchar * const exportId, bool exportDrawing, bool exportCanvas)
{
- sp_document_ensure_up_to_date(doc);
+ doc->ensureUpToDate();
/* Start */
@@ -68,18 +71,19 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
}
else {
// we want to export the entire document from root
- base = SP_ITEM(sp_document_root(doc));
+ base = SP_ITEM(doc->getRoot());
pageBoundingBox = !exportDrawing;
}
- if (!base)
+ if (!base) {
return false;
+ }
/* Create new arena */
NRArena *arena = NRArena::create();
nr_arena_set_renderoffscreen (arena);
- unsigned dkey = sp_item_display_key_new(1);
- sp_item_invoke_show(base, arena, dkey, SP_ITEM_SHOW_DISPLAY);
+ unsigned dkey = SPItem::display_key_new(1);
+ base->invoke_show(arena, dkey, SP_ITEM_SHOW_DISPLAY);
/* Create renderer and context */
CairoRenderer *renderer = new CairoRenderer();
@@ -101,7 +105,7 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
}
/* Release arena */
- sp_item_invoke_hide(base, dkey);
+ base->invoke_hide(dkey);
nr_object_unref((NRObject *) arena);
renderer->destroyContext(ctx);
@@ -110,49 +114,6 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
return ret;
}
-static bool
-latex_render_document_text_to_file( SPDocument *doc, gchar const *filename,
- const gchar * const exportId, bool exportDrawing, bool exportCanvas)
-{
- sp_document_ensure_up_to_date(doc);
-
-/* Start */
-
- SPItem *base = NULL;
-
- bool pageBoundingBox = true;
- if (exportId && strcmp(exportId, "")) {
- // we want to export the given item only
- base = SP_ITEM(doc->getObjectById(exportId));
- pageBoundingBox = exportCanvas;
- }
- else {
- // we want to export the entire document from root
- base = SP_ITEM(sp_document_root(doc));
- pageBoundingBox = !exportDrawing;
- }
-
- if (!base)
- return false;
-
- /* Create renderer */
- PDFLaTeXRenderer *renderer = new PDFLaTeXRenderer();
-
- bool ret = renderer->setTargetFile(filename);
- if (ret) {
- /* Render document */
- bool ret = renderer->setupDocument(doc, pageBoundingBox, base);
- if (ret) {
- renderer->renderItem(base);
- }
- }
-
- delete renderer;
-
- return ret;
-}
-
-
/**
\brief This function calls the output module with the filename
\param mod unused
@@ -177,11 +138,11 @@ CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc,
int level = 0;
try {
new_level = mod->get_param_enum("PDFversion");
-// if((new_level != NULL) && (g_ascii_strcasecmp("PDF-1.x", new_level) == 0))
-// level = 1;
+ if((new_level != NULL) && (g_ascii_strcasecmp("PDF-1.5", new_level) == 0))
+ level = 1;
}
catch(...) {
-// g_warning("Parameter <PDFversion> might not exist");
+ g_warning("Parameter <PDFversion> might not exist");
}
bool new_textToPath = FALSE;
@@ -255,10 +216,7 @@ CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc,
// Create LaTeX file (if requested)
if (new_textToLaTeX) {
- gchar * tex_filename;
- tex_filename = g_strdup_printf("%s.tex", filename);
- ret = latex_render_document_text_to_file(doc, tex_filename, new_exportId, new_exportDrawing, new_exportCanvas);
- g_free(tex_filename);
+ ret = latex_render_document_text_to_file(doc, filename, new_exportId, new_exportDrawing, new_exportCanvas, true);
if (!ret)
throw Inkscape::Extension::Output::save_failed();
"<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
"<name>Portable Document Format</name>\n"
"<id>org.inkscape.output.pdf.cairorenderer</id>\n"
- "<param name=\"PDFversion\" gui-text=\"" N_("Restrict to PDF version") "\" type=\"enum\" >\n"
- "<_item value='PDF14'>" N_("PDF 1.4") "</_item>\n"
+ "<param name=\"PDFversion\" gui-text=\"" N_("Restrict to PDF version:") "\" type=\"enum\" >\n"
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0))
+ "<_item value='PDF-1.5'>" N_("PDF 1.5") "</_item>\n"
+#endif
+ "<_item value='PDF-1.4'>" N_("PDF 1.4") "</_item>\n"
"</param>\n"
"<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
- "<param name=\"textToLaTeX\" gui-text=\"" N_("Exclude text, create LaTeX file") "\" type=\"boolean\">false</param>\n"
+ "<param name=\"textToLaTeX\" gui-text=\"" N_("PDF+LaTeX: Omit text in PDF, and create LaTeX file") "\" type=\"boolean\">false</param>\n"
"<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
- "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi)") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
+ "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">90</param>\n"
"<param name=\"areaDrawing\" gui-text=\"" N_("Export area is drawing") "\" type=\"boolean\">false</param>\n"
"<param name=\"areaPage\" gui-text=\"" N_("Export area is page") "\" type=\"boolean\">false</param>\n"
- "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID") "\" type=\"string\"></param>\n"
+ "<param name=\"exportId\" gui-text=\"" N_("Limit export to the object with ID:") "\" type=\"string\"></param>\n"
"<output>\n"
"<extension>.pdf</extension>\n"
"<mimetype>application/pdf</mimetype>\n"