gmane.editors.lyx.cvs

[LyX master] listerrors.lyx: set default output to ps2pdf

Scott Kostyshak — 2013-05-18T00:58:06

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 7aba4d51fab1247328a21f19ac35b3de35a33150
Author: Scott Kostyshak <skostysh< at >lyx.org>
Date:   Fri May 17 20:54:56 2013 -0400

    listerrors.lyx: set default output to ps2pdf
    
    ps2pdf dependency is hardcoded in the preamble, which is why
    pdflatex and luatex are failing.

diff --git a/lib/examples/listerrors.lyx b/lib/examples/listerrors.lyx
index 11e0383..e3628d0 100644
--- a/lib/examples/listerrors.lyx
+++ b/lib/examples/listerrors.lyx
< at >< at > -37,7 +37,7 < at >< at > noweb
 \font_sf_scale 100
 \font_tt_scale 100
 \graphics default
-\default_output_format default
+\default_output_format pdf
 \output_sync 0
 \bibtex_command default
 \index_command default

-----------------------------------------------------------------------

Summary of changes:
 lib/examples/listerrors.lyx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive

[LyX features/kill-gettext] Merge remote-tracking branch 'lyx/master' into features/kill-gettext

Vincent van Ravesteijn — 2013-05-17T18:47:14

The branch, kill-gettext, has been updated.

- Log -----------------------------------------------------------------

commit 2192d300b1816263a117adcc7b8d77bbaaf80188
Merge: c72daa4 43d7102
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 15 16:10:24 2013 +0200

    Merge remote-tracking branch 'lyx/master' into features/kill-gettext
    
    This is needed to resolve a merge conflict with commits 1f41a4fc and
    7a8995f2.

diff --cc src/tests/CMakeLists.txt
index 95e5168,c498b28..30e9697
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
< at >< at >< at > -20,10 -20,12 +20,13 < at >< at >< at > if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
  elseif(MSVC)
    set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
  else()
 -  message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
 -endif()
 +  message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
 +endif()
  
