[FOray-commit] SF.net SVN: foray:[12561] trunk/foray

[<vic...@us...>]

Revision: 12561
          http://sourceforge.net/p/foray/code/12561
Author:   victormote
Date:     2022-02-05 15:34:55 +0000 (Sat, 05 Feb 2022)
Log Message:
-----------
Conform to aXSL change: Rename package for consistency.

Modified Paths:
--------------
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBox4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBoxChars.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4aIterator.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaConfig4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlue4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlueChars.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaLeaf4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java
    trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenaltyChars.java
    trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/BestFitLb.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBreakpoint.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbNodeWrapper.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/ParaContentIterator.java
    trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/FirstFitLbTests.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/LineBreaker4aTests.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/TotalFitLbTests.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpLayout.java
    trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpParaBranch.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphen4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphenMutating4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWord.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentLatin1.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentUtf16.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordSegment4a.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java
    trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java
    trunk/foray/foray-orthography/src/test/java/org/foray/orthography/HyphenationConsumer4aTests.java
    trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java
    trunk/foray/foray-orthography/src/test/java/org/foray/orthography/StringWordTests.java
    trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/EagerLineBreaker.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/SolitaryLineBreaker.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/TextServer4a.java

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBox4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBox4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBox4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,9 +30,9 @@
 
 import org.foray.common.primitive.StringUtils;
 
