fix bug 2014 (lyxline font size)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index bb392f187974c63f23f7c09b77be43a5a804f8f9..f54846e231837b3a1df7d763b0a84edd1cda3e10 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * outputparams.[Ch]: store local_font instead of local_language
+       * paragraph.C (simpleTeXOnePar): adapt to the change above
+
 2005-09-08  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * buffer_funcs.C:

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index fe005765c806d0f9c655da2b544d8688ed24f9a0..9f2ebcfdaec3263ebd9a5cece96ffd1b027e2292 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-07  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * insetline.C (latex): write the size argument of \lyxline again
+       * insetquotes.C (latex): adapt to OutputParams changes
+
 2005-08-09  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * insettabular.C (tabularFeatures): don't force alignment to BLOCK

diff --git a/src/insets/insetline.C b/src/insets/insetline.C
index a2e5d1384338a6296b666e92064a357a462bea47..5f02e2cc7eb674ca62cd665a3ee44bd1513a4f7b 100644 (file)
--- a/src/insets/insetline.C
+++ b/src/insets/insetline.C
@@ -53,16 +53,9 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 
 
 int InsetLine::latex(Buffer const &, ostream & os,
-                       OutputParams const &) const
+                       OutputParams const & runparams) const
 {
-       os << "\\lyxline{}";
-
-/* was:
-       os << "\\lyxline{\\"
-                << pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
-                << "}\\vspace{-1\\parskip}";
-*/
-
+       os << "\\lyxline{\\" << runparams.local_font->latexSize() << '}';
        return 0;
 }
 

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 4cd7bd5bf44c68bccfde9b184615881994708e1b..a5f16116903735157e72750705e38eaa4be22842 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -270,7 +270,7 @@ int InsetQuotes::latex(Buffer const &, ostream & os,
        string qstr;
 
        if (language_ == FrenchQ && times_ == DoubleQ
-           && prefixIs(runparams.local_language->code(), "fr")) {
+           && prefixIs(runparams.local_font->language()->code(), "fr")) {
                if (side_ == LeftQ)
                        qstr = "\\og "; //the spaces are important here
                else

diff --git a/src/outputparams.C b/src/outputparams.C
index 25fd6b664a83349cad463cfcda88e291a9fa3deb..817f6d95919763f2543912219d845f580ebb0040 100644 (file)
--- a/src/outputparams.C
+++ b/src/outputparams.C
@@ -16,7 +16,7 @@
 
 OutputParams::OutputParams()
        : flavor(LATEX), nice(false), moving_arg(false),
-         free_spacing(false), use_babel(false),
+         local_font(0), free_spacing(false), use_babel(false),
          linelen(0), depth(0),
          exportdata(new ExportData)
 {}

diff --git a/src/outputparams.h b/src/outputparams.h
index d3974fd3258f5128551b0b3779ddee9792dcdd7a..c5307ff75eff4374f75af6ba8badc5c9368a939f 100644 (file)
--- a/src/outputparams.h
+++ b/src/outputparams.h
@@ -19,7 +19,7 @@
 
 
 class ExportData;
-class Language;
+class LyXFont;
 
 
 class OutputParams {
@@ -48,19 +48,19 @@ public:
 
        /** moving_arg == true means that the environment in which the inset
            is typeset is a moving argument. The inset should take care about
-           fragile commands by preceding the latex with \protect.
+           fragile commands by preceding the latex with \\protect.
        */
        bool moving_arg;
 
        /** intitle == true means that the environment in which the
-           inset is typeset is part of a title (before a \maketitle).
+           inset is typeset is part of a title (before a \\maketitle).
            Footnotes in such environments have moving arguments.
        */
        bool intitle;
 
-       /** the language at the point where the inset is
+       /** the font at the point where the inset is
         */
-       Language const * local_language;
+       LyXFont const * local_font;
 
        /** Document language babel name
         */

diff --git a/src/paragraph.C b/src/paragraph.C
index 12d91ccb62e2ebff0719d0f532f6b95be1cf62cd..795047c923b4b0adfe59725ef7cb1409b7bd3c90 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1013,7 +1013,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                if (output || running_change != Change::DELETED) {
                        OutputParams rp = runparams;
                        rp.free_spacing = style->free_spacing;
-                       rp.local_language = font.language();
+                       rp.local_font = &font;
                        rp.intitle = style->intitle;
                        pimpl_->simpleTeXSpecialChars(buf, bparams,
                                                os, texrow, rp,