autotests/export/latex/CJK/zh_CN-toc.lyx

@@ -1,26 +1,24 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 620
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin unavailable
 \textclass report
 \use_default_options false
-\maintain_unincluded_children no
+\maintain_unincluded_children false
 \language chinese-traditional
 \language_package default
 \inputencoding utf8
 \fontencoding auto
-\font_roman "lmodern" "IPAexMincho"
-\font_sans "default" "IPAexMincho"
-\font_typewriter "default" "Source Han Code JP"
+\font_roman "lmodern" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
-\font_roman_osf false
-\font_sans_osf false
-\font_typewriter_osf false
+\font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \font_cjk bsmi
@@ -45,7 +43,7 @@
 \pdf_colorlinks true
 \pdf_backref false
 \pdf_pdfusetitle true
-\papersize a4
+\papersize a4paper
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
@@ -66,9 +64,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
-\use_formatted_ref 0
 \use_minted 0
-\use_lineno 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -76,7 +72,7 @@
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation skip
-\defskip halfline
+\defskip 2ex
 \is_math_indent 0
 \math_numbering_side default
 \quotes_style english
@@ -87,13 +83,9 @@
 \tablestyle default
 \tracking_changes false
 \output_changes false
-\change_bars false
-\postpone_fragile_content false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict false
-\docbook_table_output 0
-\docbook_mathml_prefix 1
 \end_header
 
 \begin_body
@@ -156,8 +148,7 @@ The prefix
 \emph on
 Chapter
 \emph default
- in the chapter heading is not translated —
- not even with 
+ in the chapter heading is not translated — not even with 
 \begin_inset Quotes eld
 \end_inset
 
@@ -180,16 +171,13 @@ CJK
 \begin_inset Quotes erd
 \end_inset
 
- environment,
- Chinese characters in a section title lead to errors like
+ environment, Chinese characters in a section title lead to errors like
 \end_layout
 
 \begin_deeper
 \begin_layout LyX-Code
 \noindent
-!
- Package inputenc Error:
- Unicode char 中 (U+4E2D) 
+! Package inputenc Error: Unicode char 中 (U+4E2D) 
 \end_layout
 
 \begin_layout LyX-Code
@@ -233,7 +221,6 @@ Section in Chinese 中文名
 \begin_layout Standard
 This section head is in Chinese.
  這節的標題是中文。
-
 \end_layout
 
 \end_body

autotests/export/latex/languages/ja-listings-uncodable-error.lyx

@@ -1,26 +1,27 @@
 #LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 620
+\lyxformat 573
 \begin_document
 \begin_header
 \save_transient_properties false
 \origin unavailable
 \textclass scrbook
 \use_default_options false
-\maintain_unincluded_children no
+\maintain_unincluded_children false
+\begin_local_layout
+
+\end_local_layout
 \language japanese
 \language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "Source Han Code JP"
+\font_typewriter "default" "default"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
-\font_roman_osf false
-\font_sans_osf false
-\font_typewriter_osf false
+\font_osf false
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \use_microtype false
@@ -70,14 +71,12 @@
 \suppress_date false
 \justification false
 \use_refstyle 0
-\use_formatted_ref 0
 \use_minted 0
-\use_lineno 0
 \notefontcolor #0000ff
 \branch OutDated
 \selected 0
 \filename_suffix 0
-\color #f5fae7 #0a0518
+\color #f5fae7
 \end_branch
 \index 索引
 \shortcut idx
@@ -98,13 +97,9 @@
 \tablestyle default
 \tracking_changes false
 \output_changes false
-\change_bars false
-\postpone_fragile_content false
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\docbook_table_output 0
-\docbook_mathml_prefix 1
 \end_header
 
 \begin_body
@@ -114,18 +109,16 @@ False positive error:
 \end_layout
 
 \begin_layout Standard
-A listings inset in a Japanese document (both,
- platex and CJK) resulted in a
+A listings inset in a Japanese document (both, platex and CJK) resulted
+ in a
 \end_layout
 
 \begin_layout LyX-Code