- target_link_libraries(check_layout support ${QT_QTMA

[LyX master] RJournal template now also works with latex

Scott Kostyshak — 2013-05-17T03:07:56

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 43d71022045df5c056fd4eb20ee61d1a80f9cb8d
Author: Scott Kostyshak <skostysh< at >lyx.org>
Date:   Tue May 7 23:14:21 2013 -0400

    RJournal template now also works with latex
    
    Before, only PDFs were being generated so latex did not compile.
    Now, both PDF and EPS files are generated.
    
    This is not efficient but could save the user some pain, which is
    the goal of templates.
    
    An alternative would be to set the default output to use pdflatex.

diff --git a/lib/templates/RJournal.lyx b/lib/templates/RJournal.lyx
index 544c4d8..4c3d7d6 100644
--- a/lib/templates/RJournal.lyx
+++ b/lib/templates/RJournal.lyx
< at >< at > -214,7 +214,7 < at >< at > status open
 \backslash
 
 \backslash
-linewidth', fig.align='center'>>=
+linewidth', fig.align='center', dev=c('pdf','postscript')>>=
 \end_layout
 
 \begin_layout Plain Layout

commit 9e425a0547a2861dc41b130a32b62fc7ff7072c8
Author: Scott Kostysh

[LyX master] New \cite_engine_type default.

Julien Rioux — 2013-05-16T18:50:48

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit cde541d785aaac9d45d636a7f9071353dd932eb6
Author: Julien Rioux <jrioux< at >lyx.org>
Date:   Thu May 16 16:00:54 2013 +0200

    New \cite_engine_type default.
    
    The default citation capability of LaTeX is not a true numerical
    citation engine, rather it uses a mixture of labels/numbers. Thus
    we now distinguish them: "numerical" always increments the bibitem
    counter and uses its value as a numerical citation label, while
    "default" only uses the bibitem counter when no label is provided.
    
    LyX file format incremented to 471.

diff --git a/development/FORMAT b/development/FORMAT
index 82bdc6c..8f5b48c 100644
--- a/development/FORMAT
+++ b/development/FORMAT
< at >< at > -11,6 +11,12 < at >< at > adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2013-05-16 Julien Rioux <jrioux< at >lyx.org>
+* Format incremented to 471
+  New \cite_engine_type default.

[LyX master] Slowly going through the suggestion made by our headers script.

Pavel Sanda — 2013-05-16T05:04:24

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 183b188ebe3489aebb372c00818afaab870cf4b8
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 15 22:02:10 2013 -0700

    Slowly going through the suggestion made by our headers script.
    
    I tried not to kill "redundant" includes which are actually used
    in the header, apology for mistakes.

diff --git a/src/Buffer.h b/src/Buffer.h
index 4e55654..386625e 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
< at >< at > -15,8 +15,6 < at >< at >
 #include "OutputEnums.h"
 #include "OutputParams.h"
 
-#include "insets/InsetCode.h"
-
 #include "support/strfwd.h"
 #include "support/types.h"
 
diff --git a/src/BufferView.h b/src/BufferView.h
index c7fb4c1..a94ddfd 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
< at >< at > -18,7 +18,6 < at >< at >
 #include "DocumentClassPtr.h"
 #include "update_flags.h"
 
-#include "support/shared_ptr.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 
diff --git a/src/Compare.h b/src/C

[LyX master] installer: fix converter for HTML

Uwe Stöhr — 2013-05-15T21:48:26

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 792e216989f9bfe04ef2248e495e97e8a4272036
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Wed May 15 23:48:23 2013 +0200

    installer: fix converter for HTML
    
    - fix bug reported on the lyx-devel list that eLyXer could not be invoked if Python is not installed

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 4e4fb5c..53444ef 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
< at >< at > -1,4 +1,9 < at >< at >
-ï»¿Changelog for LyX-206-1:
+ï»¿Changelog for LyX-206-2:
+- fix bug that View/Export a file as HTML did not work.
+
+
+Changelog for LyX-206-1:
+- installs LyX 2.0.6
 - support for Vietnamese, Thai, Serbian Cyrillic and Mongolian will now
   automatically be installed to MiKTeX
 - language support files for Belarusian and Hungarian are now inc

[LyX master] * header_check.sh: filter headers; we should suspect only .h files.

Pavel Sanda — 2013-05-15T10:47:04

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 8c23318a997c6f080b8815722f9199281a8e6734
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 15 03:46:04 2013 -0700

    * header_check.sh: filter headers; we should suspect only .h files.

diff --git a/development/tools/header_check.sh b/development/tools/header_check.sh
index 5048093..881fe1a 100755
--- a/development/tools/header_check.sh
+++ b/development/tools/header_check.sh
< at >< at > -26,9 +26,9 < at >< at > set -u
 LOG_FILE="$(basename $0).log"
 
 # For only standard headers:
-  PATTERN='^#include <'
+# PATTERN='^#include <'
 # For all headers:
-# PATTERN='^#include'
+  PATTERN='^#include'
 
 # Exclude common headers with regex
 # (e.g. 'debug.h' will exclude 'support/debug.h')
< at >< at > -45,7 +45,7 < at >< at > function BUILD_FN ()
 PREFIX=''
 
 # This is not a clean make.
-make -j${NCORES} 2>&1 > /dev/null
+make -j${NCORES} 2>/dev/null 1>/dev/null
 ERROR_CODE=$?
 
 
< at >< at > -78,7 +78,7 < at >< at > make -j${NCORES} 2>&1 >/dev

[LyX master] * header_check.sh: fix error order

Pavel Sanda — 2013-05-15T10:43:09

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 392124e03efacc77024aa4e019a0ef26e1dbee27
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 15 03:42:13 2013 -0700

    * header_check.sh: fix error order

diff --git a/development/tools/header_check.sh b/development/tools/header_check.sh
index 9b41254..5048093 100755
--- a/development/tools/header_check.sh
+++ b/development/tools/header_check.sh
< at >< at > -36,7 +36,7 < at >< at > LOG_FILE="$(basename $0).log"
 # require headers not needed on win/linux. So check the logs before
 # deleting "redundant" standard libraries, Qt headers or includes around
 # various ifdefs...
-EXCLUDE='\(debug.h\|cstdio\|config\)'
+EXCLUDE='\(debug.h\|cstdio\|config.h\)'
 
 NCORES=$(grep "CPU" /proc/cpuinfo | wc -l)
 
< at >< at > -45,15 +45,18 < at >< at > function BUILD_FN ()
 PREFIX=''
 
 # This is not a clean make.
-IFS='' ERROR_OUTPUT=$(make -j${NCORES} 2>&1)
+make -j${NCORES} 2>&1 > /dev/null
 ERROR_CODE=$?
 
-# Without the grep, ERROR_

[LyX master] cmake: 1.) Do not include layout tests on MAC, since the linker-option which allows multiple definitions is no longer supported. 2.) Indenting made consistent

