From 16e1f90daad4974183e6a9766d3f0391ac9bcf0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 13 Oct 2003 02:10:45 +0000 Subject: [PATCH] ws changes only git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7903 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 7 +++++++ src/insets/ExternalSupport.C | 2 +- src/insets/ExternalTransforms.C | 2 +- src/insets/insetbox.C | 30 +++++++++++++++--------------- src/insets/insetbox.h | 4 ++-- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index c6ee2bb084..b4bb50ed24 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2003-10-13 Lars Gullik Bjønnes + + * ExternalSupport.C: + * ExternalTransforms.C: + * insetbox.C: + * insetbox.h: ws changes only + 2003-10-13 Lars Gullik Bjønnes * insetinclude.C (localDispatch): do not call diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C index 155f8b49e4..a84d0a0dd8 100644 --- a/src/insets/ExternalSupport.C +++ b/src/insets/ExternalSupport.C @@ -237,7 +237,7 @@ int writeExternal(InsetExternalParams const & params, support::MakeAbsPath(params.filename.mangledFilename(), buffer.temppath()); } - + string str = doSubstitution(params, buffer, cit->second.product, from_file); str = substituteCommands(params, str, format); diff --git a/src/insets/ExternalTransforms.C b/src/insets/ExternalTransforms.C index 3a82d937eb..79f2d16ebb 100644 --- a/src/insets/ExternalTransforms.C +++ b/src/insets/ExternalTransforms.C @@ -280,7 +280,7 @@ string const sanitizeLatexOption(string const & input) } output += what.str(1) + ","; it = what[3].first; - } + } // Strip any trailing commas // "...foo,,,]" -> "...foo" diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C index 147edf5763..62748c2274 100644 --- a/src/insets/insetbox.C +++ b/src/insets/insetbox.C @@ -225,13 +225,13 @@ int InsetBox::latex(Buffer const & buf, ostream & os, break; } } - + int i = 0; os << "%\n"; // Adapt to column/text width correctly also if paragraphs indented: if (stdwidth) os << "\\noindent"; - + switch (btype) { case Frameless: break; @@ -248,7 +248,7 @@ int InsetBox::latex(Buffer const & buf, ostream & os, if (params_.hor_pos != 'c') os << "[" << params_.hor_pos << "]"; } - + os << "{"; break; case ovalbox: @@ -298,7 +298,7 @@ int InsetBox::latex(Buffer const & buf, ostream & os, else os << "%\n\\end{minipage}"; } - + switch (btype) { case Frameless: break; @@ -313,9 +313,9 @@ int InsetBox::latex(Buffer const & buf, ostream & os, case Shadowbox: os << "}"; break; - } + } os << "%\n"; - + i += 3; return i; @@ -485,7 +485,7 @@ void InsetBoxParams::read(LyXLex & lex) } string token; if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "position") { @@ -498,7 +498,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "hor_pos") { @@ -509,7 +509,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "has_inner_box") { @@ -521,7 +521,7 @@ void InsetBoxParams::read(LyXLex & lex) } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "inner_pos") { @@ -533,7 +533,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "use_parbox") { @@ -544,7 +544,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "width") { @@ -555,7 +555,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "special") { @@ -566,7 +566,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "height") { @@ -577,7 +577,7 @@ void InsetBoxParams::read(LyXLex & lex) lex.pushToken(token); } if (!lex.isOK()) - return; + return; lex.next(); token = lex.getString(); if (token == "height_special") { diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h index c632653ad8..4dcf775a61 100644 --- a/src/insets/insetbox.h +++ b/src/insets/insetbox.h @@ -22,7 +22,7 @@ struct InsetBoxParams { /// InsetBoxParams(std::string const &); - /// + /// void write(std::ostream & os) const; /// void read(LyXLex & lex); @@ -92,7 +92,7 @@ public: void validate(LaTeXFeatures &) const; /// InsetBoxParams const & params() const { return params_; } - /// + /// enum BoxType { Frameless, Boxed, -- 2.39.2