-Encoding.cpp (251):
- Uncodable character in latexString!
+Encoding.cpp (251): Uncodable character in latexString!
 \end_layout
 
 \begin_layout Standard
-error messages in the terminal,
- even if the content is pure ASCII and
+error messages in the terminal, even if the content is pure ASCII and
 \end_layout
 
 \begin_layout Standard
@@ -133,7 +126,8 @@ the output is fine.
 \end_layout
 
 \begin_layout Standard
-This is because it wants to put the translated listingsname into the preamble but does not believe it can be encoded there...
+This is because it wants to put the translated listingsname into the preamble
+ but does not believe it can be encoded there...
 \end_layout
 
 \begin_layout Standard

lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx

@@ -38,7 +38,7 @@ EndPreamble
 End
 \end_local_layout
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -95,7 +95,6 @@ End
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index
@@ -539,6 +538,7 @@ LaTeXプリアンブル
 \end_layout
 
 \begin_layout JLReq Setup
+
 sidenote_type=symbol
 \end_layout
 

lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx

@@ -16,16 +16,14 @@
 % email: lyx-docs@lists.lyx.org
 
 % increase link area for cross-references and autoname them,
-\AtBeginDocument{
- \renewcommand{\ref}[1]{\mbox{\autoref{#1}}}
- \newlength{\abc}
- \settowidth{\abc}{\space}
- \addto\extrasenglish{
+\AtBeginDocument{\renewcommand{\ref}[1]{\mbox{\autoref{#1}}}}
+\newlength{\abc}
+\settowidth{\abc}{\space}
+\addto\extrasenglish{
  \renewcommand{\equationautorefname}{\hspace{-\abc}}
  \renewcommand{\sectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsectionautorefname}{sec.\negthinspace}
  \renewcommand{\subsubsectionautorefname}{sec.\negthinspace}}
-}
 
 % wird benutzt, um Tabellenzellen zu vergrosern
 \@ifundefined{extrarowheight}
@@ -60,8 +58,6 @@
 \output_sync 0
 \bibtex_command default
 \index_command default
-\float_placement class
-\float_alignment class
 \paperfontsize 12
 \spacing single
 \use_hyperref true
@@ -98,7 +94,6 @@
 \suppress_date true
 \justification true
 \use_refstyle 0
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Articles/Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Books/Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Reports/Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx

@@ -8,7 +8,7 @@
 \use_default_options true
 \maintain_unincluded_children no
 \language japanese
-\language_package babel
+\language_package default
 \inputencoding utf8
 \fontencoding auto
 \font_roman "default" "default"
@@ -56,7 +56,6 @@
 \suppress_date false
 \justification true
 \use_refstyle 1
-\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index

src/BufferView.cpp

@@ -1707,7 +1707,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			string label = dit.innerParagraph().getLabelForXRef();
 			if (!label.empty()) {
 				// if the paragraph has a label, we refer to this
-				string const arg = (type.empty()) ? label : label + " " + type;
+				string const arg = (type.empty()) ? std::move(label) : std::move(label) + " " + type;
 				lyx::dispatch(FuncRequest(LFUN_REFERENCE_INSERT, arg));
 				break;
 			} else {

src/Encoding.cpp

@@ -798,7 +798,7 @@ docstring Encodings::convertLaTeXCommands(docstring const & str, bool const lite
 		if (!cnvtd.empty()) {
 			// it did, so we'll take that bit and proceed with what's left
 			ret += cnvtd;
-			val = rem;
+			val = std::move(rem);
 			continue;
 		}
 		// it's a command of some sort

src/insets/InsetNomencl.cpp

@@ -440,7 +440,7 @@ docstring nomenclWidest(Buffer const & buffer)
 				msymb.size();
 			if (wx > w) {
 				w = wx;
-				symb = symbol;
+				symb = std::move(symbol);
 			}
 		}
 	}