Kornel Benko — 2013-05-15T09:31:54

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 6e992e3544a3a62cb6f93074708b045b8ba72aa0
Author: Kornel Benko <kornel< at >lyx.org>
Date:   Wed May 15 11:28:04 2013 +0200

    cmake:
    1.) Do not include layout tests on MAC, since the
      linker-option which allows multiple definitions is
      no longer supported.
    2.) Indenting made consistent

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07541ba..a8d10e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
< at >< at > -185,4 +185,9 < at >< at > if(LYX_BUNDLE)
 fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
 endif()
 
-add_subdirectory(tests)
+if(NOT APPLE)
+  # unresoved handling for multiple definitions
+  # APPLE can be enabled, if the hack in src/support/tests/dummy_functions.cp
+  # which requires multiple definitions is resolved. (Georg)
+  add_subdirectory(tests)
+endif()
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d5e5ceb..c498b2

[LyX master] lyx::support::get_document_dir uses QDesktopServices::storageLocation and this is in QT_QTGUI_LIBRARY

Stephan Witt — 2013-05-15T08:24:31

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 1f41a4fcfdbf079cb60d8a597e8aaba0c1447e87
Author: Stephan Witt <switt< at >lyx.org>
Date:   Wed May 15 10:24:22 2013 +0200

    lyx::support::get_document_dir uses QDesktopServices::storageLocation and this is in QT_QTGUI_LIBRARY

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d82c4ff..d5e5ceb 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
< at >< at > -24,7 +24,7 < at >< at > else()
 endif()
 
 target_link_libraries(check_layout support ${intl_link}
-${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY}
+${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
 ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
 add_dependencies(lyx_run_tests check_layout)
 set_target_properties(check_layout PROPERTIES FOLDER "tests/src")

-----------------------------------------------------------------------

Summary of changes:
 src/tests/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(

[LyX master] Add a special regfile for filetools test on windows

Vincent van Ravesteijn — 2013-05-15T07:11:38

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 19418730dd90e33dbb7c5cf7e2e5fa3be227cb7e
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 15 09:11:25 2013 +0200

    Add a special regfile for filetools test on windows

diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index a6d0578..3e6198f 100644
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
< at >< at > -37,6 +37,9 < at >< at > foreach(_src ${check_PROGRAMS})
 sources(${_src} ${_src}.cpp dummy_functions.cpp boost.cpp)
 string(REPLACE "check_" "" _srcx ${_src})
 set(src_data_file "${TOP_SRC_DIR}/src/support/tests/regfiles/${_srcx}")
+if (MSVC AND EXISTS "${src_data_file}.MSVC")
+set(src_data_file "${src_data_file}.MSVC")
+endif()
 set(created_data_file "${CMAKE_CURRENT_BINARY_DIR}/regfiles/${_src}_data")
         add_test(NAME support/${_srcx}
           COMMAND ${CMAKE_COMMAND} -DCommand=$<TARGET_FILE:${_src}>
diff --git a/s

[LyX master] * header_check.sh: forgot on exec flag

Pavel Sanda — 2013-05-15T07:08:02

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit ee0c031d2d309d5dba4d657b0806f5b5ee4f2911
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 15 00:07:40 2013 -0700

    * header_check.sh: forgot on exec flag

diff --git a/development/tools/header_check.sh b/development/tools/header_check.sh
old mode 100644
new mode 100755

-----------------------------------------------------------------------

Summary of changes:
 0 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 development/tools/header_check.sh


hooks/post-receive

[LyX master] * header_check.sh: more tweaks

Pavel Sanda — 2013-05-15T07:03:25

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 5ea35e2d62dc91ec767f13c435ee2172ed3dd6d2
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 15 00:02:16 2013 -0700

    * header_check.sh: more tweaks

diff --git a/development/tools/header_check.sh b/development/tools/header_check.sh
index 4e88f4c..9b41254 100644
--- a/development/tools/header_check.sh
+++ b/development/tools/header_check.sh
< at >< at > -1,5 +1,7 < at >< at >
 #!/usr/bin/env bash
 
+# Typical usage: cd src; ../development/tools/header_check.sh
+
 # file header_check.sh
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
< at >< at > -32,9 +34,9 < at >< at > LOG_FILE="$(basename $0).log"
 # (e.g. 'debug.h' will exclude 'support/debug.h')
 # LyX was compiled on exotic environments and these sometimes
 # require headers not needed on win/linux. So check the logs before
-# deleting "redundant" standard libraries or includes around various
-# ifdefs...
-EXCLUDE='

[LyX master] * header_check.sh: Apply new changes from Scott.

Pavel Sanda — 2013-05-15T07:00:32

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit b1d8bdf6706fabb3e42bd465712c0d3ac08ad953
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Tue May 14 23:59:42 2013 -0700

    * header_check.sh: Apply new changes from Scott.
    
    I see lot of errors like:
    The following string was expected to be '.cpp' or '.h':
     LyX.cpp: In member function 'void lyx::LyX::printError(const lyx::ErrorItem&)':
    Warning: the error was not parsed correctly.
    The following string was expected to be '.cpp' or '.h':
     LyX.cpp: In function 'void lyx::error_handler(int)':

diff --git a/development/tools/header_check.sh b/development/tools/header_check.sh
index ebf0eab..4e88f4c 100644
--- a/development/tools/header_check.sh
+++ b/development/tools/header_check.sh
< at >< at > -36,10 +36,33 < at >< at > LOG_FILE="$(basename $0).log"
 # ifdefs...
 EXCLUDE='\(debug.h\|cstdio\)'
 
+NCORES=$(grep "CPU" /proc/cpuinfo | wc -l)
+
 function BUILD_FN ()
 {
+PREFIX=''
+
 # This is

[LyX master] check_layout: Add more libraries

Vincent van Ravesteijn — 2013-05-15T06:08:41

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 7a8995f2952dfe5618fc226bb560fbd231b1a25c
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 15 08:08:33 2013 +0200

    check_layout: Add more libraries

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index f789137..d82c4ff 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
< at >< at > -20,10 +20,12 < at >< at > if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 elseif(MSVC)
   set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
 else()
-  message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
-endif()
+  message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
+endif()
 
-target_link_libraries(check_layout support ${QT_QTMAIN_LIBRARY} ${intl_link})
+target_link_libraries(check_layout support ${intl_link}
+${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY}
+${ZLIB_LIB

[LyX master] GuiAbout: Add missing include

Vincent van Ravesteijn — 2013-05-15T05:47:05

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 483e0f61e71d0633644f5d00d6176daea819462e
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 15 07:47:02 2013 +0200

    GuiAbout: Add missing include

diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp
index ae9a2a3..09834d4 100644
--- a/src/frontends/qt4/GuiAbout.cpp
+++ b/src/frontends/qt4/GuiAbout.cpp
< at >< at > -23,6 +23,7 < at >< at >
 #include "support/Package.h"
 
 #include <QDate>
+#include <QFile>
 #include <QTextStream>
 
 using namespace lyx::support;

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiAbout.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive

[LyX master] Implement forced local layouts

Georg Baum — 2013-05-15T05:21:48

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 7bdc34a98700f487a923ea2b3546f476b9d5d98c
Author: Georg Baum <baum< at >lyx.org>
Date:   Wed May 15 07:19:49 2013 +0200

    Implement forced local layouts
    
    These should be used if any new style needs to be introduced in the stable
    2.1 series: If the ForceLocal flag of the style is set, it will always be
    written to the document header, so that even older 2.1 versions can read
    and correctly output the document.

diff --git a/development/FORMAT b/development/FORMAT
index a9d62bd..82bdc6c 100644
--- a/development/FORMAT
+++ b/development/FORMAT
< at >< at > -11,6 +11,11 < at >< at > adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2013-05-15 Georg Baum  <Georg.Baum< at >post.rwth-aachen.de>
+* Format incremented to 470
+  forced local layouts for future layout backward compatibility:
+  \begin_forced_local_layout, \end_forced_local_layout
+
 2013-03-23 Georg

[LyX features/kill-gettext] Really update the files that create/install .mo files

Jean-Marc Lasgouttes — 2013-05-14T23:01:35

The branch, kill-gettext, has been updated.

- Log -----------------------------------------------------------------

commit c72daa47d6d8eab9f2fbf082d879220c3436f868
Author: Jean-Marc Lasgouttes <lasgouttes< at >lyx.org>
Date:   Tue May 14 21:59:07 2013 +0200

    Really update the files that create/install .mo files
    
    Update po.m4 and the makefile machinery in po/ to use code from gettext 0.18.2.

diff --git a/README.localization b/README.localization
index 97a40e4..081fff7 100644
--- a/README.localization
+++ b/README.localization
< at >< at > -91,7 +91,7 < at >< at > Run ./pocheck.pl -h to see all possible switches.
 6) HOW CAN I TEST MY TRANSLATION?
 
 In order to test your translation you need to obtain the LyX sources
-(from the SVN repository) and replace the existing .po with yours.
+(from the git repository) and replace the existing .po with yours.
 Afterwards, you should compile and optionally install LyX (check the
 INSTALL file for your OS). Note that, as of LyX 2.1, it is not
 necessary anymore to install anythin

[LyX master] InsetBox.cpp: remove unnecessary non-ASCII char

Uwe Stöhr — 2013-05-14T22:03:47

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit a0030713e972fa81e928992f5cf47818a71c9804
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Wed May 15 00:03:46 2013 +0200

    InsetBox.cpp: remove unnecessary non-ASCII char
    
    - this char made problems when storing the file in Unicode

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index f610263..bb8602c 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
< at >< at > -320,7 +320,7 < at >< at > void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
 if (from_ascii(width_string) != "-9.99\\columnwidth") {
 os << "\\framebox";
 if (!params_.inner_box) {
-// Special widths, see usrguide Â§3.5
+// Special widths, see usrguide sec. 3.5
 // FIXME UNICODE
 if (params_.special != "none") {
 os << "[" << params_.width.value()

-----------------------------------------------------------------------

Summary of changes:
 src/insets/I

[LyX master] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-14T21:57:43

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 76678b66d4b67f56204ced0b7ed9dc978bdb26af
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Tue May 14 23:57:33 2013 +0200

    UserGuide.lyx: next revision step
    
    sec. 6.13 - 6.18

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 7b085a2..27cebac 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -144,7 +144,6 < at >< at > enumitem
 \html_css_as_file 0

 \html_be_strict true

 \author -712698321 "JÃ¼rgen SpitzmÃ¼ller" 

-\author 2090807402 "usti" 

 \end_header

 

 \begin_body

< at >< at > -30430,7 +30429,7 < at >< at > The normal text on the page goes here.
 <cell multicolumn="2" alignment="center" valignment="top" usebox="none">

 \begin_inset Text

 

-\begin_layout 

+\begin_layout Plain Layout

 

 \end_layout

 

< at >< at > -30439,7 +30438,7 < at >< at > The normal text on the page goes here.
 <cell multicolumn="2" alignment="center" valignment="top" rightline="true" usebox="none">

 \begin

[LyX 2.0.x] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-14T21:49:51

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit f1f1f162fac0771bf369261bf8c7f6f0c58190b4
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Tue May 14 23:49:45 2013 +0200

    UserGuide.lyx: next revision step
    
    sec. 6.13 - 6.18

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index bcee3b4..3e0ef08 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -31622,7 +31622,11 < at >< at > Find
  LyX mini-editor a simple word, and search for occurrences of it by clicking

  on the 

 \family sans

-Find Next

+Find

+\begin_inset space ~

+\end_inset

+

+Next

 \family default

  button at the bottom of the dialog (or just press the 

 \begin_inset Info

< at >< at > -31633,13 +31637,13 < at >< at > arg   "break-paragraph"
  key).

  The entered word is found both in text mode and in math mode, and in emphasized

 , bold or normal face, and in both in section titles and in standard text.

- Pressing repeatedly 

+ Pressing 

 \begin_inset Info