Revision: 253ad18f8450 Author: John Boyer <john.boyer@xxxxxxxxxxxxxxxxx> Date: Mon Mar 12 09:44:59 2012 Log: Fix location of BB files in Windows and work on tutorial. http://code.google.com/p/brailleblaster/source/detail?r=253ad18f8450 Added: /src/main/org/brailleblaster/embossers/EmbossersManager.java /src/main/org/brailleblaster/printers/PrintersManager.java Deleted: /src/main/org/brailleblaster/embossers/EmbosserManager.java /src/main/org/brailleblaster/printers/PrinterManager.java Modified: /dist/helpDocs/tutorial.html /src/main/org/brailleblaster/BBIni.java ======================================= --- /dev/null+++ /src/main/org/brailleblaster/embossers/EmbossersManager.java Mon Mar 12 09:44:59 2012
@@ -0,0 +1,9 @@ +package org.brailleblaster.embossers; + +/** This class choses the embosser driver to use. +*/ + +public class EmbossersManager +{ +} + ======================================= --- /dev/null+++ /src/main/org/brailleblaster/printers/PrintersManager.java Mon Mar 12 09:44:59 2012
@@ -0,0 +1,9 @@ +package org.brailleblaster.printers; + +/** This class choses the printer driver to use. +*/ + +public class PrintersManager +{ +} + =======================================--- /src/main/org/brailleblaster/embossers/EmbosserManager.java Fri Dec 24 13:36:12 2010
+++ /dev/null @@ -1,9 +0,0 @@ -package org.brailleblaster.embossers; - -/** This class choses the embosser driver to use. -*/ - -public class EmbosserManager -{ -} - =======================================--- /src/main/org/brailleblaster/printers/PrinterManager.java Fri Mar 9 01:15:10 2012
+++ /dev/null @@ -1,9 +0,0 @@ -package org.brailleblaster.printers; - -/** This class choses the printer driver to use. -*/ - -public class PrinterManager -{ -} - ======================================= --- /dist/helpDocs/tutorial.html Sun Mar 11 08:09:03 2012 +++ /dist/helpDocs/tutorial.html Mon Mar 12 09:44:59 2012 @@ -11,7 +11,7 @@ the BrailleBlaster GUI.</p> <p>Parts of the GUI are being implemented incrementally. At present the -Open, SaveAs and emboss itmes of the file menu are implemented. The +Open, SaveAs and Emboss items of the file menu are implemented. The translate item in the translate menu is implemented. The entire help menu is implemented.</p> @@ -39,9 +39,9 @@ <p>translate: translate a file into braille. The simplest usage of this subcommand is:</p> -<p>java-jar brailleblaster.jar translate inputfile outputfile</p> - -<p>If your system does not have a GUI or it canot be reached for some +<p>java -jar brailleblaster.jar translate inputfile outputfile</p> + +<p>If your system does not have a GUI or it cannot be reached for some reason, you will get an error message saying that it could not be found. You can still use the subcommands by putting -nogui as the first argument. For example:</p> @@ -51,7 +51,7 @@ <p>The translate subcommand has many options. It will handle text, html and xml files. It will even back-translate. To learn about the options look at the section on file2brl in the -<a href="liblouisutdml/liblouisutdml.html">liblouisutdml manual</a>. +<a href="liblouisutdml.html">liblouisutdml manual</a>. BrailleBlaster does not run the file2brl program. It emulates it.</p> @@ -60,6 +60,16 @@ the name of the embosser on your system use the EmbossNow! menu item in the wordprocessor and note the name.</p> +<p>checktable: check a liblouis table for validity. The syntax of this +command is:</p> + +<p>java -jar brailleblaster.jar checktable tablename</p> + +<p>If the table contains errors appropriate messages will be printed. If +it is valid the message "no errors found" will be printed</p> + +<p>help: prints information about the subcommands.</p> + <p>If no arguments are given after brailleblaster.jar, or the argument is a file name, the application enters the wordprocessor. It may display startup dialogs if this is the first time you are using it or you have ======================================= --- /src/main/org/brailleblaster/BBIni.java Sun Oct 2 11:05:22 2011 +++ /src/main/org/brailleblaster/BBIni.java Mon Mar 12 09:44:59 2012 @@ -76,6 +76,7 @@ private static String platformName; private static boolean hLiblouisutdml = false; private static FileHandler logFile; +static final String BBID = "brlblst"; private BBIni(String[] args) { Main m = new Main(); @@ -84,28 +85,36 @@ osVersion = System.getProperty ("os.version"); fileSep = System.getProperty ("file.separator"); platformName = SWT.getPlatform(); -if (platformName.equals("win32")) -nativeLibrarySuffix = ".dll"; -else if (platformName.equals ("cocoa")) -nativeLibrarySuffix = ".dylib"; -else nativeLibrarySuffix = ".so"; +String userHome = System.getProperty ("user.home"); +String BBHome; nativeLibraryPath = brailleblasterPath + fileSep + "native" + fileSep + "lib" + fileSep + "liblouisutdml" + nativeLibrarySuffix; programDataPath = brailleblasterPath + fileSep + "programData"; helpDocsPath = brailleblasterPath + fileSep + "helpDocs"; -String userHome = System.getProperty ("user.home"); -settingsPath = userHome + fileSep + "bbsettings"; +if (platformName.equals("win32")) { +BBHome = System.getenv ("APPDATA") + BBID; +nativeLibrarySuffix = ".dll"; +} +else if (platformName.equals ("cocoa")) { +BBHome = userHome + fileSep + BBID; +nativeLibrarySuffix = ".dylib"; +} +else { +BBHome = userHome + fileSep + BBID; +nativeLibrarySuffix = ".so"; +} +settingsPath = BBHome + fileSep + "settings"; File settings = new File (settingsPath); if (!settings.exists()) settings.mkdir(); -tempFilesPath = userHome + fileSep + "bbtemp"; +tempFilesPath = BBHome + fileSep + "temp"; File temps = new File (tempFilesPath); if (!temps.exists()) temps.mkdir(); logger = Logger.getLogger ("org.brailleblaster"); try { logFile = new FileHandler -(tempFilesPath + fileSep + "bblog.xml"); +(tempFilesPath + fileSep + "log.xml"); } catch (IOException e) { logger.log (Level.SEVERE, "cannot open logfile", e); }