[LyX/master] Remove enumitem example file from attic.

2016-01-22 Thread Günter Milde 
commit ffb24b53f91437fea15e6759ac9a798dc42b03b5
Author: Günter Milde 
Date:   Fri Jan 22 16:16:55 2016 +0100

Remove enumitem example file from attic.

The content of this file is (in updated form) part of the UserGuide, so 
there is
no need for a separate example.

diff --git a/lib/doc/attic/enumitem.lyx b/lib/doc/attic/enumitem.lyx
deleted file mode 100644
index e5f9966..000
--- a/lib/doc/attic/enumitem.lyx
+++ /dev/null
@@ -1,575 +0,0 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 503
-\begin_document
-\begin_header
-\origin /systemlyxdir/examples/
-\textclass article
-\use_default_options false
-\begin_modules
-enumitem
-\end_modules
-\maintain_unincluded_children false
-\language british
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "lmss" "default"
-\font_typewriter "lmtt" "default"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize default
-\spacing single
-\use_hyperref false
-\pdf_bookmarks true
-\pdf_bookmarksnumbered false
-\pdf_bookmarksopen false
-\pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
-\pdf_pdfborder true
-\pdf_colorlinks true
-\pdf_backref section
-\pdf_pdfusetitle true
-\papersize a4paper
-\use_geometry false
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 1
-\use_package esint 1
-\use_package mathdots 0
-\use_package mathtools 1
-\use_package mhchem 1
-\use_package stackrel 1
-\use_package stmaryrd 1
-\use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\html_math_output 0
-\html_css_as_file 0
-\output_changes false
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Section*
-The enumitem Module
-\end_layout
-
-\begin_layout Standard
-The enumitem Module provides customisable list Styles using the 
-\begin_inset CommandInset href
-LatexCommand href
-name "enumitem LaTeX package"
-target "http://dante.ctan.org/CTAN/help/Catalogue/entries/enumitem.html;
-
-\end_inset
-
-.
-\end_layout
-
-\begin_layout Subsection*
-Lists with optional arguments
-\end_layout
-
-\begin_layout Standard
-Itemize, Enumeration, and Description lists may have an optional argument.
- If the optional argument contains special characters (e.g.
- the backslash), put it in an 
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-ERT box
-\end_layout
-
-\end_inset
-
-.
-\end_layout
-
-\begin_layout Enumerate
-\begin_inset Argument 1
-status open
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-labelindent=
-\backslash
-parindent,leftmargin=*,label=
-\backslash
-Roman*.,widest=IV,align=left 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
- An enumeration
-\end_layout
-
-\begin_layout Enumerate
-with left-aligned roman
-\end_layout
-
-\begin_layout Enumerate
-numbering
-\end_layout
-
-\begin_layout Enumerate
-of items.
-\end_layout
-
-\begin_layout Standard
-Enumerating with 
-\begin_inset Quotes eld
-\end_inset
-
-Spanish layout
-\begin_inset Quotes erd
-\end_inset
-
-: italic letters followed by )
-\end_layout
-
-\begin_layout Enumerate
-\begin_inset Argument 1
-status open
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-label=
-\backslash
-emph{
-\backslash
-alph*})
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
- first item
-\end_layout
-
-\begin_layout Enumerate
-second item
-\end_layout
-
-\begin_layout Standard
-Enumeration starting at a given value:
-\end_layout
-
-\begin_layout Enumerate
-\begin_inset Argument 1
-status open
-
-\begin_layout Plain Layout
-start=4
-\end_layout
-
-\end_inset
-
- This enumeration
-\end_layout
-
-\begin_layout Enumerate
-starts at 4.
-\end_layout
-
-\begin_layout Standard
-Description with emphasized (instead of bold) label and  left margin 1.5
- em:
-\end_layout
-
-\begin_layout Description
-
-\lang ngerman
-Strahlungsmodulation:
-\begin_inset Argument 1
-status open
-
-\begin_layout Plain Layout
-
-\lang ngerman
-leftmargin=1.5em,
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-font=
-\backslash
-itshape
-\backslash
-mdseries
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
- Durch die zeitliche Modulation der auf den Detektor treffenden Strahlung
- wird trotz fehlender

[LyX/master] Update/enhance/edit autotest documentation.

2016-01-22 Thread Günter Milde 
commit 7ecdcef2360b768206ee6df0bc808a2bd57b08f2
Author: Günter Milde 
Date:   Fri Jan 22 22:42:14 2016 +0100

Update/enhance/edit autotest documentation.

diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx
index e0a03df..7578270 100644
--- a/lib/doc/Development.lyx
+++ b/lib/doc/Development.lyx
@@ -1238,7 +1238,7 @@ Commit the changes to the repository, or send a patch to 
the development
 \end_layout
 
 \begin_layout Subsection
-ctest automatic tests (cmake only)
+ctest automatic tests
 \end_layout
 
 \begin_layout Standard
