Remove dependency on NO_LAYOUT_CSS #define in Layout.cpp

Remove all traces of this #define.

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 46035513c7bd163a28d15c6505941f48c2001d12..08540efd15b119b4b08497749b67c0ece75aadcd 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -1505,14 +1505,11 @@ void Layout::makeDefaultCSS() const
                htmldefaultstyle_ += from_ascii(tmp);
        }
 
-// tex2lyx does not see output_xhtml.cpp
-#ifndef NO_LAYOUT_CSS
        // alignment
        string where = alignmentToCSS(align);
        if (!where.empty()) {
                htmldefaultstyle_ += from_ascii("text-align: " + where + ";\n");
        }
-#endif
 
        // wrap up what we have, if anything
        if (!htmldefaultstyle_.empty())

diff --git a/src/Makefile.am b/src/Makefile.am
index 024cf45661c6e49dbdf4bac43945de28db9d49bf..c1949a7e0aaa30083dac8c27722b03290e4a587d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -689,7 +689,7 @@ if INSTALL_MACOSX
 ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
 endif
 
-check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
+check_layout_CPPFLAGS = $(AM_CPPFLAGS)
 check_layout_LDADD = support/liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
 check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
 check_layout_SOURCES = \

diff --git a/src/support/tests/dummy_functions.cpp b/src/support/tests/dummy_functions.cpp
index cb87ee5f471c9af0b952b1de6e263bc69c61c3a8..5a99081b77d3366365659d933003419d38e0f309 100644 (file)
--- a/src/support/tests/dummy_functions.cpp
+++ b/src/support/tests/dummy_functions.cpp
@@ -8,6 +8,11 @@ namespace lyx {
        // Dummy LyXRC support
        class LyXRC { string icon_set; } lyxrc;
 
+       // Dummy LyXAlignment support
+       enum LyXAlignment {
+               DUMMY
+       };
+
        // Keep the linker happy on Windows
        void lyx_exit(int) {}
 
@@ -24,4 +29,10 @@ namespace lyx {
 
                return lyx_messages;
        }
+
+       string alignmentToCSS(LyXAlignment)
+       {
+               return string();
+       }
+
 }

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 82eb68eb1b09a105199cf33bf6e0fb6be0f84b82..2a8b39e44f9d59b0c07424748b75f76e21188197 100644 (file)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -12,7 +12,6 @@ foreach(_f insets/InsetLayout.cpp Color.cpp Counters.cpp Floating.cpp
   list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
 endforeach()
 
-add_definitions(-DNO_LAYOUT_CSS)
 add_executable(check_layout ${check_layout_SOURCES})
 
 target_link_libraries(check_layout support

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index b1d7463b6eb4017fd5d53a7f93cecbd38e6dd530..789c3f86af5523ba69f4e6c1458afd7509d58e1b 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -30,7 +30,6 @@ include_directories(BEFORE
        ${ZLIB_INCLUDE_DIR})
 
 add_definitions(-DTEX2LYX)
-add_definitions(-DNO_LAYOUT_CSS)
 
 if(WIN32)
        set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 5b933a8d2f414b313a6305fc41bb62e931239a51..2f1c853ffb3f05aae119fc32e57e96ff5b7a567f 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -16,7 +16,7 @@ bin_PROGRAMS = tex2lyx
 
 DEFAULT_INCLUDES =
 
-AM_CPPFLAGS += -DTEX2LYX -DNO_LAYOUT_CSS $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
+AM_CPPFLAGS += -DTEX2LYX $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
        -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
 
 TEST_FILES = \

diff --git a/src/tex2lyx/dummy_impl.cpp b/src/tex2lyx/dummy_impl.cpp
index b20db6d9d6daad8053f80d04dfbbdaaa584041aa..6fb1a84b7611a68e0b91dc8613e54a06b90c579c 100644 (file)
--- a/src/tex2lyx/dummy_impl.cpp
+++ b/src/tex2lyx/dummy_impl.cpp
@@ -21,6 +21,7 @@
 #include "Format.h"
 #include "LaTeXFeatures.h"
 #include "LyXRC.h"
+#include "output_xhtml.h"
 
 #include "support/Messages.h"
 
@@ -115,6 +116,11 @@ bool LaTeXFeatures::isAvailable(string const &)
 }
 
 
+string alignmentToCSS(LyXAlignment)
+{
+       return string();
+}
+
 //
 // Keep the linker happy on Windows
 //