Merge changes from 1.0beta3 + Export XHTML without MathML

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@24 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-05-29 10:44:38 +00:00
parent 1bbf6241a4
commit 839483be11
29 changed files with 927 additions and 27 deletions

View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2009-03-02)
* Version 1.2 (2009-05-29)
*
*/
@ -153,7 +153,7 @@ public class Converter extends ConverterBase {
textCv = new TextConverter(ofr,config,this);
tableCv = new TableConverter(ofr,config,this);
drawCv = new DrawConverter(ofr,config,this);
mathCv = new MathConverter(ofr,config,this,nType!=XhtmlDocument.XHTML10);
mathCv = new MathConverter(ofr,config,this,nType!=XhtmlDocument.XHTML10 && nType!=XhtmlDocument.XHTML11);
// Set locale to document language
StyleWithProperties style = ofr.isSpreadsheet() ? ofr.getDefaultCellStyle() : ofr.getDefaultParStyle();

View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.2 (2009-03-27)
* Version 1.2 (2009-05-29)
*
*/
@ -95,6 +95,20 @@ public class L10n {
case DOCUMENT: return "Documento";
}
}
if (sLocale.startsWith("it")) { // italian
switch (nString) {
case UP: return "Su";
case FIRST : return "Inizio";
case PREVIOUS : return "Precedente";
case NEXT : return "Successivo";
case LAST : return "Fine";
case CONTENTS : return "Sommario";
case INDEX : return "Indice";
case HOME : return "Home";
case DIRECTORY: return "Cartella";
case DOCUMENT: return "Documento";
}
}
if (sLocale.startsWith("da")) { // danish
switch (nString) {
case UP: return "Op";
@ -109,6 +123,20 @@ public class L10n {
case DOCUMENT: return "Dokument";
}
}
if (sLocale.startsWith("pl")) { // polish
switch (nString) {
case UP: return "W g\u00f3r\u0119";
case FIRST : return "Pierwsza";
case PREVIOUS : return "Poprzednia";
case NEXT : return "Nast\u0119pna";
case LAST : return "Ostatnia";
case CONTENTS : return "Spis tre\u015bci";
case INDEX : return "Indeks";
case HOME : return "Pocz\u0105tek";
case DIRECTORY: return "Katalog";
case DOCUMENT: return "Dokument";
}
}
if (sLocale.startsWith("ru")) { // russian
switch (nString) {
case UP: return "\u0412\u0432\u0435\u0440\u0445";
@ -137,6 +165,20 @@ public class L10n {
case DOCUMENT: return "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442";
}
}
if (sLocale.startsWith("tr")) { // turkish
switch (nString) {
case UP: return "Yukar\u0131";
case FIRST : return "\u0130lk";
case PREVIOUS : return "\u00d6nceki";
case NEXT : return "Sonraki";
case LAST : return "Son";
case CONTENTS : return "\u0130\u00e7indekiler";
case INDEX : return "\u0130ndeks";
case HOME : return "Ev";
case DIRECTORY: return "Klas\u00f6r";
case DOCUMENT: return "D\u00f6k\u00fcman";
}
}
if (sLocale.startsWith("hr")) { // croatian
switch (nString) {
case UP: return "Up";

View file

@ -0,0 +1,35 @@
/************************************************************************
*
* Xhtml11Converter.java
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2009-05-29)
*
*/
package writer2latex.xhtml;
public class Xhtml11Converter extends Converter {
public Xhtml11Converter() {
super(XhtmlDocument.XHTML11);
}
}

View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-02-19)
* Version 1.0 (2009-05-29)
*
*/
@ -59,7 +59,7 @@ public class XhtmlDocument extends DOMDocument {
/** Constant to identify XHTML 1.0 strict documents */
public static final int XHTML10 = 0;
/** Constant to identify XHTML 1.1 documents (not used currently) */
/** Constant to identify XHTML 1.1 documents */
public static final int XHTML11 = 1;
/** Constant to identify XHTML + MathML documents */
@ -70,7 +70,7 @@ public class XhtmlDocument extends DOMDocument {
*/
public static final int XHTML_MATHML_XSL = 3;
private static final String[] sExtension = { ".html", ".html", ".xhtml", ".xml" };
private static final String[] sExtension = { ".html", ".xhtml", ".xhtml", ".xml" };
private static final String[] sEmpty = { "base", "meta", "link", "hr", "br", "param", "img", "area", "input", "col" };