Revision: 987fa5793506 Branch: default Author: Sahel "sahel.mastoureshgh@xxxxxxxxx" Date: Mon Jul 14 19:18:30 2014 UTC Log: Added aside node for transcriber note epub book http://code.google.com/p/brailleblaster/source/detail?r=987fa5793506 Modified: /dist/programData/liblouisutdml/lbu_files/epub.sem /src/main/org/brailleblaster/perspectives/braille/Manager.java/src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java
/src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java /src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java =======================================--- /dist/programData/liblouisutdml/lbu_files/epub.sem Tue Jan 28 18:43:07 2014 UTC +++ /dist/programData/liblouisutdml/lbu_files/epub.sem Mon Jul 14 19:18:30 2014 UTC
@@ -18,7 +18,7 @@ line line line byline line dateline - para prodnote + trnote aside italicx dfn italicx kbd boldx strong @@ -176,7 +176,6 @@ no footer no section no article - no aside no details no dialog no summary =======================================--- /src/main/org/brailleblaster/perspectives/braille/Manager.java Fri Jul 11 17:01:11 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/Manager.java Mon Jul 14 19:18:30 2014 UTC
@@ -744,8 +744,13 @@ text.update(false);ArrayList<Integer>posList = list.findTextMapElementRange(list.getCurrentIndex(), (Element)list.getCurrent().n.getParent(), true);
+ if (arch.getCurrentConfig().equals("epub.cfg")){+ text.insertNewNode(list.get(posList.get(posList.size() - 1)).end,"aside");
+ } + else{- text.insertNewNode(list.get(posList.get(posList.size() - 1)).end,"prodnote"); + text.insertNewNode(list.get(posList.get(posList.size() - 1)).end,"prodnote");
+ } Message styleMessage = new Message(BBEvent.UPDATE_STYLE); Styles style = styles.get("trnote"); @@ -811,6 +816,7 @@ if(document.getDOM() != null && text.view.getText().length() > 0){ group.setRedraw(false); Element parent = document.getParent(list.getCurrent().n, true); +message.put("previousStyle", styles.get(styles.getKeyFromAttribute(parent))); document.changeSemanticAction(message, list.getCurrent().parentElement());
message.put("style", styles.get(styles.getKeyFromAttribute(parent))); =======================================--- /src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java Thu Jul 3 16:07:57 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/document/BrailleDocument.java Mon Jul 14 19:18:30 2014 UTC
@@ -86,13 +86,14 @@public void insertEmptyTextNode(MapList list, TextMapElement current, int textOffset, int brailleOffset, int index,String elem){
String type = this.semHandler.getDefault(elem); Element p = makeElement(elem, "semantics", "style," + type); - //Add new attribute - if (elem.equalsIgnoreCase("prodnote")){ + //Add new attribute for epub aside and for nimas prodnote+ if ((elem.equalsIgnoreCase("prodnote") )||( elem.equalsIgnoreCase("aside"))){
p.addAttribute(new Attribute("render", "optional")); p.addAttribute(new Attribute("showin", "bxx")); p.addAttribute(new Attribute("class", "utd-trnote")); + } p.appendChild(new Text("")); =======================================--- /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Thu Jul 10 17:59:36 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Mon Jul 14 19:18:30 2014 UTC
@@ -105,6 +105,7 @@ Node brailleText = m.getDocument().findBraillePageNode(page); list.getLastPage().setBraillePage(brailleText); + } } =======================================--- /src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java Thu Jul 10 17:59:36 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/views/wp/BrailleView.java Mon Jul 14 19:18:30 2014 UTC
@@ -305,7 +305,8 @@ } view.append(textBefore + text);- handleStyle(prevStyle, style, t.brailleList.get(i).n, t.parentElement());
++ handleStyle(prevStyle, style, t.brailleList.get(i).n, t.parentElement());
t.brailleList.get(i).setOffsets(spaceBeforeText + total, spaceBeforeText + total + textLength);
total += spaceBeforeText + textLength + spaceAfterText; =======================================--- /src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java Thu Jul 10 17:59:36 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/views/wp/TextView.java Mon Jul 14 19:18:30 2014 UTC
@@ -291,7 +291,7 @@ if(textChanged == true){ sendUpdate(); } - + setListenerLock(true);if((e.caretOffset > currentEnd && (e.caretOffset < nextStart || nextStart == -1)) || (e.caretOffset > currentStart && e.caretOffset > nextStart)){
if(manager.inPrintPageRange(e.caretOffset)){ @@ -299,7 +299,7 @@ nextPageStart(e.caretOffset);else if(currentChar == SWT.ARROW_LEFT || currentChar == SWT.ARROW_UP)
previousPageEnd(e.caretOffset); - } + } }else if((e.caretOffset < currentStart && (e.caretOffset > previousEnd || previousEnd == -1)) || (e.caretOffset < currentStart && e.caretOffset < previousEnd)){
if(manager.inPrintPageRange(e.caretOffset)){ @@ -310,17 +310,17 @@ } } setListenerLock(false); - + setCurrent(view.getCaretOffset()); currentChar = ' '; sendStatusBarUpdate(view.getLineAtOffset(view.getCaretOffset())); } } } - +if(view.getLineAtOffset(view.getCaretOffset()) != currentLine && !manager.inPrintPageRange(view.getCaretOffset()))
sendStatusBarUpdate(view.getLineAtOffset(view.getCaretOffset())); - + } });