litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Various work on w2l 1.2

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@17 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-04-23 10:53:07 +00:00
parent 6f3a08b4f6
commit c410adda52
17 changed files with 202 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/distro/changelog.txt
View file

@ -2,6 +2,15 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.1 ----------
[all] Filter: Filters out characters that are illegal in xml
(this fixes a problem with rtf documents imported in OOo)
[w2x] Introduced hack to set link attributes using the link name
accepts a semicolon separated list of name=value, for example
title=link to next page;rel=next
[all] Added icon and publisher information to the extensions
[w2l] Added XeTeX as possible backend in dialog
[all] Bugfix: Paragraphs containing only fields are no longer lost

BIN
source/distro/doc/user-manual.odt
View file

Binary file not shown.

73
source/java/org/openoffice/da/comp/w2lcommon/filter/ExportFilterBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2008 by Henrik Just
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.0 (2008-11-24)
* Version 1.2 (2009-04-23)
*
*/
@ -132,38 +132,34 @@ public abstract class ExportFilterBase implements
return name;
}
public String replace(String origString, String origChar, String replaceChar){
String tmp="";
int index=origString.indexOf(origChar);
if(index !=-1){
while (index !=-1){
String first =origString.substring(0,index);
first=first.concat(replaceChar);
tmp=tmp.concat(first);
origString=origString.substring(index+1,origString.length());
index=origString.indexOf(origChar);
if(index==-1) {
tmp=tmp.concat(origString);
}
}
}
return tmp;
}
public String needsMask(String origString) {
if (origString.indexOf("&")!=-1){
origString=replace(origString,"&","&");
}
if (origString.indexOf("\"")!=-1){
origString=replace(origString,"\"",""");
}
if (origString.indexOf("<")!=-1){
origString=replace(origString,"<","&lt;");
}
if (origString.indexOf(">")!=-1){
origString=replace(origString,">","&gt;");
}
return origString;
StringBuffer buf = new StringBuffer();
int nLen = origString.length();
for (int i=0; i<nLen; i++) {
char c = origString.charAt(i);
if (c=='&'){
buf.append("&amp;");
}
if (c=='\"'){
buf.append("&quot;");
}
if (c=='<'){
buf.append("&lt;");
}
if (c=='>'){
buf.append("&gt;");
}
else if (c=='\u0009' || c=='\n' || c=='\r' || (c>='\u0020' && c<='\uD7FF') || (c>='\uE000' && c<'\uFFFD')) {
// Valid characters found at xml.com
// Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
buf.append(c);
}
else {
// Found illegal character
System.out.println("Illegal character : "+Integer.toHexString(c));
}
}
return buf.toString();
}
@ -233,7 +229,7 @@ public abstract class ExportFilterBase implements
// Implementation of XDocumentHandler:
// Flat xml is created by the sax events and passed through the pipe
// created by exporter()
public void startDocument () {
//Do nothing
}
@ -301,6 +297,7 @@ public abstract class ExportFilterBase implements
}
public void characters(String str){
str=needsMask(str);
try{
xOutStream.writeBytes(str.getBytes("UTF-8"));
}
@ -370,12 +367,12 @@ public abstract class ExportFilterBase implements
converter.setGraphicConverter(new GraphicConverterImpl(xComponentContext));
ConverterResult dataOut = null;
try {
//try {
dataOut = converter.convert(xis,sName);
}
catch (IOException e) {
//}
//catch (IOException e) {
// Fail silently
}
//}
// Write out files
Iterator<OutputFile> docEnum = dataOut.iterator();

99
source/java/org/openoffice/da/comp/writer4latex/ConfigurationDialog.java
View file

@ -20,14 +20,16 @@
*
* All Rights Reserved.
*
* Version 1.2 (2009-03-30)
* Version 1.2 (2009-04-23)
*
*/
package org.openoffice.da.comp.writer4latex;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.Vector;
import com.sun.star.awt.XControl;
import com.sun.star.awt.XControlContainer;
@ -199,32 +201,99 @@ public final class ConfigurationDialog
}
return true;
}
private boolean autoConfigure(XWindow xWindow) {
externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s");
externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s");
externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s");
externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s");
// Unix: Test to determine wether a certain application is available in the OS
// Requires "which", hence unix only
private boolean hasApp(String sAppName) {
try {
Vector<String> command = new Vector<String>();
command.add("which");
command.add(sAppName);
ProcessBuilder pb = new ProcessBuilder(command);
Process proc = pb.start();
// Gobble the error stream of the application
StreamGobbler errorGobbler = new
StreamGobbler(proc.getErrorStream(), "ERROR");
// Gooble the output stream of the application
StreamGobbler outputGobbler = new
StreamGobbler(proc.getInputStream(), "OUTPUT");
errorGobbler.start();
outputGobbler.start();
// The application exists if the process exits with 0
return proc.waitFor()==0;
}
catch (InterruptedException e) {
return false;
}
catch (IOException e) {
return false;
}
}
// Unix: Configure a certain application testing the availability
private boolean configureApp(String sName, String sAppName, String sArguments) {
if (hasApp(sAppName)) {
externalApps.setApplication(sName, sAppName, sArguments);
return true;
}
else {
externalApps.setApplication(sName, "???", "???");
return false;
}
}
// Unix: Configure a certain application testing the availability
// This variant uses an array of potential apps
private boolean configureApp(String sName, String[] sAppNames, String sArguments) {
for (String sAppName : sAppNames) {
if (configureApp(sName, sAppName, sArguments)) { return true; }
}
return false;
}
// Configure the applications automatically (OS dependent)
private boolean autoConfigure(XWindow xWindow) {
String sOsName = System.getProperty("os.name");
if ("Linux".equals(sOsName)) {
// TODO: Search for applications (which...)
// Viewers may be evince, okular, xdvi, xpdf, ghostview or...
externalApps.setApplication(ExternalApps.DVIVIEWER, "evince", "%s");
externalApps.setApplication(ExternalApps.PDFVIEWER, "evince", "%s");
externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "evince", "%s");
configureApp(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
configureApp(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
configureApp(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
configureApp(ExternalApps.DVIPS, "dvips", "%s");
configureApp(ExternalApps.BIBTEX, "bibtex", "%s");
configureApp(ExternalApps.MAKEINDEX, "makeindex", "%s");
configureApp(ExternalApps.OOLATEX, "oolatex", "%s");
// We have several possible viewers
String[] sDviViewers = {"evince", "okular", "xdvi"};
configureApp(ExternalApps.DVIVIEWER, sDviViewers, "%s");
String[] sPdfViewers = {"evince", "okular", "xpdf"};
configureApp(ExternalApps.PDFVIEWER, sPdfViewers, "%s");
String[] sPsViewers = {"evince", "okular", "ghostview"};
configureApp(ExternalApps.POSTSCRIPTVIEWER, sPsViewers, "%s");
}
else if ("Windows".equals(sOsName)) {
// TODO: Get information from the windows registry
// Assume MikTeX
externalApps.setApplication(ExternalApps.LATEX, "latex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.PDFLATEX, "pdflatex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.XELATEX, "xelatex", "--interaction=batchmode %s");
externalApps.setApplication(ExternalApps.DVIPS, "dvips", "%s");
externalApps.setApplication(ExternalApps.BIBTEX, "bibtex", "%s");
externalApps.setApplication(ExternalApps.MAKEINDEX, "makeindex", "%s");
externalApps.setApplication(ExternalApps.OOLATEX, "oolatex", "%s");
externalApps.setApplication(ExternalApps.DVIVIEWER, "yap", "--single-instance %s");
// And assume gsview for pdf and ps
// gsview32 may not be in the path, but at least this helps a bit
externalApps.setApplication(ExternalApps.PDFVIEWER, "gsview32.exe", "-e \"%s\"");
externalApps.setApplication(ExternalApps.POSTSCRIPTVIEWER, "gsview32.exe", "-e \"%s\"");
}
else {
// Unsupported OS
}
changeApplication(xWindow);
return true;
}

2
source/java/writer2latex/api/ConverterFactory.java
View file

@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.1.1";
private static final String DATE = "2008-03-30";
private static final String DATE = "2008-04-23";
/** Return version information
* @return the Writer2LaTeX version in the form

21
source/java/writer2latex/xhtml/Converter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-03-02)
* Version 1.2 (2009-03-02)
*
*/
@ -597,8 +597,23 @@ public class Converter extends ConverterBase {
anchor.setAttribute("href",sHref);
String sName = Misc.getAttribute(onode,XMLString.OFFICE_NAME);
if (sName!=null) {
anchor.setAttribute("name",sName);
anchor.setAttribute("title",sName); // OOo does not have title...
// The name attribute is rarely use (usually the user will insert a bookmark)
// Hence we (mis)use it to set additional attributes that are not supported by OOo
if (sName.indexOf(";")==-1 && sName.indexOf("=")==-1) {
// Simple case, use the value to set name and title
anchor.setAttribute("name",sName);
anchor.setAttribute("title",sName);
}
else {
// Complex case - using the syntax: name=value;name=value;...
String[] sElements = sName.split(";");
for (String sElement : sElements) {
String[] sNameVal = sElement.split("=");
if (sNameVal.length>=2) {
anchor.setAttribute(sNameVal[0],sNameVal[1]);
}
}
}
}
// TODO: target has been deprecated in xhtml 1.0 strict
String sTarget = Misc.getAttribute(onode,XMLString.OFFICE_TARGET_FRAME_NAME);

13
source/oxt/writer2latex/description.xml
View file

@ -10,7 +10,12 @@
<dependencies>
<OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
</dependencies>
<publisher>
<name xlink:href="http://writer2latex.sourceforge.net"
lang="en">Writer2LaTeX</name>
</publisher>
<display-name>
<name lang="da">Writer2LaTeX eksportfiltre</name>
<name lang="en">Writer2LaTeX export filters</name>
@ -21,6 +26,12 @@
<name lang="uk">Фільтри експорту Writer2LaTeX</name>
</display-name>
<icon>
<default xlink:href="images/w2licon.png" />
<high-contrast xlink:href="images/w2lhcicon.png" />
</icon>
<extension-description>
<src xlink:href="desc_da.txt" lang="da" />
<src xlink:href="desc_en.txt" lang="en" />

BIN
source/oxt/writer2latex/images/w2lhcicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 447 B

BIN
source/oxt/writer2latex/images/w2licon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

14
source/oxt/writer2xhtml/description.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006"
xmlns:d="http://openoffice.org/extensions/description/2006">
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="org.openoffice.da.writer2xhtml.oxt" />
@ -10,6 +11,11 @@
<OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
</dependencies>
<publisher>
<name xlink:href="http://writer2latex.sourceforge.net"
lang="en">Writer2LaTeX</name>
</publisher>
<display-name>
<name lang="da">Writer2xhtml eksportfiltre</name>
<name lang="en">Writer2xhtml export filters</name>
@ -20,6 +26,12 @@
<name lang="uk">Фільтри експорту Writer2xhtml</name>
</display-name>
<icon>
<default xlink:href="images/w2licon.png" />
<high-contrast xlink:href="images/w2hclicon.png" />
</icon>
<extension-description>
<src xlink:href="desc_da.txt" lang="da" />
<src xlink:href="desc_en.txt" lang="en" />

BIN
source/oxt/writer2xhtml/images/w2lhcicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 447 B

BIN
source/oxt/writer2xhtml/images/w2licon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

25
source/oxt/writer4latex/description.xml
View file

@ -1,9 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006"
xmlns:d="http://openoffice.org/extensions/description/2006">
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="org.openoffice.da.writer4latex.oxt" />
<version value="1.1.1" />
<dependencies>
<OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/>
</dependencies>
<publisher>
<name xlink:href="http://writer2latex.sourceforge.net"
lang="en">Writer2LaTeX</name>
</publisher>
<display-name>
<name lang="da">Writer4LaTeX frontend</name>
<name lang="en">Writer4LaTeX frontend</name>
</display-name>
<extension-description>
<src xlink:href="descriptions/desc_da.txt" lang="da" />
<src xlink:href="descriptions/desc_en.txt" lang="en" />
</extension-description>
<icon>
<default xlink:href="images/w2licon.png" />
<high-contrast xlink:href="images/w2lhcicon.png" />
</icon>
</description>

3
source/oxt/writer4latex/descriptions/desc_da.txt Normal file
View file

@ -0,0 +1,3 @@
Writer4LaTeX integrerer Writer med din LaTeX distribution.
Sammen med Writer2LaTeX eksportfilteret (som også skal være installeret) giver det dig mulighed for at bruge Writer som LaTeX frontend

3
source/oxt/writer4latex/descriptions/desc_en.txt Normal file
View file

@ -0,0 +1,3 @@
Writer4LaTeX integrates Writer with your LaTeX distribution.
Working together with the Writer2LaTeX export filter (which must be installed) this enables you to use Writer as a LaTeX frontend

BIN
source/oxt/writer4latex/images/w2lhcicon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 447 B

BIN
source/oxt/writer4latex/images/w2licon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB