[brailleblaster] 3 new revisions pushed by brandon....@xxxxxxxxx on 2015-02-20 13:23 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Fri, 20 Feb 2015 13:24:10 +0000
3 new revisions:
Revision: bd891522d539
Branch: rt1447-MergeElements
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 12:33:36 2015 UTC
Log: mergd with default
https://code.google.com/p/brailleblaster/source/detail?r=bd891522d539
Revision: dde1d11d83b9
Branch: rt1447-MergeElements
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 13:22:23 2015 UTC
Log: Fixed a bug when merging headings
https://code.google.com/p/brailleblaster/source/detail?r=dde1d11d83b9
Revision: c460ff3535fa
Branch: default
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 13:28:09 2015 UTC
Log: Merged changes from branch rt1447
https://code.google.com/p/brailleblaster/source/detail?r=c460ff3535fa
==============================================================================
Revision: bd891522d539
Branch: rt1447-MergeElements
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 12:33:36 2015 UTC
Log: mergd with default
https://code.google.com/p/brailleblaster/source/detail?r=bd891522d539
==============================================================================
Revision: dde1d11d83b9
Branch: rt1447-MergeElements
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 13:22:23 2015 UTC
Log: Fixed a bug when merging headings
https://code.google.com/p/brailleblaster/source/detail?r=dde1d11d83b9
Modified:
/src/main/org/brailleblaster/perspectives/braille/views/wp/formatters/WhiteSpaceManager.java
=======================================
---
/src/main/org/brailleblaster/perspectives/braille/views/wp/formatters/WhiteSpaceManager.java
Mon Jan 26 19:58:25 2015 UTC
+++
/src/main/org/brailleblaster/perspectives/braille/views/wp/formatters/WhiteSpaceManager.java
Fri Feb 20 13:22:23 2015 UTC
@@ -102,17 +102,18 @@
int linesAfter = 0;
int nextLinesBefore = 0;
int nextPos = 0;
+ int index = list.indexOf(t);
+ Styles nextStyle = null;
+
+ if(!isLastInList(index))
+ nextStyle = manager.getStyleTable().makeStylesElement(list.get(index +
1).parentElement(), list.get(index + 1).n);
if(style.contains(StylesType.linesAfter)){
- int index = list.indexOf(t);
linesAfter =
Integer.valueOf((String)style.get(StylesType.linesAfter));
if(isLastInList(index)){
Element prevParent = manager.getDocument().getParent(list.get(index -
1).n, true);
String sem = getSemanticAttribute(prevParent);
- if(isLastInList(index))
- nextPos =
manager.getText().view.getCharCount();
- else
- nextPos = list.get(index + 1).start;
+ nextPos = manager.getText().view.getCharCount();
if(manager.getStyleTable().get(sem).contains(StylesType.linesBefore))
nextLinesBefore =
Integer.valueOf((String)manager.getStyleTable().get(sem).get(StylesType.linesBefore));
@@ -134,6 +135,24 @@
setLines(start, linesAfter);
}
+ else if(!isLastInList(index) &&
nextStyle.contains(StylesType.linesBefore)){
+ nextLinesBefore =
Integer.valueOf((String)nextStyle.get(StylesType.linesBefore));
+ nextPos = list.get(index + 1).start;
+
+ if(linesAfter < nextLinesBefore)
+ linesAfter = nextLinesBefore;
+
+ int diff = nextPos - start;
+ if((diff > linesAfter)){
+ int blankLinesBetween = diff - 1;
+ linesAfter = linesAfter - blankLinesBetween;
+ }
+
+ if(linesAfter < 0 || diff < 0)
+ linesAfter = 0;
+
+ setLines(start, linesAfter);
+ }
else
return removeLinesAfter(t, start, style);
@@ -177,17 +196,17 @@
int linesAfter = 0;
int nextLinesBefore = 0;
int nextPos = 0;
+ int index = list.indexOf(t);
+ Styles nextStyle = null;
+ if(!isLastInList(index))
+ nextStyle = manager.getStyleTable().makeStylesElement(list.get(index +
1).parentElement(), list.get(index + 1).n);
if(style.contains(StylesType.linesAfter)){
- int index = list.indexOf(t);
linesAfter =
Integer.valueOf((String)style.get(StylesType.linesAfter));
if(isLastInList(index)){
Element prevParent = manager.getDocument().getParent(list.get(index -
1).n, true);
String sem = getSemanticAttribute(prevParent);
- if(isLastInList(index))
- nextPos =
manager.getBraille().view.getCharCount();
- else
- nextPos = list.get(index +
1).brailleList.getFirst().start;
+ nextPos =
manager.getBraille().view.getCharCount();
if(manager.getStyleTable().get(sem).contains(StylesType.linesBefore))
nextLinesBefore =
Integer.valueOf((String)manager.getStyleTable().get(sem).get(StylesType.linesBefore));
@@ -209,6 +228,24 @@
setLines(start, linesAfter);
}
+ else if(!isLastInList(index) &&
nextStyle.contains(StylesType.linesBefore)){
+ nextLinesBefore
=Integer.valueOf((String)nextStyle.get(StylesType.linesBefore));
+ nextPos = list.get(index +
1).brailleList.getFirst().start;
+
+ if(linesAfter < nextLinesBefore)
+ linesAfter = nextLinesBefore;
+
+ int diff = nextPos - start;
+ if((diff > linesAfter)){
+ int blankLinesBetween = diff - 1;
+ linesAfter = linesAfter - blankLinesBetween;
+ }
+
+ if(linesAfter < 0 || diff < 0)
+ linesAfter = 0;
+
+ setLines(start, linesAfter);
+ }
else
return removeBrailleLinesAfter(t, b, start, style);
==============================================================================
Revision: c460ff3535fa
Branch: default
Author: Brandon Roller<brandon.r.roller@xxxxxxxxx>
Date: Fri Feb 20 13:28:09 2015 UTC
Log: Merged changes from branch rt1447
https://code.google.com/p/brailleblaster/source/detail?r=c460ff3535fa
Other related posts:
- » [brailleblaster] 3 new revisions pushed by brandon....@xxxxxxxxx on 2015-02-20 13:23 GMT - brailleblaster
