diff --git a/CMakeLists.txt b/CMakeLists.txt
index d826505717a65b8d2d97623f354954a2fbbd24d0..470a8f56d8590f8c01966f0bd06432ac6efa9434 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,7 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
project(BornAgain)
# --- The version number ---
-set(BornAgain_VERSION_MAJOR 1)
-set(BornAgain_VERSION_MINOR 0)
-set(BornAgain_VERSION_PATCH 0)
+include(VERSION.cmake)
# --- General project settings ---
option(BORNAGAIN_PYTHON "Build with python support" ON)
diff --git a/Doc/UserManual/BornAgainManual.tex b/Doc/UserManual/BornAgainManual.tex
index 0e24e8debfb60f7d6c8c1155828f22770ad6f8f6..d300703f6c0131990da1a0947fb042c95156751d 100755
--- a/Doc/UserManual/BornAgainManual.tex
+++ b/Doc/UserManual/BornAgainManual.tex
@@ -1,11 +1,10 @@
-\documentclass[a4paper,11pt,twoside]{report}
-\usepackage{booktabs}
-\renewcommand{\arraystretch}{1.3}
+\documentclass[a4paper,11pt,twoside,fleqn]{report}
+
%-------------------------------------------------------------------------------
% FONT
%-------------------------------------------------------------------------------
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
+\usepackage{fourier} % must be included before fontspec (upstream bug)
+\usepackage{fontspec}
\usepackage{placeins}
%\usepackage[scaled=0.8]{beramono}
@@ -58,7 +57,6 @@
% OTHER PACKAGES
%-------------------------------------------------------------------------------
\usepackage{graphicx}
-\usepackage{epstopdf}
\usepackage{subfigure}
\usepackage{float}
@@ -68,11 +66,9 @@
\usepackage{amsmath}
\usepackage{pifont}
-\usepackage{fourier}
\usepackage{dingbat}
\usepackage{hyperref}
-\usepackage{breakurl}
\usepackage{verbatim}
@@ -81,6 +77,8 @@
\usepackage{multirow}
+\usepackage{booktabs}
+\renewcommand{\arraystretch}{1.3}
\usetikzlibrary{matrix,positioning,decorations.pathreplacing,calc}
diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index 4ced2928a4b6353d3decdccbf02978425d661642..2cd25e84c1ed98ebabb92b920fbba1fc7202bae7 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -2,10 +2,9 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
project(BornAgainManual NONE)
-# user manual version number will be automatically propagated into tes
-set(UM_VERSION_MAJOR 0)
-set(UM_VERSION_MINOR 3)
-set(UM_VERSION_PATCH 1)
+# version is read from main directory,
+# and written to cmake/scripts/UserManualVersion.tex.in
+include( ../../VERSION.cmake )
if(POLICY CMP0046)
cmake_policy(SET CMP0046 NEW)
@@ -13,10 +12,7 @@ endif()
set(PDFLATEX_COMPILER xelatex)
-set(LATEX_COMPILER_FLAGS
-"-interaction=nonstopmode --enable-write18"
-CACHE STRING "Flags passed to latex."
-)
+set(LATEX_COMPILER_FLAGS "-interaction=errorstopmode" CACHE STRING "Flags passed to latex." )
if(BORNAGAIN_MAN)
# --- configure a header file to pass CMake settings to the source code
@@ -36,165 +32,12 @@ else()
endif()
-
-set(UM_IMAGES
- Figures/website.png
- Figures/toyfit_expdata.eps
- Figures/toyfit_simdata.eps
- Figures/toyfit_chi2_p12.eps
- Figures/toyfit_chi2_p23.eps
- Figures/minimization_workflow.eps
- Figures/Manual_ex1.eps
- #Figures/multilayer3d3.eps
- Figures/setup_multilayer.jpg
- Figures/basic_architecture.eps
- Figures/AnisoPyramid2dxy.eps
- Figures/AnisoPyramid2dxz.eps
- Figures/AnistropicPyramid3d.png
- Figures/Box2dxy.eps
- Figures/Box2dxz.eps
- Figures/Box3d.png
- Figures/Cone2dxy.eps
- Figures/Cone2dxz.eps
- Figures/Cone3d.png
- Figures/Sphere2dxy.eps
- Figures/Sphere2dxz.eps
- Figures/Sphere3d.png
- Figures/Spheroid2dxy.eps
- Figures/Spheroid2dxz.eps
- Figures/Spheroid3d.png
- Figures/Cone62dxy.eps
- Figures/Cone62dxz.eps
- Figures/Cone63d.png
- Figures/Cuboctahedron2dxy.eps
- Figures/Cuboctahedron2dxz.eps
- Figures/Cuboctahedron3d.png
- Figures/Cylinder2dxy.eps
- Figures/Cylinder2dxz.eps
- Figures/Cylinder3d.png
- Figures/EllipsoidalCylinder2dxy.eps
- Figures/EllipsoidalCylinder2dxz.eps
- Figures/EllipsoidalCylinder3d.png
- Figures/FullSphere2dxy.eps
- Figures/FullSphere2dxz.eps
- Figures/FullSphere3d.png
- Figures/FullSpheroid2dxy.eps
- Figures/FullSpheroid2dxz.eps
- Figures/FullSpheroid3d.png
- Figures/HemiEllipsoid2dxy.eps
- Figures/HemiEllipsoid2dxz.eps
- Figures/HemiEllipsoid3d.png
- Figures/Prism32dxy.eps
- Figures/Prism32dxz.eps
- Figures/Prism33d.png
- Figures/Prism62dxy.eps
- Figures/Prism62dxz.eps
- Figures/Prism63d.png
- Figures/Pyramid2dxy.eps
- Figures/Pyramid2dxz.eps
- Figures/Pyramid3d.png
- Figures/Ripple12dxy.eps
- Figures/Ripple12dyz.eps
- Figures/Ripple13d.png
- Figures/Ripple22dxy.eps
- Figures/Ripple22dyz.eps
- Figures/Ripple23d.png
- Figures/Tetrahedron2dxz.eps
- Figures/Tetrahedron2dxy.eps
- Figures/Tetrahedron3d.png
- Figures/figffanisopyramid.pdf
- Figures/figffbox.pdf
- Figures/figffcone.pdf
- Figures/figffcone6.pdf
- Figures/figffcylinder.pdf
- Figures/figffcuboctah.pdf
- Figures/figffellipscylinder.pdf
- Figures/figffhemiellips.pdf
- Figures/figfffsphere.pdf
- Figures/figfffspheroid.pdf
- Figures/figffpyramid.pdf
- Figures/figffprism3.pdf
- Figures/figffprism6.pdf
- Figures/figffripple1.pdf
- Figures/figffripple2.pdf
- Figures/figffsphere.pdf
- Figures/figffspheroid.pdf
- Figures/figfftetrahedron.pdf
- Figures/drawingDWBA.eps
- Figures/drawingDWBAburied.eps
- Figures/ffspheroidBA.pdf
- Figures/ffspheroidDWBA.pdf
- Figures/drawingDepthParticle.eps
- Figures/figIntBuriedPart.eps
- Figures/CoreShellParallPyr.pdf
- Figures/CoreShellParallPyrxy.eps
- Figures/CoreShellParallPyrxz.eps
- Figures/HSphere_NoInterf.pdf
- Figures/HSphere_1DDL.pdf
- Figures/1DGrating.eps
- Figures/2Dlattice.eps
- #Figures/1Dparacrystal.eps
- Figures/HSphere_2Dlattice.pdf
- Figures/HSphere_2DDL.pdf
- Figures/drawingSSCA.eps
- Figures/drawingLMA.eps
- Figures/drawingDA.eps
- Figures/drawing2Dparacrystal.eps
- Figures/S_q_1Dparacrystal.eps
- Figures/figure_ex001.eps
- Figures/figure_ex002.eps
- Figures/figure_ex003BA.eps
- Figures/figure_ex003BASize.eps
- Figures/figure_ex003DWBA.eps
- Figures/figure_ex0041DDL.eps
- Figures/figure_ex0042DDLsq.eps
- Figures/figure_ex005Disorder1.eps
- Figures/figure_ex005Disorder2.eps
- Figures/figure_ex005Disorder3.eps
- Figures/figure_ex005Disorder4.eps
- Figures/figure_ex006Pyramids.eps
- Figures/figure_ex006RotatedPyramids.eps
- Figures/figure_ex007CoreShell.eps
- Figures/figure_ex008CorrelatedRough.eps
- Figures/figure_ex009CosRipple2DLat.eps
- Figures/figure_ex009CosRippleNoInterf.eps
- Figures/figure_ex009TriRipple2DLat.eps
- Figures/figure_ex009TriRippleNoInterf.eps
- Figures/figure_ex010BeamDiv.eps
- Figures/BAgeometry_wide.jpg
- Figures/fig_ex001.jpg
- Figures/fig_ex002.jpg
- Figures/fig_ex003BA.jpg
- Figures/fig_ex003BASize.jpg
- Figures/fig_ex003DWBA.jpg
- Figures/fig_ex005Dis1.jpg
- Figures/fig_ex005Dis2.jpg
- Figures/fig_ex005Dis3.jpg
- Figures/fig_ex005Dis4rand.jpg
- Figures/fig_ex006Pyramids.jpg
- Figures/fig_ex006RotatedPyramids.jpg
- Figures/fig_ex007Core.jpg
- Figures/fig_ex008Rough.jpg
- Figures/fig_ex009Cos.jpg
- Figures/fig_ex009Tri.jpg
- Figures/fig_ex010BeamDiv.jpg
- #Figures/g_r_1dpara.eps
- #Figures/g_r_2dpara.jpg
- Figures/g_r_2dparasq.jpg
- Figures/UserAPI_IntensityDataLayout.eps
-
-)
-
-
file(GLOB tex_inputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.tex)
-#file(GLOB tex_inputs "*.tex")
-message("XXX ${tex_inputs}")
+file(GLOB fig_inputs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Figures/*)
ADD_LATEX_DOCUMENT(BornAgainManual.tex
- INPUTS ${tex_inputs}
+ INPUTS ${tex_inputs} ${fig_inputs}
BIBFILES jw7.bib
- IMAGES ${UM_IMAGES}
- DEFAULT_SAFEPDF
-)
-
-
+# IMAGES ${UM_IMAGES}
+ DEFAULT_PDF
+)
\ No newline at end of file
diff --git a/Doc/UserManual/UserManualVersion.tex b/Doc/UserManual/UserManualVersion.tex
index 7b9c8e3889f4ec111c3e64ee80d26093cf602fa6..699e6e1c9e95740e1548bad6d5fbfbf6cc5c5d76 100644
--- a/Doc/UserManual/UserManualVersion.tex
+++ b/Doc/UserManual/UserManualVersion.tex
@@ -1,5 +1,4 @@
% User Manual version number
-% this file is automatically generated by CMakeLists.txt using cmake/modules/UserManualVersion.tex.in
-
-\newcommand{\UserManualVersionNumber}{0.3.1}
+% this file is automatically generated by CMakeLists.txt using cmake/scripts/UserManualVersion.tex.in
+\newcommand{\UserManualVersionNumber}{1.0.0}
diff --git a/VERSION.cmake b/VERSION.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..41b8a3a5eece02adcd40236a358a22af0968c636
--- /dev/null
+++ b/VERSION.cmake
@@ -0,0 +1,3 @@
+set(BornAgain_VERSION_MAJOR 1)
+set(BornAgain_VERSION_MINOR 0)
+set(BornAgain_VERSION_PATCH 0)
diff --git a/cmake/scripts/UserManualVersion.tex.in b/cmake/scripts/UserManualVersion.tex.in
index 793c314b5ac831f0a0193ff3a94320871c26f52e..17ea28579cc734d06af77ef1e7bed14380d04d23 100644
--- a/cmake/scripts/UserManualVersion.tex.in
+++ b/cmake/scripts/UserManualVersion.tex.in
@@ -1,5 +1,4 @@
% User Manual version number
-% this file is automatically generated by CMakeLists.txt using cmake/modules/UserManualVersion.tex.in
-
-\newcommand{\UserManualVersionNumber}{@UM_VERSION_MAJOR@.@UM_VERSION_MINOR@.@UM_VERSION_PATCH@}
+% this file is automatically generated by CMakeLists.txt using cmake/scripts/UserManualVersion.tex.in
+\newcommand{\UserManualVersionNumber}{@BornAgain_VERSION_MAJOR@.@BornAgain_VERSION_MINOR@.@BornAgain_VERSION_PATCH@}