From 7e37dc20ebc6cd16321aaa9a3ccd4aeb5d6b4d1b Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 8 Sep 2016 20:53:37 +0200 Subject: [PATCH] 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 +- status.22x | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/configure.py b/lib/configure.py index d604fad4a0..c478616607 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 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"''']) # @@ -1012,9 +1013,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 409e09a7ed..015e758416 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}" diff --git a/status.22x b/status.22x index 76c28e7bc9..340635fb63 100644 --- a/status.22x +++ b/status.22x @@ -15,6 +15,8 @@ What's new * DOCUMENT INPUT/OUTPUT +- .xlsx is now a suggested extension in the spreadsheet external template + * TEX2LYX IMPROVEMENTS -- 2.39.5