commit e9046da86f7848c94b986620b20c594b2a749bee
Author: Martin Vermeer <[email protected]>
Date:   Tue Sep 6 06:23:29 2016 +0300

    Further fixes due to remarks by Pavel Sanda Sep. 5, 2016
---
 lib/doc/EmbeddedObjects.lyx    |   25 +++++++++++++++++++++----
 lib/doc/Makefile.am            |    3 ++-
 lib/doc/clipart/workaround.png |  Bin 0 -> 17450 bytes
 lib/doc/workaround.png         |  Bin 17450 -> 0 bytes
 lib/external_templates         |    7 +++++--
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index eb10ca3..e91914c 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -228,11 +228,12 @@ graphicboxes
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
-\tracking_changes false
+\tracking_changes true
 \output_changes false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
+\author 227574939 "Kyttj"
 \end_header
 
 \begin_body
@@ -38608,9 +38609,13 @@ target "http://en.wikipedia.org/wiki/Xfig";
 
 \series default
 .
+\change_inserted 227574939 1473131626
+
 \end_layout
 
 \begin_layout Description
+
+\change_inserted 227574939 1473131628
 Inkscape
 \begin_inset space ~
 \end_inset
@@ -38620,7 +38625,7 @@ figure This experimental template supports images 
created with the program
 \begin_inset CommandInset href
 LatexCommand href
 name "Inkscape"
-target "https://fi.wikipedia.org/wiki/Inkscape";
+target "https://en.wikipedia.org/wiki/Inkscape";
 
 \end_inset
 
@@ -38632,12 +38637,16 @@ target "https://fi.wikipedia.org/wiki/Inkscape";
 
 \begin_deeper
 \begin_layout Standard
+
+\change_inserted 227574939 1473131628
 LyX will process the image file in much the same way as it does an Xfig
  image, extracting the text into a separate TeX file for the text strings,
  and a PDF file for the rest.
 \end_layout
 
 \begin_layout Description
+
+\change_inserted 227574939 1473131628
 Warning: Unfortunately the latest version of Inkscape, 0.91, contains a bug:
  with multi-page PDFs, the TeX file will sometimes reference more pages
  than the PDF file contains.
@@ -38647,6 +38656,8 @@ Warning: Unfortunately the latest version of Inkscape, 
0.91, contains a bug:
 status open
 
 \begin_layout Plain Layout
+
+\change_inserted 227574939 1473131628
 A workaround for those who have already SVG figures in their document is,
  to manually do the LaTeX+PDF output from Inkscape, edit the 
 \family typewriter
@@ -38662,8 +38673,10 @@ input
 \end_layout
 
 \begin_layout Plain Layout
+
+\change_inserted 227574939 1473131628
 \begin_inset Graphics
-       filename workaround.png
+       filename clipart/workaround.png
        scale 50
 
 \end_inset
@@ -38672,6 +38685,8 @@ input
 \end_layout
 
 \begin_layout Plain Layout
+
+\change_inserted 227574939 1473131628
 Here, the child document input inset (
 \family sans
 Insert\SpecialChar menuseparator
@@ -38683,7 +38698,7 @@ Child Document
 .pdf_tex
 \family default
  file in a text editor.
- The LaTeX output  is based on this edited snippet as re-generation from
+ The LaTeX output is based on this edited snippet as re-generation from
  the SVG file has been commented out.
 \end_layout
 
@@ -38694,6 +38709,8 @@ Child Document
 
 \begin_deeper
 \begin_layout Standard
+
+\change_inserted 227574939 1473131628
 The reason why we would use this complicated process at all, like in the
  case of Xfig, is that it makes the text strings inside the figure of the
  same font type and attributes as the surrounding text, which looks so much
diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index 8f534a2..2b0d6a0 100644
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -55,7 +55,8 @@ dist_clipartdoc_DATA = \
        clipart/ToolbarEnvBox.png \
        clipart/ViewToolbar.png \
        clipart/without_fntright.pdf \
-       clipart/with_fntright.pdf
+       clipart/with_fntright.pdf \
+       clipart/workaround.png
 
 cadocdir = $(docdir)/ca
 dist_cadoc_DATA = \
diff --git a/lib/doc/clipart/workaround.png b/lib/doc/clipart/workaround.png
new file mode 100644
index 0000000..9e568b0
Binary files /dev/null and b/lib/doc/clipart/workaround.png differ
diff --git a/lib/doc/workaround.png b/lib/doc/workaround.png
deleted file mode 100644
index 9e568b0..0000000
Binary files a/lib/doc/workaround.png and /dev/null differ
diff --git a/lib/external_templates b/lib/external_templates
index 61a910b..84d41fa 100644
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -295,8 +295,11 @@ Template Inkscape
        HelpText
                An Inkscape figure.
                This template should work flawlessly with Inkscape 0.48. 
-               For Inkscape 0.91, there is a bug in the LaTeX + PDF output
-               which makes a workaround necessary, see Embedded Objects manual.
+               For Inkscape 0.91, there is a (reported) bug in the 
+               LaTeX + PDF output which makes a workaround necessary, 
+               see Embedded Objects manual.
+               Note that using this template automatically uses the 
+               document text in the image (like with the Xfig template).
        HelpTextEnd
        InputFormat svg
        FileFilter "*.svg"

Reply via email to