Fixes some minor sizing issues with Words.

Author: angusforbes

index.html

@@ -128,8 +128,8 @@
 var attachmentMargin = 0.1; //percentage value
 
 var word2word_strategy = strategies.FARTHEST;
-var word2link_strategy = strategies.CLOSEST; 
-var link2link_strategy = strategies.CLOSEST; //CLOSEST sometimes causes overlaps - need to be a bit more rigorous when assigning slots - don't assign any slots that have the potential to overlap (when dragged manually)? - or let the buyer beware that this could happen - they can always move out of the way - right now it won't automatically overlap, but won't prevent a user from doing it. 
+var word2link_strategy = strategies.FARTHEST; 
+var link2link_strategy = strategies.FARTHEST; //CLOSEST sometimes causes overlaps - need to be a bit more rigorous when assigning slots - don't assign any slots that have the potential to overlap (when dragged manually)? - or let the buyer beware that this could happen - they can always move out of the way - right now it won't automatically overlap, but won't prevent a user from doing it. 
 
 var rows = []; //list of Row object, each of those has a list of Word objects
 

js/annotate.js

@@ -200,8 +200,9 @@ class Word {
       drawWord(this);
     }
 
+   
     getMinWidth() {
-      return Math.max(minWordWidth, this.tw);
+      return Math.max(minWordWidth, this.maxtextw);
     }
 
     /* must return a value less than row width - edgepaddings, else will try to reposition long words forever! */

js/interact.js

@@ -764,7 +764,7 @@ function moveWordToNewPosition(w, nx, ny) {
   w.underneathRect.y(ny);
 
   w.text.x(nx + (w.rect.w/2) - (w.text.bbox().w/2)  ); 
-  w.text.y(ny + textpaddingY*2 - texts.wordText.descent);
+  w.text.y(ny + textpaddingY*2); // - texts.wordText.descent);
 
 
 
@@ -1039,7 +1039,11 @@ function setWordToY(word, wy) {
   word.underneathRect.y(wy);  
   word.leftHandle.y(wy);  
   word.rightHandle.y(wy);  
-  word.text.y(word.rect.y + textpaddingY); 
+  word.text.y(word.rect.y + textpaddingY*2);
+  
+ if (word.tag != null) { 
+  word.tagtext.y(word.rect.y + textpaddingY/2); 
+ }
 }
 
 function setUpRowDraggable(row) {

js/render.js

@@ -453,7 +453,7 @@ function drawWord(word) {
   var text = draw.text(function(add) {
 
     add.text(word.val)
-    .y(word.wy + textpaddingY*2 - texts.wordText.descent)
+    .y(word.wy + textpaddingY*2) // - texts.wordText.descent)
     .x(word.wx + (word.ww/2) - (textwh.w / 2))
     .font(texts.wordText.style);
   });
@@ -470,7 +470,7 @@ function drawWord(word) {
      var tagtext = draw.text(function(add) {
 
        add.text(word.tag)
-       .y(word.wy + textpaddingY/2 - texts.tagText.descent)
+       .y(word.wy + textpaddingY/2) // - texts.tagText.descent)
        .x(tagXPos)
        .font(texts.tagText.style);
      });

js/style.js

@@ -388,7 +388,7 @@ function setupTexts(svg) {
 
   textArr.wordText = new TextStyle('Brown, BrownPro, futura, helvetica', 12, new FillStyle('#444'));
   textArr.linkText = new TextStyle('Brown, BrownPro, futura, helvetica', 10, new FillStyle('#888'));
-  textArr.tagText = new TextStyle('Brown, BrownPro, futura, helvetica', 12, new FillStyle('#888'));
+  textArr.tagText = new TextStyle('Brown, BrownPro, futura, helvetica', 10, new FillStyle('#888'));
 
   return textArr; 
 }