From 1bcede451a6ff1ddb633e42268a433292b2842b6 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Sun, 31 Jul 2016 01:20:16 -0400
Subject: [PATCH] Enable export of spreadsheets with XHTML.

(cherry picked from commit 1840e2dbaf8b0278a81c6b14fe8a1f939c390160)
---
 lib/configure.py       | 7 ++++++-
 lib/external_templates | 5 +++++
 status.22x             | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/configure.py b/lib/configure.py
index 84a852afde..d1d83b83a2 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -632,6 +632,7 @@ def checkFormatEntries(dtl_tools):
     checkViewer('gnumeric spreadsheet software', ['gnumeric'],
       rc_entry = [r'''\Format gnumeric gnumeric "Gnumeric spreadsheet" "" ""    "%%"   "document"	"application/x-gnumeric"
 \Format excel      xls    "Excel spreadsheet"      "" "" "%%"    "document"	"application/vnd.ms-excel"
+\Format html_table html   "HTML Table (for spreadsheets)"      "" "" "%%"    "document"	"text/html"
 \Format oocalc     ods    "OpenDocument spreadsheet" "" "" "%%"    "document"	"application/vnd.oasis.opendocument.spreadsheet"'''])
  #
     checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
@@ -1010,7 +1011,11 @@ def checkConverterEntries():
     checkProg('a spreadsheet -> latex converter', ['ssconvert'],
        rc_entry = [ r'''\converter gnumeric latex "ssconvert --export-type=Gnumeric_html:latex $$i $$o" ""
 \converter oocalc latex "ssconvert --export-type=Gnumeric_html:latex $$i $$o" ""
-\converter excel  latex "ssconvert --export-type=Gnumeric_html:latex $$i $$o" ""'''])
+\converter excel  latex "ssconvert --export-type=Gnumeric_html:latex $$i $$o" ""
+\converter gnumeric html_table "ssconvert --export-type=Gnumeric_html:html40frag $$i $$o" ""
+\converter oocalc html_table "ssconvert --export-type=Gnumeric_html:html40frag $$i $$o" ""
+\converter excel  html_table "ssconvert --export-type=Gnumeric_html:html40frag $$i $$o" ""
+'''])
 
     path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond'])
     if (lilypond != ''):
diff --git a/lib/external_templates b/lib/external_templates
index 1145f3ab0b..409e09a7ed 100644
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -81,6 +81,11 @@ Template GnumericSpreadsheet
 	Format DocBook
 		Product "[Spreadsheet: $$FName]"
 	FormatEnd
+	Format XHTML
+		Product "$$Contents(\"$$AbsPath$$Basename.html\")</p>"
+		UpdateFormat html_table
+		UpdateResult "$$AbsPath$$Basename.html"
+	FormatEnd
 TemplateEnd
 
 Template RasterImage
diff --git a/status.22x b/status.22x
index a4a3072df7..8e4bfa117e 100644
--- a/status.22x
+++ b/status.22x
@@ -83,6 +83,8 @@ What's new
 
 * LYXHTML
 
+- Enable export of external material (bug 8693).
+
 - Fix problem with output of branches (bug 8022).
 
 - Fix output of table borders (bug 10154).
-- 
2.39.5