From: Richard Kimberly Heck Date: Wed, 21 Aug 2024 15:14:41 +0000 (-0400) Subject: Replace lyx2lyx code with native solution X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=db1d2c7769478bc4080e05d4cf4249f7e1846138;p=lyx.git Replace lyx2lyx code with native solution (cherry picked from commit 46f2fd1a7457ae92b9382d23d15579c68761a997) --- diff --git a/lib/templates/Letters/DIN-Brief.lyx b/lib/templates/Letters/DIN-Brief.lyx index 5fe28997d0..ef9f511990 100644 --- a/lib/templates/Letters/DIN-Brief.lyx +++ b/lib/templates/Letters/DIN-Brief.lyx @@ -20,9 +20,6 @@ % Hochgestellte vs. Standardanschrift % \addresshigh % \addressstd (default) -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \use_default_options false \maintain_unincluded_children no @@ -49,6 +46,8 @@ \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref false @@ -73,6 +72,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Stichwortverzeichnis @@ -81,8 +81,8 @@ \end_index \secnumdepth 3 \tocdepth 3 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 0 \math_numbering_side default \quotes_style german diff --git a/lib/templates/Letters/G-Brief_%28V._2%29.lyx b/lib/templates/Letters/G-Brief_%28V._2%29.lyx index eb7ae3dd55..248b25598b 100644 --- a/lib/templates/Letters/G-Brief_%28V._2%29.lyx +++ b/lib/templates/Letters/G-Brief_%28V._2%29.lyx @@ -11,14 +11,11 @@ %\lochermarke % prints puncher marks \trennlinien % prints striplines %\unserzeichen % prints "our ref" instead of "my ref" -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \use_default_options false \maintain_unincluded_children no \language english -\language_package default +\language_package babel \inputencoding utf8 \fontencoding auto \font_roman "palatino" "default" @@ -40,6 +37,8 @@ \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref false @@ -64,6 +63,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -72,8 +72,8 @@ \end_index \secnumdepth 4 \tocdepth 4 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 0 \math_numbering_side default \quotes_style english diff --git a/lib/templates/Posters/A0_Poster/Colored.lyx b/lib/templates/Posters/A0_Poster/Colored.lyx index 85001cd9d9..c1cc1a33be 100644 --- a/lib/templates/Posters/A0_Poster/Colored.lyx +++ b/lib/templates/Posters/A0_Poster/Colored.lyx @@ -15,9 +15,6 @@ % For \arrayrulecolor \usepackage{colortbl} -% Added by lyx2lyx -\setlength{\parskip}{\bigskipamount} -\setlength{\parindent}{0pt} \end_preamble \options a0,portrait \use_default_options false @@ -49,6 +46,8 @@ multicol \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing onehalf \use_hyperref false @@ -73,6 +72,7 @@ multicol \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -85,8 +85,8 @@ multicol \bottommargin 1cm \secnumdepth 0 \tocdepth 0 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 0 \math_numbering_side default \quotes_style english diff --git a/lib/templates/Posters/A0_Poster/Simple.lyx b/lib/templates/Posters/A0_Poster/Simple.lyx index 24f0346efd..6da51d8009 100644 --- a/lib/templates/Posters/A0_Poster/Simple.lyx +++ b/lib/templates/Posters/A0_Poster/Simple.lyx @@ -8,9 +8,6 @@ \begin_preamble % Adjust padding in boxes \setlength\fboxsep{12pt} -% Added by lyx2lyx -\setlength{\parskip}{\bigskipamount} -\setlength{\parindent}{0pt} \end_preamble \options a0,portrait \use_default_options false @@ -38,6 +35,8 @@ \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false @@ -62,6 +61,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -74,8 +74,8 @@ \bottommargin 1cm \secnumdepth 0 \tocdepth 0 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 0 \math_numbering_side default \quotes_style english diff --git a/lib/templates/Posters/Beamerposter.lyx b/lib/templates/Posters/Beamerposter.lyx index bab3588cdd..eb064bf675 100644 --- a/lib/templates/Posters/Beamerposter.lyx +++ b/lib/templates/Posters/Beamerposter.lyx @@ -26,9 +26,6 @@ % This produces a grid which might be useful when positioning things %\beamertemplategridbackground[0.5cm] %\setbeamertemplate{background canvas}[vertical shading][bottom=gray,top=white] -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options final \use_default_options false @@ -59,6 +56,8 @@ multicol \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize default \spacing single \use_hyperref false @@ -83,6 +82,7 @@ multicol \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -91,8 +91,8 @@ multicol \end_index \secnumdepth 3 \tocdepth 3 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 0 \math_numbering_side default \quotes_style english diff --git a/lib/templates/Theses/PhD_Thesis/Acknowledgments.lyx b/lib/templates/Theses/PhD_Thesis/Acknowledgments.lyx index d1d6a482be..cbad60d5f9 100644 --- a/lib/templates/Theses/PhD_Thesis/Acknowledgments.lyx +++ b/lib/templates/Theses/PhD_Thesis/Acknowledgments.lyx @@ -5,12 +5,6 @@ \save_transient_properties true \origin /systemlyxdir/templates/Theses/PhD_Thesis/ \textclass scrbook -\begin_preamble - -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} -\end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true \master Main_File.lyx @@ -39,6 +33,7 @@ \bibtex_command default \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -75,6 +70,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -83,8 +79,8 @@ \end_index \secnumdepth 3 \tocdepth 3 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Appendix.lyx b/lib/templates/Theses/PhD_Thesis/Appendix.lyx index 45954c76e6..4e7e66e107 100644 --- a/lib/templates/Theses/PhD_Thesis/Appendix.lyx +++ b/lib/templates/Theses/PhD_Thesis/Appendix.lyx @@ -59,9 +59,6 @@ % \renewcommand{\tableautorefname}{Tab.\negthinspace} %} %\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true @@ -94,6 +91,7 @@ customHeadersFooters \bibtex_command bibtex \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -130,6 +128,7 @@ customHeadersFooters \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \branch Standalone @@ -143,8 +142,8 @@ customHeadersFooters \end_index \secnumdepth 3 \tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Bibliography.lyx b/lib/templates/Theses/PhD_Thesis/Bibliography.lyx index ec8677346a..5edd802569 100644 --- a/lib/templates/Theses/PhD_Thesis/Bibliography.lyx +++ b/lib/templates/Theses/PhD_Thesis/Bibliography.lyx @@ -5,11 +5,6 @@ \save_transient_properties true \origin /systemlyxdir/templates/Theses/PhD_Thesis/ \textclass scrbook -\begin_preamble -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} -\end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true \begin_modules @@ -40,6 +35,7 @@ customHeadersFooters \bibtex_command bibtex \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -76,6 +72,7 @@ customHeadersFooters \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \branch Standalone @@ -89,8 +86,8 @@ customHeadersFooters \end_index \secnumdepth 3 \tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Chapter_1.lyx b/lib/templates/Theses/PhD_Thesis/Chapter_1.lyx index a259145b9d..752b958a6a 100644 --- a/lib/templates/Theses/PhD_Thesis/Chapter_1.lyx +++ b/lib/templates/Theses/PhD_Thesis/Chapter_1.lyx @@ -59,9 +59,6 @@ % \renewcommand{\tableautorefname}{Tab.\negthinspace} %} %\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true @@ -94,6 +91,7 @@ customHeadersFooters \bibtex_command bibtex \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -130,6 +128,7 @@ customHeadersFooters \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \branch Standalone @@ -143,8 +142,8 @@ customHeadersFooters \end_index \secnumdepth 3 \tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Chapter_2.lyx b/lib/templates/Theses/PhD_Thesis/Chapter_2.lyx index 1f4a7dbd78..0e9c17d218 100644 --- a/lib/templates/Theses/PhD_Thesis/Chapter_2.lyx +++ b/lib/templates/Theses/PhD_Thesis/Chapter_2.lyx @@ -59,9 +59,6 @@ % \renewcommand{\tableautorefname}{Tab.\negthinspace} %} %\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true @@ -94,6 +91,7 @@ customHeadersFooters \bibtex_command bibtex \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -130,6 +128,7 @@ customHeadersFooters \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \branch Standalone @@ -143,8 +142,8 @@ customHeadersFooters \end_index \secnumdepth 3 \tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Main_File.lyx b/lib/templates/Theses/PhD_Thesis/Main_File.lyx index 25f68ea71f..893ebed81a 100644 --- a/lib/templates/Theses/PhD_Thesis/Main_File.lyx +++ b/lib/templates/Theses/PhD_Thesis/Main_File.lyx @@ -59,9 +59,6 @@ % \renewcommand{\tableautorefname}{Tab.\negthinspace} %} %\@ifpackageloaded{babel}{\addto\extrasenglish{\refnamechanges}}{\refnamechanges} -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true @@ -93,6 +90,7 @@ customHeadersFooters \bibtex_command bibtex \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -127,6 +125,7 @@ customHeadersFooters \suppress_date true \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \branch chapter-1 @@ -165,8 +164,8 @@ customHeadersFooters \end_index \secnumdepth 3 \tocdepth 2 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default diff --git a/lib/templates/Theses/PhD_Thesis/Summary.lyx b/lib/templates/Theses/PhD_Thesis/Summary.lyx index f015758a08..237c4d03e7 100644 --- a/lib/templates/Theses/PhD_Thesis/Summary.lyx +++ b/lib/templates/Theses/PhD_Thesis/Summary.lyx @@ -11,9 +11,6 @@ % increases the bottom float placement fraction \renewcommand{\bottomfraction}{0.5} -% Added by lyx2lyx -\setlength{\parskip}{\medskipamount} -\setlength{\parindent}{0pt} \end_preamble \options intoc,bibliography=totoc,index=totoc,BCOR10mm,captions=tableheading,titlepage \use_default_options true @@ -43,6 +40,7 @@ \bibtex_command default \index_command default \float_placement h +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -79,6 +77,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -87,8 +86,8 @@ \end_index \secnumdepth 3 \tocdepth 3 -\paragraph_separation indent -\paragraph_indentation default +\paragraph_separation skip +\defskip medskip \is_math_indent 1 \math_indentation default \math_numbering_side default