[Pkg-lyx-devel] svn commit: r673 - in /elyxer/trunk: ./ debian/ docs/ src/ src/conf/ src/gen/ src/io/ src/math/ test/ test/docs/ test/subdir/

hoexter at users.alioth.debian.org hoexter at users.alioth.debian.org
Wed Oct 28 14:52:36 UTC 2009 

Author: hoexter
Date: Wed Oct 28 14:52:35 2009
New Revision: 673

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=673
Log:
* New upstream release
  + Converts currency symbols.
  + Includes LyX child documents.

Added:
    elyxer/trunk/test/docs/
      - copied from r672, elyxer/branches/upstream/current/test/docs/
Removed:
    elyxer/trunk/docs/elyxer.jpg
    elyxer/trunk/indelyxer.py
Modified:
    elyxer/trunk/debian/changelog
    elyxer/trunk/docs/changelog.html
    elyxer/trunk/docs/changelog.lyx
    elyxer/trunk/docs/devguide.html
    elyxer/trunk/docs/index.html
    elyxer/trunk/docs/math-unicode.html
    elyxer/trunk/docs/math.html
    elyxer/trunk/docs/userguide-toc.html
    elyxer/trunk/docs/userguide.html
    elyxer/trunk/elyxer.py
    elyxer/trunk/src/conf/base.cfg
    elyxer/trunk/src/conf/config.py
    elyxer/trunk/src/gen/image.py
    elyxer/trunk/src/gen/inset.py
    elyxer/trunk/src/gen/toc.py
    elyxer/trunk/src/io/convert.py
    elyxer/trunk/src/io/path.py
    elyxer/trunk/src/math/bits.py
    elyxer/trunk/src/math/command.py
    elyxer/trunk/src/principal.py
    elyxer/trunk/test/appendix-1-6-2-test.html
    elyxer/trunk/test/appendix-1-6-2-toc-test.html
    elyxer/trunk/test/bibtex-test.html
    elyxer/trunk/test/branches-test.html
    elyxer/trunk/test/decorations-1-6-2-test.html
    elyxer/trunk/test/descriptions-test.html
    elyxer/trunk/test/file-1-6-2-good.html
    elyxer/trunk/test/file-1-6-2-test.html
    elyxer/trunk/test/file-1-6-2.lyx
    elyxer/trunk/test/footnotes-1-6-2-test.html
    elyxer/trunk/test/helloworld-test.html
    elyxer/trunk/test/index-1-6-2-test.html
    elyxer/trunk/test/lists-1-6-2-test.html
    elyxer/trunk/test/math-1-6-2-good.html
    elyxer/trunk/test/math-1-6-2-test.html
    elyxer/trunk/test/math-1-6-2.lyx
    elyxer/trunk/test/subdir/appendix-1-6-2-test.html
    elyxer/trunk/test/table-1-6-2-test.html
    elyxer/trunk/test/with images-good.html
    elyxer/trunk/test/with images-html-good.html
    elyxer/trunk/test/with images-html-test.html
    elyxer/trunk/test/with images-jpg-good.html
    elyxer/trunk/test/with images-jpg-test.html
    elyxer/trunk/test/with images-test.html

Modified: elyxer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/debian/changelog?rev=673&op=diff
==============================================================================
--- elyxer/trunk/debian/changelog (original)
+++ elyxer/trunk/debian/changelog Wed Oct 28 14:52:35 2009
@@ -1,3 +1,12 @@
+elyxer (0.34-1) UNRELEASED; urgency=low
+
+  [ Sven Hoexter ]
+  * New upstream release
+    + Converts currency symbols.
+    + Includes LyX child documents.
+
+ -- Sven Hoexter <hoexter at debian.org>  Wed, 28 Oct 2009 15:52:09 +0100
+
 elyxer (0.33-1) unstable; urgency=low
 
   * New upstream release

Modified: elyxer/trunk/docs/changelog.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/changelog.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/changelog.html (original)
+++ elyxer/trunk/docs/changelog.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyXer changelog</title>
 </head>
@@ -19,7 +19,31 @@
 </div>
 <ul>
 <li>
-0.33 (unreleased):<ul>
+0.34 (unreleased):<ul>
+<li>
+Support for child document inclusion (Insert&nbsp;▷&nbsp;File&nbsp;▷&nbsp;Child Document…).
+</li>
+<li>
+Avoid generating images on different directories (relative paths starting with <tt>../</tt>).
+</li>
+<li>
+Added <tt>\maltese</tt> <span class="formula">✠</span> and financial symbols $, €, ¥.
+</li>
+<li>
+Removed annoying message “Unexpected end of bracket” when parsing empty brackets.
+</li>
+<li>
+Support for <tt>\raisebox</tt>.
+</li>
+<li>
+Created new structure of <tt>Writer</tt>s, preparing for document segmentation and TOC generation.
+</li>
+
+</ul>
+
+</li>
+<li>
+0.33 (2009-10-19):<ul>
 <li>
 New TOC generation process based on an already-generated HTML document, not ready for prime time yet.
 </li>

Modified: elyxer/trunk/docs/changelog.lyx
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/changelog.lyx?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/changelog.lyx (original)
+++ elyxer/trunk/docs/changelog.lyx Wed Oct 28 14:52:35 2009
@@ -64,7 +64,73 @@
 \end_layout
 
 \begin_layout Itemize
-0.33 (unreleased):
+0.34 (unreleased):
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+Support for child document inclusion (Insert\SpecialChar \menuseparator
+File\SpecialChar \menuseparator
+Child Document\SpecialChar \ldots{}
+).
+\end_layout
+
+\begin_layout Itemize
+Avoid generating images on different directories (relative paths starting
+ with 
+\family typewriter
+../
+\family default
+).
+\end_layout
+
+\begin_layout Itemize
+Added 
+\family typewriter
+
+\backslash
+maltese
+\family default
+ 
+\begin_inset Formula $\maltese$
+\end_inset
+
+ and financial symbols $, €, ¥.
+\end_layout
+
+\begin_layout Itemize
+Removed annoying message 
+\begin_inset Quotes eld
+\end_inset
+
+Unexpected end of bracket
+\begin_inset Quotes erd
+\end_inset
+
+ when parsing empty brackets.
+\end_layout
+
+\begin_layout Itemize
+Support for 
+\family typewriter
+
+\backslash
+raisebox
+\family default
+.
+\end_layout
+
+\begin_layout Itemize
+Created new structure of 
+\family typewriter
+Writer
+\family default
+s, preparing for document segmentation and TOC generation.
+\end_layout
+
+\end_deeper
+\begin_layout Itemize
+0.33 (2009-10-19):
 \end_layout
 
 \begin_deeper

Modified: elyxer/trunk/docs/devguide.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/devguide.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/devguide.html (original)
+++ elyxer/trunk/docs/devguide.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyxer Developer Guide</title>
 </head>

Modified: elyxer/trunk/docs/index.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/index.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/index.html (original)
+++ elyxer/trunk/docs/index.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyXer</title>
 </head>
@@ -69,7 +69,7 @@
 Downloads
 </h3>
 <div class="Standard">
-You can download the latest version 0.33, created on 2009-10-19, from the project’s <a class="URL" href="https://savannah.nongnu.org/files/?group=elyxer">download area</a>. See the <a class="URL" href="changelog.html">change log</a> for information about past versions. <span class="greyedout">
+You can download the latest version 0.34, created on 2009-10-28, from the project’s <a class="URL" href="https://savannah.nongnu.org/files/?group=elyxer">download area</a>. See the <a class="URL" href="changelog.html">change log</a> for information about past versions. <span class="greyedout">
 <div class="Standard">
 Note: if this latest version hasn’t yet hit the mirrors and you are impatient to try it out, please visit <a class="URL" href="http://download.savannah.gnu.org/releases-noredirect/elyxer/">the Savannah direct download page</a>.
 </div>

