The free_spacing patch and fix to the mess that Rob discovered.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7019 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index d7af305af00521b61eb3e1d5339df2195967a2fc..6ad0a5e4e5c453d4f0e4f610a854e5a63705e349 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -18,6 +18,22 @@
 
        * BufferView.[Ch] (removeAutoInsets): delete function
 
+2003-05-22  Angus Leeming  <leeming@lyx.org>
+
+       * latexrunparams.h: add a free_spacing variable.
+
+       * paragraph.[Ch] (simpleTeXOnePar): further fragile clean-up; no need
+       to pass moving_arg, as the data is stored in runparams.fragile.
+
+       * paragraph_funcs.C (TeXOnePar): no longer pass free_spacing arg
+       to Inset::latexOptional or to simpleTeXOnePar.
+
+       * paragraph_pimpl.C (simpleTeXSpecialChars): no longer pass
+       free_spacing arg to Inset::latexOptional.
+
+       * tabular.[Ch] (TeXLongtableHeaderFooter, TeXRow): no longer have
+       free_spacing arg.
+
 2003-05-22  Angus Leeming  <leeming@lyx.org>
 
        * latexrunparams.h: add fragile and use_babel variables.

diff --git a/src/buffer.C b/src/buffer.C
index 147316fc75d8e6f7f4e73b77017cc7ea5ddd1b04..4029eb400086354bfc87d51d7e900986ed763132 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1048,7 +1048,7 @@ void Buffer::makeLaTeXFile(ostream & os,
                texrow.newline();
        }
 
-       latexParagraphs(this, paragraphs, os, texrow, runparams, false);
+       latexParagraphs(this, paragraphs, os, texrow, runparams);
 
        // add this just in case after all the paragraphs
        os << endl;

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 16e88ec2ffd6c7b8df10d95227a119c2feb84dd6..4b9ac506ec0297e735f99c76fdacb0002ab04eb3 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-22  Angus Leeming  <leeming@lyx.org>
+
+       * PreviewLoader.C (dumpPreamble): no longer pass a free_spacing arg to
+       the inset::latex method.
+
 2003-05-22  Angus Leeming  <leeming@lyx.org>
 
        * PreviewLoader.C (dumpPreamble): no longer pass a fragile arg to

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index 9db9fdfd6b7ddb5a9114a4c08f1cc8f8decb6f33..04b8ccc14d4400280fd1a6ea699f4708f8667fb4 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -568,6 +568,7 @@ void PreviewLoader::Impl::dumpPreamble(ostream & os) const
        runparams.flavor = LatexRunParams::LATEX;
        runparams.nice = true;
        runparams.fragile = true;
+       runparams.free_spacing = true;
        tmp.makeLaTeXFile(os, buffer_.filePath(), runparams, false, true);
 
        // FIXME! This is a HACK! The proper fix is to control the 'true'
@@ -589,7 +590,7 @@ void PreviewLoader::Impl::dumpPreamble(ostream & os) const
 
        for (; it != end; ++it)
                if (it->lyxCode() == Inset::MATHMACRO_CODE)
-                       it->latex(&buffer_, os, runparams, true);
+                       it->latex(&buffer_, os, runparams);
 
        // All equation lables appear as "(#)" + preview.sty's rendering of
        // the label name

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index b77f0ab5678bd2bbf3c92d622aa643d3db39658f..8de0572b99361cf0dcc8310fcf5a66b5862da639 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -2,6 +2,11 @@
 
        * inseterror.C (localDispatch): comment out unused var.
 
+2003-05-22  Angus Leeming  <leeming@lyx.org>
+
+       * inset*.[Ch] (latex): no longer has a free_spacing arg. Data is now
+       passed through the LatexRunParams arg.
+
 2003-05-22  Angus Leeming  <leeming@lyx.org>
 
        * inset*.[Ch] (latex): no longer has a fragile arg. Data is now passed

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 5119b1fa291a3cf72c0da150e8e5f1b34ad4e823..6bc007f2327791580e30e7131d23074203828dd0 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -188,13 +188,9 @@ public:
        virtual void write(Buffer const *, std::ostream &) const = 0;
        ///
        virtual void read(Buffer const *, LyXLex & lex) = 0;
