FIX pdf build, added odt build, docx build of crm_spec

.gitattributes

@@ -64,6 +64,7 @@ crm/methodologist-manual/src/index.md -text
 crm/spec/Makefile -text
 crm/spec/conf/html/settings.xsl -text
 crm/spec/conf/pandoc/book.docbook -text
+crm/spec/conf/pandoc/template.latex -text
 crm/spec/conf/vcs/insert-revision-and-build-date.xsl -text
 crm/spec/resources/img/activity_edit_1.png -text
 crm/spec/resources/img/activity_edit_2.png -text

crm/spec/Makefile

@@ -3,6 +3,19 @@
 SRC=src
 DOCBOOK-XSL = /usr/share/xml/docbook/stylesheet/docbook-xsl
 DOCBOOKOPTS=--template=conf/pandoc/book.docbook --smart -t docbook -V lang=ru
+ODTOPTS=-t odt --standalone
+PANDOC_PDF_OPTIONS=--latex-engine=xelatex \
+					   --template=conf/pandoc/template.latex \
+					   -V lang=$(LANGUAGE) \
+					   -V papersize:"a4paper" \
+					   -V geometry:margin=2cm \
+					   -V mainfont="Liberation Serif" \
+					   -V sansfont="Liberation Sans" \
+					   -V classoption=11pt \
+					   --smart \
+					   --no-tex-ligatures
+#					   --highlight-style=kate \
+#					   -V classoption=12pt \
 
 spec.md: 
 	gpp -H -I$(SRC) $(SRC)/index.md > spec.md
@@ -33,12 +46,24 @@ html: spec.xml
 	cp -a $(DOCBOOK-XSL)/images bin/html/resources/docbook
 	rm -f spec.xml
 
-pdf: spec.xml
+pdf: spec.md
 	@echo Creating pdf document
+	mkdir -p bin/pdf
 #	SP_ENCODING="UTF-8" docbook2pdf -o bin spec.xml
-	dblatex -b xetex -o bin/spec.pdf spec.xml
+	pandoc $(PANDOC_PDF_OPTIONS) -o bin/pdf/spec.pdf spec.md
 	rm -f spec.xml
 
