[liblouis-liblouisxml] [liblouisutdml] push by john.bo...@xxxxxxxxxxxxxxxxx - fixed problem with newpage action and others on 2013-08-23 03:18 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Fri, 23 Aug 2013 03:18:36 +0000
Revision: 68c11c3ddd3b
Branch: default
Author: John Boyer <john.boyer@xxxxxxxxxxxxxxxxx>
Date: Fri Aug 23 03:17:35 2013 UTC
Log: fixed problem with newpage action and others
http://code.google.com/p/liblouisutdml/source/detail?r=68c11c3ddd3b
Modified:
/liblouisutdml/transcribe_paragraph.c
/liblouisutdml/transcriber.c
=======================================
--- /liblouisutdml/transcribe_paragraph.c Tue Jun 4 10:48:31 2013 UTC
+++ /liblouisutdml/transcribe_paragraph.c Fri Aug 23 03:17:35 2013 UTC
@@ -236,7 +236,9 @@
do_boxline (node);
if (action != 0)
pop_sem_stack ();
+ if (node->children == NULL)
return 1;
+ break;
case pagebreak:
do_pagebreak (node);
if (action != 0)
@@ -261,17 +263,23 @@
do_softreturn ();
if (action != 0)
pop_sem_stack ();
+ if (node->children == NULL)
return 1;
+ break;
case newpage:
do_newpage ();
if (action != 0)
pop_sem_stack ();
+ if (node->children == NULL)
return 1;
+ break;
case righthandpage:
do_righthandpage ();
if (action != 0)
pop_sem_stack ();
+ if (node->children == NULL)
return 1;
+ break;
case code:
transcribe_computerCode (node, 0);
if (action != 0)
@@ -305,7 +313,9 @@
return 1;
case changetable:
change_table (node);
+ if (node->children == NULL)
return 1;
+ break;
case pagenum:
do_pagenum ();
break;
=======================================
--- /liblouisutdml/transcriber.c Mon Aug 19 15:10:02 2013 UTC
+++ /liblouisutdml/transcriber.c Fri Aug 23 03:17:35 2013 UTC
@@ -1014,8 +1014,8 @@
{
int k;
int top = ud->top;
- memset (&ud->typeform[ud->old_text_length], ud->text_length -
- ud->old_text_length, 0);
+ memset (&ud->typeform[ud->old_text_length], 0, ud->text_length -
+ ud->old_text_length);
while (top >= 0 && (ud->stack[top] == italicx || ud->stack[top] == boldx
|| ud->stack[top] == underlinex
|| ud->stack[top] == compbrl))
@@ -4425,7 +4425,7 @@
PageStatus curPageStatus;
int braillePageNumber = 0;
int printPageNumber = 0;
- pageNumber.transTextLength = 0;
+ memset (&pageNumber, 0, sizeof (pageNumber));
curPageStatus = checkPageStatus ();
if (curPageStatus == midPage)
return 1;
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 - fixed problem with newpage action and others on 2013-08-23 03:18 GMT - liblouisutdml
