anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws changes only

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7903 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-10-13 02:10:45 +00:00
parent 32d1460f26
commit 16e1f90daa
5 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/ChangeLog
View File

@ -1,3 +1,10 @@
2003-10-13 Lars Gullik Bjønnes <larsbj@gullik.net>
* ExternalSupport.C:
* ExternalTransforms.C:
* insetbox.C:
* insetbox.h: ws changes only
2003-10-13 Lars Gullik Bjønnes <larsbj@gullik.net>
* insetinclude.C (localDispatch): do not call

2
src/insets/ExternalSupport.C
View File

@ -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);

2
src/insets/ExternalTransforms.C
View File

@ -280,7 +280,7 @@ string const sanitizeLatexOption(string const & input)
}
output += what.str(1) + ",";
it = what[3].first;
}
}
// Strip any trailing commas
// "...foo,,,]" -> "...foo"

30
src/insets/insetbox.C
View File

@ -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") {

4
src/insets/insetbox.h
View File

@ -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,