+odt-ru: spec.md
+	[ -d bin/odt ] || mkdir bin/odt
+	pandoc $(ODTOPTS) -o bin/odt/spec.odt spec.md
+
+odt: odt-ru
+	rm -f spec.md
+
+docx: spec.md
+	mkdir -p bin/docx
+	pandoc -s -S -o bin/docx/spec.docx spec.md
+
 clean:
 	@echo Remove all
 	rm -rf *.xml *.md bin/*

crm/spec/conf/pandoc/template.latex

+\documentclass[$if(fontsize)$$fontsize$,$endif$$if(lang)$$lang$,$endif$$if(papersize)$$papersize$,$endif$$for(classoption)$$classoption$$sep$,$endfor$]{$documentclass$}
+% Add possibility to make image on separate landscape page
+\usepackage{pdflscape}
+\usepackage{rotating}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{amssymb,amsmath}
+\usepackage{ifxetex,ifluatex}
+\usepackage{fixltx2e} % provides \textsubscript
+% use upquote if available, for straight quotes in verbatim environments
+\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
+\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex
+  \usepackage[utf8]{inputenc}
+$if(euro)$
+  \usepackage{eurosym}
+$endif$
+\else % if luatex or xelatex
+  \ifxetex
+    \usepackage{mathspec}
+    \usepackage{xltxtra,xunicode}
+% Use fontspec on XeTeX too
+	\usepackage{fontspec}
+% Set default fonts if not submitted
+$if(mainfont)$
+    \setmainfont{$mainfont$}
+$else$
+	\setmainfont{DejaVu Serif}
+$endif$
+$if(sansfont)$
+    \setsansfont{$sansfont$}
+$else$
+	\setsansfont{DejaVu Sans}
+$endif$
+$if(monofont)$
+    \setmonofont[Mapping=tex-ansi]{$monofont$}
+$else$
+	\setmonofont{DejaVu Sans Mono}
+$endif$
+$if(mathfont)$
+    \setmathfont(Digits,Latin,Greek){$mathfont$}
+$endif$
+  \else
+    \usepackage{fontspec}
+  \fi
+  \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
+  \newcommand{\euro}{€}
+\fi
+% use microtype if available
+\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
+$if(geometry)$
+\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry}
+$else$
+\usepackage{geometry}
+$endif$
+$if(natbib)$
+\usepackage{natbib}
+\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
+$endif$
+$if(biblatex)$
+\usepackage{biblatex}
+$if(biblio-files)$
+\bibliography{$biblio-files$}
+$endif$
+$endif$
+$if(listings)$
+\usepackage{listings}
+$endif$
+$if(lhs)$
+\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{}
+$endif$
+$if(highlighting-macros)$
+$highlighting-macros$
+$endif$
+$if(verbatim-in-note)$
+\usepackage{fancyvrb}
+$endif$
+$if(tables)$
+\usepackage{longtable,booktabs}
+$endif$
+$if(graphics)$
+\usepackage{graphicx}
+% Redefine \includegraphics so that, unless explicit options are
+% given, the image width will not exceed the width of the page.
+% Images get their normal width if they fit onto the page, but
+% are scaled down if they would overflow the margins.
+\makeatletter
+\def\ScaleIfNeeded{%
+  \ifdim\Gin@nat@width>\linewidth
+    \linewidth
+  \else
+    \Gin@nat@width
+  \fi
+}
+\makeatother
+\let\Oldincludegraphics\includegraphics
+{%
+ \catcode`\@=11\relax%
+ \gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%
+}%
+$endif$
+\ifxetex
+$if(docbookstyle)$
+\usepackage[hyperlink]{docbook}
+$else$
+  \usepackage[setpagesize=false, % page size defined by xetex
+              unicode=false, % unicode breaks when used with xetex
+              xetex]{hyperref}
+$endif$
+\else
+  \usepackage[unicode=true]{hyperref}
+\fi
+\hypersetup{breaklinks=true,
+            bookmarks=true,
+            pdfauthor={$author-meta$},
+            pdftitle={$title-meta$},
+            colorlinks=true,
+            citecolor=$if(citecolor)$$citecolor$$else$blue$endif$,
+            urlcolor=$if(urlcolor)$$urlcolor$$else$blue$endif$,
+            linkcolor=$if(linkcolor)$$linkcolor$$else$magenta$endif$,
+            pdfborder={0 0 0}}
+\urlstyle{same}  % don't use monospace font for urls
+$if(links-as-notes)$
+% Make links footnotes instead of hotlinks:
+\renewcommand{\href}[2]{#2\footnote{\url{#1}}}
+$endif$
+$if(strikeout)$
+\usepackage[normalem]{ulem}
+% avoid problems with \sout in headers with hyperref:
+\pdfstringdefDisableCommands{\renewcommand{\sout}{}}
+$endif$
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{6pt plus 2pt minus 1pt}
+\setlength{\emergencystretch}{3em}  % prevent overfull lines
+$if(numbersections)$
+\setcounter{secnumdepth}{5}
+$else$
+\setcounter{secnumdepth}{0}
+$endif$
+$if(verbatim-in-note)$
+\VerbatimFootnotes % allows verbatim text in footnotes
+$endif$
+% Our special commands
+\newcommand{\lscapefigure}{\newgeometry{margin=1cm}\begin{landscape}\thispagestyle{empty}}
+\newcommand{\nolscapefigure}{\end{landscape}\restoregeometry}
+$if(lang)$
+\ifxetex
+  \usepackage{polyglossia}
+  \setmainlanguage{$mainlang$}
+\else
+  \usepackage[$lang$]{babel}
+\fi
+$endif$
+% Fix \tightlist (https://github.com/jgm/pandoc/pull/1571#issuecomment-106298268)
+\providecommand{\tightlist}{%
+  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
+
+$if(title)$
+\title{$title$}
+$endif$
+$if(subtitle)$
+\subtitle{$subtitle$}
+$endif$
+\author{$for(author)$$author$$sep$ \and $endfor$}
+\date{$date$}
+$for(header-includes)$
+$header-includes$
+$endfor$
+
+\begin{document}
+$if(title)$
+\maketitle
+$endif$
+$if(abstract)$
+\begin{abstract}
+$abstract$
+\end{abstract}
+$endif$
+
+$for(include-before)$
+$include-before$
+
+$endfor$
+$if(toc)$
+{
+%\hypersetup{linkcolor=black}
+\setcounter{tocdepth}{$toc-depth$}
+\tableofcontents
+}
+$endif$
+$if(listoffigures)$
+\listoffigures
+\clearpage
+$endif$
+
+$body$
+
+$if(natbib)$
+$if(biblio-files)$
+$if(biblio-title)$
+$if(book-class)$
+\renewcommand\bibname{$biblio-title$}
+$else$
+\renewcommand\refname{$biblio-title$}
+$endif$
+$endif$
+\bibliography{$biblio-files$}
+
+$endif$
+$endif$
+$if(biblatex)$
+\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$
+
+$endif$
+$for(include-after)$
+$include-after$
+
+$endfor$
+\end{document}