+2004-08-16 José Matos <jamatos@lyx.org>
+
+ * lyx_1_4.lyx (convert_comment, convert_breaks, convert_frameless_box):
+ (convert_names, add_begin_body, strip_end_space): use the same policy
+ of lyx of not using spaces as the last character in a line that starts
+ with a command token (\xxxxx).
+
2004-08-15 José Matos <jamatos@lyx.org>
* lyx_1_4.py (normalize_papersize, denormalize_papersize):
i = find_token(lines, "\\layout", i)
if i == -1:
i = len(lines) - 1
- lines[i:i] = ["\\end_inset ","",""]
+ lines[i:i] = ["\\end_inset","",""]
return
j = find_token(lines, '\\begin_deeper', old_i, i)
#but if this happens deal with it greacefully adding
#the missing \end_deeper.
i = len(lines) - 1
- lines[i:i] = ["\end_deeper","","","\\end_inset ","",""]
+ lines[i:i] = ["\end_deeper","","","\\end_inset","",""]
return
else:
del lines[i]
#but if this happens deal with it greacefully adding
#the missing \end_inset.
i = len(lines) - 1
- lines[i:i] = ["\\end_inset ","","","\\end_inset ","",""]
+ lines[i:i] = ["\\end_inset","","","\\end_inset","",""]
return
else:
i = i + 1
paragraph_above.extend(['\\newpage ',''])
if vspace_top != -1:
- paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset ','',''])
+ paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset','',''])
if line_top != -1:
paragraph_above.extend(['\\lyxline ',''])
paragraph_bellow.extend(['\\lyxline ',''])
if vspace_bot != -1:
- paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset ','',''])
+ paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset','',''])
if pb_bot != -1:
paragraph_bellow.extend(['\\newpage ',''])
else:
lines[i] = lines[i] + '}'
i = i + 1
- lines[i:i] = ['', '\\end_inset ']
+ lines[i:i] = ['', '\\end_inset']
i = i + 2
j = find_end_of_inset(lines, i)
if j == -1:
"%s" % firstname,
"\end_layout",
"",
- "\end_inset ",
+ "\end_inset",
"",
"",
"\\begin_inset CharStyle Surname",
"%s" % surname,
"\\end_layout",
"",
- "\\end_inset ",
+ "\\end_inset",
""]
def remove_begin_header(header, opt):
- i = find_token(header, "\\begin_header", 0)
+ i = find_token(header, "\\begin_document", 0)
if i != -1:
del header[i]
- i = find_token(header, "\\begin_document", 0)
+ i = find_token(header, "\\begin_header", 0)
if i != -1:
del header[i]
#
def add_begin_body(body, opt):
body.insert(0, '\\begin_body')
+ body.insert(1, '')
i = find_token(body, "\\end_document", 0)
body.insert(i, '\\end_body')
i = find_token(body, "\\begin_body", 0)
if i != -1:
del body[i]
+ if not body[i]:
+ del body[i]
i = find_token(body, "\\end_body", 0)
if i != -1:
del body[i]
header[i] = '\\papersize Custom'
+##
+# Strip spaces at end of command line
+#
+def strip_end_space(body):
+ for i in range(len(body)):
+ if body[i][:1] == '\\':
+ body[i] = strip(body[i])
+
+
##
# Convertion hub
#
add_begin_header(file.header, file)
add_begin_body(file.body, file)
normalize_papersize(file.header)
+ strip_end_space(file.body)
file.format = 236
def revert(file):
revert_spaces(file.body)
revert_bibtex(file.body)
rm_tracking_changes(file.header)
- rm_file.body_changes(file.body)
+ rm_body_changes(file.body)
file.format = 221
+2004-08-16 José Matos <jamatos@lyx.org>
+
+ * ParagraphParameters.C (write):
+ * Spacing.C (writeFile):
+ * bufferparams.C (writeLaTeX):
+ * lyx_cb.C (Reconfigure):
+ * paragraph.C (write):
+ * tabular.C (write): remove unnecessary space at end of line.
+
+
2004-08-16 José Matos <jamatos@lyx.org>
* text.C (readParagraph): remove debug message.
void ParagraphParameters::write(ostream & os) const
{
+ ostringstream oss;
+
// Maybe the paragraph has special spacing
- spacing().writeFile(os, true);
+ spacing().writeFile(oss, true);
// The labelwidth string used in lists.
if (!labelWidthString().empty())
- os << "\\labelwidthstring "
+ oss << "\\labelwidthstring "
<< labelWidthString() << '\n';
// Start of appendix?
if (startOfAppendix())
- os << "\\start_of_appendix ";
+ oss << "\\start_of_appendix ";
// Noindent?
if (noindent())
- os << "\\noindent ";
+ oss << "\\noindent ";
// Do we have a manual left indent?
if (!leftIndent().zero())
- os << "\\leftindent " << leftIndent().asString()
+ oss << "\\leftindent " << leftIndent().asString()
<< ' ';
// Alignment?
case LYX_ALIGN_CENTER: h = 3; break;
default: h = 0; break;
}
- os << "\\align " << string_align[h] << ' ';
+ oss << "\\align " << string_align[h] << ' ';
}
+ os << rtrim(oss.str());
}
os.setf(ios::showpoint|ios::fixed);
os.precision(2);
os << cmd << spacing_string[getSpace()]
- << ' ' << getValue() << " \n";
+ << ' ' << getValue() << "\n";
} else {
- os << cmd << spacing_string[getSpace()] << " \n";
+ os << cmd << spacing_string[getSpace()] << "\n";
}
}
<< "\\begin_document\n";
// now write out the buffer parameters.
- ofs << "\n\\begin_header\n";
+ ofs << "\\begin_header\n";
params().writeFile(ofs);
ofs << "\\end_header\n";
"\\dvipost{osstart color push Red}\n"
"\\dvipost{osend color pop}\n"
"\\dvipost{cbstart color push Blue}\n"
- "\\dvipost{cbend color pop} \n";
+ "\\dvipost{cbend color pop}\n";
}
int const nlines =
+2004-08-16 José Matos <jamatos@lyx.org>
+
+ * PreviewLoader.C (Impl::startLoading): remove space at end of line.
+
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
if (ret != 0) {
lyxerr[Debug::GRAPHICS] << "PreviewLoader::startLoading()\n"
- << "Unable to start process \n"
+ << "Unable to start process\n"
<< command << endl;
return;
}
+2004-08-16 José Matos <jamatos@lyx.org>
+
+ * insethfill.C (write):
+ * insetline.C (write):
+ * insetnewline.C (write):
+ * insetpagebreak.C (write): remove space at end of line.
+
2004-08-16 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insettabular.C (plaintext): do not use ownerPar to get the
void InsetHFill::write(Buffer const &, ostream & os) const
{
- os << "\n\\hfill \n";
+ os << "\n\\hfill\n";
}
void InsetLine::write(Buffer const &, ostream & os) const
{
- os << "\n\\lyxline \n";
+ os << "\n\\lyxline\n";
}
void InsetNewline::write(Buffer const &, ostream & os) const
{
- os << "\n\\newline \n";
+ os << "\n\\newline\n";
}
void InsetPagebreak::write(Buffer const &, ostream & os) const
{
- os << "\n\\newpage \n";
+ os << "\n\\newpage\n";
}
Alert::information(_("System reconfigured"),
_("The system has been reconfigured.\n"
- "You need to restart LyX to make use of any \n"
+ "You need to restart LyX to make use of any\n"
"updated document class specifications."));
}
+2004-08-16 José Matos <jamatos@lyx.org>
+
+ * formulamacro.C (write):
+ * math_macrotemplate.C (write): remove space at end of line.
+
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file
void InsetFormulaMacro::write(Buffer const &, ostream & os) const
{
- os << "FormulaMacro ";
+ os << "FormulaMacro\n";
WriteStream wi(os, false, false);
tmpl()->write(wi);
}
void MathMacroTemplate::write(Buffer const &, std::ostream & os) const
{
WriteStream wi(os, false, false);
- os << "FormulaMacro ";
+ os << "FormulaMacro\n";
write(wi);
}
void MathMacroTemplate::write(WriteStream & os) const
{
if (type_ == "def") {
- os << "\n\\def\\" << name_.c_str();
+ os << "\\def\\" << name_.c_str();
for (int i = 1; i <= numargs_; ++i)
os << '#' << i;
} else {
// newcommand or renewcommand
- os << "\n\\" << type_.c_str() << "{\\" << name_.c_str() << '}';
+ os << "\\" << type_.c_str() << "{\\" << name_.c_str() << '}';
if (numargs_ > 0)
os << '[' << numargs_ << ']';
}
if (dth != params().depth()) {
if (params().depth() > dth) {
while (params().depth() > dth) {
- os << "\n\\begin_deeper ";
+ os << "\n\\begin_deeper";
++dth;
}
} else {
while (params().depth() < dth) {
- os << "\n\\end_deeper ";
+ os << "\n\\end_deeper";
--dth;
}
}
} else {
os << "\n\\begin_inset ";
inset->write(buf, os);
- os << "\n\\end_inset \n\n";
+ os << "\n\\end_inset\n\n";
column = 0;
}
}
break;
case '\\':
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
column = 0;
break;
case '.':
<< ">\n";
os << "\\begin_inset ";
cell_info[i][j].inset.write(buf, os);
- os << "\n\\end_inset \n"
+ os << "\n\\end_inset\n"
<< "</cell>\n";
}
os << "</row>\n";
+2008-08-16 José Matos <jamatos@lyx.org>
+
+ * context.C (begin_deeper, end_deeper):
+ * preamble.C (end_preamble):
+ * table.C (handle_tabular):
+ * text.C (end_inset, handle_ert, handle_comment):
+ (parse_text_attributes, parse_text): remove space at end of line.
+
2004-08-10 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* preamble.C (split_options): new, split package options into vector
void begin_deeper(ostream & os)
{
- os << "\n\\begin_deeper \n";
+ os << "\n\\begin_deeper\n";
}
void end_deeper(ostream & os)
{
- os << "\n\\end_deeper \n";
+ os << "\n\\end_deeper\n";
}
}
void end_preamble(ostream & os, LyXTextClass const & /*textclass*/)
{
- os << "#LyX file created by tex2lyx 0.1.2 \n"
+ os << "#LyX file created by tex2lyx 0.1.2\n"
<< "\\lyxformat 235\n"
<< "\\textclass " << h_textclass << "\n"
<< "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
<< ">"
<< "\n\\begin_inset Text\n"
<< cell.content
- << "\n\\end_inset \n"
+ << "\n\\end_inset\n"
<< "</cell>\n";
}
os << "</row>\n";
void end_inset(ostream & os)
{
- os << "\n\\end_inset \n\n";
+ os << "\n\\end_inset\n\n";
}
newcontext.check_layout(os);
for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
if (*it == '\\')
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
else if (*it == '\n')
- os << "\n\\newline \n";
+ os << "\n\\newline\n";
else
os << *it;
}
newcontext.check_layout(os);
for (string::const_iterator it = s.begin(), et = s.end(); it != et; ++it) {
if (*it == '\\')
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
else
os << *it;
}
context.check_layout(os);
string oldvalue = currentvalue;
currentvalue = newvalue;
- os << '\n' << attribute << ' ' << newvalue << " \n";
+ os << '\n' << attribute << ' ' << newvalue << "\n";
parse_text_snippet(p, os, flags, outer, context);
currentvalue = oldvalue;
- os << '\n' << attribute << ' ' << oldvalue << " \n";
+ os << '\n' << attribute << ' ' << oldvalue << "\n";
}
// s will change the size, so we must reset
// it here
os << s << "\n\\size " << context.font.size
- << " \n";
+ << "\n";
else if (is_known(next.cs(), known_font_families))
// s will change the font family, so we must
// reset it here
os << s << "\n\\family "
- << context.font.family << " \n";
+ << context.font.family << "\n";
else if (is_known(next.cs(), known_font_series))
// s will change the font series, so we must
// reset it here
os << s << "\n\\series "
- << context.font.series << " \n";
+ << context.font.series << "\n";
else if (is_known(next.cs(), known_font_shapes))
// s will change the font shape, so we must
// reset it here
os << s << "\n\\shape "
- << context.font.shape << " \n";
+ << context.font.shape << "\n";
else if (is_known(next.cs(), known_old_font_families) ||
is_known(next.cs(), known_old_font_series) ||
is_known(next.cs(), known_old_font_shapes))
// and shape, so we must reset it here
os << s
<< "\n\\family " << context.font.family
- << " \n\\series " << context.font.series
- << " \n\\shape " << context.font.shape
- << " \n";
+ << "\n\\series " << context.font.series
+ << "\n\\shape " << context.font.shape
+ << "\n";
else {
handle_ert(os, "{", context, false);
// s will end the current layout and begin a
else if (t.cs() == "hfill") {
context.check_layout(os);
- os << "\n\\hfill \n";
+ os << "\n\\hfill\n";
skip_braces(p);
p.skip_spaces();
}
Font oldFont = context.font;
context.font.init();
context.font.size = oldFont.size;
- os << "\n\\family " << context.font.family << " \n";
- os << "\n\\series " << context.font.series << " \n";
- os << "\n\\shape " << context.font.shape << " \n";
+ os << "\n\\family " << context.font.family << "\n";
+ os << "\n\\series " << context.font.series << "\n";
+ os << "\n\\shape " << context.font.shape << "\n";
if (t.cs() == "textnormal") {
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
context.font = oldFont;
- os << "\n\\shape " << oldFont.shape << " \n";
- os << "\n\\series " << oldFont.series << " \n";
- os << "\n\\family " << oldFont.family << " \n";
+ os << "\n\\shape " << oldFont.shape << "\n";
+ os << "\n\\series " << oldFont.series << "\n";
+ os << "\n\\family " << oldFont.family << "\n";
} else
eat_whitespace(p, os, context, false);
}
else if (t.cs() == "underbar") {
context.check_layout(os);
- os << "\n\\bar under \n";
+ os << "\n\\bar under\n";
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
- os << "\n\\bar default \n";
+ os << "\n\\bar default\n";
}
else if (t.cs() == "emph" || t.cs() == "noun") {
context.check_layout(os);
- os << "\n\\" << t.cs() << " on \n";
+ os << "\n\\" << t.cs() << " on\n";
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
- os << "\n\\" << t.cs() << " default \n";
+ os << "\n\\" << t.cs() << " default\n";
}
else if (use_natbib &&
context.font.size = oldsize;
context.font.family =
known_coded_font_families[where - known_old_font_families];
- os << "\n\\family " << context.font.family << " \n"
- << "\\series " << context.font.series << " \n"
- << "\\shape " << context.font.shape << " \n";
+ os << "\n\\family " << context.font.family << "\n"
+ << "\\series " << context.font.series << "\n"
+ << "\\shape " << context.font.shape << "\n";
eat_whitespace(p, os, context, false);
}
context.font.size = oldsize;
context.font.series =
known_coded_font_series[where - known_old_font_series];
- os << "\n\\family " << context.font.family << " \n"
- << "\\series " << context.font.series << " \n"
- << "\\shape " << context.font.shape << " \n";
+ os << "\n\\family " << context.font.family << "\n"
+ << "\\series " << context.font.series << "\n"
+ << "\\shape " << context.font.shape << "\n";
eat_whitespace(p, os, context, false);
}
context.font.size = oldsize;
context.font.shape =
known_coded_font_shapes[where - known_old_font_shapes];
- os << "\n\\family " << context.font.family << " \n"
- << "\\series " << context.font.series << " \n"
- << "\\shape " << context.font.shape << " \n";
+ os << "\n\\family " << context.font.family << "\n"
+ << "\\series " << context.font.series << "\n"
+ << "\\shape " << context.font.shape << "\n";
eat_whitespace(p, os, context, false);
}
else if (t.cs() == "textbackslash") {
context.check_layout(os);
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
skip_braces(p);
}
handle_ert(os, "\\\\*" + p.getOpt(), context);
}
else {
- os << "\n\\newline \n";
+ os << "\n\\newline\n";
}
}