anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 2014 (lyxline font size)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10431 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-09-09 11:04:53 +00:00
parent 6c3d48c0c6
commit afed118a7b
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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> 2005-09-08 Martin Vermeer <martin.vermeer@hut.fi>
* buffer_funcs.C: * buffer_funcs.C:

5
src/insets/ChangeLog
View File

@ -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> 2005-08-09 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* insettabular.C (tabularFeatures): don't force alignment to BLOCK * insettabular.C (tabularFeatures): don't force alignment to BLOCK

11
src/insets/insetline.C
View File

@ -53,16 +53,9 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
int InsetLine::latex(Buffer const &, ostream & os, int InsetLine::latex(Buffer const &, ostream & os,
OutputParams const &) const OutputParams const & runparams) const
{ {
os << "\\lyxline{}"; os << "\\lyxline{\\" << runparams.local_font->latexSize() << '}';
/* was:
os << "\\lyxline{\\"
<< pit->getFont(bparams, 0, outerFont(pit, paragraphs)).latexSize()
<< "}\\vspace{-1\\parskip}";
*/
return 0; return 0;
} }

2
src/insets/insetquotes.C
View File

@ -270,7 +270,7 @@ int InsetQuotes::latex(Buffer const &, ostream & os,
string qstr; string qstr;
if (language_ == FrenchQ && times_ == DoubleQ if (language_ == FrenchQ && times_ == DoubleQ
&& prefixIs(runparams.local_language->code(), "fr")) { && prefixIs(runparams.local_font->language()->code(), "fr")) {
if (side_ == LeftQ) if (side_ == LeftQ)
qstr = "\\og "; //the spaces are important here qstr = "\\og "; //the spaces are important here
else else

2
src/outputparams.C
View File

@ -16,7 +16,7 @@
OutputParams::OutputParams() OutputParams::OutputParams()
: flavor(LATEX), nice(false), moving_arg(false), : 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), linelen(0), depth(0),
exportdata(new ExportData) exportdata(new ExportData)
{} {}

10
src/outputparams.h
View File

@ -19,7 +19,7 @@
class ExportData; class ExportData;
class Language; class LyXFont;
class OutputParams { class OutputParams {
@ -48,19 +48,19 @@ public:
/** moving_arg == true means that the environment in which the inset /** moving_arg == true means that the environment in which the inset
is typeset is a moving argument. The inset should take care about 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; bool moving_arg;
/** intitle == true means that the environment in which the /** 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. Footnotes in such environments have moving arguments.
*/ */
bool intitle; 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 /** Document language babel name
*/ */

2
src/paragraph.C
View File

@ -1013,7 +1013,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf,
if (output || running_change != Change::DELETED) { if (output || running_change != Change::DELETED) {
OutputParams rp = runparams; OutputParams rp = runparams;
rp.free_spacing = style->free_spacing; rp.free_spacing = style->free_spacing;
rp.local_language = font.language(); rp.local_font = &font;
rp.intitle = style->intitle; rp.intitle = style->intitle;
pimpl_->simpleTeXSpecialChars(buf, bparams, pimpl_->simpleTeXSpecialChars(buf, bparams,
os, texrow, rp, os, texrow, rp,