reformatting and remove using delc

[lyx.git] / src / insets / insetquotes.C

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index e8e5bde31a2fb3a9882262c7e8307cb714b7b85e..99e19b1b9d807cdc15a4e1d03126b496c0d5ec79 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -31,15 +31,15 @@ using std::endl;
 // Quotes. Used for the various quotes. German, English, French,
 // Danish, Polish, all either double or single.
 
-extern BufferView * current_view;
+namespace {
 
 // codes used to read/write quotes to LyX files
-static char const * const language_char = "esgpfa";
-static char const * const side_char = "lr" ;
-static char const * const times_char = "sd";
+char const * const language_char = "esgpfa";
+char const * const side_char = "lr" ;
+char const * const times_char = "sd";
 
 // List of known quote chars
-static char const * const quote_char = ",'`<>";
+char const * const quote_char = ",'`<>";
 
 // Index of chars used for the quote. Index is [side, language]
 int quote_index[2][6] = {
@@ -47,21 +47,23 @@ int quote_index[2][6] = {
        { 1, 1, 2, 1, 4, 3 } };  // "`'`'><"
 
 // Corresponding LaTeX code, for double and single quotes.
-static char const * const latex_quote_t1[2][5] = 
+char const * const latex_quote_t1[2][5] = 
 { { "\\quotesinglbase{}",  "'", "`", 
     "\\guilsinglleft{}", "\\guilsinglright{}" }, 
   { ",,", "''", "``", "<<", ">>" } };
 
-static char const * const latex_quote_ot1[2][5] = 
+char const * const latex_quote_ot1[2][5] = 
 { { "\\quotesinglbase{}",  "'", "`", 
     "\\guilsinglleft{}", "\\guilsinglright{}" }, 
   { "\\quotedblbase{}", "''", "``",
     "\\guillemotleft{}", "\\guillemotright{}" } };
 
-static char const * const latex_quote_babel[2][5] = 
+char const * const latex_quote_babel[2][5] = 
 { { "\\glq{}",  "'", "`", "\\flq{}", "\\frq{}" },
   { "\\glqq{}", "''", "``", "\\flqq{}", "\\frqq{}" } };
 
+} // namespace anon
+
 
 InsetQuotes::InsetQuotes(string const & str)
 {
@@ -80,7 +82,7 @@ InsetQuotes::InsetQuotes(char c, BufferParams const & params)
        : language(params.quotes_language), times(params.quotes_times)
 {
        // Decide whether left or right 
-       switch(c) {
+       switch (c) {
        case ' ': case '(': case '{': case '[': case '-': case ':':
        case LyXParagraph::META_HFILL:
        case LyXParagraph::META_NEWLINE: 
@@ -141,14 +143,14 @@ void InsetQuotes::ParseString(string const & s)
 }
 
 
-string InsetQuotes::DispString() const
+string const InsetQuotes::DispString() const
 {
        string disp;
        disp += quote_char[quote_index[side][language]];
        if (times == InsetQuotes::DoubleQ)
                disp += disp;
 
-       if (lyxrc.font_norm == "iso8859-1") 
+       if (lyxrc.font_norm_type == LyXRC::ISO_8859_1)
                if (disp == "<<")
                        disp = '«';
                else if (disp == ">>")
@@ -188,9 +190,7 @@ int InsetQuotes::width(BufferView *, LyXFont const & font) const
 }
 
 
-//LyXFont InsetQuotes::ConvertFont(LyXFont font)
-// I really belive this should be
-LyXFont InsetQuotes::ConvertFont(LyXFont const & f)
+LyXFont const InsetQuotes::ConvertFont(LyXFont const & f) const
 {
        LyXFont font(f);
        // quotes-insets cannot be latex of any kind
@@ -231,17 +231,22 @@ void InsetQuotes::Read(Buffer const *, LyXLex & lex)
 }
 
 
-int InsetQuotes::Latex(Buffer const *, ostream & os,
+extern bool use_babel;
+
+int InsetQuotes::Latex(Buffer const * buf, ostream & os,
                       bool /*fragile*/, bool) const
 {
-       string doclang = 
-               current_view->buffer()->GetLanguage();
+       string const doclang = buf->GetLanguage()->lang();
        int quoteind = quote_index[side][language];
        string qstr;
        
        if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times][quoteind];
+#ifdef DO_USE_DEFAULT_LANGUAGE
        } else if (doclang == "default") {
+#else
+       } else if (!use_babel) {
+#endif
                qstr = latex_quote_ot1[times][quoteind];
        } else if (language == InsetQuotes::FrenchQ 
                 && times == InsetQuotes::DoubleQ
@@ -261,7 +266,7 @@ int InsetQuotes::Latex(Buffer const *, ostream & os,
 }
 
 
-int InsetQuotes::Ascii(Buffer const *, ostream & os) const
+int InsetQuotes::Ascii(Buffer const *, ostream & os, int) const
 {
        os << "\"";
        return 0;
@@ -277,7 +282,7 @@ int InsetQuotes::Linuxdoc(Buffer const *, ostream & os) const
 
 int InsetQuotes::DocBook(Buffer const *, ostream & os) const
 {
-       if(times == InsetQuotes::DoubleQ) {
+       if (times == InsetQuotes::DoubleQ) {
                if (side == InsetQuotes::LeftQ)
                        os << "&ldquo;";
                else
@@ -296,7 +301,7 @@ void InsetQuotes::Validate(LaTeXFeatures & features) const
 {
        char type = quote_char[quote_index[side][language]];
 
-       if (current_view->buffer()->GetLanguage() == "default" 
+       if (features.bufferParams().language->lang() == "default" 
            && lyxrc.fontenc != "T1") {
                if (times == InsetQuotes::SingleQ) 
                        switch (type) {
@@ -316,7 +321,7 @@ void InsetQuotes::Validate(LaTeXFeatures & features) const
 }
 
 
-Inset * InsetQuotes::Clone() const
+Inset * InsetQuotes::Clone(Buffer const &) const
 {
   return new InsetQuotes(language, side, times);
 }