From 76d272da30045d91054ee0ff35b385ed9f781145 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Fri, 18 Apr 2008 17:06:03 +0000 Subject: [PATCH] Embedding: revert embedding options and extra_embedded_files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24328 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/FORMAT | 3 +++ lib/lyx2lyx/LyX.py | 2 +- lib/lyx2lyx/lyx_1_6.py | 27 ++++++++++++++++++++++----- src/Buffer.cpp | 2 +- src/BufferParams.cpp | 13 ------------- src/insets/InsetBibtex.cpp | 2 -- src/insets/InsetExternal.cpp | 4 +--- src/insets/InsetGraphicsParams.cpp | 4 +--- 8 files changed, 29 insertions(+), 28 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 6a4c2dd640..3e4676186d 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -1,6 +1,9 @@ LyX file-format changes ----------------------- +2008-04-18 Bo Peng + * Format incremented to 328: Revert the support for embedding + 2008-04-16 Uwe Stöhr * Format incremented to 327: support for Mexican Spanish. diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 3166028510..cae99b7e52 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -80,7 +80,7 @@ format_relation = [("0_06", [200], minor_versions("0.6" , 4)), ("1_3", [221], minor_versions("1.3" , 7)), ("1_4", range(222,246), minor_versions("1.4" , 5)), ("1_5", range(246,277), minor_versions("1.5" , 2)), - ("1_6", range(277,328), minor_versions("1.6" , 0))] # Uwe: support for Spanish(Mexico) + ("1_6", range(277,329), minor_versions("1.6" , 0))] # Uwe: support for Spanish(Mexico) def formats_list(): diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py index 708a11c947..64904a3b23 100644 --- a/lib/lyx2lyx/lyx_1_6.py +++ b/lib/lyx2lyx/lyx_1_6.py @@ -1532,11 +1532,11 @@ def revert_widesideways(document): i = i + 1 -def revert_external_embedding(document): - ' Remove embed tag from external inset ' +def revert_inset_embedding(document, type): + ' Remove embed tag from certain type of insets' i = 0 while 1: - i = find_token(document.body, "\\begin_inset External", i) + i = find_token(document.body, "\\begin_inset %s" % type, i) if i == -1: return j = find_end_of_inset(document.body, i) @@ -1545,11 +1545,18 @@ def revert_external_embedding(document): i = i + 1 continue k = find_token(document.body, "\tembed", i, j) + if k == -1: + k = find_token(document.body, "embed", i, j) if k != -1: del document.body[k] i = i + 1 +def revert_external_embedding(document): + ' Remove embed tag from external inset ' + revert_inset_embedding(document, 'External') + + def convert_subfig(document): " Convert subfigures to subfloats. " i = 0 @@ -1987,6 +1994,14 @@ def revert_mexican(document): j = j + 1 +def remove_embedding(document): + ' Remove embed tag from all insets' + revert_inset_embedding(document, 'Graphics') + revert_inset_embedding(document, 'External') + revert_inset_embedding(document, 'CommandInset include') + revert_inset_embedding(document, 'CommandInset bibtex') + + ## # Conversion hub # @@ -2042,10 +2057,12 @@ convert = [[277, [fix_wrong_tables]], [324, [convert_linebreaks]], [325, [convert_japanese_plain]], [326, []], - [327, []] + [327, []], + [328, [remove_embedding, remove_extra_embedded_files, remove_inzip_options]], ] -revert = [[326, [revert_mexican]], +revert = [[327, []], + [326, [revert_mexican]], [325, [revert_pdfpages]], [324, []], [323, [revert_linebreaks]], diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 6f7369843d..d6fdee79b1 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -117,7 +117,7 @@ namespace os = support::os; namespace { -int const LYX_FORMAT = 327; // Uwe: support for Spanish(Mexico) +int const LYX_FORMAT = 328; typedef map DepClean; typedef map > RefCache; diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 2697fd75c3..01fbfb0a45 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -845,19 +845,6 @@ void BufferParams::writeFile(ostream & os) const else os << "\\author " << Author() << "\n"; } - - vector::const_iterator e_it = extraEmbeddedFiles().begin(); - vector::const_iterator e_end = extraEmbeddedFiles().end(); - os << "\\extra_embedded_files \""; - bool first = true; - for (; e_it != e_end; ++e_it) { - if (!first) - os << ","; - else - first = false; - os << *e_it; - } - os << "\"\n"; } diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index 28971be46c..f2f88cb903 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -78,7 +78,6 @@ ParamInfo const & InsetBibtex::findInfo(string const & /* cmdName */) if (param_info_.empty()) { param_info_.add("btprint", ParamInfo::LATEX_OPTIONAL); param_info_.add("bibfiles", ParamInfo::LATEX_REQUIRED); - param_info_.add("embed", ParamInfo::LYX_INTERNAL); param_info_.add("options", ParamInfo::LYX_INTERNAL); } return param_info_; @@ -827,7 +826,6 @@ void InsetBibtex::updateParam() embed += from_utf8(it->inzipName()); } setParam("bibfiles", bibfiles); - setParam("embed", embed); } diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index 6de1fec99f..64329bb722 100644 --- a/src/insets/InsetExternal.cpp +++ b/src/insets/InsetExternal.cpp @@ -188,10 +188,8 @@ void InsetExternalParams::write(Buffer const & buf, ostream & os) const os << "External\n" << "\ttemplate " << templatename() << '\n'; - if (!filename.empty()) { + if (!filename.empty()) os << "\tfilename " << filename.outputFilename(buf.filePath()) << '\n'; - os << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n'; - } if (display != defaultDisplayType) os << "\tdisplay " << external::displayTranslator().find(display) diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp index 16130e7c6a..8cc2052233 100644 --- a/src/insets/InsetGraphicsParams.cpp +++ b/src/insets/InsetGraphicsParams.cpp @@ -137,10 +137,8 @@ bool operator!=(InsetGraphicsParams const & left, void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const { // Do not write the default values - if (!filename.empty()) { + if (!filename.empty()) os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n'; - os << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n'; - } if (lyxscale != 100) os << "\tlyxscale " << lyxscale << '\n'; if (display != graphics::DefaultDisplay) -- 2.39.2