-import org.axsl.kpModel.KpBox;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpBox;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 
 /**
  * A hard-wired implementation of a Knuth-Plass box.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBoxChars.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBoxChars.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBoxChars.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,9 +28,9 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpBox;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpBox;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 
 /**
  * An implementation of Knuth-Plass penalty that wraps text content.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,9 +28,9 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4aIterator.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4aIterator.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaBranch4aIterator.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,9 +31,9 @@
 import org.foray.common.MarkedIndexOutOfBoundsException;
 import org.foray.common.sequence.IntArrayBuilder;
 
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 
 import java.util.ListIterator;
 import java.util.NoSuchElementException;

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaConfig4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaConfig4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaConfig4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,9 +30,9 @@
 
 import org.axsl.font.FontContext;
 import org.axsl.font.FontUse;
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.Orthography;
 
 /**

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlue4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlue4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlue4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,9 +30,9 @@
 
 import org.foray.common.primitive.StringUtils;
 
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 
 /**
  * A hard-wired implementation of a Knuth-Plass glue item.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlueChars.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlueChars.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaGlueChars.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,9 +28,9 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 
 /**
  * An implementation of Knuth-Plass glue that wraps text content.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaLeaf4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaLeaf4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaLeaf4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,8 +28,8 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 
 /**
  * Abstract superclass for FOray implementations of {@link KpLeaf}.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenalty4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,10 +30,10 @@
 
 import org.foray.common.primitive.StringUtils;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 /**
  * A hard-wired implementation of Knuth-Plass penalty.

Modified: trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenaltyChars.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenaltyChars.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/para/ParaPenaltyChars.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,10 +28,10 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 /**
  * An implementation of Knuth-Plass penalty that wraps text content.

Modified: trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java
===================================================================
--- trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-common/src/test/java/org/foray/common/para/ParaBranch4aTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,7 +28,7 @@
 
 package org.foray.common.para;
 
-import org.axsl.kpModel.KpPenalty;
+import org.axsl.kp.KpPenalty;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -76,9 +76,9 @@
 import org.axsl.graphic.GraphicServer;
 import org.axsl.i18n.Script;
 import org.axsl.i18n.WritingSystem;
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.Orthography;
 import org.axsl.orthography.OrthographyServer;
 import org.axsl.speech.SpeechException;

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Block4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -38,8 +38,8 @@
 import org.axsl.fotree.FoTreeException;
 import org.axsl.fotree.FoVisitor;
 import org.axsl.fotree.fo.Block;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaContext;
 
 /**
  * A "block" object in XSL-FO.

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BlockDiscrete4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -40,9 +40,9 @@
 import org.axsl.fotree.FoTreeException;
 import org.axsl.fotree.FoVisitor;
 import org.axsl.fotree.fo.BlockDiscrete;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 
 import java.util.ArrayList;
 import java.util.List;

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-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextWords4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -37,9 +37,9 @@
 import org.axsl.fotree.text.FoOrthographyServer;
 import org.axsl.fotree.text.FoTextToken;
 import org.axsl.fotree.text.FoTextTokenFlow;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 import org.axsl.orthography.OrthographyException;
 import org.axsl.orthography.Whitespace;
 

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/BestFitLb.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/BestFitLb.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/BestFitLb.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -29,9 +29,9 @@
 package org.foray.linebreak;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 /**
  * Implementation of the Knuth-Plass "best-fit" linebreaking algorithm.

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/FirstFitLb.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,12 +31,12 @@
 import org.foray.common.sequence.IntArrayBuilder;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBreakpoint.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBreakpoint.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbBreakpoint.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,7 +28,7 @@
 
 package org.foray.linebreak;
 
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaContext;
 import org.axsl.linebreak.KpFitnessClass;
 
 /**

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbNodeWrapper.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbNodeWrapper.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/LbNodeWrapper.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,10 +30,10 @@
 
 import org.foray.common.data.OrderedTreePath4a;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 import java.util.List;
 

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/ParaContentIterator.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/ParaContentIterator.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/ParaContentIterator.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.data.OrderedTreePath4a;
 import org.foray.common.sequence.IntArrayBuilder;
 
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpNode;
 
 import java.util.Iterator;
 import java.util.Stack;

Modified: trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java
===================================================================
--- trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/main/java/org/foray/linebreak/TotalFitLb.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -35,14 +35,14 @@
 import org.foray.common.sequence.IntArrayBuilder;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.KpBox;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpGlue;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpBox;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpGlue;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 import org.axsl.linebreak.KpFitnessClass;
 
 import java.util.ArrayList;

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/FirstFitLbTests.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/FirstFitLbTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/FirstFitLbTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.para.ParaBranch4a;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 import org.junit.Assert;
 import org.junit.Test;

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/LineBreaker4aTests.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/LineBreaker4aTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/LineBreaker4aTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -38,8 +38,8 @@
 import org.foray.orthography.Punctuation4a;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaContext;
 
 import org.junit.Assert;
 import org.mockito.Mockito;

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/TotalFitLbTests.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/TotalFitLbTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/TotalFitLbTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.para.ParaBranch4a;
 
 import org.axsl.context.LineBreakContext;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 
 import org.junit.Assert;
 import org.junit.Ignore;

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpLayout.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpLayout.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpLayout.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -33,8 +33,8 @@
 import org.foray.common.sequence.IntArray;
 import org.foray.linebreak.FirstFitLbTests;
 
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpLeaf;
 
 import java.io.PrintStream;
 

Modified: trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpParaBranch.java
===================================================================
--- trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpParaBranch.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-linebreak/src/test/java/org/foray/linebreak/util/DumpParaBranch.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.para.ParaBranch4a;
 import org.foray.linebreak.FirstFitLbTests;
 
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpNode;
 
 import java.io.PrintStream;
 

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphen4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphen4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphen4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,10 +31,10 @@
 import org.foray.common.para.ParaLeaf4a;
 
 import org.axsl.fotree.text.FoDiscretionaryHyphen;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 import org.axsl.orthography.DiscretionaryHyphen;
 
 import java.util.Collections;
@@ -86,7 +86,7 @@
 
     /**
      * Protected constructor. There are only 3 possible normal values, so these are pre-constructed.
-     * Use {@link #fromQuality(org.axsl.kpModel.KpPenalty.Quality)} to obtain an instance of this class.
+     * Use {@link #fromQuality(org.axsl.kp.KpPenalty.Quality)} to obtain an instance of this class.
      * @param quality The quality for this instance.
      */
     protected DiscretionaryHyphen4a(final DiscretionaryHyphen.Quality quality) {
@@ -118,7 +118,7 @@
     }
 
     @Override
