From d0348b3974cedc67a37ad5562aea820462323d44 Mon Sep 17 00:00:00 2001
From: Duan Yao <duanyao@ustc.edu>
Date: Sun, 29 Jun 2014 14:48:57 +0800
Subject: [PATCH] Rename class CoveredTextHandler to CoveredTextDetector

---
 src/CoveredTextHandler.cc       | 8 ++++----
 src/CoveredTextHandler.h        | 6 +++---
 src/HTMLRenderer/HTMLRenderer.h | 4 ++--
 src/HTMLRenderer/general.cc     | 8 ++++----
 src/HTMLRenderer/text.cc        | 2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/CoveredTextHandler.cc b/src/CoveredTextHandler.cc
index ace7bdc..31da294 100644
--- a/src/CoveredTextHandler.cc
+++ b/src/CoveredTextHandler.cc
@@ -11,19 +11,19 @@
 
 namespace pdf2htmlEX {
 
-void CoveredTextHandler::reset()
+void CoveredTextDetector::reset()
 {
     char_bboxes.clear();
     chars_covered.clear();
 }
 
-void CoveredTextHandler::add_char_bbox(double * bbox)
+void CoveredTextDetector::add_char_bbox(double * bbox)
 {
     char_bboxes.insert(char_bboxes.end(), bbox, bbox + 4);
     chars_covered.push_back(false);
 }
 
-void CoveredTextHandler::add_char_bbox_clipped(double * bbox, bool patially)
+void CoveredTextDetector::add_char_bbox_clipped(double * bbox, bool patially)
 {
     char_bboxes.insert(char_bboxes.end(), bbox, bbox + 4);
     chars_covered.push_back(true);
@@ -31,7 +31,7 @@ void CoveredTextHandler::add_char_bbox_clipped(double * bbox, bool patially)
         add_non_char_bbox(bbox, chars_covered.size() - 1);
 }
 
-void CoveredTextHandler::add_non_char_bbox(double * bbox, int index)
+void CoveredTextDetector::add_non_char_bbox(double * bbox, int index)
 {
     if (index < 0)
         index = chars_covered.size();
diff --git a/src/CoveredTextHandler.h b/src/CoveredTextHandler.h
index f491e9b..3203053 100644
--- a/src/CoveredTextHandler.h
+++ b/src/CoveredTextHandler.h
@@ -5,8 +5,8 @@
  *      Author: duanyao
  */
 
-#ifndef COVEREDTEXTHANDLER_H__
-#define COVEREDTEXTHANDLER_H__
+#ifndef COVEREDTEXTDETECTOR_H__
+#define COVEREDTEXTDETECTOR_H__
 
 #include <vector>
 
@@ -15,7 +15,7 @@ namespace pdf2htmlEX {
 /**
  * Detect characters that are covered by non-char graphics on a page.
  */
-class CoveredTextHandler
+class CoveredTextDetector
 {
 public:
 
diff --git a/src/HTMLRenderer/HTMLRenderer.h b/src/HTMLRenderer/HTMLRenderer.h
index 3ec57c1..0dd107b 100644
--- a/src/HTMLRenderer/HTMLRenderer.h
+++ b/src/HTMLRenderer/HTMLRenderer.h
@@ -157,7 +157,7 @@ public:
     // Does not fail on out-of-bound conditions, but return false.
     bool is_char_covered(int index);
     // Currently drawn char (glyph) count in current page.
-    int get_char_count() { return (int)covered_text_handler.get_chars_covered().size(); }
+    int get_char_count() { return (int)covered_text_detecor.get_chars_covered().size(); }
 
 protected:
     ////////////////////////////////////////////////////
@@ -364,7 +364,7 @@ protected:
 
     static const std::string MANIFEST_FILENAME;
 
-    CoveredTextHandler covered_text_handler;
+    CoveredTextDetector covered_text_detecor;
     DrawingTracer tracer;
 };
 
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index a2be519..7f211db 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -80,11 +80,11 @@ HTMLRenderer::HTMLRenderer(const Param & param)
     all_manager.bottom      .set_eps(EPS);
 
     tracer.on_char_drawn =
-            [this](double * box) { covered_text_handler.add_char_bbox(box); };
+            [this](double * box) { covered_text_detecor.add_char_bbox(box); };
     tracer.on_char_clipped =
-            [this](double * box, bool partial) { covered_text_handler.add_char_bbox_clipped(box, partial); };
+            [this](double * box, bool partial) { covered_text_detecor.add_char_bbox_clipped(box, partial); };
     tracer.on_non_char_drawn =
-            [this](double * box) { covered_text_handler.add_non_char_bbox(box); };
+            [this](double * box) { covered_text_detecor.add_non_char_bbox(box); };
 }
 
 HTMLRenderer::~HTMLRenderer()
@@ -192,7 +192,7 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state)
 void HTMLRenderer::startPage(int pageNum, GfxState *state, XRef * xref)
 #endif
 {
-    covered_text_handler.reset();
+    covered_text_detecor.reset();
     tracer.reset(state);
 
     this->pageNum = pageNum;
diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc
index 95d8186..5d5ecd9 100644
--- a/src/HTMLRenderer/text.cc
+++ b/src/HTMLRenderer/text.cc
@@ -153,7 +153,7 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
 
 bool HTMLRenderer::is_char_covered(int index)
 {
-    auto covered = covered_text_handler.get_chars_covered();
+    auto covered = covered_text_detecor.get_chars_covered();
     if (index < 0 || index >= (int)covered.size())
     {
         std::cerr << "Warning: HTMLRenderer::is_char_covered: index out of bound: "