summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/lualatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-12 23:11:23 +0000
committerKarl Berry <karl@freefriends.org>2014-12-12 23:11:23 +0000
commit669b58d5a4c33308d1aa8e0a00b3290f6942ceea (patch)
tree489ff99314f20133a8155117b27e081e614fca31 /Master/texmf-dist/tex/lualatex
parent35e43230f4164d6cd6df0258ea993101bcb6b5ef (diff)
odsfile (12dec14)
git-svn-id: svn://tug.org/texlive/trunk@35808 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
-rw-r--r--Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua3
-rw-r--r--Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty5
2 files changed, 5 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua b/Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua
index 406700b9b3a..ffd47229aca 100644
--- a/Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua
+++ b/Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua
@@ -87,8 +87,7 @@ function getColumnCount(tbl)
local columns = tbl["table:table-column"] or {}
local x = 0
for _, c in pairs(columns) do
- local attr = c["_attr"] or {}
- local rep = attr["table:number-columns-repeated"] or 1
+ local rep = c["table:number-columns-repeated"] or 1
x = x + rep
end
return x
diff --git a/Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty b/Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty
index 1d7609b981c..57a2be71952 100644
--- a/Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty
+++ b/Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty
@@ -166,7 +166,10 @@ rowtemplate=nil
coltypes = makeColtypes(headings)
end
end
- tex.print(odsreader.interp(templates[currenttemplate],{content=table.concat(content, "\\\\ "..rowseparator),coltypes=coltypes,colheading=colheading,rowsep=rowseparator}))
+ content = table.concat(content, "\\\\ "..rowseparator) .. "\\\\"
+ local result = odsreader.interp(templates[currenttemplate],{content=content,coltypes=coltypes,colheading=colheading,rowsep=rowseparator})
+ print(result)
+ tex.print(result)
else
local content = {}
currenttemplate = currenttemplate or "empty"