Modified: elyxer/trunk/docs/math-unicode.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/math-unicode.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/math-unicode.html (original)
+++ elyxer/trunk/docs/math-unicode.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyxer Math Showcase (Unicode edition)</title>
 </head>

Modified: elyxer/trunk/docs/math.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/math.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/math.html (original)
+++ elyxer/trunk/docs/math.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyxer Math Showcase (non-Unicode edition)</title>
 </head>

Modified: elyxer/trunk/docs/userguide-toc.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/userguide-toc.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/userguide-toc.html (original)
+++ elyxer/trunk/docs/userguide-toc.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="toc.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/docs/userguide.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/docs/userguide.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/docs/userguide.html (original)
+++ elyxer/trunk/docs/userguide.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="lyx.css" type="text/css" media="screen"/>
 <title>eLyXer User Guide</title>
 </head>

Modified: elyxer/trunk/elyxer.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/elyxer.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/elyxer.py (original)
+++ elyxer/trunk/elyxer.py Wed Oct 28 14:52:35 2009
@@ -30,6 +30,7 @@
 
 
 
+import os.path
 
 
 
@@ -253,6 +254,7 @@
       u'\\begin_inset CommandInset bibtex':u'BibTeX', 
       u'\\begin_inset CommandInset citation':u'BiblioCite', 
       u'\\begin_inset CommandInset href':u'URL', 
+      u'\\begin_inset CommandInset include':u'IncludeInset', 
       u'\\begin_inset CommandInset index_print':u'PrintIndex', 
       u'\\begin_inset CommandInset label':u'Label', 
       u'\\begin_inset CommandInset nomencl_print':u'NomenclaturePrint', 
@@ -497,8 +499,8 @@
       }
 
   commands = {
-      u'\\!':u'', u'\\%':u'%', u'\\,':u' ', u'\\:':u' ', u'\\Box':u'□', 
-      u'\\CIRCLE':u'●', u'\\CheckedBox':u'☑', u'\\Circle':u'○', 
+      u'\\!':u'', u'\\$':u'$', u'\\%':u'%', u'\\,':u' ', u'\\:':u' ', 
+      u'\\Box':u'□', u'\\CIRCLE':u'●', u'\\CheckedBox':u'☑', u'\\Circle':u'○', 
       u'\\Diamond':u'◇', u'\\Downarrow':u'⇓', u'\\Im':u'ℑ', u'\\Join':u'⨝', 
       u'\\LEFTCIRCLE':u'◖', u'\\LEFTcircle':u'◐', u'\\Leftarrow':u'⇐', 
       u'\\Leftrightarrow':u' ⇔ ', u'\\Longleftarrow':u'⟸', 
@@ -527,11 +529,11 @@
       u'\\diamond':u'◇', u'\\diamondsuit':u'♦', u'\\dim':u'dim', 
       u'\\displaystyle':u'', u'\\div':u'÷', u'\\doteq':u'≐', u'\\dots':u'…', 
       u'\\downarrow':u'↓', u'\\earth':u'♁', u'\\ell':u'â„“', u'\\emptyset':u'âˆ
', 
-      u'\\equiv':u' ≡ ', u'\\exists':u'∃', u'\\exp':u'exp', u'\\female':u'♀', 
-      u'\\flat':u'♭', u'\\forall':u'∀', u'\\frown':u'⌢', u'\\frownie':u'☹', 
-      u'\\gcd':u'gcd', u'\\ge':u' ≥ ', u'\\gemini':u'♊', u'\\geq':u' ≥ ', 
-      u'\\geq)':u'≥', u'\\gets':u'←', u'\\gg':u'≫', u'\\gimel':u'ℷ', 
-      u'\\hbar':u'ℏ', u'\\heartsuit':u'♥', u'\\hom':u'hom', 
+      u'\\equiv':u' ≡ ', u'\\euro':u'€', u'\\exists':u'∃', u'\\exp':u'exp', 
+      u'\\female':u'♀', u'\\flat':u'♭', u'\\forall':u'∀', u'\\frown':u'⌢', 
+      u'\\frownie':u'☹', u'\\gcd':u'gcd', u'\\ge':u' ≥ ', u'\\gemini':u'♊', 
+      u'\\geq':u' ≥ ', u'\\geq)':u'≥', u'\\gets':u'←', u'\\gg':u'≫', 
+      u'\\gimel':u'ℷ', u'\\hbar':u'ℏ', u'\\heartsuit':u'♥', u'\\hom':u'hom', 
       u'\\hookleftarrow':u'↩', u'\\hookrightarrow':u'↪', u'\\imath':u'ı', 
       u'\\implies':u'  ⇒  ', u'\\in':u' ∈ ', u'\\inf':u'inf', u'\\infty':u'∞', 
       u'\\int':u'<span class="bigsymbol">∫</span>', 
@@ -547,19 +549,19 @@
       u'\\ln':u'ln', u'\\lnot':u'¬', u'\\log':u'log', u'\\longleftarrow':u'⟵', 
       u'\\longleftrightarrow':u'⟷', u'\\longmapsto':u'⟼', 
       u'\\longrightarrow':u'⟶', u'\\lor':u'∨', u'\\lozenge':u'◊', 
-      u'\\lyxlock':u'', u'\\male':u'♂', u'\\mapsto':u'↦', u'\\max':u'max', 
-      u'\\mercury':u'☿', u'\\mho':u'℧', u'\\mid':u'∣', u'\\min':u'min', 
-      u'\\models':u'⊨', u'\\mp':u'∓', u'\\nabla':u'∇', u'\\natural':u'♮', 
-      u'\\ne':u' ≠ ', u'\\nearrow':u'↗', u'\\neg':u'¬', u'\\neg)':u'¬', 
-      u'\\neptune':u'♆', u'\\neq':u' ≠ ', u'\\ni':u'∋', u'\\ni)':u'∋', 
-      u'\\nonumber':u'', u'\\not':u'¬', u'\\not<':u'≮', u'\\not=':u'≠', 
-      u'\\not>':u'≯', u'\\not\\in':u' ∉ ', u'\\nwarrow':u'↖', u'\\odot':u'⊙', 
-      u'\\oint':u'∮', u'\\ominus':u'⊖', u'\\oplus':u'⊕', u'\\oslash':u'⊘', 
-      u'\\otimes':u'⊗', u'\\owns':u'∋', u'\\parallel':u'∥', u'\\partial':u'∂', 
-      u'\\perp':u'⊥', u'\\pisces':u'♓', u'\\pluto':u'♇', u'\\pm':u'±', 
-      u'\\pounds':u'£', u'\\prec':u'≺', u'\\preceq':u'≼', u'\\prime':u'′', 
-      u'\\prod':u'<span class="bigsymbol">∏</span>', u'\\prompto':u'∝', 
-      u'\\propto':u' ∝ ', u'\\qquad':u'  ', u'\\quad':u' ', 
+      u'\\lyxlock':u'', u'\\male':u'♂', u'\\maltese':u'✠', u'\\mapsto':u'↦', 
+      u'\\max':u'max', u'\\mercury':u'☿', u'\\mho':u'℧', u'\\mid':u'∣', 
+      u'\\min':u'min', u'\\models':u'⊨', u'\\mp':u'∓', u'\\nabla':u'∇', 
+      u'\\natural':u'♮', u'\\ne':u' ≠ ', u'\\nearrow':u'↗', u'\\neg':u'¬', 
+      u'\\neg)':u'¬', u'\\neptune':u'♆', u'\\neq':u' ≠ ', u'\\ni':u'∋', 
+      u'\\ni)':u'∋', u'\\nonumber':u'', u'\\not':u'¬', u'\\not<':u'≮', 
+      u'\\not=':u'≠', u'\\not>':u'≯', u'\\not\\in':u' ∉ ', u'\\nwarrow':u'↖', 
+      u'\\odot':u'⊙', u'\\oint':u'∮', u'\\ominus':u'⊖', u'\\oplus':u'⊕', 
+      u'\\oslash':u'⊘', u'\\otimes':u'⊗', u'\\owns':u'∋', u'\\parallel':u'∥', 
+      u'\\partial':u'∂', u'\\perp':u'⊥', u'\\pisces':u'♓', u'\\pluto':u'♇', 
+      u'\\pm':u'±', u'\\pounds':u'£', u'\\prec':u'≺', u'\\preceq':u'≼', 
+      u'\\prime':u'′', u'\\prod':u'<span class="bigsymbol">∏</span>', 
+      u'\\prompto':u'∝', u'\\propto':u' ∝ ', u'\\qquad':u'  ', u'\\quad':u' ', 
       u'\\quarternote':u'♩', u'\\rangle':u'⟩', u'\\rbrace':u'}', 
       u'\\rbrace)':u'}', u'\\rbrack':u']', u'\\rceil':u'⌉', u'\\rfloor':u'⌋', 
       u'\\rhd':u'⊳', u'\\rightarrow':u' → ', u'\\rightarrow)':u'→', 
@@ -586,8 +588,8 @@
       u'\\varclubsuit':u'♧', u'\\vardiamondsuit':u'♦', u'\\varheartsuit':u'♥', 
       u'\\varspadesuit':u'♤', u'\\vdash':u'⊢', u'\\vdots':u'⋮', u'\\vee':u'∨', 
       u'\\vee)':u'∨', u'\\vert':u'∣', u'\\virgo':u'♍', u'\\wedge':u'∧', 
-      u'\\wedge)':u'∧', u'\\wp':u'℘', u'\\wr':u'≀', u'\\{':u'{', u'\\|':u'∥', 
-      u'\\}':u'}', 
+      u'\\wedge)':u'∧', u'\\wp':u'℘', u'\\wr':u'≀', u'\\yen':u'¥', u'\\{':u'{', 
+      u'\\|':u'∥', u'\\}':u'}', 
       }
 
   decoratingfunctions = {
@@ -643,6 +645,10 @@
       u'\\underline':u'u', u'\\vphantom':u'span class="phantom"', 
       }
 
