summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
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
parent35e43230f4164d6cd6df0258ea993101bcb6b5ef (diff)
odsfile (12dec14)
git-svn-id: svn://tug.org/texlive/trunk@35808 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdfbin186675 -> 251598 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex5
-rw-r--r--Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua3
-rw-r--r--Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty5
4 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf
index 88de7f2d97d..b4dafe00be2 100644
--- a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf
+++ b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex
index dff02bf44c4..a3a3c8d486a 100644
--- a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex
+++ b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex
@@ -1,9 +1,11 @@
\documentclass{ltxdoc}
+\usepackage[utf8]{luainputenc}
+\usepackage[T1]{fontenc}
\usepackage{odsfile,tgschola,metalogo,hyperref,xspace,microtype,showexpl,booktabs,url}
\author{Michal Hoftich (\url{michal.h21@gmail.com})}
\title{The \textsf{odsfile} package:\\
accessing of the \textsf{opendocument spreadsheet} from \LaTeX{}
-documents\thanks{Version 0.4, last revisited 2014-06-10.}
+documents\thanks{Version 0.4, last revisited 2014-12-11.}
}
\usepackage[english]{babel}
\lstloadlanguages{[LaTeX]Tex}
@@ -341,6 +343,7 @@ CC & 5 & 7
\begin{itemize}
\item Fixed bugs in loading sheets without ranges
\item Fixed bugs in behaviour of empty cells\footnote{Thanks to \href{https://github.com/TripleWhy}{TrippleWhy}}
+ \item Fixed bug in row counting\footnote{Thanks to \href{https://github.com/yamsu}{yamsu}}
\item Added support for children element in column paragraphs
\item Added cell value escaping
\end{itemize}
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"