1 files changed, 46 insertions, 2 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 0ea1fd591..3c222bd9e 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -111,6 +111,7 @@ CairoRenderContext::CairoRenderContext(CairoRenderer *parent) :
     _ps_level(1),
     _eps(false),
     _is_texttopath(FALSE),
+    _is_omittext(FALSE),
     _is_filtertobitmap(FALSE),
     _bitmapresolution(72),
     _stream(NULL),
@@ -124,7 +125,8 @@ CairoRenderContext::CairoRenderContext(CairoRenderer *parent) :
     _state(NULL),
     _renderer(parent),
     _render_mode(RENDER_MODE_NORMAL),
-    _clip_mode(CLIP_MODE_MASK)
+    _clip_mode(CLIP_MODE_MASK),
+    _omittext_state(EMPTY)
 {
     font_table = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, font_data_free);
 }
@@ -426,6 +428,16 @@ void CairoRenderContext::setTextToPath(bool texttopath)
     _is_texttopath = texttopath;
 }
 
+void CairoRenderContext::setOmitText(bool omittext)
+{
+    _is_omittext = omittext;
+}
+
+bool CairoRenderContext::getOmitText(void)
+{
+    return _is_omittext;
+}
+
 void CairoRenderContext::setFilterToBitmap(bool filtertobitmap)
 {
     _is_filtertobitmap = filtertobitmap;
@@ -1331,11 +1343,36 @@ CairoRenderContext::_setStrokeStyle(SPStyle const *style, Geom::OptRect const &p
     cairo_set_miter_limit(_cr, MAX(1, style->stroke_miterlimit.value));
 }
 
+void
+CairoRenderContext::_prepareRenderGraphic()
+{
+    // Only PDFLaTeX supports importing a single page of a graphics file,
+    // so only PDF backend gets interleaved text/graphics
+    if (_is_omittext && _target == CAIRO_SURFACE_TYPE_PDF) {
+        if (_omittext_state == NEW_PAGE_ON_GRAPHIC)
+            cairo_show_page(_cr);
+        _omittext_state = GRAPHIC_ON_TOP;
+    }
+}
+
+void
+CairoRenderContext::_prepareRenderText()
+{
+    // Only PDFLaTeX supports importing a single page of a graphics file,
+    // so only PDF backend gets interleaved text/graphics
+    if (_is_omittext && _target == CAIRO_SURFACE_TYPE_PDF) {
+        if (_omittext_state == GRAPHIC_ON_TOP)
+            _omittext_state = NEW_PAGE_ON_GRAPHIC;
+    }
+}
+
 bool
 CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle const *style, Geom::OptRect const &pbox)
 {
     g_assert( _is_valid );
 
+    _prepareRenderGraphic();
+
     if (_render_mode == RENDER_MODE_CLIP) {
         if (_clip_mode == CLIP_MODE_PATH) {
             addClipPath(pathv, &style->fill_rule);
@@ -1408,6 +1445,8 @@ bool CairoRenderContext::renderImage(GdkPixbuf *pb,
         return true;
     }
 
+    _prepareRenderGraphic();
+
     int w = gdk_pixbuf_get_width (pb);
     int h = gdk_pixbuf_get_height (pb);
 
@@ -1489,7 +1528,12 @@ unsigned int CairoRenderContext::_showGlyphs(cairo_t *cr, PangoFont * /*font*/,
 bool
 CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_matrix,
                                     std::vector<CairoGlyphInfo> const &glyphtext, SPStyle const *style)
-{
+{    
+
+    _prepareRenderText();
+    if (_is_omittext)
+        return true;
+
     // create a cairo_font_face from PangoFont
     double size = style->font_size.computed; /// \fixme why is this variable never used?
     gpointer fonthash = (gpointer)font;