[liblouis-liblouisxml] [liblouisutdml] push by john.bo...@xxxxxxxxxxxxxxxxx - Finished fixing problems with print page numbers in utd on 2013-06-26 00:07 GMT

  • From: liblouisutdml@xxxxxxxxxxxxxx
  • To: liblouis-liblouisxml@xxxxxxxxxxxxx
  • Date: Wed, 26 Jun 2013 00:07:31 +0000

Revision: 8ef6df606a54
Branch:   default
Author:   John Boyer <john.boyer@xxxxxxxxxxxxxxxxx>
Date:     Tue Jun 25 17:06:46 2013
Log:      Finished fixing problems with print page numbers in utd
http://code.google.com/p/liblouisutdml/source/detail?r=8ef6df606a54

Modified:
 /lbu_files/utd.sem
 /liblouisutdml/readconfig.c
 /liblouisutdml/transcriber.c
 /liblouisutdml/utd2brf.c

=======================================
--- /lbu_files/utd.sem  Mon Feb 27 19:37:42 2012
+++ /lbu_files/utd.sem  Tue Jun 25 17:06:46 2013
@@ -1,12 +1,12 @@
 # Copyright 2010, ViewPlus Technologies, Inc and Abilitiessoft, Inc.
 # Licensed under LGPL

+newentries no
 markhead head
 utdmeta meta,name,utd
 utdbrl brl
 utdbrlonly span,class,brlonly
 utdnewpage newpage,brlnumber
 utdnewline newline,xy
-utdgraphic xxx
-newentries no
+utddispimg xxx

=======================================
--- /liblouisutdml/readconfig.c Sat May 25 05:48:55 2013
+++ /liblouisutdml/readconfig.c Tue Jun 25 17:06:46 2013
@@ -1422,7 +1422,8 @@
          return 0;
        }
ud->cells_per_line = (ud->page_right - ud->page_left) / ud->cell_width; - ud->lines_on_page = (ud->page_bottom - ud->page_top) / ud->normal_line;
+      ud->lines_per_page = (ud->page_bottom - ud->page_top) /
+      ud->normal_line;
       ud->back_text = textDevice;
       ud->back_line_length = 70;
     }
=======================================
--- /liblouisutdml/transcriber.c        Mon Jun 24 08:59:44 2013
+++ /liblouisutdml/transcriber.c        Tue Jun 25 17:06:46 2013
@@ -4131,7 +4131,7 @@
   int remaining;
   if (ud->vert_line_pos < ud->page_top)
     ud->vert_line_pos = ud->page_top;
-  if (ud->vert_line_pos == ud->page_top)
+  if (ud->vert_line_pos == ud->page_top && ud->lines_on_page == 0)
     return topOfPage;
   remaining = ud->page_bottom - ud->vert_line_pos;
   if (remaining < ud->normal_line)
@@ -4309,7 +4309,6 @@
   makeBrlOnlyNode ();
   makeNewline (brlOnlyNode, 0);
   addBrlOnly (brlOnlyNode, &sb);
-  makeNewline (brlOnlyNode, 0);
   return 1;
 }

@@ -4547,6 +4546,7 @@
   sprintf (number, "%d", ud->braille_page_number);
   xmlNewProp (newNode, (xmlChar *) "brlnumber", (xmlChar *) number);
   newpageNode = xmlAddChild (parent, newNode);
+  ud->lines_on_page = 0;
   return 1;
 }

@@ -4561,6 +4561,7 @@
   xmlAddChild (parent, newNode);
   ud->vert_line_pos += lineWidth;
   lineWidth = ud->normal_line;
+  ud->lines_on_page++;
   return 1;
 }

@@ -4652,12 +4653,10 @@
           for (k = 0; k < outSize && k < MAXNUMLEN; k++)
             printPageNumber[k] = ud->text_buffer[ud->old_text_length
             + k];
-          ud->text_length = ud->old_text_length;
-          fineFormat ();
           utd_makePageSeparator (printPageNumber, k);
         }
       ud->text_length = ud->old_text_length;
-      return;
+      break;
     case italicx:
       if (!(ud->emphasis & italic))
        break;
@@ -4692,6 +4691,7 @@
 {
   xmlNode *newNode = xmlNewNode (NULL, (xmlChar *) "newline");
   newlineNode = xmlAddChild (brlNode, newNode);
+  ud->lines_on_page++;
   return 1;
 }

=======================================
--- /liblouisutdml/utd2brf.c    Wed May 29 19:32:45 2013
+++ /liblouisutdml/utd2brf.c    Tue Jun 25 17:06:46 2013
@@ -26,7 +26,7 @@
    the Free Software Foundation, 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.

-   Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxx
+   Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxxx
    */

 #include <stdio.h>
@@ -67,7 +67,6 @@
 finishDocument ()
 {
 }
-

 static int
 findBrlNodes (xmlNode * node)
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 - Finished fixing problems with print page numbers in utd on 2013-06-26 00:07 GMT - liblouisutdml