-       /** returns the number of rows (\n's) of generated tex code.
-           If the free_spc (freespacing) variable is set, then this inset
-           is in a free-spacing paragraph.
-       */
+       /// returns the number of rows (\n's) of generated tex code.
        virtual int latex(Buffer const *, std::ostream &,
-                         LatexRunParams const &,
-                         bool free_spc) const = 0;
+                         LatexRunParams const &) const = 0;
        ///
        virtual int ascii(Buffer const *,
                          std::ostream &, int linelen = 0) const = 0;

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index 0cbb94b61ba2e46085a4c4ae69b71a32ab026772..68dbbf29aa8cc26c4240b28b6038162b88b5780c 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -84,8 +84,7 @@ string const InsetBibtex::getScreenLabel(Buffer const *) const
 
 
 int InsetBibtex::latex(Buffer const * buffer, ostream & os,
-                      LatexRunParams const & runparams,
-                      bool/*fs*/) const
+                      LatexRunParams const & runparams) const
 {
        // changing the sequence of the commands
        // 1. \bibliographystyle{style}

diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h
index 47656595903cb44d954d29d1e84e8a74f9ba05a9..ee2b05774bf9b08bf02c02127a3d435ee4513828 100644 (file)
--- a/src/insets/insetbibtex.h
+++ b/src/insets/insetbibtex.h
@@ -39,8 +39,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::BIBTEX_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool freespace) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        void fillWithBibKeys(Buffer const *,
                std::vector<std::pair<string,string> > &) const;

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index f63bbe50837167e9ffbb7e320b17dd015ef019ac..da5afffce716705b8a31ece1ea912644194283db 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -106,8 +106,7 @@ void InsetCaption::draw(BufferView * bv, LyXFont const & f,
 
 
 int InsetCaption::latex(Buffer const * buf, ostream & os,
-                       LatexRunParams const & runparams,
-                       bool free_spc) const
+                       LatexRunParams const & runparams) const
 {
        // This is a bit too simplistic to take advantage of
        // caption options we must add more later. (Lgb)
@@ -115,7 +114,7 @@ int InsetCaption::latex(Buffer const * buf, ostream & os,
        // \caption{...}, later we will make it take advantage
        // of the one of the caption packages. (Lgb)
        ostringstream ost;
-       int const l = InsetText::latex(buf, ost, runparams, free_spc);
+       int const l = InsetText::latex(buf, ost, runparams);
        os << "\\caption{" << ost.str() << "}\n";
        return l + 1;
 }

diff --git a/src/insets/insetcaption.h b/src/insets/insetcaption.h
index ec18a641793e5043d9112cdc1749c51cc634058d..af616f662894dff6327f7d40419527b7e5dd440c 100644 (file)
--- a/src/insets/insetcaption.h
+++ b/src/insets/insetcaption.h
@@ -38,8 +38,7 @@ public:
                          int baseline, float & x) const;
        ///
        virtual int latex(Buffer const * buf, std::ostream & os,
-                         LatexRunParams const &,
-                         bool free_spc) const;
+                         LatexRunParams const &) const;
        ///
        int ascii(Buffer const * buf, std::ostream & os, int linelen) const;
        ///

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index b789b5b64c560071532b5f087f5496552997e7b5..9f153708487d5f5c54026dc96e0562417f7e0857 100644 (file)
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -354,8 +354,7 @@ int InsetCitation::ascii(Buffer const * buffer, ostream & os, int) const
 // citations and then changes his mind, turning natbib support off. The output
 // should revert to \cite[]{}
 int InsetCitation::latex(Buffer const * buffer, ostream & os,
-                        LatexRunParams const &,
-                        bool/*fs*/) const
+                        LatexRunParams const &) const
 {
        os << "\\";
        if (buffer->params.use_natbib)

diff --git a/src/insets/insetcite.h b/src/insets/insetcite.h
index a4eb1ef96931c7daa9ff188b611cb0b8c17d56a6..76f0b3628bc736e289f37965cd77e71aa42b33d5 100644 (file)
--- a/src/insets/insetcite.h
+++ b/src/insets/insetcite.h
@@ -37,8 +37,8 @@ public:
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        dispatch_result localDispatch(FuncRequest const & cmd);
        ///

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index b59ab6d7f8763e7d07d3366c78f1ca743319b2ff..92e80458e69effd11a1b178f1e198e0b49da4426 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -272,10 +272,9 @@ void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
 
 
 int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-                           LatexRunParams const & runparams,
-                           bool free_spc) const
+                           LatexRunParams const & runparams) const
 {
-       return inset.latex(buf, os, runparams, free_spc);
+       return inset.latex(buf, os, runparams);
 }
 
 

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 9c26829fa4d181d29c745a22eb99f94eb7168c24..2b33a90c956abc508e02aa407bbd794dbdccd9df 100644 (file)
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -79,8 +79,8 @@ public:
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int) const;
        ///

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index ee32fa3a76b892699bb45487bf72628c8d270649..f1235c1abc7ee2c2e65aaa710ef0934226499ac5 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -39,8 +39,8 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 }
 
 
-int InsetCommand::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                       bool/*fs*/) const
+int InsetCommand::latex(Buffer const *, ostream & os,
+                       LatexRunParams const &) const
 {
        os << getCommand();
        return 0;

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 8ee4be0ea6d38ae768afe4912803285c0e337721..6b734eebe1b47d352a9c6e01eec4962ed292587f 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -42,8 +42,7 @@ public:
        void scanCommand(string const & c) { p_.scanCommand(c); };
        ///
        virtual int latex(Buffer const *, std::ostream &,
-                         LatexRunParams const &,
-                         bool free_spc) const;
+                         LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index 1fc442dbe952c81807e732c6f011848d99d9ba32..15c239b44925b243c7806c8efd64a3d1867dfe0a 100644 (file)
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -66,8 +66,7 @@ string const InsetEnvironment::editMessage() const
 
 
 int InsetEnvironment::latex(Buffer const * buf, ostream & os,
-                           LatexRunParams const & runparams,
-                           bool) const
+                           LatexRunParams const & runparams) const
 {
        os << layout_->latexheader;
        TexRow texrow;

diff --git a/src/insets/insetenv.h b/src/insets/insetenv.h
index 2a8cd40e4cd6d0b0e031d76687a78174aaf49ac1..ed8e0665b9cebbc66e267fe8e48af960f3cf1ba3 100644 (file)
--- a/src/insets/insetenv.h
+++ b/src/insets/insetenv.h
@@ -30,8 +30,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::ENVIRONMENT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        string const editMessage() const;
        ///

diff --git a/src/insets/inseterror.h b/src/insets/inseterror.h
index a4b10e33ba483e6ac39e3670c554dee371f1269d..b490f2dba06d206b09102e6d93f0d27e1678d12e 100644 (file)
--- a/src/insets/inseterror.h
+++ b/src/insets/inseterror.h
@@ -38,8 +38,8 @@ public:
        ///
        void read(Buffer const *, LyXLex &) {}
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const { return 0; }
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const { return 0; }
        ///
        int ascii(Buffer const *, std::ostream &, int) const { return 0; }
        ///

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 45fcba114f74f6c1af31b7f7b35bb9fa5a5f6a20..aae3d97142c108431c3ada9752ba2b5c2ee4169e 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -323,8 +323,8 @@ void InsetERT::lfunMouseMotion(FuncRequest const & cmd)
 }
 
 
