renamed: config option 'html_filter_break_lines' to 'html_filter_break_word'

added:   config option 'html_filter_wrap_line'
         this wraps the whole line (line calculated with html tags as well)
changed: orphans (for html filter) are read from locale files now
         ('language_orphans' value )



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@728 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-04-16 08:42:22 +00:00
parent aadf12c7b3
commit 426beae796
19 changed files with 1079 additions and 672 deletions

View File

@@ -604,16 +604,6 @@ void App::SendHeaders(bool compressing, int compress_encoding, Header header)
void App::SetHtmlFilterConf()
{
html_filter.TrimWhite(config.html_filter_trim_white);
html_filter.BreakLines(config.html_filter_break_lines);
html_filter.InsertTabs(config.html_filter_tabs);
if( config.html_filter_orphans )
html_filter.CheckOrphans(config.html_filter_orphans_lang, config.html_filter_orphans_mode);
}
void App::FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref)
{
@@ -624,8 +614,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std:
if( config.html_filter && !raw )
{
SetHtmlFilterConf();
html_filter.Filter(*source, clean_html);
TemplatesFunctions::html_filter.Filter(*source, clean_html);
AddDebugInfo(clean_html);
source = &clean_html;
}