From: Arjen Baart Date: Sun, 18 Aug 2019 19:32:39 +0000 (+0200) Subject: Added test for table. X-Git-Url: http://www.andromeda.nl/gitweb/?p=xmldoc.git;a=commitdiff_plain;h=93a06a4dae1056b7e9a32824d34f1ea8df46f7d4 Added test for table. --- diff --git a/ChangeLog b/ChangeLog index 442f046..d2281c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -Version 0.9 - Aug 17, 2019 +Version 0.9 - Aug 18, 2019 =========================================================== o Fixed LaTeX special characters o Added test for lists +o Added test for table Version 0.8 - Jul 26, 2019 =========================================================== diff --git a/doc/Makefile.am b/doc/Makefile.am index fa38dee..a4e8038 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -42,5 +42,5 @@ validate: # xmllint --noout --valid $(XMLS) clean-local: - rm -f guide.xhtml guide.html guide.ps guide.tex guide.dvi guide.log guide,aux guide.toc guide.txt guide.pdf + rm -f guide.xhtml guide.html guide.ps guide.tex guide.dvi guide.log guide.aux guide.toc guide.txt guide.pdf rm -f $(IMAGES) $(PICTURES) diff --git a/doc/Makefile.in b/doc/Makefile.in index 14e30ef..c5d0670 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -432,7 +432,7 @@ validate: # xmllint --noout --valid $(XMLS) clean-local: - rm -f guide.xhtml guide.html guide.ps guide.tex guide.dvi guide.log guide,aux guide.toc guide.txt guide.pdf + rm -f guide.xhtml guide.html guide.ps guide.tex guide.dvi guide.log guide.aux guide.toc guide.txt guide.pdf rm -f $(IMAGES) $(PICTURES) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/test/Makefile.am b/test/Makefile.am index c3de07b..9205b18 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -TESTS = basic title titlepage sections toc paragraph lists specialchars +TESTS = basic title titlepage sections toc paragraph lists table specialchars clean-local: rm -f *.html *.tex *.aux *.dvi *.pdf diff --git a/test/Makefile.in b/test/Makefile.in index 3949a09..6621e31 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -408,7 +408,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS = basic title titlepage sections toc paragraph lists specialchars +TESTS = basic title titlepage sections toc paragraph lists table specialchars all: all-am .SUFFIXES: @@ -639,6 +639,13 @@ lists.log: lists --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +table.log: table + @p='table'; \ + b='table'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) specialchars.log: specialchars @p='specialchars'; \ b='specialchars'; \ diff --git a/test/table b/test/table new file mode 100755 index 0000000..ed00a29 --- /dev/null +++ b/test/table @@ -0,0 +1,5 @@ +#!/bin/bash + +./check table + +exit $? diff --git a/test/table.html.exp b/test/table.html.exp new file mode 100644 index 0000000..fede1f0 --- /dev/null +++ b/test/table.html.exp @@ -0,0 +1,117 @@ + + + + + + + xmldoc table check + + + + +

xmldoc table check

+ +

1 A table example

+ + + + +

Drink	Price
Beer	1.80
Wiskey	3.50
Wine	2.20

+ +

+ diff --git a/test/table.tex.exp b/test/table.tex.exp new file mode 100644 index 0000000..7f8e328 --- /dev/null +++ b/test/table.tex.exp @@ -0,0 +1,50 @@ + +\documentclass[a4paper]{book} +\usepackage{xcolor} +\usepackage{graphics} +\usepackage{latexsym} +\usepackage{marvosym} +\begin{document} + + + + \begin{titlepage} + + + \begin{center} + \sffamily\bfseries\LARGE{xmldoc table check} + \end{center} + + + \end{titlepage} + + + + \chapter{A table example} + +\begin{tabular}{lrc} + + +\begin{bfseries}Drink \end{bfseries}& + +\begin{bfseries}Price\end{bfseries}& +\\ + + Beer & + 1.80& +\\ + + Wiskey & + 3.50& +\\ + + Wine & + 2.20& +\\ + + +\end{tabular} + + + +\end{document} diff --git a/test/table.xml b/test/table.xml new file mode 100644 index 0000000..d35db2e --- /dev/null +++ b/test/table.xml @@ -0,0 +1,23 @@ + + + + + + + + xmldoc table check + + + + A table example + + Drink Price + Beer 1.80 + Wiskey 3.50 + Wine 2.20 +

+ + + + +