-int InsetERT::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                   bool /*free_spc*/) const
+int InsetERT::latex(Buffer const *, ostream & os,
+                   LatexRunParams const &) const
 {
        ParagraphList::iterator par = inset.paragraphs.begin();
        ParagraphList::iterator end = inset.paragraphs.end();

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 4264ad9094dbe972445c86352064df8034a2187b..8a9d2a98a2c52adc2635bda3bebb1f0aef8af28f 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -64,8 +64,8 @@ public:
        ///
        EDITABLE editable() const;
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *,
                          std::ostream &, int linelen = 0) const;

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 597b4b3b88acc75e1a7494db301bfa67908fe2a1..0ffdcc7973750debbb5b0b1ce56e481d43ce52f3 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -167,8 +167,7 @@ int InsetExternal::write(string const & format,
 
 
 int InsetExternal::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const &,
-                        bool) const
+                        LatexRunParams const &) const
 {
        return write("LaTeX", buf, os);
 }

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index 7223495874b670903a6b818b00fc389ee05b18e0..0806794fdf01afa75f7237691dc072ca7a0dd4a9 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -54,8 +54,7 @@ public:
         is in a free-spacing paragraph.
         */
        virtual int latex(Buffer const *, std::ostream &,
-                         LatexRunParams const &,
-                         bool free_spc) const;
+                         LatexRunParams const &) const;
        /// write ASCII output to the ostream
        virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
        /// write LinuxDoc output to the ostream

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index e4b1142b24c1bb6f3ebcf8fee7cf600d877993c7..d04f2e04283f1f8756f1d500662a7473d809a70c 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -272,8 +272,7 @@ string const InsetFloat::editMessage() const
 
 
 int InsetFloat::latex(Buffer const * buf, ostream & os,
-                     LatexRunParams const & runparams,
-                     bool fp) const
+                     LatexRunParams const & runparams) const
 {
        FloatList const & floats = buf->params.getLyXTextClass().floats();
        string const tmptype = (params_.wide ? params_.type + "*" : params_.type);
@@ -304,7 +303,7 @@ int InsetFloat::latex(Buffer const * buf, ostream & os,
        }
        os << '\n';
 
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        // The \n is used to force \end{<floatname>} to appear in a new line.
        // In this case, we do not case if the current output line is empty.

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index abc4d5f2953d0b15f62f46c86ce00e2913c53096..4e74486d40025a547e31bea3d7766155df4dd687 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -57,8 +57,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 8ade79ede210dcd37323e6c718e37019766015b6..3a4aeee2e89dbc38d9f21ca958925ca2370fa552 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -108,8 +108,7 @@ dispatch_result InsetFloatList::localDispatch(FuncRequest const & cmd)
 
 
 int InsetFloatList::latex(Buffer const * buf, ostream & os,
-                         LatexRunParams const &,
-                         bool) const
+                         LatexRunParams const &) const
 {
        FloatList const & floats = buf->params.getLyXTextClass().floats();
        FloatList::const_iterator cit = floats[getCmdName()];

diff --git a/src/insets/insetfloatlist.h b/src/insets/insetfloatlist.h
index be3253090a34a89ecfa1dc14281b6f8faf6144ec..2e1cfa18b6440de2ca8cf5d10315c20d21880c5c 100644 (file)
--- a/src/insets/insetfloatlist.h
+++ b/src/insets/insetfloatlist.h
@@ -44,8 +44,8 @@ public:
        ///
        void read(Buffer const *, LyXLex &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int linuxdoc(Buffer const *, std::ostream &) const { return 0; }
        ///

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index eb797063aefa5603d033f7925ef28a1c0863b0cc..bf9b21b62fe88d95979cd0b48d0895a4270ccbe6 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -59,8 +59,7 @@ string const InsetFoot::editMessage() const
 
 
 int InsetFoot::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams_in,
-                    bool fp) const
+                    LatexRunParams const & runparams_in) const
 {
        LatexRunParams runparams = runparams_in;
        if (buf && parOwner()) {
@@ -70,7 +69,7 @@ int InsetFoot::latex(Buffer const * buf, ostream & os,
 
        os << "%\n\\footnote{";
 
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
        os << "%\n}";
 
        return i + 2;

diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h
index 0990d632108f72f865453aae73dadd19143f0e88..14384cd411166d221cb34a07a9d22b0b8ae1ffac 100644 (file)
--- a/src/insets/insetfoot.h
+++ b/src/insets/insetfoot.h
@@ -31,8 +31,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::FOOT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index c111e404af998616b7ae447c72a3704da0b6ba1d..3517ec5b194e592b21469f17efe38dd2939f2449 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -673,8 +673,7 @@ string const InsetGraphics::prepareFile(Buffer const * buf,
 
 
 int InsetGraphics::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const & runparams,
-                        bool/*fs*/) const
+                        LatexRunParams const & runparams) const
 {
        // If there is no file specified or not existing,
        // just output a message about it in the latex output.

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index cc6c4e1aa82fdf10ad05f2c4f9cf4f30be04e26a..507dd08ccb373337d4fd198b039fe45e27a9e59c 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -49,8 +49,8 @@ public:
         #fragile == true# means, that the inset should take care about
         fragile commands by adding a #\protect# before.
         */
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insethfill.C b/src/insets/insethfill.C
index 98d50abe5e60a3b3efa9f4d80978ea0a2b509058..62f62f8b4ca54a714d9f2847993c3d0deaab6e7d 100644 (file)
--- a/src/insets/insethfill.C
+++ b/src/insets/insethfill.C
@@ -21,8 +21,8 @@ InsetHFill::InsetHFill()
 {}
 
 
-int InsetHFill::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                     bool /*fs*/) const
+int InsetHFill::latex(Buffer const *, ostream & os,
+                     LatexRunParams const &) const
 {
        os << getCommand();
        return 0;

diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h
index 31344e376a3db2a29b145f175941f325d35fe3f0..68d555f9236600c1fde0bdcedf4bb66832c63262 100644 (file)
--- a/src/insets/insethfill.h
+++ b/src/insets/insethfill.h
@@ -28,8 +28,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::HFILL_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index ccb2cd08cd9956dce5f82bb23be32bae7cd68be0..5af3b2ccb7d4eb200c42001885ca3059d2effc6f 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -286,8 +286,7 @@ bool InsetInclude::loadIfNeeded() const
 
 
 int InsetInclude::latex(Buffer const * buffer, ostream & os,
-                       LatexRunParams const & runparams,
-                       bool /*fs*/) const
+                       LatexRunParams const & runparams) const
 {
        string incfile(params_.cparams.getContents());
 
@@ -575,7 +574,7 @@ string const InsetInclude::PreviewImpl::latexString() const
        ostringstream os;
        LatexRunParams runparams;
        runparams.flavor = LatexRunParams::LATEX;
-       parent().latex(view()->buffer(), os, runparams, false);
+       parent().latex(view()->buffer(), os, runparams);
 
        return STRCONV(os.str());
 }

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 59c7ccc0e2f3b233fe275645ed089f20c29539a4..5263fdce43f5a538af88d1b6c78a06e9c5299ea0 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -91,8 +91,8 @@ public:
        ///
        void read(Buffer const *, LyXLex &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 60eb0f2d986094d407c082a4bf3a27af3ebd8f5f..8f6887eed65b3bbc28f0bd36c1f1b3109fd0d0bd 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -82,8 +82,8 @@ dispatch_result InsetLabel::localDispatch(FuncRequest const & cmd)
 }
 
 
-int InsetLabel::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                     bool /*fs*/) const
+int InsetLabel::latex(Buffer const *, ostream & os,
+                     LatexRunParams const &) const
 {
        os << escape(getCommand());
        return 0;

diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h
index 90b5377f1aaf41c1f860aa9105b61b51c5debe73..d0593b3b68d5266173874d182d4485150805c0da 100644 (file)
--- a/src/insets/insetlabel.h
+++ b/src/insets/insetlabel.h
@@ -36,8 +36,8 @@ public:
        ///
        std::vector<string> const getLabelList() const;
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 068e2110d6507e6a12a35d404925e4e2e79278cc..0ff4ce011cc8408d768925df578dcf1077bc1be0 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -622,8 +622,7 @@ void InsetLatexAccent::read(Buffer const *, LyXLex & lex)
 
 
 int InsetLatexAccent::latex(Buffer const *, ostream & os,
-                           LatexRunParams const &,
-                           bool/*fs*/) const
+                           LatexRunParams const &) const
 {
        os << contents;
        return 0;

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index b8dc7836ec659661eedc20cb02245424363670ea..dfb139efb3a78d7003e10df71aaa09b15f2495e1 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -49,8 +49,8 @@ public:
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetlist.C b/src/insets/insetlist.C
index 6b82f1982d5efb2eb0b24b68068d31488a8e5cc6..15c98b4e245881425544e35ef7cfb193f05fea28 100644 (file)
--- a/src/insets/insetlist.C
+++ b/src/insets/insetlist.C
@@ -63,11 +63,11 @@ string const InsetList::editMessage() const
 
 
 int InsetList::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams, bool fp) const
+                    LatexRunParams const & runparams) const
 {
        os << "\\footnote{%\n";
 
-       int i = inset.latex(buf, os, runparams, fp);
+       int i = inset.latex(buf, os, runparams);
        os << "}%\n";
 
        return i + 2;

diff --git a/src/insets/insetlist.h b/src/insets/insetlist.h
index 41a92d3afb3452325a3838fe8ee26a6b539aa730..2a43793f91b60e22272b3b1558d9b73a269921bc 100644 (file)
--- a/src/insets/insetlist.h
+++ b/src/insets/insetlist.h
@@ -27,8 +27,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::FOOT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        string const editMessage() const;
 };

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 7fd21d188fa2f1412ca2b9d362bbece929b3c2b9..174d7db8439a8bac2ef1d6f09349e2d18620616e 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -54,12 +54,11 @@ string const InsetMarginal::editMessage() const
 
 
 int InsetMarginal::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const & runparams,
