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

Some fixes for 1.0 beta

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@8 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-03-08 13:43:50 +00:00
parent 6c7c7cdbf2
commit fe1b3e2fc5
15 changed files with 391 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-03-02)
* Version 1.0 (2009-03-08)
*
*/
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.0 beta";
private static final String DATE = "2008-03-02";
private static final String DATE = "2008-03-08";
/** Return version information
* @return the Writer2LaTeX version in the form

4
source/java/writer2latex/bibtex/BibTeXDocument.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-02-17)
* Version 1.0 (2009-03-08)
*
*/
@ -120,7 +120,7 @@ public class BibTeXDocument implements Document {
// BibTeX files are plain ascii
OutputStreamWriter osw = new OutputStreamWriter(os,"ASCII");
osw.write("%% This file was converted to BibTeX by Writer2BibTeX ver. "+ConverterFactory.getVersion()+".\n");
osw.write("%% See http://www.hj-gym.dk/~hj/writer2latex for more info.\n");
osw.write("%% See http://writer2latex.sourceforge.net for more info.\n");
osw.write("\n");
Enumeration enumeration = entries.elements();
while (enumeration.hasMoreElements()) {

10
source/java/writer2latex/latex/DrawConverter.java
View file

@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
* Version 1.0 (2009-02-17)
* Version 1.0 (2009-03-08)
*
*/
@ -251,8 +251,8 @@ public class DrawConverter extends ConverterHelper {
}
Element frame = getFrame(node);
//String sName = frame.getAttribute(XMLString.DRAW_NAME);
palette.getFieldCv().addTarget(frame,"|graphics",ldp);
String sName = frame.getAttribute(XMLString.DRAW_NAME);
palette.getFieldCv().addTarget(sName,"|graphic",ldp);
String sAnchor = frame.getAttribute(XMLString.TEXT_ANCHOR_TYPE);
// TODO: Recognize Jex equations (needs further testing of Jex)
@ -421,8 +421,8 @@ public class DrawConverter extends ConverterHelper {
private void handleDrawTextBox(Element node, LaTeXDocumentPortion ldp, Context oc) {
Element frame = getFrame(node);
//String sName = frame.getAttribute(XMLString.DRAW_NAME);
palette.getFieldCv().addTarget(frame,"|frame",ldp);
String sName = frame.getAttribute(XMLString.DRAW_NAME);
palette.getFieldCv().addTarget(sName,"|frame",ldp);
String sAnchor = frame.getAttribute(XMLString.TEXT_ANCHOR_TYPE);
//if (oc.isInFrame() || "as-char".equals(sAnchor)) {
if ("as-char".equals(sAnchor)) {

8
source/java/writer2latex/xhtml/DrawConverter.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-12-15)
* Version 1.0 (2009-03-08)
*
*/
@ -760,7 +760,7 @@ public class DrawConverter extends ConverterHelper {
// We thus have to subtract the borders and padding to get the correct width
StyleWithProperties style = ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME));
String sWidth = Misc.getAttribute(node,XMLString.SVG_WIDTH);
String sWidth = node.getAttribute(XMLString.SVG_WIDTH);
if (sWidth.length()>0) {
if (style!=null) {
// Subtract padding
@ -782,7 +782,7 @@ public class DrawConverter extends ConverterHelper {
props.addValue("width",scale(sWidth));
}
String sHeight = Misc.getAttribute(node,XMLString.SVG_HEIGHT);
String sHeight = node.getAttribute(XMLString.SVG_HEIGHT);
if (sHeight.length()>0 && !bOnlyWidth) {
if (style!=null) {
// Subtract padding

18
source/java/writer2latex/xhtml/L10n.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-12-16)
* Version 1.0 (2009-03-05)
*
*/
@ -81,6 +81,20 @@ public class L10n {
case DOCUMENT: return "Document";
}
}
if (sLocale.startsWith("es")) { // spanish
switch (nString) {
case UP: return "Arriba";
case FIRST : return "Primero";
case PREVIOUS : return "Previo";
case NEXT : return "Siguiente";
case LAST : return "\u00daltimo";
case CONTENTS : return "Contenido";
case INDEX : return "\u00cdndice";
case HOME : return "Inicio";
case DIRECTORY: return "Directorio";
case DOCUMENT: return "Documento";
}
}
if (sLocale.startsWith("da")) { // danish
switch (nString) {
case UP: return "Op";