Change label "Show Zoom" to "Show Zoom Value"

[features.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 5dad3ab7c435657f3d9062a3d1b70541c242956f..a4521848c310f280d9a0cbb6c9a42fdc9bf2ba75 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -10,11 +10,16 @@
 
 #include <config.h>
 
-#include "InsetLayout.h"
 #include "InsetText.h"
 
+#include "mathed/MacroTable.h"
+
 #include "insets/InsetArgument.h"
 #include "insets/InsetLayout.h"
+#include "insets/InsetPreview.h"
+
+#include "graphics/PreviewImage.h"
+#include "graphics/PreviewLoader.h"
 
 #include "buffer_funcs.h"
 #include "Buffer.h"
@@ -26,6 +31,7 @@
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "ErrorList.h"
+#include "Exporter.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetList.h"
@@ -57,10 +63,12 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Changer.h"
+#include "support/FileName.h"
 
 #include <algorithm>
 #include <stack>
@@ -72,9 +80,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-using graphics::PreviewLoader;
-
-
 /////////////////////////////////////////////////////////////////////
 
 InsetText::InsetText(Buffer * buf, UsePlain type)
@@ -628,8 +633,9 @@ void InsetText::docbook(XMLStream & xs, OutputParams const & rp, XHTMLOptions op
 
        InsetLayout const &il = getLayout();
 
-       // Maybe this is an <info> paragraph that should not be generated at all (i.e. right now, its place is somewhere
-       // else, typically outside the current paragraph).
+       // Maybe this is an <info> paragraph that should not be generated
+       // at all (i.e. right now, its place is somewhere else, typically outside
+       // the current paragraph).
        if (!rp.docbook_generate_info && il.docbookininfo() != "never")
                return;
 
@@ -648,14 +654,48 @@ void InsetText::docbookRenderAsImage(XMLStream & xs, OutputParams const & rp, XH
 {
        LASSERT(getLayout().docbookrenderasimage(), return);
 
+       // Generate the LaTeX code to compile in order to get the image.
+       // This code actually does the same as an InsetPreview, but without
+       // an InsetPreview.
+       // Also, the image must be generated before the DocBook output is finished,
+       // unlike a preview that is not immediately required for display.
+       docstring const latex_snippet = insetToLaTeXSnippet(&buffer(), this);
+       std::string const snippet = support::trim(to_utf8(latex_snippet));
+       // TODO: no real support for Unicode. This code is very similar to RenderPreview::addPreview, the same gotcha applies.
+
+       graphics::PreviewLoader* loader = buffer().loader();
+       // This should be OK because we are exporting
+       LASSERT(loader != nullptr, return);
+       loader->add(snippet);
+       loader->startLoading(true); // Generate the image and wait until done.
+       graphics::PreviewImage const * img = loader->preview(snippet);
+       LASSERT(img != nullptr, return);
+       support::FileName const & filename = img->filename();
+
+       // Use a file name that is only determined by the LaTeX code: the name of
+       // the snippet is more or less random (i.e., if the user generates the file
+       // several times, they will have a clutter of preview files).
+       // Hence: use a cryptographic hash of the snippet. If the snippet changes,
+       // the file name will change a lot; two snippets are unlikely to have the
+       // same hash (by design of cryptographic hash functions). Computing a hash
+       // is typically slow, but extremely fast compared to compilation of the
+       // preview and image rendering.
+       std::string newFileName = "lyx_" + sanitizeFileName(toHexHash(snippet)) + "." + filename.extension();
+
+       // Copy the image into the right folder.
+       rp.exportdata->addExternalFile("docbook5", filename, newFileName);
+
        // TODO: deal with opts. What exactly is the WriterOuterTag here, for instance?
+       // Start writing the DocBook code for the image.
        xs << xml::StartTag("mediaobject")
           << xml::CR();
 
        // Output the rendered inset.
        xs << xml::StartTag("imageobject")
-          << xml::CR();
-       xs << xml::EndTag("imageobject")
+          << xml::CR()
+          << xml::CompTag("imagedata", std::string("fileref='") + newFileName + "'")
+          << xml::CR()
+          << xml::EndTag("imageobject")
           << xml::CR();
 
        // Output the raw content.
@@ -668,8 +708,7 @@ void InsetText::docbookRenderAsImage(XMLStream & xs, OutputParams const & rp, XH
           << xml::EndTag("textobject")
           << xml::CR();
 
-       xs << xml::EndTag("mediaobject")
-          << xml::CR();
+       xs << xml::EndTag("mediaobject");
 }
 
 
@@ -944,7 +983,7 @@ void InsetText::appendParagraphs(ParagraphList & plist)
 
 
 void InsetText::addPreview(DocIterator const & text_inset_pos,
-       PreviewLoader & loader) const
+       graphics::PreviewLoader & loader) const
 {
        ParagraphList::const_iterator pit = paragraphs().begin();
        ParagraphList::const_iterator pend = paragraphs().end();