-                        bool fp) const
+                        LatexRunParams const & runparams) const
 {
        os << "%\n\\marginpar{";
 
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
        os << "%\n}";
 
        return i + 2;

diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h
index 7ce18a7d49df8839ec571d2bf4ab9c3e0869d15b..a0c089f53d2565104d139a2b547a1d69c81ab71b 100644 (file)
--- a/src/insets/insetmarginal.h
+++ b/src/insets/insetmarginal.h
@@ -30,8 +30,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::MARGIN_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        string const editMessage() const;
 };

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 8e69267393a213268c1c2a7468ccbb86e3e03dc1..e12cb7fdeb1e8f3f3846a7cfbffe26b7651fee4e 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -251,8 +251,7 @@ string const InsetMinipage::editMessage() const
 
 
 int InsetMinipage::latex(Buffer const * buf, ostream & os,
-                        LatexRunParams const & runparams,
-                        bool fp) const
+                        LatexRunParams const & runparams) const
 {
        string s_pos;
        switch (params_.pos) {
@@ -269,7 +268,7 @@ int InsetMinipage::latex(Buffer const * buf, ostream & os,
        os << "\\begin{minipage}[" << s_pos << "]{"
           << params_.width.asLatexString() << "}%\n";
 
-       int i = inset.latex(buf, os, runparams, fp);
+       int i = inset.latex(buf, os, runparams);
 
        os << "\\end{minipage}%\n";
        return i + 2;

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index 7af83034effdd095dd2e416cf6c6129cbc178015..6be1f4f929d821ef1d57d498be8db0e852cff7a8 100644 (file)
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -72,8 +72,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::MINIPAGE_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        string const editMessage() const;
        ///

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index 6f07e43a1674b58689a276d7a9a4d28fe72d8903..6e92e72444b5782de6709599790ad784ff08a095 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -46,8 +46,8 @@ void InsetNewline::dimension(BufferView *, LyXFont const & font,
 }
 
 
-int InsetNewline::latex(Buffer const *, ostream &, LatexRunParams const &,
-                       bool) const
+int InsetNewline::latex(Buffer const *, ostream &,
+                       LatexRunParams const &) const
 {
        lyxerr << "Eek, calling InsetNewline::latex !" << endl;
        return 0;

diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h
index 33f8306f9a311973929205b0d4cdb97de1264b9a..5cebf1d21a0481eeabf5105bc0732cc8dd158ed4 100644 (file)
--- a/src/insets/insetnewline.h
+++ b/src/insets/insetnewline.h
@@ -32,8 +32,7 @@ public:
                          int baseline, float & x) const;
 
        virtual int latex(Buffer const *, std::ostream &,
-                         LatexRunParams const &,
-                         bool free_spc) const;
+                         LatexRunParams const &) const;
 
        virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
 

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 8a226a8c59e01154c7105865fcdd50d85982a420..6b340ac83c4727c3f301999a80115368f1194b23 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -33,8 +33,8 @@ public:
        ///
        void write(Buffer const *, std::ostream &) const;
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const
                { return 0; }
        ///
        int linuxdoc(Buffer const *, std::ostream &) const

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 04310bb17326ef9341b84032ce2199c5b40e9609..c25923bad17cc078f7a2c238665e318012ef688c 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -66,18 +66,18 @@ void InsetOptArg::write(Buffer const * buf, ostream & os) const
 }
 
 
-int InsetOptArg::latex(Buffer const *, ostream &, LatexRunParams const &,
-                      bool) const
+int InsetOptArg::latex(Buffer const *, ostream &,
+                      LatexRunParams const &) const
 {
        return 0;
 }
 
 
 int InsetOptArg::latexOptional(Buffer const * buf, ostream & os,
-                              LatexRunParams const & runparams, bool fp) const
+                              LatexRunParams const & runparams) const
 {
        os << '[';
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
        os << ']';
        return i + 2;
 }

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 5821665b3e0bb0bcbea731571118e6beddabc076..23249681866c4b60ea933aaa8c7dfcc43e00d5a1 100644 (file)
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -38,12 +38,11 @@ public:
        string const editMessage() const;
 
        /// Standard LaTeX output -- short-circuited
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        /// Outputting the optional parameter of a LaTeX command
        int latexOptional(Buffer const *, std::ostream &,
-                         LatexRunParams const &,
-                         bool fp) const;
+                         LatexRunParams const &) const;
        /// Write out tothe .lyx file
        void write(Buffer const * buf, std::ostream & os) const;
 };

diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C
index 339401f9fa95682f7b3d2f65ed32fed8e7e371fa..9ded7ca7c3af5884d9749e10931925f9d6d73fd3 100644 (file)
--- a/src/insets/insetparent.C
+++ b/src/insets/insetparent.C
@@ -55,10 +55,9 @@ dispatch_result InsetParent::localDispatch(FuncRequest const & cmd)
 
 // LaTeX must just ignore this command
 int InsetParent::latex(Buffer const * buf, ostream & os,
-                      LatexRunParams const & runparams,
-                      bool free_spc) const
+                      LatexRunParams const & runparams) const
 {
        os << "%%#{lyx}";
-       InsetCommand::latex(buf, os, runparams, free_spc);
+       InsetCommand::latex(buf, os, runparams);
        return 0;
 }

diff --git a/src/insets/insetparent.h b/src/insets/insetparent.h
index ba8dbd3a3fec4486d5b4f66983f10bdcfc849a49..ec2be9c618b6854ef9d24b4c5463f55aca8b2959 100644 (file)
--- a/src/insets/insetparent.h
+++ b/src/insets/insetparent.h
@@ -39,8 +39,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::PARENT_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        void setParent(string const & fn) { setContents(fn); }
 };

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 8d38abee11c711bbddd18ce309ccb38d8be01094..571adbf73b1e90f26170e509f592cb3f7fcfd1e9 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -239,8 +239,7 @@ void InsetQuotes::read(Buffer const *, LyXLex & lex)
 
 
 int InsetQuotes::latex(Buffer const * buf, ostream & os,
-                      LatexRunParams const & runparams,
-                      bool /* free_spc */) const
+                      LatexRunParams const & runparams) const
 {
        // How do we get the local language here??
        lyx::pos_type curr_pos = parOwner()->getPositionOfInset(this);

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index dbebf31cdc15e4f324222cb2c2d145d51576c021..f6e94e4b711300a9199ca35d816b99604ba614b5 100644 (file)
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -83,8 +83,8 @@ public:
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 973c5b8490b796ee724dd43d8b4f8f0c498f43c2..72cb13da36882dc05957a1bc76496c565ac74640 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -71,8 +71,8 @@ string const InsetRef::getScreenLabel(Buffer const *) const
 }
 
 
