github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

RichText: Header/Footer can be changed by paragraph/table

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10084 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-07-21 05:45:44 +00:00
parent d65073ef29
commit 4b1727cab9
25 changed files with 506 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

21
uppsrc/RichText/ParseQtf.cpp
View file

@ -425,9 +425,15 @@ void RichQtfParser::TableFormat(bool bw)
case '@': t.format.color = GetColor(); break;
case 'R': t.format.bordercolor = GetColor(); break;
case '!': t.format = RichCell::Format(); break;
case 'k': t.format.keep = true;
case 'o': t.format.round = true;
case 'K': tab.format.keep = true;
case 'o': t.format.round = true; break;
case 'k': t.format.keep = true; break;
case 'K': tab.format.keep = true; break;
case 'P': tab.format.newpage = true; break;
case 'T':
tab.format.newhdrftr = true;
tab.format.header_qtf = GetText2('^', '^');
tab.format.footer_qtf = GetText2('^', '^');
break;
case 'a':
Number2(a, b);
if(a >= 0)
@ -774,7 +780,14 @@ void RichQtfParser::Parse(const char *qtf, int _accesskey)
}
break;
case 't':
if(IsDigit(*term)) //temporary fix... :(
if(*term == 'P') {
term++;
format.newhdrftr = true;
format.header_qtf = GetText2('^', '^');
format.footer_qtf = GetText2('^', '^');
}
else
if(IsDigit(*term))
format.tabsize = ReadNumber();
break;
case '~': {