From 0b71631e451f8ba8328b83a88d62c9bff5abda99 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 13 Dec 2022 21:09:38 +0000 Subject: odsfile (13dec22) git-svn-id: svn://tug.org/texlive/trunk@65268 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/odsfile/README | 2 +- Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf | Bin 253761 -> 94940 bytes Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex | 42 ++++++++++++++++++--- Master/texmf-dist/doc/lualatex/odsfile/pokus.ods | Bin 15481 -> 11019 bytes 4 files changed, 37 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/lualatex/odsfile/README b/Master/texmf-dist/doc/lualatex/odsfile/README index 50ba5f3333d..981cf49210c 100644 --- a/Master/texmf-dist/doc/lualatex/odsfile/README +++ b/Master/texmf-dist/doc/lualatex/odsfile/README @@ -34,7 +34,7 @@ Basic usage ... -\includespread[\begin{tabular}{l l} +\begin{tabular}{l l} \includespread[file=pokus.ods] \end{tabular} diff --git a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.pdf index 3aaee3587b1..7ea30cb63f9 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 cf2d141f6a7..9aefc2a8909 100644 --- a/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex +++ b/Master/texmf-dist/doc/lualatex/odsfile/odsfile.tex @@ -1,11 +1,14 @@ \documentclass{ltxdoc} -\usepackage[utf8]{luainputenc} -\usepackage[T1]{fontenc} -\usepackage{odsfile,tgschola,metalogo,hyperref,xspace,microtype,showexpl,booktabs,url} +\usepackage{fontspec} +\setmainfont{TeX Gyre Schola} +% \usepackage[utf8]{luainputenc} +% \usepackage[T1]{fontenc} +% \usepackage{odsfile,tgschola,metalogo,hyperref,xspace,showexpl,booktabs,url} +\usepackage{odsfile,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.6, last revisited 2015-09-20.} +documents\thanks{Version 0.7, last revisited 2022-12-13.} } \usepackage[english]{babel} \lstloadlanguages{[LaTeX]Tex} @@ -50,13 +53,17 @@ You can load |odsfile| classically with There are macros: \begin{itemize} \item \cmd{\includespread} +\item \cmd{\includespread*} +\item \cmd{\OdsNl} +\item \cmd{\OdsLastNl} \item \cmd{\tabletemplate} \item \cmd{\loadodsfile} \item \cmd{\savespreadsheet} \item |AddRow| environment \end{itemize} -\noindent Main command is\marginpar{\cmd{\includespread}} \cmd{\includespread}. It's syntax is:\\ +\noindent Main command is\marginpar{\cmd{\includespread}} \cmd{\includespread} +and it's starred variant \cmd{\includespread*}. It's syntax is:\\ \cmd{\includespread}\oarg{key-value list} Options are: @@ -102,6 +109,13 @@ You can omit some or both of the numbers: \includespread[range=b2:c] \end{tabular} \end{LTXexample} + +\begin{LTXexample} +\begin{tabular}{lll} +\includespread[range=newrangetest] +\end{tabular} +\end{LTXexample} + \item[columns] Column heading specification. It can be either |head|, |top|, or comma separated list of values. \begin{description} \item[top] Use as headers first line from the table. @@ -172,6 +186,14 @@ number is the position of the cell from beginning of the selection. \includespread[range=a2:b,rowseparator={,\ },rowtemplate={\textit{-{1}}:-{2}}] \end{LTXexample} +\item[celltemplate] This template is applied to every cell in the included table. + \begin{LTXexample} + \begin{tabular}{lll} + \includespread[range=a1:c1,celltemplate={\textit{-{value}}}] + \includespread[range=a2:c] + \end{tabular} + \end{LTXexample} + \item[multicoltemplate] supports merged cells. Default template uses left aligned \verb|\multicolumn| command @@ -216,7 +238,7 @@ The |p| column specifier is used for each column, where cell with manual line br -{colheading} \midrule -{content} -\\ \bottomrule +\bottomrule \end{tabular} } \end{verbatim} @@ -359,6 +381,14 @@ CC & 5 & 7 \section{Changes} \begin{description} + \item[v0.7] + \begin{itemize} + \item Fixed character escaping. Unescaped ``\%,\#,\$, \_ and \&'' characters will be escaped to prevent compilation errors. + Characters that are already escaped in the ODS file will be left untouched.\footnote{Thanks to Wybo Dekker} + \item Added support for LuaTeX -recorder command line option + \item Added \texttt{celltemplate} option + \item Fixed named range handling\footnote{Thanks to Angelforest} + \end{itemize} \item[v0.6] \begin{itemize} diff --git a/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods b/Master/texmf-dist/doc/lualatex/odsfile/pokus.ods index e59b8762151..52bdbf4cc30 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