Consistent output of breakable/non-breakable dashes on all TeX engines.

[lyx.git] / lib / doc / MergedManuals.lyx

diff --git a/lib/doc/MergedManuals.lyx b/lib/doc/MergedManuals.lyx
index a28aa8af0d7ffe43757c2b3ab77972c25d0d7555..0e576cda46019abbf541b75d6bf154cd9abe0520 100644 (file)
--- a/lib/doc/MergedManuals.lyx
+++ b/lib/doc/MergedManuals.lyx
@@ -1,5 +1,5 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 506
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -31,6 +31,8 @@ initials
 \font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures false
 \graphics default
 \default_output_format xhtml
 \output_sync 0
@@ -43,14 +45,14 @@ initials
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
@@ -60,6 +62,7 @@ initials
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index Index
 \shortcut idx
 \color #008000
@@ -68,7 +71,10 @@ initials
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -233,7 +239,7 @@ filename "../examples/linguistics.lyx"
 \begin_layout Plain Layout
 \begin_inset CommandInset include
 LatexCommand include
-filename "../lib/examples/xypic.lyx"
+filename "../examples/xypic.lyx"
 
 \end_inset