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.

diff --git a/lib/configure.py b/lib/configure.py
index d3d1c31bfe284245a31a6aefd7864e75ddd2d83b..3e60d2041819a5d8e9016bd7602e4c19ff9225a4 100644 (file)
--- 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 f54a298078eae7a8cca67b59995a22607aabee95..bacaf3e969e0b7e2bec192a000aa14c1f7da4939 100644 (file)
--- 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}"