From 669b58d5a4c33308d1aa8e0a00b3290f6942ceea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Dec 2014 23:11:23 +0000 Subject: odsfile (12dec14) git-svn-id: svn://tug.org/texlive/trunk@35808 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf | Bin 186675 -> 251598 bytes Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex | 5 ++++- Master/texmf-dist/tex/lualatex/odsfile/odsfile.lua | 3 +-- Master/texmf-dist/tex/lualatex/odsfile/odsfile.sty | 5 ++++- 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 Binary files a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf and b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf 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" -- cgit v1.2.3