diff --git a/CMakeLists.txt b/CMakeLists.txt index 43b2e95..7e984a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_BUILD_TYPE Release CACHE STRING "Build configuration (Debug, Release, project(pdf2htmlEX) cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) -include_directories(${CMAKE_SOURCE_DIR}/src/include) +include_directories(${CMAKE_SOURCE_DIR}/src) set(PDF2HTMLEX_VERSION "0.6") set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION}) @@ -138,37 +138,40 @@ if(NOT CXX0X_SUPPORT) endif() -configure_file (${CMAKE_SOURCE_DIR}/src/include/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/include/pdf2htmlEX-config.h) +configure_file (${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h.in ${CMAKE_SOURCE_DIR}/src/pdf2htmlEX-config.h) configure_file (${CMAKE_SOURCE_DIR}/pdf2htmlEX.1.in ${CMAKE_SOURCE_DIR}/pdf2htmlEX.1) add_executable(pdf2htmlEX + src/Param.h + src/config.h + src/pdf2htmlEX-config.h src/pdf2htmlEX.cc - src/include/HTMLRenderer.h - src/HTMLRenderer/general.cc - src/HTMLRenderer/state.cc - src/HTMLRenderer/install.cc - src/HTMLRenderer/export.cc - src/HTMLRenderer/text.cc - src/HTMLRenderer/image.cc + src/HTMLRenderer/HTMLRenderer.h src/HTMLRenderer/draw.cc - src/HTMLRenderer/link.cc - src/include/namespace.h + src/HTMLRenderer/export.cc + src/HTMLRenderer/general.cc + src/HTMLRenderer/image.cc + src/HTMLRenderer/install.cc src/HTMLRenderer/LineBuffer.cc - src/HTMLRenderer/TmpFiles.cc - src/include/ffw.h - src/ffw.c - src/include/BackgroundRenderer.h - src/include/SplashBackgroundRenderer.h - src/SplashBackgroundRenderer.cc - src/include/CairoBackgroundRenderer.h - src/CairoBackgroundRenderer.cc - src/include/Preprocessor.h - src/Preprocessor.cc - src/include/util.h - src/util.cc - src/include/ArgParser.h - src/ArgParser.cc - src/include/pdf2htmlEX-config.h + src/HTMLRenderer/link.cc + src/HTMLRenderer/state.cc + src/HTMLRenderer/text.cc + src/HTMLRenderer/Preprocessor.h + src/HTMLRenderer/Preprocessor.cc + src/BackgroundRenderer/BackgroundRenderer.h + src/BackgroundRenderer/SplashBackgroundRenderer.h + src/BackgroundRenderer/SplashBackgroundRenderer.cc + src/BackgroundRenderer/CairoBackgroundRenderer.h + src/BackgroundRenderer/CairoBackgroundRenderer.cc + src/util/namespace.h + src/util/ffw.h + src/util/ffw.c + src/util/util.h + src/util/util.cc + src/util/TmpFiles.h + src/util/TmpFiles.cc + src/util/ArgParser.h + src/util/ArgParser.cc ) target_link_libraries(pdf2htmlEX ${PDF2HTMLEX_LIBS}) diff --git a/src/include/BackgroundRenderer.h b/src/BackgroundRenderer/BackgroundRenderer.h similarity index 100% rename from src/include/BackgroundRenderer.h rename to src/BackgroundRenderer/BackgroundRenderer.h diff --git a/src/CairoBackgroundRenderer.cc b/src/BackgroundRenderer/CairoBackgroundRenderer.cc similarity index 100% rename from src/CairoBackgroundRenderer.cc rename to src/BackgroundRenderer/CairoBackgroundRenderer.cc diff --git a/src/include/CairoBackgroundRenderer.h b/src/BackgroundRenderer/CairoBackgroundRenderer.h similarity index 100% rename from src/include/CairoBackgroundRenderer.h rename to src/BackgroundRenderer/CairoBackgroundRenderer.h diff --git a/src/CairoOutputDev/CairoFontEngine.cc b/src/BackgroundRenderer/CairoOutputDev/CairoFontEngine.cc similarity index 100% rename from src/CairoOutputDev/CairoFontEngine.cc rename to src/BackgroundRenderer/CairoOutputDev/CairoFontEngine.cc diff --git a/src/CairoOutputDev/CairoFontEngine.h b/src/BackgroundRenderer/CairoOutputDev/CairoFontEngine.h similarity index 100% rename from src/CairoOutputDev/CairoFontEngine.h rename to src/BackgroundRenderer/CairoOutputDev/CairoFontEngine.h diff --git a/src/CairoOutputDev/CairoOutputDev.cc b/src/BackgroundRenderer/CairoOutputDev/CairoOutputDev.cc similarity index 100% rename from src/CairoOutputDev/CairoOutputDev.cc rename to src/BackgroundRenderer/CairoOutputDev/CairoOutputDev.cc diff --git a/src/CairoOutputDev/CairoOutputDev.h b/src/BackgroundRenderer/CairoOutputDev/CairoOutputDev.h similarity index 100% rename from src/CairoOutputDev/CairoOutputDev.h rename to src/BackgroundRenderer/CairoOutputDev/CairoOutputDev.h diff --git a/src/CairoOutputDev/CairoRescaleBox.cc b/src/BackgroundRenderer/CairoOutputDev/CairoRescaleBox.cc similarity index 100% rename from src/CairoOutputDev/CairoRescaleBox.cc rename to src/BackgroundRenderer/CairoOutputDev/CairoRescaleBox.cc diff --git a/src/CairoOutputDev/CairoRescaleBox.h b/src/BackgroundRenderer/CairoOutputDev/CairoRescaleBox.h similarity index 100% rename from src/CairoOutputDev/CairoRescaleBox.h rename to src/BackgroundRenderer/CairoOutputDev/CairoRescaleBox.h diff --git a/src/SplashBackgroundRenderer.cc b/src/BackgroundRenderer/SplashBackgroundRenderer.cc similarity index 100% rename from src/SplashBackgroundRenderer.cc rename to src/BackgroundRenderer/SplashBackgroundRenderer.cc diff --git a/src/include/SplashBackgroundRenderer.h b/src/BackgroundRenderer/SplashBackgroundRenderer.h similarity index 97% rename from src/include/SplashBackgroundRenderer.h rename to src/BackgroundRenderer/SplashBackgroundRenderer.h index 8ba0cd5..ebf6c74 100644 --- a/src/include/SplashBackgroundRenderer.h +++ b/src/BackgroundRenderer/SplashBackgroundRenderer.h @@ -15,8 +15,8 @@ #include #include -#include "HTMLRenderer.h" #include "Param.h" +#include "HTMLRenderer/HTMLRenderer.h" namespace pdf2htmlEX { diff --git a/src/include/HTMLRenderer.h b/src/HTMLRenderer/HTMLRenderer.h similarity index 99% rename from src/include/HTMLRenderer.h rename to src/HTMLRenderer/HTMLRenderer.h index 19add6c..2922a8e 100644 --- a/src/include/HTMLRenderer.h +++ b/src/HTMLRenderer/HTMLRenderer.h @@ -25,9 +25,9 @@ #include #include "Param.h" -#include "util.h" #include "Preprocessor.h" -#include "TmpFiles.h" +#include "util/util.h" +#include "util/TmpFiles.h" /* * Naming Convention diff --git a/src/HTMLRenderer/LineBuffer.cc b/src/HTMLRenderer/LineBuffer.cc index acbb944..c70c24f 100644 --- a/src/HTMLRenderer/LineBuffer.cc +++ b/src/HTMLRenderer/LineBuffer.cc @@ -10,7 +10,7 @@ #include #include "HTMLRenderer.h" -#include "namespace.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/Preprocessor.cc b/src/HTMLRenderer/Preprocessor.cc similarity index 99% rename from src/Preprocessor.cc rename to src/HTMLRenderer/Preprocessor.cc index 317c9cd..3214d99 100644 --- a/src/Preprocessor.cc +++ b/src/HTMLRenderer/Preprocessor.cc @@ -15,7 +15,7 @@ #include #include "Preprocessor.h" -#include "util.h" +#include "util/util.h" namespace pdf2htmlEX { diff --git a/src/include/Preprocessor.h b/src/HTMLRenderer/Preprocessor.h similarity index 100% rename from src/include/Preprocessor.h rename to src/HTMLRenderer/Preprocessor.h diff --git a/src/HTMLRenderer/draw.cc b/src/HTMLRenderer/draw.cc index e745fe4..5132d2d 100644 --- a/src/HTMLRenderer/draw.cc +++ b/src/HTMLRenderer/draw.cc @@ -14,8 +14,8 @@ #include #include "HTMLRenderer.h" -#include "util.h" -#include "namespace.h" +#include "util/util.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/export.cc b/src/HTMLRenderer/export.cc index 6caec63..febb5b9 100644 --- a/src/HTMLRenderer/export.cc +++ b/src/HTMLRenderer/export.cc @@ -11,7 +11,7 @@ #include #include "HTMLRenderer.h" -#include "namespace.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc index b47685e..a921c12 100644 --- a/src/HTMLRenderer/general.cc +++ b/src/HTMLRenderer/general.cc @@ -14,10 +14,10 @@ #include #include "HTMLRenderer.h" -#include "BackgroundRenderer.h" -#include "namespace.h" -#include "ffw.h" #include "pdf2htmlEX-config.h" +#include "BackgroundRenderer/BackgroundRenderer.h" +#include "util/namespace.h" +#include "util/ffw.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/image.cc b/src/HTMLRenderer/image.cc index cac7c2c..9c3da52 100644 --- a/src/HTMLRenderer/image.cc +++ b/src/HTMLRenderer/image.cc @@ -8,7 +8,7 @@ */ #include "HTMLRenderer.h" -#include "namespace.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/install.cc b/src/HTMLRenderer/install.cc index b741e26..ee839cd 100644 --- a/src/HTMLRenderer/install.cc +++ b/src/HTMLRenderer/install.cc @@ -15,8 +15,8 @@ #include "Param.h" #include "HTMLRenderer.h" -#include "namespace.h" -#include "util.h" +#include "util/namespace.h" +#include "util/util.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/link.cc b/src/HTMLRenderer/link.cc index 83cf6aa..6b1f9ff 100644 --- a/src/HTMLRenderer/link.cc +++ b/src/HTMLRenderer/link.cc @@ -11,10 +11,10 @@ #include #include -#include #include -#include "namespace.h" +#include "HTMLRenderer.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc index e5a1dac..1474469 100644 --- a/src/HTMLRenderer/state.cc +++ b/src/HTMLRenderer/state.cc @@ -16,8 +16,8 @@ #include #include "HTMLRenderer.h" -#include "namespace.h" -#include "util.h" +#include "util/namespace.h" +#include "util/util.h" namespace pdf2htmlEX { diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc index 4f61d43..0c07c88 100644 --- a/src/HTMLRenderer/text.cc +++ b/src/HTMLRenderer/text.cc @@ -15,9 +15,9 @@ #include #include -#include "ffw.h" #include "HTMLRenderer.h" -#include "namespace.h" +#include "util/ffw.h" +#include "util/namespace.h" namespace pdf2htmlEX { diff --git a/src/include/Param.h b/src/Param.h similarity index 100% rename from src/include/Param.h rename to src/Param.h diff --git a/src/include/pdf2htmlEX-config.h.in b/src/pdf2htmlEX-config.h.in similarity index 100% rename from src/include/pdf2htmlEX-config.h.in rename to src/pdf2htmlEX-config.h.in diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc index f56b778..f971243 100644 --- a/src/pdf2htmlEX.cc +++ b/src/pdf2htmlEX.cc @@ -19,10 +19,10 @@ #include #include -#include "HTMLRenderer.h" #include "Param.h" #include "pdf2htmlEX-config.h" -#include "ArgParser.h" +#include "HTMLRenderer/HTMLRenderer.h" +#include "util/ArgParser.h" using namespace std; using namespace pdf2htmlEX; diff --git a/src/ArgParser.cc b/src/util/ArgParser.cc similarity index 100% rename from src/ArgParser.cc rename to src/util/ArgParser.cc diff --git a/src/include/ArgParser.h b/src/util/ArgParser.h similarity index 100% rename from src/include/ArgParser.h rename to src/util/ArgParser.h diff --git a/src/HTMLRenderer/TmpFiles.cc b/src/util/TmpFiles.cc similarity index 100% rename from src/HTMLRenderer/TmpFiles.cc rename to src/util/TmpFiles.cc diff --git a/src/include/TmpFiles.h b/src/util/TmpFiles.h similarity index 100% rename from src/include/TmpFiles.h rename to src/util/TmpFiles.h diff --git a/src/ffw.c b/src/util/ffw.c similarity index 100% rename from src/ffw.c rename to src/util/ffw.c diff --git a/src/include/ffw.h b/src/util/ffw.h similarity index 100% rename from src/include/ffw.h rename to src/util/ffw.h diff --git a/src/include/namespace.h b/src/util/namespace.h similarity index 100% rename from src/include/namespace.h rename to src/util/namespace.h diff --git a/src/util.cc b/src/util/util.cc similarity index 100% rename from src/util.cc rename to src/util/util.cc diff --git a/src/include/util.h b/src/util/util.h similarity index 100% rename from src/include/util.h rename to src/util/util.h