fix conflicts

kermitt2 · Dec 21, 2023 · a9b6826 · a9b6826
2 parents c776e3c + 4b77e73
commit a9b6826
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/data/BiblioItem.java b/grobid-core/src/main/java/org/grobid/core/data/BiblioItem.java
@@ -2266,7 +2266,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2279,7 +2279,7 @@ public String toTEI(int n, int indent, GrobidAnalysisConfig config) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2429,7 +2429,7 @@ else if (bookTitle == null) {
                     if (titleTokens != null && titleTokens.size()>0) {
                         String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                         if (coords != null && coords.length()>0) {
-                            tei.append(" coord=\"" + coords + "\"");
+                            tei.append(" coords=\"" + coords + "\"");
                         }
                     } 
                 }
@@ -2453,7 +2453,7 @@ else if (bookTitle == null) {
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2685,7 +2685,7 @@ else if (this.getYear().length() == 4)
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }
@@ -2712,7 +2712,7 @@ else if (this.getYear().length() == 4)
                         if (titleTokens != null && titleTokens.size()>0) {
                             String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                             if (coords != null && coords.length()>0) {
-                                tei.append(" coord=\"" + coords + "\"");
+                                tei.append(" coords=\"" + coords + "\"");
                             }
                         } 
                     }

diff --git a/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java b/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java
@@ -154,7 +154,7 @@ public StringBuilder toTEIHeader(BiblioItem biblio,
             if (titleTokens != null && titleTokens.size()>0) {
                 String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                 if (coords != null) {
-                    tei.append(" coord=\"" + coords + "\"");
+                    tei.append(" coords=\"" + coords + "\"");
                 }
             }
         }
@@ -394,7 +394,7 @@ else if (biblio.getE_Year().length() == 4)
                 if (titleTokens != null && titleTokens.size()>0) {
                     String coords = LayoutTokensUtil.getCoordsString(titleTokens);
                     if (coords != null) {
-                        tei.append(" coord=\"" + coords + "\"");
+                        tei.append(" coords=\"" + coords + "\"");
                     }
                 }
             }

diff --git a/grobid-core/src/main/java/org/grobid/core/engines/ProcessEngine.java b/grobid-core/src/main/java/org/grobid/core/engines/ProcessEngine.java
@@ -137,7 +137,7 @@ public void processFullText(final GrobidMainArgs pGbdArgs) throws Exception {
         } else {
             List<String> elementCoordinates = null;
             if (pGbdArgs.getTeiCoordinates()) {
-                elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note", "affiliation");
+                elementCoordinates = Arrays.asList("figure", "persName", "ref", "biblStruct", "formula", "s", "note", "title", "head", "affiliation");
             }
             processFullTextDirectory(files, pGbdArgs, pGbdArgs.getPath2Output(), pGbdArgs.getSaveAssets(), 
                 elementCoordinates, pGbdArgs.getSegmentSentences(), pGbdArgs.getAddElementId());

diff --git a/grobid-service/src/main/resources/web/grobid/grobid.js b/grobid-service/src/main/resources/web/grobid/grobid.js
@@ -13,7 +13,7 @@ var grobid = (function($) {
 
 	var block = 0;
 
-    var elementCoords = ['s', 'biblStruct', 'persName', 'figure', 'formula', 'head', 'note', 'affiliation'];
+    var elementCoords = ['s', 'biblStruct', 'persName', 'figure', 'formula', 'head', 'note', 'title', 'affiliation'];
 
 	function defineBaseURL(ext) {
 		var baseUrl = null;