From 5518ca028e4f5dc61adeff29224261c91eea0a15 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 28 Dec 2018 10:11:42 +0100 Subject: [PATCH] Add tabular-features set-inner-lines and fix set-all-lines behavior MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Daniel Ramöller (racoon) Fixes: #11382 (cherry picked from commit cb84f752f21bb4cf4bd9ed6999df0353aba2b57e) --- lib/Makefile.am | 3 +++ .../tabular-feature_set-inner-lines.png | Bin 0 -> 5934 bytes .../tabular-feature_unset-all-lines.png | Bin 203 -> 6619 bytes .../tabular-feature_set-inner-lines.svgz | Bin 0 -> 1607 bytes .../tabular-feature_set-inner-lines.svgz | Bin 0 -> 1680 bytes lib/ui/stdtoolbars.inc | 1 + src/insets/InsetTabular.cpp | 20 ++++++++++++++---- src/insets/InsetTabular.h | 2 ++ status.23x | 1 + 9 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 lib/images/classic/tabular-feature_set-inner-lines.png create mode 100644 lib/images/oxygen/tabular-feature_set-inner-lines.svgz create mode 100644 lib/images/tabular-feature_set-inner-lines.svgz diff --git a/lib/Makefile.am b/lib/Makefile.am index 95e105864d..49f95dee26 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -556,6 +556,7 @@ dist_images_DATA1X = \ images/tabular-feature_set-longtabular.svgz \ images/tabular-feature_set-rotate-cell.svgz \ images/tabular-feature_set-border-lines.svgz \ + images/tabular-feature_set-inner-lines.svgz \ images/tabular-feature_set-rotate-tabular.svgz \ images/tabular-feature_toggle-line-bottom.svgz \ images/tabular-feature_toggle-line-left.svgz \ @@ -1826,6 +1827,7 @@ dist_imagesoxygen_DATA1X = \ images/oxygen/tabular-feature_multirow.svgz \ images/oxygen/tabular-feature_set-all-lines.svgz \ images/oxygen/tabular-feature_set-border-lines.svgz \ + images/oxygen/tabular-feature_set-inner-lines.svgz \ images/oxygen/tabular-feature_set-longtabular.svgz \ images/oxygen/tabular-feature_toggle-line-bottom.svgz \ images/oxygen/tabular-feature_toggle-line-left.svgz \ @@ -2016,6 +2018,7 @@ dist_imagesclassic_DATA = \ images/classic/tabular-feature_multirow.png \ images/classic/tabular-feature_set-all-lines.png \ images/classic/tabular-feature_set-border-lines.png \ + images/classic/tabular-feature_set-inner-lines.png \ images/classic/tabular-feature_set-longtabular.png \ images/classic/tabular-feature_set-rotate-cell.png \ images/classic/tabular-feature_set-rotate-tabular.png \ diff --git a/lib/images/classic/tabular-feature_set-inner-lines.png b/lib/images/classic/tabular-feature_set-inner-lines.png new file mode 100644 index 0000000000000000000000000000000000000000..a8179e955925c20f9808f5335ef2cd27298a6ddb GIT binary patch literal 5934 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 A+5i9m diff --git a/lib/images/oxygen/tabular-feature_set-inner-lines.svgz b/lib/images/oxygen/tabular-feature_set-inner-lines.svgz new file mode 100644 index 0000000000000000000000000000000000000000..9ad978e1d7a0d0a6a8b1e4460c7a496db6f763fe GIT binary patch literal 1607 zcmV-N2DtejiwFP!000000KHdjZ`(Ey{+?gKDPK~|qWB_8q-wh#T68P0VZhpM9|uLE zZMCvwP;zYN*Y7Cn#ZH{qZG%b(V%;72+&w&!cjGtPWsdH&sj{+|I202H=^`o9te8)n z&!67A(m_=n7ipZAg`PM?>Aaae8ZN1s>#)vAVJi`n?%oGq{fA=y?3A9^-7oEv`!DE>DWKQJzA0?Ug~NU zC%W=Fc{BbfAFN=LrS$?nnQT56I-4)*;X6ww4g}17vj6T}iqbN%7!#+CZ`XNj+!-v| z+UWl(UAtLPXyZccy23E}em_;~N7Va3uws~_8|D)s{9uF_q0%MXrSz3Eg)!qE&SIr^ zncmo$5L(4^NRPZU6X$x?JkDNmTbfjxP8BrIk*WkzvU&#*w&L>ki%#mg%(aP&1OlR@ z)yxfWb4tF>QhiF%M`+#aflg|xMVywKiNhW$H(3D+w_O$%^56-Jex*XHIulr|o+#c0 zSS`wp4Q1lY;=Ixir@Jr9CCu^&CfQD$fMLQyMf^ufOCTdSP%M1HKN#*({)BS(oN^g& zvt@R#(_xVY;I%Pue7JeM)3CzLKk6W_$(B^ls(}gn#eG)gC0Y-bUv3DHwH**xI^BjdglcVrEI64W2eI`^$LUj>pa0Zpy_YzbgVJ}H~5vY6~ zRLAzc1XL16)rF|?48iHlzUNV2ED1xOv2#fXHfP+v_2CU(Bnbug&#a6}R1#m74(H(@ zwlmq6q)D1y0Qa3svZWJ;D}}?*4+c+mAf+_$aS*6Mx@9MAK`MNONkI9qPLG$G`63*q zvPD(2FdB-$>k}!_+09$w=OU}2oLg7ge6%IeU&ZJC8XT-X!EIha{RNldGOkUwy&;%# zLIT1@#J-pjMTk#FuEYxNm5_)LR4P7}f{EbOK;hG5Q9`jFQX!7WayjO3iPKOVu@x$; zlpj7|i-VLY60qmk5>#BmR&&$66k8NHa-pi^3PO=1hJiT3CHzuwqB6@HXP9vou#31- zScKGPk{>6Q&tNurm<`OP8#^M2g+LuV@_CZfWh4daS^r;|XX!@EicnxE+Jcklb-BT1rvOY?Qu_tqf3E!VL1 z`vcV0Pf29Gjq7Q)gc{X$I=@200r=xK)BY=sI=!lTr*j=|O#j==UXp8-t~5O{O_ z_&j{|+G>Y$egA3JxsHmmxQA8;4t`U9Z9WH{Pmv%6KB{Ot3LeTW0ThP<+Teqd)DrMm zYPq5?oXNxR8&Pm7_Tb{!VdFj%yS~#!nWm>>U&ZyJg8}G25gf8i!M!~K$9(h_35g~3 zsZ=9hV8t2Z0{H5rqqo%TSG6I~9?FGsFW7trWQ6N`Z3ZGW#t?1lx^Px$lS3<7M}8+uW9ZzCiFb$4 z2esAH)HEy*BIpQ63Yn0cqu)`(6OmH>2sh$KxS?DIKa-oWH=kaO?cFlH`X70`E0UxX F006Re4x0b~ literal 0 HcmV?d00001 diff --git a/lib/images/tabular-feature_set-inner-lines.svgz b/lib/images/tabular-feature_set-inner-lines.svgz new file mode 100644 index 0000000000000000000000000000000000000000..c9ea7527109279a3301b857e4e9a43fe458b693a GIT binary patch literal 1680 zcmV;B25l5a7Wzq^iK(9D`ggON$v1|f{UC*3ics6caXqpCkvtk?uQ@viWT*;&o36MG@5F;nJW$%> zwFvSw&9kCfnH9G^VHrlPw6bPHDm;v} z8gCPD#k0m#+`e{j{}TS%1q}fe`AP;Nf|UYgqBQS6+_y}_LSY&9wrRY7p!XmonV*Vc z=?9`P8+x_Amk+oiY~rw7Om)VquZ4)`i?aQU!>JB%3G=GY#-4GQ2TH+IFa3vA;!7if zh^?gfs}Q9TXPJ-&02c*<#ZUX4Y9q$20T%KIqS_r{mTfaj;U>X&)B&g@IcKP za!$=k{cW7aPa+%;306`<|1c7NCuEzQnptH`D59eChWesaDgjI7qc4Ayei*~@y%3ZW zp6VX5UCaoldPCg-6(|UZw%by-1gMyFQt(Y&<*pAG5fGX0$4Ve6I@nx9npZ$4=@4q+lAnJF6uoMVT)f>AH0Qg;JLoof9D=%UvS& zJfkYr@omH+H}YOrq`Gp(xVI#aB4{is85$$csbdB{uTDe}jhrjgK?2yGYq{Q4dYy}U zT@gn38of66h|BR+YPn&bR~v@H7Qr=Yxka#drC!bqazU>zsPHfA?bJ=o!wmb(gmf7k z{LZC>1gVP|;;ZKxmtFQ0lovPHd37FvpL)dcLBJ;=Qw6mk_shmW>_KIBR06yH53%iqa4L((kT84TUvVA()NE@9y8UeIy9R zf8_G9D}N>6KjbUu0Btu_x2s^RjP=V|oWdQ;h^Bo0JYTz1;fgj}yJ zz@rcF9_FbZXJ-GrFzZ0~1OLmh#$N0{U)dp=rH~NM;)~G0(Ed&=Wgf1A62`^DH2CLx z-^T^i+r#Q#*;~kXT``oii{l8?9&e7-UNKJ0rc|ph36tr5VLcC0j^Lzp+J4pyfyZ$yUWG? zQ?3#*&hqRDMsc`($o#STY^r`oX`M} zxU|E3OlmMQ&mseu>;F2u3`D}=-iY25$dm}-)wt#mB4oa-8n>R{YD(R?-Xq=;B*mv)2OgzxnTA}^fbDjcZ!+3OkI$RU{ z<6=8k($55+U}dkG+AfwbBkrL6*uo6+7phpen^+7J`v?&O2SX6s%h?%3mHCu&uS2v4 aNiZKkWV|S*iMrOzZvF-US|zGJ7XScH4nTSU literal 0 HcmV?d00001 diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 8f0f6dce3f..0e6782b09c 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -156,6 +156,7 @@ ToolbarSet Item "Set right line" "tabular-feature toggle-line-right" Item "Set border lines" "tabular-feature set-border-lines" Item "Set all lines" "tabular-feature set-all-lines" + Item "Set inner lines" "tabular-feature set-inner-lines" Item "Unset all lines" "tabular-feature unset-all-lines" Separator Item "Align left" "command-alternatives tabular-feature m-align-left;tabular-feature align-left" diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index c111365f28..0e1c8499c8 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -198,6 +198,7 @@ TabularFeature tabularFeature[] = { Tabular::LONGTABULAR_ALIGN_RIGHT, "longtabular-align-right", false }, { Tabular::SET_DECIMAL_POINT, "set-decimal-point", true }, { Tabular::SET_TABULAR_WIDTH, "set-tabular-width", true }, + { Tabular::SET_INNER_LINES, "set-inner-lines", false }, { Tabular::LAST_ACTION, "", false } }; @@ -4744,6 +4745,7 @@ bool InsetTabular::getFeatureStatus(Cursor & cur, string const & s, case Tabular::SET_ALL_LINES: case Tabular::UNSET_ALL_LINES: + case Tabular::SET_INNER_LINES: case Tabular::SET_BORDER_LINES: status.setEnabled(!tabular.ltCaption(tabular.cellRow(cur.idx()))); break; @@ -5554,6 +5556,7 @@ void InsetTabular::tabularFeatures(Cursor & cur, row_type sel_row_start; row_type sel_row_end; bool setLines = false; + bool setLinesInnerOnly = false; LyXAlignment setAlign = LYX_ALIGN_LEFT; Tabular::VAlignment setVAlign = Tabular::LYX_VALIGN_TOP; @@ -5899,6 +5902,9 @@ void InsetTabular::tabularFeatures(Cursor & cur, break; } + case Tabular::SET_INNER_LINES: + setLinesInnerOnly = true; + // fall through case Tabular::SET_ALL_LINES: setLines = true; // fall through @@ -5906,10 +5912,16 @@ void InsetTabular::tabularFeatures(Cursor & cur, for (row_type r = sel_row_start; r <= sel_row_end; ++r) for (col_type c = sel_col_start; c <= sel_col_end; ++c) { idx_type const cell = tabular.cellIndex(r, c); - tabular.setTopLine(cell, setLines); - tabular.setBottomLine(cell, setLines); - tabular.setRightLine(cell, setLines); - tabular.setLeftLine(cell, setLines); + if (!setLinesInnerOnly || r != sel_row_start) + tabular.setTopLine(cell, setLines); + if ((!setLinesInnerOnly || r != sel_row_end) + && (!setLines || r == sel_row_end)) + tabular.setBottomLine(cell, setLines); + if ((!setLinesInnerOnly || c != sel_col_end) + && (!setLines || c == sel_col_end)) + tabular.setRightLine(cell, setLines); + if ((!setLinesInnerOnly || c != sel_col_start)) + tabular.setLeftLine(cell, setLines); } break; diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index be11b0413e..1a8bf33243 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -297,6 +297,8 @@ public: /// SET_TABULAR_WIDTH, /// + SET_INNER_LINES, + /// LAST_ACTION }; /// diff --git a/status.23x b/status.23x index 5216b09953..adf8b1395b 100644 --- a/status.23x +++ b/status.23x @@ -167,6 +167,7 @@ What's new - Quote filenames when calling gunzip and avoid a crash when the filename of a compressed file does not end with a proper extension (bug 4269). +- Fix behavior of (un)setting all tabular borders (bug 11382). * INTERNALS