foray-commit Mailing List for FOray (Page 61)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12377
          http://sourceforge.net/p/foray/code/12377
Author:   victormote
Date:     2022-01-10 18:49:27 +0000 (Mon, 10 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Add method to mark a location in a TokenFlow.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
===================================================================

--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2022-01-10 18:20:28 UTC (rev 12376)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2022-01-10 18:49:27 UTC (rev 12377)
@@ -189,4 +189,9 @@
         return null;
     }
 
+    @Override
+    public Location markLocation(final int tokenIndex, final byte segmentIndex, final byte charIndex) {
+        return this.paraBranch.markLocation(tokenIndex, segmentIndex, charIndex);
+    }
+
 }

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java	2022-01-10 18:20:28 UTC (rev 12376)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java	2022-01-10 18:49:27 UTC (rev 12377)
@@ -36,6 +36,7 @@
 import org.axsl.common.para.ParaNode;
 import org.axsl.fotree.text.FoToken;
 import org.axsl.fotree.text.FoTokenFlow;
+import org.axsl.orthography.TokenFlow;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,6 +47,48 @@
  */
 public class TokenFlow4a implements FoTokenFlow {
 
+    /**
+     * FOray implementation of {@link FoTokenFlow.Location}.
+     */
+    public class Location implements FoTokenFlow.Location {
+        /* TODO: If 16 bits is not enough for the token index, consider cramming the three parameters into one int,
+         * using the 32 bits as 20 bits for the token, 6 for the segment, and 6 for the char, adding 4 bits to the size
+         * of the token index. */
+
+        /** The token index. See {@link TokenFlow.Location#getTokenIndex()}. */
+        private char tokenIndex;
+
+        /** The segment index. See {@link TokenFlow.Location#getSegmentIndex()}. */
+        private byte segmentIndex;
+
+        /** The char index. See {@link TokenFlow.Location#getCharIndex()}. */
+        private byte charIndex;
+
+        Location(final int tokenIndex, final byte segmentIndex, final byte charIndex) {
+            /* A char can index 65,536 tokens, which is probably 30,000 words, allowing half of the tokens to be
+             * whitespace, and some others to be punctuation. */
+            this.tokenIndex = (char) tokenIndex;
+            this.segmentIndex = segmentIndex;
+            this.charIndex = charIndex;
+        }
+
+        @Override
+        public int getTokenIndex() {
+            return this.tokenIndex;
+        }
+
+        @Override
+        public byte getSegmentIndex() {
+            return this.segmentIndex;
+        }
+
+        @Override
+        public byte getCharIndex() {
+            return this.charIndex;
+        }
+
+    }
+
     /** The tokens (children) of this text flow. */
     private List<FoToken> tokens = new ArrayList<FoToken>();
 
@@ -122,4 +165,10 @@
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public org.axsl.orthography.TokenFlow.Location markLocation(final int tokenIndex, final byte segmentIndex,
+            final byte charIndex) {
+        return new Location(tokenIndex, segmentIndex, charIndex);
+    }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov (4)	Dec

foray-commit Mailing List for FOray (Page 61)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages