From 9e569a7aaecaf821bcebe2c4cb02ebcc8f003a03 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 18 Sep 2015 15:06:04 +0000 Subject: [PATCH] Qtf: {{* now equivalent to {{~0/0 git-svn-id: svn://ultimatepp.org/upp/trunk@8948 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RichText/ParseQtf.cpp | 5 +++++ uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/uppsrc/RichText/ParseQtf.cpp b/uppsrc/RichText/ParseQtf.cpp index 1a00f4675..46cd2ef1a 100644 --- a/uppsrc/RichText/ParseQtf.cpp +++ b/uppsrc/RichText/ParseQtf.cpp @@ -435,6 +435,11 @@ void RichQtfParser::TableFormat(bool bw) if(b >= 0) t.format.margin.left = t.format.margin.right = t.format.margin.top = t.format.margin.bottom = b; break; //!!cell all lines + case '*': + tab.format.frame = tab.format.grid = + t.format.border.left = t.format.border.right = t.format.border.top = t.format.border.bottom = + t.format.margin.left = t.format.margin.right = t.format.margin.top = t.format.margin.bottom = 0; + break; case '-': t.hspan = GetNumber(); break; case '+': case '|': t.vspan = GetNumber(); break; diff --git a/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp index e70eb915d..deb0d0bf1 100644 --- a/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp +++ b/uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp @@ -326,7 +326,9 @@ optimization, [*@(128.0.255) %`-] is equivalent to [@(128.0.255) %][@(0.0.255) 0 ::^ [s0;%- [C@(128.0.255) k]] ::= [s0; Keep paragraph on single page.] ::^ [s0;%- [C@(128.0.255) K]] -::= [s0; Keep paragraph on same page as next one.] +::= [s0; Keep paragraph on same page as next one. Only works well for +binding two paragraphs (does not propagate further). If you need +to bind more, use organizing table [@(128.0.255) `{`{`*K ][/ text][@(128.0.255) `}`}]] ::^ [s0;%- [C@(128.0.255) Q]] ::= [s0; Orphan control.] ::^ [s0;%- [C@(128.0.255) n][/C@(0.0.255) text][C@(128.0.255) ;]] @@ -600,6 +602,9 @@ Default is border: 0, margin: 15.] [s0; [C@(128.0.255) a][/C@(0.0.255) /number]] :: [s0; Sets all cell borders (first [/@(0.0.255) number]) and margins in dots. If any of numbers is missing, sets only the one present.] +:: [s0; [C@(128.0.255) `*]] +:: [s0; Same as f0g0a0/0 `- sets everything to zero to use table as +organizing element.] :: [s0; [C@(128.0.255) o]] :: [s0; Sets round border.] :: [s0; [C@(128.0.255) `@][/C@(0.0.255) color]]