+  spacingfunctions = {
+      u'\\raisebox':u'span class="raisebox"', 
+      }
+
   starts = {
       u'beginafter':u'}', u'beginbefore':u'\\begin{', u'bracket':u'{', 
       u'command':u'\\', u'complex':u'\\[', u'simple':u'$', 
@@ -670,7 +676,7 @@
   "Configuration class from config file"
 
   version = {
-      u'date':u'2009-10-19', u'lyxformat':u'345', u'number':u'0.33', 
+      u'date':u'2009-10-28', u'lyxformat':u'345', u'number':u'0.34', 
       }
 
 class NumberingConfig(object):
@@ -2332,6 +2338,22 @@
       return
     self.output.settag(TagConfig.boxes[self.type], True)
 
+class IncludeInset(Container):
+  "A child document included within another."
+
+  # the converter factory will be set in converter.py
+  converterfactory = None
+
+  def __init__(self):
+    self.parser = InsetParser()
+    self.output = ContentsOutput()
+
+  def process(self):
+    "Include the provided child document"
+    self.filename = self.parser.parameters['filename']
+    Trace.debug('Child document: ' + self.filename)
+    converter = IncludeInset.converterfactory.create(self.filename)
+    converter.convert()
 
 
 
@@ -3092,7 +3114,6 @@
       self.add(self.inner)
       return
     if pos.finished():
-      Trace.error('Unexpected end of bracket')
       return
     if pos.current() != self.ending:
       Trace.error('No formula in bracket at ' + pos.remaining())
@@ -3345,8 +3366,7 @@
   commandmap = FormulaConfig.fractionfunctions
 
   def parsebit(self, pos):
-    "Parse a fraction function with two parameters"
-    tags = self.translated
+    "Parse a fraction function with two parameters (optional alignment)"
     self.output = TaggedOutput().settag(self.translated[0])
     align = self.parsesquare(pos)
     parameter1 = self.parseparameter(pos)
@@ -3370,11 +3390,29 @@
       parameter1.type = 'font'
       parameter2.type = 'font'
 
+class SpacingFunction(CommandBit):
+  "A spacing function with two parameters"
+
+  commandmap = FormulaConfig.spacingfunctions
+
+  def parsebit(self, pos):
+    "Parse a spacing function with two parameters"
+    parameter1 = Bracket().parseliteral(pos)
+    if not parameter1:
+      Trace.error('Missing first {} in function ' + self.translated[0])
+      return
+    parameter2 = self.parseparameter(pos)
+    if not parameter2:
+      Trace.error('Missing second {} in function ' + self.translated[0])
+      return
+    self.output = TaggedOutput().settag(self.translated +
+        ' style="vertical-align:' + parameter1.literal + '"')
+
 FormulaFactory.bits += [FormulaCommand(), SymbolFunction()]
 FormulaCommand.commandbits = [
     EmptyCommand(), AlphaCommand(), OneParamFunction(), DecoratingFunction(),
     FractionFunction(), FontFunction(), LabelFunction(), TextFunction(),
-    HybridFunction(),
+    HybridFunction(), SpacingFunction(),
     ]
 
 
@@ -3581,6 +3619,17 @@
     if len(dir) > 0 and not os.path.exists(dir):
       os.makedirs(dir)
 
+  def removebackdirs(self):
+    "Remove any occurrences of ../ (or ..\ on Windows)"
+    self.path = os.path.normpath(self.path)
+    backdir = '..' + os.path.sep
+    while self.path.startswith(backdir):
+      Trace.debug('Backdir in: ' + self.path)
+      self.path = self.path[len(backdir):]
+    while self.url.startswith('../'):
+      Trace.debug('Backdir in: ' + self.url)
+      self.url = self.url[len('../'):]
+
 
 
 class Image(Container):
@@ -3598,13 +3647,15 @@
     if not self.origin.exists():
       Trace.error('Image ' + unicode(self.origin) + ' not found')
       return
-    self.destination = self.checkext(OutputPath(self.origin))
+    self.destination = self.getdestination(self.origin)
     self.convert(self.getparams())
     imagefile = ImageFile(self.destination)
     self.width, self.height = imagefile.getdimensions()
 
-  def checkext(self, destination):
-    "Convert extension of destination to output image format"
+  def getdestination(self, origin):
+    "Convert origin path to destination path."
+    "Changes extension of destination to output image format."
+    destination = OutputPath(origin)
     forceformat = '.jpg'
     forcedest = '.png'
     if Options.forceformat:
@@ -3612,6 +3663,7 @@
       forcedest = Options.forceformat
     if not destination.hasext(forceformat):
       destination.changeext(forcedest)
+    destination.removebackdirs()
     return destination
 
   def convert(self, params):
@@ -4551,7 +4603,13 @@
     self.depth = 0
     Options.nocopy = True
 
-  def writetoc(self, container):
+  def clone(self, filterheader):
+    "Return a cloned copy."
+    clone = TOCWriter()
+    clone.writer = self.writer
+    return clone
+
+  def write(self, container):
     "Write the table of contents for a container."
     if container.__class__ in [LyxHeader, LyxFooter]:
       self.writeheaderfooter(container)
@@ -4936,34 +4994,62 @@
 class eLyXerConverter(object):
   "Converter for a document in a lyx file"
 
-  def __init__(self, ioparser):
-    "Create the converter"
+  latestwriter = None
+
+  def setio(self, ioparser):
+    "Set the InOutParser"
     self.reader = LineReader(ioparser.filein)
-    self.writer = LineWriter(ioparser.fileout)
+    linewriter = LineWriter(ioparser.fileout)
+    if Options.toc:
+      self.writer = TOCWriter(linewriter)
+    else:
+      self.writer = ContainerWriter(linewriter)
+    eLyXerConverter.latestwriter = self.writer
+    return self
+
+  def embed(self, filein):
+    "Embed the results for a new input file into the latest output file."
+    "Header and footer are ignored. Useful for embedding one document inside another."
+    self.reader = LineReader(filein)
+    self.writer = eLyXerConverter.latestwriter.clone(filterheader = True)
+    return self
 
   def convert(self):
     "Perform the conversion for the document"
     try:
-      if Options.toc:
-        # generate TOC
-        writer = TOCWriter(self.writer)
-        self.processcontents(lambda container: writer.writetoc(container))
-      else:
-        # generate converted document
-        self.processcontents(lambda container: self.writer.write(container.gethtml()))
+      self.processcontents()
     except (Exception):
       Trace.error('Conversion failed at ' + self.reader.currentline())
       raise
 
-  def processcontents(self, write):
+  def processcontents(self):
     "Parse the contents and write it by containers"
     factory = ContainerFactory()
-    postproc = Postprocessor()
+    self.postproc = Postprocessor()
     while not self.reader.finished():
       containers = factory.createsome(self.reader)
       for container in containers:
-        container = postproc.postprocess(container)
-        write(container)
+        container = self.postproc.postprocess(container)
+        self.writer.write(container)
+
+class ContainerWriter(object):
+  "A writer of containers. Just writes them out to a line writer."
+
+  def __init__(self, linewriter):
+    self.linewriter = linewriter
+    self.filterheader = False
+
+  def clone(self, filterheader):
+    "Clone the writer."
+    clone = ContainerWriter(self.linewriter)
+    clone.filterheader = filterheader
+    return clone
+
+  def write(self, container):
+    "Write a container to the line writer."
+    if self.filterheader and container.__class__ in [LyxHeader, LyxFooter]:
+      return
+    self.linewriter.write(container.gethtml())
 
 class InOutParser(object):
   "Parse in and out arguments"
@@ -4992,6 +5078,16 @@
       raise Exception('Unused arguments: ' + unicode(args))
     return self
 
+class ConverterFactory(object):
+  "Create a converter fit for converting a filename and embedding the result."
+
+  def create(self, filename):
+    "Create a converter for a given filename."
+    fullname = os.path.join(Options.directory, filename)
+    return eLyXerConverter().embed(fullname)
+
+IncludeInset.converterfactory = ConverterFactory()
+
 
 
 def readdir(filename, diroption):
@@ -5014,7 +5110,7 @@
     readdir(ioparser.fileout, 'destdirectory')
   else:
     Options.destdirectory = '.'
-  converter = eLyXerConverter(ioparser)
+  converter = eLyXerConverter().setio(ioparser)
   converter.convert()
 
 def main():

Modified: elyxer/trunk/src/conf/base.cfg
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/conf/base.cfg?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/conf/base.cfg (original)
+++ elyxer/trunk/src/conf/base.cfg Wed Oct 28 14:52:35 2009
@@ -86,6 +86,7 @@
 \begin_inset LatexCommand citealt:BiblioCite
 \begin_inset CommandInset href:URL
 \begin_inset CommandInset index_print:PrintIndex
+\begin_inset CommandInset include:IncludeInset
 \begin_inset CommandInset label:Label
 \begin_inset CommandInset nomencl_print:NomenclaturePrint
 \begin_inset CommandInset nomenclature:NomenclatureEntry
@@ -761,6 +762,7 @@
 \lyxlock:
 \male:♂
 \mapsto:↦
+\maltese:✠
 \max:max
 \mercury:☿
 \mho:℧
@@ -924,7 +926,11 @@
 \dag:†
 \ddag:‡
 \copyright:©
+# financial
 \pounds:£
+\euro:€
+\yen:Â¥
+\$:$
 
 [FormulaConfig.decoratingfunctions]
 \acute:´
@@ -963,6 +969,9 @@
 \nicefrac:[span class="fraction",sup class="numerator",⁄,sub class="denominator"]
 \unitfrac:[span class="fraction",sup class="unit",⁄,sub class="unit"]
 
+[FormulaConfig.spacingfunctions]
+\raisebox:span class="raisebox"
+
 [FormulaConfig.hybridfunctions]
 \sqrt:span class="sqrt"
 \unit:span class="unit"
@@ -1031,7 +1040,7 @@
 
 [GeneralConfig.version]
 date:2009-06-17
-number:0.33
+number:0.34
 lyxformat:345
 
 [NumberingConfig.layouts]

Modified: elyxer/trunk/src/conf/config.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/conf/config.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/conf/config.py (original)
+++ elyxer/trunk/src/conf/config.py Wed Oct 28 14:52:35 2009
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # eLyXer configuration
-# autogenerated from config file on 2009-10-19
+# autogenerated from config file on 2009-10-28
 
 class BibStylesConfig(object):
   "Configuration class from config file"
@@ -81,6 +81,7 @@
       u'\\begin_inset CommandInset bibtex':u'BibTeX', 
       u'\\begin_inset CommandInset citation':u'BiblioCite', 
       u'\\begin_inset CommandInset href':u'URL', 
+      u'\\begin_inset CommandInset include':u'IncludeInset', 
       u'\\begin_inset CommandInset index_print':u'PrintIndex', 
       u'\\begin_inset CommandInset label':u'Label', 
       u'\\begin_inset CommandInset nomencl_print':u'NomenclaturePrint', 
@@ -325,8 +326,8 @@
       }
 
   commands = {
-      u'\\!':u'', u'\\%':u'%', u'\\,':u' ', u'\\:':u' ', u'\\Box':u'□', 
-      u'\\CIRCLE':u'●', u'\\CheckedBox':u'☑', u'\\Circle':u'○', 
+      u'\\!':u'', u'\\$':u'$', u'\\%':u'%', u'\\,':u' ', u'\\:':u' ', 
+      u'\\Box':u'□', u'\\CIRCLE':u'●', u'\\CheckedBox':u'☑', u'\\Circle':u'○', 
       u'\\Diamond':u'◇', u'\\Downarrow':u'⇓', u'\\Im':u'ℑ', u'\\Join':u'⨝', 
       u'\\LEFTCIRCLE':u'◖', u'\\LEFTcircle':u'◐', u'\\Leftarrow':u'⇐', 
       u'\\Leftrightarrow':u' ⇔ ', u'\\Longleftarrow':u'⟸', 
@@ -355,11 +356,11 @@
       u'\\diamond':u'◇', u'\\diamondsuit':u'♦', u'\\dim':u'dim', 
       u'\\displaystyle':u'', u'\\div':u'÷', u'\\doteq':u'≐', u'\\dots':u'…', 
       u'\\downarrow':u'↓', u'\\earth':u'♁', u'\\ell':u'â„“', u'\\emptyset':u'âˆ
', 
-      u'\\equiv':u' ≡ ', u'\\exists':u'∃', u'\\exp':u'exp', u'\\female':u'♀', 
-      u'\\flat':u'♭', u'\\forall':u'∀', u'\\frown':u'⌢', u'\\frownie':u'☹', 
-      u'\\gcd':u'gcd', u'\\ge':u' ≥ ', u'\\gemini':u'♊', u'\\geq':u' ≥ ', 
-      u'\\geq)':u'≥', u'\\gets':u'←', u'\\gg':u'≫', u'\\gimel':u'ℷ', 
-      u'\\hbar':u'ℏ', u'\\heartsuit':u'♥', u'\\hom':u'hom', 
+      u'\\equiv':u' ≡ ', u'\\euro':u'€', u'\\exists':u'∃', u'\\exp':u'exp', 
+      u'\\female':u'♀', u'\\flat':u'♭', u'\\forall':u'∀', u'\\frown':u'⌢', 
+      u'\\frownie':u'☹', u'\\gcd':u'gcd', u'\\ge':u' ≥ ', u'\\gemini':u'♊', 
+      u'\\geq':u' ≥ ', u'\\geq)':u'≥', u'\\gets':u'←', u'\\gg':u'≫', 
+      u'\\gimel':u'ℷ', u'\\hbar':u'ℏ', u'\\heartsuit':u'♥', u'\\hom':u'hom', 
       u'\\hookleftarrow':u'↩', u'\\hookrightarrow':u'↪', u'\\imath':u'ı', 
       u'\\implies':u'  ⇒  ', u'\\in':u' ∈ ', u'\\inf':u'inf', u'\\infty':u'∞', 
       u'\\int':u'<span class="bigsymbol">∫</span>', 
@@ -375,19 +376,19 @@
       u'\\ln':u'ln', u'\\lnot':u'¬', u'\\log':u'log', u'\\longleftarrow':u'⟵', 
       u'\\longleftrightarrow':u'⟷', u'\\longmapsto':u'⟼', 
       u'\\longrightarrow':u'⟶', u'\\lor':u'∨', u'\\lozenge':u'◊', 
-      u'\\lyxlock':u'', u'\\male':u'♂', u'\\mapsto':u'↦', u'\\max':u'max', 
-      u'\\mercury':u'☿', u'\\mho':u'℧', u'\\mid':u'∣', u'\\min':u'min', 
-      u'\\models':u'⊨', u'\\mp':u'∓', u'\\nabla':u'∇', u'\\natural':u'♮', 
-      u'\\ne':u' ≠ ', u'\\nearrow':u'↗', u'\\neg':u'¬', u'\\neg)':u'¬', 
-      u'\\neptune':u'♆', u'\\neq':u' ≠ ', u'\\ni':u'∋', u'\\ni)':u'∋', 
-      u'\\nonumber':u'', u'\\not':u'¬', u'\\not<':u'≮', u'\\not=':u'≠', 
-      u'\\not>':u'≯', u'\\not\\in':u' ∉ ', u'\\nwarrow':u'↖', u'\\odot':u'⊙', 
-      u'\\oint':u'∮', u'\\ominus':u'⊖', u'\\oplus':u'⊕', u'\\oslash':u'⊘', 
-      u'\\otimes':u'⊗', u'\\owns':u'∋', u'\\parallel':u'∥', u'\\partial':u'∂', 
-      u'\\perp':u'⊥', u'\\pisces':u'♓', u'\\pluto':u'♇', u'\\pm':u'±', 
-      u'\\pounds':u'£', u'\\prec':u'≺', u'\\preceq':u'≼', u'\\prime':u'′', 
-      u'\\prod':u'<span class="bigsymbol">∏</span>', u'\\prompto':u'∝', 
-      u'\\propto':u' ∝ ', u'\\qquad':u'  ', u'\\quad':u' ', 
+      u'\\lyxlock':u'', u'\\male':u'♂', u'\\maltese':u'✠', u'\\mapsto':u'↦', 
+      u'\\max':u'max', u'\\mercury':u'☿', u'\\mho':u'℧', u'\\mid':u'∣', 
+      u'\\min':u'min', u'\\models':u'⊨', u'\\mp':u'∓', u'\\nabla':u'∇', 
+      u'\\natural':u'♮', u'\\ne':u' ≠ ', u'\\nearrow':u'↗', u'\\neg':u'¬', 
+      u'\\neg)':u'¬', u'\\neptune':u'♆', u'\\neq':u' ≠ ', u'\\ni':u'∋', 
+      u'\\ni)':u'∋', u'\\nonumber':u'', u'\\not':u'¬', u'\\not<':u'≮', 
+      u'\\not=':u'≠', u'\\not>':u'≯', u'\\not\\in':u' ∉ ', u'\\nwarrow':u'↖', 
+      u'\\odot':u'⊙', u'\\oint':u'∮', u'\\ominus':u'⊖', u'\\oplus':u'⊕', 
+      u'\\oslash':u'⊘', u'\\otimes':u'⊗', u'\\owns':u'∋', u'\\parallel':u'∥', 
+      u'\\partial':u'∂', u'\\perp':u'⊥', u'\\pisces':u'♓', u'\\pluto':u'♇', 
+      u'\\pm':u'±', u'\\pounds':u'£', u'\\prec':u'≺', u'\\preceq':u'≼', 
+      u'\\prime':u'′', u'\\prod':u'<span class="bigsymbol">∏</span>', 
+      u'\\prompto':u'∝', u'\\propto':u' ∝ ', u'\\qquad':u'  ', u'\\quad':u' ', 
       u'\\quarternote':u'♩', u'\\rangle':u'⟩', u'\\rbrace':u'}', 
       u'\\rbrace)':u'}', u'\\rbrack':u']', u'\\rceil':u'⌉', u'\\rfloor':u'⌋', 
       u'\\rhd':u'⊳', u'\\rightarrow':u' → ', u'\\rightarrow)':u'→', 
@@ -414,8 +415,8 @@
       u'\\varclubsuit':u'♧', u'\\vardiamondsuit':u'♦', u'\\varheartsuit':u'♥', 
       u'\\varspadesuit':u'♤', u'\\vdash':u'⊢', u'\\vdots':u'⋮', u'\\vee':u'∨', 
       u'\\vee)':u'∨', u'\\vert':u'∣', u'\\virgo':u'♍', u'\\wedge':u'∧', 
-      u'\\wedge)':u'∧', u'\\wp':u'℘', u'\\wr':u'≀', u'\\{':u'{', u'\\|':u'∥', 
-      u'\\}':u'}', 
+      u'\\wedge)':u'∧', u'\\wp':u'℘', u'\\wr':u'≀', u'\\yen':u'¥', u'\\{':u'{', 
+      u'\\|':u'∥', u'\\}':u'}', 
       }
 
   decoratingfunctions = {
@@ -471,6 +472,10 @@
       u'\\underline':u'u', u'\\vphantom':u'span class="phantom"', 
       }
 
