From 22fc8fdc8ae8e61eb460763f1606f4bdfaa502a8 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 25 Aug 2016 07:19:37 +0000 Subject: [PATCH] RichText: EncodeHTML list-style-position now default (not inside) git-svn-id: svn://ultimatepp.org/upp/trunk@10182 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/CoWork.h | 3 ++- uppsrc/RichText/EncodeHTML.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/CoWork.h b/uppsrc/Core/CoWork.h index 336a7e7e7..a76172349 100644 --- a/uppsrc/Core/CoWork.h +++ b/uppsrc/Core/CoWork.h @@ -44,9 +44,10 @@ public: // byte magic[sizeof(ConditionVariable)]; ConditionVariable waitforfinish; - Link jobs; + Link jobs; // global stack and CoWork stack as double-linked lists int todo; +// experimental pipe support Mutex stepmutex; Array>> step; Vector steprunning; diff --git a/uppsrc/RichText/EncodeHTML.cpp b/uppsrc/RichText/EncodeHTML.cpp index 8f358bc2b..2c53b5a26 100644 --- a/uppsrc/RichText/EncodeHTML.cpp +++ b/uppsrc/RichText/EncodeHTML.cpp @@ -72,7 +72,7 @@ String HtmlParaStyle(const RichPara::Format& f, Zoom z) case RichPara::BULLET_BOX: case RichPara::BULLET_BOXWHITE: style << "square"; break; } - style << ";list-style-position:inside;"; +// style << ";list-style-position:inside;"; lm += 20; } style << Format("margin:%dpx %dpx %dpx %dpx;text-indent:%dpx;",