diff --git a/TODO b/TODO index f983f2d..ea3fa14 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ optimize font_size & transform matrix tracking -c++ classes for different states +print css for draw/link/image... == Future: == diff --git a/src/HTMLRenderer/HTMLRenderer.h b/src/HTMLRenderer/HTMLRenderer.h index 3a9f0b7..0735e8d 100644 --- a/src/HTMLRenderer/HTMLRenderer.h +++ b/src/HTMLRenderer/HTMLRenderer.h @@ -225,11 +225,6 @@ protected: double default_ctm[6]; - // page info - int pageNum; - double pageWidth ; - double pageHeight ; - /* * The content of each page is first scaled with factor1 (>=1), then scale back with factor2(<=1) * @@ -292,7 +287,9 @@ protected: WordSpaceManager word_space_manager; FillColorManager fill_color_manager; FontSizeManager font_size_manager; + BottomManager bottom_manager; HeightManager height_manager; + WidthManager width_manager; RiseManager rise_manager; LeftManager left_manager; //////////////////////////////////////////////// diff --git a/src/HTMLRenderer/TextLineBuffer.cc b/src/HTMLRenderer/TextLineBuffer.cc index ee16f13..38d0253 100644 --- a/src/HTMLRenderer/TextLineBuffer.cc +++ b/src/HTMLRenderer/TextLineBuffer.cc @@ -85,15 +85,14 @@ void HTMLRenderer::TextLineBuffer::flush(void) ostream & out = renderer->f_pages.fs; renderer->height_manager.install(max_ascent); - renderer->left_manager.install(x); + renderer->left_manager .install(x); + renderer->bottom_manager.install(y); - out << "