From ceddd94461085ac5a006d7c6757bd31a204faa0d Mon Sep 17 00:00:00 2001 From: henrikjust Date: Mon, 24 Nov 2014 10:56:12 +0000 Subject: [PATCH] w2l log viewer improvements git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@221 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- source/distro/changelog.txt | 5 +++ .../da/comp/writer2latex/LogViewerDialog.java | 43 ++++++++++++++++-- .../writer2latex/xhtml/MathConverter.java | 5 ++- .../oxt/writer2latex/W4LDialogs/LogViewer.xdl | 16 ++++--- source/oxt/writer2latex/help/en/help.tree | 3 +- .../logviewer.xhp | 44 +++++++++++++++++++ .../menu.xhp | 3 +- 7 files changed, 106 insertions(+), 13 deletions(-) create mode 100644 source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/logviewer.xhp diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index b5da9e2..e667895 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,11 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.2 ---------- +[w2x] Bugfix: No longer include xmlns attribute on math nodes in HTML5 + +[w2l] Various improvements to the log viewer dialog: Reduced height to better accommodate small screen resolutions. + Added checkbox to filter the LaTeX log to display only errors. Added help page and long tips. + [w2x] Changed export format for toolbar from XHTML+MathML to HTML5 [w2l] Added new option font to load font packages. It accepts a large number of standard font packages such as diff --git a/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java b/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java index f446fe6..dfcab73 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/LogViewerDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.6 (2014-10-29) + * Version 1.6 (2014-11-20) * */ @@ -36,6 +36,7 @@ import java.net.URISyntaxException; import com.sun.star.awt.XDialog; import com.sun.star.uno.XComponentContext; +import org.openoffice.da.comp.w2lcommon.helper.DialogAccess; import org.openoffice.da.comp.w2lcommon.helper.DialogBase; /** This class provides a uno component which displays logfiles @@ -59,6 +60,7 @@ public class LogViewerDialog extends DialogBase private String sBaseUrl = null; private String sLaTeXLog = null; + private String sLaTeXErrors = null; private String sBibTeXLog = null; private String sMakeindexLog = null; @@ -71,6 +73,7 @@ public class LogViewerDialog extends DialogBase public void initialize() { if (sBaseUrl!=null) { sLaTeXLog = readTextFile(sBaseUrl+".log"); + sLaTeXErrors = errorFilter(sLaTeXLog); sBibTeXLog = readTextFile(sBaseUrl+".blg"); sMakeindexLog = readTextFile(sBaseUrl+".ilg"); setComboBoxText("LogContents",sLaTeXLog); @@ -98,19 +101,27 @@ public class LogViewerDialog extends DialogBase // Implement XDialogEventHandler public boolean callHandlerMethod(XDialog xDialog, Object event, String sMethod) { if (sMethod.equals("ViewLaTeXLog")) { - setComboBoxText("LogContents", sLaTeXLog); + setComboBoxText("LogContents", + getCheckBoxState("ErrorFilter")==DialogAccess.CHECKBOX_CHECKED ? sLaTeXErrors : sLaTeXLog); + setControlEnabled("ErrorFilter",true); } else if (sMethod.equals("ViewBibTeXLog")) { setComboBoxText("LogContents", sBibTeXLog); + setControlEnabled("ErrorFilter",false); } else if (sMethod.equals("ViewMakeindexLog")) { setComboBoxText("LogContents", sMakeindexLog); + setControlEnabled("ErrorFilter",false); + } + else if (sMethod.equals("ErrorFilterChange")) { + setComboBoxText("LogContents", + getCheckBoxState("ErrorFilter")==DialogAccess.CHECKBOX_CHECKED ? sLaTeXErrors : sLaTeXLog); } return true; } public String[] getSupportedMethodNames() { - String[] sNames = { "ViewLaTeXLog", "ViewBibTeXLog", "ViewMakeindexLog" }; + String[] sNames = { "ViewLaTeXLog", "ViewBibTeXLog", "ViewMakeindexLog", "ErrorFilterChange" }; return sNames; } @@ -139,6 +150,32 @@ public class LogViewerDialog extends DialogBase } return buf.toString(); } + + // Extract errors from LaTeX log file only + private String errorFilter(String log) { + StringBuilder buf = new StringBuilder(); + int nLen = log.length(); + int nIndex = 0; + boolean bIncludeLines = false; + while (nIndex1 && log.charAt(nIndex)=='!') { + bIncludeLines = true; + } + else if (nNewline==nIndex) { + if (bIncludeLines) { + buf.append('\n'); + } + bIncludeLines = false; + } + if (bIncludeLines) { + buf.append(log.substring(nIndex,nNewline)).append('\n'); + } + nIndex = nNewline+1; + } + return buf.toString(); + } } diff --git a/source/java/writer2latex/xhtml/MathConverter.java b/source/java/writer2latex/xhtml/MathConverter.java index 2635481..0028f40 100644 --- a/source/java/writer2latex/xhtml/MathConverter.java +++ b/source/java/writer2latex/xhtml/MathConverter.java @@ -187,9 +187,10 @@ public class MathConverter extends ConverterHelper { if (onode.hasAttribute("xmlns:math")) { math.setAttribute("xmlns", onode.getAttribute("xmlns:math")); } - else if (onode.hasAttribute("xmlns")) { + else if (onode.hasAttribute("xmlns") && converter.nType!=XhtmlDocument.HTML5) { + // Don't include xmlns attribute in HTML5 math.setAttribute("xmlns", onode.getAttribute("xmlns")); - } + } if (bAllowDisplay && onode.hasAttribute("display")) { // Starting with version 4.2, LO exports display="block" for display equations // This is a good thing, but in XHTML we can unfortunately only allow this for diff --git a/source/oxt/writer2latex/W4LDialogs/LogViewer.xdl b/source/oxt/writer2latex/W4LDialogs/LogViewer.xdl index 6b5a405..bbfd9b4 100644 --- a/source/oxt/writer2latex/W4LDialogs/LogViewer.xdl +++ b/source/oxt/writer2latex/W4LDialogs/LogViewer.xdl @@ -1,19 +1,23 @@ - + - + - + - + - - + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2latex/help/en/help.tree b/source/oxt/writer2latex/help/en/help.tree index c0c5e5d..a1548af 100644 --- a/source/oxt/writer2latex/help/en/help.tree +++ b/source/oxt/writer2latex/help/en/help.tree @@ -3,7 +3,8 @@ Introduction Menu and toolbar - LaTeX Export + LaTeX export + View log files Applications diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/logviewer.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/logviewer.xhp new file mode 100644 index 0000000..1ff6283 --- /dev/null +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/logviewer.xhp @@ -0,0 +1,44 @@ + + + + + View log files + org.openoffice.da.writer2latex.oxt/logviewer.xhp + + + + + View log files + View the log files of the most recent LaTeX run of the + current document. +
+ Click the Log-button on the toolbar +
+ + When the document is processed with LaTeX, a number of + log files are generated. They contain error messages and other technical information about the conversion. + Advanced users may use this for troubleshooting. + + Log files + + + View LaTeX log + Select this to view the log of the latest LaTeX run + Select this to view the log of the latest LaTeX run. + The log file can become quite long and difficult to read. If you only want to view error messages in the + log, you can check Only errors at the bottom of the dialog. + + + Check this if you only want to see error messages in the log file + + + View BibTeX log + Select this to view the log of the latest BibTeX run + Select this to view the log of the latest BibTeX run. + + + View Makeindex log + Select this to view the log of the latest Makeindex run + Select this to view the log of the latest Makeindex run. + + \ No newline at end of file diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/menu.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/menu.xhp index bb6ac68..f352e8f 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/menu.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/menu.xhp @@ -51,7 +51,8 @@ Run LaTeX and display the result - View Log files + View Log files In case of any problems in the conversion process, you can view the log files created by