-int InsetRef::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                   bool /*fs*/) const
+int InsetRef::latex(Buffer const *, ostream & os,
+                   LatexRunParams const &) const
 {
        if (getOptions().empty())
                os << escape(getCommand());

diff --git a/src/insets/insetref.h b/src/insets/insetref.h
index 287c08e254529e1798e8b7199dc95da88130b19f..532c7eaa2a60a1dc4e634a12e3209b776436df85 100644 (file)
--- a/src/insets/insetref.h
+++ b/src/insets/insetref.h
@@ -54,8 +54,8 @@ public:
        ///
        bool display() const { return false; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index 135e994c9853325c09e9a4aa00c8e3c6fb272119..0799bad7ffab7d1368524c12347085e24228f8b4 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -18,6 +18,7 @@
 #include "debug.h"
 #include "dimension.h"
 #include "LaTeXFeatures.h"
+#include "latexrunparams.h"
 #include "BufferView.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
@@ -156,33 +157,33 @@ void InsetSpace::read(Buffer const *, LyXLex & lex)
 }
 
 
-int InsetSpace::latex(Buffer const *, ostream & os, LatexRunParams const &,
-                     bool free_space) const
+int InsetSpace::latex(Buffer const *, ostream & os,
+                     LatexRunParams const & runparams) const
 {
        switch (kind_) {
        case NORMAL:
-               os << (free_space ? " " : "\\ ");
+               os << (runparams.free_spacing ? " " : "\\ ");
                break;
        case PROTECTED:
-               os << (free_space ? ' ' : '~');
+               os << (runparams.free_spacing ? ' ' : '~');
                break;
        case THIN:
-               os << (free_space ? " " : "\\,");
+               os << (runparams.free_spacing ? " " : "\\,");
                break;
        case QUAD:
-               os << (free_space ? " " : "\\quad{}");
+               os << (runparams.free_spacing ? " " : "\\quad{}");
                break;
        case QQUAD:
-               os << (free_space ? " " : "\\qquad{}");
+               os << (runparams.free_spacing ? " " : "\\qquad{}");
                break;
        case ENSPACE:
-               os << (free_space ? " " : "\\enspace{}");
+               os << (runparams.free_spacing ? " " : "\\enspace{}");
                break;
        case ENSKIP:
-               os << (free_space ? " " : "\\enskip{}");
+               os << (runparams.free_spacing ? " " : "\\enskip{}");
                break;
        case NEGTHIN:
-               os << (free_space ? " " : "\\negthinspace{}");
+               os << (runparams.free_spacing ? " " : "\\negthinspace{}");
                break;
        }
        return 0;

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 69c277056388cdee1e89116273416fb10ef6cd14..606996f4a5356670541a5de2b990b1af0eff27b1 100644 (file)
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -61,8 +61,8 @@ public:
        /// Will not be used when lyxf3
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index b23d5d12ccb8397db8446f22c4475a89c5cb12fd..15519f374e60ee51dc29b13be36b393b07544702 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -161,8 +161,7 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
 
 
 int InsetSpecialChar::latex(Buffer const *, ostream & os,
-                           LatexRunParams const &,
-                           bool free_space) const
+                           LatexRunParams const &) const
 {
        switch (kind_) {
        case HYPHENATION:

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index ec196630601482475789bbc22faceaedf07c041d..d8ec503700e640e19cbb4a2dfad97d7d790151a7 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -54,8 +54,8 @@ public:
        /// Will not be used when lyxf3
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 4ab0c9cb42c5e11294404b0c4bfd26b89b8360ee..cec7de014a5e3d16e97a47c54161beccbf8c4a4b 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1193,10 +1193,9 @@ Inset::RESULT InsetTabular::localDispatch(FuncRequest const & cmd)
 
 
 int InsetTabular::latex(Buffer const * buf, ostream & os,
-                       LatexRunParams const & runparams,
-                       bool fp) const
+                       LatexRunParams const & runparams) const
 {
-       return tabular->latex(buf, os, runparams, fp);
+       return tabular->latex(buf, os, runparams);
 }
 
 

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index a948052efe4aca4ef71fd9ec35dd126f65c60a6b..3a3199c8a835993645444601f0cbec99f8cbf84e 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -125,8 +125,8 @@ public:
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 675a14f727e2cd2743b8c681bb6cf217804a48e9..981629234425abf861b8f0d1c8a444929a4aa24f 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -1448,8 +1448,7 @@ Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
 
 
 int InsetText::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams,
-                    bool) const
+                    LatexRunParams const & runparams) const
 {
        TexRow texrow;
        latexParagraphs(buf, paragraphs, os, texrow, runparams);

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index 8565d1da2679b31bcee72c7aad39647f3a0d2e10..c42a2d0bae9387b7fa4ac337290d29861aa0bb8e 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -112,8 +112,8 @@ public:
        ///
        RESULT localDispatch(FuncRequest const &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insettheorem.C b/src/insets/insettheorem.C
index b0810ea92aebfb1a94c5480d6773301bb432bd5b..a5070d80510654d6224d4f2a918011a90b128b1b 100644 (file)
--- a/src/insets/insettheorem.C
+++ b/src/insets/insettheorem.C
@@ -72,11 +72,11 @@ string const InsetTheorem::editMessage() const
 
 
 int InsetTheorem::latex(Buffer const * buf, ostream & os,
-                       LatexRunParams const & runparams, bool fp) const
+                       LatexRunParams const & runparams) const
 {
        os << "\\begin{theorem}%\n";
 
-       int i = inset.latex(buf, os, runparams, fp);
+       int i = inset.latex(buf, os, runparams);
        os << "\\end{theorem}%\n";
 
        return i + 2;

diff --git a/src/insets/insettheorem.h b/src/insets/insettheorem.h
index 5a070908f25cdcdedcf1dbf3a3eb521ddc2d5ad2..bbb09b7920530b6a2c6f13488bf9dc447cd68f9a 100644 (file)
--- a/src/insets/insettheorem.h
+++ b/src/insets/insettheorem.h
@@ -31,8 +31,8 @@ public:
        ///
        bool display() const { return true; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        string const editMessage() const;
 };

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index fd272a4b6011e77e6c08e025ad573b369e6ab759..0b1aa1e038f8dbcdc4efa5b6d12478773f3fe5b4 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -72,8 +72,7 @@ string const InsetUrl::getScreenLabel(Buffer const *) const
 
 
 int InsetUrl::latex(Buffer const *, ostream & os,
-                   LatexRunParams const & runparams,
-                   bool /*free_spc*/) const
+                   LatexRunParams const & runparams) const
 {
        if (!getOptions().empty())
                os << getOptions() + ' ';

diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h
index d9052ae7fd6f68f19bb93d832d35392e275b7c39..dd93b7bc84751ea54ce2bea53da9d380e00ce34e 100644 (file)
--- a/src/insets/inseturl.h
+++ b/src/insets/inseturl.h
@@ -43,8 +43,8 @@ public:
        ///
        bool display() const { return false; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 21b14a0867181938957a79450e52ea3f2bc8b4c0..97cd8d3b05a1c9da97df24d453318aab11e5c9ff 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -193,8 +193,7 @@ string const InsetWrap::editMessage() const
 
 
 int InsetWrap::latex(Buffer const * buf, ostream & os,
-                    LatexRunParams const & runparams,
-                    bool fp) const
+                    LatexRunParams const & runparams) const
 {
        os << "\\begin{floating" << params_.type << '}';
        if (!params_.placement.empty()) {
@@ -202,7 +201,7 @@ int InsetWrap::latex(Buffer const * buf, ostream & os,
        }
        os  << '{' << params_.width.asLatexString() << "}%\n";
 
-       int const i = inset.latex(buf, os, runparams, fp);
+       int const i = inset.latex(buf, os, runparams);
 
        os << "\\end{floating" << params_.type << "}%\n";
        return i + 2;

diff --git a/src/insets/insetwrap.h b/src/insets/insetwrap.h
index a936c54e782d1a7bd03e71e440270ed387672f01..a6c029190ff4fb0191067629323a8fc3b7ddd790 100644 (file)
--- a/src/insets/insetwrap.h
+++ b/src/insets/insetwrap.h
@@ -55,8 +55,8 @@ public:
        ///
        Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool fp) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
        ///

diff --git a/src/latexrunparams.h b/src/latexrunparams.h
index 7ca181f4b683d9252064d9a8a1d0edecd7aa72ea..39c46ace1d36255f2cbf716e5b565f885da17214 100644 (file)
--- a/src/latexrunparams.h
+++ b/src/latexrunparams.h
@@ -19,7 +19,8 @@ struct LatexRunParams {
         };
 
         LatexRunParams() : flavor(LATEX), nice(false),
-                          fragile(false), use_babel(false) {}
+                          fragile(false), free_spacing(false),
+                          use_babel(false) {}
 
        /** The latex that we export depends occasionally on what is to
            compile the file.
@@ -38,6 +39,11 @@ struct LatexRunParams {
        */
        bool fragile;
 
+       /** free_spacing == true means that the inset is in a free-spacing
+           paragraph.
+       */
+       bool free_spacing;
+       
        /** This var is set by the return value from BufferParams::writeLaTeX
         */
        bool use_babel;

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 69b43a3c2edefaf245282c5ce8a837ba811b90e3..b4c07a81a654e3a26fa0f1862efd3faa1bd8e768 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-22  Angus Leeming  <leeming@lyx.org>
+
+       * formula.[Ch] (latex):
+       * formulamacro.[Ch] (latex):
+       no longer have a free_spacing arg. Data is now passed through the
+       LatexRunParams arg.
+
 2003-05-22  Angus Leeming  <leeming@lyx.org>
 
        * formula.[Ch] (latex):

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 6e362b4baa0ec5699bf919903311941a3647f301..85571b1c07e5f36c44606904422ef1ec509a701a 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -129,8 +129,7 @@ void InsetFormula::write(Buffer const *, ostream & os) const
 
 
 int InsetFormula::latex(Buffer const *, ostream & os,
-                       LatexRunParams const & runparams,
-                       bool) const
+                       LatexRunParams const & runparams) const
 {
        WriteStream wi(os, runparams.fragile, true);
        par_->write(wi);

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 2e1c7fa9c3f431f6a078293c749f97d0ce1bd438..fc3b49fbabfbd46b4f63d81b81d6785c1203599f 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -44,8 +44,8 @@ public:
        ///
        void read(Buffer const *, LyXLex & lex);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 3c76fed129a7765ba547bf237d5de400a44e49df..71598df0130cba89316272b326e8ff4434f6f53d 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -81,8 +81,7 @@ void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 
 
 int InsetFormulaMacro::latex(Buffer const *, ostream & os,
-                            LatexRunParams const & runparams,
-                            bool /*free_spacing*/) const
+                            LatexRunParams const & runparams) const
 {
        WriteStream wi(os, runparams.fragile, true);
        par()->write(wi);

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 4a0fcb7d3dd1fca8558023aab5c7b733270ba0b3..0b73fb94aec71bede60970fe74c9d85ba1e53044 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -44,8 +44,8 @@ public:
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int latex(Buffer const *, std::ostream & os, LatexRunParams const &,
-                 bool free_spc) const;
+       int latex(Buffer const *, std::ostream & os,
+                 LatexRunParams const &) const;
        ///
        int linuxdoc(Buffer const *, std::ostream & os) const;
        ///

diff --git a/src/paragraph.C b/src/paragraph.C
index 06cc0b128221cefae0c45733057b71769af67526..3b3b7fdf4bd8f11dc637e9fd50be6d3ca02f9671 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -915,8 +915,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                BufferParams const & bparams,
                                LyXFont const & outerfont,
                                ostream & os, TexRow & texrow,
-                               LatexRunParams const & runparams,
-                               bool moving_arg)
+                               LatexRunParams const & runparams)
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
@@ -960,7 +959,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                basefont = getLayoutFont(bparams, outerfont);
        }
 
