From b847c110b1e922e2121b4a055c0609bf721f7eaa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 8 Dec 2011 23:00:35 +0000 Subject: [PATCH] lyx2lyx/lyx_1_6.py: backport some fixes from trunk git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40446 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/lyx2lyx/lyx_1_6.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py index fb65bbf977..2d0964c3af 100644 --- a/lib/lyx2lyx/lyx_1_6.py +++ b/lib/lyx2lyx/lyx_1_6.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA """ Convert files to the file format generated by lyx 1.6""" @@ -51,7 +51,7 @@ def find_end_of_inset(lines, i): # DO NOT do this: # document.body[i] = wrap_insert_ert(...) # wrap_into_ert may returns a multiline string, which should NOT appear -# in document.body. Insetad, do something like this: +# in document.body. Instead, do something like this: # subst = wrap_inset_ert(...) # subst = subst.split('\n') # document.body[i:i+1] = subst @@ -793,7 +793,7 @@ def convert_flex(document): document.body[i] = document.body[i].replace('\\begin_inset CharStyle', '\\begin_inset Flex') def revert_flex(document): - "Convert Flex to CharStyle" + "Revert Flex to CharStyle" i = 0 while True: i = find_token(document.body, "\\begin_inset Flex", i) @@ -1600,7 +1600,7 @@ def convert_macro_global(document): "Remove TeX code command \global when it is in front of a macro" # math macros are nowadays already defined \global, so that an additional # \global would make the document uncompilable, see - # http://bugzilla.lyx.org/show_bug.cgi?id=5371 + # http://www.lyx.org/trac/ticket/5371 # We're looking for something like this: # \begin_inset ERT # status collapsed @@ -2879,7 +2879,7 @@ def update_apa_styles(document): def convert_paper_sizes(document): ' exchange size options legalpaper and executivepaper to correct order ' - # routine is needed to fix http://bugzilla.lyx.org/show_bug.cgi?id=4868 + # routine is needed to fix http://www.lyx.org/trac/ticket/4868 i = 0 j = 0 i = find_token(document.header, "\\papersize executivepaper", 0) -- 2.39.5