commit df8e0ed9e0c37ab75b6979237ea0a7c7b60a17a8
Author: Georg Baum <[email protected]>
Date: Mon Sep 5 22:52:38 2016 +0200
Add xlsx format
We do already have docx, but xlsx was missing. This is a separate format
because of the MIME type. nd because some users might need converters which
can only handle one format. Now the spreadsheet template does not hide the
fact anymore that it can deal with xlsx files as well.
---
lib/configure.py | 3 +++
lib/external_templates | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index d3d1c31..3e60d20 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -638,6 +638,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 excel2 xlsx "MS Excel Office Open XML" "" "" "%%" "document"
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
\Format html_table html "HTML Table (for spreadsheets)" "" "" "%%"
"document" "text/html"
\Format oocalc ods "OpenDocument spreadsheet" "" "" "%%" "document"
"application/vnd.oasis.opendocument.spreadsheet"'''])
#
@@ -1021,9 +1022,11 @@ def checkConverterEntries():
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 excel2 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" ""
+\converter excel2 html_table "ssconvert --export-type=Gnumeric_html:html40frag
$$i $$o" ""
'''])
path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter',
['lilypond'])
diff --git a/lib/external_templates b/lib/external_templates
index f54a298..bacaf3e 100644
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -47,7 +47,7 @@ Template GnumericSpreadsheet
both for gnumeric and excel files.
HelpTextEnd
InputFormat "gnumeric"
- FileFilter "*.{gnumeric,ods,xls}"
+ FileFilter "*.{gnumeric,ods,xls,xlsx}"
AutomaticProduction true
Format LaTeX
Product
"\\def\\inputGnumericTable{}\\input{$$AbsOrRelPathMaster$$Basename.tex}"