-       moving_arg |= style->needprotect;
+       bool fragile = runparams.fragile;
+       fragile |= style->needprotect;
 
        // Which font is currently active?
        LyXFont running_font(basefont);
@@ -978,7 +978,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        ++column;
                }
                if (!asdefault)
-                       column += startTeXParParams(bparams, os, moving_arg);
+                       column += startTeXParParams(bparams, os, fragile);
 
        }
 
@@ -1003,7 +1003,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
                        if (!asdefault)
                                column += startTeXParParams(bparams, os,
-                                                           moving_arg);
+                                                           fragile);
                }
 
                value_type c = getChar(i);
@@ -1062,7 +1062,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                running_change = change;
 
                LatexRunParams rp = runparams;
-               rp.fragile = moving_arg;
+               rp.fragile = fragile;
+               rp.free_spacing = style->free_spacing;
                pimpl_->simpleTeXSpecialChars(buf, bparams,
                                              os, texrow, runparams,
                                              font, running_font,
@@ -1103,7 +1104,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        }
 
        if (!asdefault) {
-               column += endTeXParParams(bparams, os, moving_arg);
+               column += endTeXParParams(bparams, os, fragile);
        }
 
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;

diff --git a/src/paragraph.h b/src/paragraph.h
index d82b4dc47909163109637a03b13d4663d38b0030..3b822aa561fab778693599a2fd16f20d7ea59033 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -100,8 +100,7 @@ public:
        ///
        bool simpleTeXOnePar(Buffer const *, BufferParams const &,
                             LyXFont const & outerfont, std::ostream &,
-                            TexRow & texrow, LatexRunParams const &,
-                            bool moving_arg);
+                            TexRow & texrow, LatexRunParams const &);
 
        ///
        bool hasSameLayout(Paragraph const & par) const;

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 9f08b624cb6ad7fdb7fab8e6a3c9ce1e89cadf45..c6b92bb839600d259497fcb09b4128220384366c 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -15,7 +15,6 @@
 #include "buffer.h"
 #include "ParagraphParameters.h"
 #include "lyxtextclasslist.h"
-#include "latexrunparams.h"
 #include "debug.h"
 #include "gettext.h"
 #include "language.h"
@@ -304,7 +303,7 @@ TeXDeeper(Buffer const * buf,
                                             os, texrow, runparams);
                } else {
                        par = TeXOnePar(buf, paragraphs, par,
-                                            os, texrow, runparams, false);
+                                            os, texrow, runparams);
                }
        }
        lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
