tex2lyx: support for beraserif.sty

[lyx.git] / src / tex2lyx / tex2lyx.h

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index f2bde2e8cb5fe1cd55608556d3aa723c2d6f9265..83f75df07e92b96d178cd19090a417e6c5b1cf32 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -53,6 +53,7 @@ extern std::string babel2lyx(std::string const & language);
 extern std::map<std::string, std::vector<std::string> > used_packages;
 extern const char * const modules_placeholder;
 extern std::string h_inputencoding;
+extern std::string h_paragraph_separation;
 
 /// in text.cpp
 std::string translate_len(std::string const &);
@@ -82,7 +83,7 @@ void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
 
 
 /// in tex2lyx.cpp
-std::string const trim(std::string const & a, char const * p = " \t\n\r");
+std::string const trimSpaceAndEol(std::string const & a);
 
 void split(std::string const & s, std::vector<std::string> & result,
        char delim = ',');
@@ -165,7 +166,7 @@ extern bool noweb_mode;
 /// Did we recognize any pdflatex-only construct?
 extern bool pdflatex;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 345;
+extern int const LYX_FORMAT;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();