@@ -1247,7 +1247,7 @@ Some tests are located in the
 status collapsed
 
 \begin_layout Plain Layout
-development/autotests
+development/autotests/
 \end_layout
 
 \end_inset
@@ -1255,24 +1255,28 @@ development/autotests
  subfolder of the \SpecialChar LyX
  source code distribution.
  
-\begin_inset Flex Code
-status collapsed
+\begin_inset Foot
+status open
 
 \begin_layout Plain Layout
-cmake
+The README document in this folder only describes the 
+\begin_inset Quotes eld
+\end_inset
+
+keytests
+\begin_inset Quotes erd
+\end_inset
+
+ subset of autotests!
 \end_layout
 
 \end_inset
 
- is required to run the automatic \SpecialChar LyX
- tests, running them is not implemented
- for autotools.
  
 \end_layout
 
 \begin_layout Standard
-The \SpecialChar LyX
- tests can be run by the commands 
+These tests can be run by the commands 
 \begin_inset Flex Code
 status collapsed
 
@@ -1282,7 +1286,12 @@ ctest
 
 \end_inset
 
- (all platforms) or 
+ in the
+\emph on
+ build directory
+\emph default
+ (all platforms) or (when using a make based build system and not MSVC)
+ 
 \begin_inset Flex Code
 status collapsed
 
@@ -1292,17 +1301,37 @@ make test
 
 \end_inset
 
- (when using a make based build system and not MSVC) in the 
+ in the 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
-autotests
+autotests/
 \end_layout
 
 \end_inset
 
- subfolder of the build directory.
+ subfolder of the
+\emph on
+ build directory
+\emph default
+.
+ The test logs are written to the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+Testing/Temporary/
+\end_layout
+
+\end_inset
+
+ subfolder of the
+\emph on
+ 
+\emph default
+build directory.
+ 
 \end_layout
 
 \begin_layout Subsubsection
@@ -1325,9 +1354,8 @@ reuse
 \begin_inset Quotes erd
 \end_inset
 
- documentation, template, and example files trying to export them to all
- supported output formats.
- In addition, there are a number of dedicated sample documents under 
+ documentation, template, and example documents.
+ In addition, there are a number of dedicated sample documents in the 
 \begin_inset Flex Code
 status collapsed
 
@@ -1337,7 +1365,22 @@ autotests/export/
 
 \end_inset
 
-.
+ subfolder of the \SpecialChar LyX
+ source code distribution.
+ All samples are (after copying and eventual processing by scripts) exported
+ to various output formats via the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+—export-to
+\end_layout
+
+\end_inset
+
+ command line option.
+ The test checks for errors reported by LyX (However, error-free export
+ is no guarantee for an error-free output document.)
 \end_layout
 
 \begin_layout Paragraph
@@ -1413,6 +1456,219 @@ reference "subsec:Interpreting-export-tests"
 \begin_layout Paragraph
 \begin_inset CommandInset label
 LatexCommand label
+name "par:export-test-output-formats"
+
+\end_inset
+
+Output formats
+\end_layout
+
+\begin_layout Standard
+The following output formats are currently tested for each sample document
+ (see 
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "par:Export-test-filtering"
+
+\end_inset
+
+ for exceptions):
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.
+LyX:
+\end_layout
+
+\begin_deeper
+\begin_layout Labeling
+\labelwidthstring 00.00.
+lyx16 LyX 1.6 file format (lyx2lyx)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.
+lyx21 LyX 2.1 file format (lyx2lyx)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.
+xhtml LyXHTML (native LyX HTML export)
+\end_layout
+
+\end_deeper
+\begin_layout Labeling
+\labelwidthstring 00.00.
+LyX
+\begin_inset space ~
+\end_inset
+
++
+\begin_inset space ~
+\end_inset
+
+LaTeX:
+\end_layout
+
+\begin_deeper
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+dvi DVI (8-bit latex)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+dvi3_texF DVI (LuaTeX with 8-bit TeX fonts)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+dvi3_systemF DVI (LuaTeX with Unicode fonts)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+pdf2 PDF (pdflatex)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+pdf4_texF PDF (XeTeX with 8-bit TeX fonts)
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring pdf5_systemFM
+pdf4_systemF PDF (XeTeX with Unicode fonts)
+\end_layout
+

[LyX/master] python now will be found, rmdir could fail

2016-01-22 Thread Peter Kümmel 
commit 44fd57e4b45873e33b0b151ddafdcdebf1cd23df
Author: Peter Kümmel 
Date:   Fri Jan 22 12:33:16 2016 +0100

python now will be found, rmdir could fail