@@ -378,7 +377,7 @@ TeXEnvironment(Buffer const * buf,
        }
        ParagraphList::iterator par = pit;
        do {
-               par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams, false);
+               par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
 
                if (par != paragraphs.end()&& par->params().depth() > pit->params().depth()) {
                            if (par->layout()->isParagraph()) {
@@ -552,8 +551,7 @@ TeXOnePar(Buffer const * buf,
                if (style->optionalargs == 1) {
                        InsetOptArg * it = optArgInset(*pit);
                        if (it)
-                               it->latexOptional(buf, os, runparams,
-                                                 false);
+                               it->latexOptional(buf, os, runparams);
                }
                else
                        os << style->latexparam();
@@ -572,8 +570,7 @@ TeXOnePar(Buffer const * buf,
        os << everypar;
        bool need_par = pit->simpleTeXOnePar(buf, bparams,
                                             outerFont(pit, paragraphs),
-                                            os, texrow, runparams,
-                                            runparams.fragile);
+                                            os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
        // character if this has another size as the default.

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index d48015c7159f488ae27fa96a38088e53921f62ce..50d7d5399a9991ab288b5f7cbb1f27f0d1adf58a 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -581,8 +581,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                        running_font = basefont;
                }
 
-               int tmp = inset->latex(buf, os, runparams,
-                                      style.free_spacing);
+               int tmp = inset->latex(buf, os, runparams);
 
                if (close)
                        os << '}';

diff --git a/src/tabular.C b/src/tabular.C
index 296288fc1113b6bf276c0853ea9785c962ac53dc..51330930dc0c0469f88b5c34a4f404cc3c02680c 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1872,8 +1872,7 @@ int LyXTabular::TeXCellPostamble(ostream & os, int cell) const
 
 
 int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
-                                        LatexRunParams const & runparams,
-                                        bool fp) const
+                                        LatexRunParams const & runparams) const
 {
        if (!is_long_tabular)
                return 0;
@@ -1887,7 +1886,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
                }
                for (int i = 0; i < rows_; ++i) {
                        if (row_info[i].endhead) {
-                               ret += TeXRow(os, i, buf, runparams, fp);
+                               ret += TeXRow(os, i, buf, runparams);
                        }
                }
                if (endhead.bottomDL) {
@@ -1909,7 +1908,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
                }
                for (int i = 0; i < rows_; ++i) {
                        if (row_info[i].endfirsthead) {
-                               ret += TeXRow(os, i, buf, runparams, fp);
+                               ret += TeXRow(os, i, buf, runparams);
                        }
                }
                if (endfirsthead.bottomDL) {
@@ -1927,7 +1926,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
                }
                for (int i = 0; i < rows_; ++i) {
                        if (row_info[i].endfoot) {
-                               ret += TeXRow(os, i, buf, runparams, fp);
+                               ret += TeXRow(os, i, buf, runparams);
                        }
                }
                if (endfoot.bottomDL) {
@@ -1949,7 +1948,7 @@ int LyXTabular::TeXLongtableHeaderFooter(ostream & os, Buffer const * buf,
                }
                for (int i = 0; i < rows_; ++i) {
                        if (row_info[i].endlastfoot) {
-                               ret += TeXRow(os, i, buf, runparams, fp);
+                               ret += TeXRow(os, i, buf, runparams);
                        }
                }
                if (endlastfoot.bottomDL) {
@@ -1973,7 +1972,7 @@ bool LyXTabular::isValidRow(int const row) const
 
 
 int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
-                      LatexRunParams const & runparams, bool fp) const
+                      LatexRunParams const & runparams) const
 {
        int ret = 0;
        int cell = GetCellNumber(i, 0);
@@ -1990,7 +1989,7 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
 
                if (rtl)
                        os << "\\R{";
-               ret += inset->latex(buf, os, runparams, fp);
+               ret += inset->latex(buf, os, runparams);
                if (rtl)
                        os << '}';
 
@@ -2009,7 +2008,7 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
 
 
 int LyXTabular::latex(Buffer const * buf, ostream & os,
-                     LatexRunParams const & runparams, bool fp) const
+                     LatexRunParams const & runparams) const
 {
        int ret = 0;
 
@@ -2083,7 +2082,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
        os << "}\n";
        ++ret;
 
-       ret += TeXLongtableHeaderFooter(os, buf, runparams, fp);
+       ret += TeXLongtableHeaderFooter(os, buf, runparams);
 
        //+---------------------------------------------------------------------
        //+                      the single row and columns (cells)            +
@@ -2091,7 +2090,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
 
        for (int i = 0; i < rows_; ++i) {
                if (isValidRow(i)) {
-                       ret += TeXRow(os, i, buf, runparams, fp);
+                       ret += TeXRow(os, i, buf, runparams);
                        if (is_long_tabular && row_info[i].newpage) {
                                os << "\\newpage\n";
                                ++ret;

diff --git a/src/tabular.h b/src/tabular.h
index bf786d4dedb917211705cd30d9474db41b307cfb..dd18d9dbd47731bd8a57ab0772ee24382d0c3924 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -291,8 +291,8 @@ public:
        ///
        void Read(Buffer const *, LyXLex &);
        ///
-       int latex(Buffer const *, std::ostream &, LatexRunParams const &,
-                 bool) const;
+       int latex(Buffer const *, std::ostream &,
+                 LatexRunParams const &) const;
        ///
        int docbook(Buffer const * buf, std::ostream & os, bool mixcont) const;
        ///
@@ -561,12 +561,12 @@ private:
        int TeXCellPostamble(std::ostream &, int cell) const;
        ///
        int TeXLongtableHeaderFooter(std::ostream &, Buffer const * buf,
-                                    LatexRunParams const &, bool fp) const;
+                                    LatexRunParams const &) const;
        ///
        bool isValidRow(int const row) const;
        ///
        int TeXRow(std::ostream &, int const row, Buffer const * buf,
-                  LatexRunParams const &, bool fp) const;
+                  LatexRunParams const &) const;
        ///
        // helper function for ASCII returns number of newlines
        ///