+  spacingfunctions = {
+      u'\\raisebox':u'span class="raisebox"', 
+      }
+
   starts = {
       u'beginafter':u'}', u'beginbefore':u'\\begin{', u'bracket':u'{', 
       u'command':u'\\', u'complex':u'\\[', u'simple':u'$', 
@@ -498,7 +503,7 @@
   "Configuration class from config file"
 
   version = {
-      u'date':u'2009-10-19', u'lyxformat':u'345', u'number':u'0.33', 
+      u'date':u'2009-10-28', u'lyxformat':u'345', u'number':u'0.34', 
       }
 
 class NumberingConfig(object):

Modified: elyxer/trunk/src/gen/image.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/gen/image.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/gen/image.py (original)
+++ elyxer/trunk/src/gen/image.py Wed Oct 28 14:52:35 2009
@@ -44,13 +44,15 @@
     if not self.origin.exists():
       Trace.error('Image ' + unicode(self.origin) + ' not found')
       return
-    self.destination = self.checkext(OutputPath(self.origin))
+    self.destination = self.getdestination(self.origin)
     self.convert(self.getparams())
     imagefile = ImageFile(self.destination)
     self.width, self.height = imagefile.getdimensions()
 
-  def checkext(self, destination):
-    "Convert extension of destination to output image format"
+  def getdestination(self, origin):
+    "Convert origin path to destination path."
+    "Changes extension of destination to output image format."
+    destination = OutputPath(origin)
     forceformat = '.jpg'
     forcedest = '.png'
     if Options.forceformat:
@@ -58,6 +60,7 @@
       forcedest = Options.forceformat
     if not destination.hasext(forceformat):
       destination.changeext(forcedest)
+    destination.removebackdirs()
     return destination
 
   def convert(self, params):

Modified: elyxer/trunk/src/gen/inset.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/gen/inset.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/gen/inset.py (original)
+++ elyxer/trunk/src/gen/inset.py Wed Oct 28 14:52:35 2009
@@ -29,6 +29,7 @@
 from gen.container import *
 from gen.structure import *
 from gen.layout import *
+from gen.factory import *
 
 
 class InsetText(Container):
@@ -162,4 +163,20 @@
       return
     self.output.settag(TagConfig.boxes[self.type], True)
 
+class IncludeInset(Container):
+  "A child document included within another."
 
+  # the converter factory will be set in converter.py
+  converterfactory = None
+
+  def __init__(self):
+    self.parser = InsetParser()
+    self.output = ContentsOutput()
+
+  def process(self):
+    "Include the provided child document"
+    self.filename = self.parser.parameters['filename']
+    Trace.debug('Child document: ' + self.filename)
+    converter = IncludeInset.converterfactory.create(self.filename)
+    converter.convert()
+

Modified: elyxer/trunk/src/gen/toc.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/gen/toc.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/gen/toc.py (original)
+++ elyxer/trunk/src/gen/toc.py Wed Oct 28 14:52:35 2009
@@ -36,7 +36,13 @@
     self.depth = 0
     Options.nocopy = True
 
-  def writetoc(self, container):
+  def clone(self, filterheader):
+    "Return a cloned copy."
+    clone = TOCWriter()
+    clone.writer = self.writer
+    return clone
+
+  def write(self, container):
     "Write the table of contents for a container."
     if container.__class__ in [LyxHeader, LyxFooter]:
       self.writeheaderfooter(container)

Modified: elyxer/trunk/src/io/convert.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/io/convert.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/io/convert.py (original)
+++ elyxer/trunk/src/io/convert.py Wed Oct 28 14:52:35 2009
@@ -24,11 +24,12 @@
 # http://www.nongnu.org/elyxer/
 
 
+import os.path
 from io.fileline import *
 from util.options import *
 from gen.factory import *
 from gen.toc import *
-from gen.structure import *
+from gen.inset import *
 from post.postprocess import *
 from post.postlist import *
 from post.posttable import *
@@ -38,34 +39,62 @@
 class eLyXerConverter(object):
   "Converter for a document in a lyx file"
 
-  def __init__(self, ioparser):
-    "Create the converter"
+  latestwriter = None
+
+  def setio(self, ioparser):
+    "Set the InOutParser"
     self.reader = LineReader(ioparser.filein)
-    self.writer = LineWriter(ioparser.fileout)
+    linewriter = LineWriter(ioparser.fileout)
+    if Options.toc:
+      self.writer = TOCWriter(linewriter)
+    else:
+      self.writer = ContainerWriter(linewriter)
+    eLyXerConverter.latestwriter = self.writer
+    return self
+
+  def embed(self, filein):
+    "Embed the results for a new input file into the latest output file."
+    "Header and footer are ignored. Useful for embedding one document inside another."
+    self.reader = LineReader(filein)
+    self.writer = eLyXerConverter.latestwriter.clone(filterheader = True)
+    return self
 
   def convert(self):
     "Perform the conversion for the document"
     try:
-      if Options.toc:
-        # generate TOC
-        writer = TOCWriter(self.writer)
-        self.processcontents(lambda container: writer.writetoc(container))
-      else:
-        # generate converted document
-        self.processcontents(lambda container: self.writer.write(container.gethtml()))
+      self.processcontents()
     except (Exception):
       Trace.error('Conversion failed at ' + self.reader.currentline())
       raise
 
-  def processcontents(self, write):
+  def processcontents(self):
     "Parse the contents and write it by containers"
     factory = ContainerFactory()
-    postproc = Postprocessor()
+    self.postproc = Postprocessor()
     while not self.reader.finished():
       containers = factory.createsome(self.reader)
       for container in containers:
-        container = postproc.postprocess(container)
-        write(container)
+        container = self.postproc.postprocess(container)
+        self.writer.write(container)
+
+class ContainerWriter(object):
+  "A writer of containers. Just writes them out to a line writer."
+
+  def __init__(self, linewriter):
+    self.linewriter = linewriter
+    self.filterheader = False
+
+  def clone(self, filterheader):
+    "Clone the writer."
+    clone = ContainerWriter(self.linewriter)
+    clone.filterheader = filterheader
+    return clone
+
+  def write(self, container):
+    "Write a container to the line writer."
+    if self.filterheader and container.__class__ in [LyxHeader, LyxFooter]:
+      return
+    self.linewriter.write(container.gethtml())
 
 class InOutParser(object):
   "Parse in and out arguments"
@@ -94,3 +123,13 @@
       raise Exception('Unused arguments: ' + unicode(args))
     return self
 
+class ConverterFactory(object):
+  "Create a converter fit for converting a filename and embedding the result."
+
+  def create(self, filename):
+    "Create a converter for a given filename."
+    fullname = os.path.join(Options.directory, filename)
+    return eLyXerConverter().embed(fullname)
+
+IncludeInset.converterfactory = ConverterFactory()
+

Modified: elyxer/trunk/src/io/path.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/io/path.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/io/path.py (original)
+++ elyxer/trunk/src/io/path.py Wed Oct 28 14:52:35 2009
@@ -96,3 +96,14 @@
     if len(dir) > 0 and not os.path.exists(dir):
       os.makedirs(dir)
 
+  def removebackdirs(self):
+    "Remove any occurrences of ../ (or ..\ on Windows)"
+    self.path = os.path.normpath(self.path)
+    backdir = '..' + os.path.sep
+    while self.path.startswith(backdir):
+      Trace.debug('Backdir in: ' + self.path)
+      self.path = self.path[len(backdir):]
+    while self.url.startswith('../'):
+      Trace.debug('Backdir in: ' + self.url)
+      self.url = self.url[len('../'):]
+

Modified: elyxer/trunk/src/math/bits.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/math/bits.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/math/bits.py (original)
+++ elyxer/trunk/src/math/bits.py Wed Oct 28 14:52:35 2009
@@ -131,7 +131,6 @@
       self.add(self.inner)
       return
     if pos.finished():
-      Trace.error('Unexpected end of bracket')
       return
     if pos.current() != self.ending:
       Trace.error('No formula in bracket at ' + pos.remaining())

Modified: elyxer/trunk/src/math/command.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/math/command.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/math/command.py (original)
+++ elyxer/trunk/src/math/command.py Wed Oct 28 14:52:35 2009
@@ -244,8 +244,7 @@
   commandmap = FormulaConfig.fractionfunctions
 
   def parsebit(self, pos):
-    "Parse a fraction function with two parameters"
-    tags = self.translated
+    "Parse a fraction function with two parameters (optional alignment)"
     self.output = TaggedOutput().settag(self.translated[0])
     align = self.parsesquare(pos)
     parameter1 = self.parseparameter(pos)
@@ -269,10 +268,28 @@
       parameter1.type = 'font'
       parameter2.type = 'font'
 
+class SpacingFunction(CommandBit):
+  "A spacing function with two parameters"
+
+  commandmap = FormulaConfig.spacingfunctions
+
+  def parsebit(self, pos):
+    "Parse a spacing function with two parameters"
+    parameter1 = Bracket().parseliteral(pos)
+    if not parameter1:
+      Trace.error('Missing first {} in function ' + self.translated[0])
+      return
+    parameter2 = self.parseparameter(pos)
+    if not parameter2:
+      Trace.error('Missing second {} in function ' + self.translated[0])
+      return
+    self.output = TaggedOutput().settag(self.translated +
+        ' style="vertical-align:' + parameter1.literal + '"')
+
 FormulaFactory.bits += [FormulaCommand(), SymbolFunction()]
 FormulaCommand.commandbits = [
     EmptyCommand(), AlphaCommand(), OneParamFunction(), DecoratingFunction(),
     FractionFunction(), FontFunction(), LabelFunction(), TextFunction(),
-    HybridFunction(),
+    HybridFunction(), SpacingFunction(),
     ]
 

Modified: elyxer/trunk/src/principal.py
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/src/principal.py?rev=673&op=diff
==============================================================================
--- elyxer/trunk/src/principal.py (original)
+++ elyxer/trunk/src/principal.py Wed Oct 28 14:52:35 2009
@@ -51,7 +51,7 @@
     readdir(ioparser.fileout, 'destdirectory')
   else:
     Options.destdirectory = '.'
-  converter = eLyXerConverter(ioparser)
+  converter = eLyXerConverter().setio(ioparser)
   converter.convert()
 
 def main():

Modified: elyxer/trunk/test/appendix-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/appendix-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/appendix-1-6-2-test.html (original)
+++ elyxer/trunk/test/appendix-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Appendix Test</title>
 </head>

Modified: elyxer/trunk/test/appendix-1-6-2-toc-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/appendix-1-6-2-toc-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/appendix-1-6-2-toc-test.html (original)
+++ elyxer/trunk/test/appendix-1-6-2-toc-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/toc.css" type="text/css" media="screen"/>
 <title>Appendix Test</title>
 </head>

Modified: elyxer/trunk/test/bibtex-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/bibtex-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/bibtex-test.html (original)
+++ elyxer/trunk/test/bibtex-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/branches-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/branches-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/branches-test.html (original)
+++ elyxer/trunk/test/branches-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/decorations-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/decorations-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/decorations-1-6-2-test.html (original)
+++ elyxer/trunk/test/decorations-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Decorations Test</title>
 </head>

Modified: elyxer/trunk/test/descriptions-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/descriptions-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/descriptions-test.html (original)
+++ elyxer/trunk/test/descriptions-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/file-1-6-2-good.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/file-1-6-2-good.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/file-1-6-2-good.html (original)
+++ elyxer/trunk/test/file-1-6-2-good.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-18"/>
+<meta name="create-date" content="2009-10-25"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -35,6 +35,15 @@
 With some more text.
 </div>
 <div class="Standard">
+Now we include a different document.
+</div>
+<div class="Standard">
+Hello world
+</div>
+<div class="Standard">
+
+</div>
+<div class="Standard">
 <h1 class="index">Index</h1>
 
 </div>

Modified: elyxer/trunk/test/file-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/file-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/file-1-6-2-test.html (original)
+++ elyxer/trunk/test/file-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -35,6 +35,15 @@
 With some more text.
 </div>
 <div class="Standard">
+Now we include a different document.
+</div>
+<div class="Standard">
+Hello world
+</div>
+<div class="Standard">
+
+</div>
+<div class="Standard">
 <h1 class="index">Index</h1>
 
 </div>

Modified: elyxer/trunk/test/file-1-6-2.lyx
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/file-1-6-2.lyx?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/file-1-6-2.lyx (original)
+++ elyxer/trunk/test/file-1-6-2.lyx Wed Oct 28 14:52:35 2009
@@ -1,4 +1,4 @@
-#LyX 1.6.2 created this file. For more info see http://www.lyx.org/
+#LyX 1.6.4 created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -100,6 +100,20 @@
 \end_layout
 
 \begin_layout Standard
+Now we include a different document.
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset include
+LatexCommand include
+filename "helloworld.lyx"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
 \begin_inset CommandInset index_print
 LatexCommand printindex
 

Modified: elyxer/trunk/test/footnotes-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/footnotes-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/footnotes-1-6-2-test.html (original)
+++ elyxer/trunk/test/footnotes-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/helloworld-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/helloworld-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/helloworld-test.html (original)
+++ elyxer/trunk/test/helloworld-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/index-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/index-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/index-1-6-2-test.html (original)
+++ elyxer/trunk/test/index-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Index Test</title>
 </head>

Modified: elyxer/trunk/test/lists-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/lists-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/lists-1-6-2-test.html (original)
+++ elyxer/trunk/test/lists-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/math-1-6-2-good.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/math-1-6-2-good.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/math-1-6-2-good.html (original)
+++ elyxer/trunk/test/math-1-6-2-good.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-27"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Math Test</title>
 </head>
@@ -215,7 +215,25 @@
 </span>
 </div>
 <h1 class="Chapter">
-<a class="toc" name="toc-Chapter-7">7</a> Fonts
+<a class="toc" name="toc-Chapter-7">7</a> Spacing
+</h1>
+<div class="Standard">
+The command <tt>\raisebox</tt> is useful to, surprisingly, raise a little box.
+</div>
+<div class="Standard">
+<span class="formula"><span class="raisebox" style="vertical-align:2mm"><i>raised</i></span><i>over</i><span class="raisebox" style="vertical-align:-2mm"><i>lowered</i></span><span class="mathrm">and back</span>.</span>
+</div>
+<div class="Standard">
+It can also be used just for spacing.
+</div>
+<div class="Standard">
+<span class="formula"><span class="raisebox" style="vertical-align:5mm"></span><i>B</i><sup><i>V</i></sup></span>.
+</div>
+<div class="Standard">
+There are other spacings commands.
+</div>
+<h1 class="Chapter">
+<a class="toc" name="toc-Chapter-8">8</a> Fonts
 </h1>
 <div class="Standard">
 Fonts can be switched on and off.
@@ -233,7 +251,7 @@
 Units can be shown with or without a magnitude. Withouth: <span class="formula"><span class="unit">km</span></span>. With: <span class="formula">57â€
<span class="unit">km</span></span>. With a fraction: <span class="formula"><span class="fraction">20â€
<sup class="unit">km</sup>⁄<sub class="unit">h</sub></span></span>.
 </div>
 <h1 class="Chapter">
-<a class="toc" name="toc-Chapter-8">8</a> Bye-bye
+<a class="toc" name="toc-Chapter-9">9</a> Bye-bye
 </h1>
 <div class="Standard">
 That’s all folks!

Modified: elyxer/trunk/test/math-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/math-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/math-1-6-2-test.html (original)
+++ elyxer/trunk/test/math-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Math Test</title>
 </head>
@@ -215,7 +215,25 @@
 </span>
 </div>
 <h1 class="Chapter">
-<a class="toc" name="toc-Chapter-7">7</a> Fonts
+<a class="toc" name="toc-Chapter-7">7</a> Spacing
+</h1>
+<div class="Standard">
+The command <tt>\raisebox</tt> is useful to, surprisingly, raise a little box.
+</div>
+<div class="Standard">
+<span class="formula"><span class="raisebox" style="vertical-align:2mm"><i>raised</i></span><i>over</i><span class="raisebox" style="vertical-align:-2mm"><i>lowered</i></span><span class="mathrm">and back</span>.</span>
+</div>
+<div class="Standard">
+It can also be used just for spacing.
+</div>
+<div class="Standard">
+<span class="formula"><span class="raisebox" style="vertical-align:5mm"></span><i>B</i><sup><i>V</i></sup></span>.
+</div>
+<div class="Standard">
+There are other spacings commands.
+</div>
+<h1 class="Chapter">
+<a class="toc" name="toc-Chapter-8">8</a> Fonts
 </h1>
 <div class="Standard">
 Fonts can be switched on and off.
@@ -233,7 +251,7 @@
 Units can be shown with or without a magnitude. Withouth: <span class="formula"><span class="unit">km</span></span>. With: <span class="formula">57â€
<span class="unit">km</span></span>. With a fraction: <span class="formula"><span class="fraction">20â€
<sup class="unit">km</sup>⁄<sub class="unit">h</sub></span></span>.
 </div>
 <h1 class="Chapter">
-<a class="toc" name="toc-Chapter-8">8</a> Bye-bye
+<a class="toc" name="toc-Chapter-9">9</a> Bye-bye
 </h1>
 <div class="Standard">
 That’s all folks!

Modified: elyxer/trunk/test/math-1-6-2.lyx
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/math-1-6-2.lyx?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/math-1-6-2.lyx (original)
+++ elyxer/trunk/test/math-1-6-2.lyx Wed Oct 28 14:52:35 2009
@@ -403,6 +403,42 @@
 \end_layout
 
 \begin_layout Chapter
+Spacing
+\end_layout
+
+\begin_layout Standard
+The command 
+\family typewriter
+
+\backslash
+raisebox
+\family default
+ is useful to, surprisingly, raise a little box.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Formula $\raisebox{2mm}{raised}over\raisebox{-2mm}{lowered}\textrm{and back}.$
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+It can also be used just for spacing.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Formula $\raisebox{5mm}{}B^{V}$
+\end_inset
+
+.
+\end_layout
+
+\begin_layout Standard
+There are other spacings commands.
+\end_layout
+
+\begin_layout Chapter
 Fonts
 \end_layout
 
@@ -461,7 +497,7 @@
 
 .
  Regular text can be embedded into formulae: 
-\begin_inset Formula $\textrm{regular text \backslash command \backslash another command \backslash \backslash no spaces allowed}$
+\begin_inset Formula $\textrm{regular text \backslash command \backslash another command \backslash\backslash no spaces allowed}$
 \end_inset
 
 .

Modified: elyxer/trunk/test/subdir/appendix-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/subdir/appendix-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/subdir/appendix-1-6-2-test.html (original)
+++ elyxer/trunk/test/subdir/appendix-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../../docs/lyx.css" type="text/css" media="screen"/>
 <title>Appendix Test</title>
 </head>

Modified: elyxer/trunk/test/table-1-6-2-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/table-1-6-2-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/table-1-6-2-test.html (original)
+++ elyxer/trunk/test/table-1-6-2-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>

Modified: elyxer/trunk/test/with images-good.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-good.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-good.html (original)
+++ elyxer/trunk/test/with images-good.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-18"/>
+<meta name="create-date" content="2009-10-25"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -22,7 +22,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.png" alt="figure ../docs/elyxer.png" width="111" height="111"/>
+<img class="embedded" src="docs/elyxer.png" alt="figure docs/elyxer.png" width="111" height="111"/>
 Third image: from another directory.
 </div>
 <div class="Standard">

Modified: elyxer/trunk/test/with images-html-good.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-html-good.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-html-good.html (original)
+++ elyxer/trunk/test/with images-html-good.html Wed Oct 28 14:52:35 2009
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="generator" content="http://www.nongnu.org/elyxer/">
-<meta name="create-date" content="2009-10-18">
+<meta name="create-date" content="2009-10-25">
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen">
 <title>Converted document</title>
 </head>
@@ -21,7 +21,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.png" alt="figure ../docs/elyxer.png" width="111" height="111">
+<img class="embedded" src="docs/elyxer.png" alt="figure docs/elyxer.png" width="111" height="111">
 Third image: from another directory.
 </div>
 <div class="Standard">

Modified: elyxer/trunk/test/with images-html-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-html-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-html-test.html (original)
+++ elyxer/trunk/test/with images-html-test.html Wed Oct 28 14:52:35 2009
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="generator" content="http://www.nongnu.org/elyxer/">
-<meta name="create-date" content="2009-10-19">
+<meta name="create-date" content="2009-10-28">
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen">
 <title>Converted document</title>
 </head>
@@ -21,7 +21,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.png" alt="figure ../docs/elyxer.png" width="111" height="111">
+<img class="embedded" src="docs/elyxer.png" alt="figure docs/elyxer.png" width="111" height="111">
 Third image: from another directory.
 </div>
 <div class="Standard">

Modified: elyxer/trunk/test/with images-jpg-good.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-jpg-good.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-jpg-good.html (original)
+++ elyxer/trunk/test/with images-jpg-good.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-18"/>
+<meta name="create-date" content="2009-10-25"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -22,7 +22,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.jpg" alt="figure ../docs/elyxer.jpg" width="111" height="111"/>
+<img class="embedded" src="docs/elyxer.jpg" alt="figure docs/elyxer.jpg" width="111" height="111"/>
 Third image: from another directory.
 </div>
 <div class="Standard">

Modified: elyxer/trunk/test/with images-jpg-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-jpg-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-jpg-test.html (original)
+++ elyxer/trunk/test/with images-jpg-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -22,7 +22,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.jpg" alt="figure ../docs/elyxer.jpg" width="111" height="111"/>
+<img class="embedded" src="docs/elyxer.jpg" alt="figure docs/elyxer.jpg" width="111" height="111"/>
 Third image: from another directory.
 </div>
 <div class="Standard">

Modified: elyxer/trunk/test/with images-test.html
URL: http://svn.debian.org/wsvn/pkg-lyx/elyxer/trunk/test/with%20images-test.html?rev=673&op=diff
==============================================================================
--- elyxer/trunk/test/with images-test.html (original)
+++ elyxer/trunk/test/with images-test.html Wed Oct 28 14:52:35 2009
@@ -4,7 +4,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2009-10-19"/>
+<meta name="create-date" content="2009-10-28"/>
 <link rel="stylesheet" href="../docs/lyx.css" type="text/css" media="screen"/>
 <title>Converted document</title>
 </head>
@@ -22,7 +22,7 @@
 Second image: convoluted path.
 </div>
 <div class="Standard">
-<img class="embedded" src="../docs/elyxer.png" alt="figure ../docs/elyxer.png" width="111" height="111"/>
+<img class="embedded" src="docs/elyxer.png" alt="figure docs/elyxer.png" width="111" height="111"/>
 Third image: from another directory.
 </div>
 <div class="Standard">

More information about the Pkg-lyx-devel mailing list