diff --git a/development/cmake/build5-2010-installer.bat 
b/development/cmake/build5-2010-installer.bat
index c32d97b..ff74e51 100644
--- a/development/cmake/build5-2010-installer.bat
+++ b/development/cmake/build5-2010-installer.bat
@@ -16,9 +16,8 @@ echo LyX build : %LYX_BUILD%
 
 REM first remove an existing compilation to assure a clean version
 mkdir %LYX_BUILD%
-rmdir /s/q %LYX_BUILD%
-mkdir %LYX_BUILD%
-
+del /s/q %LYX_BUILD%\*
+rmdir /s/q %LYX_BUILD%\LYX_INSTALLED
 
 REM Download 
http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip
 REM Extract on the same level as LyX sources
@@ -28,7 +27,7 @@ REM MSVC 2010 tools
 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
 
 cd %LYX_BUILD%
-cmake %LYX_SOURCE% -G"NMake Makefiles" 
-DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 
-DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 
-DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF 
+cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_USE_QT=QT5 -DLYX_MERGE_FILES=1 
-DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF 
 
 nmake doc
 nmake translations

[LyX/master] improve configuration with cmake-gui

2016-01-22 Thread Peter Kümmel 
commit 03e7e5cfb3e78135985a6a8184cf0b2eb257214e
Author: Peter Kümmel 
Date:   Fri Jan 22 12:12:53 2016 +0100

improve configuration with cmake-gui

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a28a190..4a121f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,6 @@ LYX_OPTION(VLD   "Use VLD with MSVC" OFF 
MSVC)
 LYX_OPTION(WALL  "Enable all warnings" OFF MSVC)
 LYX_OPTION(CONFIGURE_CHECKS  "Also run configure checks for MSVC" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
-LYX_OPTION(3RDPARTY_BUILD"Build 3rdparty libraries " OFF MSVC)
 
 # APPLE specific
 LYX_OPTION(DMG   "Build as Mac bundle, needed for .dmg  
(experimental) " OFF MAC)
@@ -289,8 +288,9 @@ include(LyXPaths)
 file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
 
 if(WIN32)
+   set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
if(MSVC)
-   set(LYX_3RDPARTY_BUILD ON)
+   set(LYX_3RDPARTY_BUILD ON CACHE BOOL "Build 3rdparty libraries" 
FORCE)
endif()
set(USE_WINDOWS_PACKAGING ON)
 elseif(APPLE)
@@ -444,9 +444,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" 
CACHE PATH "LyX default install prefix" FORCE)
endif()
endif()
-   if(WIN32)
-   set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default 
install prefix" FORCE)
-   endif()
+endif()
+if(WIN32)
+   set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install 
prefix" FORCE)
 endif()
 if(IS_ABSOLUTE)
set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
@@ -648,25 +648,27 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 endforeach()
 
-if(NOT LYX_PYTHON_EXECUTABLE)
-   find_package(PythonInterp 2.7 QUIET)
-   if(PYTHONINTERP_FOUND)
- if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
-   unset(PYTHONINTERP_FOUND)
- endif()
-   endif()
+if(GNUWIN32_DIR)
+   list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+endif()
 
-   if(NOT PYTHONINTERP_FOUND AND NOT GNUWIN32_DIR)
- unset(PYTHON_EXECUTABLE CACHE)
- unset(PYTHON_VERSION_MAJOR)
- unset(PYTHON_VERSION_MINOR)
- unset(PYTHON_VERSION_STRING)
- find_package(PythonInterp 3.3 REQUIRED)
+find_package(PythonInterp 2.7 QUIET)
+if(PYTHONINTERP_FOUND)
+   if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+   unset(PYTHONINTERP_FOUND)
endif()
+endif()
 
-   set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python 
to be used by LyX")
+if(NOT PYTHONINTERP_FOUND)
+  unset(PYTHON_EXECUTABLE CACHE)
+  unset(PYTHON_VERSION_MAJOR)
+  unset(PYTHON_VERSION_MINOR)
+  unset(PYTHON_VERSION_STRING)
+  find_package(PythonInterp 3.3 REQUIRED)
 endif()
 
+set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be 
used by LyX")
+
 if(LYX_NLS)
find_package(LyXGettext)
if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)

[LyX/master] pass values for @executable_path and @loader_path to instruct the dyld where to find the Qt frameworks

2016-01-22 Thread Stephan Witt 
commit 1440ae2e130113ffda1e1a6374f451bd31d568a8
Author: Stephan Witt 
Date:   Sat Jan 23 07:15:32 2016 +0100

pass values for @executable_path and @loader_path to instruct the dyld 
where to find the Qt frameworks

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index d5ce4cb..f033482 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -128,7 +128,9 @@ tex2lyx_LDADD = \
@LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
-tex2lyx_LDFLAGS = -framework AppKit
+tex2lyx_LDFLAGS = -framework AppKit \
+   -Wl,-rpath,@loader_path/../Frameworks \
+   -Wl,-rpath,@executable_path/../Frameworks
 endif
 
 .PHONY: alltests alltests-recursive updatetests