[liblouis-liblouisxml] [liblouisutdml] push by john.bo...@xxxxxxxxxxxxxxxxx - Added ability to use liblouis virtual dots in conversion modules on 2012-06-16 15:45 GMT

  • From: liblouisutdml@xxxxxxxxxxxxxx
  • To: liblouis-liblouisxml@xxxxxxxxxxxxx
  • Date: Sat, 16 Jun 2012 15:49:59 +0000

Revision: e65c3434d789
Author:   John Boyer <john.boyer@xxxxxxxxxxxxxxxxx>
Date:     Sat Jun 16 08:44:39 2012
Log:      Added ability to use liblouis virtual dots in conversion modules
http://code.google.com/p/liblouisutdml/source/detail?r=e65c3434d789

Modified:
 /configure.ac
 /lbu_files/preferences.cfg
 /liblouisutdml/liblouisutdml.h
 /liblouisutdml/readconfig.c
 /liblouisutdml/sem_enum.h
 /liblouisutdml/sem_names.h
 /liblouisutdml/transcriber.c
 /windows/make_makefile.c

=======================================
--- /configure.ac       Tue Feb 28 04:07:20 2012
+++ /configure.ac       Sat Jun 16 08:44:39 2012
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.59)
-AC_INIT(liblouisutdml, 2.2.0, john.boyer@xxxxxxxxxxxxxxxxx)
+AC_INIT(liblouisutdml, 2.3.0, john.boyer@xxxxxxxxxxxxxxxxx)
 AC_CONFIG_SRCDIR([liblouisutdml/semantics.c])
 AC_CONFIG_HEADER([liblouisutdml/config.h])
 # AM_MAINTAINER_MODE
@@ -15,7 +15,7 @@

 # increment any time the source changes; set to
 # 0 if you increment CURRENT
-LIBLOUISUTDML_REVISION=4
+LIBLOUISUTDML_REVISION=5

 # increment if any interfaces have been added; set to 0
 # if any interfaces have been changed or removed. removal has
=======================================
--- /lbu_files/preferences.cfg  Sat Apr 21 16:32:06 2012
+++ /lbu_files/preferences.cfg  Sat Jun 16 08:44:39 2012
@@ -58,10 +58,7 @@
        semanticFiles *,nemeth.sem
        internetAccess no
        newEntries yes
-       volumeSem utd.sem
-       transinxmlSem utd.sem
-       brfSem utd.sem
-       pefSem utd.sem
+       converterSem utd.sem

 #(miscellaneous)
        #include (another configuration file)
=======================================
--- /liblouisutdml/liblouisutdml.h      Wed Mar 21 20:29:33 2012
+++ /liblouisutdml/liblouisutdml.h      Sat Jun 16 08:44:39 2012
@@ -75,7 +75,8 @@
     notUC = 1 << 28,
     notSync = 1<<27,
     utdInput = 1<<26,
-    convertOnly = 1<<25
+    convertOnly = 1<<25,
+    louisDots = 1<<24
   } ProcessingModes;

   int EXPORT_CALL lbu_translateString
=======================================
--- /liblouisutdml/readconfig.c Tue Jun 12 09:06:23 2012
+++ /liblouisutdml/readconfig.c Sat Jun 16 08:44:39 2012
@@ -749,6 +749,7 @@
     "notSync", "1<<27",
     "utdInput", "1<<26",
     "convertOnly", "1<<25",
+    "louisDots", "1<<24",
     NULL
   };

@@ -1325,7 +1326,7 @@
     strcat (ud->xml_header, "]>\n");
   ud->mode = mode | ud->config_mode;
   ud->orig_format_for = ud->format_for;
-  if (ud->format_for > utd)
+  if (ud->format_for > utd || (ud->mode & louisDots))
     {
       ud->mode &= ~notUC;
       ud->format_for = utd;
=======================================
--- /liblouisutdml/sem_enum.h   Tue Feb 21 05:59:37 2012
+++ /liblouisutdml/sem_enum.h   Sat Jun 16 08:44:39 2012
@@ -75,6 +75,9 @@
   contracted,
   /* General text */
   pagenum,
+  /* Use next 2 for anything. */
+  genpurp1,
+  genpurp2,
   pagebreak,
   attrtotext,
   runninghead,
=======================================
--- /liblouisutdml/sem_names.h  Tue Feb 21 05:59:37 2012
+++ /liblouisutdml/sem_names.h  Sat Jun 16 08:44:39 2012
@@ -40,6 +40,8 @@
   "uncontracted",
   "contracted",
   "pagenum",
+  "genpurp1",
+  "genpurp2",
   "pagebreak",
   "attrtotext",
   "runninghead",
=======================================
--- /liblouisutdml/transcriber.c        Tue Jun 12 02:51:58 2012
+++ /liblouisutdml/transcriber.c        Sat Jun 16 08:44:39 2012
@@ -3746,8 +3746,11 @@
                        ud->text_buffer, length, dotsIO);
       else
        memcpy (ud->text_buffer, content, length * CHARSIZE);
+      if (!(ud->mode & louisDots))
       for (inlen = 0; inlen < length; inlen++)
        ud->text_buffer[inlen] = (ud->text_buffer[inlen] & 0x00ff) | 0x2800;
+      else
+        inlen = length;
     }
   outlen = maxContent;
   wc_string_to_utf8 (ud->text_buffer, &inlen, brlContent, &outlen);
=======================================
--- /windows/make_makefile.c    Sat Jul 30 06:32:57 2011
+++ /windows/make_makefile.c    Sat Jun 16 08:44:39 2012
@@ -42,7 +42,7 @@
     "# This file was generated by make_makefile.exe.",
     "# Do not edit this file. Change configure.mk.",
     "# Then run",
-    "# nmake (no arguments)",
+    "# nmake /f Makefile.nmake",
     "# to generate liblouisutdml.dll and liblouisutdml.lib",
     "!include configure.mk",
     "!include $(LIBLOUIS_PATH)\\windows\\configure.mk",
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com

Other related posts:

  • » [liblouis-liblouisxml] [liblouisutdml] push by john.bo...@xxxxxxxxxxxxxxxxx - Added ability to use liblouis virtual dots in conversion modules on 2012-06-16 15:45 GMT - liblouisutdml