diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..212e862 --- /dev/null +++ b/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index a2790c7..e91bd7e 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,13 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2 ---------- version 1.1.1 ---------- +[w4l] Added help files + +[w2x] Bugfix: A textposition of 0% is no longer considered to be superscript + +[all] OFFICE_HOME and URE_HOME in build.xml renamed to OFFICE_CLASSES and URE_CLASSES, + which should now point directly to the directory containing the jars + [w2x] Added support for text:start-value in outline numbering and list styles (the latter is only relevant if use_list_hack is true) diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 9b2ba57..2de5d6d 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/writer2latex/xhtml/TextStyleConverter.java b/source/java/writer2latex/xhtml/TextStyleConverter.java index 68c7e45..628c86c 100644 --- a/source/java/writer2latex/xhtml/TextStyleConverter.java +++ b/source/java/writer2latex/xhtml/TextStyleConverter.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2008 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.0 (2008-09-08) + * Version 1.2 (2010-02-14) * */ @@ -240,6 +240,7 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { if (sPos==null) return false; if (sPos.startsWith("sub")) return false; if (sPos.startsWith("-")) return false; + if (sPos.startsWith("0%")) return false; return true; } @@ -354,7 +355,9 @@ public class TextStyleConverter extends StyleWithPropertiesConverterHelper { } if (s!=null) { props.addValue("font-size",Misc.multiply(s4,scale(s))); } else { props.addValue("font-size",s4); } - props.addValue("vertical-align",s3); + if (!"0%".equals(s3)) { + props.addValue("vertical-align",s3); + } } else if (s!=null) { props.addValue("font-size",scale(s)); diff --git a/source/java/writer2latex/xhtml/XhtmlConfig.java b/source/java/writer2latex/xhtml/XhtmlConfig.java index 4364810..c3575d3 100644 --- a/source/java/writer2latex/xhtml/XhtmlConfig.java +++ b/source/java/writer2latex/xhtml/XhtmlConfig.java @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * Copyright: 2002-2009 by Henrik Just + * Copyright: 2002-2010 by Henrik Just * * All Rights Reserved. * - * Version 1.2 (2009-09-22) + * Version 1.2 (2010-02-14) * */ diff --git a/source/oxt/writer2xhtml/META-INF/manifest.xml b/source/oxt/writer2xhtml/META-INF/manifest.xml index 4c3483e..dc4955b 100644 --- a/source/oxt/writer2xhtml/META-INF/manifest.xml +++ b/source/oxt/writer2xhtml/META-INF/manifest.xml @@ -28,5 +28,5 @@ - + diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml index 7733382..6377560 100644 --- a/source/oxt/writer2xhtml/description.xml +++ b/source/oxt/writer2xhtml/description.xml @@ -8,7 +8,7 @@ - + diff --git a/source/oxt/writer4latex/META-INF/manifest.xml b/source/oxt/writer4latex/META-INF/manifest.xml index 1d8e87b..3a837b4 100644 --- a/source/oxt/writer4latex/META-INF/manifest.xml +++ b/source/oxt/writer4latex/META-INF/manifest.xml @@ -44,6 +44,10 @@ + + \ No newline at end of file diff --git a/source/oxt/writer4latex/W4LDialogs/Configuration.xdl b/source/oxt/writer4latex/W4LDialogs/Configuration.xdl index 9891929..bc5c289 100644 --- a/source/oxt/writer4latex/W4LDialogs/Configuration.xdl +++ b/source/oxt/writer4latex/W4LDialogs/Configuration.xdl @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -23,16 +23,15 @@ - + - + - + - \ No newline at end of file diff --git a/source/oxt/writer4latex/help/en/help.tree b/source/oxt/writer4latex/help/en/help.tree new file mode 100644 index 0000000..5b62a35 --- /dev/null +++ b/source/oxt/writer4latex/help/en/help.tree @@ -0,0 +1,10 @@ + + + + Introduction + Configuration + Menu reference + Guidelines + Using the templates + + diff --git a/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/configuration.xhp b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/configuration.xhp new file mode 100644 index 0000000..1cd9864 --- /dev/null +++ b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/configuration.xhp @@ -0,0 +1,81 @@ + + + + + Configuration + org.openoffice.da.writer4latex.oxt/configuration.xhp + + + + + Configuration + Before you can use Writer4LaTeX you must configure it to use your LaTeX + distribution as well as viewers for the different output formats. + + + + To access this function... + + + + + Select Tools - Extension Manager - Writer4LaTeX + and click Configure + Select Tools - Options - %PRODUCTNAME Writer - Writer4LaTeX + + + +
+ + + Automatic Configuration + If you click this button, Writer4LaTeX will try to locate the external programs + and configure them. You will be presented with a short report of the results. Any applications that Writer4LaTeX cannot find for + you must be configured manually. + Click here to let Writer4LaTeX configure your external applications automatically + + + Application + Select the external application you wish to configure in the list. + The available applications are: + + + PdfLaTeX: The pdflatex executable (used if you select PDF as your backend format) + + + LaTeX: The latex executable (used for other backend formats) + + + Dvips: The DVI to PostScript converter dvips (used if you select PostScript as your backend format) + + + BibTeX: The bibtex executable (used if your document contains a bibliography) + + + MakeIndex: The makeindex executable (used if your document contains an alphabetical index) + + + DVI Viewer: Application to view DVI files + + + PDF Viewer: Application to view PDF files + + + PostScript Viewer: Application to view PostScript files + + + Select the external application you wish to configure here + + + Executable + Type the full path to the executable or click Browse to find + the executable in your file system + Type the full path to the executable here or find it using the Browse button + + + Options + Fill out any additional options here. Often you will only need the file name, + which is denoted %s. + Fill out any additional options here, using %s to represent the file name + + \ No newline at end of file diff --git a/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/guidelines.xhp b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/guidelines.xhp new file mode 100644 index 0000000..242673f --- /dev/null +++ b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/guidelines.xhp @@ -0,0 +1,12 @@ + + + + + Guidelines + org.openoffice.da.writer4latex.oxt/guidelines.xhp + + + + Guidelines + + \ No newline at end of file diff --git a/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/introduction.xhp b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/introduction.xhp new file mode 100644 index 0000000..56992d0 --- /dev/null +++ b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/introduction.xhp @@ -0,0 +1,57 @@ + + + + + Introduction + org.openoffice.da.writer4latex.oxt/introduction.xhp + + + + About Writer4LaTeX + + The purpose of the Writer4LaTeX extension is to turn Writer into a frontend for LaTeX. + By installing Writer4LaTeX you will thus be available to author well-structured LaTeX documents using (almost) the full power of + %PRODUCTNAME Writer. + The functionality of %PRODUCTNAME Writer with Writer4LaTeX can be compared to the application + LyX. + + + Authoring LaTeX files with Writer4LaTeX + You can use Writer4LaTeX in two different ways + + + + You can prepare your documents with Writer as you usually do, + keeping a few + guidelines in mind. + You can then invoke Writer4LaTeX to convert your document into LaTeX, process the LaTeX document and display the final result. You are free to create either a LaTeX document that preserves as much of your formatting as possible – or create a clean LaTeX document that will resemble a LaTeX document created by hand. + + + + You can use some special + Writer templates + provided with Writer4LaTeX to + create your documents. Using the styles supported by these templates, you can easily create standard LaTeX documents + using the opportunities of standard LaTeX document classes. + + For this initial version, templates for the standard LaTeX classes article + are provided. More templates will be added later (report, book, beamer...), and you can also add your own templates. + + + + + LaTeX import + You can import existing LaTeX documents into Writer. + This feature uses Eitan M. Gurari's excellent TeX4ht system. Note however, that this doesn't mean that roundtrip + editing %PRODUCTNAME Writer ↔ LaTeX is possible. The intended use of the import feature is to be able to work on documents + that were orginally authored in LaTeX. + + + Before you start + Before you can use Writer4LaTeX, you need to + configure it. + This requires that you have + a working TeX installation on your system such as MikTeX for Windows or TeX Live for unix/linux. + + + \ No newline at end of file diff --git a/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/menu.xhp b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/menu.xhp new file mode 100644 index 0000000..e1c224c --- /dev/null +++ b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/menu.xhp @@ -0,0 +1,29 @@ + + + + + The LaTeX menu + org.openoffice.da.writer4latex.oxt/menu.xhp + + + + The LaTeX menu + Writer4LaTeX offers the top level menu LaTeX in Writer + with the following commands. + + + Run LaTeX... + ... + Run LaTeX + + + Run LaTeX directly + ... + Run LaTeX directly + + + View Log files + ... + View log files + + \ No newline at end of file diff --git a/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/templates.xhp b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/templates.xhp new file mode 100644 index 0000000..c0173a9 --- /dev/null +++ b/source/oxt/writer4latex/help/en/org.openoffice.da.writer4latex.oxt/templates.xhp @@ -0,0 +1,134 @@ + + + + + Using the templates + org.openoffice.da.writer4latex.oxt/templates.xhp + + + + Using the templates + The article template + This template contains a number of styles that corresponds to LaTeX code. + If you use these styles and makes sure to use the configuration W4L: Article when you convert your document + (this is selected automatically) with Writer2LaTeX, you will get a result that resembles a handwritten LaTeX file. + Note that hard formatting and any other styles will be ignored. The available styles are summarized in the following table. + + + + + %PRODUCTNAME Writer Style + + + LaTeX code + + + + + Title + + + \title{...} + + + + + + + + + + +
+ + + + + \ No newline at end of file