From dc9643d7d269a0d9153ee8dc2983009c9c0ddbc8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Sep 2015 23:36:30 +0000 Subject: odsfile (23sep15) git-svn-id: svn://tug.org/texlive/trunk@38449 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf | Bin 251598 -> 253761 bytes Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex | 42 +++++++++++++++++++-- Master/texmf-dist/doc/lualatex/odsfile/pokus.ods | Bin 7533 -> 15481 bytes 3 files changed, 39 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/doc/lualatex') diff --git a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf index b4dafe00be2..3aaee3587b1 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 a3a3c8d486a..cf2d141f6a7 100644 --- a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex +++ b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex @@ -5,7 +5,7 @@ \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-12-11.} +documents\thanks{Version 0.6, last revisited 2015-09-20.} } \usepackage[english]{babel} \lstloadlanguages{[LaTeX]Tex} @@ -63,13 +63,22 @@ Options are: \begin{description} \item[file] Filename of file to be loaded. You should specify this only on first use of \cmd{\includespread}. -\item[sheet] Name of sheet to be loaded. If it's not specified on first use of \cmd{\includespread}, then first sheet from the file is loaded. The sheet remains selected until another use of |sheet|. +\item[sheet] Name of sheet to be loaded. If it's not specified on first use of + \cmd{\includespread}, then first sheet from the file is loaded. The sheet + remains selected until another use of |sheet|. + \begin{LTXexample} \begin{tabular}{l l} \includespread[file=pokus.ods,sheet=List2] \end{tabular} \end{LTXexample} -\item[range] Selects range from table to be inserted. Range is specified in format similar to spreadsheet processors, like |a2:c4|, selecting cells starting at first column, second row and ending and third column, fourth row. + +\item[range] Selects range from table to be inserted. Range is specified in + format similar to spreadsheet processors, like |a2:c4|, selecting cells + starting at first column, second row and ending and third column, fourth row. + Other variant of supported ranges are \textit{named ranges}, which can be + saved in the |ods file|. + \begin{LTXexample} \begin{tabular}{lll} \includespread[sheet=List1,range=a2:c4] @@ -162,8 +171,19 @@ number is the position of the cell from beginning of the selection. \begin{LTXexample} \includespread[range=a2:b,rowseparator={,\ },rowtemplate={\textit{-{1}}:-{2}}] \end{LTXexample} + +\item[multicoltemplate] +supports merged cells. Default template uses left aligned \verb|\multicolumn| +command +\begin{LTXexample} + \begin{tabular}{lll} + \includespread[sheet=Sheet3, multicoltemplate={\multicolumn{-{count}}{r}{-{value}}}] + \end{tabular} +\end{LTXexample} + \end{description} + \section{Templates}\label{sec:tpl} If you don't want to specify tabular environment by hand, you can use simple templating mechanism to insert tabular environment by hand. @@ -339,6 +359,22 @@ CC & 5 & 7 \section{Changes} \begin{description} + +\item[v0.6] + \begin{itemize} + \item Fixed bug in handling of rows with only one cell\footnote{Thanks to Ulrike Fisher} + \item Added support for named ranges + \item Fixed text:s handling. Beware that using multiple formatting styles + in one cell may result in discarding whole cell, or wrong order. This is + caused by underlying LuaXML library and it is likely to remain. +\end{itemize} +\item[v0.5] +\begin{itemize} + \item Fixed bug: cell attributes weren't saved + \item Added support for merged cells + \item Added \texttt{multicoltemplate} option +\end{itemize} + \item[v0.4] \begin{itemize} \item Fixed bugs in loading sheets without ranges diff --git a/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods b/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods index d2c6762ffba..e59b8762151 100644 Binary files a/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods and b/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods differ -- cgit v1.2.3