2006-08-08 10:42:59 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
2005-10-21 16:11:36 +00:00
|
|
|
|
|
|
|
# file layout2layout.py
|
|
|
|
# This file is part of LyX, the document processor.
|
|
|
|
# Licence details can be found in the file COPYING.
|
|
|
|
|
|
|
|
# author Georg Baum
|
|
|
|
|
|
|
|
# Full author contact details are available in file CREDITS
|
|
|
|
|
2009-02-04 20:06:50 +00:00
|
|
|
# This script will update a .layout file to current format
|
2005-10-21 16:11:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
import os, re, string, sys
|
|
|
|
|
2008-03-24 13:21:26 +00:00
|
|
|
# Incremented to format 4, 6 April 2007, lasgouttes
|
|
|
|
# Introduction of generic "Provides" declaration
|
2005-10-21 16:11:36 +00:00
|
|
|
|
2008-03-24 13:21:26 +00:00
|
|
|
# Incremented to format 5, 22 August 2007 by vermeer
|
|
|
|
# InsetLayout material
|
|
|
|
|
|
|
|
# Incremented to format 6, 7 January 2008 by spitz
|
|
|
|
# Requires tag added to layout files
|
|
|
|
|
|
|
|
# Incremented to format 7, 24 March 2008 by rgh
|
2008-03-24 13:11:16 +00:00
|
|
|
# AddToPreamble tag added to layout files
|
2008-07-25 15:51:27 +00:00
|
|
|
|
|
|
|
# Incremented to format 8, 25 July 2008 by rgh
|
|
|
|
# UseModule tag added to layout files
|
2008-07-28 15:14:37 +00:00
|
|
|
# CopyStyle added to InsetLayout
|
2008-10-05 19:39:09 +00:00
|
|
|
|
|
|
|
# Incremented to format 9, 5 October 2008 by rgh
|
|
|
|
# ForcePlain and CustomPars tags added to InsetLayout
|
|
|
|
|
2008-10-06 14:37:28 +00:00
|
|
|
# Incremented to format 10, 6 October 2008 by rgh
|
|
|
|
# Change format of counters
|
|
|
|
|
2008-10-23 00:27:03 +00:00
|
|
|
# Incremented to format 11, 14 October 2008 by rgh
|
|
|
|
# Add ProvidesModule, ExcludesModule tags
|
|
|
|
|
2009-02-04 20:06:50 +00:00
|
|
|
# Incremented to format 12, 10 January 2009 by gb
|
|
|
|
# Add I18NPreamble tag
|
|
|
|
|
2009-02-06 17:54:33 +00:00
|
|
|
# Incremented to format 13, 5 February 2009 by rgh
|
|
|
|
# Add InToc tag for InsetLayout
|
|
|
|
|
2009-02-17 20:25:56 +00:00
|
|
|
# Incremented to format 14, 14 February 2009 by gb
|
|
|
|
# Rename I18NPreamble to BabelPreamble and add LangPreamble
|
|
|
|
|
2009-05-28 08:59:25 +00:00
|
|
|
# Incremented to format 15, 28 May 2009 by lasgouttes
|
2009-10-27 19:03:30 +00:00
|
|
|
# Add new tag OutputFormat; modules can be conditioned on feature
|
2009-05-28 08:59:25 +00:00
|
|
|
# "from->to".
|
|
|
|
|
2009-06-05 20:07:16 +00:00
|
|
|
# Incremented to format 16, 5 June 2009 by rgh
|
|
|
|
# Add new tags for Text Class:
|
2009-06-19 13:11:06 +00:00
|
|
|
# HTMLPreamble, HTMLAddToPreamble
|
2009-06-05 20:07:16 +00:00
|
|
|
# For Layout:
|
|
|
|
# HTMLTag, HTMLAttr, HTMLLabel, HTMLLabelAttr, HTMLItem, HTMLItemAttr
|
|
|
|
# HTMLStyle, and HTMLPreamble
|
|
|
|
# For InsetLayout:
|
|
|
|
# HTMLTag, HTMLAttr, HTMLStyle, and HTMLPreamble
|
2009-06-19 13:10:36 +00:00
|
|
|
# For Floats:
|
|
|
|
# HTMLType, HTMLClass, HTMLStyle
|
2009-06-05 20:07:16 +00:00
|
|
|
|
2009-10-27 19:03:30 +00:00
|
|
|
# Incremented to format 17, 12 August 2009 by rgh
|
|
|
|
# Add IfStyle and IfCounter tags for layout.
|
|
|
|
|
|
|
|
# Incremented to format 18, 27 October 2009 by rgh
|
2010-01-07 17:32:42 +00:00
|
|
|
# Added some new tags for HTML output.
|
2009-10-27 19:03:30 +00:00
|
|
|
|
2009-12-01 14:34:05 +00:00
|
|
|
# Incremented to format 19, 17 November 2009 by rgh
|
|
|
|
# Added InPreamble tag.
|
|
|
|
|
2009-12-18 00:29:22 +00:00
|
|
|
# Incremented to format 20, 17 December 2009 by rgh
|
|
|
|
# Added ContentAsLabel tag.
|
|
|
|
|
2010-01-12 19:38:31 +00:00
|
|
|
# Incremented to format 21, 12 January 2010 by rgh
|
2010-01-19 19:43:15 +00:00
|
|
|
# Added HTMLTocLayout and HTMLTitle tags.
|
2010-02-13 15:44:17 +00:00
|
|
|
|
2010-01-20 20:33:36 +00:00
|
|
|
# Incremented to format 22, 20 January 2010 by rgh
|
|
|
|
# Added HTMLFormat tag to Counters.
|
2010-01-12 19:38:31 +00:00
|
|
|
|
2010-02-13 15:44:17 +00:00
|
|
|
# Incremented to format 23, 13 February 2010 by spitz
|
|
|
|
# Added Spellcheck tag.
|
|
|
|
|
2010-03-05 17:24:38 +00:00
|
|
|
# Incremented to format 24, 5 March 2010 by rgh
|
2010-03-05 22:58:29 +00:00
|
|
|
# Changed LaTeXBuiltin tag to NeedsFloatPkg and
|
|
|
|
# added new tag ListCommand.
|
2010-03-05 17:24:38 +00:00
|
|
|
|
2010-03-17 12:23:24 +00:00
|
|
|
# Incremented to format 25, 12 March 2010 by rgh
|
|
|
|
# Added RefPrefix tag for layouts and floats.
|
|
|
|
|
2010-03-29 18:37:25 +00:00
|
|
|
# Incremented to format 26, 29 March 2010 by rgh
|
|
|
|
# Added CiteFormat.
|
|
|
|
|
2010-06-04 21:50:08 +00:00
|
|
|
# Incremented to format 27, 4 June 2010 by rgh
|
|
|
|
# Added RequiredArgs tag.
|
|
|
|
|
2010-08-09 21:20:29 +00:00
|
|
|
# Incremented to format 28, 6 August 2010 by lasgouttes
|
|
|
|
# Added ParbreakIsNewline tag for Layout and InsetLayout.
|
|
|
|
|
2010-10-12 14:46:17 +00:00
|
|
|
# Incremented to format 29, 10 August 2010 by rgh
|
|
|
|
# Changed Custom:Style, CharStyle:Style, and Element:Style
|
|
|
|
# uniformly to Flex:Style.
|
|
|
|
|
2010-10-13 15:54:39 +00:00
|
|
|
# Incremented to format 30, 13 August 2010 by rgh
|
|
|
|
# Introduced ResetsFont tag for InsetLayout.
|
|
|
|
|
2011-01-12 22:53:41 +00:00
|
|
|
# Incremented to format 31, 12 January 2011 by rgh
|
|
|
|
# Introducted NoCounter tag.
|
|
|
|
|
2011-01-30 22:22:18 +00:00
|
|
|
# Incremented to format 32, 30 January 2011 by forenr
|
|
|
|
# Added Display tag for InsetLayout
|
|
|
|
|
2011-02-02 22:28:47 +00:00
|
|
|
# Incremented to format 33, 2 February 2011 by rgh
|
|
|
|
# Changed NeedsFloatPkg to UsesFloatPkg
|
|
|
|
|
2011-03-28 15:11:57 +00:00
|
|
|
# Incremented to format 34, 28 March 2011 by rgh
|
|
|
|
# Remove obsolete Fill_(Top|Bottom) tags
|
|
|
|
|
2011-03-28 23:11:54 +00:00
|
|
|
# Incremented to format 35, 28 March 2011 by rgh
|
|
|
|
# Try to add "Flex:" to any flex insets that don't have it.
|
|
|
|
|
2011-12-07 15:05:21 +00:00
|
|
|
# Incremented to format 36, 7 December 2011, by rgh
|
|
|
|
# Added HTMLStyles and AddToHTMLStyles tags.
|
|
|
|
|
2012-03-01 00:41:30 +00:00
|
|
|
# Incremented to format 37, 29 February 2012 by jrioux
|
|
|
|
# Implement the citation engine machinery in layouts.
|
|
|
|
# Change CiteFormat to CiteFormat (default|authoryear|numerical).
|
|
|
|
|
2012-04-10 18:21:01 +00:00
|
|
|
# Incremented to format 38, 08 April 2012 by gb
|
|
|
|
# Introduce LangPreamble and BabelPreamble for InsetLayout.
|
|
|
|
|
2012-04-19 09:56:32 +00:00
|
|
|
# Incremented to format 39, 15 April 2012 by sanda
|
|
|
|
# Introduce styling of branches via "InsetLayout Branch:".
|
|
|
|
|
2012-10-10 17:22:54 +00:00
|
|
|
# Incremented to format 40, 10 October 2012 by rgh
|
|
|
|
# Re-do layout names for layout categories
|
|
|
|
|
2012-11-20 10:49:02 +00:00
|
|
|
# Incremented to format 41, 20 November 2012 by spitz
|
|
|
|
# New Argument syntax
|
|
|
|
|
2012-12-22 10:39:04 +00:00
|
|
|
# Incremented to format 42, 22 December 2012 by spitz
|
|
|
|
# New Style tag "ItemCommand"
|
|
|
|
|
2012-12-30 17:29:02 +00:00
|
|
|
# Incremented to format 43, 30 December 2012 by spitz
|
|
|
|
# Extended InsetCaption format
|
|
|
|
|
2013-02-09 17:28:21 +00:00
|
|
|
# Incremented to format 44, 9 February 2013 by rgh
|
|
|
|
# Remove COUNTER label style; rename as STATIC
|
|
|
|
# Rename TOP_ENVIRONMENT to ABOVE and CENTERED_TOP_ENVIRONMENT to CENTERED
|
|
|
|
|
2013-02-09 19:31:26 +00:00
|
|
|
# Incremented to format 45, 12 February 2013 by rgh
|
|
|
|
# New Tag "NoInsetLayout"
|
|
|
|
|
2013-05-15 05:19:49 +00:00
|
|
|
# Incremented to format 46, 15 May 2013 by gb
|
|
|
|
# New Tag "ForceLocal"
|
|
|
|
|
2013-05-23 13:25:40 +00:00
|
|
|
# Incremented to format 47, 23 May 2013 by rgh
|
|
|
|
# Add PackageOptions tag
|
|
|
|
|
2013-06-01 21:42:08 +00:00
|
|
|
# Incremented to format 48, 31 May 2013 by rgh
|
|
|
|
# Add InitialValue tag for counters
|
|
|
|
|
2014-02-10 21:06:32 +00:00
|
|
|
# Incremented to format 49, 10 Feb 2014 by gb
|
|
|
|
# Change default of "ResetsFont" tag to false
|
|
|
|
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
# Incremented to format 50, 9 May 2014 by forenr
|
|
|
|
# Removal of "Separator" layouts
|
|
|
|
|
2014-05-29 12:10:32 +00:00
|
|
|
# Incremented to format 51, 29 May 2014 by spitz
|
|
|
|
# New Style tag "ToggleIndent"
|
|
|
|
|
2009-05-19 23:34:12 +00:00
|
|
|
# Do not forget to document format change in Customization
|
2009-05-28 02:00:04 +00:00
|
|
|
# Manual (section "Declaring a new text class").
|
2009-05-19 23:34:12 +00:00
|
|
|
|
2010-01-14 14:05:50 +00:00
|
|
|
# You might also want to consider running the
|
|
|
|
# development/tools/updatelayouts.sh script to update all
|
|
|
|
# layout files to the new format.
|
|
|
|
|
2014-05-29 19:25:08 +00:00
|
|
|
currentFormat = 51
|
2008-01-10 03:59:39 +00:00
|
|
|
|
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
def usage(prog_name):
|
|
|
|
return ("Usage: %s inputfile outputfile\n" % prog_name +
|
|
|
|
"or %s <inputfile >outputfile" % prog_name)
|
|
|
|
|
|
|
|
|
|
|
|
def error(message):
|
|
|
|
sys.stderr.write(message + '\n')
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
|
2009-06-21 18:23:10 +00:00
|
|
|
def trim_bom(line):
|
|
|
|
" Remove byte order mark."
|
|
|
|
if line[0:3] == "\357\273\277":
|
|
|
|
return line[3:]
|
|
|
|
else:
|
|
|
|
return line
|
|
|
|
|
|
|
|
|
2009-11-13 16:12:04 +00:00
|
|
|
def read(source):
|
2005-10-21 16:11:36 +00:00
|
|
|
" Read input file and strip lineendings."
|
2011-09-12 20:42:22 +00:00
|
|
|
lines = source.read().splitlines() or ['']
|
2009-11-14 19:16:53 +00:00
|
|
|
lines[0] = trim_bom(lines[0])
|
2005-10-21 16:11:36 +00:00
|
|
|
return lines
|
|
|
|
|
|
|
|
|
|
|
|
def write(output, lines):
|
|
|
|
" Write output file with native lineendings."
|
2009-11-14 19:16:53 +00:00
|
|
|
output.write(os.linesep.join(lines) + os.linesep)
|
2005-10-21 16:11:36 +00:00
|
|
|
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# Concatenates old and new in an intelligent way:
|
|
|
|
# If old is wrapped in ", they are stripped. The result is wrapped in ".
|
|
|
|
def concatenate_label(old, new):
|
|
|
|
# Don't use strip as long as we support python 1.5.2
|
|
|
|
if old[0] == '"':
|
|
|
|
return old[0:-1] + new + '"'
|
|
|
|
else:
|
|
|
|
return '"' + old + new + '"'
|
|
|
|
|
2008-10-07 15:45:08 +00:00
|
|
|
# appends a string to a list unless it's already there
|
|
|
|
def addstring(s, l):
|
|
|
|
if l.count(s) > 0:
|
|
|
|
return
|
|
|
|
l.append(s)
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
def convert(lines):
|
|
|
|
" Convert to new format."
|
|
|
|
re_Comment = re.compile(r'^(\s*)#')
|
2008-10-07 15:45:08 +00:00
|
|
|
re_Counter = re.compile(r'\s*Counter\s*', re.IGNORECASE)
|
|
|
|
re_Name = re.compile(r'\s*Name\s+(\S+)\s*', re.IGNORECASE)
|
2008-10-23 00:27:03 +00:00
|
|
|
re_UseMod = re.compile(r'^\s*UseModule\s+(.*)', re.IGNORECASE)
|
2005-10-21 16:11:36 +00:00
|
|
|
re_Empty = re.compile(r'^(\s*)$')
|
|
|
|
re_Format = re.compile(r'^(\s*)(Format)(\s+)(\S+)', re.IGNORECASE)
|
|
|
|
re_Preamble = re.compile(r'^(\s*)Preamble', re.IGNORECASE)
|
|
|
|
re_EndPreamble = re.compile(r'^(\s*)EndPreamble', re.IGNORECASE)
|
2009-02-17 20:25:56 +00:00
|
|
|
re_LangPreamble = re.compile(r'^(\s*)LangPreamble', re.IGNORECASE)
|
|
|
|
re_EndLangPreamble = re.compile(r'^(\s*)EndLangPreamble', re.IGNORECASE)
|
|
|
|
re_BabelPreamble = re.compile(r'^(\s*)BabelPreamble', re.IGNORECASE)
|
|
|
|
re_EndBabelPreamble = re.compile(r'^(\s*)EndBabelPreamble', re.IGNORECASE)
|
2006-03-29 18:49:27 +00:00
|
|
|
re_MaxCounter = re.compile(r'^(\s*)(MaxCounter)(\s+)(\S+)', re.IGNORECASE)
|
2005-10-21 16:11:36 +00:00
|
|
|
re_LabelType = re.compile(r'^(\s*)(LabelType)(\s+)(\S+)', re.IGNORECASE)
|
2006-03-29 18:49:27 +00:00
|
|
|
re_LabelString = re.compile(r'^(\s*)(LabelString)(\s+)(("[^"]+")|(\S+))', re.IGNORECASE)
|
|
|
|
re_LabelStringAppendix = re.compile(r'^(\s*)(LabelStringAppendix)(\s+)(("[^"]+")|(\S+))', re.IGNORECASE)
|
2006-01-08 15:35:38 +00:00
|
|
|
re_LatexType = re.compile(r'^(\s*)(LatexType)(\s+)(\S+)', re.IGNORECASE)
|
|
|
|
re_Style = re.compile(r'^(\s*)(Style)(\s+)(\S+)', re.IGNORECASE)
|
2007-01-30 13:23:21 +00:00
|
|
|
re_CopyStyle = re.compile(r'^(\s*)(CopyStyle)(\s+)(\S+)', re.IGNORECASE)
|
|
|
|
re_NoStyle = re.compile(r'^(\s*)(NoStyle)(\s+)(\S+)', re.IGNORECASE)
|
2006-01-08 15:35:38 +00:00
|
|
|
re_End = re.compile(r'^(\s*)(End)(\s*)$', re.IGNORECASE)
|
2007-04-06 09:02:23 +00:00
|
|
|
re_Provides = re.compile(r'^(\s*)Provides(\S+)(\s+)(\S+)', re.IGNORECASE)
|
2007-08-22 14:36:07 +00:00
|
|
|
re_CharStyle = re.compile(r'^(\s*)CharStyle(\s+)(\S+)$', re.IGNORECASE)
|
2012-03-01 00:41:30 +00:00
|
|
|
re_CiteFormat = re.compile(r'^(\s*)(CiteFormat)(?:(\s*)()|(\s+)(default|authoryear|numerical))', re.IGNORECASE)
|
2009-08-13 19:17:41 +00:00
|
|
|
re_AMSMaths = re.compile(r'^\s*Input ams(?:math|def)s.inc\s*')
|
2008-10-07 15:45:08 +00:00
|
|
|
re_AMSMathsPlain = re.compile(r'^\s*Input amsmaths-plain.inc\s*')
|
|
|
|
re_AMSMathsSeq = re.compile(r'^\s*Input amsmaths-seq.inc\s*')
|
2009-02-04 20:06:50 +00:00
|
|
|
re_TocLevel = re.compile(r'^(\s*)(TocLevel)(\s+)(\S+)', re.IGNORECASE)
|
2009-02-17 20:25:56 +00:00
|
|
|
re_I18nPreamble = re.compile(r'^(\s*)I18nPreamble', re.IGNORECASE)
|
|
|
|
re_EndI18nPreamble = re.compile(r'^(\s*)EndI18nPreamble', re.IGNORECASE)
|
2010-03-05 22:58:29 +00:00
|
|
|
re_Float = re.compile(r'^\s*Float\s*$', re.IGNORECASE)
|
|
|
|
re_Type = re.compile(r'\s*Type\s+(\w+)', re.IGNORECASE)
|
2010-03-05 17:24:38 +00:00
|
|
|
re_Builtin = re.compile(r'^(\s*)LaTeXBuiltin\s+(\w*)', re.IGNORECASE)
|
|
|
|
re_True = re.compile(r'^\s*(?:true|1)\s*$', re.IGNORECASE)
|
2011-03-28 22:44:17 +00:00
|
|
|
re_InsetLayout = re.compile(r'^\s*InsetLayout\s+(?:Custom|CharStyle|Element):(\S+)\s*$', re.IGNORECASE)
|
2014-02-10 21:06:32 +00:00
|
|
|
re_ResetsFont = re.compile(r'^(\s*)ResetsFont(\s+)(\S+)$', re.IGNORECASE)
|
2010-10-12 14:46:17 +00:00
|
|
|
# with quotes
|
2011-03-28 22:44:17 +00:00
|
|
|
re_QInsetLayout = re.compile(r'^\s*InsetLayout\s+"(?:Custom|CharStyle|Element):([^"]+)"\s*$', re.IGNORECASE)
|
|
|
|
re_InsetLayout_CopyStyle = re.compile(r'^\s*CopyStyle\s+(?:Custom|CharStyle|Element):(\S+)\s*$', re.IGNORECASE)
|
|
|
|
re_QInsetLayout_CopyStyle = re.compile(r'^\s*CopyStyle\s+"(?:Custom|CharStyle|Element):([^"]+)"\s*$', re.IGNORECASE)
|
|
|
|
re_NeedsFloatPkg = re.compile(r'^(\s*)NeedsFloatPkg\s+(\w+)\s*$', re.IGNORECASE)
|
|
|
|
re_Fill = re.compile(r'^\s*Fill_(?:Top|Bottom).*$', re.IGNORECASE)
|
2011-03-28 23:11:54 +00:00
|
|
|
re_InsetLayout2 = re.compile(r'^\s*InsetLayout\s+(\S+)\s*$', re.IGNORECASE)
|
|
|
|
# with quotes
|
|
|
|
re_QInsetLayout2 = re.compile(r'^\s*InsetLayout\s+"([^"]+)"\s*$', re.IGNORECASE)
|
|
|
|
re_IsFlex = re.compile(r'\s*LyXType.*$', re.IGNORECASE)
|
2011-04-15 02:50:45 +00:00
|
|
|
re_CopyStyle2 = re.compile(r'(\s*CopyStyle\s+)"?([^"]+)"?\s*$')
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
re_Separator = re.compile(r'^(?:(-*)|(\s*))(Separator|EndOfSlide)(?:(-*)|(\s*))$', re.IGNORECASE)
|
2012-10-10 17:54:26 +00:00
|
|
|
# for categories
|
|
|
|
re_Declaration = re.compile(r'^#\s*\\Declare\w+Class.*$')
|
|
|
|
re_ExtractCategory = re.compile(r'^(#\s*\\Declare\w+Class(?:\[[^]]*?\])?){([^(]+?)\s+\(([^)]+?)\)\s*}\s*$')
|
|
|
|
ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \
|
|
|
|
"presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"}
|
2012-11-20 10:49:02 +00:00
|
|
|
# Arguments
|
|
|
|
re_OptArgs = re.compile(r'^(\s*)OptionalArgs(\s+)(\d+)\D*$', re.IGNORECASE)
|
|
|
|
re_ReqArgs = re.compile(r'^(\s*)RequiredArgs(\s+)(\d+)\D*$', re.IGNORECASE)
|
2013-02-09 17:28:21 +00:00
|
|
|
|
|
|
|
# various changes associated with changing how chapters are handled
|
|
|
|
re_LabelTypeIsCounter = re.compile(r'^(\s*)LabelType(\s*)Counter\s*$', re.IGNORECASE)
|
|
|
|
re_TopEnvironment = re.compile(r'^(\s*)LabelType(\s+)Top_Environment\s*$', re.IGNORECASE)
|
|
|
|
re_CenteredEnvironment = re.compile(r'^(\s*)LabelType(\s+)Centered_Top_Environment\s*$', re.IGNORECASE)
|
|
|
|
re_ChapterStyle = re.compile(r'^\s*Style\s+Chapter\s*$', re.IGNORECASE)
|
2012-10-10 17:54:26 +00:00
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# counters for sectioning styles (hardcoded in 1.3)
|
|
|
|
counters = {"part" : "\\Roman{part}",
|
|
|
|
"chapter" : "\\arabic{chapter}",
|
|
|
|
"section" : "\\arabic{section}",
|
2006-04-07 15:25:34 +00:00
|
|
|
"subsection" : "\\arabic{section}.\\arabic{subsection}",
|
|
|
|
"subsubsection" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}",
|
|
|
|
"paragraph" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}.\\arabic{paragraph}",
|
|
|
|
"subparagraph" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}.\\arabic{paragraph}.\\arabic{subparagraph}"}
|
2006-03-29 18:49:27 +00:00
|
|
|
|
|
|
|
# counters for sectioning styles in appendix (hardcoded in 1.3)
|
|
|
|
appendixcounters = {"chapter" : "\\Alph{chapter}",
|
|
|
|
"section" : "\\Alph{section}",
|
2006-04-07 15:25:34 +00:00
|
|
|
"subsection" : "\\arabic{section}.\\arabic{subsection}",
|
|
|
|
"subsubsection" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}",
|
|
|
|
"paragraph" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}.\\arabic{paragraph}",
|
|
|
|
"subparagraph" : "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}.\\arabic{paragraph}.\\arabic{subparagraph}"}
|
2006-03-29 18:49:27 +00:00
|
|
|
|
|
|
|
# Value of TocLevel for sectioning styles
|
2013-05-10 17:47:03 +00:00
|
|
|
toclevels = {"part" : -1,
|
2006-03-29 18:49:27 +00:00
|
|
|
"chapter" : 0,
|
|
|
|
"section" : 1,
|
|
|
|
"subsection" : 2,
|
|
|
|
"subsubsection" : 3,
|
|
|
|
"paragraph" : 4,
|
|
|
|
"subparagraph" : 5}
|
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
i = 0
|
|
|
|
only_comment = 1
|
2006-03-29 18:49:27 +00:00
|
|
|
counter = ""
|
2009-02-04 20:06:50 +00:00
|
|
|
toclevel = ""
|
2006-01-08 15:35:38 +00:00
|
|
|
label = ""
|
2006-03-29 18:49:27 +00:00
|
|
|
labelstring = ""
|
|
|
|
labelstringappendix = ""
|
2006-01-08 15:35:38 +00:00
|
|
|
space1 = ""
|
2006-03-29 18:49:27 +00:00
|
|
|
labelstring_line = -1
|
|
|
|
labelstringappendix_line = -1
|
|
|
|
labeltype_line = -1
|
2006-04-13 08:54:50 +00:00
|
|
|
latextype = ""
|
2006-01-19 08:40:10 +00:00
|
|
|
latextype_line = -1
|
2006-01-08 15:35:38 +00:00
|
|
|
style = ""
|
2006-03-29 18:49:27 +00:00
|
|
|
maxcounter = 0
|
2007-01-30 13:23:21 +00:00
|
|
|
format = 1
|
2008-10-07 15:45:08 +00:00
|
|
|
formatline = 0
|
|
|
|
usemodules = []
|
2011-04-15 02:50:45 +00:00
|
|
|
flexstyles = []
|
2012-11-20 10:49:02 +00:00
|
|
|
opts = 0
|
|
|
|
reqs = 0
|
2013-02-09 17:28:21 +00:00
|
|
|
inchapter = False
|
2014-02-10 21:06:32 +00:00
|
|
|
isflexlayout = False # only used for 48 -> 49
|
|
|
|
# Whether a style is inherited (works only for CopyStyle currently,
|
|
|
|
# not for true inherited styles, see bug 8920
|
|
|
|
inherited = False # only used for 48 -> 49
|
|
|
|
resetsfont_found = False # only used for 48 -> 49
|
2008-10-07 15:45:08 +00:00
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
while i < len(lines):
|
2012-10-12 13:49:10 +00:00
|
|
|
# Skip comments and empty lines
|
|
|
|
if (re_Comment.match(lines[i]) or re_Empty.match(lines[i])):
|
|
|
|
# We need to deal with this conversion here, because it happens
|
|
|
|
# inside the initial comment block.
|
|
|
|
if only_comment and format == 39:
|
|
|
|
match = re_ExtractCategory.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lpre = match.group(1)
|
|
|
|
lcat = match.group(2)
|
|
|
|
lnam = match.group(3)
|
|
|
|
if lcat in ConvDict:
|
|
|
|
lcat = ConvDict[lcat]
|
|
|
|
lines[i] = lpre + "{" + lnam + "}"
|
|
|
|
lines.insert(i+1, "# \\DeclareCategory{" + lcat + "}")
|
|
|
|
i += 1
|
|
|
|
i += 1
|
|
|
|
continue
|
2005-10-21 16:11:36 +00:00
|
|
|
|
2006-01-19 08:40:10 +00:00
|
|
|
# insert file format if not already there
|
2005-10-21 16:11:36 +00:00
|
|
|
if (only_comment):
|
2008-10-06 12:16:17 +00:00
|
|
|
match = re_Format.match(lines[i])
|
|
|
|
if match:
|
2008-10-07 15:45:08 +00:00
|
|
|
formatline = i
|
2008-10-06 12:16:17 +00:00
|
|
|
format = int(match.group(4))
|
|
|
|
if format > 1 and format < currentFormat:
|
|
|
|
lines[i] = "Format %d" % (format + 1)
|
|
|
|
only_comment = 0
|
|
|
|
elif format == currentFormat:
|
|
|
|
# nothing to do
|
|
|
|
return format
|
2005-10-21 16:11:36 +00:00
|
|
|
else:
|
2013-05-15 05:19:49 +00:00
|
|
|
error('Cannot convert file format %s to %s' % (format, currentFormat))
|
2008-10-06 12:16:17 +00:00
|
|
|
else:
|
|
|
|
lines.insert(i, "Format 2")
|
|
|
|
only_comment = 0
|
|
|
|
continue
|
2005-10-21 16:11:36 +00:00
|
|
|
|
|
|
|
# Don't get confused by LaTeX code
|
|
|
|
if re_Preamble.match(lines[i]):
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2005-10-21 16:11:36 +00:00
|
|
|
while i < len(lines) and not re_EndPreamble.match(lines[i]):
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
2009-02-17 20:25:56 +00:00
|
|
|
if re_LangPreamble.match(lines[i]):
|
|
|
|
i += 1
|
|
|
|
while i < len(lines) and not re_EndLangPreamble.match(lines[i]):
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
if re_BabelPreamble.match(lines[i]):
|
|
|
|
i += 1
|
|
|
|
while i < len(lines) and not re_EndBabelPreamble.match(lines[i]):
|
|
|
|
i += 1
|
2012-03-01 00:41:30 +00:00
|
|
|
continue
|
2013-02-21 20:57:59 +00:00
|
|
|
|
2014-05-29 12:10:32 +00:00
|
|
|
if format == 50:
|
|
|
|
# nothing to do.
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
if format == 49:
|
|
|
|
separator = []
|
|
|
|
|
|
|
|
# delete separator styles
|
|
|
|
match = re_Style.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if re_Separator.match(style):
|
|
|
|
del lines[i]
|
|
|
|
while i < len(lines) and not re_End.match(lines[i]):
|
|
|
|
separator.append(lines[i])
|
|
|
|
del lines[i]
|
|
|
|
if i == len(lines):
|
|
|
|
error('Incomplete separator style.')
|
|
|
|
else:
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
|
|
|
|
# delete undefinition of separator styles
|
|
|
|
match = re_NoStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if re_Separator.match(style):
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
|
|
|
|
# replace the CopyStyle statement with the definition of the real
|
|
|
|
# style. This may result in duplicate statements, but that is OK
|
|
|
|
# since the second one will overwrite the first one.
|
|
|
|
match = re_CopyStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if re_Separator.match(style):
|
|
|
|
if len(separator) > 0:
|
|
|
|
lines[i:i+1] = separator
|
|
|
|
else:
|
|
|
|
# FIXME: If this style was redefined in an include file,
|
|
|
|
# we should replace the real style and not this default.
|
|
|
|
lines[i:i+1] = [' Category MainText',
|
|
|
|
' KeepEmpty 1',
|
|
|
|
' Margin Dynamic',
|
|
|
|
' LatexType Paragraph',
|
|
|
|
' LatexName dummy',
|
|
|
|
' ParIndent MM',
|
|
|
|
' Align Block',
|
|
|
|
' LabelType Static',
|
|
|
|
' LabelString "--- Separate Environment ---"',
|
|
|
|
' LabelFont',
|
|
|
|
' Family Roman',
|
|
|
|
' Series Medium',
|
|
|
|
' Size Normal',
|
|
|
|
' Color Blue',
|
|
|
|
' EndFont',
|
|
|
|
' HTMLLabel NONE']
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2014-02-10 21:06:32 +00:00
|
|
|
if format == 48:
|
|
|
|
# The default of ResetsFont in LyX changed from true to false,
|
|
|
|
# because it is now used for all InsetLayouts, not only flex ones.
|
|
|
|
# Therefore we need to set it to true for all flex insets which do
|
|
|
|
# do not already have a ResetsFont.
|
|
|
|
match = re_InsetLayout2.match(lines[i])
|
2014-04-25 21:17:10 +00:00
|
|
|
if not match:
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
name = string.lower(match.group(1))
|
|
|
|
if name != "flex" and name != "\"flex\"" and name[0:5] != "flex:" and name [0:6] != "\"flex:":
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
resetsfont_found = False
|
|
|
|
inherited = False
|
|
|
|
notdone = True
|
|
|
|
while i < len(lines):
|
|
|
|
match = re_ResetsFont.match(lines[i])
|
|
|
|
if match:
|
|
|
|
resetsfont_found = True
|
|
|
|
else:
|
|
|
|
match = re_CopyStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
inherited = True
|
2014-02-10 21:06:32 +00:00
|
|
|
else:
|
2014-04-25 21:17:10 +00:00
|
|
|
match = re_End.match(lines[i])
|
|
|
|
if match:
|
|
|
|
break
|
|
|
|
i += 1
|
|
|
|
if not resetsfont_found and not inherited:
|
|
|
|
lines.insert(i, "\tResetsFont true")
|
|
|
|
|
2014-02-10 21:06:32 +00:00
|
|
|
continue
|
|
|
|
|
2013-06-01 21:42:08 +00:00
|
|
|
if format >= 44 and format <= 47:
|
2013-02-09 19:31:26 +00:00
|
|
|
# nothing to do.
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2013-02-09 17:28:21 +00:00
|
|
|
if format == 43:
|
|
|
|
match = re_LabelTypeIsCounter.match(lines[i])
|
|
|
|
if match:
|
|
|
|
if inchapter:
|
|
|
|
lines[i] = match.group(1) + "LabelType" + match.group(2) + "Above"
|
|
|
|
else:
|
|
|
|
lines[i] = match.group(1) + "LabelType" + match.group(2) + "Static"
|
|
|
|
|
|
|
|
match = re_TopEnvironment.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = match.group(1) + "LabelType" + match.group(2) + "Above"
|
|
|
|
|
|
|
|
match = re_CenteredEnvironment.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = match.group(1) + "LabelType" + match.group(2) + "Centered"
|
|
|
|
|
|
|
|
if inchapter:
|
|
|
|
match = re_Style.match(lines[i])
|
|
|
|
if match:
|
|
|
|
inchapter = False
|
|
|
|
else:
|
|
|
|
match = re_ChapterStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
inchapter = True
|
|
|
|
|
|
|
|
i += 1
|
|
|
|
continue
|
2012-03-01 00:41:30 +00:00
|
|
|
|
2012-12-30 17:29:02 +00:00
|
|
|
if format == 42:
|
|
|
|
if lines[i] == "InsetLayout Caption":
|
|
|
|
lines[i] = "InsetLayout Caption:Standard"
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2012-12-22 10:39:04 +00:00
|
|
|
if format == 41:
|
|
|
|
# nothing to do.
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2012-11-20 10:49:02 +00:00
|
|
|
if format == 40:
|
|
|
|
# reset counters on Style beginning
|
|
|
|
match = re_Style.match(lines[i])
|
|
|
|
if match:
|
|
|
|
opts = 0
|
|
|
|
reqs = 0
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
match = re_OptArgs.match(lines[i])
|
|
|
|
if match:
|
|
|
|
# Save number of optional arguments
|
|
|
|
space1 = match.group(1)
|
|
|
|
opts = int(match.group(3))
|
|
|
|
# OptionalArgs 0 > ResetArgs 1
|
|
|
|
if opts == 0:
|
|
|
|
lines[i] = space1 + "ResetArgs\t1"
|
|
|
|
i += 1
|
|
|
|
else:
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
match = re_ReqArgs.match(lines[i])
|
|
|
|
if match:
|
|
|
|
# Save number of required arguments
|
|
|
|
space1 = match.group(1)
|
|
|
|
reqs = int(match.group(3))
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
# Insert the required number of arguments at the end of the style definition
|
|
|
|
match = re_End.match(lines[i])
|
|
|
|
if match:
|
|
|
|
newarg = ['']
|
|
|
|
# First the optionals (this is the required order pre 2.1)
|
|
|
|
if opts > 0:
|
|
|
|
if opts == 1:
|
|
|
|
newarg = [ '%sArgument 1' % (space1),
|
|
|
|
'%s\tLabelString\t\"Optional Layout Argument\"' % (space1),
|
|
|
|
'%sEndArgument' % (space1)]
|
|
|
|
elif opts > 1:
|
|
|
|
actopt = 1
|
|
|
|
while actopt < (opts + 1):
|
|
|
|
newarg += [ '%sArgument %d' % (space1, actopt),
|
|
|
|
'%s\tLabelString\t\"Optional Layout Argument %d\"' % (space1, actopt),
|
|
|
|
'%sEndArgument' % (space1)]
|
|
|
|
actopt += 1
|
|
|
|
# Now the mandatories
|
|
|
|
if reqs > 0:
|
|
|
|
actopt = opts + 1
|
|
|
|
while actopt < (opts + reqs + 1):
|
|
|
|
newarg += [ '%sArgument %d' % (space1, actopt),
|
|
|
|
'%s\tLabelString\t"Required Layout Argument %d"' % (space1, actopt - opts),
|
|
|
|
'%s\tMandatory\t1' % (space1),
|
|
|
|
'%sEndArgument' % (space1)]
|
|
|
|
actopt += 1
|
|
|
|
# Since we replace the "End" line, re-add this line
|
|
|
|
if len(newarg) > 1:
|
|
|
|
newarg += ['End']
|
|
|
|
lines[i:i+1] = newarg
|
|
|
|
i += len(newarg)
|
|
|
|
# Reset the counters
|
|
|
|
opts = 0
|
|
|
|
reqs = 0
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2012-10-10 17:22:54 +00:00
|
|
|
if format == 39:
|
2012-10-12 13:54:49 +00:00
|
|
|
# There is a conversion with format 40, but it is done within the
|
|
|
|
# initial comment block and so is above.
|
2012-10-10 17:54:26 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
2012-04-19 09:56:32 +00:00
|
|
|
|
2012-10-10 17:22:54 +00:00
|
|
|
if format == 37 or format == 38:
|
2012-10-10 17:54:26 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
2012-04-10 18:21:01 +00:00
|
|
|
|
2012-03-01 00:41:30 +00:00
|
|
|
if format == 36:
|
|
|
|
match = re_CiteFormat.match(lines[i]);
|
|
|
|
if match and match.group(4) == "":
|
|
|
|
lines[i] = match.group(0) + " default"
|
|
|
|
i += 1
|
2009-02-17 20:25:56 +00:00
|
|
|
continue
|
2011-01-30 22:22:18 +00:00
|
|
|
|
2011-12-06 22:38:46 +00:00
|
|
|
if format == 35:
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2011-03-28 23:11:54 +00:00
|
|
|
if format == 34:
|
2012-12-10 16:09:50 +00:00
|
|
|
match = re_QInsetLayout2.match(lines[i])
|
2011-03-28 23:11:54 +00:00
|
|
|
if not match:
|
2012-12-10 16:09:50 +00:00
|
|
|
match = re_InsetLayout2.match(lines[i])
|
2011-03-28 23:11:54 +00:00
|
|
|
if not match:
|
2011-04-15 02:50:45 +00:00
|
|
|
match = re_CopyStyle2.match(lines[i])
|
|
|
|
if not match:
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
style = match.group(2)
|
|
|
|
|
|
|
|
if flexstyles.count(style):
|
|
|
|
lines[i] = match.group(1) + "\"Flex:" + style + "\""
|
2011-03-28 23:11:54 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
2011-04-15 02:50:45 +00:00
|
|
|
|
2011-03-28 23:11:54 +00:00
|
|
|
name = match.group(1)
|
|
|
|
names = name.split(":", 1)
|
|
|
|
if len(names) > 1 and names[0] == "Flex":
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
|
|
|
isflex = False
|
|
|
|
for j in range(i + 1, len(lines)):
|
|
|
|
if re_IsFlex.match(lines[j]):
|
|
|
|
isflex = True
|
|
|
|
break
|
|
|
|
if re_End.match(lines[j]):
|
|
|
|
break
|
|
|
|
|
|
|
|
if isflex:
|
2011-04-15 02:50:45 +00:00
|
|
|
flexstyles.append(name)
|
2011-03-28 23:11:54 +00:00
|
|
|
lines[i] = "InsetLayout \"Flex:" + name + "\""
|
|
|
|
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2011-03-28 15:11:57 +00:00
|
|
|
if format == 33:
|
|
|
|
m = re_Fill.match(lines[i])
|
|
|
|
if m:
|
|
|
|
lines[i] = ""
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2011-02-02 22:28:47 +00:00
|
|
|
if format == 32:
|
|
|
|
match = re_NeedsFloatPkg.match(lines[i])
|
|
|
|
if match:
|
|
|
|
space = match.group(1)
|
|
|
|
val = match.group(2)
|
|
|
|
lines[i] = space + "UsesFloatPkg " + val
|
|
|
|
newval = 'true'
|
2011-02-02 23:00:57 +00:00
|
|
|
if val == '1' or val.lower() == 'true':
|
2011-02-02 22:28:47 +00:00
|
|
|
newval = 'false'
|
|
|
|
lines.insert(i, space + "IsPredefined " + newval)
|
|
|
|
i += 1
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2010-10-13 15:54:39 +00:00
|
|
|
# Only new features
|
2011-01-30 22:22:18 +00:00
|
|
|
if format >= 29 and format <= 31:
|
2010-10-13 15:54:39 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2010-10-12 14:46:17 +00:00
|
|
|
if format == 28:
|
|
|
|
match = re_InsetLayout.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "InsetLayout Flex:" + match.group(1)
|
|
|
|
else:
|
|
|
|
match = re_QInsetLayout.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "InsetLayout \"Flex:" + match.group(1) + "\""
|
2011-02-14 01:36:00 +00:00
|
|
|
else:
|
|
|
|
match = re_InsetLayout_CopyStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "\tCopyStyle Flex:" + match.group(1)
|
|
|
|
else:
|
|
|
|
match = re_QInsetLayout_CopyStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "\tCopyStyle \"Flex:" + match.group(1) + "\""
|
2010-10-12 14:46:17 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2010-03-17 12:23:24 +00:00
|
|
|
# Only new features
|
2010-08-09 21:20:29 +00:00
|
|
|
if format >= 24 and format <= 27:
|
2010-10-12 14:46:17 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
2009-02-17 20:25:56 +00:00
|
|
|
|
2010-03-05 17:24:38 +00:00
|
|
|
if format == 23:
|
2010-03-05 22:58:29 +00:00
|
|
|
match = re_Float.match(lines[i])
|
|
|
|
i += 1
|
|
|
|
if not match:
|
|
|
|
continue
|
|
|
|
# we need to do two things:
|
|
|
|
# (i) Convert Builtin to NeedsFloatPkg
|
|
|
|
# (ii) Write ListCommand lines for the builtin floats table and figure
|
|
|
|
builtin = False
|
|
|
|
cmd = ""
|
|
|
|
while True and i < len(lines):
|
|
|
|
m1 = re_End.match(lines[i])
|
|
|
|
if m1:
|
|
|
|
if builtin and cmd:
|
|
|
|
line = " ListCommand " + cmd
|
|
|
|
lines.insert(i, line)
|
|
|
|
i += 1
|
|
|
|
break
|
|
|
|
m2 = re_Builtin.match(lines[i])
|
|
|
|
if m2:
|
|
|
|
builtin = True
|
|
|
|
ws1 = m2.group(1)
|
|
|
|
arg = m2.group(2)
|
|
|
|
newarg = ""
|
|
|
|
if re_True.match(arg):
|
|
|
|
newarg = "false"
|
|
|
|
else:
|
|
|
|
newarg = "true"
|
|
|
|
lines[i] = ws1 + "NeedsFloatPkg " + newarg
|
|
|
|
m3 = re_Type.match(lines[i])
|
|
|
|
if m3:
|
|
|
|
fltype = m3.group(1)
|
|
|
|
fltype = fltype.lower()
|
|
|
|
if fltype == "table":
|
|
|
|
cmd = "listoftables"
|
|
|
|
elif fltype == "figure":
|
|
|
|
cmd = "listoffigures"
|
|
|
|
# else unknown, which is why we're doing this
|
|
|
|
i += 1
|
|
|
|
continue
|
2010-03-05 17:24:38 +00:00
|
|
|
|
2009-05-28 08:59:25 +00:00
|
|
|
# This just involved new features, not any changes to old ones
|
2010-02-13 15:44:17 +00:00
|
|
|
if format >= 14 and format <= 22:
|
2009-05-28 08:59:25 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2009-02-17 20:25:56 +00:00
|
|
|
# Rename I18NPreamble to BabelPreamble
|
|
|
|
if format == 13:
|
|
|
|
match = re_I18nPreamble.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = match.group(1) + "BabelPreamble"
|
|
|
|
i += 1
|
|
|
|
match = re_EndI18nPreamble.match(lines[i])
|
|
|
|
while i < len(lines) and not match:
|
|
|
|
i += 1
|
|
|
|
match = re_EndI18nPreamble.match(lines[i])
|
|
|
|
lines[i] = match.group(1) + "EndBabelPreamble"
|
|
|
|
i += 1
|
|
|
|
continue
|
2007-08-22 14:36:07 +00:00
|
|
|
|
2009-02-06 17:54:33 +00:00
|
|
|
# These just involved new features, not any changes to old ones
|
|
|
|
if format == 11 or format == 12:
|
2009-02-04 20:06:50 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2008-10-23 00:27:03 +00:00
|
|
|
if format == 10:
|
|
|
|
match = re_UseMod.match(lines[i])
|
|
|
|
if match:
|
|
|
|
module = match.group(1)
|
|
|
|
lines[i] = "DefaultModule " + module
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2008-10-06 14:37:28 +00:00
|
|
|
if format == 9:
|
|
|
|
match = re_Counter.match(lines[i])
|
|
|
|
if match:
|
|
|
|
counterline = i
|
|
|
|
i += 1
|
|
|
|
while i < len(lines):
|
|
|
|
namem = re_Name.match(lines[i])
|
|
|
|
if namem:
|
|
|
|
name = namem.group(1)
|
|
|
|
lines.pop(i)
|
|
|
|
lines[counterline] = "Counter %s" % name
|
|
|
|
# we don't need to increment i
|
|
|
|
continue
|
|
|
|
endem = re_End.match(lines[i])
|
|
|
|
if endem:
|
|
|
|
i += 1
|
|
|
|
break
|
|
|
|
i += 1
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2008-10-07 15:45:08 +00:00
|
|
|
if format == 8:
|
|
|
|
# We want to scan for ams-type includes and, if we find them,
|
|
|
|
# add corresponding UseModule tags to the layout.
|
|
|
|
match = re_AMSMaths.match(lines[i])
|
|
|
|
if match:
|
|
|
|
addstring("theorems-ams", usemodules)
|
|
|
|
addstring("theorems-ams-extended", usemodules)
|
|
|
|
addstring("theorems-sec", usemodules)
|
|
|
|
lines.pop(i)
|
|
|
|
continue
|
|
|
|
match = re_AMSMathsPlain.match(lines[i])
|
|
|
|
if match:
|
|
|
|
addstring("theorems-starred", usemodules)
|
|
|
|
lines.pop(i)
|
|
|
|
continue
|
|
|
|
match = re_AMSMathsSeq.match(lines[i])
|
|
|
|
if match:
|
|
|
|
addstring("theorems-ams", usemodules)
|
|
|
|
addstring("theorems-ams-extended", usemodules)
|
|
|
|
lines.pop(i)
|
|
|
|
continue
|
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2008-10-05 19:39:09 +00:00
|
|
|
# These just involved new features, not any changes to old ones
|
2008-10-07 15:45:08 +00:00
|
|
|
if format >= 5 and format <= 7:
|
2008-01-10 03:59:39 +00:00
|
|
|
i += 1
|
|
|
|
continue
|
|
|
|
|
2007-08-22 14:36:07 +00:00
|
|
|
if format == 4:
|
|
|
|
# Handle conversion to long CharStyle names
|
|
|
|
match = re_CharStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "InsetLayout CharStyle:%s" % (match.group(3))
|
|
|
|
i += 1
|
|
|
|
lines.insert(i, "\tLyXType charstyle")
|
|
|
|
i += 1
|
|
|
|
lines.insert(i, "")
|
|
|
|
lines[i] = "\tLabelString %s" % (match.group(3))
|
|
|
|
i += 1
|
2005-10-21 16:11:36 +00:00
|
|
|
continue
|
|
|
|
|
2007-04-06 09:02:23 +00:00
|
|
|
if format == 3:
|
|
|
|
# convert 'providesamsmath x', 'providesmakeidx x', 'providesnatbib x', 'providesurl x' to
|
|
|
|
# 'provides amsmath x', 'provides makeidx x', 'provides natbib x', 'provides url x'
|
|
|
|
# x is either 0 or 1
|
|
|
|
match = re_Provides.match(lines[i])
|
|
|
|
if match:
|
|
|
|
lines[i] = "%sProvides %s%s%s" % (match.group(1), match.group(2).lower(),
|
|
|
|
match.group(3), match.group(4))
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2007-04-06 09:02:23 +00:00
|
|
|
continue
|
|
|
|
|
2007-01-30 13:23:21 +00:00
|
|
|
if format == 2:
|
|
|
|
caption = []
|
|
|
|
|
|
|
|
# delete caption styles
|
|
|
|
match = re_Style.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if style == "caption":
|
|
|
|
del lines[i]
|
|
|
|
while i < len(lines) and not re_End.match(lines[i]):
|
|
|
|
caption.append(lines[i])
|
|
|
|
del lines[i]
|
|
|
|
if i == len(lines):
|
|
|
|
error('Incomplete caption style.')
|
|
|
|
else:
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
|
|
|
|
# delete undefinition of caption styles
|
|
|
|
match = re_NoStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if style == "caption":
|
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
|
|
|
|
# replace the CopyStyle statement with the definition of the real
|
|
|
|
# style. This may result in duplicate statements, but that is OK
|
|
|
|
# since the second one will overwrite the first one.
|
|
|
|
match = re_CopyStyle.match(lines[i])
|
|
|
|
if match:
|
|
|
|
style = string.lower(match.group(4))
|
|
|
|
if style == "caption":
|
|
|
|
if len(caption) > 0:
|
|
|
|
lines[i:i+1] = caption
|
|
|
|
else:
|
|
|
|
# FIXME: This style comes from an include file, we
|
|
|
|
# should replace the real style and not this default.
|
|
|
|
lines[i:i+1] = [' Margin First_Dynamic',
|
|
|
|
' LatexType Command',
|
|
|
|
' LatexName caption',
|
|
|
|
' NeedProtect 1',
|
|
|
|
' LabelSep xx',
|
|
|
|
' ParSkip 0.4',
|
|
|
|
' TopSep 0.5',
|
|
|
|
' Align Center',
|
|
|
|
' AlignPossible Center',
|
|
|
|
' LabelType Sensitive',
|
|
|
|
' LabelString "Senseless!"',
|
|
|
|
' OptionalArgs 1',
|
|
|
|
' LabelFont',
|
|
|
|
' Series Bold',
|
|
|
|
' EndFont']
|
|
|
|
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2007-01-30 13:23:21 +00:00
|
|
|
continue
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# Delete MaxCounter and remember the value of it
|
|
|
|
match = re_MaxCounter.match(lines[i])
|
|
|
|
if match:
|
|
|
|
level = match.group(4)
|
|
|
|
if string.lower(level) == "counter_chapter":
|
|
|
|
maxcounter = 0
|
|
|
|
elif string.lower(level) == "counter_section":
|
|
|
|
maxcounter = 1
|
|
|
|
elif string.lower(level) == "counter_subsection":
|
|
|
|
maxcounter = 2
|
|
|
|
elif string.lower(level) == "counter_subsubsection":
|
|
|
|
maxcounter = 3
|
|
|
|
elif string.lower(level) == "counter_paragraph":
|
|
|
|
maxcounter = 4
|
|
|
|
elif string.lower(level) == "counter_subparagraph":
|
|
|
|
maxcounter = 5
|
|
|
|
elif string.lower(level) == "counter_enumi":
|
|
|
|
maxcounter = 6
|
|
|
|
elif string.lower(level) == "counter_enumii":
|
|
|
|
maxcounter = 7
|
|
|
|
elif string.lower(level) == "counter_enumiii":
|
|
|
|
maxcounter = 8
|
2005-10-21 16:11:36 +00:00
|
|
|
del lines[i]
|
|
|
|
continue
|
|
|
|
|
|
|
|
# Replace line
|
|
|
|
#
|
|
|
|
# LabelType Counter_EnumI
|
|
|
|
#
|
|
|
|
# with two lines
|
|
|
|
#
|
|
|
|
# LabelType Counter
|
|
|
|
# LabelCounter EnumI
|
|
|
|
#
|
|
|
|
match = re_LabelType.match(lines[i])
|
|
|
|
if match:
|
|
|
|
label = match.group(4)
|
2006-03-29 18:49:27 +00:00
|
|
|
# Remember indenting space for later reuse in added lines
|
2006-01-08 15:35:38 +00:00
|
|
|
space1 = match.group(1)
|
2006-03-29 18:49:27 +00:00
|
|
|
# Remember the line for adding the LabelCounter later.
|
|
|
|
# We can't do it here because it could shift latextype_line etc.
|
|
|
|
labeltype_line = i
|
2005-10-21 16:11:36 +00:00
|
|
|
if string.lower(label[:8]) == "counter_":
|
2006-03-29 18:49:27 +00:00
|
|
|
counter = string.lower(label[8:])
|
2005-10-21 16:11:36 +00:00
|
|
|
lines[i] = re_LabelType.sub(r'\1\2\3Counter', lines[i])
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# Remember the LabelString line
|
|
|
|
match = re_LabelString.match(lines[i])
|
|
|
|
if match:
|
|
|
|
labelstring = match.group(4)
|
|
|
|
labelstring_line = i
|
|
|
|
|
|
|
|
# Remember the LabelStringAppendix line
|
|
|
|
match = re_LabelStringAppendix.match(lines[i])
|
|
|
|
if match:
|
|
|
|
labelstringappendix = match.group(4)
|
|
|
|
labelstringappendix_line = i
|
|
|
|
|
|
|
|
# Remember the LatexType line
|
2006-01-08 15:35:38 +00:00
|
|
|
match = re_LatexType.match(lines[i])
|
|
|
|
if match:
|
2006-04-13 08:54:50 +00:00
|
|
|
latextype = string.lower(match.group(4))
|
2006-01-19 08:40:10 +00:00
|
|
|
latextype_line = i
|
2006-03-29 18:49:27 +00:00
|
|
|
|
2009-02-04 20:06:50 +00:00
|
|
|
# Remember the TocLevel line
|
|
|
|
match = re_TocLevel.match(lines[i])
|
|
|
|
if match:
|
|
|
|
toclevel = string.lower(match.group(4))
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# Reset variables at the beginning of a style definition
|
2006-01-08 15:35:38 +00:00
|
|
|
match = re_Style.match(lines[i])
|
|
|
|
if match:
|
2006-03-29 18:49:27 +00:00
|
|
|
style = string.lower(match.group(4))
|
|
|
|
counter = ""
|
2009-02-04 20:06:50 +00:00
|
|
|
toclevel = ""
|
2006-01-08 15:35:38 +00:00
|
|
|
label = ""
|
|
|
|
space1 = ""
|
2006-03-29 18:49:27 +00:00
|
|
|
labelstring = ""
|
|
|
|
labelstringappendix = ""
|
|
|
|
labelstring_line = -1
|
|
|
|
labelstringappendix_line = -1
|
|
|
|
labeltype_line = -1
|
2006-04-13 08:54:50 +00:00
|
|
|
latextype = ""
|
2006-01-19 08:40:10 +00:00
|
|
|
latextype_line = -1
|
2006-03-29 18:49:27 +00:00
|
|
|
|
|
|
|
if re_End.match(lines[i]):
|
|
|
|
|
|
|
|
# Add a line "LatexType Bib_Environment" if LabelType is Bibliography
|
|
|
|
# (or change the existing LatexType)
|
|
|
|
if string.lower(label) == "bibliography":
|
|
|
|
if (latextype_line < 0):
|
|
|
|
lines.insert(i, "%sLatexType Bib_Environment" % space1)
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2006-03-29 18:49:27 +00:00
|
|
|
else:
|
|
|
|
lines[latextype_line] = re_LatexType.sub(r'\1\2\3Bib_Environment', lines[latextype_line])
|
|
|
|
|
2006-04-13 08:54:50 +00:00
|
|
|
# Change "LabelType Static" to "LabelType Itemize" for itemize environments
|
|
|
|
if latextype == "item_environment" and string.lower(label) == "static":
|
|
|
|
lines[labeltype_line] = re_LabelType.sub(r'\1\2\3Itemize', lines[labeltype_line])
|
|
|
|
|
|
|
|
# Change "LabelType Counter_EnumI" to "LabelType Enumerate" for enumerate environments
|
|
|
|
if latextype == "item_environment" and string.lower(label) == "counter_enumi":
|
|
|
|
lines[labeltype_line] = re_LabelType.sub(r'\1\2\3Enumerate', lines[labeltype_line])
|
|
|
|
# Don't add the LabelCounter line later
|
|
|
|
counter = ""
|
|
|
|
|
2006-03-29 18:49:27 +00:00
|
|
|
# Replace
|
|
|
|
#
|
|
|
|
# LabelString "Chapter"
|
|
|
|
#
|
|
|
|
# with
|
|
|
|
#
|
|
|
|
# LabelString "Chapter \arabic{chapter}"
|
|
|
|
#
|
|
|
|
# if this style has a counter. Ditto for LabelStringAppendix.
|
|
|
|
# This emulates the hardcoded article style numbering of 1.3
|
|
|
|
#
|
|
|
|
if counter != "":
|
2011-02-14 02:28:13 +00:00
|
|
|
if style in counters:
|
2006-03-29 18:49:27 +00:00
|
|
|
if labelstring_line < 0:
|
|
|
|
lines.insert(i, '%sLabelString "%s"' % (space1, counters[style]))
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2006-03-29 18:49:27 +00:00
|
|
|
else:
|
|
|
|
new_labelstring = concatenate_label(labelstring, counters[style])
|
|
|
|
lines[labelstring_line] = re_LabelString.sub(
|
|
|
|
r'\1\2\3%s' % new_labelstring.replace("\\", "\\\\"),
|
|
|
|
lines[labelstring_line])
|
2011-02-14 02:28:13 +00:00
|
|
|
if style in appendixcounters:
|
2006-03-29 18:49:27 +00:00
|
|
|
if labelstringappendix_line < 0:
|
|
|
|
lines.insert(i, '%sLabelStringAppendix "%s"' % (space1, appendixcounters[style]))
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2006-03-29 18:49:27 +00:00
|
|
|
else:
|
|
|
|
new_labelstring = concatenate_label(labelstring, appendixcounters[style])
|
|
|
|
lines[labelstringappendix_line] = re_LabelStringAppendix.sub(
|
|
|
|
r'\1\2\3%s' % new_labelstring.replace("\\", "\\\\"),
|
|
|
|
lines[labelstringappendix_line])
|
|
|
|
|
|
|
|
# Now we can safely add the LabelCounter line
|
|
|
|
lines.insert(labeltype_line + 1, "%sLabelCounter %s" % (space1, counter))
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2006-03-29 18:49:27 +00:00
|
|
|
|
|
|
|
# Add the TocLevel setting for sectioning styles
|
2011-02-14 02:28:13 +00:00
|
|
|
if toclevel == "" and style in toclevels and maxcounter <= toclevels[style]:
|
2009-12-05 22:56:16 +00:00
|
|
|
lines.insert(i, '%s\tTocLevel %d' % (space1, toclevels[style]))
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2006-01-08 15:35:38 +00:00
|
|
|
|
2007-08-22 14:36:07 +00:00
|
|
|
i += 1
|
2005-10-21 16:11:36 +00:00
|
|
|
|
2011-09-12 20:42:22 +00:00
|
|
|
if only_comment:
|
|
|
|
lines.insert(i, "Format 2")
|
2008-10-07 15:45:08 +00:00
|
|
|
if usemodules:
|
|
|
|
i = formatline + 1
|
|
|
|
for mod in usemodules:
|
|
|
|
lines.insert(i, "UseModule " + mod)
|
|
|
|
i += 1
|
|
|
|
|
2007-03-24 12:39:45 +00:00
|
|
|
return format + 1
|
|
|
|
|
2005-10-21 16:11:36 +00:00
|
|
|
|
|
|
|
def main(argv):
|
|
|
|
|
|
|
|
# Open files
|
|
|
|
if len(argv) == 1:
|
2009-11-13 16:12:04 +00:00
|
|
|
source = sys.stdin
|
2005-10-21 16:11:36 +00:00
|
|
|
output = sys.stdout
|
|
|
|
elif len(argv) == 3:
|
2009-11-13 16:12:04 +00:00
|
|
|
source = open(argv[1], 'rb')
|
2005-10-21 16:11:36 +00:00
|
|
|
output = open(argv[2], 'wb')
|
|
|
|
else:
|
|
|
|
error(usage(argv[0]))
|
|
|
|
|
|
|
|
# Do the real work
|
2009-11-13 16:12:04 +00:00
|
|
|
lines = read(source)
|
2007-03-24 12:39:45 +00:00
|
|
|
format = 1
|
2008-01-10 03:59:39 +00:00
|
|
|
while (format < currentFormat):
|
2007-03-24 12:39:45 +00:00
|
|
|
format = convert(lines)
|
2005-10-21 16:11:36 +00:00
|
|
|
write(output, lines)
|
|
|
|
|
|
|
|
# Close files
|
|
|
|
if len(argv) == 3:
|
2009-11-13 16:12:04 +00:00
|
|
|
source.close()
|
2005-10-21 16:11:36 +00:00
|
|
|
output.close()
|
|
|
|
|
|
|
|
return 0
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
main(sys.argv)
|