From: Juergen Spitzmueller Date: Tue, 26 Mar 2019 12:43:33 +0000 (+0100) Subject: Introducing table templates X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ef55689c5927affb5b49e1407748ccdc64fe96ac;p=features.git Introducing table templates The idea is simple: we insert a pre-formatted table (with a given border style currently, but other attributes are possible as well) via file-insert and scale it then to the requested size. We need three sizes (1x1, 1x2 and 1x3) to generate all sizes properly (due to border specifications). Currently, these styles can only be accessed via lfun tabular-style-insert and the Tabular Create dialog. My plan is to add a buffer param to set a default style (#9901) which then also is respected by the toolbar button and probably a layout tag to let classes specify a default style (#8360). --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 737262a752..31d9ba1b68 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2637,6 +2637,21 @@ dist_ui_DATA = \ ui/stdmenus.inc \ ui/stdtoolbars.inc +tabletemplatesdir = $(pkgdatadir)/tabletemplates +dist_tabletemplates_DATA = \ + tabletemplates/Formal.lyx \ + tabletemplates/Formal_1x1.lyx \ + tabletemplates/Formal_1x2.lyx \ + tabletemplates/Grid_with_Head.lyx \ + tabletemplates/Grid_with_Head_1x1.lyx \ + tabletemplates/Grid_with_Head_1x2.lyx \ + tabletemplates/No_Borders.lyx \ + tabletemplates/No_Borders_1x1.lyx \ + tabletemplates/No_Borders_1x2.lyx \ + tabletemplates/Simple_Grid.lyx \ + tabletemplates/Simple_Grid_1x1.lyx \ + tabletemplates/Simple_Grid_1x2.lyx + xtemplatesdir = $(pkgdatadir)/xtemplates dist_xtemplates_DATA = \ xtemplates/chess.xtemplate \ @@ -2751,6 +2766,7 @@ exampleandtemplate_files = \ $(dist_srexamples_DATA) \ $(dist_srmoduleexamples_DATA) \ $(dist_svexamples_DATA) \ + $(dist_tabletemplates_DATA) \ $(dist_thesistemplates_DATA) \ $(dist_ukexamples_DATA) \ $(dist_examples_DATA) \ diff --git a/lib/tabletemplates/Formal.lyx b/lib/tabletemplates/Formal.lyx new file mode 100644 index 0000000000..44ca1a695f --- /dev/null +++ b/lib/tabletemplates/Formal.lyx @@ -0,0 +1,126 @@ +#LyX 2.3 created this file. For more info see http://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Formal_1x1.lyx b/lib/tabletemplates/Formal_1x1.lyx new file mode 100644 index 0000000000..92b04ae954 --- /dev/null +++ b/lib/tabletemplates/Formal_1x1.lyx @@ -0,0 +1,104 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Formal_1x2.lyx b/lib/tabletemplates/Formal_1x2.lyx new file mode 100644 index 0000000000..ca348b6c61 --- /dev/null +++ b/lib/tabletemplates/Formal_1x2.lyx @@ -0,0 +1,115 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Grid_with_Head.lyx b/lib/tabletemplates/Grid_with_Head.lyx new file mode 100644 index 0000000000..a15eb859ba --- /dev/null +++ b/lib/tabletemplates/Grid_with_Head.lyx @@ -0,0 +1,126 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Grid_with_Head_1x1.lyx b/lib/tabletemplates/Grid_with_Head_1x1.lyx new file mode 100644 index 0000000000..e42df38ab9 --- /dev/null +++ b/lib/tabletemplates/Grid_with_Head_1x1.lyx @@ -0,0 +1,104 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Grid_with_Head_1x2.lyx b/lib/tabletemplates/Grid_with_Head_1x2.lyx new file mode 100644 index 0000000000..03c19820ef --- /dev/null +++ b/lib/tabletemplates/Grid_with_Head_1x2.lyx @@ -0,0 +1,115 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/No_Borders.lyx b/lib/tabletemplates/No_Borders.lyx new file mode 100644 index 0000000000..804b61e9c7 --- /dev/null +++ b/lib/tabletemplates/No_Borders.lyx @@ -0,0 +1,126 @@ +#LyX 2.3 created this file. For more info see http://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/No_Borders_1x1.lyx b/lib/tabletemplates/No_Borders_1x1.lyx new file mode 100644 index 0000000000..865925f78b --- /dev/null +++ b/lib/tabletemplates/No_Borders_1x1.lyx @@ -0,0 +1,104 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/No_Borders_1x2.lyx b/lib/tabletemplates/No_Borders_1x2.lyx new file mode 100644 index 0000000000..07fb862542 --- /dev/null +++ b/lib/tabletemplates/No_Borders_1x2.lyx @@ -0,0 +1,115 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Simple_Grid.lyx b/lib/tabletemplates/Simple_Grid.lyx new file mode 100644 index 0000000000..c9b2b5b4a2 --- /dev/null +++ b/lib/tabletemplates/Simple_Grid.lyx @@ -0,0 +1,126 @@ +#LyX 2.3 created this file. For more info see http://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding global +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Simple_Grid_1x1.lyx b/lib/tabletemplates/Simple_Grid_1x1.lyx new file mode 100644 index 0000000000..e42df38ab9 --- /dev/null +++ b/lib/tabletemplates/Simple_Grid_1x1.lyx @@ -0,0 +1,104 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/lib/tabletemplates/Simple_Grid_1x2.lyx b/lib/tabletemplates/Simple_Grid_1x2.lyx new file mode 100644 index 0000000000..6ca55caa97 --- /dev/null +++ b/lib/tabletemplates/Simple_Grid_1x2.lyx @@ -0,0 +1,115 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 568 +\begin_document +\begin_header +\save_transient_properties true +\origin /systemlyxdir/tablestyles/ +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding auto +\font_roman "default" "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_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\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 1 +\use_minted 0 +\index Stichwortverzeichnis +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style danish +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Standard +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_body +\end_document diff --git a/po/Rules-lyx b/po/Rules-lyx index d9dae4023e..d49dfdff6e 100644 --- a/po/Rules-lyx +++ b/po/Rules-lyx @@ -16,7 +16,7 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS) sort | uniq ) > $@-t \ && mv $@-t $@ -l10n_pots: qt4_l10n.pot layouts_l10n.pot languages_l10n.pot latexfonts_l10n.pot encodings_l10n.pot ui_l10n.pot external_l10n.pot formats_l10n.pot examples_templates_l10n.pot +l10n_pots: qt4_l10n.pot layouts_l10n.pot languages_l10n.pot latexfonts_l10n.pot encodings_l10n.pot ui_l10n.pot external_l10n.pot formats_l10n.pot examples_templates_l10n.pot tabletemplates_l10n.pot cat $^ | msguniq -o $(DOMAIN).po rm $^ @@ -60,6 +60,9 @@ examples_templates_l10n.pot: $(top_srcdir)/lib/examples/* \ $(top_srcdir)/lib/templates/* $(LYX_POT) -o $@ -t examples_templates $^ +tabletemplates_l10n.pot: $(top_srcdir)/lib/tabletemplates/*.lyx + $(LYX_POT) -o $@ -t tabletemplates $^ + # LyX specific code to generate l10n statistics for the web site i18n.inc: $(POFILES) postats.py $(PYTHON) $(srcdir)/postats.py "$(VERSION)" $(POFILES) >$@ diff --git a/po/lyx_pot.py b/po/lyx_pot.py index 93ff596627..71bd4c7e6a 100755 --- a/po/lyx_pot.py +++ b/po/lyx_pot.py @@ -653,6 +653,29 @@ def parseExamplesTemplates(file, seen, output): (relativePath(input_files[0], base), 0, filename.replace('_', ' ').replace('%26', '&').replace('%28', '(').replace('%29', ')')), file=output) +def tabletemplates_l10n(input_files, output, base): + '''Generate pot file from lib/tabletemplates ''' + output = io.open(output, 'w', encoding='utf_8', newline='\n') + # only record each item once + seen = [] + for file in input_files: + filename = file.split(os.sep)[-1] + if os.path.isfile(file): + if filename[-4:] != ".lyx": + continue + filename = filename[:-4] + if filename[-4:-1] == "_1x": + continue + if seen.count(filename): + continue + + seen.append(filename) + if filename != "": + print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ + (relativePath(input_files[0], base), 0, filename.replace('_', ' ')), file=output) + output.close() + + Usage = ''' lyx_pot.py [-b|--base top_src_dir] [-o|--output output_file] [-h|--help] [-s|src_file filename] -t|--type input_type input_files @@ -675,6 +698,7 @@ where external: external templates files formats: formats predefined in lib/configure.py examples_templates: example and template files + tabletemplates: table template files ''' if __name__ == '__main__': @@ -698,7 +722,7 @@ if __name__ == '__main__': elif opt in ['-s', '--src_file']: input_files = [f.strip() for f in io.open(value, encoding='utf_8')] - if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates'] or output is None: + if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates', 'tabletemplates'] or output is None: print('Wrong input type or output filename.') sys.exit(1) @@ -729,5 +753,7 @@ if __name__ == '__main__': encodings_l10n(input_files, output, base) elif input_type == 'examples_templates': examples_templates_l10n(input_files, output, base) + elif input_type == 'tabletemplates': + tabletemplates_l10n(input_files, output, base) else: languages_l10n(input_files, output, base) diff --git a/src/FuncCode.h b/src/FuncCode.h index b9aed5d458..2d9a5eda0f 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -483,6 +483,7 @@ enum FuncCode // 375 LFUN_SEARCH_IGNORE, // kornel, 20181115 LFUN_BUFFER_WRITE_AS_TEMPLATE, // spitz, 20190323 + LFUN_TABULAR_STYLE_INSERT, // spitz, 20190325 LFUN_LASTACTION // end of the table }; diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 969ef64be0..1374ab5ff0 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3787,6 +3787,18 @@ void LyXAction::init() */ { LFUN_TABULAR_INSERT, "tabular-insert", Noop, Edit }, +/*! + * \var lyx::FuncCode lyx::LFUN_TABULAR_STYLE_INSERT + * \li Action: Inserts table of a given style into the document. + * \li Notion: See #LFUN_TABULAR_FEATURE for some more details + about tabular modifications. + * \li Syntax: tabular-style-insert