-    public org.axsl.kpModel.KpPenalty.Quality getPenaltyQuality() {
+    public org.axsl.kp.KpPenalty.Quality getPenaltyQuality() {
         return PENALTY_MAP.get(this.quality);
     }
 

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphenMutating4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphenMutating4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/DiscretionaryHyphenMutating4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -37,11 +37,11 @@
 import org.foray.common.WellKnownConstants;
 
 import org.axsl.fotree.text.FoDiscretionaryHyphen;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.KpPenalty;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.KpPenalty;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 import org.axsl.orthography.DiscretionaryHyphen;
 import org.axsl.orthography.DiscretionaryHyphenMutating;
 

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,9 +31,9 @@
 import org.foray.common.primitive.CharSequenceUtils;
 
 import org.axsl.fotree.text.FoPunctuation;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.ParaConfig;
 import org.axsl.value.group.TextModifiers;
 
 import java.util.ArrayList;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWord.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWord.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.primitive.CharSequenceUtils;
 import org.foray.common.primitive.NumberUtils;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpPenalty;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpPenalty;
 
 /**
  * A word implementation that wraps a set of {@link StringWordSegmentUtf16}, a thin wrapper around a {@link String}.

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentLatin1.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentLatin1.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentLatin1.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,9 +30,9 @@
 
 import org.foray.common.primitive.StringLatin1;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.WordSegment;
 import org.axsl.value.group.TextModifiers;
 

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentUtf16.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentUtf16.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentUtf16.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,9 +30,9 @@
 
 import org.foray.common.primitive.StringUtf16;
 
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.WordSegment;
 import org.axsl.value.group.TextModifiers;
 

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-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -36,8 +36,8 @@
 import org.axsl.fotree.text.FoTextTokenFlow;
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
 import org.axsl.orthography.TextTokenFlowLocation;
 import org.axsl.orthography.Whitespace;
 import org.axsl.value.WhiteSpaceTreatment;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -34,9 +34,9 @@
 import org.foray.common.primitive.XmlCharacterUtils;
 
 import org.axsl.fotree.text.FoWhitespace;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.ParaConfig;
 import org.axsl.unicode.block.General_Punctuation_Block;
 import org.axsl.value.LinefeedTreatment;
 import org.axsl.value.group.TextModifiers;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -35,9 +35,9 @@
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordComponent;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.KpPenalty;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.KpPenalty;
 import org.axsl.orthography.Word;
 import org.axsl.orthography.WordSegment;
 import org.axsl.utility.sequence.ByteSequence;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordSegment4a.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordSegment4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordSegment4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,8 +31,8 @@
 import org.foray.common.para.ParaLeaf4a;
 
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.KpLeaf;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.WordSegment;
 import org.axsl.value.TextTransform;
 import org.axsl.value.group.TextModifiers;

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/CapitalizedWord.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -32,7 +32,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/DecoratedWord.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -34,8 +34,8 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordComponent;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.KpPenalty;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.KpPenalty;
 
 /**
  * Decorates a normalized word with some additional data.

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/ExactWord.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -34,7 +34,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 
 /**
  * Decorates a normalized word with an exact representation of the actual capitalization.

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPast1Word.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,7 +31,7 @@
 import org.foray.orthography.StringWordSegmentUtf16;
 
 import org.axsl.fotree.text.FoWord;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 
 /**
  * Wraps a word, usually a verb, and adds a syllable "ed" to the end.

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural1Word.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPlural2Word.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive1Word.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/LatinPossessive2Word.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java
===================================================================
--- trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/main/java/org/foray/orthography/wrapper/UppercaseWord.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -32,7 +32,7 @@
 
 import org.axsl.fotree.text.FoWord;
 import org.axsl.fotree.text.FoWordSegment;
-import org.axsl.kpModel.KpLeaf;
+import org.axsl.kp.KpLeaf;
 import org.axsl.orthography.WordSegment;
 
 /**

Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/HyphenationConsumer4aTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/HyphenationConsumer4aTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/HyphenationConsumer4aTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.foray.common.i18n.WritingSystem4a;
 
-import org.axsl.kpModel.ParaConfig;
+import org.axsl.kp.ParaConfig;
 import org.axsl.orthography.OrthographyException;
 import org.axsl.orthography.Word;
 

Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/SegmentDictionaryWordTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,7 +28,7 @@
 
 package org.foray.orthography;
 
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpNode;
 import org.axsl.orthography.DiscretionaryHyphen.Quality;
 
 import org.junit.Assert;

Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/StringWordTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/StringWordTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/StringWordTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,7 +28,7 @@
 
 package org.foray.orthography;
 
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpNode;
 import org.axsl.orthography.DiscretionaryHyphen;
 
 import org.junit.Assert;

Modified: trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java
===================================================================
--- trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-orthography/src/test/java/org/foray/orthography/WordWrapperTests.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -28,7 +28,7 @@
 
 package org.foray.orthography;
 
-import org.axsl.kpModel.KpNode;
+import org.axsl.kp.KpNode;
 import org.axsl.orthography.DiscretionaryHyphen.Quality;
 import org.axsl.orthography.Word;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/BlockDiscretePnr.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -36,10 +36,10 @@
 import org.axsl.area.NormalBlockArea;
 import org.axsl.area.factory.BlockLevelAreaFactory;
 import org.axsl.fotree.fo.BlockDiscrete;
-import org.axsl.kpModel.KpBranch;
-import org.axsl.kpModel.KpNode;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.KpBranch;
+import org.axsl.kp.KpNode;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 import org.axsl.linebreak.LineBreakResult;
 import org.axsl.linebreak.LineBreaker;
 

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/FoTextWordsPnr.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -35,8 +35,8 @@
 import org.axsl.area.LineArea;
 import org.axsl.area.NormalBlockArea;
 import org.axsl.fotree.fo.FoTextWords;
-import org.axsl.kpModel.ParaConfig;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaConfig;
+import org.axsl.kp.ParaContext;
 import org.axsl.linebreak.LineBreakResult;
 import org.axsl.linebreak.LineBreaker;
 import org.axsl.orthography.TextTokenFlowLocation;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/EagerLineBreaker.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/EagerLineBreaker.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/EagerLineBreaker.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -32,7 +32,7 @@
 import org.axsl.content.ContentItem;
 import org.axsl.content.IndivisibleContent;
 import org.axsl.font.FontConsumer;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaContext;
 import org.axsl.linebreak.OutputLine;
 import org.axsl.text.TextException;
 import org.axsl.text.line.LineBreakHandler;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/LineBreaker.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -31,7 +31,7 @@
 import org.axsl.content.CharContent;
 import org.axsl.font.FontConsumer;
 import org.axsl.font.FontUse;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaContext;
 import org.axsl.text.line.LineBreakHandler;
 
 /**

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/SolitaryLineBreaker.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/SolitaryLineBreaker.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -30,7 +30,7 @@
 
 import org.axsl.content.CharContent;
 import org.axsl.font.FontConsumer;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaContext;
 import org.axsl.orthography.Orthography;
 import org.axsl.orthography.Word;
 import org.axsl.text.TextException;

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/TextServer4a.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/TextServer4a.java	2022-02-05 15:15:15 UTC (rev 12560)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/lb/TextServer4a.java	2022-02-05 15:34:55 UTC (rev 12561)
@@ -29,7 +29,7 @@
 package org.foray.pioneer.lb;
 
 import org.axsl.font.FontConsumer;
-import org.axsl.kpModel.ParaContext;
+import org.axsl.kp.ParaContext;
 import org.axsl.text.line.LineBreakHandler;
 
 /**

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