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

Merge bugfixes from 1.2 beta

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@157 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2014-08-05 08:22:37 +00:00
parent 8d15813690
commit d3bd2a10d5
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2012-03-11)
* Version 1.4 (2014-08-05)
*
*/
@ -687,13 +687,15 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta
private void newStyleClick(DialogAccess dlg) {
if (nCurrentFamily>-1) {
updateStyleMaps(dlg);
// Invalidate current style name in any case (appendItem returns null if the user
// selects an existing style, but it still changes the current item)
sCurrentStyleName = null;
String sNewName = appendItem(dlg, "StyleName",styleNameProvider.getInternalNames(sOOoFamilyNames[nCurrentFamily]).keySet());
if (sNewName!=null) {
styleMap[nCurrentFamily].put(sNewName, new HashMap<String,String>());
clearControls(dlg);
sCurrentStyleName=null;
styleNameChange(dlg);
}
styleNameChange(dlg);
updateStyleControls(dlg);
}
}

12
source/java/writer2latex/latex/LaTeXConfig.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2011 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2011-03-30)
* Version 1.4 (2014-08-05)
*
*/
@ -465,7 +465,13 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase {
String sInput = elm.getAttribute("input");
Map<String,String> attributes = new HashMap<String,String>();
attributes.put("latex-code", elm.getAttribute("latex-code"));
attributes.put("fontenc", elm.getAttribute("fontenc"));
if (elm.hasAttribute("fontenc") && elm.getAttribute("fontenc").length()>0) {
// The fontenc attribute is optional
attributes.put("fontenc", elm.getAttribute("fontenc"));
}
else {
attributes.put("fontenc", "any");
}
stringReplace.put(sInput,attributes);
}
else if (elm.getTagName().equals("math-symbol-map")) {

6
source/java/writer2latex/latex/StarMathConverter.java
View file

@ -16,9 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* Version 1.2 (2012-03-05)
* Version 1.4 (2014-08-05)
*
* All Rights Reserved.
*/
@ -240,6 +240,7 @@ class Token{
public static final Token COPROD=new Token();
public static final Token FORALL=new Token();
public static final Token EXISTS=new Token();
public static final Token NOTEXISTS = new Token();
public static final Token LIM=new Token();
public static final Token NABLA=new Token();
public static final Token TOWARD=new Token();
@ -458,6 +459,7 @@ class SmTokenTable{
new SmTokenTableEntry( "emptyset" , Token.EMPTYSET, "\\emptyset ", TGroup.STANDALONE, 5),
new SmTokenTableEntry( "equiv", Token.EQUIV, "\\equiv ", TGroup.RELATION, 0),
new SmTokenTableEntry( "exists", Token.EXISTS, "\\exists ", TGroup.STANDALONE, 5),
new SmTokenTableEntry( "notexists", Token.NOTEXISTS, "\\nexists ", TGroup.STANDALONE, 5),
new SmTokenTableEntry( "exp", Token.EXP, "\\exp ", TGroup.FUNCTION, 5),
new SmTokenTableEntry( "fact", Token.FACT, "!", TGroup.UNOPER, 5),
new SmTokenTableEntry( "fixed", Token.FIXED, "\\mathtt", TGroup.FONT, 0),

2
source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl
View file

@ -39,7 +39,7 @@
<dlg:button dlg:id="ExportButton" dlg:tab-index="34" dlg:left="5" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Export" dlg:button-type="ok"/>
<dlg:button dlg:id="CancelButton" dlg:tab-index="35" dlg:left="70" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Cancel" dlg:button-type="cancel"/>
<dlg:button dlg:id="HelpButton" dlg:tab-index="36" dlg:left="290" dlg:top="230" dlg:width="55" dlg:height="12" dlg:value="Help" dlg:button-type="help"/>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="37" dlg:left="175" dlg:top="9" dlg:width="2" dlg:height="190" dlg:value="&amp;143.XhtmlOptions.FixedLine1.Label" dlg:align="vertical"/>
<dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="37" dlg:left="175" dlg:top="9" dlg:width="2" dlg:height="190" dlg:value="" dlg:align="vertical"/>
<dlg:checkbox dlg:id="RelativeFontSize" dlg:tab-index="8" dlg:left="10" dlg:top="64" dlg:width="155" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EpubOptionsRelativeFontSize" dlg:value="Use relative font size" dlg:checked="true">
<script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:RelativeFontSizeChange" script:language="UNO"/>
</dlg:checkbox>