Merge changes from 1.0 final + more config ui work

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@34 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2009-09-21 06:12:18 +00:00
parent e8bba32302
commit a0384669cc
46 changed files with 1671 additions and 90 deletions

View file

@ -313,6 +313,10 @@ public class ClassicI18n extends I18n {
pack.append("\\usepackage[")
.append(babelopt.toString())
.append("]{babel}").nl();
// For Polish we must undefine \lll which is later defined by ams
if (languages.contains("pl")) {
pack.append("\\let\\lll\\undefined").nl();
}
}
// usepackage tipa

View file

@ -16,16 +16,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2006 by Henrik Just
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 0.5 (2006-11-02)
* Version 1.2 (2009-09-20)
*
*/
package writer2latex.latex.i18n;
import java.util.HashSet;
import java.util.Set;
/** This class contains a trie of string -> LaTeX code replacements
*/
public class ReplacementTrie extends ReplacementTrieNode {
@ -48,8 +51,10 @@ public class ReplacementTrie extends ReplacementTrieNode {
else { super.put(sInput,sLaTeXCode,nFontencs); }
}
public String[] getInputStrings() {
return null; //TODO
public Set<String> getInputStrings() {
HashSet<String> strings = new HashSet<String>();
collectStrings(strings,"");
return strings;
}

View file

@ -16,16 +16,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2006 by Henrik Just
* Copyright: 2002-2009 by Henrik Just
*
* All Rights Reserved.
*
* Version 0.5 (2006-11-02)
* Version 1.2 (2009-09-20)
*
*/
package writer2latex.latex.i18n;
import java.util.Set;
/** This class contains a node in a trie of string -> LaTeX code replacements
*/
public class ReplacementTrieNode {
@ -114,6 +116,18 @@ public class ReplacementTrieNode {
child.setFontencs(nFontencs);
}
}
protected void collectStrings(Set<String> strings, String sPrefix) {
ReplacementTrieNode child = this.getFirstChild();
while (child!=null) {
if (child.getLaTeXCode()!=null) {
strings.add(sPrefix+child.getLetter());
System.out.println("Found "+sPrefix+child.getLetter());
}
child.collectStrings(strings, sPrefix+child.getLetter());
child = child.getNextSibling();
}
}
public String toString() {
String s = Character.toString(cLetter);

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- This is a datafile used by Writer2LaTeX
Version 1.0 (2008-12-03)
Version 1.0 (2009-09-07)
The definitions for greek characters are contributed by interzone, info@interzone.gr
and extended by Johannis Likos. Additional bugfixes by Alexej Kryukov
@ -1273,8 +1273,8 @@ PART I: Common symbols, ascii only
<symbol char="227D" math="{\succcurlyeq}"/>
<symbol char="227E" math="{\precsim}"/>
<symbol char="227F" math="{\succsim}"/>
<symbol char="2280" math="{\nsucc}"/>
<symbol char="2281" math="{\nprec}"/>
<symbol char="2280" math="{\nprec}"/>
<symbol char="2281" math="{\nsucc}"/>
<symbol char="2282" math="{\subset}"/>
<symbol char="2283" math="{\supset}"/>
<symbol char="2284" math="{\not\subset}"/>