The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 8941e980b957e716746b3dfb7e01de80c5631236 Author: Vincent van Ravesteijn <[email protected]> Date: Mon Jun 25 11:24:04 2012 +0200 BufferParams: Remove superfluous '\n' This extra '\n' seems to have been an unintended side-effect of d7eaaba9 (Juergen Spitzmueller, "support for CJK font argument"; Jun 5 2008). diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 283ff71..40ab0dc 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -997,7 +997,7 @@ void BufferParams::writeFile(ostream & os) const if (!fonts_cjk.empty()) { os << "\\font_cjk " << fonts_cjk << '\n'; } - os << "\n\\graphics " << graphics_driver << '\n'; + os << "\\graphics " << graphics_driver << '\n'; os << "\\default_output_format " << default_output_format << '\n'; os << "\\output_sync " << output_sync << '\n'; if (!output_sync_macro.empty()) commit e20238e21f2c9d46b729038c6dfa89240603b386 Author: Vincent van Ravesteijn <[email protected]> Date: Mon Jun 25 11:21:27 2012 +0200 tex2lyx: Remove superfluous '\n' Instead of adding the extra '\n' to tex2lyx, we should remove it from BufferParams.cpp because it was introduced there unintendedly in d7eaaba9 (Juergen Spitzmueller; "support for CJK font argument"; Jun 5 2008). This partly reverts commit c2810f922665c591a7c32d4c679e58e55132505a. diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 8873d3f..b40bf8f 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -985,7 +985,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) << "\\font_sc " << h_font_sc << "\n" << "\\font_osf " << h_font_osf << "\n" << "\\font_sf_scale " << h_font_sf_scale << "\n" - << "\\font_tt_scale " << h_font_tt_scale << "\n\n" + << "\\font_tt_scale " << h_font_tt_scale << "\n" << "\\graphics " << h_graphics << "\n" << "\\default_output_format " << h_default_output_format << "\n" << "\\output_sync " << h_output_sync << "\n"; ----------------------------------------------------------------------- Summary of changes: src/BufferParams.cpp | 2 +- src/tex2lyx/Preamble.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
