diff -Nru plantuml-1.2017.15/build.xml plantuml-1.2018.9/build.xml
--- plantuml-1.2017.15/build.xml 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/build.xml 2018-07-27 21:59:19.000000000 +0000
@@ -56,6 +56,11 @@
+
+
+
+
+
@@ -64,7 +69,7 @@
-
+
diff -Nru plantuml-1.2017.15/debian/changelog plantuml-1.2018.9/debian/changelog
--- plantuml-1.2017.15/debian/changelog 2017-09-16 19:54:51.000000000 +0000
+++ plantuml-1.2018.9/debian/changelog 2018-08-05 09:39:13.000000000 +0000
@@ -1,3 +1,18 @@
+plantuml (1:1.2018.9-1) unstable; urgency=medium
+
+ [ Alex Kirchhoff ]
+ * New upstream version (1.2018.9).
+ * Update pdf.patch:
+ - Add libavalon-framework-java, libcommons-io-java,
+ libcommons-logging-java, libxml-commons-external-java,
+ libxmlgraphics-commons-java as dependencies.
+ * Update the description with new features
+ (Closes: #897414).
+ * Update Vcs-* to point to Salsa.
+ * Update Standards-Version from 4.0.0 to 4.1.5 (no change needed)
+
+ -- Andrej Shadura Sun, 05 Aug 2018 11:39:13 +0200
+
plantuml (1:1.2017.15-1) unstable; urgency=medium
* Fix "New version available" package upstream release (1.2017.15), new
diff -Nru plantuml-1.2017.15/debian/control plantuml-1.2018.9/debian/control
--- plantuml-1.2017.15/debian/control 2017-09-16 19:54:51.000000000 +0000
+++ plantuml-1.2018.9/debian/control 2018-08-05 09:39:13.000000000 +0000
@@ -10,10 +10,10 @@
default-jdk,
libfop-java,
libbatik-java
-Standards-Version: 4.0.0
+Standards-Version: 4.1.5
Homepage: http://plantuml.com/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/plantuml.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/plantuml.git/
+Vcs-Git: https://salsa.debian.org/debian/plantuml.git
+Vcs-Browser: https://salsa.debian.org/debian/plantuml
Package: plantuml
Architecture: all
@@ -22,19 +22,35 @@
default-jre,
libfop-java,
libbatik-java,
- libjlatexmath-java
+ libjlatexmath-java,
+ libavalon-framework-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libxml-commons-external-java,
+ libxmlgraphics-commons-java
Recommends: graphviz
Description: text-to-UML converter
PlantUML is a program allowing to draw UML diagrams, using a simple
human readable text description.
.
- PlantUML supports the following diagram types:
+ PlantUML supports the following UML diagrams:
- sequence diagram
- use case diagram
- class diagram
- activity diagram
- component diagram
- state diagram
+ - object diagram
+ - deployment diagram
+ - timing diagram
+ .
+ The following non-UML diagrams are also supported:
+ - wireframe graphical interface (Salt)
+ - Archimate diagram
+ - Specification and Description Language (SDL)
+ - Ditaa diagram
+ - Gantt diagram
+ - mathematics with AsciiMath or JLaTeXMath notation
.
Output images can be generated in PNG, in SVG or LaTeX format.
PlantUML also supports generation of ASCII art diagrams (only for
diff -Nru plantuml-1.2017.15/debian/patches/pdf.patch plantuml-1.2018.9/debian/patches/pdf.patch
--- plantuml-1.2017.15/debian/patches/pdf.patch 2017-09-16 19:54:51.000000000 +0000
+++ plantuml-1.2018.9/debian/patches/pdf.patch 2018-08-05 09:39:13.000000000 +0000
@@ -1,7 +1,7 @@
Subject: Specify Class-Path to the libraries needed to support PDF (#807928).
Author: Andrew Shadura
Forwarded: not-needed
-Last-Update: 2017-09-16
+Last-Update: 2018-08-04
--- a/build.xml
+++ b/build.xml
@@ -9,8 +9,8 @@
--
-+
+-
++
diff -Nru plantuml-1.2017.15/license.txt plantuml-1.2018.9/license.txt
--- plantuml-1.2017.15/license.txt 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/license.txt 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,49 @@
+=======================================================================
+PlantUML : a free UML diagram generator
+========================================================================
+
+(C) Copyright 2009-2017, Arnaud Roques
+
+Project Info: http://plantuml.com
+
+If you like this project or if you find it useful, you can support us at:
+
+http://plantuml.com/patreon (only 1$ per month!)
+http://plantuml.com/paypal
+
+PlantUML is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+PlantUML distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+License for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+USA.
+
+PlantUML can occasionally display sponsored or advertising messages. Those
+messages are usually generated on welcome or error images and never on
+functional diagrams.
+
+Images (whatever their format : PNG, SVG, EPS...) generated by running PlantUML
+are owned by the author of their corresponding sources code (that is, their
+textual description in PlantUML language). Those images are not covered by
+the GPL license.
+
+The generated images can then be used without any reference to the GPL license.
+It is not even necessary to stipulate that they have been generated with PlantUML,
+also this will be appreciate by PlantUML team.
+
+There is an exception : if the textual description in PlantUML language is also covered
+by a license (like the GPL), then the generated images are logically covered
+by the very same license.
+
+Icons provided by OpenIconic : https://useiconic.com/open
+Archimate sprites provided by Archi : http://www.archimatetool.com
+ASCIIMathML (c) Peter Jipsen http://www.chapman.edu/~jipsen
+ASCIIMathML (c) David Lippman http://www.pierce.ctc.edu/dlippman
diff -Nru plantuml-1.2017.15/pom.xml plantuml-1.2018.9/pom.xml
--- plantuml-1.2017.15/pom.xml 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/pom.xml 2018-07-27 21:59:19.000000000 +0000
@@ -35,7 +35,7 @@
net.sourceforge.plantumlplantuml
- 1.2017.15-SNAPSHOT
+ 1.2018.10-SNAPSHOTjarPlantUML
@@ -120,6 +120,12 @@
net/sourceforge/plantuml/math/*.js
+
+ ${project.basedir}
+
+ stdlib/**/*.repx
+
+
diff -Nru plantuml-1.2017.15/README.md plantuml-1.2018.9/README.md
--- plantuml-1.2017.15/README.md 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/README.md 2018-07-27 21:59:19.000000000 +0000
@@ -15,5 +15,18 @@
* [Object diagram](http://plantuml.com/object-diagram),
* [Deployment diagram](http://plantuml.com/deployment-diagram),
* [Timing diagram](http://plantuml.com/timing-diagram)
+
+And also:
+ * [Activity diagram (legacy syntax)](http://plantuml.com/activity-diagram-legacy)
+ * [Archimate diagram](http://plantuml.com/archimate)
+ * [Gantt charts](http://plantuml.com/gantt-diagram)
+ * [SALT UI mockups](http://plantuml.com/salt)
+
+Furthermore:
+ * [Hyperlinks and tooltips](http://plantuml.com/link)
+ * [Creole](http://plantuml.com/creole): rich text, emoticons, unicode, icons
+ * [OpenIconic icons](http://plantuml.com/openiconic)
+ * [Sprite icons](http://plantuml.com/sprite)
+ * [AsciiMath mathematical expressions](http://plantuml.com/ascii-math)
To know more about PlantUML, please visit http://plantuml.com/
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/ACearth.java plantuml-1.2018.9/src/com/ctreber/acearth/ACearth.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/ACearth.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/ACearth.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,373 +0,0 @@
-package com.ctreber.acearth;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
-import com.ctreber.acearth.gui.CanvasACearth;
-import com.ctreber.acearth.plugins.Plugin;
-import com.ctreber.acearth.plugins.markers.Marker;
-import com.ctreber.acearth.plugins.markers.PluginMarkers;
-import com.ctreber.acearth.projection.Projection;
-import com.ctreber.acearth.projection.ProjectionCyl;
-import com.ctreber.acearth.projection.ProjectionMerc;
-import com.ctreber.acearth.projection.ProjectionOrtho;
-import com.ctreber.acearth.renderer.Renderer;
-import com.ctreber.acearth.renderer.RowTypeRendererScanBit;
-import com.ctreber.acearth.renderer.RowTypeRendererScanDot;
-import com.ctreber.acearth.scanbit.BitGeneratorMap;
-import com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
-import com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
-import com.ctreber.acearth.scandot.DotGeneratorLines;
-import com.ctreber.acearth.scandot.DotGeneratorStars;
-import com.ctreber.acearth.scandot.ScanDot;
-import com.ctreber.acearth.scandot.ScanDotGenerator;
-import com.ctreber.acearth.shader.Shader;
-import com.ctreber.acearth.shader.ShaderDefault;
-import com.ctreber.acearth.shader.ShaderFlat;
-import com.ctreber.acearth.shader.ShaderOrtho;
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.acearth.util.SunPositionCalculator;
-import com.ctreber.acearth.util.Toolkit;
-import com.ctreber.aclib.sort.CTSort;
-import com.ctreber.aclib.sort.QuickSort;
-
-/**
- *
AC.earth - XEarth for Java
- *
- *
- *
- * The original XEarth was written by Kirk Johnson in July 1993 - thank you for
- * writing this great little program and making it available for free!
- *
- *
- * I wanted to extend the program, but not in C. So I created this Java version,
- * and found the process quite painfull interesting. The
- * biggest effort went into resolving references between C files and
- * eliminatiing pointers.
- *
- *
- * AC.earth is based on XEarth by Kirk Johnson
- *
- *
- * To comply with the XEarth license I include the following text:
- *
- *
- * XEarth Copyright (C) 1989, 1990, 1993-1995, 1999 Kirk Lauritz Johnson
- * Parts of the source code are:
- * Copyright (C) 1989, 1990, 1991 by Jim Frost
- * Copyright (C) 1992 by Jamie Zawinski <jwz@lucid.com>
- * Permission to use, copy, modify and freely distribute xearth for
- * non-commercial and not-for-profit purposes is hereby granted
- * without fee, provided that both the above copyright notice and this
- * permission notice appear in all copies and in supporting
- * documentation.
- * [Section refering to GIF omitted because it doesn't apply to this version]
- * The author makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- * The license for this program (AC.earth) is the same as the quoted license
- * above, with one change: The "copyright notice and permission notice" shall
- * include the entire text of this section.
- *
- * todo Phase 2: Make grid value stuff more meaningful ("every n degrees") todo
- * Phase 2: Enter fixed time as data and time, not seconds since epoch todo
- * Phase 2: Compact map data into binary file
- *
- *
- * Well, the main class.
- * @param markers
- */
- public ACearth(List markers) {
- // fsStartTime = System.currentTimeMillis();
-
- fPlugins = new ArrayList();
- fPlugins.add(new PluginMarkers(markers));
-
- }
-
- public void exportPng(OutputStream os) throws IOException {
- fCanvas = new CanvasACearth(this, fConf.getInt("imageWidth"), fConf.getInt("imageHeight"));
- update();
- fCanvas.saveToImage(os);
- }
-
- public void update() throws IOException {
- Projection lProjection = null;
- Shader lShader = null;
- BitGeneratorMap lScanner = null;
- if (fConf.is("projection", "Cylindrical")) {
- lProjection = new ProjectionCyl();
- lScanner = new BitGeneratorMapDefault(lProjection);
- lShader = new ShaderDefault();
- }
-
- if (fConf.is("projection", "Mercator")) {
- lProjection = new ProjectionMerc();
- lScanner = new BitGeneratorMapDefault(lProjection);
- lShader = new ShaderDefault();
- }
-
- if (fConf.is("projection", "Orthographic")) {
- lProjection = new ProjectionOrtho();
- lScanner = new BitGeneratorMapOrtho(lProjection);
- lShader = new ShaderOrtho();
- }
-
- computePositions();
- lProjection.setImageWidth(fConf.getInt("imageWidth"));
- lProjection.setImageHeight(fConf.getInt("imageHeight"));
- lProjection.setShiftX(fConf.getInt("shiftX"));
- lProjection.setShiftY(fConf.getInt("shiftY"));
- lProjection.setViewMagnification(fConf.getDouble("viewMagnification"));
- lProjection.setViewPos(fViewPos);
- lProjection.setViewRotation(fViewRotation);
-
- lScanner.setImageWidth(fConf.getInt("imageWidth"));
- lScanner.setImageHeight(fConf.getInt("imageHeight"));
- lScanner.setMapData(MapDataReader.readMapData());
- // Process the map (produces ScanBit-s).
- lScanner.generateScanBits();
-
- // Process stars and lines (produces ScanDots-s).
- List lScanDots = new ArrayList();
- if (fConf.getBoolean("starsP")) {
- ScanDotGenerator lGenerator = new DotGeneratorStars(fConf.getInt("imageWidth"),
- fConf.getInt("imageHeight"), fConf.getDouble("starFrequency"), fConf.getInt("bigStars"), new Random(fCurrentTime));
- lGenerator.generateScanDots();
- lScanDots.addAll(lGenerator.getScanDots());
- }
-
- if (fConf.getBoolean("gridP")) {
- ScanDotGenerator lGenerator = new DotGeneratorLines(lProjection, fConf.getInt("gridDivision"), fConf
- .getInt("gridPixelDivision"));
- lGenerator.generateScanDots();
- lScanDots.addAll(lGenerator.getScanDots());
- }
-
- final CTSort lSort = new QuickSort();
- ScanDot[] lScanDotsArray = (ScanDot[]) lScanDots.toArray(new ScanDot[0]);
- lSort.sort(lScanDotsArray);
-
- if (!fConf.getBoolean("shadeP")) {
- lShader = new ShaderFlat();
- }
- lShader.setProjection(lProjection);
- lShader.setSunPos(fConf.getSunPos());
- lShader.setDaySideBrightness(fConf.getInt("daySideBrightness"));
- lShader.setTerminatorDiscontinuity(fConf.getInt("terminatorDiscontinuity"));
- lShader.setNightSideBrightness(fConf.getInt("nightSideBrightness"));
- lShader.init();
-
- Renderer lRenderer = new Renderer(fCanvas);
-
- RowTypeRendererScanBit lRowRendererScanBit = new RowTypeRendererScanBit();
- lRowRendererScanBit.setScanBits(lScanner.getScanBits());
- lRenderer.addRowTypeRenderer(lRowRendererScanBit);
-
- RowTypeRendererScanDot lRowRendererScanDot = new RowTypeRendererScanDot();
- lRowRendererScanDot.setScanDots(lScanDotsArray);
- lRenderer.addRowTypeRenderer(lRowRendererScanDot);
-
- lRenderer.setShader(lShader);
- lRenderer.render();
-
- // Apply plugins
- Iterator lIt = fPlugins.iterator();
- while (lIt.hasNext()) {
- Plugin lPlugin = (Plugin) lIt.next();
- lPlugin.setProjection(lProjection);
- lPlugin.setRenderTarget(fCanvas);
- lPlugin.setParent(this);
- lPlugin.render();
- }
-
- }
-
- /**
- *
- * This is repeated when time changes since this influences the position of
- * Earth.
- */
- private void computePositions() {
- // Determine time for rendering
- if (fConf.getInt("fixedTime") == 0) {
- // No fixed time.
- // final long lTimePassed = System.currentTimeMillis() - fsStartTime;
- // fCurrentTime = fsStartTime + (long) (fConf.getDouble("timeWarpFactor") * lTimePassed);
- fCurrentTime = System.currentTimeMillis();
- } else {
- // Fixed time.
- fCurrentTime = fConf.getInt("fixedTime") * 1000L;
- }
-
- if (fConf.getBoolean("sunMovesP")) {
- fConf.setSunPos(SunPositionCalculator.getSunPositionOnEarth(fCurrentTime));
- }
-
- // Determine viewing position
- if (fConf.is("viewPositionType", "Fixed")) {
- fViewPos = fConf.getViewPos();
- } else if (fConf.is("viewPositionType", "Sun-relative")) {
- fViewPos = getSunRelativePosition();
- } else if (fConf.is("viewPositionType", "Orbit")) {
- fViewPos = getOrbitPosition(fCurrentTime);
- } else if (fConf.is("viewPositionType", "Random")) {
- fViewPos = getRandomPosition();
- } else if (fConf.is("viewPositionType", "Moon")) {
- fViewPos = SunPositionCalculator.getMoonPositionOnEarth(fCurrentTime);
- }
-
- // for ViewRotGalactic, compute appropriate viewing rotation
- if (fConf.is("viewRotationType", "Galactic")) {
- fViewRotation = (Toolkit.degsToRads(fConf.getSunPos().getLat()
- * Math.sin((fViewPos.getLong() - fConf.getSunPos().getLong()))));
- } else {
- fViewRotation = fConf.getDouble("viewRotation");
- }
- }
-
- /**
- *
- * Add sun position and position relative to sun, straighten out the result.
- *
- * @return Position relativ to sun position as defined by fSunPosRel.
- */
- private Coordinate getSunRelativePosition() {
- final Coordinate lPos = fConf.getSunPos();
- lPos.add(fConf.getSunPosRel());
-
- return lPos;
- }
-
- private Coordinate getOrbitPosition(long pTimeMillis) {
- double x, y, z;
- double a, c, s;
- double t1, t2;
-
- /* start at 0 N 0 E */
- x = 0;
- y = 0;
- z = 1;
-
- /*
- * rotate in about y axis (from z towards x) according to the number of
- * orbits we've completed
- */
- a = (double) pTimeMillis / (fConf.getDouble("orbitPeriod") * 3600 * 1000) * 2 * Math.PI;
- c = Math.cos(a);
- s = Math.sin(a);
- t1 = c * z - s * x;
- t2 = s * z + c * x;
- z = t1;
- x = t2;
-
- /*
- * rotate about z axis (from x towards y) according to the inclination
- * of the orbit
- */
- a = Toolkit.degsToRads(fConf.getDouble("orbitInclination"));
- c = Math.cos(a);
- s = Math.sin(a);
- t1 = c * x - s * y;
- t2 = s * x + c * y;
- x = t1;
- y = t2;
-
- /*
- * rotate about y axis (from x towards z) according to the number of
- * rotations the earth has made
- */
- a = ((double) pTimeMillis / 86400000) * (2 * Math.PI);
- c = Math.cos(a);
- s = Math.sin(a);
- t1 = c * x - s * z;
- t2 = s * x + c * z;
- x = t1;
- z = t2;
-
- return new Coordinate(Toolkit.radsToDegs(Math.asin(y)), Toolkit.radsToDegs(Math.atan2(x, z)));
- }
-
- /**
- *
- * Pick a position (lat, lon) at random
- *
- * @return A random position.
- */
- private static Coordinate getRandomPosition() {
-
- /* select a vector at random */
- final double[] pos = new double[3];
- double mag = 0;
- do {
- for (int i = 0; i < 3; i++) {
- pos[i] = ((Math.random() * 20000) * 1e-4) - 1;
- mag += pos[i] * pos[i];
- }
- } while ((mag > 1.0) || (mag < 0.01));
-
- /* normalize the vector */
- mag = Math.sqrt(mag);
- for (int i = 0; i < 3; i++) {
- pos[i] /= mag;
- }
-
- /* convert to (lat, lon) */
- final double s_lat = pos[1];
- final double c_lat = Math.sqrt(1 - s_lat * s_lat);
- final double s_lon = pos[0] / c_lat;
- final double c_lon = pos[2] / c_lat;
-
- return new Coordinate(Math.atan2(s_lat, c_lat) * (180 / Math.PI), Math.atan2(s_lon, c_lon) * (180 / Math.PI));
- }
-
-// public static long getStartTime() {
-// return fsStartTime;
-// }
-
- public ConfigurationACearth getConf() {
- return fConf;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/ConfigurationACearth.java plantuml-1.2018.9/src/com/ctreber/acearth/ConfigurationACearth.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/ConfigurationACearth.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/ConfigurationACearth.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-package com.ctreber.acearth;
-
-import com.ctreber.acearth.util.Coordinate;
-import com.ctreber.aclib.gui.MOBoolean;
-import com.ctreber.aclib.gui.MODouble;
-import com.ctreber.aclib.gui.MOEnum;
-import com.ctreber.aclib.gui.MOInteger;
-import com.ctreber.aclib.gui.MOString;
-import com.ctreber.aclib.gui.MonitoredObject;
-
-/**
- *
- * How to avoid writing all the accessors? Code generator that creates derived
- * class from template class? Configuration items in data structure?
- *
- * Construct a canvas of the specified size.
- *
- * @param pWidth
- * Width
- * @param pHeight
- * Height
- */
- public PixelCanvas(int pWidth, int pHeight) {
- fImageWidth = pWidth;
- fImageHeight = pHeight;
- fEarthImage2 = new BufferedImage(fImageWidth, fImageHeight, BufferedImage.TYPE_INT_RGB);
- }
-
- public Graphics2D getGraphics2D() {
- return fEarthImage2.createGraphics();
- }
-
- public void setPixel(int pX, int pY, int pA, int pR, int pG, int pB) {
- setPixel(pX, pY, new Color(pR, pG, pB, pA));
- }
-
- public void setPixel(int pX, int pY, Color pColor) {
- fEarthImage2.setRGB(pX, pY, pColor.getRGB());
- }
-
- public int getImageWidth() {
- return fImageWidth;
- }
-
- public int getImageHeight() {
- return fImageHeight;
- }
-
- public boolean saveToImage(String pFileName, String pFormat) throws IOException {
- return ImageIO.write(fEarthImage2, pFormat, new File(pFileName));
- }
-
- public void saveToImage(OutputStream os) throws IOException {
- ImageIO.write(fEarthImage2, "png", os);
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/MapData.java plantuml-1.2018.9/src/com/ctreber/acearth/MapData.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/MapData.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/MapData.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,6835 +0,0 @@
-package com.ctreber.acearth;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
AC.earth - XEarth for Java
- *
- *
- *
- * The original XEarth was written by Kirk Johnson in July 1993 - thank you for
- * writing this great little program and making it available for free!
- *
- *
- * I wanted to extend the program, but not in C. So I created this Java version,
- * and found the process quite painfull interesting. The
- * biggest effort went into resolving references between C files and
- * eliminatiing pointers.
- *
- *
- * AC.earth is based on XEarth by Kirk Johnson
- *
- *
- * To comply with the XEarth license I include the following text:
- *
- *
- * XEarth Copyright (C) 1989, 1990, 1993-1995, 1999 Kirk Lauritz Johnson
- * Parts of the source code are:
- * Copyright (C) 1989, 1990, 1991 by Jim Frost
- * Copyright (C) 1992 by Jamie Zawinski <jwz@lucid.com>
- * Permission to use, copy, modify and freely distribute xearth for
- * non-commercial and not-for-profit purposes is hereby granted
- * without fee, provided that both the above copyright notice and this
- * permission notice appear in all copies and in supporting
- * documentation.
- * [Section refering to GIF omitted because it doesn't apply to this version]
- * The author makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, d OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *
- *
- * The license for this program (AC.earth) is the same as the quoted license
- * above, with one change: The "copyright notice and permission notice" shall
- * include the entire text of this section.
- *
- * todo Phase 2: Make grid value stuff more meaningful ("every n degrees") todo
- * Phase 2: Enter fixed time as d and time, not seconds since epoch todo
- * Phase 2: Compact map d into binary file
- *
- *
Project 3D point on y axis.
- */
- abstract public double projectY(double pY);
-
- abstract public double inverseProjectY(double pY);
-
- /**
- *
Project 3D point on x axis.
- */
- abstract protected double projectX(double pX, double pZ);
-
- abstract public double inverseProjectX(double pX);
-
- public abstract boolean isVisible(Point3D pPoint);
-
- public boolean isWithinImage(Point2D pPoint)
- {
- return (pPoint.getX() >= 0) && (pPoint.getX() < fImageWidth) &&
- (pPoint.getY() >= 0) && (pPoint.getY() < fImageHeight);
- }
-
- /**
- *
Translate screen point into coordinate on Earth.
- *
- * @param pX
- * @param pY
- * @return
- */
- abstract public Coordinate getLocation(int pX, int pY);
-
- /**
- *
Imagine view the globe, N is up, S is down, and N0E0 is in the center.
- * x is right/left, y is up/down, and z is front/rear.
- *
- *
Map points are located on the surface of a unit sphere (diameter = 1).
- * Latitude is the angle between x and y or z and y. Longitude is the angle
- * between x and z.
- *
- *
Why? The way we choose our global coordinate system, longitude circles
- * (latidude variable) always have the same size while the size of
- * latidude circles (longitude variable) depends on the latitude.
- *
- * @param pPoint
- * @return
- */
- public Point2D project2D(Point3D pPoint)
- {
- return new Point2D(projectX(pPoint.getX(), pPoint.getZ()),
- projectY(pPoint.getY()));
- }
-
- public Point2D finalize(Point2D pPoint)
- {
- return new Point2D(finalizeX(pPoint.getX()), finalizeY(pPoint.getY()));
- }
-
- /**
- *
Since the final mapping is relative to the center of the image
- * -PI and PI get mapped to the left and right border respectively.
- * But see ProjectionOrtho.setScale().
- */
- public double finalizeX(double pX)
- {
- return fXOffset + fScale * pX;
- }
-
- /**
- *
Since the final mapping is relative to the center of the image
- * -PI and PI get mapped to the bottom and top border respectively.
- * But see ProjectionOrtho.setScale().
- */
- public double finalizeY(double pY)
- {
- return fYOffset - fScale * pY;
- }
-
- /**
- *
All of Earth is visible.
- *
- * @param pPoint
- * @return
- */
- public boolean isVisible(Point3D pPoint)
- {
- return pPoint.getZ() >= 0;
- }
-
- public Coordinate getLocation(int pX, int pY)
- {
- final double lX = inverseFinalizeX(pX);
- final double lY = inverseFinalizeY(pY);
- final double lZ = Math.sqrt(1 - lX * lX - lY * lY);
- final Point3D lP = new Point3D(lX, lY, lZ);
-
- return rotateReverse(lP).getCoordinate();
- }
-
- /**
- * @return Longitude, not in rad but from -1 to 1.
- */
- public double projectX(double pX, double pZ)
- {
- return pX;
- }
-
- public double inverseProjectX(double pX)
- {
- return pX;
- }
-
- /**
- * @return Latitude, not in rad but from -1 to 1.
- */
- public double projectY(double pY)
- {
- return pY;
- }
-
- public double inverseProjectY(double pY)
- {
- return pY;
- }
-
- /**
- *
The scale is not from -PI to PI but from -1 to 1 in this case
- * (the range of x, y, z of the points).
- */
- protected void setScale()
- {
- fScale = Math.min(fImageHeight, fImageWidth) * fViewMagnification * 0.99 / 2;
- }
-}
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/renderer/Renderer.java plantuml-1.2018.9/src/com/ctreber/acearth/renderer/Renderer.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/renderer/Renderer.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/renderer/Renderer.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-package com.ctreber.acearth.renderer;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.ctreber.acearth.shader.Shader;
-
-/**
- *
- * Uses defined RowTypeRenderers and Shader to render to render target.
- *
- *
For each line, the scanbuffer (= a raster divice) records the points hit
- * I.e., line 5 (y=5) contains the values 2, 6, 40, and 46 (these line have
- * been crossed). The values always come as pairs because we're dealing with
- * polygons, which have a left and a right side which consists of a line.
- * The points in between two values painted as filled.
- *
- *
- * @author Christian Treber, ct@ctreber.com
- *
- */
-abstract public class Shader
-{
- private static final Color COLOR_SPACE = Color.black;
- private static final Color COLOR_STAR = Color.white;
- private static final Color COLOR_WATER = Color.blue;
- private static final Color COLOR_LAND = Color.green;
- // Brown
- //static final Color COLOR_LAND = new Color(255, 136, 25);
- private static final Color COLOR_GRID_LAND = Color.white;
- // Bright blue
- private static final Color COLOR_GRID_WATER = new Color(128, 128, 255);
-
- /**
Needed to calculate lighting vectors. */
- Projection fProjection;
-
- // Stuff below only needed when shading.
- private Coordinate fSunPos;
- private double fNightSideBrightness;
- private double fDaySideBrightness;
- private double fTerminatorDiscontinuity;
-
- private double fDaySideValueBase;
- private double fDaySideValueRange;
- Point3D fLightVector;
-
- abstract public Color[] getShadedColors(int pRowNo, int[] pRowTypes);
-
- public void init()
- {
- // Precompute shading parameters. I personally find the terminator
- // stuff is obscure and might as well be left out.
- final double tmp = fTerminatorDiscontinuity / 100;
- // 100%: day, 0%: night
- fDaySideValueBase = (int)(tmp * fDaySideBrightness +
- (1 - tmp) * fNightSideBrightness);
- fDaySideValueRange = fDaySideBrightness - fDaySideValueBase;
- fLightVector = fProjection.rotate(fSunPos.getPoint3D());
- }
-
- Color getShadedColorForType(int pType, double pSunValue)
- {
- double lBrightness;
-
- if(pSunValue < 0)
- {
- // The sun is below the horizon.
- lBrightness = fNightSideBrightness / 100;
- } else
- {
- // The sun is above the horizon. The brightness will range from
- // the base to the maximum value.
- lBrightness = (fDaySideValueBase + pSunValue * fDaySideValueRange) / 100;
- }
- if(lBrightness > 1.0)
- {
- lBrightness = 1.0;
- }
-
- switch(pType)
- {
- case BitGeneratorMap.PixTypeSpace:
- return COLOR_SPACE;
-
- case BitGeneratorMap.PixTypeStar:
- return COLOR_STAR;
-
- case BitGeneratorMap.PixTypeGridLand:
- return shade(COLOR_GRID_LAND, lBrightness);
-
- case BitGeneratorMap.PixTypeGridWater:
- return shade(COLOR_GRID_WATER, lBrightness);
-
- case BitGeneratorMap.PixTypeLand:
- return shade(COLOR_LAND, lBrightness);
-
- case BitGeneratorMap.PixTypeWater:
- return shade(COLOR_WATER, lBrightness);
- }
-
- return null;
- }
-
- private static Color shade(Color pColor, double pBrightness)
- {
- return new Color((int)(pColor.getRed() * pBrightness),
- (int)(pColor.getGreen() * pBrightness),
- (int)(pColor.getBlue() * pBrightness));
- }
-
- public void setProjection(Projection pProjection)
- {
- fProjection = pProjection;
- }
-
- public void setSunPos(Coordinate pSunPos)
- {
- fSunPos = pSunPos;
- }
-
- public void setDaySideBrightness(double pDaySideBrightness)
- {
- fDaySideBrightness = pDaySideBrightness;
- }
-
- public void setNightSideBrightness(double pNightSideBrightness)
- {
- fNightSideBrightness = pNightSideBrightness;
- }
-
- public void setTerminatorDiscontinuity(double pTerminatorDiscontinuity)
- {
- fTerminatorDiscontinuity = pTerminatorDiscontinuity;
- }
-}
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/shader/ShaderOrtho.java plantuml-1.2018.9/src/com/ctreber/acearth/shader/ShaderOrtho.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/shader/ShaderOrtho.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/shader/ShaderOrtho.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-package com.ctreber.acearth.shader;
-
-import java.awt.Color;
-
-/**
- *
computing julian dates (assuming gregorian calendar, thus this is
- * only valid for dates of 1582 oct 15 or later)
- * (after duffett-smith, section 4)
- *
- *
Verified.
- *
- * @param pYear year (e.g. 19xx)
- * @param pMonth month (jan=1, feb=2, ...)
- * @param pDay day of month
- */
- private static double getJulianDate(int pYear, int pMonth, int pDay)
- {
- if((pMonth == 1) || (pMonth == 2))
- {
- pYear -= 1;
- pMonth += 12;
- }
-
- final int A = pYear / 100;
- final int B = 2 - A + (A / 4);
- final int C = (int)(365.25 * pYear);
- final int D = (int)(30.6001 * (pMonth + 1));
-
- return B + C + D + pDay + 1720994.5;
- }
-
-
- /**
- *
compute greenwich mean sidereal time (getGST) corresponding to a given
- * number of milliseconds since the unix epoch
- * (after duffett-smith, section 12)
- *
- *
Given a particular time (expressed in milliseconds since the unix
- * epoch), compute position on the earth (lat, lon) such that sun is
- * directly overhead.
- *
- *
Verified.
- *
- * @param pMillis seconds since unix epoch
- *
- */
- public static Coordinate getSunPositionOnEarth(long pMillis)
- {
- final Coordinate lSunPosEc = new Coordinate(0.0, getSunEclipticLongitude(pMillis));
- final Coordinate lSunPosEq = lSunPosEc.eclipticToEquatorial();
-
- final double lRA = Toolkit.limitRads(lSunPosEq.getRA() - (Toolkit.TWOPI / 24) * getGST(pMillis));
-
- return new Coordinate(Toolkit.radsToDegs(lSunPosEq.getDE()), Toolkit.radsToDegs(lRA));
- }
-
- /**
- *
Given a particular time (expressed in milliseconds since the unix
- * epoch), compute position on the earth (lat, lon) such that the
- * moon is directly overhead.
- *
- * Based on duffett-smith **2nd ed** section 61; combines some steps
- * into single expressions to reduce the number of extra variables.
- *
- *
Verified.
- */
- public static Coordinate getMoonPositionOnEarth(long pMillis)
- {
- final double lDays = daysSinceEpoch(pMillis);
- double lSunLongEc = getSunEclipticLongitude(pMillis);
- final double Ms = getMeanSunLongitude(lDays);
-
- double L = Toolkit.limitRads(Toolkit.fmod(lDays / SIDERAL_MONTH, 0, 1.0) * Toolkit.TWOPI + MOON_MEAN_LONGITUDE);
- double Mm = Toolkit.limitRads(L - Toolkit.degsToRads(0.1114041 * lDays) - MOON_MEAN_LONGITUDE_PERIGEE);
- double N = Toolkit.limitRads(MOON_MEAN_LONGITUDE_NODE - Toolkit.degsToRads(0.0529539 * lDays));
- final double Ev = Toolkit.degsToRads(1.2739) * Math.sin(2.0 * (L - lSunLongEc) - Mm);
- final double Ae = Toolkit.degsToRads(0.1858) * Math.sin(Ms);
- Mm += Ev - Ae - Toolkit.degsToRads(0.37) * Math.sin(Ms);
- final double Ec = Toolkit.degsToRads(6.2886) * Math.sin(Mm);
- L += Ev + Ec - Ae + Toolkit.degsToRads(0.214) * Math.sin(2.0 * Mm);
- L += Toolkit.degsToRads(0.6583) * Math.sin(2.0 * (L - lSunLongEc));
- N -= Toolkit.degsToRads(0.16) * Math.sin(Ms);
-
- L -= N;
- lSunLongEc = Toolkit.limitRads((Math.abs(Math.cos(L)) < 1e-12) ?
- (N + Math.sin(L) * Math.cos(MOON_INCLINATION) * Math.PI / 2) :
- (N + Math.atan2(Math.sin(L) * Math.cos(MOON_INCLINATION), Math.cos(L))));
- final double lSunLatEc = Math.asin(Math.sin(L) * Math.sin(MOON_INCLINATION));
-
- final Coordinate lSunPosEq = new Coordinate(lSunLatEc, lSunLongEc).eclipticToEquatorial();
- final double lRA = Toolkit.limitRads(lSunPosEq.getRA() - (Toolkit.TWOPI / 24) * getGST(pMillis));
-
- return new Coordinate(Toolkit.radsToDegs(lSunPosEq.getDE()), Toolkit.radsToDegs(lRA));
- }
-}
diff -Nru plantuml-1.2017.15/src/com/ctreber/acearth/util/Toolkit.java plantuml-1.2018.9/src/com/ctreber/acearth/util/Toolkit.java
--- plantuml-1.2017.15/src/com/ctreber/acearth/util/Toolkit.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/ctreber/acearth/util/Toolkit.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-package com.ctreber.acearth.util;
-
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-/**
- *
A simple, fast array of bits, represented compactly by an array of ints internally.
- *
- * @author Sean Owen
- */
-public final class BitArray {
-
- // TODO: I have changed these members to be public so ProGuard can inline get() and set(). Ideally
- // they'd be private and we'd use the -allowaccessmodification flag, but Dalvik rejects the
- // resulting binary at runtime on Android. If we find a solution to this, these should be changed
- // back to private.
- public int[] bits;
- public int size;
-
- public BitArray() {
- this.size = 0;
- this.bits = new int[1];
- }
-
- public BitArray(int size) {
- this.size = size;
- this.bits = makeArray(size);
- }
-
- public int getSize() {
- return size;
- }
-
- public int getSizeInBytes() {
- return (size + 7) >> 3;
- }
-
- private void ensureCapacity(int size) {
- if (size > bits.length << 5) {
- int[] newBits = makeArray(size);
- System.arraycopy(bits, 0, newBits, 0, bits.length);
- this.bits = newBits;
- }
- }
-
- /**
- * @param i bit to get
- * @return true iff bit i is set
- */
- public boolean get(int i) {
- return (bits[i >> 5] & (1 << (i & 0x1F))) != 0;
- }
-
- /**
- * Sets bit i.
- *
- * @param i bit to set
- */
- public void set(int i) {
- bits[i >> 5] |= 1 << (i & 0x1F);
- }
-
- /**
- * Flips bit i.
- *
- * @param i bit to set
- */
- public void flip(int i) {
- bits[i >> 5] ^= 1 << (i & 0x1F);
- }
-
- /**
- * Sets a block of 32 bits, starting at bit i.
- *
- * @param i first bit to set
- * @param newBits the new value of the next 32 bits. Note again that the least-significant bit
- * corresponds to bit i, the next-least-significant to i+1, and so on.
- */
- public void setBulk(int i, int newBits) {
- bits[i >> 5] = newBits;
- }
-
- /**
- * Clears all bits (sets to false).
- */
- public void clear() {
- int max = bits.length;
- for (int i = 0; i < max; i++) {
- bits[i] = 0;
- }
- }
-
- /**
- * Efficient method to check if a range of bits is set, or not set.
- *
- * @param start start of range, inclusive.
- * @param end end of range, exclusive
- * @param value if true, checks that bits in range are set, otherwise checks that they are not set
- * @return true iff all bits are set or not set in range, according to value argument
- * @throws IllegalArgumentException if end is less than or equal to start
- */
- public boolean isRange(int start, int end, boolean value) {
- if (end < start) {
- throw new IllegalArgumentException();
- }
- if (end == start) {
- return true; // empty range matches
- }
- end--; // will be easier to treat this as the last actually set bit -- inclusive
- int firstInt = start >> 5;
- int lastInt = end >> 5;
- for (int i = firstInt; i <= lastInt; i++) {
- int firstBit = i > firstInt ? 0 : start & 0x1F;
- int lastBit = i < lastInt ? 31 : end & 0x1F;
- int mask;
- if (firstBit == 0 && lastBit == 31) {
- mask = -1;
- } else {
- mask = 0;
- for (int j = firstBit; j <= lastBit; j++) {
- mask |= 1 << j;
- }
- }
-
- // Return false if we're looking for 1s and the masked bits[i] isn't all 1s (that is,
- // equals the mask, or we're looking for 0s and the masked portion is not all 0s
- if ((bits[i] & mask) != (value ? mask : 0)) {
- return false;
- }
- }
- return true;
- }
-
- public void appendBit(boolean bit) {
- ensureCapacity(size + 1);
- if (bit) {
- bits[size >> 5] |= (1 << (size & 0x1F));
- }
- size++;
- }
-
- /**
- * Appends the least-significant bits, from value, in order from most-significant to
- * least-significant. For example, appending 6 bits from 0x000001E will append the bits
- * 0, 1, 1, 1, 1, 0 in that order.
- */
- public void appendBits(int value, int numBits) {
- if (numBits < 0 || numBits > 32) {
- throw new IllegalArgumentException("Num bits must be between 0 and 32");
- }
- ensureCapacity(size + numBits);
- for (int numBitsLeft = numBits; numBitsLeft > 0; numBitsLeft--) {
- appendBit(((value >> (numBitsLeft - 1)) & 0x01) == 1);
- }
- }
-
- public void appendBitArray(BitArray other) {
- int otherSize = other.getSize();
- ensureCapacity(size + otherSize);
- for (int i = 0; i < otherSize; i++) {
- appendBit(other.get(i));
- }
- }
-
- public void xor(BitArray other) {
- if (bits.length != other.bits.length) {
- throw new IllegalArgumentException("Sizes don't match");
- }
- for (int i = 0; i < bits.length; i++) {
- // The last byte could be incomplete (i.e. not have 8 bits in
- // it) but there is no problem since 0 XOR 0 == 0.
- bits[i] ^= other.bits[i];
- }
- }
-
- /**
- *
- * @param bitOffset first bit to start writing
- * @param array array to write into. Bytes are written most-significant byte first. This is the opposite
- * of the internal representation, which is exposed by {@link #getBitArray()}
- * @param offset position in array to start writing
- * @param numBytes how many bytes to write
- */
- public void toBytes(int bitOffset, byte[] array, int offset, int numBytes) {
- for (int i = 0; i < numBytes; i++) {
- int theByte = 0;
- for (int j = 0; j < 8; j++) {
- if (get(bitOffset)) {
- theByte |= 1 << (7 - j);
- }
- bitOffset++;
- }
- array[offset + i] = (byte) theByte;
- }
- }
-
- /**
- * @return underlying array of ints. The first element holds the first 32 bits, and the least
- * significant bit is bit 0.
- */
- public int[] getBitArray() {
- return bits;
- }
-
- /**
- * Reverses all bits in the array.
- */
- public void reverse() {
- int[] newBits = new int[bits.length];
- int size = this.size;
- for (int i = 0; i < size; i++) {
- if (get(size - i - 1)) {
- newBits[i >> 5] |= 1 << (i & 0x1F);
- }
- }
- bits = newBits;
- }
-
- private static int[] makeArray(int size) {
- return new int[(size + 31) >> 5];
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(size);
- for (int i = 0; i < size; i++) {
- if ((i & 0x07) == 0) {
- result.append(' ');
- }
- result.append(get(i) ? 'X' : '.');
- }
- return result.toString();
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/BitMatrix.java plantuml-1.2018.9/src/com/google/zxing/common/BitMatrix.java
--- plantuml-1.2017.15/src/com/google/zxing/common/BitMatrix.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/BitMatrix.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-/**
- *
Represents a 2D matrix of bits. In function arguments below, and throughout the common
- * module, x is the column position, and y is the row position. The ordering is always x, y.
- * The origin is at the top-left.
- *
- *
Internally the bits are represented in a 1-D array of 32-bit ints. However, each row begins
- * with a new int. This is done intentionally so that we can copy out a row into a BitArray very
- * efficiently.
- *
- *
The ordering of bits is row-major. Within each int, the least significant bits are used first,
- * meaning they represent lower x values. This is compatible with BitArray's implementation.
- *
- * @author Sean Owen
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class BitMatrix {
-
- // TODO: Just like BitArray, these need to be public so ProGuard can inline them.
- public final int width;
- public final int height;
- public final int rowSize;
- public final int[] bits;
-
- // A helper to construct a square matrix.
- public BitMatrix(int dimension) {
- this(dimension, dimension);
- }
-
- public BitMatrix(int width, int height) {
- if (width < 1 || height < 1) {
- throw new IllegalArgumentException("Both dimensions must be greater than 0");
- }
- this.width = width;
- this.height = height;
- this.rowSize = (width + 31) >> 5;
- bits = new int[rowSize * height];
- }
-
- /**
- *
Gets the requested bit, where true means black.
- *
- * @param x The horizontal component (i.e. which column)
- * @param y The vertical component (i.e. which row)
- * @return value of given bit in matrix
- */
- public boolean get(int x, int y) {
- int offset = y * rowSize + (x >> 5);
- return ((bits[offset] >>> (x & 0x1f)) & 1) != 0;
- }
-
- /**
- *
Sets the given bit to true.
- *
- * @param x The horizontal component (i.e. which column)
- * @param y The vertical component (i.e. which row)
- */
- public void set(int x, int y) {
- int offset = y * rowSize + (x >> 5);
- bits[offset] |= 1 << (x & 0x1f);
- }
-
- /**
- *
Flips the given bit.
- *
- * @param x The horizontal component (i.e. which column)
- * @param y The vertical component (i.e. which row)
- */
- public void flip(int x, int y) {
- int offset = y * rowSize + (x >> 5);
- bits[offset] ^= 1 << (x & 0x1f);
- }
-
- /**
- * Clears all bits (sets to false).
- */
- public void clear() {
- int max = bits.length;
- for (int i = 0; i < max; i++) {
- bits[i] = 0;
- }
- }
-
- /**
- *
Sets a square region of the bit matrix to true.
- *
- * @param left The horizontal position to begin at (inclusive)
- * @param top The vertical position to begin at (inclusive)
- * @param width The width of the region
- * @param height The height of the region
- */
- public void setRegion(int left, int top, int width, int height) {
- if (top < 0 || left < 0) {
- throw new IllegalArgumentException("Left and top must be nonnegative");
- }
- if (height < 1 || width < 1) {
- throw new IllegalArgumentException("Height and width must be at least 1");
- }
- int right = left + width;
- int bottom = top + height;
- if (bottom > this.height || right > this.width) {
- throw new IllegalArgumentException("The region must fit inside the matrix");
- }
- for (int y = top; y < bottom; y++) {
- int offset = y * rowSize;
- for (int x = left; x < right; x++) {
- bits[offset + (x >> 5)] |= 1 << (x & 0x1f);
- }
- }
- }
-
- /**
- * A fast method to retrieve one row of data from the matrix as a BitArray.
- *
- * @param y The row to retrieve
- * @param row An optional caller-allocated BitArray, will be allocated if null or too small
- * @return The resulting BitArray - this reference should always be used even when passing
- * your own row
- */
- public BitArray getRow(int y, BitArray row) {
- if (row == null || row.getSize() < width) {
- row = new BitArray(width);
- }
- int offset = y * rowSize;
- for (int x = 0; x < rowSize; x++) {
- row.setBulk(x << 5, bits[offset + x]);
- }
- return row;
- }
-
- /**
- * This is useful in detecting a corner of a 'pure' barcode.
- *
- * @return {x,y} coordinate of top-left-most 1 bit, or null if it is all white
- */
- public int[] getTopLeftOnBit() {
- int bitsOffset = 0;
- while (bitsOffset < bits.length && bits[bitsOffset] == 0) {
- bitsOffset++;
- }
- if (bitsOffset == bits.length) {
- return null;
- }
- int y = bitsOffset / rowSize;
- int x = (bitsOffset % rowSize) << 5;
-
- int theBits = bits[bitsOffset];
- int bit = 0;
- while ((theBits << (31-bit)) == 0) {
- bit++;
- }
- x += bit;
- return new int[] {x, y};
- }
-
- /**
- * @return The width of the matrix
- */
- public int getWidth() {
- return width;
- }
-
- /**
- * @return The height of the matrix
- */
- public int getHeight() {
- return height;
- }
-
- public boolean equals(Object o) {
- if (!(o instanceof BitMatrix)) {
- return false;
- }
- BitMatrix other = (BitMatrix) o;
- if (width != other.width || height != other.height ||
- rowSize != other.rowSize || bits.length != other.bits.length) {
- return false;
- }
- for (int i = 0; i < bits.length; i++) {
- if (bits[i] != other.bits[i]) {
- return false;
- }
- }
- return true;
- }
-
- public int hashCode() {
- int hash = width;
- hash = 31 * hash + width;
- hash = 31 * hash + height;
- hash = 31 * hash + rowSize;
- for (int i = 0; i < bits.length; i++) {
- hash = 31 * hash + bits[i];
- }
- return hash;
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(height * (width + 1));
- for (int y = 0; y < height; y++) {
- for (int x = 0; x < width; x++) {
- result.append(get(x, y) ? "X " : " ");
- }
- result.append('\n');
- }
- return result.toString();
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/BitSource.java plantuml-1.2018.9/src/com/google/zxing/common/BitSource.java
--- plantuml-1.2017.15/src/com/google/zxing/common/BitSource.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/BitSource.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-/**
- *
This provides an easy abstraction to read bits at a time from a sequence of bytes, where the
- * number of bits read is not often a multiple of 8.
- *
- *
This class is thread-safe but not reentrant. Unless the caller modifies the bytes array
- * it passed in, in which case all bets are off.
- *
- * @author Sean Owen
- */
-public final class BitSource {
-
- private final byte[] bytes;
- private int byteOffset;
- private int bitOffset;
-
- /**
- * @param bytes bytes from which this will read bits. Bits will be read from the first byte first.
- * Bits are read within a byte from most-significant to least-significant bit.
- */
- public BitSource(byte[] bytes) {
- this.bytes = bytes;
- }
-
- /**
- * @param numBits number of bits to read
- * @return int representing the bits read. The bits will appear as the least-significant
- * bits of the int
- * @throws IllegalArgumentException if numBits isn't in [1,32]
- */
- public int readBits(int numBits) {
- if (numBits < 1 || numBits > 32) {
- throw new IllegalArgumentException();
- }
-
- int result = 0;
-
- // First, read remainder from current byte
- if (bitOffset > 0) {
- int bitsLeft = 8 - bitOffset;
- int toRead = numBits < bitsLeft ? numBits : bitsLeft;
- int bitsToNotRead = bitsLeft - toRead;
- int mask = (0xFF >> (8 - toRead)) << bitsToNotRead;
- result = (bytes[byteOffset] & mask) >> bitsToNotRead;
- numBits -= toRead;
- bitOffset += toRead;
- if (bitOffset == 8) {
- bitOffset = 0;
- byteOffset++;
- }
- }
-
- // Next read whole bytes
- if (numBits > 0) {
- while (numBits >= 8) {
- result = (result << 8) | (bytes[byteOffset] & 0xFF);
- byteOffset++;
- numBits -= 8;
- }
-
- // Finally read a partial byte
- if (numBits > 0) {
- int bitsToNotRead = 8 - numBits;
- int mask = (0xFF >> bitsToNotRead) << bitsToNotRead;
- result = (result << numBits) | ((bytes[byteOffset] & mask) >> bitsToNotRead);
- bitOffset += numBits;
- }
- }
-
- return result;
- }
-
- /**
- * @return number of bits that can be read successfully
- */
- public int available() {
- return 8 * (bytes.length - byteOffset) - bitOffset;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/CharacterSetECI.java plantuml-1.2018.9/src/com/google/zxing/common/CharacterSetECI.java
--- plantuml-1.2017.15/src/com/google/zxing/common/CharacterSetECI.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/CharacterSetECI.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulates a Character Set ECI, according to "Extended Channel Interpretations" 5.3.1.1
- * of ISO 18004.
- *
- * @author Sean Owen
- */
-public final class CharacterSetECI extends ECI {
-
- private static Hashtable VALUE_TO_ECI;
- private static Hashtable NAME_TO_ECI;
-
- private static void initialize() {
- VALUE_TO_ECI = new Hashtable(29);
- NAME_TO_ECI = new Hashtable(29);
- // TODO figure out if these values are even right!
- addCharacterSet(0, "Cp437");
- addCharacterSet(1, new String[] {"ISO8859_1", "ISO-8859-1"});
- addCharacterSet(2, "Cp437");
- addCharacterSet(3, new String[] {"ISO8859_1", "ISO-8859-1"});
- addCharacterSet(4, "ISO8859_2");
- addCharacterSet(5, "ISO8859_3");
- addCharacterSet(6, "ISO8859_4");
- addCharacterSet(7, "ISO8859_5");
- addCharacterSet(8, "ISO8859_6");
- addCharacterSet(9, "ISO8859_7");
- addCharacterSet(10, "ISO8859_8");
- addCharacterSet(11, "ISO8859_9");
- addCharacterSet(12, "ISO8859_10");
- addCharacterSet(13, "ISO8859_11");
- addCharacterSet(15, "ISO8859_13");
- addCharacterSet(16, "ISO8859_14");
- addCharacterSet(17, "ISO8859_15");
- addCharacterSet(18, "ISO8859_16");
- addCharacterSet(20, new String[] {"SJIS", "Shift_JIS"});
- }
-
- private final String encodingName;
-
- private CharacterSetECI(int value, String encodingName) {
- super(value);
- this.encodingName = encodingName;
- }
-
- public String getEncodingName() {
- return encodingName;
- }
-
- private static void addCharacterSet(int value, String encodingName) {
- CharacterSetECI eci = new CharacterSetECI(value, encodingName);
- VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
- NAME_TO_ECI.put(encodingName, eci);
- }
-
- private static void addCharacterSet(int value, String[] encodingNames) {
- CharacterSetECI eci = new CharacterSetECI(value, encodingNames[0]);
- VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
- for (int i = 0; i < encodingNames.length; i++) {
- NAME_TO_ECI.put(encodingNames[i], eci);
- }
- }
-
- /**
- * @param value character set ECI value
- * @return {@link CharacterSetECI} representing ECI of given value, or null if it is legal but
- * unsupported
- * @throws IllegalArgumentException if ECI value is invalid
- */
- public static CharacterSetECI getCharacterSetECIByValue(int value) {
- if (VALUE_TO_ECI == null) {
- initialize();
- }
- if (value < 0 || value >= 900) {
- throw new IllegalArgumentException("Bad ECI value: " + value);
- }
- return (CharacterSetECI) VALUE_TO_ECI.get(new Integer(value));
- }
-
- /**
- * @param name character set ECI encoding name
- * @return {@link CharacterSetECI} representing ECI for character encoding, or null if it is legal
- * but unsupported
- */
- public static CharacterSetECI getCharacterSetECIByName(String name) {
- if (NAME_TO_ECI == null) {
- initialize();
- }
- return (CharacterSetECI) NAME_TO_ECI.get(name);
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/DecoderResult.java plantuml-1.2018.9/src/com/google/zxing/common/DecoderResult.java
--- plantuml-1.2017.15/src/com/google/zxing/common/DecoderResult.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/DecoderResult.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-import java.util.Vector;
-
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-/**
- *
Encapsulates the result of decoding a matrix of bits. This typically
- * applies to 2D barcode formats. For now it contains the raw bytes obtained,
- * as well as a String interpretation of those bytes, if applicable.
- *
- * @author Sean Owen
- */
-public final class DecoderResult {
-
- private final byte[] rawBytes;
- private final String text;
- private final Vector byteSegments;
- private final ErrorCorrectionLevel ecLevel;
-
- public DecoderResult(byte[] rawBytes, String text, Vector byteSegments, ErrorCorrectionLevel ecLevel) {
- if (rawBytes == null && text == null) {
- throw new IllegalArgumentException();
- }
- this.rawBytes = rawBytes;
- this.text = text;
- this.byteSegments = byteSegments;
- this.ecLevel = ecLevel;
- }
-
- public byte[] getRawBytes() {
- return rawBytes;
- }
-
- public String getText() {
- return text;
- }
-
- public Vector getByteSegments() {
- return byteSegments;
- }
-
- public ErrorCorrectionLevel getECLevel() {
- return ecLevel;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/DetectorResult.java plantuml-1.2018.9/src/com/google/zxing/common/DetectorResult.java
--- plantuml-1.2017.15/src/com/google/zxing/common/DetectorResult.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/DetectorResult.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-import com.google.zxing.ResultPoint;
-
-/**
- *
Encapsulates the result of detecting a barcode in an image. This includes the raw
- * matrix of black/white pixels corresponding to the barcode, and possibly points of interest
- * in the image, like the location of finder patterns or corners of the barcode in the image.
- *
- * @author Sean Owen
- */
-public final class DetectorResult {
-
- private final BitMatrix bits;
- private final ResultPoint[] points;
-
- public DetectorResult(BitMatrix bits, ResultPoint[] points) {
- this.bits = bits;
- this.points = points;
- }
-
- public BitMatrix getBits() {
- return bits;
- }
-
- public ResultPoint[] getPoints() {
- return points;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/ECI.java plantuml-1.2018.9/src/com/google/zxing/common/ECI.java
--- plantuml-1.2017.15/src/com/google/zxing/common/ECI.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/ECI.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-/**
- * Superclass of classes encapsulating types ECIs, according to "Extended Channel Interpretations"
- * 5.3 of ISO 18004.
- *
- * @author Sean Owen
- */
-public abstract class ECI {
-
- private final int value;
-
- ECI(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- /**
- * @param value ECI value
- * @return {@link ECI} representing ECI of given value, or null if it is legal but unsupported
- * @throws IllegalArgumentException if ECI value is invalid
- */
- public static ECI getECIByValue(int value) {
- if (value < 0 || value > 999999) {
- throw new IllegalArgumentException("Bad ECI value: " + value);
- }
- if (value < 900) { // Character set ECIs use 000000 - 000899
- return CharacterSetECI.getCharacterSetECIByValue(value);
- }
- return null;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/GF256.java plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/GF256.java
--- plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/GF256.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/GF256.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common.reedsolomon;
-
-/**
- *
This class contains utility methods for performing mathematical operations over
- * the Galois Field GF(256). Operations use a given primitive polynomial in calculations.
- *
- *
Throughout this package, elements of GF(256) are represented as an int
- * for convenience and speed (but at the cost of memory).
- * Only the bottom 8 bits are really used.
- *
- * @author Sean Owen
- */
-public final class GF256 {
-
- public static final GF256 QR_CODE_FIELD = new GF256(0x011D); // x^8 + x^4 + x^3 + x^2 + 1
- public static final GF256 DATA_MATRIX_FIELD = new GF256(0x012D); // x^8 + x^5 + x^3 + x^2 + 1
-
- private final int[] expTable;
- private final int[] logTable;
- private final GF256Poly zero;
- private final GF256Poly one;
-
- /**
- * Create a representation of GF(256) using the given primitive polynomial.
- *
- * @param primitive irreducible polynomial whose coefficients are represented by
- * the bits of an int, where the least-significant bit represents the constant
- * coefficient
- */
- private GF256(int primitive) {
- expTable = new int[256];
- logTable = new int[256];
- int x = 1;
- for (int i = 0; i < 256; i++) {
- expTable[i] = x;
- x <<= 1; // x = x * 2; we're assuming the generator alpha is 2
- if (x >= 0x100) {
- x ^= primitive;
- }
- }
- for (int i = 0; i < 255; i++) {
- logTable[expTable[i]] = i;
- }
- // logTable[0] == 0 but this should never be used
- zero = new GF256Poly(this, new int[]{0});
- one = new GF256Poly(this, new int[]{1});
- }
-
- GF256Poly getZero() {
- return zero;
- }
-
- GF256Poly getOne() {
- return one;
- }
-
- /**
- * @return the monomial representing coefficient * x^degree
- */
- GF256Poly buildMonomial(int degree, int coefficient) {
- if (degree < 0) {
- throw new IllegalArgumentException();
- }
- if (coefficient == 0) {
- return zero;
- }
- int[] coefficients = new int[degree + 1];
- coefficients[0] = coefficient;
- return new GF256Poly(this, coefficients);
- }
-
- /**
- * Implements both addition and subtraction -- they are the same in GF(256).
- *
- * @return sum/difference of a and b
- */
- static int addOrSubtract(int a, int b) {
- return a ^ b;
- }
-
- /**
- * @return 2 to the power of a in GF(256)
- */
- int exp(int a) {
- return expTable[a];
- }
-
- /**
- * @return base 2 log of a in GF(256)
- */
- int log(int a) {
- if (a == 0) {
- throw new IllegalArgumentException();
- }
- return logTable[a];
- }
-
- /**
- * @return multiplicative inverse of a
- */
- int inverse(int a) {
- if (a == 0) {
- throw new ArithmeticException();
- }
- return expTable[255 - logTable[a]];
- }
-
- /**
- * @param a
- * @param b
- * @return product of a and b in GF(256)
- */
- int multiply(int a, int b) {
- if (a == 0 || b == 0) {
- return 0;
- }
- int logSum = logTable[a] + logTable[b];
- // index is a sped-up alternative to logSum % 255 since sum
- // is in [0,510]. Thanks to jmsachs for the idea
- return expTable[(logSum & 0xFF) + (logSum >>> 8)];
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/GF256Poly.java plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/GF256Poly.java
--- plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/GF256Poly.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/GF256Poly.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common.reedsolomon;
-
-/**
- *
Represents a polynomial whose coefficients are elements of GF(256).
- * Instances of this class are immutable.
- *
- *
Much credit is due to William Rucklidge since portions of this code are an indirect
- * port of his C++ Reed-Solomon implementation.
- *
- * @author Sean Owen
- */
-final class GF256Poly {
-
- private final GF256 field;
- private final int[] coefficients;
-
- /**
- * @param field the {@link GF256} instance representing the field to use
- * to perform computations
- * @param coefficients coefficients as ints representing elements of GF(256), arranged
- * from most significant (highest-power term) coefficient to least significant
- * @throws IllegalArgumentException if argument is null or empty,
- * or if leading coefficient is 0 and this is not a
- * constant polynomial (that is, it is not the monomial "0")
- */
- GF256Poly(GF256 field, int[] coefficients) {
- if (coefficients == null || coefficients.length == 0) {
- throw new IllegalArgumentException();
- }
- this.field = field;
- int coefficientsLength = coefficients.length;
- if (coefficientsLength > 1 && coefficients[0] == 0) {
- // Leading term must be non-zero for anything except the constant polynomial "0"
- int firstNonZero = 1;
- while (firstNonZero < coefficientsLength && coefficients[firstNonZero] == 0) {
- firstNonZero++;
- }
- if (firstNonZero == coefficientsLength) {
- this.coefficients = field.getZero().coefficients;
- } else {
- this.coefficients = new int[coefficientsLength - firstNonZero];
- System.arraycopy(coefficients,
- firstNonZero,
- this.coefficients,
- 0,
- this.coefficients.length);
- }
- } else {
- this.coefficients = coefficients;
- }
- }
-
- int[] getCoefficients() {
- return coefficients;
- }
-
- /**
- * @return degree of this polynomial
- */
- int getDegree() {
- return coefficients.length - 1;
- }
-
- /**
- * @return true iff this polynomial is the monomial "0"
- */
- boolean isZero() {
- return coefficients[0] == 0;
- }
-
- /**
- * @return coefficient of x^degree term in this polynomial
- */
- int getCoefficient(int degree) {
- return coefficients[coefficients.length - 1 - degree];
- }
-
- /**
- * @return evaluation of this polynomial at a given point
- */
- int evaluateAt(int a) {
- if (a == 0) {
- // Just return the x^0 coefficient
- return getCoefficient(0);
- }
- int size = coefficients.length;
- if (a == 1) {
- // Just the sum of the coefficients
- int result = 0;
- for (int i = 0; i < size; i++) {
- result = GF256.addOrSubtract(result, coefficients[i]);
- }
- return result;
- }
- int result = coefficients[0];
- for (int i = 1; i < size; i++) {
- result = GF256.addOrSubtract(field.multiply(a, result), coefficients[i]);
- }
- return result;
- }
-
- GF256Poly addOrSubtract(GF256Poly other) {
- if (!field.equals(other.field)) {
- throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
- }
- if (isZero()) {
- return other;
- }
- if (other.isZero()) {
- return this;
- }
-
- int[] smallerCoefficients = this.coefficients;
- int[] largerCoefficients = other.coefficients;
- if (smallerCoefficients.length > largerCoefficients.length) {
- int[] temp = smallerCoefficients;
- smallerCoefficients = largerCoefficients;
- largerCoefficients = temp;
- }
- int[] sumDiff = new int[largerCoefficients.length];
- int lengthDiff = largerCoefficients.length - smallerCoefficients.length;
- // Copy high-order terms only found in higher-degree polynomial's coefficients
- System.arraycopy(largerCoefficients, 0, sumDiff, 0, lengthDiff);
-
- for (int i = lengthDiff; i < largerCoefficients.length; i++) {
- sumDiff[i] = GF256.addOrSubtract(smallerCoefficients[i - lengthDiff], largerCoefficients[i]);
- }
-
- return new GF256Poly(field, sumDiff);
- }
-
- GF256Poly multiply(GF256Poly other) {
- if (!field.equals(other.field)) {
- throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
- }
- if (isZero() || other.isZero()) {
- return field.getZero();
- }
- int[] aCoefficients = this.coefficients;
- int aLength = aCoefficients.length;
- int[] bCoefficients = other.coefficients;
- int bLength = bCoefficients.length;
- int[] product = new int[aLength + bLength - 1];
- for (int i = 0; i < aLength; i++) {
- int aCoeff = aCoefficients[i];
- for (int j = 0; j < bLength; j++) {
- product[i + j] = GF256.addOrSubtract(product[i + j],
- field.multiply(aCoeff, bCoefficients[j]));
- }
- }
- return new GF256Poly(field, product);
- }
-
- GF256Poly multiply(int scalar) {
- if (scalar == 0) {
- return field.getZero();
- }
- if (scalar == 1) {
- return this;
- }
- int size = coefficients.length;
- int[] product = new int[size];
- for (int i = 0; i < size; i++) {
- product[i] = field.multiply(coefficients[i], scalar);
- }
- return new GF256Poly(field, product);
- }
-
- GF256Poly multiplyByMonomial(int degree, int coefficient) {
- if (degree < 0) {
- throw new IllegalArgumentException();
- }
- if (coefficient == 0) {
- return field.getZero();
- }
- int size = coefficients.length;
- int[] product = new int[size + degree];
- for (int i = 0; i < size; i++) {
- product[i] = field.multiply(coefficients[i], coefficient);
- }
- return new GF256Poly(field, product);
- }
-
- GF256Poly[] divide(GF256Poly other) {
- if (!field.equals(other.field)) {
- throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
- }
- if (other.isZero()) {
- throw new IllegalArgumentException("Divide by 0");
- }
-
- GF256Poly quotient = field.getZero();
- GF256Poly remainder = this;
-
- int denominatorLeadingTerm = other.getCoefficient(other.getDegree());
- int inverseDenominatorLeadingTerm = field.inverse(denominatorLeadingTerm);
-
- while (remainder.getDegree() >= other.getDegree() && !remainder.isZero()) {
- int degreeDifference = remainder.getDegree() - other.getDegree();
- int scale = field.multiply(remainder.getCoefficient(remainder.getDegree()), inverseDenominatorLeadingTerm);
- GF256Poly term = other.multiplyByMonomial(degreeDifference, scale);
- GF256Poly iterationQuotient = field.buildMonomial(degreeDifference, scale);
- quotient = quotient.addOrSubtract(iterationQuotient);
- remainder = remainder.addOrSubtract(term);
- }
-
- return new GF256Poly[] { quotient, remainder };
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(8 * getDegree());
- for (int degree = getDegree(); degree >= 0; degree--) {
- int coefficient = getCoefficient(degree);
- if (coefficient != 0) {
- if (coefficient < 0) {
- result.append(" - ");
- coefficient = -coefficient;
- } else {
- if (result.length() > 0) {
- result.append(" + ");
- }
- }
- if (degree == 0 || coefficient != 1) {
- int alphaPower = field.log(coefficient);
- if (alphaPower == 0) {
- result.append('1');
- } else if (alphaPower == 1) {
- result.append('a');
- } else {
- result.append("a^");
- result.append(alphaPower);
- }
- }
- if (degree != 0) {
- if (degree == 1) {
- result.append('x');
- } else {
- result.append("x^");
- result.append(degree);
- }
- }
- }
- }
- return result.toString();
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
--- plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common.reedsolomon;
-
-import java.util.Vector;
-
-/**
- *
Implements Reed-Solomon enbcoding, as the name implies.
- *
- * @author Sean Owen
- * @author William Rucklidge
- */
-public final class ReedSolomonEncoder {
-
- private final GF256 field;
- private final Vector cachedGenerators;
-
- public ReedSolomonEncoder(GF256 field) {
- if (!GF256.QR_CODE_FIELD.equals(field)) {
- throw new IllegalArgumentException("Only QR Code is supported at this time");
- }
- this.field = field;
- this.cachedGenerators = new Vector();
- cachedGenerators.addElement(new GF256Poly(field, new int[] { 1 }));
- }
-
- private GF256Poly buildGenerator(int degree) {
- if (degree >= cachedGenerators.size()) {
- GF256Poly lastGenerator = (GF256Poly) cachedGenerators.elementAt(cachedGenerators.size() - 1);
- for (int d = cachedGenerators.size(); d <= degree; d++) {
- GF256Poly nextGenerator = lastGenerator.multiply(new GF256Poly(field, new int[] { 1, field.exp(d - 1) }));
- cachedGenerators.addElement(nextGenerator);
- lastGenerator = nextGenerator;
- }
- }
- return (GF256Poly) cachedGenerators.elementAt(degree);
- }
-
- public void encode(int[] toEncode, int ecBytes) {
- if (ecBytes == 0) {
- throw new IllegalArgumentException("No error correction bytes");
- }
- int dataBytes = toEncode.length - ecBytes;
- if (dataBytes <= 0) {
- throw new IllegalArgumentException("No data bytes provided");
- }
- GF256Poly generator = buildGenerator(ecBytes);
- int[] infoCoefficients = new int[dataBytes];
- System.arraycopy(toEncode, 0, infoCoefficients, 0, dataBytes);
- GF256Poly info = new GF256Poly(field, infoCoefficients);
- info = info.multiplyByMonomial(ecBytes, 1);
- GF256Poly remainder = info.divide(generator)[1];
- int[] coefficients = remainder.getCoefficients();
- int numZeroCoefficients = ecBytes - coefficients.length;
- for (int i = 0; i < numZeroCoefficients; i++) {
- toEncode[dataBytes + i] = 0;
- }
- System.arraycopy(coefficients, 0, toEncode, dataBytes + numZeroCoefficients, coefficients.length);
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java
--- plantuml-1.2017.15/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/reedsolomon/ReedSolomonException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common.reedsolomon;
-
-/**
- *
Thrown when an exception occurs during Reed-Solomon decoding, such as when
- * there are too many errors to correct.
- *
- * @author Sean Owen
- */
-public final class ReedSolomonException extends Exception {
-
- public ReedSolomonException(String message) {
- super(message);
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/common/StringUtils.java plantuml-1.2018.9/src/com/google/zxing/common/StringUtils.java
--- plantuml-1.2017.15/src/com/google/zxing/common/StringUtils.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/common/StringUtils.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.common;
-
-import java.util.Hashtable;
-
-import com.google.zxing.DecodeHintType;
-
-/**
- * Common string-related functions.
- *
- * @author Sean Owen
- */
-public final class StringUtils {
-
- private static final String PLATFORM_DEFAULT_ENCODING =
- System.getProperty("file.encoding");
- public static final String SHIFT_JIS = "SJIS";
- private static final String EUC_JP = "EUC_JP";
- private static final String UTF8 = "UTF8";
- private static final String ISO88591 = "ISO8859_1";
- private static final boolean ASSUME_SHIFT_JIS =
- SHIFT_JIS.equalsIgnoreCase(PLATFORM_DEFAULT_ENCODING) ||
- EUC_JP.equalsIgnoreCase(PLATFORM_DEFAULT_ENCODING);
-
- private StringUtils() {}
-
- /**
- * @param bytes bytes encoding a string, whose encoding should be guessed
- * @param hints decode hints if applicable
- * @return name of guessed encoding; at the moment will only guess one of:
- * {@link #SHIFT_JIS}, {@link #UTF8}, {@link #ISO88591}, or the platform
- * default encoding if none of these can possibly be correct
- */
- public static String guessEncoding(byte[] bytes, Hashtable hints) {
- if (hints != null) {
- String characterSet = (String) hints.get(DecodeHintType.CHARACTER_SET);
- if (characterSet != null) {
- return characterSet;
- }
- }
- // Does it start with the UTF-8 byte order mark? then guess it's UTF-8
- if (bytes.length > 3 &&
- bytes[0] == (byte) 0xEF &&
- bytes[1] == (byte) 0xBB &&
- bytes[2] == (byte) 0xBF) {
- return UTF8;
- }
- // For now, merely tries to distinguish ISO-8859-1, UTF-8 and Shift_JIS,
- // which should be by far the most common encodings. ISO-8859-1
- // should not have bytes in the 0x80 - 0x9F range, while Shift_JIS
- // uses this as a first byte of a two-byte character. If we see this
- // followed by a valid second byte in Shift_JIS, assume it is Shift_JIS.
- // If we see something else in that second byte, we'll make the risky guess
- // that it's UTF-8.
- int length = bytes.length;
- boolean canBeISO88591 = true;
- boolean canBeShiftJIS = true;
- boolean canBeUTF8 = true;
- int utf8BytesLeft = 0;
- int maybeDoubleByteCount = 0;
- int maybeSingleByteKatakanaCount = 0;
- boolean sawLatin1Supplement = false;
- boolean sawUTF8Start = false;
- boolean lastWasPossibleDoubleByteStart = false;
-
- for (int i = 0;
- i < length && (canBeISO88591 || canBeShiftJIS || canBeUTF8);
- i++) {
-
- int value = bytes[i] & 0xFF;
-
- // UTF-8 stuff
- if (value >= 0x80 && value <= 0xBF) {
- if (utf8BytesLeft > 0) {
- utf8BytesLeft--;
- }
- } else {
- if (utf8BytesLeft > 0) {
- canBeUTF8 = false;
- }
- if (value >= 0xC0 && value <= 0xFD) {
- sawUTF8Start = true;
- int valueCopy = value;
- while ((valueCopy & 0x40) != 0) {
- utf8BytesLeft++;
- valueCopy <<= 1;
- }
- }
- }
-
- // ISO-8859-1 stuff
-
- if ((value == 0xC2 || value == 0xC3) && i < length - 1) {
- // This is really a poor hack. The slightly more exotic characters people might want to put in
- // a QR Code, by which I mean the Latin-1 supplement characters (e.g. u-umlaut) have encodings
- // that start with 0xC2 followed by [0xA0,0xBF], or start with 0xC3 followed by [0x80,0xBF].
- int nextValue = bytes[i + 1] & 0xFF;
- if (nextValue <= 0xBF &&
- ((value == 0xC2 && nextValue >= 0xA0) || (value == 0xC3 && nextValue >= 0x80))) {
- sawLatin1Supplement = true;
- }
- }
- if (value >= 0x7F && value <= 0x9F) {
- canBeISO88591 = false;
- }
-
- // Shift_JIS stuff
-
- if (value >= 0xA1 && value <= 0xDF) {
- // count the number of characters that might be a Shift_JIS single-byte Katakana character
- if (!lastWasPossibleDoubleByteStart) {
- maybeSingleByteKatakanaCount++;
- }
- }
- if (!lastWasPossibleDoubleByteStart &&
- ((value >= 0xF0 && value <= 0xFF) || value == 0x80 || value == 0xA0)) {
- canBeShiftJIS = false;
- }
- if (((value >= 0x81 && value <= 0x9F) || (value >= 0xE0 && value <= 0xEF))) {
- // These start double-byte characters in Shift_JIS. Let's see if it's followed by a valid
- // second byte.
- if (lastWasPossibleDoubleByteStart) {
- // If we just checked this and the last byte for being a valid double-byte
- // char, don't check starting on this byte. If this and the last byte
- // formed a valid pair, then this shouldn't be checked to see if it starts
- // a double byte pair of course.
- lastWasPossibleDoubleByteStart = false;
- } else {
- // ... otherwise do check to see if this plus the next byte form a valid
- // double byte pair encoding a character.
- lastWasPossibleDoubleByteStart = true;
- if (i >= bytes.length - 1) {
- canBeShiftJIS = false;
- } else {
- int nextValue = bytes[i + 1] & 0xFF;
- if (nextValue < 0x40 || nextValue > 0xFC) {
- canBeShiftJIS = false;
- } else {
- maybeDoubleByteCount++;
- }
- // There is some conflicting information out there about which bytes can follow which in
- // double-byte Shift_JIS characters. The rule above seems to be the one that matches practice.
- }
- }
- } else {
- lastWasPossibleDoubleByteStart = false;
- }
- }
- if (utf8BytesLeft > 0) {
- canBeUTF8 = false;
- }
-
- // Easy -- if assuming Shift_JIS and no evidence it can't be, done
- if (canBeShiftJIS && ASSUME_SHIFT_JIS) {
- return SHIFT_JIS;
- }
- if (canBeUTF8 && sawUTF8Start) {
- return UTF8;
- }
- // Distinguishing Shift_JIS and ISO-8859-1 can be a little tough. The crude heuristic is:
- // - If we saw
- // - at least 3 bytes that starts a double-byte value (bytes that are rare in ISO-8859-1), or
- // - over 5% of bytes could be single-byte Katakana (also rare in ISO-8859-1),
- // - and, saw no sequences that are invalid in Shift_JIS, then we conclude Shift_JIS
- if (canBeShiftJIS && (maybeDoubleByteCount >= 3 || 20 * maybeSingleByteKatakanaCount > length)) {
- return SHIFT_JIS;
- }
- // Otherwise, we default to ISO-8859-1 unless we know it can't be
- if (!sawLatin1Supplement && canBeISO88591) {
- return ISO88591;
- }
- // Otherwise, we take a wild guess with platform encoding
- return PLATFORM_DEFAULT_ENCODING;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
--- plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,446 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.datamatrix.decoder;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-
-/**
- * @author bbrown@google.com (Brian Brown)
- */
-final class BitMatrixParser {
-
- private final BitMatrix mappingBitMatrix;
- private final BitMatrix readMappingMatrix;
- private final Version version;
-
- /**
- * @param bitMatrix {@link BitMatrix} to parse
- * @throws FormatException if dimension is < 10 or > 144 or not 0 mod 2
- */
- BitMatrixParser(BitMatrix bitMatrix) throws FormatException {
- int dimension = bitMatrix.getHeight();
- if (dimension < 10 || dimension > 144 || (dimension & 0x01) != 0) {
- throw FormatException.getFormatInstance();
- }
-
- version = readVersion(bitMatrix);
- this.mappingBitMatrix = extractDataRegion(bitMatrix);
- // TODO(bbrown): Make this work for rectangular symbols
- this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getHeight());
- }
-
- /**
- *
Creates the version object based on the dimension of the original bit matrix from
- * the datamatrix code.
- *
- *
See ISO 16022:2006 Table 7 - ECC 200 symbol attributes
- *
- * @param bitMatrix Original {@link BitMatrix} including alignment patterns
- * @return {@link Version} encapsulating the Data Matrix Code's "version"
- * @throws FormatException if the dimensions of the mapping matrix are not valid
- * Data Matrix dimensions.
- */
- Version readVersion(BitMatrix bitMatrix) throws FormatException {
-
- if (version != null) {
- return version;
- }
-
- // TODO(bbrown): make this work for rectangular dimensions as well.
- int numRows = bitMatrix.getHeight();
- int numColumns = numRows;
-
- return Version.getVersionForDimensions(numRows, numColumns);
- }
-
- /**
- *
Reads the bits in the {@link BitMatrix} representing the mapping matrix (No alignment patterns)
- * in the correct order in order to reconstitute the codewords bytes contained within the
- * Data Matrix Code.
- *
- * @return bytes encoded within the Data Matrix Code
- * @throws FormatException if the exact number of bytes expected is not read
- */
- byte[] readCodewords() throws FormatException {
-
- byte[] result = new byte[version.getTotalCodewords()];
- int resultOffset = 0;
-
- int row = 4;
- int column = 0;
- // TODO(bbrown): Data Matrix can be rectangular, assuming square for now
- int numRows = mappingBitMatrix.getHeight();
- int numColumns = numRows;
-
- boolean corner1Read = false;
- boolean corner2Read = false;
- boolean corner3Read = false;
- boolean corner4Read = false;
-
- // Read all of the codewords
- do {
- // Check the four corner cases
- if ((row == numRows) && (column == 0) && !corner1Read) {
- result[resultOffset++] = (byte) readCorner1(numRows, numColumns);
- row -= 2;
- column +=2;
- corner1Read = true;
- } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x03) != 0) && !corner2Read) {
- result[resultOffset++] = (byte) readCorner2(numRows, numColumns);
- row -= 2;
- column +=2;
- corner2Read = true;
- } else if ((row == numRows+4) && (column == 2) && ((numColumns & 0x07) == 0) && !corner3Read) {
- result[resultOffset++] = (byte) readCorner3(numRows, numColumns);
- row -= 2;
- column +=2;
- corner3Read = true;
- } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x07) == 4) && !corner4Read) {
- result[resultOffset++] = (byte) readCorner4(numRows, numColumns);
- row -= 2;
- column +=2;
- corner4Read = true;
- } else {
- // Sweep upward diagonally to the right
- do {
- if ((row < numRows) && (column >= 0) && !readMappingMatrix.get(column, row)) {
- result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);
- }
- row -= 2;
- column +=2;
- } while ((row >= 0) && (column < numColumns));
- row += 1;
- column +=3;
-
- // Sweep downward diagonally to the left
- do {
- if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(column, row)) {
- result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);
- }
- row += 2;
- column -=2;
- } while ((row < numRows) && (column >= 0));
- row += 3;
- column +=1;
- }
- } while ((row < numRows) || (column < numColumns));
-
- if (resultOffset != version.getTotalCodewords()) {
- throw FormatException.getFormatInstance();
- }
- return result;
- }
-
- /**
- *
Reads a bit of the mapping matrix accounting for boundary wrapping.
- *
- * @param row Row to read in the mapping matrix
- * @param column Column to read in the mapping matrix
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return value of the given bit in the mapping matrix
- */
- boolean readModule(int row, int column, int numRows, int numColumns) {
- // Adjust the row and column indices based on boundary wrapping
- if (row < 0) {
- row += numRows;
- column += 4 - ((numRows + 4) & 0x07);
- }
- if (column < 0) {
- column += numColumns;
- row += 4 - ((numColumns + 4) & 0x07);
- }
- readMappingMatrix.set(column, row);
- return mappingBitMatrix.get(column, row);
- }
-
- /**
- *
Reads the 8 bits of the standard Utah-shaped pattern.
- *
- *
See ISO 16022:2006, 5.8.1 Figure 6
- *
- * @param row Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
- * @param column Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return byte from the utah shape
- */
- int readUtah(int row, int column, int numRows, int numColumns) {
- int currentByte = 0;
- if (readModule(row - 2, column - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 2, column - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row - 1, column, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(row, column, numRows, numColumns)) {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /**
- *
Reads the 8 bits of the special corner condition 1.
- *
- *
See ISO 16022:2006, Figure F.3
- *
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return byte from the Corner condition 1
- */
- int readCorner1(int numRows, int numColumns) {
- int currentByte = 0;
- if (readModule(numRows - 1, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(2, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(3, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /**
- *
Reads the 8 bits of the special corner condition 2.
- *
- *
See ISO 16022:2006, Figure F.4
- *
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return byte from the Corner condition 2
- */
- int readCorner2(int numRows, int numColumns) {
- int currentByte = 0;
- if (readModule(numRows - 3, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 2, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 4, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 3, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /**
- *
Reads the 8 bits of the special corner condition 3.
- *
- *
See ISO 16022:2006, Figure F.5
- *
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return byte from the Corner condition 3
- */
- int readCorner3(int numRows, int numColumns) {
- int currentByte = 0;
- if (readModule(numRows - 1, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 3, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 3, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /**
- *
Reads the 8 bits of the special corner condition 4.
- *
- *
See ISO 16022:2006, Figure F.6
- *
- * @param numRows Number of rows in the mapping matrix
- * @param numColumns Number of columns in the mapping matrix
- * @return byte from the Corner condition 4
- */
- int readCorner4(int numRows, int numColumns) {
- int currentByte = 0;
- if (readModule(numRows - 3, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 2, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(numRows - 1, 0, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 2, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(0, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(1, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(2, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- currentByte <<= 1;
- if (readModule(3, numColumns - 1, numRows, numColumns)) {
- currentByte |= 1;
- }
- return currentByte;
- }
-
- /**
- *
Extracts the data region from a {@link BitMatrix} that contains
- * alignment patterns.
- *
- * @param bitMatrix Original {@link BitMatrix} with alignment patterns
- * @return BitMatrix that has the alignment patterns removed
- */
- BitMatrix extractDataRegion(BitMatrix bitMatrix) {
- int symbolSizeRows = version.getSymbolSizeRows();
- int symbolSizeColumns = version.getSymbolSizeColumns();
-
- // TODO(bbrown): Make this work with rectangular codes
- if (bitMatrix.getHeight() != symbolSizeRows) {
- throw new IllegalArgumentException("Dimension of bitMarix must match the version size");
- }
-
- int dataRegionSizeRows = version.getDataRegionSizeRows();
- int dataRegionSizeColumns = version.getDataRegionSizeColumns();
-
- int numDataRegionsRow = symbolSizeRows / dataRegionSizeRows;
- int numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
-
- int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
- //int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
-
- // TODO(bbrown): Make this work with rectangular codes
- BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionRow);
- for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {
- int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;
- for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn) {
- int dataRegionColumnOffset = dataRegionColumn * dataRegionSizeColumns;
- for (int i = 0; i < dataRegionSizeRows; ++i) {
- int readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;
- int writeRowOffset = dataRegionRowOffset + i;
- for (int j = 0; j < dataRegionSizeColumns; ++j) {
- int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;
- if (bitMatrix.get(readColumnOffset, readRowOffset)) {
- int writeColumnOffset = dataRegionColumnOffset + j;
- bitMatrixWithoutAlignment.set(writeColumnOffset, writeRowOffset);
- }
- }
- }
- }
- }
- return bitMatrixWithoutAlignment;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/DataBlock.java plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/DataBlock.java
--- plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/DataBlock.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/DataBlock.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.datamatrix.decoder;
-
-/**
- *
Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into
- * multiple blocks, each of which is a unit of data and error-correction codewords. Each
- * is represented by an instance of this class.
When Data Matrix Codes use multiple data blocks, they actually interleave the bytes of each of them.
- * That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
- * method will separate the data into original blocks.
- *
- * @param rawCodewords bytes as read directly from the Data Matrix Code
- * @param version version of the Data Matrix Code
- * @return {@link DataBlock}s containing original bytes, "de-interleaved" from representation in the
- * Data Matrix Code
- */
- static DataBlock[] getDataBlocks(byte[] rawCodewords,
- Version version) {
- // Figure out the number and size of data blocks used by this version
- Version.ECBlocks ecBlocks = version.getECBlocks();
-
- // First count the total number of data blocks
- int totalBlocks = 0;
- Version.ECB[] ecBlockArray = ecBlocks.getECBlocks();
- for (int i = 0; i < ecBlockArray.length; i++) {
- totalBlocks += ecBlockArray[i].getCount();
- }
-
- // Now establish DataBlocks of the appropriate size and number of data codewords
- DataBlock[] result = new DataBlock[totalBlocks];
- int numResultBlocks = 0;
- for (int j = 0; j < ecBlockArray.length; j++) {
- Version.ECB ecBlock = ecBlockArray[j];
- for (int i = 0; i < ecBlock.getCount(); i++) {
- int numDataCodewords = ecBlock.getDataCodewords();
- int numBlockCodewords = ecBlocks.getECCodewords() + numDataCodewords;
- result[numResultBlocks++] = new DataBlock(numDataCodewords, new byte[numBlockCodewords]);
- }
- }
-
- // All blocks have the same amount of data, except that the last n
- // (where n may be 0) have 1 less byte. Figure out where these start.
- // TODO(bbrown): There is only one case where there is a difference for Data Matrix for size 144
- int longerBlocksTotalCodewords = result[0].codewords.length;
- //int shorterBlocksTotalCodewords = longerBlocksTotalCodewords - 1;
-
- int longerBlocksNumDataCodewords = longerBlocksTotalCodewords - ecBlocks.getECCodewords();
- int shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
- // The last elements of result may be 1 element shorter for 144 matrix
- // first fill out as many elements as all of them have minus 1
- int rawCodewordsOffset = 0;
- for (int i = 0; i < shorterBlocksNumDataCodewords; i++) {
- for (int j = 0; j < numResultBlocks; j++) {
- result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
- }
- }
-
- // Fill out the last data block in the longer ones
- boolean specialVersion = version.getVersionNumber() == 24;
- int numLongerBlocks = specialVersion ? 8 : numResultBlocks;
- for (int j = 0; j < numLongerBlocks; j++) {
- result[j].codewords[longerBlocksNumDataCodewords - 1] = rawCodewords[rawCodewordsOffset++];
- }
-
- // Now add in error correction blocks
- int max = result[0].codewords.length;
- for (int i = longerBlocksNumDataCodewords; i < max; i++) {
- for (int j = 0; j < numResultBlocks; j++) {
- int iOffset = (specialVersion && j > 7) ? i - 1 : i;
- result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
- }
- }
-
- if (rawCodewordsOffset != rawCodewords.length) {
- throw new IllegalArgumentException();
- }
-
- return result;
- }
-
- int getNumDataCodewords() {
- return numDataCodewords;
- }
-
- byte[] getCodewords() {
- return codewords;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/Version.java plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/Version.java
--- plantuml-1.2017.15/src/com/google/zxing/datamatrix/decoder/Version.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/datamatrix/decoder/Version.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.datamatrix.decoder;
-
-import com.google.zxing.FormatException;
-
-/**
- * The Version object encapsulates attributes about a particular
- * size Data Matrix Code.
- *
- * @author bbrown@google.com (Brian Brown)
- */
-public final class Version {
-
- private static final Version[] VERSIONS = buildVersions();
-
- private final int versionNumber;
- private final int symbolSizeRows;
- private final int symbolSizeColumns;
- private final int dataRegionSizeRows;
- private final int dataRegionSizeColumns;
- private final ECBlocks ecBlocks;
- private final int totalCodewords;
-
- private Version(int versionNumber,
- int symbolSizeRows,
- int symbolSizeColumns,
- int dataRegionSizeRows,
- int dataRegionSizeColumns,
- ECBlocks ecBlocks) {
- this.versionNumber = versionNumber;
- this.symbolSizeRows = symbolSizeRows;
- this.symbolSizeColumns = symbolSizeColumns;
- this.dataRegionSizeRows = dataRegionSizeRows;
- this.dataRegionSizeColumns = dataRegionSizeColumns;
- this.ecBlocks = ecBlocks;
-
- // Calculate the total number of codewords
- int total = 0;
- int ecCodewords = ecBlocks.getECCodewords();
- ECB[] ecbArray = ecBlocks.getECBlocks();
- for (int i = 0; i < ecbArray.length; i++) {
- ECB ecBlock = ecbArray[i];
- total += ecBlock.getCount() * (ecBlock.getDataCodewords() + ecCodewords);
- }
- this.totalCodewords = total;
- }
-
- public int getVersionNumber() {
- return versionNumber;
- }
-
- public int getSymbolSizeRows() {
- return symbolSizeRows;
- }
-
- public int getSymbolSizeColumns() {
- return symbolSizeColumns;
- }
-
- public int getDataRegionSizeRows() {
- return dataRegionSizeRows;
- }
-
- public int getDataRegionSizeColumns() {
- return dataRegionSizeColumns;
- }
-
- public int getTotalCodewords() {
- return totalCodewords;
- }
-
- ECBlocks getECBlocks() {
- return ecBlocks;
- }
-
- /**
- *
Deduces version information from Data Matrix dimensions.
- *
- * @param numRows Number of rows in modules
- * @param numColumns Number of columns in modules
- * @return {@link Version} for a Data Matrix Code of those dimensions
- * @throws FormatException if dimensions do correspond to a valid Data Matrix size
- */
- public static Version getVersionForDimensions(int numRows, int numColumns) throws FormatException {
- if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0) {
- throw FormatException.getFormatInstance();
- }
-
- // TODO(bbrown): This is doing a linear search through the array of versions.
- // If we interleave the rectangular versions with the square versions we could
- // do a binary search.
- int numVersions = VERSIONS.length;
- for (int i = 0; i < numVersions; ++i){
- Version version = VERSIONS[i];
- if (version.symbolSizeRows == numRows && version.symbolSizeColumns == numColumns) {
- return version;
- }
- }
-
- throw FormatException.getFormatInstance();
- }
-
- /**
- *
Encapsulates a set of error-correction blocks in one symbol version. Most versions will
- * use blocks of differing sizes within one version, so, this encapsulates the parameters for
- * each set of blocks. It also holds the number of error-correction codewords per block since it
- * will be the same across all blocks within one version.
Encapsualtes the parameters for one error-correction block in one symbol version.
- * This includes the number of data codewords, and the number of times a block with these
- * parameters is used consecutively in the Data Matrix code version's format.
- */
- static final class ECB {
- private final int count;
- private final int dataCodewords;
-
- private ECB(int count, int dataCodewords) {
- this.count = count;
- this.dataCodewords = dataCodewords;
- }
-
- int getCount() {
- return count;
- }
-
- int getDataCodewords() {
- return dataCodewords;
- }
- }
-
- public String toString() {
- return String.valueOf(versionNumber);
- }
-
- /**
- * See ISO 16022:2006 5.5.1 Table 7
- */
- private static Version[] buildVersions() {
- return new Version[]{
- new Version(1, 10, 10, 8, 8,
- new ECBlocks(5, new ECB(1, 3))),
- new Version(2, 12, 12, 10, 10,
- new ECBlocks(7, new ECB(1, 5))),
- new Version(3, 14, 14, 12, 12,
- new ECBlocks(10, new ECB(1, 8))),
- new Version(4, 16, 16, 14, 14,
- new ECBlocks(12, new ECB(1, 12))),
- new Version(5, 18, 18, 16, 16,
- new ECBlocks(14, new ECB(1, 18))),
- new Version(6, 20, 20, 18, 18,
- new ECBlocks(18, new ECB(1, 22))),
- new Version(7, 22, 22, 20, 20,
- new ECBlocks(20, new ECB(1, 30))),
- new Version(8, 24, 24, 22, 22,
- new ECBlocks(24, new ECB(1, 36))),
- new Version(9, 26, 26, 24, 24,
- new ECBlocks(28, new ECB(1, 44))),
- new Version(10, 32, 32, 14, 14,
- new ECBlocks(36, new ECB(1, 62))),
- new Version(11, 36, 36, 16, 16,
- new ECBlocks(42, new ECB(1, 86))),
- new Version(12, 40, 40, 18, 18,
- new ECBlocks(48, new ECB(1, 114))),
- new Version(13, 44, 44, 20, 20,
- new ECBlocks(56, new ECB(1, 144))),
- new Version(14, 48, 48, 22, 22,
- new ECBlocks(68, new ECB(1, 174))),
- new Version(15, 52, 52, 24, 24,
- new ECBlocks(42, new ECB(2, 102))),
- new Version(16, 64, 64, 14, 14,
- new ECBlocks(56, new ECB(2, 140))),
- new Version(17, 72, 72, 16, 16,
- new ECBlocks(36, new ECB(4, 92))),
- new Version(18, 80, 80, 18, 18,
- new ECBlocks(48, new ECB(4, 114))),
- new Version(19, 88, 88, 20, 20,
- new ECBlocks(56, new ECB(4, 144))),
- new Version(20, 96, 96, 22, 22,
- new ECBlocks(68, new ECB(4, 174))),
- new Version(21, 104, 104, 24, 24,
- new ECBlocks(56, new ECB(6, 136))),
- new Version(22, 120, 120, 18, 18,
- new ECBlocks(68, new ECB(6, 175))),
- new Version(23, 132, 132, 20, 20,
- new ECBlocks(62, new ECB(8, 163))),
- new Version(24, 144, 144, 22, 22,
- new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))),
- new Version(25, 8, 18, 6, 16,
- new ECBlocks(7, new ECB(1, 5))),
- new Version(26, 8, 32, 6, 14,
- new ECBlocks(11, new ECB(1, 10))),
- new Version(27, 12, 26, 10, 24,
- new ECBlocks(14, new ECB(1, 16))),
- new Version(28, 12, 36, 10, 16,
- new ECBlocks(18, new ECB(1, 22))),
- new Version(29, 16, 36, 10, 16,
- new ECBlocks(24, new ECB(1, 32))),
- new Version(30, 16, 48, 14, 22,
- new ECBlocks(28, new ECB(1, 49)))
- };
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/DecodeHintType.java plantuml-1.2018.9/src/com/google/zxing/DecodeHintType.java
--- plantuml-1.2017.15/src/com/google/zxing/DecodeHintType.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/DecodeHintType.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-import java.io.Reader;
-
-/**
- * Encapsulates a type of hint that a caller may pass to a barcode reader to help it
- * more quickly or accurately decode it. It is up to implementations to decide what,
- * if anything, to do with the information that is supplied.
- *
- * @author Sean Owen
- * @author dswitkin@google.com (Daniel Switkin)
- * @see Reader#decode(BinaryBitmap,java.util.Hashtable)
- */
-public final class DecodeHintType {
-
- // No, we can't use an enum here. J2ME doesn't support it.
-
- /**
- * Unspecified, application-specific hint. Maps to an unspecified {@link Object}.
- */
- public static final DecodeHintType OTHER = new DecodeHintType();
-
- /**
- * Image is a pure monochrome image of a barcode. Doesn't matter what it maps to;
- * use {@link Boolean#TRUE}.
- */
- public static final DecodeHintType PURE_BARCODE = new DecodeHintType();
-
- /**
- * Image is known to be of one of a few possible formats.
- * Maps to a {@link java.util.Vector} of {@link BarcodeFormat}s.
- */
- public static final DecodeHintType POSSIBLE_FORMATS = new DecodeHintType();
-
- /**
- * Spend more time to try to find a barcode; optimize for accuracy, not speed.
- * Doesn't matter what it maps to; use {@link Boolean#TRUE}.
- */
- public static final DecodeHintType TRY_HARDER = new DecodeHintType();
-
- /**
- * Specifies what character encoding to use when decoding, where applicable (type String)
- */
- public static final DecodeHintType CHARACTER_SET = new DecodeHintType();
-
- /**
- * Allowed lengths of encoded data -- reject anything else. Maps to an int[].
- */
- public static final DecodeHintType ALLOWED_LENGTHS = new DecodeHintType();
-
- /**
- * Assume Code 39 codes employ a check digit. Maps to {@link Boolean}.
- */
- public static final DecodeHintType ASSUME_CODE_39_CHECK_DIGIT = new DecodeHintType();
-
- /**
- * The caller needs to be notified via callback when a possible {@link ResultPoint}
- * is found. Maps to a {@link ResultPointCallback}.
- */
- public static final DecodeHintType NEED_RESULT_POINT_CALLBACK = new DecodeHintType();
-
- private DecodeHintType() {
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/EncodeHintType.java plantuml-1.2018.9/src/com/google/zxing/EncodeHintType.java
--- plantuml-1.2017.15/src/com/google/zxing/EncodeHintType.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/EncodeHintType.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- * These are a set of hints that you may pass to Writers to specify their behavior.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class EncodeHintType {
-
- /**
- * Specifies what degree of error correction to use, for example in QR Codes (type Integer).
- */
- public static final EncodeHintType ERROR_CORRECTION = new EncodeHintType();
-
- /**
- * Specifies what character encoding to use where applicable (type String)
- */
- public static final EncodeHintType CHARACTER_SET = new EncodeHintType();
-
- private EncodeHintType() {
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/FormatException.java plantuml-1.2018.9/src/com/google/zxing/FormatException.java
--- plantuml-1.2017.15/src/com/google/zxing/FormatException.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/FormatException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- * Thrown when a barcode was successfully detected, but some aspect of
- * the content did not conform to the barcode's format rules. This could have
- * been due to a mis-detection.
- *
- * @author Sean Owen
- */
-public final class FormatException extends ReaderException {
-
- private static final FormatException instance = new FormatException();
-
- private FormatException() {
- // do nothing
- }
-
- public static FormatException getFormatInstance() {
- return instance;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/NotFoundException.java plantuml-1.2018.9/src/com/google/zxing/NotFoundException.java
--- plantuml-1.2017.15/src/com/google/zxing/NotFoundException.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/NotFoundException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- * Thrown when a barcode was not found in the image. It might have been
- * partially detected but could not be confirmed.
- *
- * @author Sean Owen
- */
-public final class NotFoundException extends ReaderException {
-
- private static final NotFoundException instance = new NotFoundException();
-
- private NotFoundException() {
- // do nothing
- }
-
- public static NotFoundException getNotFoundInstance() {
- return instance;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/BitMatrixParser.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-
-/**
- * @author Sean Owen
- */
-final class BitMatrixParser {
-
- private final BitMatrix bitMatrix;
- private Version parsedVersion;
- private FormatInformation parsedFormatInfo;
-
- /**
- * @param bitMatrix {@link BitMatrix} to parse
- * @throws FormatException if dimension is not >= 21 and 1 mod 4
- */
- BitMatrixParser(BitMatrix bitMatrix) throws FormatException {
- int dimension = bitMatrix.getHeight();
- if (dimension < 21 || (dimension & 0x03) != 1) {
- throw FormatException.getFormatInstance();
- }
- this.bitMatrix = bitMatrix;
- }
-
- /**
- *
Reads format information from one of its two locations within the QR Code.
- *
- * @return {@link FormatInformation} encapsulating the QR Code's format info
- * @throws FormatException if both format information locations cannot be parsed as
- * the valid encoding of format information
- */
- FormatInformation readFormatInformation() throws FormatException {
-
- if (parsedFormatInfo != null) {
- return parsedFormatInfo;
- }
-
- // Read top-left format info bits
- int formatInfoBits1 = 0;
- for (int i = 0; i < 6; i++) {
- formatInfoBits1 = copyBit(i, 8, formatInfoBits1);
- }
- // .. and skip a bit in the timing pattern ...
- formatInfoBits1 = copyBit(7, 8, formatInfoBits1);
- formatInfoBits1 = copyBit(8, 8, formatInfoBits1);
- formatInfoBits1 = copyBit(8, 7, formatInfoBits1);
- // .. and skip a bit in the timing pattern ...
- for (int j = 5; j >= 0; j--) {
- formatInfoBits1 = copyBit(8, j, formatInfoBits1);
- }
-
- // Read the top-right/bottom-left pattern too
- int dimension = bitMatrix.getHeight();
- int formatInfoBits2 = 0;
- int iMin = dimension - 8;
- for (int i = dimension - 1; i >= iMin; i--) {
- formatInfoBits2 = copyBit(i, 8, formatInfoBits2);
- }
- for (int j = dimension - 7; j < dimension; j++) {
- formatInfoBits2 = copyBit(8, j, formatInfoBits2);
- }
-
- parsedFormatInfo = FormatInformation.decodeFormatInformation(formatInfoBits1, formatInfoBits2);
- if (parsedFormatInfo != null) {
- return parsedFormatInfo;
- }
- throw FormatException.getFormatInstance();
- }
-
- /**
- *
Reads version information from one of its two locations within the QR Code.
- *
- * @return {@link Version} encapsulating the QR Code's version
- * @throws FormatException if both version information locations cannot be parsed as
- * the valid encoding of version information
- */
- Version readVersion() throws FormatException {
-
- if (parsedVersion != null) {
- return parsedVersion;
- }
-
- int dimension = bitMatrix.getHeight();
-
- int provisionalVersion = (dimension - 17) >> 2;
- if (provisionalVersion <= 6) {
- return Version.getVersionForNumber(provisionalVersion);
- }
-
- // Read top-right version info: 3 wide by 6 tall
- int versionBits = 0;
- int ijMin = dimension - 11;
- for (int j = 5; j >= 0; j--) {
- for (int i = dimension - 9; i >= ijMin; i--) {
- versionBits = copyBit(i, j, versionBits);
- }
- }
-
- parsedVersion = Version.decodeVersionInformation(versionBits);
- if (parsedVersion != null && parsedVersion.getDimensionForVersion() == dimension) {
- return parsedVersion;
- }
-
- // Hmm, failed. Try bottom left: 6 wide by 3 tall
- versionBits = 0;
- for (int i = 5; i >= 0; i--) {
- for (int j = dimension - 9; j >= ijMin; j--) {
- versionBits = copyBit(i, j, versionBits);
- }
- }
-
- parsedVersion = Version.decodeVersionInformation(versionBits);
- if (parsedVersion != null && parsedVersion.getDimensionForVersion() == dimension) {
- return parsedVersion;
- }
- throw FormatException.getFormatInstance();
- }
-
- private int copyBit(int i, int j, int versionBits) {
- return bitMatrix.get(i, j) ? (versionBits << 1) | 0x1 : versionBits << 1;
- }
-
- /**
- *
Reads the bits in the {@link BitMatrix} representing the finder pattern in the
- * correct order in order to reconstitute the codewords bytes contained within the
- * QR Code.
- *
- * @return bytes encoded within the QR Code
- * @throws FormatException if the exact number of bytes expected is not read
- */
- byte[] readCodewords() throws FormatException {
-
- FormatInformation formatInfo = readFormatInformation();
- Version version = readVersion();
-
- // Get the data mask for the format used in this QR Code. This will exclude
- // some bits from reading as we wind through the bit matrix.
- DataMask dataMask = DataMask.forReference((int) formatInfo.getDataMask());
- int dimension = bitMatrix.getHeight();
- dataMask.unmaskBitMatrix(bitMatrix, dimension);
-
- BitMatrix functionPattern = version.buildFunctionPattern();
-
- boolean readingUp = true;
- byte[] result = new byte[version.getTotalCodewords()];
- int resultOffset = 0;
- int currentByte = 0;
- int bitsRead = 0;
- // Read columns in pairs, from right to left
- for (int j = dimension - 1; j > 0; j -= 2) {
- if (j == 6) {
- // Skip whole column with vertical alignment pattern;
- // saves time and makes the other code proceed more cleanly
- j--;
- }
- // Read alternatingly from bottom to top then top to bottom
- for (int count = 0; count < dimension; count++) {
- int i = readingUp ? dimension - 1 - count : count;
- for (int col = 0; col < 2; col++) {
- // Ignore bits covered by the function pattern
- if (!functionPattern.get(j - col, i)) {
- // Read a bit
- bitsRead++;
- currentByte <<= 1;
- if (bitMatrix.get(j - col, i)) {
- currentByte |= 1;
- }
- // If we've made a whole byte, save it off
- if (bitsRead == 8) {
- result[resultOffset++] = (byte) currentByte;
- bitsRead = 0;
- currentByte = 0;
- }
- }
- }
- }
- readingUp ^= true; // readingUp = !readingUp; // switch directions
- }
- if (resultOffset != version.getTotalCodewords()) {
- throw FormatException.getFormatInstance();
- }
- return result;
- }
-
-}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/DataBlock.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/DataBlock.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/DataBlock.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/DataBlock.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-/**
- *
Encapsulates a block of data within a QR Code. QR Codes may split their data into
- * multiple blocks, each of which is a unit of data and error-correction codewords. Each
- * is represented by an instance of this class.
- *
- * @author Sean Owen
- */
-final class DataBlock {
-
- private final int numDataCodewords;
- private final byte[] codewords;
-
- private DataBlock(int numDataCodewords, byte[] codewords) {
- this.numDataCodewords = numDataCodewords;
- this.codewords = codewords;
- }
-
- /**
- *
When QR Codes use multiple data blocks, they are actually interleaved.
- * That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
- * method will separate the data into original blocks.
- *
- * @param rawCodewords bytes as read directly from the QR Code
- * @param version version of the QR Code
- * @param ecLevel error-correction level of the QR Code
- * @return {@link DataBlock}s containing original bytes, "de-interleaved" from representation in the
- * QR Code
- */
- static DataBlock[] getDataBlocks(byte[] rawCodewords,
- Version version,
- ErrorCorrectionLevel ecLevel) {
-
- if (rawCodewords.length != version.getTotalCodewords()) {
- throw new IllegalArgumentException();
- }
-
- // Figure out the number and size of data blocks used by this version and
- // error correction level
- Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel);
-
- // First count the total number of data blocks
- int totalBlocks = 0;
- Version.ECB[] ecBlockArray = ecBlocks.getECBlocks();
- for (int i = 0; i < ecBlockArray.length; i++) {
- totalBlocks += ecBlockArray[i].getCount();
- }
-
- // Now establish DataBlocks of the appropriate size and number of data codewords
- DataBlock[] result = new DataBlock[totalBlocks];
- int numResultBlocks = 0;
- for (int j = 0; j < ecBlockArray.length; j++) {
- Version.ECB ecBlock = ecBlockArray[j];
- for (int i = 0; i < ecBlock.getCount(); i++) {
- int numDataCodewords = ecBlock.getDataCodewords();
- int numBlockCodewords = ecBlocks.getECCodewordsPerBlock() + numDataCodewords;
- result[numResultBlocks++] = new DataBlock(numDataCodewords, new byte[numBlockCodewords]);
- }
- }
-
- // All blocks have the same amount of data, except that the last n
- // (where n may be 0) have 1 more byte. Figure out where these start.
- int shorterBlocksTotalCodewords = result[0].codewords.length;
- int longerBlocksStartAt = result.length - 1;
- while (longerBlocksStartAt >= 0) {
- int numCodewords = result[longerBlocksStartAt].codewords.length;
- if (numCodewords == shorterBlocksTotalCodewords) {
- break;
- }
- longerBlocksStartAt--;
- }
- longerBlocksStartAt++;
-
- int shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.getECCodewordsPerBlock();
- // The last elements of result may be 1 element longer;
- // first fill out as many elements as all of them have
- int rawCodewordsOffset = 0;
- for (int i = 0; i < shorterBlocksNumDataCodewords; i++) {
- for (int j = 0; j < numResultBlocks; j++) {
- result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
- }
- }
- // Fill out the last data block in the longer ones
- for (int j = longerBlocksStartAt; j < numResultBlocks; j++) {
- result[j].codewords[shorterBlocksNumDataCodewords] = rawCodewords[rawCodewordsOffset++];
- }
- // Now add in error correction blocks
- int max = result[0].codewords.length;
- for (int i = shorterBlocksNumDataCodewords; i < max; i++) {
- for (int j = 0; j < numResultBlocks; j++) {
- int iOffset = j < longerBlocksStartAt ? i : i + 1;
- result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
- }
- }
- return result;
- }
-
- int getNumDataCodewords() {
- return numDataCodewords;
- }
-
- byte[] getCodewords() {
- return codewords;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/DataMask.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/DataMask.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/DataMask.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/DataMask.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-import com.google.zxing.common.BitMatrix;
-
-/**
- *
Encapsulates data masks for the data bits in a QR code, per ISO 18004:2006 6.8. Implementations
- * of this class can un-mask a raw BitMatrix. For simplicity, they will unmask the entire BitMatrix,
- * including areas used for finder patterns, timing patterns, etc. These areas should be unused
- * after the point they are unmasked anyway.
- *
- *
Note that the diagram in section 6.8.1 is misleading since it indicates that i is column position
- * and j is row position. In fact, as the text says, i is row position and j is column position.
- *
- * @author Sean Owen
- */
-abstract class DataMask {
-
- /**
- * See ISO 18004:2006 6.8.1
- */
- private static final DataMask[] DATA_MASKS = {
- new DataMask000(),
- new DataMask001(),
- new DataMask010(),
- new DataMask011(),
- new DataMask100(),
- new DataMask101(),
- new DataMask110(),
- new DataMask111(),
- };
-
- private DataMask() {
- }
-
- /**
- *
Implementations of this method reverse the data masking process applied to a QR Code and
- * make its bits ready to read.
- *
- * @param bits representation of QR Code bits
- * @param dimension dimension of QR Code, represented by bits, being unmasked
- */
- final void unmaskBitMatrix(BitMatrix bits, int dimension) {
- for (int i = 0; i < dimension; i++) {
- for (int j = 0; j < dimension; j++) {
- if (isMasked(i, j)) {
- bits.flip(j, i);
- }
- }
- }
- }
-
- abstract boolean isMasked(int i, int j);
-
- /**
- * @param reference a value between 0 and 7 indicating one of the eight possible
- * data mask patterns a QR Code may use
- * @return {@link DataMask} encapsulating the data mask pattern
- */
- static DataMask forReference(int reference) {
- if (reference < 0 || reference > 7) {
- throw new IllegalArgumentException();
- }
- return DATA_MASKS[reference];
- }
-
- /**
- * 000: mask bits for which (x + y) mod 2 == 0
- */
- private static class DataMask000 extends DataMask {
- boolean isMasked(int i, int j) {
- return ((i + j) & 0x01) == 0;
- }
- }
-
- /**
- * 001: mask bits for which x mod 2 == 0
- */
- private static class DataMask001 extends DataMask {
- boolean isMasked(int i, int j) {
- return (i & 0x01) == 0;
- }
- }
-
- /**
- * 010: mask bits for which y mod 3 == 0
- */
- private static class DataMask010 extends DataMask {
- boolean isMasked(int i, int j) {
- return j % 3 == 0;
- }
- }
-
- /**
- * 011: mask bits for which (x + y) mod 3 == 0
- */
- private static class DataMask011 extends DataMask {
- boolean isMasked(int i, int j) {
- return (i + j) % 3 == 0;
- }
- }
-
- /**
- * 100: mask bits for which (x/2 + y/3) mod 2 == 0
- */
- private static class DataMask100 extends DataMask {
- boolean isMasked(int i, int j) {
- return (((i >>> 1) + (j /3)) & 0x01) == 0;
- }
- }
-
- /**
- * 101: mask bits for which xy mod 2 + xy mod 3 == 0
- */
- private static class DataMask101 extends DataMask {
- boolean isMasked(int i, int j) {
- int temp = i * j;
- return (temp & 0x01) + (temp % 3) == 0;
- }
- }
-
- /**
- * 110: mask bits for which (xy mod 2 + xy mod 3) mod 2 == 0
- */
- private static class DataMask110 extends DataMask {
- boolean isMasked(int i, int j) {
- int temp = i * j;
- return (((temp & 0x01) + (temp % 3)) & 0x01) == 0;
- }
- }
-
- /**
- * 111: mask bits for which ((x+y)mod 2 + xy mod 3) mod 2 == 0
- */
- private static class DataMask111 extends DataMask {
- boolean isMasked(int i, int j) {
- return ((((i + j) & 0x01) + ((i * j) % 3)) & 0x01) == 0;
- }
- }
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-/**
- *
See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
- * defined by the QR code standard.
- *
- * @author Sean Owen
- */
-public final class ErrorCorrectionLevel {
-
- // No, we can't use an enum here. J2ME doesn't support it.
-
- /**
- * L = ~7% correction
- */
- public static final ErrorCorrectionLevel L = new ErrorCorrectionLevel(0, 0x01, "L");
- /**
- * M = ~15% correction
- */
- public static final ErrorCorrectionLevel M = new ErrorCorrectionLevel(1, 0x00, "M");
- /**
- * Q = ~25% correction
- */
- public static final ErrorCorrectionLevel Q = new ErrorCorrectionLevel(2, 0x03, "Q");
- /**
- * H = ~30% correction
- */
- public static final ErrorCorrectionLevel H = new ErrorCorrectionLevel(3, 0x02, "H");
-
- private static final ErrorCorrectionLevel[] FOR_BITS = {M, L, H, Q};
-
- private final int ordinal;
- private final int bits;
- private final String name;
-
- private ErrorCorrectionLevel(int ordinal, int bits, String name) {
- this.ordinal = ordinal;
- this.bits = bits;
- this.name = name;
- }
-
- public int ordinal() {
- return ordinal;
- }
-
- public int getBits() {
- return bits;
- }
-
- public String getName() {
- return name;
- }
-
- public String toString() {
- return name;
- }
-
- /**
- * @param bits int containing the two bits encoding a QR Code's error correction level
- * @return {@link ErrorCorrectionLevel} representing the encoded error correction level
- */
- public static ErrorCorrectionLevel forBits(int bits) {
- if (bits < 0 || bits >= FOR_BITS.length) {
- throw new IllegalArgumentException();
- }
- return FOR_BITS[bits];
- }
-
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/FormatInformation.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/FormatInformation.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/FormatInformation.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/FormatInformation.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-/**
- *
Encapsulates a QR Code's format information, including the data mask used and
- * error correction level.
- *
- * @author Sean Owen
- * @see DataMask
- * @see ErrorCorrectionLevel
- */
-final class FormatInformation {
-
- private static final int FORMAT_INFO_MASK_QR = 0x5412;
-
- /**
- * See ISO 18004:2006, Annex C, Table C.1
- */
- private static final int[][] FORMAT_INFO_DECODE_LOOKUP = {
- {0x5412, 0x00},
- {0x5125, 0x01},
- {0x5E7C, 0x02},
- {0x5B4B, 0x03},
- {0x45F9, 0x04},
- {0x40CE, 0x05},
- {0x4F97, 0x06},
- {0x4AA0, 0x07},
- {0x77C4, 0x08},
- {0x72F3, 0x09},
- {0x7DAA, 0x0A},
- {0x789D, 0x0B},
- {0x662F, 0x0C},
- {0x6318, 0x0D},
- {0x6C41, 0x0E},
- {0x6976, 0x0F},
- {0x1689, 0x10},
- {0x13BE, 0x11},
- {0x1CE7, 0x12},
- {0x19D0, 0x13},
- {0x0762, 0x14},
- {0x0255, 0x15},
- {0x0D0C, 0x16},
- {0x083B, 0x17},
- {0x355F, 0x18},
- {0x3068, 0x19},
- {0x3F31, 0x1A},
- {0x3A06, 0x1B},
- {0x24B4, 0x1C},
- {0x2183, 0x1D},
- {0x2EDA, 0x1E},
- {0x2BED, 0x1F},
- };
-
- /**
- * Offset i holds the number of 1 bits in the binary representation of i
- */
- private static final int[] BITS_SET_IN_HALF_BYTE =
- {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
-
- private final ErrorCorrectionLevel errorCorrectionLevel;
- private final byte dataMask;
-
- private FormatInformation(int formatInfo) {
- // Bits 3,4
- errorCorrectionLevel = ErrorCorrectionLevel.forBits((formatInfo >> 3) & 0x03);
- // Bottom 3 bits
- dataMask = (byte) (formatInfo & 0x07);
- }
-
- static int numBitsDiffering(int a, int b) {
- a ^= b; // a now has a 1 bit exactly where its bit differs with b's
- // Count bits set quickly with a series of lookups:
- return BITS_SET_IN_HALF_BYTE[a & 0x0F] +
- BITS_SET_IN_HALF_BYTE[(a >>> 4 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 8 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 12 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 16 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 20 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 24 & 0x0F)] +
- BITS_SET_IN_HALF_BYTE[(a >>> 28 & 0x0F)];
- }
-
- /**
- * @param maskedFormatInfo1 format info indicator, with mask still applied
- * @param maskedFormatInfo2 second copy of same info; both are checked at the same time
- * to establish best match
- * @return information about the format it specifies, or null
- * if doesn't seem to match any known pattern
- */
- static FormatInformation decodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2) {
- FormatInformation formatInfo = doDecodeFormatInformation(maskedFormatInfo1, maskedFormatInfo2);
- if (formatInfo != null) {
- return formatInfo;
- }
- // Should return null, but, some QR codes apparently
- // do not mask this info. Try again by actually masking the pattern
- // first
- return doDecodeFormatInformation(maskedFormatInfo1 ^ FORMAT_INFO_MASK_QR,
- maskedFormatInfo2 ^ FORMAT_INFO_MASK_QR);
- }
-
- private static FormatInformation doDecodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2) {
- // Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing
- int bestDifference = Integer.MAX_VALUE;
- int bestFormatInfo = 0;
- for (int i = 0; i < FORMAT_INFO_DECODE_LOOKUP.length; i++) {
- int[] decodeInfo = FORMAT_INFO_DECODE_LOOKUP[i];
- int targetInfo = decodeInfo[0];
- if (targetInfo == maskedFormatInfo1 || targetInfo == maskedFormatInfo2) {
- // Found an exact match
- return new FormatInformation(decodeInfo[1]);
- }
- int bitsDifference = numBitsDiffering(maskedFormatInfo1, targetInfo);
- if (bitsDifference < bestDifference) {
- bestFormatInfo = decodeInfo[1];
- bestDifference = bitsDifference;
- }
- if (maskedFormatInfo1 != maskedFormatInfo2) {
- // also try the other option
- bitsDifference = numBitsDiffering(maskedFormatInfo2, targetInfo);
- if (bitsDifference < bestDifference) {
- bestFormatInfo = decodeInfo[1];
- bestDifference = bitsDifference;
- }
- }
- }
- // Hamming distance of the 32 masked codes is 7, by construction, so <= 3 bits
- // differing means we found a match
- if (bestDifference <= 3) {
- return new FormatInformation(bestFormatInfo);
- }
- return null;
- }
-
- ErrorCorrectionLevel getErrorCorrectionLevel() {
- return errorCorrectionLevel;
- }
-
- byte getDataMask() {
- return dataMask;
- }
-
- public int hashCode() {
- return (errorCorrectionLevel.ordinal() << 3) | (int) dataMask;
- }
-
- public boolean equals(Object o) {
- if (!(o instanceof FormatInformation)) {
- return false;
- }
- FormatInformation other = (FormatInformation) o;
- return this.errorCorrectionLevel == other.errorCorrectionLevel &&
- this.dataMask == other.dataMask;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/Mode.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/Mode.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/Mode.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/Mode.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-/**
- *
See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which
- * data can be encoded to bits in the QR code standard.
- *
- * @author Sean Owen
- */
-public final class Mode {
-
- // No, we can't use an enum here. J2ME doesn't support it.
-
- public static final Mode TERMINATOR = new Mode(new int[]{0, 0, 0}, 0x00, "TERMINATOR"); // Not really a mode...
- public static final Mode NUMERIC = new Mode(new int[]{10, 12, 14}, 0x01, "NUMERIC");
- public static final Mode ALPHANUMERIC = new Mode(new int[]{9, 11, 13}, 0x02, "ALPHANUMERIC");
- public static final Mode STRUCTURED_APPEND = new Mode(new int[]{0, 0, 0}, 0x03, "STRUCTURED_APPEND"); // Not supported
- public static final Mode BYTE = new Mode(new int[]{8, 16, 16}, 0x04, "BYTE");
- public static final Mode ECI = new Mode(null, 0x07, "ECI"); // character counts don't apply
- public static final Mode KANJI = new Mode(new int[]{8, 10, 12}, 0x08, "KANJI");
- public static final Mode FNC1_FIRST_POSITION = new Mode(null, 0x05, "FNC1_FIRST_POSITION");
- public static final Mode FNC1_SECOND_POSITION = new Mode(null, 0x09, "FNC1_SECOND_POSITION");
-
- private final int[] characterCountBitsForVersions;
- private final int bits;
- private final String name;
-
- private Mode(int[] characterCountBitsForVersions, int bits, String name) {
- this.characterCountBitsForVersions = characterCountBitsForVersions;
- this.bits = bits;
- this.name = name;
- }
-
- /**
- * @param bits four bits encoding a QR Code data mode
- * @return {@link Mode} encoded by these bits
- * @throws IllegalArgumentException if bits do not correspond to a known mode
- */
- public static Mode forBits(int bits) {
- switch (bits) {
- case 0x0:
- return TERMINATOR;
- case 0x1:
- return NUMERIC;
- case 0x2:
- return ALPHANUMERIC;
- case 0x3:
- return STRUCTURED_APPEND;
- case 0x4:
- return BYTE;
- case 0x5:
- return FNC1_FIRST_POSITION;
- case 0x7:
- return ECI;
- case 0x8:
- return KANJI;
- case 0x9:
- return FNC1_SECOND_POSITION;
- default:
- throw new IllegalArgumentException();
- }
- }
-
- /**
- * @param version version in question
- * @return number of bits used, in this QR Code symbol {@link Version}, to encode the
- * count of characters that will follow encoded in this {@link Mode}
- */
- public int getCharacterCountBits(Version version) {
- if (characterCountBitsForVersions == null) {
- throw new IllegalArgumentException("Character count doesn't apply to this mode");
- }
- int number = version.getVersionNumber();
- int offset;
- if (number <= 9) {
- offset = 0;
- } else if (number <= 26) {
- offset = 1;
- } else {
- offset = 2;
- }
- return characterCountBitsForVersions[offset];
- }
-
- public int getBits() {
- return bits;
- }
-
- public String getName() {
- return name;
- }
-
- public String toString() {
- return name;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/Version.java plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/Version.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/decoder/Version.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/decoder/Version.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,586 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.decoder;
-
-import com.google.zxing.FormatException;
-import com.google.zxing.common.BitMatrix;
-
-/**
- * See ISO 18004:2006 Annex D
- *
- * @author Sean Owen
- */
-public final class Version {
-
- /**
- * See ISO 18004:2006 Annex D.
- * Element i represents the raw version bits that specify version i + 7
- */
- private static final int[] VERSION_DECODE_INFO = {
- 0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6,
- 0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78,
- 0x1145D, 0x12A17, 0x13532, 0x149A6, 0x15683,
- 0x168C9, 0x177EC, 0x18EC4, 0x191E1, 0x1AFAB,
- 0x1B08E, 0x1CC1A, 0x1D33F, 0x1ED75, 0x1F250,
- 0x209D5, 0x216F0, 0x228BA, 0x2379F, 0x24B0B,
- 0x2542E, 0x26A64, 0x27541, 0x28C69
- };
-
- private static final Version[] VERSIONS = buildVersions();
-
- private final int versionNumber;
- private final int[] alignmentPatternCenters;
- private final ECBlocks[] ecBlocks;
- private final int totalCodewords;
-
- private Version(int versionNumber,
- int[] alignmentPatternCenters,
- ECBlocks ecBlocks1,
- ECBlocks ecBlocks2,
- ECBlocks ecBlocks3,
- ECBlocks ecBlocks4) {
- this.versionNumber = versionNumber;
- this.alignmentPatternCenters = alignmentPatternCenters;
- this.ecBlocks = new ECBlocks[]{ecBlocks1, ecBlocks2, ecBlocks3, ecBlocks4};
- int total = 0;
- int ecCodewords = ecBlocks1.getECCodewordsPerBlock();
- ECB[] ecbArray = ecBlocks1.getECBlocks();
- for (int i = 0; i < ecbArray.length; i++) {
- ECB ecBlock = ecbArray[i];
- total += ecBlock.getCount() * (ecBlock.getDataCodewords() + ecCodewords);
- }
- this.totalCodewords = total;
- }
-
- public int getVersionNumber() {
- return versionNumber;
- }
-
- public int[] getAlignmentPatternCenters() {
- return alignmentPatternCenters;
- }
-
- public int getTotalCodewords() {
- return totalCodewords;
- }
-
- public int getDimensionForVersion() {
- return 17 + 4 * versionNumber;
- }
-
- public ECBlocks getECBlocksForLevel(ErrorCorrectionLevel ecLevel) {
- return ecBlocks[ecLevel.ordinal()];
- }
-
- /**
- *
Deduces version information purely from QR Code dimensions.
- *
- * @param dimension dimension in modules
- * @return {@link Version} for a QR Code of that dimension
- * @throws FormatException if dimension is not 1 mod 4
- */
- public static Version getProvisionalVersionForDimension(int dimension) throws FormatException {
- if (dimension % 4 != 1) {
- throw FormatException.getFormatInstance();
- }
- try {
- return getVersionForNumber((dimension - 17) >> 2);
- } catch (IllegalArgumentException iae) {
- throw FormatException.getFormatInstance();
- }
- }
-
- public static Version getVersionForNumber(int versionNumber) {
- if (versionNumber < 1 || versionNumber > 40) {
- throw new IllegalArgumentException();
- }
- return VERSIONS[versionNumber - 1];
- }
-
- static Version decodeVersionInformation(int versionBits) {
- int bestDifference = Integer.MAX_VALUE;
- int bestVersion = 0;
- for (int i = 0; i < VERSION_DECODE_INFO.length; i++) {
- int targetVersion = VERSION_DECODE_INFO[i];
- // Do the version info bits match exactly? done.
- if (targetVersion == versionBits) {
- return getVersionForNumber(i + 7);
- }
- // Otherwise see if this is the closest to a real version info bit string
- // we have seen so far
- int bitsDifference = FormatInformation.numBitsDiffering(versionBits, targetVersion);
- if (bitsDifference < bestDifference) {
- bestVersion = i + 7;
- bestDifference = bitsDifference;
- }
- }
- // We can tolerate up to 3 bits of error since no two version info codewords will
- // differ in less than 8 bits.
- if (bestDifference <= 3) {
- return getVersionForNumber(bestVersion);
- }
- // If we didn't find a close enough match, fail
- return null;
- }
-
- /**
- * See ISO 18004:2006 Annex E
- */
- BitMatrix buildFunctionPattern() {
- int dimension = getDimensionForVersion();
- BitMatrix bitMatrix = new BitMatrix(dimension);
-
- // Top left finder pattern + separator + format
- bitMatrix.setRegion(0, 0, 9, 9);
- // Top right finder pattern + separator + format
- bitMatrix.setRegion(dimension - 8, 0, 8, 9);
- // Bottom left finder pattern + separator + format
- bitMatrix.setRegion(0, dimension - 8, 9, 8);
-
- // Alignment patterns
- int max = alignmentPatternCenters.length;
- for (int x = 0; x < max; x++) {
- int i = alignmentPatternCenters[x] - 2;
- for (int y = 0; y < max; y++) {
- if ((x == 0 && (y == 0 || y == max - 1)) || (x == max - 1 && y == 0)) {
- // No alignment patterns near the three finder paterns
- continue;
- }
- bitMatrix.setRegion(alignmentPatternCenters[y] - 2, i, 5, 5);
- }
- }
-
- // Vertical timing pattern
- bitMatrix.setRegion(6, 9, 1, dimension - 17);
- // Horizontal timing pattern
- bitMatrix.setRegion(9, 6, dimension - 17, 1);
-
- if (versionNumber > 6) {
- // Version info, top right
- bitMatrix.setRegion(dimension - 11, 0, 3, 6);
- // Version info, bottom left
- bitMatrix.setRegion(0, dimension - 11, 6, 3);
- }
-
- return bitMatrix;
- }
-
- /**
- *
Encapsulates a set of error-correction blocks in one symbol version. Most versions will
- * use blocks of differing sizes within one version, so, this encapsulates the parameters for
- * each set of blocks. It also holds the number of error-correction codewords per block since it
- * will be the same across all blocks within one version.
- */
- public static final class ECBlocks {
- private final int ecCodewordsPerBlock;
- private final ECB[] ecBlocks;
-
- ECBlocks(int ecCodewordsPerBlock, ECB ecBlocks) {
- this.ecCodewordsPerBlock = ecCodewordsPerBlock;
- this.ecBlocks = new ECB[]{ecBlocks};
- }
-
- ECBlocks(int ecCodewordsPerBlock, ECB ecBlocks1, ECB ecBlocks2) {
- this.ecCodewordsPerBlock = ecCodewordsPerBlock;
- this.ecBlocks = new ECB[]{ecBlocks1, ecBlocks2};
- }
-
- public int getECCodewordsPerBlock() {
- return ecCodewordsPerBlock;
- }
-
- public int getNumBlocks() {
- int total = 0;
- for (int i = 0; i < ecBlocks.length; i++) {
- total += ecBlocks[i].getCount();
- }
- return total;
- }
-
- public int getTotalECCodewords() {
- return ecCodewordsPerBlock * getNumBlocks();
- }
-
- public ECB[] getECBlocks() {
- return ecBlocks;
- }
- }
-
- /**
- *
Encapsualtes the parameters for one error-correction block in one symbol version.
- * This includes the number of data codewords, and the number of times a block with these
- * parameters is used consecutively in the QR code version's format.
- */
- public static final class ECB {
- private final int count;
- private final int dataCodewords;
-
- ECB(int count, int dataCodewords) {
- this.count = count;
- this.dataCodewords = dataCodewords;
- }
-
- public int getCount() {
- return count;
- }
-
- public int getDataCodewords() {
- return dataCodewords;
- }
- }
-
- public String toString() {
- return String.valueOf(versionNumber);
- }
-
- /**
- * See ISO 18004:2006 6.5.1 Table 9
- */
- private static Version[] buildVersions() {
- return new Version[]{
- new Version(1, new int[]{},
- new ECBlocks(7, new ECB(1, 19)),
- new ECBlocks(10, new ECB(1, 16)),
- new ECBlocks(13, new ECB(1, 13)),
- new ECBlocks(17, new ECB(1, 9))),
- new Version(2, new int[]{6, 18},
- new ECBlocks(10, new ECB(1, 34)),
- new ECBlocks(16, new ECB(1, 28)),
- new ECBlocks(22, new ECB(1, 22)),
- new ECBlocks(28, new ECB(1, 16))),
- new Version(3, new int[]{6, 22},
- new ECBlocks(15, new ECB(1, 55)),
- new ECBlocks(26, new ECB(1, 44)),
- new ECBlocks(18, new ECB(2, 17)),
- new ECBlocks(22, new ECB(2, 13))),
- new Version(4, new int[]{6, 26},
- new ECBlocks(20, new ECB(1, 80)),
- new ECBlocks(18, new ECB(2, 32)),
- new ECBlocks(26, new ECB(2, 24)),
- new ECBlocks(16, new ECB(4, 9))),
- new Version(5, new int[]{6, 30},
- new ECBlocks(26, new ECB(1, 108)),
- new ECBlocks(24, new ECB(2, 43)),
- new ECBlocks(18, new ECB(2, 15),
- new ECB(2, 16)),
- new ECBlocks(22, new ECB(2, 11),
- new ECB(2, 12))),
- new Version(6, new int[]{6, 34},
- new ECBlocks(18, new ECB(2, 68)),
- new ECBlocks(16, new ECB(4, 27)),
- new ECBlocks(24, new ECB(4, 19)),
- new ECBlocks(28, new ECB(4, 15))),
- new Version(7, new int[]{6, 22, 38},
- new ECBlocks(20, new ECB(2, 78)),
- new ECBlocks(18, new ECB(4, 31)),
- new ECBlocks(18, new ECB(2, 14),
- new ECB(4, 15)),
- new ECBlocks(26, new ECB(4, 13),
- new ECB(1, 14))),
- new Version(8, new int[]{6, 24, 42},
- new ECBlocks(24, new ECB(2, 97)),
- new ECBlocks(22, new ECB(2, 38),
- new ECB(2, 39)),
- new ECBlocks(22, new ECB(4, 18),
- new ECB(2, 19)),
- new ECBlocks(26, new ECB(4, 14),
- new ECB(2, 15))),
- new Version(9, new int[]{6, 26, 46},
- new ECBlocks(30, new ECB(2, 116)),
- new ECBlocks(22, new ECB(3, 36),
- new ECB(2, 37)),
- new ECBlocks(20, new ECB(4, 16),
- new ECB(4, 17)),
- new ECBlocks(24, new ECB(4, 12),
- new ECB(4, 13))),
- new Version(10, new int[]{6, 28, 50},
- new ECBlocks(18, new ECB(2, 68),
- new ECB(2, 69)),
- new ECBlocks(26, new ECB(4, 43),
- new ECB(1, 44)),
- new ECBlocks(24, new ECB(6, 19),
- new ECB(2, 20)),
- new ECBlocks(28, new ECB(6, 15),
- new ECB(2, 16))),
- new Version(11, new int[]{6, 30, 54},
- new ECBlocks(20, new ECB(4, 81)),
- new ECBlocks(30, new ECB(1, 50),
- new ECB(4, 51)),
- new ECBlocks(28, new ECB(4, 22),
- new ECB(4, 23)),
- new ECBlocks(24, new ECB(3, 12),
- new ECB(8, 13))),
- new Version(12, new int[]{6, 32, 58},
- new ECBlocks(24, new ECB(2, 92),
- new ECB(2, 93)),
- new ECBlocks(22, new ECB(6, 36),
- new ECB(2, 37)),
- new ECBlocks(26, new ECB(4, 20),
- new ECB(6, 21)),
- new ECBlocks(28, new ECB(7, 14),
- new ECB(4, 15))),
- new Version(13, new int[]{6, 34, 62},
- new ECBlocks(26, new ECB(4, 107)),
- new ECBlocks(22, new ECB(8, 37),
- new ECB(1, 38)),
- new ECBlocks(24, new ECB(8, 20),
- new ECB(4, 21)),
- new ECBlocks(22, new ECB(12, 11),
- new ECB(4, 12))),
- new Version(14, new int[]{6, 26, 46, 66},
- new ECBlocks(30, new ECB(3, 115),
- new ECB(1, 116)),
- new ECBlocks(24, new ECB(4, 40),
- new ECB(5, 41)),
- new ECBlocks(20, new ECB(11, 16),
- new ECB(5, 17)),
- new ECBlocks(24, new ECB(11, 12),
- new ECB(5, 13))),
- new Version(15, new int[]{6, 26, 48, 70},
- new ECBlocks(22, new ECB(5, 87),
- new ECB(1, 88)),
- new ECBlocks(24, new ECB(5, 41),
- new ECB(5, 42)),
- new ECBlocks(30, new ECB(5, 24),
- new ECB(7, 25)),
- new ECBlocks(24, new ECB(11, 12),
- new ECB(7, 13))),
- new Version(16, new int[]{6, 26, 50, 74},
- new ECBlocks(24, new ECB(5, 98),
- new ECB(1, 99)),
- new ECBlocks(28, new ECB(7, 45),
- new ECB(3, 46)),
- new ECBlocks(24, new ECB(15, 19),
- new ECB(2, 20)),
- new ECBlocks(30, new ECB(3, 15),
- new ECB(13, 16))),
- new Version(17, new int[]{6, 30, 54, 78},
- new ECBlocks(28, new ECB(1, 107),
- new ECB(5, 108)),
- new ECBlocks(28, new ECB(10, 46),
- new ECB(1, 47)),
- new ECBlocks(28, new ECB(1, 22),
- new ECB(15, 23)),
- new ECBlocks(28, new ECB(2, 14),
- new ECB(17, 15))),
- new Version(18, new int[]{6, 30, 56, 82},
- new ECBlocks(30, new ECB(5, 120),
- new ECB(1, 121)),
- new ECBlocks(26, new ECB(9, 43),
- new ECB(4, 44)),
- new ECBlocks(28, new ECB(17, 22),
- new ECB(1, 23)),
- new ECBlocks(28, new ECB(2, 14),
- new ECB(19, 15))),
- new Version(19, new int[]{6, 30, 58, 86},
- new ECBlocks(28, new ECB(3, 113),
- new ECB(4, 114)),
- new ECBlocks(26, new ECB(3, 44),
- new ECB(11, 45)),
- new ECBlocks(26, new ECB(17, 21),
- new ECB(4, 22)),
- new ECBlocks(26, new ECB(9, 13),
- new ECB(16, 14))),
- new Version(20, new int[]{6, 34, 62, 90},
- new ECBlocks(28, new ECB(3, 107),
- new ECB(5, 108)),
- new ECBlocks(26, new ECB(3, 41),
- new ECB(13, 42)),
- new ECBlocks(30, new ECB(15, 24),
- new ECB(5, 25)),
- new ECBlocks(28, new ECB(15, 15),
- new ECB(10, 16))),
- new Version(21, new int[]{6, 28, 50, 72, 94},
- new ECBlocks(28, new ECB(4, 116),
- new ECB(4, 117)),
- new ECBlocks(26, new ECB(17, 42)),
- new ECBlocks(28, new ECB(17, 22),
- new ECB(6, 23)),
- new ECBlocks(30, new ECB(19, 16),
- new ECB(6, 17))),
- new Version(22, new int[]{6, 26, 50, 74, 98},
- new ECBlocks(28, new ECB(2, 111),
- new ECB(7, 112)),
- new ECBlocks(28, new ECB(17, 46)),
- new ECBlocks(30, new ECB(7, 24),
- new ECB(16, 25)),
- new ECBlocks(24, new ECB(34, 13))),
- new Version(23, new int[]{6, 30, 54, 78, 102},
- new ECBlocks(30, new ECB(4, 121),
- new ECB(5, 122)),
- new ECBlocks(28, new ECB(4, 47),
- new ECB(14, 48)),
- new ECBlocks(30, new ECB(11, 24),
- new ECB(14, 25)),
- new ECBlocks(30, new ECB(16, 15),
- new ECB(14, 16))),
- new Version(24, new int[]{6, 28, 54, 80, 106},
- new ECBlocks(30, new ECB(6, 117),
- new ECB(4, 118)),
- new ECBlocks(28, new ECB(6, 45),
- new ECB(14, 46)),
- new ECBlocks(30, new ECB(11, 24),
- new ECB(16, 25)),
- new ECBlocks(30, new ECB(30, 16),
- new ECB(2, 17))),
- new Version(25, new int[]{6, 32, 58, 84, 110},
- new ECBlocks(26, new ECB(8, 106),
- new ECB(4, 107)),
- new ECBlocks(28, new ECB(8, 47),
- new ECB(13, 48)),
- new ECBlocks(30, new ECB(7, 24),
- new ECB(22, 25)),
- new ECBlocks(30, new ECB(22, 15),
- new ECB(13, 16))),
- new Version(26, new int[]{6, 30, 58, 86, 114},
- new ECBlocks(28, new ECB(10, 114),
- new ECB(2, 115)),
- new ECBlocks(28, new ECB(19, 46),
- new ECB(4, 47)),
- new ECBlocks(28, new ECB(28, 22),
- new ECB(6, 23)),
- new ECBlocks(30, new ECB(33, 16),
- new ECB(4, 17))),
- new Version(27, new int[]{6, 34, 62, 90, 118},
- new ECBlocks(30, new ECB(8, 122),
- new ECB(4, 123)),
- new ECBlocks(28, new ECB(22, 45),
- new ECB(3, 46)),
- new ECBlocks(30, new ECB(8, 23),
- new ECB(26, 24)),
- new ECBlocks(30, new ECB(12, 15),
- new ECB(28, 16))),
- new Version(28, new int[]{6, 26, 50, 74, 98, 122},
- new ECBlocks(30, new ECB(3, 117),
- new ECB(10, 118)),
- new ECBlocks(28, new ECB(3, 45),
- new ECB(23, 46)),
- new ECBlocks(30, new ECB(4, 24),
- new ECB(31, 25)),
- new ECBlocks(30, new ECB(11, 15),
- new ECB(31, 16))),
- new Version(29, new int[]{6, 30, 54, 78, 102, 126},
- new ECBlocks(30, new ECB(7, 116),
- new ECB(7, 117)),
- new ECBlocks(28, new ECB(21, 45),
- new ECB(7, 46)),
- new ECBlocks(30, new ECB(1, 23),
- new ECB(37, 24)),
- new ECBlocks(30, new ECB(19, 15),
- new ECB(26, 16))),
- new Version(30, new int[]{6, 26, 52, 78, 104, 130},
- new ECBlocks(30, new ECB(5, 115),
- new ECB(10, 116)),
- new ECBlocks(28, new ECB(19, 47),
- new ECB(10, 48)),
- new ECBlocks(30, new ECB(15, 24),
- new ECB(25, 25)),
- new ECBlocks(30, new ECB(23, 15),
- new ECB(25, 16))),
- new Version(31, new int[]{6, 30, 56, 82, 108, 134},
- new ECBlocks(30, new ECB(13, 115),
- new ECB(3, 116)),
- new ECBlocks(28, new ECB(2, 46),
- new ECB(29, 47)),
- new ECBlocks(30, new ECB(42, 24),
- new ECB(1, 25)),
- new ECBlocks(30, new ECB(23, 15),
- new ECB(28, 16))),
- new Version(32, new int[]{6, 34, 60, 86, 112, 138},
- new ECBlocks(30, new ECB(17, 115)),
- new ECBlocks(28, new ECB(10, 46),
- new ECB(23, 47)),
- new ECBlocks(30, new ECB(10, 24),
- new ECB(35, 25)),
- new ECBlocks(30, new ECB(19, 15),
- new ECB(35, 16))),
- new Version(33, new int[]{6, 30, 58, 86, 114, 142},
- new ECBlocks(30, new ECB(17, 115),
- new ECB(1, 116)),
- new ECBlocks(28, new ECB(14, 46),
- new ECB(21, 47)),
- new ECBlocks(30, new ECB(29, 24),
- new ECB(19, 25)),
- new ECBlocks(30, new ECB(11, 15),
- new ECB(46, 16))),
- new Version(34, new int[]{6, 34, 62, 90, 118, 146},
- new ECBlocks(30, new ECB(13, 115),
- new ECB(6, 116)),
- new ECBlocks(28, new ECB(14, 46),
- new ECB(23, 47)),
- new ECBlocks(30, new ECB(44, 24),
- new ECB(7, 25)),
- new ECBlocks(30, new ECB(59, 16),
- new ECB(1, 17))),
- new Version(35, new int[]{6, 30, 54, 78, 102, 126, 150},
- new ECBlocks(30, new ECB(12, 121),
- new ECB(7, 122)),
- new ECBlocks(28, new ECB(12, 47),
- new ECB(26, 48)),
- new ECBlocks(30, new ECB(39, 24),
- new ECB(14, 25)),
- new ECBlocks(30, new ECB(22, 15),
- new ECB(41, 16))),
- new Version(36, new int[]{6, 24, 50, 76, 102, 128, 154},
- new ECBlocks(30, new ECB(6, 121),
- new ECB(14, 122)),
- new ECBlocks(28, new ECB(6, 47),
- new ECB(34, 48)),
- new ECBlocks(30, new ECB(46, 24),
- new ECB(10, 25)),
- new ECBlocks(30, new ECB(2, 15),
- new ECB(64, 16))),
- new Version(37, new int[]{6, 28, 54, 80, 106, 132, 158},
- new ECBlocks(30, new ECB(17, 122),
- new ECB(4, 123)),
- new ECBlocks(28, new ECB(29, 46),
- new ECB(14, 47)),
- new ECBlocks(30, new ECB(49, 24),
- new ECB(10, 25)),
- new ECBlocks(30, new ECB(24, 15),
- new ECB(46, 16))),
- new Version(38, new int[]{6, 32, 58, 84, 110, 136, 162},
- new ECBlocks(30, new ECB(4, 122),
- new ECB(18, 123)),
- new ECBlocks(28, new ECB(13, 46),
- new ECB(32, 47)),
- new ECBlocks(30, new ECB(48, 24),
- new ECB(14, 25)),
- new ECBlocks(30, new ECB(42, 15),
- new ECB(32, 16))),
- new Version(39, new int[]{6, 26, 54, 82, 110, 138, 166},
- new ECBlocks(30, new ECB(20, 117),
- new ECB(4, 118)),
- new ECBlocks(28, new ECB(40, 47),
- new ECB(7, 48)),
- new ECBlocks(30, new ECB(43, 24),
- new ECB(22, 25)),
- new ECBlocks(30, new ECB(10, 15),
- new ECB(67, 16))),
- new Version(40, new int[]{6, 30, 58, 86, 114, 142, 170},
- new ECBlocks(30, new ECB(19, 118),
- new ECB(6, 119)),
- new ECBlocks(28, new ECB(18, 47),
- new ECB(31, 48)),
- new ECBlocks(30, new ECB(34, 24),
- new ECB(34, 25)),
- new ECBlocks(30, new ECB(20, 15),
- new ECB(61, 16)))
- };
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/BlockPair.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/BlockPair.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/BlockPair.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/BlockPair.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-final class BlockPair {
-
- private final byte[] dataBytes;
- private final byte[] errorCorrectionBytes;
-
- BlockPair(byte[] data, byte[] errorCorrection) {
- dataBytes = data;
- errorCorrectionBytes = errorCorrection;
- }
-
- public byte[] getDataBytes() {
- return dataBytes;
- }
-
- public byte[] getErrorCorrectionBytes() {
- return errorCorrectionBytes;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/ByteMatrix.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/ByteMatrix.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/ByteMatrix.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/ByteMatrix.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-/**
- * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a
- * unsigned container, it's up to you to do byteValue & 0xff at each location.
- *
- * JAVAPORT: The original code was a 2D array of ints, but since it only ever gets assigned
- * -1, 0, and 1, I'm going to use less memory and go with bytes.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class ByteMatrix {
-
- private final byte[][] bytes;
- private final int width;
- private final int height;
-
- public ByteMatrix(int width, int height) {
- bytes = new byte[height][width];
- this.width = width;
- this.height = height;
- }
-
- public int getHeight() {
- return height;
- }
-
- public int getWidth() {
- return width;
- }
-
- public byte get(int x, int y) {
- return bytes[y][x];
- }
-
- public byte[][] getArray() {
- return bytes;
- }
-
- public void set(int x, int y, byte value) {
- bytes[y][x] = value;
- }
-
- public void set(int x, int y, int value) {
- bytes[y][x] = (byte) value;
- }
-
- public void set(int x, int y, boolean value) {
- bytes[y][x] = (byte) (value ? 1 : 0);
- }
-
- public void clear(byte value) {
- for (int y = 0; y < height; ++y) {
- for (int x = 0; x < width; ++x) {
- bytes[y][x] = value;
- }
- }
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(2 * width * height + 2);
- for (int y = 0; y < height; ++y) {
- for (int x = 0; x < width; ++x) {
- switch (bytes[y][x]) {
- case 0:
- result.append(" 0");
- break;
- case 1:
- result.append(" 1");
- break;
- default:
- result.append(" ");
- break;
- }
- }
- result.append('\n');
- }
- return result.toString();
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/Encoder.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/Encoder.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/Encoder.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/Encoder.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,557 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.CharacterSetECI;
-import com.google.zxing.common.ECI;
-import com.google.zxing.common.reedsolomon.GF256;
-import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
-import com.google.zxing.qrcode.decoder.Version;
-
-/**
- * @author satorux@google.com (Satoru Takabayashi) - creator
- * @author dswitkin@google.com (Daniel Switkin) - ported from C++
- */
-public final class Encoder {
-
- // The original table is defined in the table 5 of JISX0510:2004 (p.19).
- private static final int[] ALPHANUMERIC_TABLE = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00-0x0f
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x10-0x1f
- 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, // 0x20-0x2f
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, // 0x30-0x3f
- -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 0x40-0x4f
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, // 0x50-0x5f
- };
-
- static final String DEFAULT_BYTE_MODE_ENCODING = "ISO-8859-1";
-
- private Encoder() {
- }
-
- // The mask penalty calculation is complicated. See Table 21 of JISX0510:2004 (p.45) for details.
- // Basically it applies four rules and summate all penalties.
- private static int calculateMaskPenalty(ByteMatrix matrix) {
- int penalty = 0;
- penalty += MaskUtil.applyMaskPenaltyRule1(matrix);
- penalty += MaskUtil.applyMaskPenaltyRule2(matrix);
- penalty += MaskUtil.applyMaskPenaltyRule3(matrix);
- penalty += MaskUtil.applyMaskPenaltyRule4(matrix);
- return penalty;
- }
-
- /**
- * Encode "bytes" with the error correction level "ecLevel". The encoding mode will be chosen
- * internally by chooseMode(). On success, store the result in "qrCode".
- *
- * We recommend you to use QRCode.EC_LEVEL_L (the lowest level) for
- * "getECLevel" since our primary use is to show QR code on desktop screens. We don't need very
- * strong error correction for this purpose.
- *
- * Note that there is no way to encode bytes in MODE_KANJI. We might want to add EncodeWithMode()
- * with which clients can specify the encoding mode. For now, we don't need the functionality.
- */
- public static void encode(String content, ErrorCorrectionLevel ecLevel, QRCode qrCode)
- throws WriterException {
- encode(content, ecLevel, null, qrCode);
- }
-
- public static void encode(String content, ErrorCorrectionLevel ecLevel, Hashtable hints,
- QRCode qrCode) throws WriterException {
-
- String encoding = hints == null ? null : (String) hints.get(EncodeHintType.CHARACTER_SET);
- if (encoding == null) {
- encoding = DEFAULT_BYTE_MODE_ENCODING;
- }
-
- // Step 1: Choose the mode (encoding).
- Mode mode = chooseMode(content, encoding);
-
- // Step 2: Append "bytes" into "dataBits" in appropriate encoding.
- BitArray dataBits = new BitArray();
- appendBytes(content, mode, dataBits, encoding);
- // Step 3: Initialize QR code that can contain "dataBits".
- int numInputBytes = dataBits.getSizeInBytes();
- initQRCode(numInputBytes, ecLevel, mode, qrCode);
-
- // Step 4: Build another bit vector that contains header and data.
- BitArray headerAndDataBits = new BitArray();
-
- // Step 4.5: Append ECI message if applicable
- if (mode == Mode.BYTE && !DEFAULT_BYTE_MODE_ENCODING.equals(encoding)) {
- CharacterSetECI eci = CharacterSetECI.getCharacterSetECIByName(encoding);
- if (eci != null) {
- appendECI(eci, headerAndDataBits);
- }
- }
-
- appendModeInfo(mode, headerAndDataBits);
-
- int numLetters = mode.equals(Mode.BYTE) ? dataBits.getSizeInBytes() : content.length();
- appendLengthInfo(numLetters, qrCode.getVersion(), mode, headerAndDataBits);
- headerAndDataBits.appendBitArray(dataBits);
-
- // Step 5: Terminate the bits properly.
- terminateBits(qrCode.getNumDataBytes(), headerAndDataBits);
-
- // Step 6: Interleave data bits with error correction code.
- BitArray finalBits = new BitArray();
- interleaveWithECBytes(headerAndDataBits, qrCode.getNumTotalBytes(), qrCode.getNumDataBytes(),
- qrCode.getNumRSBlocks(), finalBits);
-
- // Step 7: Choose the mask pattern and set to "qrCode".
- ByteMatrix matrix = new ByteMatrix(qrCode.getMatrixWidth(), qrCode.getMatrixWidth());
- qrCode.setMaskPattern(chooseMaskPattern(finalBits, qrCode.getECLevel(), qrCode.getVersion(),
- matrix));
-
- // Step 8. Build the matrix and set it to "qrCode".
- MatrixUtil.buildMatrix(finalBits, qrCode.getECLevel(), qrCode.getVersion(),
- qrCode.getMaskPattern(), matrix);
- qrCode.setMatrix(matrix);
- // Step 9. Make sure we have a valid QR Code.
- if (!qrCode.isValid()) {
- throw new WriterException("Invalid QR code: " + qrCode.toString());
- }
- }
-
- /**
- * @return the code point of the table used in alphanumeric mode or
- * -1 if there is no corresponding code in the table.
- */
- static int getAlphanumericCode(int code) {
- if (code < ALPHANUMERIC_TABLE.length) {
- return ALPHANUMERIC_TABLE[code];
- }
- return -1;
- }
-
- public static Mode chooseMode(String content) {
- return chooseMode(content, null);
- }
-
- /**
- * Choose the best mode by examining the content. Note that 'encoding' is used as a hint;
- * if it is Shift_JIS, and the input is only double-byte Kanji, then we return {@link Mode#KANJI}.
- */
- public static Mode chooseMode(String content, String encoding) {
- if ("Shift_JIS".equals(encoding)) {
- // Choose Kanji mode if all input are double-byte characters
- return isOnlyDoubleByteKanji(content) ? Mode.KANJI : Mode.BYTE;
- }
- boolean hasNumeric = false;
- boolean hasAlphanumeric = false;
- for (int i = 0; i < content.length(); ++i) {
- char c = content.charAt(i);
- if (c >= '0' && c <= '9') {
- hasNumeric = true;
- } else if (getAlphanumericCode(c) != -1) {
- hasAlphanumeric = true;
- } else {
- return Mode.BYTE;
- }
- }
- if (hasAlphanumeric) {
- return Mode.ALPHANUMERIC;
- } else if (hasNumeric) {
- return Mode.NUMERIC;
- }
- return Mode.BYTE;
- }
-
- private static boolean isOnlyDoubleByteKanji(String content) {
- byte[] bytes;
- try {
- bytes = content.getBytes("Shift_JIS");
- } catch (UnsupportedEncodingException uee) {
- return false;
- }
- int length = bytes.length;
- if (length % 2 != 0) {
- return false;
- }
- for (int i = 0; i < length; i += 2) {
- int byte1 = bytes[i] & 0xFF;
- if ((byte1 < 0x81 || byte1 > 0x9F) && (byte1 < 0xE0 || byte1 > 0xEB)) {
- return false;
- }
- }
- return true;
- }
-
- private static int chooseMaskPattern(BitArray bits, ErrorCorrectionLevel ecLevel, int version,
- ByteMatrix matrix) throws WriterException {
-
- int minPenalty = Integer.MAX_VALUE; // Lower penalty is better.
- int bestMaskPattern = -1;
- // We try all mask patterns to choose the best one.
- for (int maskPattern = 0; maskPattern < QRCode.NUM_MASK_PATTERNS; maskPattern++) {
- MatrixUtil.buildMatrix(bits, ecLevel, version, maskPattern, matrix);
- int penalty = calculateMaskPenalty(matrix);
- if (penalty < minPenalty) {
- minPenalty = penalty;
- bestMaskPattern = maskPattern;
- }
- }
- return bestMaskPattern;
- }
-
- /**
- * Initialize "qrCode" according to "numInputBytes", "ecLevel", and "mode". On success,
- * modify "qrCode".
- */
- private static void initQRCode(int numInputBytes, ErrorCorrectionLevel ecLevel, Mode mode,
- QRCode qrCode) throws WriterException {
- qrCode.setECLevel(ecLevel);
- qrCode.setMode(mode);
-
- // In the following comments, we use numbers of Version 7-H.
- for (int versionNum = 1; versionNum <= 40; versionNum++) {
- Version version = Version.getVersionForNumber(versionNum);
- // numBytes = 196
- int numBytes = version.getTotalCodewords();
- // getNumECBytes = 130
- Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel);
- int numEcBytes = ecBlocks.getTotalECCodewords();
- // getNumRSBlocks = 5
- int numRSBlocks = ecBlocks.getNumBlocks();
- // getNumDataBytes = 196 - 130 = 66
- int numDataBytes = numBytes - numEcBytes;
- // We want to choose the smallest version which can contain data of "numInputBytes" + some
- // extra bits for the header (mode info and length info). The header can be three bytes
- // (precisely 4 + 16 bits) at most. Hence we do +3 here.
- if (numDataBytes >= numInputBytes + 3) {
- // Yay, we found the proper rs block info!
- qrCode.setVersion(versionNum);
- qrCode.setNumTotalBytes(numBytes);
- qrCode.setNumDataBytes(numDataBytes);
- qrCode.setNumRSBlocks(numRSBlocks);
- // getNumECBytes = 196 - 66 = 130
- qrCode.setNumECBytes(numEcBytes);
- // matrix width = 21 + 6 * 4 = 45
- qrCode.setMatrixWidth(version.getDimensionForVersion());
- return;
- }
- }
- throw new WriterException("Cannot find proper rs block info (input data too big?)");
- }
-
- /**
- * Terminate bits as described in 8.4.8 and 8.4.9 of JISX0510:2004 (p.24).
- */
- static void terminateBits(int numDataBytes, BitArray bits) throws WriterException {
- int capacity = numDataBytes << 3;
- if (bits.getSize() > capacity) {
- throw new WriterException("data bits cannot fit in the QR Code" + bits.getSize() + " > " +
- capacity);
- }
- for (int i = 0; i < 4 && bits.getSize() < capacity; ++i) {
- bits.appendBit(false);
- }
- // Append termination bits. See 8.4.8 of JISX0510:2004 (p.24) for details.
- // If the last byte isn't 8-bit aligned, we'll add padding bits.
- int numBitsInLastByte = bits.getSize() & 0x07;
- if (numBitsInLastByte > 0) {
- for (int i = numBitsInLastByte; i < 8; i++) {
- bits.appendBit(false);
- }
- }
- // If we have more space, we'll fill the space with padding patterns defined in 8.4.9 (p.24).
- int numPaddingBytes = numDataBytes - bits.getSizeInBytes();
- for (int i = 0; i < numPaddingBytes; ++i) {
- bits.appendBits(((i & 0x01) == 0) ? 0xEC : 0x11, 8);
- }
- if (bits.getSize() != capacity) {
- throw new WriterException("Bits size does not equal capacity");
- }
- }
-
- /**
- * Get number of data bytes and number of error correction bytes for block id "blockID". Store
- * the result in "numDataBytesInBlock", and "numECBytesInBlock". See table 12 in 8.5.1 of
- * JISX0510:2004 (p.30)
- */
- static void getNumDataBytesAndNumECBytesForBlockID(int numTotalBytes, int numDataBytes,
- int numRSBlocks, int blockID, int[] numDataBytesInBlock,
- int[] numECBytesInBlock) throws WriterException {
- if (blockID >= numRSBlocks) {
- throw new WriterException("Block ID too large");
- }
- // numRsBlocksInGroup2 = 196 % 5 = 1
- int numRsBlocksInGroup2 = numTotalBytes % numRSBlocks;
- // numRsBlocksInGroup1 = 5 - 1 = 4
- int numRsBlocksInGroup1 = numRSBlocks - numRsBlocksInGroup2;
- // numTotalBytesInGroup1 = 196 / 5 = 39
- int numTotalBytesInGroup1 = numTotalBytes / numRSBlocks;
- // numTotalBytesInGroup2 = 39 + 1 = 40
- int numTotalBytesInGroup2 = numTotalBytesInGroup1 + 1;
- // numDataBytesInGroup1 = 66 / 5 = 13
- int numDataBytesInGroup1 = numDataBytes / numRSBlocks;
- // numDataBytesInGroup2 = 13 + 1 = 14
- int numDataBytesInGroup2 = numDataBytesInGroup1 + 1;
- // numEcBytesInGroup1 = 39 - 13 = 26
- int numEcBytesInGroup1 = numTotalBytesInGroup1 - numDataBytesInGroup1;
- // numEcBytesInGroup2 = 40 - 14 = 26
- int numEcBytesInGroup2 = numTotalBytesInGroup2 - numDataBytesInGroup2;
- // Sanity checks.
- // 26 = 26
- if (numEcBytesInGroup1 != numEcBytesInGroup2) {
- throw new WriterException("EC bytes mismatch");
- }
- // 5 = 4 + 1.
- if (numRSBlocks != numRsBlocksInGroup1 + numRsBlocksInGroup2) {
- throw new WriterException("RS blocks mismatch");
- }
- // 196 = (13 + 26) * 4 + (14 + 26) * 1
- if (numTotalBytes !=
- ((numDataBytesInGroup1 + numEcBytesInGroup1) *
- numRsBlocksInGroup1) +
- ((numDataBytesInGroup2 + numEcBytesInGroup2) *
- numRsBlocksInGroup2)) {
- throw new WriterException("Total bytes mismatch");
- }
-
- if (blockID < numRsBlocksInGroup1) {
- numDataBytesInBlock[0] = numDataBytesInGroup1;
- numECBytesInBlock[0] = numEcBytesInGroup1;
- } else {
- numDataBytesInBlock[0] = numDataBytesInGroup2;
- numECBytesInBlock[0] = numEcBytesInGroup2;
- }
- }
-
- /**
- * Interleave "bits" with corresponding error correction bytes. On success, store the result in
- * "result". The interleave rule is complicated. See 8.6 of JISX0510:2004 (p.37) for details.
- */
- static void interleaveWithECBytes(BitArray bits, int numTotalBytes,
- int numDataBytes, int numRSBlocks, BitArray result) throws WriterException {
-
- // "bits" must have "getNumDataBytes" bytes of data.
- if (bits.getSizeInBytes() != numDataBytes) {
- throw new WriterException("Number of bits and data bytes does not match");
- }
-
- // Step 1. Divide data bytes into blocks and generate error correction bytes for them. We'll
- // store the divided data bytes blocks and error correction bytes blocks into "blocks".
- int dataBytesOffset = 0;
- int maxNumDataBytes = 0;
- int maxNumEcBytes = 0;
-
- // Since, we know the number of reedsolmon blocks, we can initialize the vector with the number.
- Vector blocks = new Vector(numRSBlocks);
-
- for (int i = 0; i < numRSBlocks; ++i) {
- int[] numDataBytesInBlock = new int[1];
- int[] numEcBytesInBlock = new int[1];
- getNumDataBytesAndNumECBytesForBlockID(
- numTotalBytes, numDataBytes, numRSBlocks, i,
- numDataBytesInBlock, numEcBytesInBlock);
-
- int size = numDataBytesInBlock[0];
- byte[] dataBytes = new byte[size];
- bits.toBytes(8*dataBytesOffset, dataBytes, 0, size);
- byte[] ecBytes = generateECBytes(dataBytes, numEcBytesInBlock[0]);
- blocks.addElement(new BlockPair(dataBytes, ecBytes));
-
- maxNumDataBytes = Math.max(maxNumDataBytes, size);
- maxNumEcBytes = Math.max(maxNumEcBytes, ecBytes.length);
- dataBytesOffset += numDataBytesInBlock[0];
- }
- if (numDataBytes != dataBytesOffset) {
- throw new WriterException("Data bytes does not match offset");
- }
-
- // First, place data blocks.
- for (int i = 0; i < maxNumDataBytes; ++i) {
- for (int j = 0; j < blocks.size(); ++j) {
- byte[] dataBytes = ((BlockPair) blocks.elementAt(j)).getDataBytes();
- if (i < dataBytes.length) {
- result.appendBits(dataBytes[i], 8);
- }
- }
- }
- // Then, place error correction blocks.
- for (int i = 0; i < maxNumEcBytes; ++i) {
- for (int j = 0; j < blocks.size(); ++j) {
- byte[] ecBytes = ((BlockPair) blocks.elementAt(j)).getErrorCorrectionBytes();
- if (i < ecBytes.length) {
- result.appendBits(ecBytes[i], 8);
- }
- }
- }
- if (numTotalBytes != result.getSizeInBytes()) { // Should be same.
- throw new WriterException("Interleaving error: " + numTotalBytes + " and " +
- result.getSizeInBytes() + " differ.");
- }
- }
-
- static byte[] generateECBytes(byte[] dataBytes, int numEcBytesInBlock) {
- int numDataBytes = dataBytes.length;
- int[] toEncode = new int[numDataBytes + numEcBytesInBlock];
- for (int i = 0; i < numDataBytes; i++) {
- toEncode[i] = dataBytes[i] & 0xFF;
- }
- new ReedSolomonEncoder(GF256.QR_CODE_FIELD).encode(toEncode, numEcBytesInBlock);
-
- byte[] ecBytes = new byte[numEcBytesInBlock];
- for (int i = 0; i < numEcBytesInBlock; i++) {
- ecBytes[i] = (byte) toEncode[numDataBytes + i];
- }
- return ecBytes;
- }
-
- /**
- * Append mode info. On success, store the result in "bits".
- */
- static void appendModeInfo(Mode mode, BitArray bits) {
- bits.appendBits(mode.getBits(), 4);
- }
-
-
- /**
- * Append length info. On success, store the result in "bits".
- */
- static void appendLengthInfo(int numLetters, int version, Mode mode, BitArray bits)
- throws WriterException {
- int numBits = mode.getCharacterCountBits(Version.getVersionForNumber(version));
- if (numLetters > ((1 << numBits) - 1)) {
- throw new WriterException(numLetters + "is bigger than" + ((1 << numBits) - 1));
- }
- bits.appendBits(numLetters, numBits);
- }
-
- /**
- * Append "bytes" in "mode" mode (encoding) into "bits". On success, store the result in "bits".
- */
- static void appendBytes(String content, Mode mode, BitArray bits, String encoding)
- throws WriterException {
- if (mode.equals(Mode.NUMERIC)) {
- appendNumericBytes(content, bits);
- } else if (mode.equals(Mode.ALPHANUMERIC)) {
- appendAlphanumericBytes(content, bits);
- } else if (mode.equals(Mode.BYTE)) {
- append8BitBytes(content, bits, encoding);
- } else if (mode.equals(Mode.KANJI)) {
- appendKanjiBytes(content, bits);
- } else {
- throw new WriterException("Invalid mode: " + mode);
- }
- }
-
- static void appendNumericBytes(String content, BitArray bits) {
- int length = content.length();
- int i = 0;
- while (i < length) {
- int num1 = content.charAt(i) - '0';
- if (i + 2 < length) {
- // Encode three numeric letters in ten bits.
- int num2 = content.charAt(i + 1) - '0';
- int num3 = content.charAt(i + 2) - '0';
- bits.appendBits(num1 * 100 + num2 * 10 + num3, 10);
- i += 3;
- } else if (i + 1 < length) {
- // Encode two numeric letters in seven bits.
- int num2 = content.charAt(i + 1) - '0';
- bits.appendBits(num1 * 10 + num2, 7);
- i += 2;
- } else {
- // Encode one numeric letter in four bits.
- bits.appendBits(num1, 4);
- i++;
- }
- }
- }
-
- static void appendAlphanumericBytes(String content, BitArray bits) throws WriterException {
- int length = content.length();
- int i = 0;
- while (i < length) {
- int code1 = getAlphanumericCode(content.charAt(i));
- if (code1 == -1) {
- throw new WriterException();
- }
- if (i + 1 < length) {
- int code2 = getAlphanumericCode(content.charAt(i + 1));
- if (code2 == -1) {
- throw new WriterException();
- }
- // Encode two alphanumeric letters in 11 bits.
- bits.appendBits(code1 * 45 + code2, 11);
- i += 2;
- } else {
- // Encode one alphanumeric letter in six bits.
- bits.appendBits(code1, 6);
- i++;
- }
- }
- }
-
- static void append8BitBytes(String content, BitArray bits, String encoding)
- throws WriterException {
- byte[] bytes;
- try {
- bytes = content.getBytes(encoding);
- } catch (UnsupportedEncodingException uee) {
- throw new WriterException(uee.toString());
- }
- for (int i = 0; i < bytes.length; ++i) {
- bits.appendBits(bytes[i], 8);
- }
- }
-
- static void appendKanjiBytes(String content, BitArray bits) throws WriterException {
- byte[] bytes;
- try {
- bytes = content.getBytes("Shift_JIS");
- } catch (UnsupportedEncodingException uee) {
- throw new WriterException(uee.toString());
- }
- int length = bytes.length;
- for (int i = 0; i < length; i += 2) {
- int byte1 = bytes[i] & 0xFF;
- int byte2 = bytes[i + 1] & 0xFF;
- int code = (byte1 << 8) | byte2;
- int subtracted = -1;
- if (code >= 0x8140 && code <= 0x9ffc) {
- subtracted = code - 0x8140;
- } else if (code >= 0xe040 && code <= 0xebbf) {
- subtracted = code - 0xc140;
- }
- if (subtracted == -1) {
- throw new WriterException("Invalid byte sequence");
- }
- int encoded = ((subtracted >> 8) * 0xc0) + (subtracted & 0xff);
- bits.appendBits(encoded, 13);
- }
- }
-
- private static void appendECI(ECI eci, BitArray bits) {
- bits.appendBits(Mode.ECI.getBits(), 4);
- // This is correct for values up to 127, which is all we need now.
- bits.appendBits(eci.getValue(), 8);
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/MaskUtil.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/MaskUtil.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/MaskUtil.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/MaskUtil.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-/**
- * @author satorux@google.com (Satoru Takabayashi) - creator
- * @author dswitkin@google.com (Daniel Switkin) - ported from C++
- */
-public final class MaskUtil {
-
- private MaskUtil() {
- // do nothing
- }
-
- // Apply mask penalty rule 1 and return the penalty. Find repetitive cells with the same color and
- // give penalty to them. Example: 00000 or 11111.
- public static int applyMaskPenaltyRule1(ByteMatrix matrix) {
- return applyMaskPenaltyRule1Internal(matrix, true) + applyMaskPenaltyRule1Internal(matrix, false);
- }
-
- // Apply mask penalty rule 2 and return the penalty. Find 2x2 blocks with the same color and give
- // penalty to them.
- public static int applyMaskPenaltyRule2(ByteMatrix matrix) {
- int penalty = 0;
- byte[][] array = matrix.getArray();
- int width = matrix.getWidth();
- int height = matrix.getHeight();
- for (int y = 0; y < height - 1; ++y) {
- for (int x = 0; x < width - 1; ++x) {
- int value = array[y][x];
- if (value == array[y][x + 1] && value == array[y + 1][x] && value == array[y + 1][x + 1]) {
- penalty += 3;
- }
- }
- }
- return penalty;
- }
-
- // Apply mask penalty rule 3 and return the penalty. Find consecutive cells of 00001011101 or
- // 10111010000, and give penalty to them. If we find patterns like 000010111010000, we give
- // penalties twice (i.e. 40 * 2).
- public static int applyMaskPenaltyRule3(ByteMatrix matrix) {
- int penalty = 0;
- byte[][] array = matrix.getArray();
- int width = matrix.getWidth();
- int height = matrix.getHeight();
- for (int y = 0; y < height; ++y) {
- for (int x = 0; x < width; ++x) {
- // Tried to simplify following conditions but failed.
- if (x + 6 < width &&
- array[y][x] == 1 &&
- array[y][x + 1] == 0 &&
- array[y][x + 2] == 1 &&
- array[y][x + 3] == 1 &&
- array[y][x + 4] == 1 &&
- array[y][x + 5] == 0 &&
- array[y][x + 6] == 1 &&
- ((x + 10 < width &&
- array[y][x + 7] == 0 &&
- array[y][x + 8] == 0 &&
- array[y][x + 9] == 0 &&
- array[y][x + 10] == 0) ||
- (x - 4 >= 0 &&
- array[y][x - 1] == 0 &&
- array[y][x - 2] == 0 &&
- array[y][x - 3] == 0 &&
- array[y][x - 4] == 0))) {
- penalty += 40;
- }
- if (y + 6 < height &&
- array[y][x] == 1 &&
- array[y + 1][x] == 0 &&
- array[y + 2][x] == 1 &&
- array[y + 3][x] == 1 &&
- array[y + 4][x] == 1 &&
- array[y + 5][x] == 0 &&
- array[y + 6][x] == 1 &&
- ((y + 10 < height &&
- array[y + 7][x] == 0 &&
- array[y + 8][x] == 0 &&
- array[y + 9][x] == 0 &&
- array[y + 10][x] == 0) ||
- (y - 4 >= 0 &&
- array[y - 1][x] == 0 &&
- array[y - 2][x] == 0 &&
- array[y - 3][x] == 0 &&
- array[y - 4][x] == 0))) {
- penalty += 40;
- }
- }
- }
- return penalty;
- }
-
- // Apply mask penalty rule 4 and return the penalty. Calculate the ratio of dark cells and give
- // penalty if the ratio is far from 50%. It gives 10 penalty for 5% distance. Examples:
- // - 0% => 100
- // - 40% => 20
- // - 45% => 10
- // - 50% => 0
- // - 55% => 10
- // - 55% => 20
- // - 100% => 100
- public static int applyMaskPenaltyRule4(ByteMatrix matrix) {
- int numDarkCells = 0;
- byte[][] array = matrix.getArray();
- int width = matrix.getWidth();
- int height = matrix.getHeight();
- for (int y = 0; y < height; ++y) {
- for (int x = 0; x < width; ++x) {
- if (array[y][x] == 1) {
- numDarkCells += 1;
- }
- }
- }
- int numTotalCells = matrix.getHeight() * matrix.getWidth();
- double darkRatio = (double) numDarkCells / numTotalCells;
- return Math.abs((int) (darkRatio * 100 - 50)) / 5 * 10;
- }
-
- // Return the mask bit for "getMaskPattern" at "x" and "y". See 8.8 of JISX0510:2004 for mask
- // pattern conditions.
- public static boolean getDataMaskBit(int maskPattern, int x, int y) {
- if (!QRCode.isValidMaskPattern(maskPattern)) {
- throw new IllegalArgumentException("Invalid mask pattern");
- }
- int intermediate, temp;
- switch (maskPattern) {
- case 0:
- intermediate = (y + x) & 0x1;
- break;
- case 1:
- intermediate = y & 0x1;
- break;
- case 2:
- intermediate = x % 3;
- break;
- case 3:
- intermediate = (y + x) % 3;
- break;
- case 4:
- intermediate = ((y >>> 1) + (x / 3)) & 0x1;
- break;
- case 5:
- temp = y * x;
- intermediate = (temp & 0x1) + (temp % 3);
- break;
- case 6:
- temp = y * x;
- intermediate = (((temp & 0x1) + (temp % 3)) & 0x1);
- break;
- case 7:
- temp = y * x;
- intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1);
- break;
- default:
- throw new IllegalArgumentException("Invalid mask pattern: " + maskPattern);
- }
- return intermediate == 0;
- }
-
- // Helper function for applyMaskPenaltyRule1. We need this for doing this calculation in both
- // vertical and horizontal orders respectively.
- private static int applyMaskPenaltyRule1Internal(ByteMatrix matrix, boolean isHorizontal) {
- int penalty = 0;
- int numSameBitCells = 0;
- int prevBit = -1;
- // Horizontal mode:
- // for (int i = 0; i < matrix.height(); ++i) {
- // for (int j = 0; j < matrix.width(); ++j) {
- // int bit = matrix.get(i, j);
- // Vertical mode:
- // for (int i = 0; i < matrix.width(); ++i) {
- // for (int j = 0; j < matrix.height(); ++j) {
- // int bit = matrix.get(j, i);
- int iLimit = isHorizontal ? matrix.getHeight() : matrix.getWidth();
- int jLimit = isHorizontal ? matrix.getWidth() : matrix.getHeight();
- byte[][] array = matrix.getArray();
- for (int i = 0; i < iLimit; ++i) {
- for (int j = 0; j < jLimit; ++j) {
- int bit = isHorizontal ? array[i][j] : array[j][i];
- if (bit == prevBit) {
- numSameBitCells += 1;
- // Found five repetitive cells with the same color (bit).
- // We'll give penalty of 3.
- if (numSameBitCells == 5) {
- penalty += 3;
- } else if (numSameBitCells > 5) {
- // After five repetitive cells, we'll add the penalty one
- // by one.
- penalty += 1;
- }
- } else {
- numSameBitCells = 1; // Include the cell itself.
- prevBit = bit;
- }
- }
- numSameBitCells = 0; // Clear at each row/column.
- }
- return penalty;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/MatrixUtil.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/MatrixUtil.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/MatrixUtil.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,524 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-/**
- * @author satorux@google.com (Satoru Takabayashi) - creator
- * @author dswitkin@google.com (Daniel Switkin) - ported from C++
- */
-public final class MatrixUtil {
-
- private MatrixUtil() {
- // do nothing
- }
-
- private static final int[][] POSITION_DETECTION_PATTERN = {
- {1, 1, 1, 1, 1, 1, 1},
- {1, 0, 0, 0, 0, 0, 1},
- {1, 0, 1, 1, 1, 0, 1},
- {1, 0, 1, 1, 1, 0, 1},
- {1, 0, 1, 1, 1, 0, 1},
- {1, 0, 0, 0, 0, 0, 1},
- {1, 1, 1, 1, 1, 1, 1},
- };
-
- private static final int[][] HORIZONTAL_SEPARATION_PATTERN = {
- {0, 0, 0, 0, 0, 0, 0, 0},
- };
-
- private static final int[][] VERTICAL_SEPARATION_PATTERN = {
- {0}, {0}, {0}, {0}, {0}, {0}, {0},
- };
-
- private static final int[][] POSITION_ADJUSTMENT_PATTERN = {
- {1, 1, 1, 1, 1},
- {1, 0, 0, 0, 1},
- {1, 0, 1, 0, 1},
- {1, 0, 0, 0, 1},
- {1, 1, 1, 1, 1},
- };
-
- // From Appendix E. Table 1, JIS0510X:2004 (p 71). The table was double-checked by komatsu.
- private static final int[][] POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE = {
- {-1, -1, -1, -1, -1, -1, -1}, // Version 1
- { 6, 18, -1, -1, -1, -1, -1}, // Version 2
- { 6, 22, -1, -1, -1, -1, -1}, // Version 3
- { 6, 26, -1, -1, -1, -1, -1}, // Version 4
- { 6, 30, -1, -1, -1, -1, -1}, // Version 5
- { 6, 34, -1, -1, -1, -1, -1}, // Version 6
- { 6, 22, 38, -1, -1, -1, -1}, // Version 7
- { 6, 24, 42, -1, -1, -1, -1}, // Version 8
- { 6, 26, 46, -1, -1, -1, -1}, // Version 9
- { 6, 28, 50, -1, -1, -1, -1}, // Version 10
- { 6, 30, 54, -1, -1, -1, -1}, // Version 11
- { 6, 32, 58, -1, -1, -1, -1}, // Version 12
- { 6, 34, 62, -1, -1, -1, -1}, // Version 13
- { 6, 26, 46, 66, -1, -1, -1}, // Version 14
- { 6, 26, 48, 70, -1, -1, -1}, // Version 15
- { 6, 26, 50, 74, -1, -1, -1}, // Version 16
- { 6, 30, 54, 78, -1, -1, -1}, // Version 17
- { 6, 30, 56, 82, -1, -1, -1}, // Version 18
- { 6, 30, 58, 86, -1, -1, -1}, // Version 19
- { 6, 34, 62, 90, -1, -1, -1}, // Version 20
- { 6, 28, 50, 72, 94, -1, -1}, // Version 21
- { 6, 26, 50, 74, 98, -1, -1}, // Version 22
- { 6, 30, 54, 78, 102, -1, -1}, // Version 23
- { 6, 28, 54, 80, 106, -1, -1}, // Version 24
- { 6, 32, 58, 84, 110, -1, -1}, // Version 25
- { 6, 30, 58, 86, 114, -1, -1}, // Version 26
- { 6, 34, 62, 90, 118, -1, -1}, // Version 27
- { 6, 26, 50, 74, 98, 122, -1}, // Version 28
- { 6, 30, 54, 78, 102, 126, -1}, // Version 29
- { 6, 26, 52, 78, 104, 130, -1}, // Version 30
- { 6, 30, 56, 82, 108, 134, -1}, // Version 31
- { 6, 34, 60, 86, 112, 138, -1}, // Version 32
- { 6, 30, 58, 86, 114, 142, -1}, // Version 33
- { 6, 34, 62, 90, 118, 146, -1}, // Version 34
- { 6, 30, 54, 78, 102, 126, 150}, // Version 35
- { 6, 24, 50, 76, 102, 128, 154}, // Version 36
- { 6, 28, 54, 80, 106, 132, 158}, // Version 37
- { 6, 32, 58, 84, 110, 136, 162}, // Version 38
- { 6, 26, 54, 82, 110, 138, 166}, // Version 39
- { 6, 30, 58, 86, 114, 142, 170}, // Version 40
- };
-
- // Type info cells at the left top corner.
- private static final int[][] TYPE_INFO_COORDINATES = {
- {8, 0},
- {8, 1},
- {8, 2},
- {8, 3},
- {8, 4},
- {8, 5},
- {8, 7},
- {8, 8},
- {7, 8},
- {5, 8},
- {4, 8},
- {3, 8},
- {2, 8},
- {1, 8},
- {0, 8},
- };
-
- // From Appendix D in JISX0510:2004 (p. 67)
- private static final int VERSION_INFO_POLY = 0x1f25; // 1 1111 0010 0101
-
- // From Appendix C in JISX0510:2004 (p.65).
- private static final int TYPE_INFO_POLY = 0x537;
- private static final int TYPE_INFO_MASK_PATTERN = 0x5412;
-
- // Set all cells to -1. -1 means that the cell is empty (not set yet).
- //
- // JAVAPORT: We shouldn't need to do this at all. The code should be rewritten to begin encoding
- // with the ByteMatrix initialized all to zero.
- public static void clearMatrix(ByteMatrix matrix) {
- matrix.clear((byte) -1);
- }
-
- // Build 2D matrix of QR Code from "dataBits" with "ecLevel", "version" and "getMaskPattern". On
- // success, store the result in "matrix" and return true.
- public static void buildMatrix(BitArray dataBits, ErrorCorrectionLevel ecLevel, int version,
- int maskPattern, ByteMatrix matrix) throws WriterException {
- clearMatrix(matrix);
- embedBasicPatterns(version, matrix);
- // Type information appear with any version.
- embedTypeInfo(ecLevel, maskPattern, matrix);
- // Version info appear if version >= 7.
- maybeEmbedVersionInfo(version, matrix);
- // Data should be embedded at end.
- embedDataBits(dataBits, maskPattern, matrix);
- }
-
- // Embed basic patterns. On success, modify the matrix and return true.
- // The basic patterns are:
- // - Position detection patterns
- // - Timing patterns
- // - Dark dot at the left bottom corner
- // - Position adjustment patterns, if need be
- public static void embedBasicPatterns(int version, ByteMatrix matrix) throws WriterException {
- // Let's get started with embedding big squares at corners.
- embedPositionDetectionPatternsAndSeparators(matrix);
- // Then, embed the dark dot at the left bottom corner.
- embedDarkDotAtLeftBottomCorner(matrix);
-
- // Position adjustment patterns appear if version >= 2.
- maybeEmbedPositionAdjustmentPatterns(version, matrix);
- // Timing patterns should be embedded after position adj. patterns.
- embedTimingPatterns(matrix);
- }
-
- // Embed type information. On success, modify the matrix.
- public static void embedTypeInfo(ErrorCorrectionLevel ecLevel, int maskPattern, ByteMatrix matrix)
- throws WriterException {
- BitArray typeInfoBits = new BitArray();
- makeTypeInfoBits(ecLevel, maskPattern, typeInfoBits);
-
- for (int i = 0; i < typeInfoBits.getSize(); ++i) {
- // Place bits in LSB to MSB order. LSB (least significant bit) is the last value in
- // "typeInfoBits".
- boolean bit = typeInfoBits.get(typeInfoBits.getSize() - 1 - i);
-
- // Type info bits at the left top corner. See 8.9 of JISX0510:2004 (p.46).
- int x1 = TYPE_INFO_COORDINATES[i][0];
- int y1 = TYPE_INFO_COORDINATES[i][1];
- matrix.set(x1, y1, bit);
-
- if (i < 8) {
- // Right top corner.
- int x2 = matrix.getWidth() - i - 1;
- int y2 = 8;
- matrix.set(x2, y2, bit);
- } else {
- // Left bottom corner.
- int x2 = 8;
- int y2 = matrix.getHeight() - 7 + (i - 8);
- matrix.set(x2, y2, bit);
- }
- }
- }
-
- // Embed version information if need be. On success, modify the matrix and return true.
- // See 8.10 of JISX0510:2004 (p.47) for how to embed version information.
- public static void maybeEmbedVersionInfo(int version, ByteMatrix matrix) throws WriterException {
- if (version < 7) { // Version info is necessary if version >= 7.
- return; // Don't need version info.
- }
- BitArray versionInfoBits = new BitArray();
- makeVersionInfoBits(version, versionInfoBits);
-
- int bitIndex = 6 * 3 - 1; // It will decrease from 17 to 0.
- for (int i = 0; i < 6; ++i) {
- for (int j = 0; j < 3; ++j) {
- // Place bits in LSB (least significant bit) to MSB order.
- boolean bit = versionInfoBits.get(bitIndex);
- bitIndex--;
- // Left bottom corner.
- matrix.set(i, matrix.getHeight() - 11 + j, bit);
- // Right bottom corner.
- matrix.set(matrix.getHeight() - 11 + j, i, bit);
- }
- }
- }
-
- // Embed "dataBits" using "getMaskPattern". On success, modify the matrix and return true.
- // For debugging purposes, it skips masking process if "getMaskPattern" is -1.
- // See 8.7 of JISX0510:2004 (p.38) for how to embed data bits.
- public static void embedDataBits(BitArray dataBits, int maskPattern, ByteMatrix matrix)
- throws WriterException {
- int bitIndex = 0;
- int direction = -1;
- // Start from the right bottom cell.
- int x = matrix.getWidth() - 1;
- int y = matrix.getHeight() - 1;
- while (x > 0) {
- // Skip the vertical timing pattern.
- if (x == 6) {
- x -= 1;
- }
- while (y >= 0 && y < matrix.getHeight()) {
- for (int i = 0; i < 2; ++i) {
- int xx = x - i;
- // Skip the cell if it's not empty.
- if (!isEmpty(matrix.get(xx, y))) {
- continue;
- }
- boolean bit;
- if (bitIndex < dataBits.getSize()) {
- bit = dataBits.get(bitIndex);
- ++bitIndex;
- } else {
- // Padding bit. If there is no bit left, we'll fill the left cells with 0, as described
- // in 8.4.9 of JISX0510:2004 (p. 24).
- bit = false;
- }
-
- // Skip masking if mask_pattern is -1.
- if (maskPattern != -1) {
- if (MaskUtil.getDataMaskBit(maskPattern, xx, y)) {
- bit = !bit;
- }
- }
- matrix.set(xx, y, bit);
- }
- y += direction;
- }
- direction = -direction; // Reverse the direction.
- y += direction;
- x -= 2; // Move to the left.
- }
- // All bits should be consumed.
- if (bitIndex != dataBits.getSize()) {
- throw new WriterException("Not all bits consumed: " + bitIndex + '/' + dataBits.getSize());
- }
- }
-
- // Return the position of the most significant bit set (to one) in the "value". The most
- // significant bit is position 32. If there is no bit set, return 0. Examples:
- // - findMSBSet(0) => 0
- // - findMSBSet(1) => 1
- // - findMSBSet(255) => 8
- public static int findMSBSet(int value) {
- int numDigits = 0;
- while (value != 0) {
- value >>>= 1;
- ++numDigits;
- }
- return numDigits;
- }
-
- // Calculate BCH (Bose-Chaudhuri-Hocquenghem) code for "value" using polynomial "poly". The BCH
- // code is used for encoding type information and version information.
- // Example: Calculation of version information of 7.
- // f(x) is created from 7.
- // - 7 = 000111 in 6 bits
- // - f(x) = x^2 + x^1 + x^0
- // g(x) is given by the standard (p. 67)
- // - g(x) = x^12 + x^11 + x^10 + x^9 + x^8 + x^5 + x^2 + 1
- // Multiply f(x) by x^(18 - 6)
- // - f'(x) = f(x) * x^(18 - 6)
- // - f'(x) = x^14 + x^13 + x^12
- // Calculate the remainder of f'(x) / g(x)
- // x^2
- // __________________________________________________
- // g(x) )x^14 + x^13 + x^12
- // x^14 + x^13 + x^12 + x^11 + x^10 + x^7 + x^4 + x^2
- // --------------------------------------------------
- // x^11 + x^10 + x^7 + x^4 + x^2
- //
- // The remainder is x^11 + x^10 + x^7 + x^4 + x^2
- // Encode it in binary: 110010010100
- // The return value is 0xc94 (1100 1001 0100)
- //
- // Since all coefficients in the polynomials are 1 or 0, we can do the calculation by bit
- // operations. We don't care if cofficients are positive or negative.
- public static int calculateBCHCode(int value, int poly) {
- // If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1
- // from 13 to make it 12.
- int msbSetInPoly = findMSBSet(poly);
- value <<= msbSetInPoly - 1;
- // Do the division business using exclusive-or operations.
- while (findMSBSet(value) >= msbSetInPoly) {
- value ^= poly << (findMSBSet(value) - msbSetInPoly);
- }
- // Now the "value" is the remainder (i.e. the BCH code)
- return value;
- }
-
- // Make bit vector of type information. On success, store the result in "bits" and return true.
- // Encode error correction level and mask pattern. See 8.9 of
- // JISX0510:2004 (p.45) for details.
- public static void makeTypeInfoBits(ErrorCorrectionLevel ecLevel, int maskPattern, BitArray bits)
- throws WriterException {
- if (!QRCode.isValidMaskPattern(maskPattern)) {
- throw new WriterException("Invalid mask pattern");
- }
- int typeInfo = (ecLevel.getBits() << 3) | maskPattern;
- bits.appendBits(typeInfo, 5);
-
- int bchCode = calculateBCHCode(typeInfo, TYPE_INFO_POLY);
- bits.appendBits(bchCode, 10);
-
- BitArray maskBits = new BitArray();
- maskBits.appendBits(TYPE_INFO_MASK_PATTERN, 15);
- bits.xor(maskBits);
-
- if (bits.getSize() != 15) { // Just in case.
- throw new WriterException("should not happen but we got: " + bits.getSize());
- }
- }
-
- // Make bit vector of version information. On success, store the result in "bits" and return true.
- // See 8.10 of JISX0510:2004 (p.45) for details.
- public static void makeVersionInfoBits(int version, BitArray bits) throws WriterException {
- bits.appendBits(version, 6);
- int bchCode = calculateBCHCode(version, VERSION_INFO_POLY);
- bits.appendBits(bchCode, 12);
-
- if (bits.getSize() != 18) { // Just in case.
- throw new WriterException("should not happen but we got: " + bits.getSize());
- }
- }
-
- // Check if "value" is empty.
- private static boolean isEmpty(int value) {
- return value == -1;
- }
-
- // Check if "value" is valid.
- private static boolean isValidValue(int value) {
- return (value == -1 || // Empty.
- value == 0 || // Light (white).
- value == 1); // Dark (black).
- }
-
- private static void embedTimingPatterns(ByteMatrix matrix) throws WriterException {
- // -8 is for skipping position detection patterns (size 7), and two horizontal/vertical
- // separation patterns (size 1). Thus, 8 = 7 + 1.
- for (int i = 8; i < matrix.getWidth() - 8; ++i) {
- int bit = (i + 1) % 2;
- // Horizontal line.
- if (!isValidValue(matrix.get(i, 6))) {
- throw new WriterException();
- }
- if (isEmpty(matrix.get(i, 6))) {
- matrix.set(i, 6, bit);
- }
- // Vertical line.
- if (!isValidValue(matrix.get(6, i))) {
- throw new WriterException();
- }
- if (isEmpty(matrix.get(6, i))) {
- matrix.set(6, i, bit);
- }
- }
- }
-
- // Embed the lonely dark dot at left bottom corner. JISX0510:2004 (p.46)
- private static void embedDarkDotAtLeftBottomCorner(ByteMatrix matrix) throws WriterException {
- if (matrix.get(8, matrix.getHeight() - 8) == 0) {
- throw new WriterException();
- }
- matrix.set(8, matrix.getHeight() - 8, 1);
- }
-
- private static void embedHorizontalSeparationPattern(int xStart, int yStart,
- ByteMatrix matrix) throws WriterException {
- // We know the width and height.
- if (HORIZONTAL_SEPARATION_PATTERN[0].length != 8 || HORIZONTAL_SEPARATION_PATTERN.length != 1) {
- throw new WriterException("Bad horizontal separation pattern");
- }
- for (int x = 0; x < 8; ++x) {
- if (!isEmpty(matrix.get(xStart + x, yStart))) {
- throw new WriterException();
- }
- matrix.set(xStart + x, yStart, HORIZONTAL_SEPARATION_PATTERN[0][x]);
- }
- }
-
- private static void embedVerticalSeparationPattern(int xStart, int yStart,
- ByteMatrix matrix) throws WriterException {
- // We know the width and height.
- if (VERTICAL_SEPARATION_PATTERN[0].length != 1 || VERTICAL_SEPARATION_PATTERN.length != 7) {
- throw new WriterException("Bad vertical separation pattern");
- }
- for (int y = 0; y < 7; ++y) {
- if (!isEmpty(matrix.get(xStart, yStart + y))) {
- throw new WriterException();
- }
- matrix.set(xStart, yStart + y, VERTICAL_SEPARATION_PATTERN[y][0]);
- }
- }
-
- // Note that we cannot unify the function with embedPositionDetectionPattern() despite they are
- // almost identical, since we cannot write a function that takes 2D arrays in different sizes in
- // C/C++. We should live with the fact.
- private static void embedPositionAdjustmentPattern(int xStart, int yStart,
- ByteMatrix matrix) throws WriterException {
- // We know the width and height.
- if (POSITION_ADJUSTMENT_PATTERN[0].length != 5 || POSITION_ADJUSTMENT_PATTERN.length != 5) {
- throw new WriterException("Bad position adjustment");
- }
- for (int y = 0; y < 5; ++y) {
- for (int x = 0; x < 5; ++x) {
- if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
- throw new WriterException();
- }
- matrix.set(xStart + x, yStart + y, POSITION_ADJUSTMENT_PATTERN[y][x]);
- }
- }
- }
-
- private static void embedPositionDetectionPattern(int xStart, int yStart,
- ByteMatrix matrix) throws WriterException {
- // We know the width and height.
- if (POSITION_DETECTION_PATTERN[0].length != 7 || POSITION_DETECTION_PATTERN.length != 7) {
- throw new WriterException("Bad position detection pattern");
- }
- for (int y = 0; y < 7; ++y) {
- for (int x = 0; x < 7; ++x) {
- if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
- throw new WriterException();
- }
- matrix.set(xStart + x, yStart + y, POSITION_DETECTION_PATTERN[y][x]);
- }
- }
- }
-
- // Embed position detection patterns and surrounding vertical/horizontal separators.
- private static void embedPositionDetectionPatternsAndSeparators(ByteMatrix matrix) throws WriterException {
- // Embed three big squares at corners.
- int pdpWidth = POSITION_DETECTION_PATTERN[0].length;
- // Left top corner.
- embedPositionDetectionPattern(0, 0, matrix);
- // Right top corner.
- embedPositionDetectionPattern(matrix.getWidth() - pdpWidth, 0, matrix);
- // Left bottom corner.
- embedPositionDetectionPattern(0, matrix.getWidth() - pdpWidth, matrix);
-
- // Embed horizontal separation patterns around the squares.
- int hspWidth = HORIZONTAL_SEPARATION_PATTERN[0].length;
- // Left top corner.
- embedHorizontalSeparationPattern(0, hspWidth - 1, matrix);
- // Right top corner.
- embedHorizontalSeparationPattern(matrix.getWidth() - hspWidth,
- hspWidth - 1, matrix);
- // Left bottom corner.
- embedHorizontalSeparationPattern(0, matrix.getWidth() - hspWidth, matrix);
-
- // Embed vertical separation patterns around the squares.
- int vspSize = VERTICAL_SEPARATION_PATTERN.length;
- // Left top corner.
- embedVerticalSeparationPattern(vspSize, 0, matrix);
- // Right top corner.
- embedVerticalSeparationPattern(matrix.getHeight() - vspSize - 1, 0, matrix);
- // Left bottom corner.
- embedVerticalSeparationPattern(vspSize, matrix.getHeight() - vspSize,
- matrix);
- }
-
- // Embed position adjustment patterns if need be.
- private static void maybeEmbedPositionAdjustmentPatterns(int version, ByteMatrix matrix)
- throws WriterException {
- if (version < 2) { // The patterns appear if version >= 2
- return;
- }
- int index = version - 1;
- int[] coordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index];
- int numCoordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index].length;
- for (int i = 0; i < numCoordinates; ++i) {
- for (int j = 0; j < numCoordinates; ++j) {
- int y = coordinates[i];
- int x = coordinates[j];
- if (x == -1 || y == -1) {
- continue;
- }
- // If the cell is unset, we embed the position adjustment pattern here.
- if (isEmpty(matrix.get(x, y))) {
- // -2 is necessary since the x/y coordinates point to the center of the pattern, not the
- // left top corner.
- embedPositionAdjustmentPattern(x - 2, y - 2, matrix);
- }
- }
- }
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/QRCode.java plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/QRCode.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/encoder/QRCode.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/encoder/QRCode.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,239 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode.encoder;
-
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.decoder.Mode;
-
-/**
- * @author satorux@google.com (Satoru Takabayashi) - creator
- * @author dswitkin@google.com (Daniel Switkin) - ported from C++
- */
-public final class QRCode {
-
- public static final int NUM_MASK_PATTERNS = 8;
-
- private Mode mode;
- private ErrorCorrectionLevel ecLevel;
- private int version;
- private int matrixWidth;
- private int maskPattern;
- private int numTotalBytes;
- private int numDataBytes;
- private int numECBytes;
- private int numRSBlocks;
- private ByteMatrix matrix;
-
- public QRCode() {
- mode = null;
- ecLevel = null;
- version = -1;
- matrixWidth = -1;
- maskPattern = -1;
- numTotalBytes = -1;
- numDataBytes = -1;
- numECBytes = -1;
- numRSBlocks = -1;
- matrix = null;
- }
-
- // Mode of the QR Code.
- public Mode getMode() {
- return mode;
- }
-
- // Error correction level of the QR Code.
- public ErrorCorrectionLevel getECLevel() {
- return ecLevel;
- }
-
- // Version of the QR Code. The bigger size, the bigger version.
- public int getVersion() {
- return version;
- }
-
- // ByteMatrix width of the QR Code.
- public int getMatrixWidth() {
- return matrixWidth;
- }
-
- // Mask pattern of the QR Code.
- public int getMaskPattern() {
- return maskPattern;
- }
-
- // Number of total bytes in the QR Code.
- public int getNumTotalBytes() {
- return numTotalBytes;
- }
-
- // Number of data bytes in the QR Code.
- public int getNumDataBytes() {
- return numDataBytes;
- }
-
- // Number of error correction bytes in the QR Code.
- public int getNumECBytes() {
- return numECBytes;
- }
-
- // Number of Reedsolomon blocks in the QR Code.
- public int getNumRSBlocks() {
- return numRSBlocks;
- }
-
- // ByteMatrix data of the QR Code.
- public ByteMatrix getMatrix() {
- return matrix;
- }
-
-
- // Return the value of the module (cell) pointed by "x" and "y" in the matrix of the QR Code. They
- // call cells in the matrix "modules". 1 represents a black cell, and 0 represents a white cell.
- public int at(int x, int y) {
- // The value must be zero or one.
- int value = matrix.get(x, y);
- if (!(value == 0 || value == 1)) {
- // this is really like an assert... not sure what better exception to use?
- throw new RuntimeException("Bad value");
- }
- return value;
- }
-
- // Checks all the member variables are set properly. Returns true on success. Otherwise, returns
- // false.
- public boolean isValid() {
- return
- // First check if all version are not uninitialized.
- mode != null &&
- ecLevel != null &&
- version != -1 &&
- matrixWidth != -1 &&
- maskPattern != -1 &&
- numTotalBytes != -1 &&
- numDataBytes != -1 &&
- numECBytes != -1 &&
- numRSBlocks != -1 &&
- // Then check them in other ways..
- isValidMaskPattern(maskPattern) &&
- numTotalBytes == numDataBytes + numECBytes &&
- // ByteMatrix stuff.
- matrix != null &&
- matrixWidth == matrix.getWidth() &&
- // See 7.3.1 of JISX0510:2004 (p.5).
- matrix.getWidth() == matrix.getHeight(); // Must be square.
- }
-
- // Return debug String.
- public String toString() {
- StringBuffer result = new StringBuffer(200);
- result.append("<<\n");
- result.append(" mode: ");
- result.append(mode);
- result.append("\n ecLevel: ");
- result.append(ecLevel);
- result.append("\n version: ");
- result.append(version);
- result.append("\n matrixWidth: ");
- result.append(matrixWidth);
- result.append("\n maskPattern: ");
- result.append(maskPattern);
- result.append("\n numTotalBytes: ");
- result.append(numTotalBytes);
- result.append("\n numDataBytes: ");
- result.append(numDataBytes);
- result.append("\n numECBytes: ");
- result.append(numECBytes);
- result.append("\n numRSBlocks: ");
- result.append(numRSBlocks);
- if (matrix == null) {
- result.append("\n matrix: null\n");
- } else {
- result.append("\n matrix:\n");
- result.append(matrix.toString());
- }
- result.append(">>\n");
- return result.toString();
- }
-
- public void setMode(Mode value) {
- mode = value;
- }
-
- public void setECLevel(ErrorCorrectionLevel value) {
- ecLevel = value;
- }
-
- public void setVersion(int value) {
- version = value;
- }
-
- public void setMatrixWidth(int value) {
- matrixWidth = value;
- }
-
- public void setMaskPattern(int value) {
- maskPattern = value;
- }
-
- public void setNumTotalBytes(int value) {
- numTotalBytes = value;
- }
-
- public void setNumDataBytes(int value) {
- numDataBytes = value;
- }
-
- public void setNumECBytes(int value) {
- numECBytes = value;
- }
-
- public void setNumRSBlocks(int value) {
- numRSBlocks = value;
- }
-
- // This takes ownership of the 2D array.
- public void setMatrix(ByteMatrix value) {
- matrix = value;
- }
-
- // Check if "mask_pattern" is valid.
- public static boolean isValidMaskPattern(int maskPattern) {
- return maskPattern >= 0 && maskPattern < NUM_MASK_PATTERNS;
- }
-
- // Return true if the all values in the matrix are binary numbers.
- //
- // JAVAPORT: This is going to be super expensive and unnecessary, we should not call this in
- // production. I'm leaving it because it may be useful for testing. It should be removed entirely
- // if ByteMatrix is changed never to contain a -1.
- /*
- private static boolean EverythingIsBinary(final ByteMatrix matrix) {
- for (int y = 0; y < matrix.height(); ++y) {
- for (int x = 0; x < matrix.width(); ++x) {
- int value = matrix.get(y, x);
- if (!(value == 0 || value == 1)) {
- // Found non zero/one value.
- return false;
- }
- }
- }
- return true;
- }
- */
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/qrcode/QRCodeWriter.java plantuml-1.2018.9/src/com/google/zxing/qrcode/QRCodeWriter.java
--- plantuml-1.2017.15/src/com/google/zxing/qrcode/QRCodeWriter.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/qrcode/QRCodeWriter.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.qrcode;
-
-import java.util.Hashtable;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.Writer;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.google.zxing.qrcode.encoder.ByteMatrix;
-import com.google.zxing.qrcode.encoder.Encoder;
-import com.google.zxing.qrcode.encoder.QRCode;
-
-/**
- * This object renders a QR Code as a BitMatrix 2D array of greyscale values.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class QRCodeWriter implements Writer {
-
- private static final int QUIET_ZONE_SIZE = 4;
-
- public BitMatrix encode(String contents, BarcodeFormat format, int multiple) throws WriterException {
-
- return encode(contents, format, multiple, null);
- }
-
- public BitMatrix encode(String contents, BarcodeFormat format, int multiple, Hashtable hints) throws WriterException {
-
- if (contents == null || contents.length() == 0) {
- throw new IllegalArgumentException("Found empty contents");
- }
-
- if (format != BarcodeFormat.QR_CODE) {
- throw new IllegalArgumentException("Can only encode QR_CODE, but got " + format);
- }
-
- ErrorCorrectionLevel errorCorrectionLevel = ErrorCorrectionLevel.L;
- if (hints != null) {
- ErrorCorrectionLevel requestedECLevel = (ErrorCorrectionLevel) hints.get(EncodeHintType.ERROR_CORRECTION);
- if (requestedECLevel != null) {
- errorCorrectionLevel = requestedECLevel;
- }
- }
-
- QRCode code = new QRCode();
- Encoder.encode(contents, errorCorrectionLevel, hints, code);
- return renderResult(code, multiple);
- }
-
- // Note that the input matrix uses 0 == white, 1 == black, while the output
- // matrix uses
- // 0 == black, 255 == white (i.e. an 8 bit greyscale bitmap).
- private static BitMatrix renderResult(QRCode code, int multiple) {
- ByteMatrix input = code.getMatrix();
- int inputWidth = input.getWidth();
- int inputHeight = input.getHeight();
- int qrWidth = inputWidth + (QUIET_ZONE_SIZE << 1);
- int qrHeight = inputHeight + (QUIET_ZONE_SIZE << 1);
- // int outputWidth = Math.max(width, qrWidth);
- // int outputHeight = Math.max(height, qrHeight);
-
- // int multiple = Math.min(outputWidth / qrWidth, outputHeight /
- // qrHeight);
- // Padding includes both the quiet zone and the extra white pixels to
- // accommodate the requested
- // dimensions. For example, if input is 25x25 the QR will be 33x33
- // including the quiet zone.
- // If the requested size is 200x160, the multiple will be 4, for a QR of
- // 132x132. These will
- // handle all the padding from 100x100 (the actual QR) up to 200x160.
- int leftPadding = QUIET_ZONE_SIZE * multiple;
- int topPadding = QUIET_ZONE_SIZE * multiple;
-
- BitMatrix output = new BitMatrix(qrWidth * multiple, qrHeight * multiple);
-
- for (int inputY = 0, outputY = topPadding; inputY < inputHeight; inputY++, outputY += multiple) {
- // Write the contents of this row of the barcode
- for (int inputX = 0, outputX = leftPadding; inputX < inputWidth; inputX++, outputX += multiple) {
- if (input.get(inputX, inputY) == 1) {
- output.setRegion(outputX, outputY, multiple, multiple);
- }
- }
- }
-
- return output;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/ReaderException.java plantuml-1.2018.9/src/com/google/zxing/ReaderException.java
--- plantuml-1.2017.15/src/com/google/zxing/ReaderException.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/ReaderException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- * The general exception class throw when something goes wrong during decoding of a barcode.
- * This includes, but is not limited to, failing checksums / error correction algorithms, being
- * unable to locate finder timing patterns, and so on.
- *
- * @author Sean Owen
- */
-public abstract class ReaderException extends Exception {
-
- // TODO: Currently we throw up to 400 ReaderExceptions while scanning a single 240x240 image before
- // rejecting it. This involves a lot of overhead and memory allocation, and affects both performance
- // and latency on continuous scan clients. In the future, we should change all the decoders not to
- // throw exceptions for routine events, like not finding a barcode on a given row. Instead, we
- // should return error codes back to the callers, and simply delete this class. In the mean time, I
- // have altered this class to be as lightweight as possible, by ignoring the exception string, and
- // by disabling the generation of stack traces, which is especially time consuming. These are just
- // temporary measures, pending the big cleanup.
-
- //private static final ReaderException instance = new ReaderException();
-
- // EXCEPTION TRACKING SUPPORT
- // Identifies who is throwing exceptions and how often. To use:
- //
- // 1. Uncomment these lines and the code below which uses them.
- // 2. Uncomment the two corresponding lines in j2se/CommandLineRunner.decode()
- // 3. Change core to build as Java 1.5 temporarily
-// private static int exceptionCount = 0;
-// private static Map throwers = new HashMap(32);
-
- ReaderException() {
- // do nothing
- }
-
- //public static ReaderException getInstance() {
-// Exception e = new Exception();
-// // Take the stack frame before this one.
-// StackTraceElement stack = e.getStackTrace()[1];
-// String key = stack.getClassName() + "." + stack.getMethodName() + "(), line " +
-// stack.getLineNumber();
-// if (throwers.containsKey(key)) {
-// Integer value = throwers.get(key);
-// value++;
-// throwers.put(key, value);
-// } else {
-// throwers.put(key, 1);
-// }
-// exceptionCount++;
-
- //return instance;
- //}
-
-// public static int getExceptionCountAndReset() {
-// int temp = exceptionCount;
-// exceptionCount = 0;
-// return temp;
-// }
-//
-// public static String getThrowersAndReset() {
-// StringBuilder builder = new StringBuilder(1024);
-// Object[] keys = throwers.keySet().toArray();
-// for (int x = 0; x < keys.length; x++) {
-// String key = (String) keys[x];
-// Integer value = throwers.get(key);
-// builder.append(key);
-// builder.append(": ");
-// builder.append(value);
-// builder.append("\n");
-// }
-// throwers.clear();
-// return builder.toString();
-// }
-
- // Prevent stack traces from being taken
- // srowen says: huh, my IDE is saying this is not an override. native methods can't be overridden?
- // This, at least, does not hurt. Because we use a singleton pattern here, it doesn't matter anyhow.
- public final Throwable fillInStackTrace() {
- return null;
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/ResultPoint.java plantuml-1.2018.9/src/com/google/zxing/ResultPoint.java
--- plantuml-1.2017.15/src/com/google/zxing/ResultPoint.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/ResultPoint.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright 2007 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- *
Encapsulates a point of interest in an image containing a barcode. Typically, this
- * would be the location of a finder pattern or the corner of the barcode, for example.
- *
- * @author Sean Owen
- */
-public class ResultPoint {
-
- private final float x;
- private final float y;
-
- public ResultPoint(float x, float y) {
- this.x = x;
- this.y = y;
- }
-
- public final float getX() {
- return x;
- }
-
- public final float getY() {
- return y;
- }
-
- public boolean equals(Object other) {
- if (other instanceof ResultPoint) {
- ResultPoint otherPoint = (ResultPoint) other;
- return x == otherPoint.x && y == otherPoint.y;
- }
- return false;
- }
-
- public int hashCode() {
- return 31 * Float.floatToIntBits(x) + Float.floatToIntBits(y);
- }
-
- public String toString() {
- StringBuffer result = new StringBuffer(25);
- result.append('(');
- result.append(x);
- result.append(',');
- result.append(y);
- result.append(')');
- return result.toString();
- }
-
- /**
- *
Orders an array of three ResultPoints in an order [A,B,C] such that AB < AC and
- * BC < AC and the angle between BC and BA is less than 180 degrees.
- */
- public static void orderBestPatterns(ResultPoint[] patterns) {
-
- // Find distances between pattern centers
- float zeroOneDistance = distance(patterns[0], patterns[1]);
- float oneTwoDistance = distance(patterns[1], patterns[2]);
- float zeroTwoDistance = distance(patterns[0], patterns[2]);
-
- ResultPoint pointA, pointB, pointC;
- // Assume one closest to other two is B; A and C will just be guesses at first
- if (oneTwoDistance >= zeroOneDistance && oneTwoDistance >= zeroTwoDistance) {
- pointB = patterns[0];
- pointA = patterns[1];
- pointC = patterns[2];
- } else if (zeroTwoDistance >= oneTwoDistance && zeroTwoDistance >= zeroOneDistance) {
- pointB = patterns[1];
- pointA = patterns[0];
- pointC = patterns[2];
- } else {
- pointB = patterns[2];
- pointA = patterns[0];
- pointC = patterns[1];
- }
-
- // Use cross product to figure out whether A and C are correct or flipped.
- // This asks whether BC x BA has a positive z component, which is the arrangement
- // we want for A, B, C. If it's negative, then we've got it flipped around and
- // should swap A and C.
- if (crossProductZ(pointA, pointB, pointC) < 0.0f) {
- ResultPoint temp = pointA;
- pointA = pointC;
- pointC = temp;
- }
-
- patterns[0] = pointA;
- patterns[1] = pointB;
- patterns[2] = pointC;
- }
-
-
- /**
- * @return distance between two points
- */
- public static float distance(ResultPoint pattern1, ResultPoint pattern2) {
- float xDiff = pattern1.getX() - pattern2.getX();
- float yDiff = pattern1.getY() - pattern2.getY();
- return (float) Math.sqrt((double) (xDiff * xDiff + yDiff * yDiff));
- }
-
- /**
- * Returns the z component of the cross product between vectors BC and BA.
- */
- private static float crossProductZ(ResultPoint pointA, ResultPoint pointB, ResultPoint pointC) {
- float bX = pointB.x;
- float bY = pointB.y;
- return ((pointC.x - bX) * (pointA.y - bY)) - ((pointC.y - bY) * (pointA.x - bX));
- }
-
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/WriterException.java plantuml-1.2018.9/src/com/google/zxing/WriterException.java
--- plantuml-1.2017.15/src/com/google/zxing/WriterException.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/WriterException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-/**
- * A base class which covers the range of exceptions which may occur when encoding a barcode using
- * the Writer framework.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class WriterException extends Exception {
-
- public WriterException() {
- super();
- }
-
- public WriterException(String message) {
- super(message);
- }
-
-}
diff -Nru plantuml-1.2017.15/src/com/google/zxing/Writer.java plantuml-1.2018.9/src/com/google/zxing/Writer.java
--- plantuml-1.2017.15/src/com/google/zxing/Writer.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/com/google/zxing/Writer.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing;
-
-import java.util.Hashtable;
-
-import com.google.zxing.common.BitMatrix;
-
-/**
- * The base class for all objects which encode/generate a barcode image.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public interface Writer {
-
- /**
- * Encode a barcode using the default settings.
- *
- * @param contents The contents to encode in the barcode
- * @param format The barcode format to generate
- * @param width The preferred width in pixels
- * @param height The preferred height in pixels
- * @return The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
- */
- BitMatrix encode(String contents, BarcodeFormat format, int multiple)
- throws WriterException;
-
- /**
- *
- * @param contents The contents to encode in the barcode
- * @param format The barcode format to generate
- * @param width The preferred width in pixels
- * @param height The preferred height in pixels
- * @param hints Additional parameters to supply to the encoder
- * @return The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
- */
- BitMatrix encode(String contents, BarcodeFormat format, int multiple, Hashtable hints)
- throws WriterException;
-
-}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/ACearth.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/ACearth.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/ACearth.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/ACearth.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,373 @@
+package ext.plantuml.com.ctreber.acearth;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+
+import ext.plantuml.com.ctreber.acearth.gui.CanvasACearth;
+import ext.plantuml.com.ctreber.acearth.plugins.Plugin;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers;
+import ext.plantuml.com.ctreber.acearth.projection.Projection;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionCyl;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionMerc;
+import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho;
+import ext.plantuml.com.ctreber.acearth.renderer.Renderer;
+import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit;
+import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault;
+import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho;
+import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines;
+import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars;
+import ext.plantuml.com.ctreber.acearth.scandot.ScanDot;
+import ext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator;
+import ext.plantuml.com.ctreber.acearth.shader.Shader;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderDefault;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderFlat;
+import ext.plantuml.com.ctreber.acearth.shader.ShaderOrtho;
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.acearth.util.SunPositionCalculator;
+import ext.plantuml.com.ctreber.acearth.util.Toolkit;
+import ext.plantuml.com.ctreber.aclib.sort.CTSort;
+import ext.plantuml.com.ctreber.aclib.sort.QuickSort;
+
+/**
+ *
AC.earth - XEarth for Java
+ *
+ *
+ *
+ * The original XEarth was written by Kirk Johnson in July 1993 - thank you for
+ * writing this great little program and making it available for free!
+ *
+ *
+ * I wanted to extend the program, but not in C. So I created this Java version,
+ * and found the process quite painfull interesting. The
+ * biggest effort went into resolving references between C files and
+ * eliminatiing pointers.
+ *
+ *
+ * AC.earth is based on XEarth by Kirk Johnson
+ *
+ *
+ * To comply with the XEarth license I include the following text:
+ *
+ *
+ * XEarth Copyright (C) 1989, 1990, 1993-1995, 1999 Kirk Lauritz Johnson
+ * Parts of the source code are:
+ * Copyright (C) 1989, 1990, 1991 by Jim Frost
+ * Copyright (C) 1992 by Jamie Zawinski <jwz@lucid.com>
+ * Permission to use, copy, modify and freely distribute xearth for
+ * non-commercial and not-for-profit purposes is hereby granted
+ * without fee, provided that both the above copyright notice and this
+ * permission notice appear in all copies and in supporting
+ * documentation.
+ * [Section refering to GIF omitted because it doesn't apply to this version]
+ * The author makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT
+ * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *
+ *
+ * The license for this program (AC.earth) is the same as the quoted license
+ * above, with one change: The "copyright notice and permission notice" shall
+ * include the entire text of this section.
+ *
+ * todo Phase 2: Make grid value stuff more meaningful ("every n degrees") todo
+ * Phase 2: Enter fixed time as data and time, not seconds since epoch todo
+ * Phase 2: Compact map data into binary file
+ *
+ *
+ * Well, the main class.
+ * @param markers
+ */
+ public ACearth(List markers) {
+ // fsStartTime = System.currentTimeMillis();
+
+ fPlugins = new ArrayList();
+ fPlugins.add(new PluginMarkers(markers));
+
+ }
+
+ public void exportPng(OutputStream os) throws IOException {
+ fCanvas = new CanvasACearth(this, fConf.getInt("imageWidth"), fConf.getInt("imageHeight"));
+ update();
+ fCanvas.saveToImage(os);
+ }
+
+ public void update() throws IOException {
+ Projection lProjection = null;
+ Shader lShader = null;
+ BitGeneratorMap lScanner = null;
+ if (fConf.is("projection", "Cylindrical")) {
+ lProjection = new ProjectionCyl();
+ lScanner = new BitGeneratorMapDefault(lProjection);
+ lShader = new ShaderDefault();
+ }
+
+ if (fConf.is("projection", "Mercator")) {
+ lProjection = new ProjectionMerc();
+ lScanner = new BitGeneratorMapDefault(lProjection);
+ lShader = new ShaderDefault();
+ }
+
+ if (fConf.is("projection", "Orthographic")) {
+ lProjection = new ProjectionOrtho();
+ lScanner = new BitGeneratorMapOrtho(lProjection);
+ lShader = new ShaderOrtho();
+ }
+
+ computePositions();
+ lProjection.setImageWidth(fConf.getInt("imageWidth"));
+ lProjection.setImageHeight(fConf.getInt("imageHeight"));
+ lProjection.setShiftX(fConf.getInt("shiftX"));
+ lProjection.setShiftY(fConf.getInt("shiftY"));
+ lProjection.setViewMagnification(fConf.getDouble("viewMagnification"));
+ lProjection.setViewPos(fViewPos);
+ lProjection.setViewRotation(fViewRotation);
+
+ lScanner.setImageWidth(fConf.getInt("imageWidth"));
+ lScanner.setImageHeight(fConf.getInt("imageHeight"));
+ lScanner.setMapData(MapDataReader.readMapData());
+ // Process the map (produces ScanBit-s).
+ lScanner.generateScanBits();
+
+ // Process stars and lines (produces ScanDots-s).
+ List lScanDots = new ArrayList();
+ if (fConf.getBoolean("starsP")) {
+ ScanDotGenerator lGenerator = new DotGeneratorStars(fConf.getInt("imageWidth"),
+ fConf.getInt("imageHeight"), fConf.getDouble("starFrequency"), fConf.getInt("bigStars"), new Random(fCurrentTime));
+ lGenerator.generateScanDots();
+ lScanDots.addAll(lGenerator.getScanDots());
+ }
+
+ if (fConf.getBoolean("gridP")) {
+ ScanDotGenerator lGenerator = new DotGeneratorLines(lProjection, fConf.getInt("gridDivision"), fConf
+ .getInt("gridPixelDivision"));
+ lGenerator.generateScanDots();
+ lScanDots.addAll(lGenerator.getScanDots());
+ }
+
+ final CTSort lSort = new QuickSort();
+ ScanDot[] lScanDotsArray = (ScanDot[]) lScanDots.toArray(new ScanDot[0]);
+ lSort.sort(lScanDotsArray);
+
+ if (!fConf.getBoolean("shadeP")) {
+ lShader = new ShaderFlat();
+ }
+ lShader.setProjection(lProjection);
+ lShader.setSunPos(fConf.getSunPos());
+ lShader.setDaySideBrightness(fConf.getInt("daySideBrightness"));
+ lShader.setTerminatorDiscontinuity(fConf.getInt("terminatorDiscontinuity"));
+ lShader.setNightSideBrightness(fConf.getInt("nightSideBrightness"));
+ lShader.init();
+
+ Renderer lRenderer = new Renderer(fCanvas);
+
+ RowTypeRendererScanBit lRowRendererScanBit = new RowTypeRendererScanBit();
+ lRowRendererScanBit.setScanBits(lScanner.getScanBits());
+ lRenderer.addRowTypeRenderer(lRowRendererScanBit);
+
+ RowTypeRendererScanDot lRowRendererScanDot = new RowTypeRendererScanDot();
+ lRowRendererScanDot.setScanDots(lScanDotsArray);
+ lRenderer.addRowTypeRenderer(lRowRendererScanDot);
+
+ lRenderer.setShader(lShader);
+ lRenderer.render();
+
+ // Apply plugins
+ Iterator lIt = fPlugins.iterator();
+ while (lIt.hasNext()) {
+ Plugin lPlugin = (Plugin) lIt.next();
+ lPlugin.setProjection(lProjection);
+ lPlugin.setRenderTarget(fCanvas);
+ lPlugin.setParent(this);
+ lPlugin.render();
+ }
+
+ }
+
+ /**
+ *
+ * This is repeated when time changes since this influences the position of
+ * Earth.
+ */
+ private void computePositions() {
+ // Determine time for rendering
+ if (fConf.getInt("fixedTime") == 0) {
+ // No fixed time.
+ // final long lTimePassed = System.currentTimeMillis() - fsStartTime;
+ // fCurrentTime = fsStartTime + (long) (fConf.getDouble("timeWarpFactor") * lTimePassed);
+ fCurrentTime = System.currentTimeMillis();
+ } else {
+ // Fixed time.
+ fCurrentTime = fConf.getInt("fixedTime") * 1000L;
+ }
+
+ if (fConf.getBoolean("sunMovesP")) {
+ fConf.setSunPos(SunPositionCalculator.getSunPositionOnEarth(fCurrentTime));
+ }
+
+ // Determine viewing position
+ if (fConf.is("viewPositionType", "Fixed")) {
+ fViewPos = fConf.getViewPos();
+ } else if (fConf.is("viewPositionType", "Sun-relative")) {
+ fViewPos = getSunRelativePosition();
+ } else if (fConf.is("viewPositionType", "Orbit")) {
+ fViewPos = getOrbitPosition(fCurrentTime);
+ } else if (fConf.is("viewPositionType", "Random")) {
+ fViewPos = getRandomPosition();
+ } else if (fConf.is("viewPositionType", "Moon")) {
+ fViewPos = SunPositionCalculator.getMoonPositionOnEarth(fCurrentTime);
+ }
+
+ // for ViewRotGalactic, compute appropriate viewing rotation
+ if (fConf.is("viewRotationType", "Galactic")) {
+ fViewRotation = (Toolkit.degsToRads(fConf.getSunPos().getLat()
+ * Math.sin((fViewPos.getLong() - fConf.getSunPos().getLong()))));
+ } else {
+ fViewRotation = fConf.getDouble("viewRotation");
+ }
+ }
+
+ /**
+ *
+ * Add sun position and position relative to sun, straighten out the result.
+ *
+ * @return Position relativ to sun position as defined by fSunPosRel.
+ */
+ private Coordinate getSunRelativePosition() {
+ final Coordinate lPos = fConf.getSunPos();
+ lPos.add(fConf.getSunPosRel());
+
+ return lPos;
+ }
+
+ private Coordinate getOrbitPosition(long pTimeMillis) {
+ double x, y, z;
+ double a, c, s;
+ double t1, t2;
+
+ /* start at 0 N 0 E */
+ x = 0;
+ y = 0;
+ z = 1;
+
+ /*
+ * rotate in about y axis (from z towards x) according to the number of
+ * orbits we've completed
+ */
+ a = (double) pTimeMillis / (fConf.getDouble("orbitPeriod") * 3600 * 1000) * 2 * Math.PI;
+ c = Math.cos(a);
+ s = Math.sin(a);
+ t1 = c * z - s * x;
+ t2 = s * z + c * x;
+ z = t1;
+ x = t2;
+
+ /*
+ * rotate about z axis (from x towards y) according to the inclination
+ * of the orbit
+ */
+ a = Toolkit.degsToRads(fConf.getDouble("orbitInclination"));
+ c = Math.cos(a);
+ s = Math.sin(a);
+ t1 = c * x - s * y;
+ t2 = s * x + c * y;
+ x = t1;
+ y = t2;
+
+ /*
+ * rotate about y axis (from x towards z) according to the number of
+ * rotations the earth has made
+ */
+ a = ((double) pTimeMillis / 86400000) * (2 * Math.PI);
+ c = Math.cos(a);
+ s = Math.sin(a);
+ t1 = c * x - s * z;
+ t2 = s * x + c * z;
+ x = t1;
+ z = t2;
+
+ return new Coordinate(Toolkit.radsToDegs(Math.asin(y)), Toolkit.radsToDegs(Math.atan2(x, z)));
+ }
+
+ /**
+ *
+ * Pick a position (lat, lon) at random
+ *
+ * @return A random position.
+ */
+ private static Coordinate getRandomPosition() {
+
+ /* select a vector at random */
+ final double[] pos = new double[3];
+ double mag = 0;
+ do {
+ for (int i = 0; i < 3; i++) {
+ pos[i] = ((Math.random() * 20000) * 1e-4) - 1;
+ mag += pos[i] * pos[i];
+ }
+ } while ((mag > 1.0) || (mag < 0.01));
+
+ /* normalize the vector */
+ mag = Math.sqrt(mag);
+ for (int i = 0; i < 3; i++) {
+ pos[i] /= mag;
+ }
+
+ /* convert to (lat, lon) */
+ final double s_lat = pos[1];
+ final double c_lat = Math.sqrt(1 - s_lat * s_lat);
+ final double s_lon = pos[0] / c_lat;
+ final double c_lon = pos[2] / c_lat;
+
+ return new Coordinate(Math.atan2(s_lat, c_lat) * (180 / Math.PI), Math.atan2(s_lon, c_lon) * (180 / Math.PI));
+ }
+
+// public static long getStartTime() {
+// return fsStartTime;
+// }
+
+ public ConfigurationACearth getConf() {
+ return fConf;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,152 @@
+package ext.plantuml.com.ctreber.acearth;
+
+import ext.plantuml.com.ctreber.acearth.util.Coordinate;
+import ext.plantuml.com.ctreber.aclib.gui.MOBoolean;
+import ext.plantuml.com.ctreber.aclib.gui.MODouble;
+import ext.plantuml.com.ctreber.aclib.gui.MOEnum;
+import ext.plantuml.com.ctreber.aclib.gui.MOInteger;
+import ext.plantuml.com.ctreber.aclib.gui.MOString;
+import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject;
+
+/**
+ *
+ * How to avoid writing all the accessors? Code generator that creates derived
+ * class from template class? Configuration items in data structure?
+ *
+ * Construct a canvas of the specified size.
+ *
+ * @param pWidth
+ * Width
+ * @param pHeight
+ * Height
+ */
+ public PixelCanvas(int pWidth, int pHeight) {
+ fImageWidth = pWidth;
+ fImageHeight = pHeight;
+ fEarthImage2 = new BufferedImage(fImageWidth, fImageHeight, BufferedImage.TYPE_INT_RGB);
+ }
+
+ public Graphics2D getGraphics2D() {
+ return fEarthImage2.createGraphics();
+ }
+
+ public void setPixel(int pX, int pY, int pA, int pR, int pG, int pB) {
+ setPixel(pX, pY, new Color(pR, pG, pB, pA));
+ }
+
+ public void setPixel(int pX, int pY, Color pColor) {
+ fEarthImage2.setRGB(pX, pY, pColor.getRGB());
+ }
+
+ public int getImageWidth() {
+ return fImageWidth;
+ }
+
+ public int getImageHeight() {
+ return fImageHeight;
+ }
+
+ public boolean saveToImage(String pFileName, String pFormat) throws IOException {
+ return ImageIO.write(fEarthImage2, pFormat, new File(pFileName));
+ }
+
+ public void saveToImage(OutputStream os) throws IOException {
+ ImageIO.write(fEarthImage2, "png", os);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/MapData.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/MapData.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/MapData.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/MapData.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,6835 @@
+package ext.plantuml.com.ctreber.acearth;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
AC.earth - XEarth for Java
+ *
+ *
+ *
+ * The original XEarth was written by Kirk Johnson in July 1993 - thank you for
+ * writing this great little program and making it available for free!
+ *
+ *
+ * I wanted to extend the program, but not in C. So I created this Java version,
+ * and found the process quite painfull interesting. The
+ * biggest effort went into resolving references between C files and
+ * eliminatiing pointers.
+ *
+ *
+ * AC.earth is based on XEarth by Kirk Johnson
+ *
+ *
+ * To comply with the XEarth license I include the following text:
+ *
+ *
+ * XEarth Copyright (C) 1989, 1990, 1993-1995, 1999 Kirk Lauritz Johnson
+ * Parts of the source code are:
+ * Copyright (C) 1989, 1990, 1991 by Jim Frost
+ * Copyright (C) 1992 by Jamie Zawinski <jwz@lucid.com>
+ * Permission to use, copy, modify and freely distribute xearth for
+ * non-commercial and not-for-profit purposes is hereby granted
+ * without fee, provided that both the above copyright notice and this
+ * permission notice appear in all copies and in supporting
+ * documentation.
+ * [Section refering to GIF omitted because it doesn't apply to this version]
+ * The author makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT
+ * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, d OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *
+ *
+ * The license for this program (AC.earth) is the same as the quoted license
+ * above, with one change: The "copyright notice and permission notice" shall
+ * include the entire text of this section.
+ *
+ * todo Phase 2: Make grid value stuff more meaningful ("every n degrees") todo
+ * Phase 2: Enter fixed time as d and time, not seconds since epoch todo
+ * Phase 2: Compact map d into binary file
+ *
+ *
Project 3D point on y axis.
+ */
+ abstract public double projectY(double pY);
+
+ abstract public double inverseProjectY(double pY);
+
+ /**
+ *
Project 3D point on x axis.
+ */
+ abstract protected double projectX(double pX, double pZ);
+
+ abstract public double inverseProjectX(double pX);
+
+ public abstract boolean isVisible(Point3D pPoint);
+
+ public boolean isWithinImage(Point2D pPoint)
+ {
+ return (pPoint.getX() >= 0) && (pPoint.getX() < fImageWidth) &&
+ (pPoint.getY() >= 0) && (pPoint.getY() < fImageHeight);
+ }
+
+ /**
+ *
Translate screen point into coordinate on Earth.
+ *
+ * @param pX
+ * @param pY
+ * @return
+ */
+ abstract public Coordinate getLocation(int pX, int pY);
+
+ /**
+ *
Imagine view the globe, N is up, S is down, and N0E0 is in the center.
+ * x is right/left, y is up/down, and z is front/rear.
+ *
+ *
Map points are located on the surface of a unit sphere (diameter = 1).
+ * Latitude is the angle between x and y or z and y. Longitude is the angle
+ * between x and z.
+ *
+ *
Why? The way we choose our global coordinate system, longitude circles
+ * (latidude variable) always have the same size while the size of
+ * latidude circles (longitude variable) depends on the latitude.
+ *
+ * @param pPoint
+ * @return
+ */
+ public Point2D project2D(Point3D pPoint)
+ {
+ return new Point2D(projectX(pPoint.getX(), pPoint.getZ()),
+ projectY(pPoint.getY()));
+ }
+
+ public Point2D finalize(Point2D pPoint)
+ {
+ return new Point2D(finalizeX(pPoint.getX()), finalizeY(pPoint.getY()));
+ }
+
+ /**
+ *
Since the final mapping is relative to the center of the image
+ * -PI and PI get mapped to the left and right border respectively.
+ * But see ProjectionOrtho.setScale().
+ */
+ public double finalizeX(double pX)
+ {
+ return fXOffset + fScale * pX;
+ }
+
+ /**
+ *
Since the final mapping is relative to the center of the image
+ * -PI and PI get mapped to the bottom and top border respectively.
+ * But see ProjectionOrtho.setScale().
+ */
+ public double finalizeY(double pY)
+ {
+ return fYOffset - fScale * pY;
+ }
+
+ /**
+ *
All of Earth is visible.
+ *
+ * @param pPoint
+ * @return
+ */
+ public boolean isVisible(Point3D pPoint)
+ {
+ return pPoint.getZ() >= 0;
+ }
+
+ public Coordinate getLocation(int pX, int pY)
+ {
+ final double lX = inverseFinalizeX(pX);
+ final double lY = inverseFinalizeY(pY);
+ final double lZ = Math.sqrt(1 - lX * lX - lY * lY);
+ final Point3D lP = new Point3D(lX, lY, lZ);
+
+ return rotateReverse(lP).getCoordinate();
+ }
+
+ /**
+ * @return Longitude, not in rad but from -1 to 1.
+ */
+ public double projectX(double pX, double pZ)
+ {
+ return pX;
+ }
+
+ public double inverseProjectX(double pX)
+ {
+ return pX;
+ }
+
+ /**
+ * @return Latitude, not in rad but from -1 to 1.
+ */
+ public double projectY(double pY)
+ {
+ return pY;
+ }
+
+ public double inverseProjectY(double pY)
+ {
+ return pY;
+ }
+
+ /**
+ *
The scale is not from -PI to PI but from -1 to 1 in this case
+ * (the range of x, y, z of the points).
+ */
+ protected void setScale()
+ {
+ fScale = Math.min(fImageHeight, fImageWidth) * fViewMagnification * 0.99 / 2;
+ }
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,92 @@
+package ext.plantuml.com.ctreber.acearth.renderer;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import ext.plantuml.com.ctreber.acearth.shader.Shader;
+
+/**
+ *
+ * Uses defined RowTypeRenderers and Shader to render to render target.
+ *
+ *
For each line, the scanbuffer (= a raster divice) records the points hit
+ * I.e., line 5 (y=5) contains the values 2, 6, 40, and 46 (these line have
+ * been crossed). The values always come as pairs because we're dealing with
+ * polygons, which have a left and a right side which consists of a line.
+ * The points in between two values painted as filled.
+ *
+ *
+ * @author Christian Treber, ct@ctreber.com
+ *
+ */
+abstract public class Shader
+{
+ private static final Color COLOR_SPACE = Color.black;
+ private static final Color COLOR_STAR = Color.white;
+ private static final Color COLOR_WATER = Color.blue;
+ private static final Color COLOR_LAND = Color.green;
+ // Brown
+ //static final Color COLOR_LAND = new Color(255, 136, 25);
+ private static final Color COLOR_GRID_LAND = Color.white;
+ // Bright blue
+ private static final Color COLOR_GRID_WATER = new Color(128, 128, 255);
+
+ /**
Needed to calculate lighting vectors. */
+ Projection fProjection;
+
+ // Stuff below only needed when shading.
+ private Coordinate fSunPos;
+ private double fNightSideBrightness;
+ private double fDaySideBrightness;
+ private double fTerminatorDiscontinuity;
+
+ private double fDaySideValueBase;
+ private double fDaySideValueRange;
+ Point3D fLightVector;
+
+ abstract public Color[] getShadedColors(int pRowNo, int[] pRowTypes);
+
+ public void init()
+ {
+ // Precompute shading parameters. I personally find the terminator
+ // stuff is obscure and might as well be left out.
+ final double tmp = fTerminatorDiscontinuity / 100;
+ // 100%: day, 0%: night
+ fDaySideValueBase = (int)(tmp * fDaySideBrightness +
+ (1 - tmp) * fNightSideBrightness);
+ fDaySideValueRange = fDaySideBrightness - fDaySideValueBase;
+ fLightVector = fProjection.rotate(fSunPos.getPoint3D());
+ }
+
+ Color getShadedColorForType(int pType, double pSunValue)
+ {
+ double lBrightness;
+
+ if(pSunValue < 0)
+ {
+ // The sun is below the horizon.
+ lBrightness = fNightSideBrightness / 100;
+ } else
+ {
+ // The sun is above the horizon. The brightness will range from
+ // the base to the maximum value.
+ lBrightness = (fDaySideValueBase + pSunValue * fDaySideValueRange) / 100;
+ }
+ if(lBrightness > 1.0)
+ {
+ lBrightness = 1.0;
+ }
+
+ switch(pType)
+ {
+ case BitGeneratorMap.PixTypeSpace:
+ return COLOR_SPACE;
+
+ case BitGeneratorMap.PixTypeStar:
+ return COLOR_STAR;
+
+ case BitGeneratorMap.PixTypeGridLand:
+ return shade(COLOR_GRID_LAND, lBrightness);
+
+ case BitGeneratorMap.PixTypeGridWater:
+ return shade(COLOR_GRID_WATER, lBrightness);
+
+ case BitGeneratorMap.PixTypeLand:
+ return shade(COLOR_LAND, lBrightness);
+
+ case BitGeneratorMap.PixTypeWater:
+ return shade(COLOR_WATER, lBrightness);
+ }
+
+ return null;
+ }
+
+ private static Color shade(Color pColor, double pBrightness)
+ {
+ return new Color((int)(pColor.getRed() * pBrightness),
+ (int)(pColor.getGreen() * pBrightness),
+ (int)(pColor.getBlue() * pBrightness));
+ }
+
+ public void setProjection(Projection pProjection)
+ {
+ fProjection = pProjection;
+ }
+
+ public void setSunPos(Coordinate pSunPos)
+ {
+ fSunPos = pSunPos;
+ }
+
+ public void setDaySideBrightness(double pDaySideBrightness)
+ {
+ fDaySideBrightness = pDaySideBrightness;
+ }
+
+ public void setNightSideBrightness(double pNightSideBrightness)
+ {
+ fNightSideBrightness = pNightSideBrightness;
+ }
+
+ public void setTerminatorDiscontinuity(double pTerminatorDiscontinuity)
+ {
+ fTerminatorDiscontinuity = pTerminatorDiscontinuity;
+ }
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,55 @@
+package ext.plantuml.com.ctreber.acearth.shader;
+
+import java.awt.Color;
+
+/**
+ *
computing julian dates (assuming gregorian calendar, thus this is
+ * only valid for dates of 1582 oct 15 or later)
+ * (after duffett-smith, section 4)
+ *
+ *
Verified.
+ *
+ * @param pYear year (e.g. 19xx)
+ * @param pMonth month (jan=1, feb=2, ...)
+ * @param pDay day of month
+ */
+ private static double getJulianDate(int pYear, int pMonth, int pDay)
+ {
+ if((pMonth == 1) || (pMonth == 2))
+ {
+ pYear -= 1;
+ pMonth += 12;
+ }
+
+ final int A = pYear / 100;
+ final int B = 2 - A + (A / 4);
+ final int C = (int)(365.25 * pYear);
+ final int D = (int)(30.6001 * (pMonth + 1));
+
+ return B + C + D + pDay + 1720994.5;
+ }
+
+
+ /**
+ *
compute greenwich mean sidereal time (getGST) corresponding to a given
+ * number of milliseconds since the unix epoch
+ * (after duffett-smith, section 12)
+ *
+ *
Given a particular time (expressed in milliseconds since the unix
+ * epoch), compute position on the earth (lat, lon) such that sun is
+ * directly overhead.
+ *
+ *
Verified.
+ *
+ * @param pMillis seconds since unix epoch
+ *
+ */
+ public static Coordinate getSunPositionOnEarth(long pMillis)
+ {
+ final Coordinate lSunPosEc = new Coordinate(0.0, getSunEclipticLongitude(pMillis));
+ final Coordinate lSunPosEq = lSunPosEc.eclipticToEquatorial();
+
+ final double lRA = Toolkit.limitRads(lSunPosEq.getRA() - (Toolkit.TWOPI / 24) * getGST(pMillis));
+
+ return new Coordinate(Toolkit.radsToDegs(lSunPosEq.getDE()), Toolkit.radsToDegs(lRA));
+ }
+
+ /**
+ *
Given a particular time (expressed in milliseconds since the unix
+ * epoch), compute position on the earth (lat, lon) such that the
+ * moon is directly overhead.
+ *
+ * Based on duffett-smith **2nd ed** section 61; combines some steps
+ * into single expressions to reduce the number of extra variables.
+ *
+ *
Verified.
+ */
+ public static Coordinate getMoonPositionOnEarth(long pMillis)
+ {
+ final double lDays = daysSinceEpoch(pMillis);
+ double lSunLongEc = getSunEclipticLongitude(pMillis);
+ final double Ms = getMeanSunLongitude(lDays);
+
+ double L = Toolkit.limitRads(Toolkit.fmod(lDays / SIDERAL_MONTH, 0, 1.0) * Toolkit.TWOPI + MOON_MEAN_LONGITUDE);
+ double Mm = Toolkit.limitRads(L - Toolkit.degsToRads(0.1114041 * lDays) - MOON_MEAN_LONGITUDE_PERIGEE);
+ double N = Toolkit.limitRads(MOON_MEAN_LONGITUDE_NODE - Toolkit.degsToRads(0.0529539 * lDays));
+ final double Ev = Toolkit.degsToRads(1.2739) * Math.sin(2.0 * (L - lSunLongEc) - Mm);
+ final double Ae = Toolkit.degsToRads(0.1858) * Math.sin(Ms);
+ Mm += Ev - Ae - Toolkit.degsToRads(0.37) * Math.sin(Ms);
+ final double Ec = Toolkit.degsToRads(6.2886) * Math.sin(Mm);
+ L += Ev + Ec - Ae + Toolkit.degsToRads(0.214) * Math.sin(2.0 * Mm);
+ L += Toolkit.degsToRads(0.6583) * Math.sin(2.0 * (L - lSunLongEc));
+ N -= Toolkit.degsToRads(0.16) * Math.sin(Ms);
+
+ L -= N;
+ lSunLongEc = Toolkit.limitRads((Math.abs(Math.cos(L)) < 1e-12) ?
+ (N + Math.sin(L) * Math.cos(MOON_INCLINATION) * Math.PI / 2) :
+ (N + Math.atan2(Math.sin(L) * Math.cos(MOON_INCLINATION), Math.cos(L))));
+ final double lSunLatEc = Math.asin(Math.sin(L) * Math.sin(MOON_INCLINATION));
+
+ final Coordinate lSunPosEq = new Coordinate(lSunLatEc, lSunLongEc).eclipticToEquatorial();
+ final double lRA = Toolkit.limitRads(lSunPosEq.getRA() - (Toolkit.TWOPI / 24) * getGST(pMillis));
+
+ return new Coordinate(Toolkit.radsToDegs(lSunPosEq.getDE()), Toolkit.radsToDegs(lRA));
+ }
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java
--- plantuml-1.2017.15/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,135 @@
+package ext.plantuml.com.ctreber.acearth.util;
+
+import java.util.HashSet;
+import java.util.StringTokenizer;
+
+/**
+ *
A simple, fast array of bits, represented compactly by an array of ints internally.
+ *
+ * @author Sean Owen
+ */
+public final class BitArray {
+
+ // TODO: I have changed these members to be public so ProGuard can inline get() and set(). Ideally
+ // they'd be private and we'd use the -allowaccessmodification flag, but Dalvik rejects the
+ // resulting binary at runtime on Android. If we find a solution to this, these should be changed
+ // back to private.
+ public int[] bits;
+ public int size;
+
+ public BitArray() {
+ this.size = 0;
+ this.bits = new int[1];
+ }
+
+ public BitArray(int size) {
+ this.size = size;
+ this.bits = makeArray(size);
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public int getSizeInBytes() {
+ return (size + 7) >> 3;
+ }
+
+ private void ensureCapacity(int size) {
+ if (size > bits.length << 5) {
+ int[] newBits = makeArray(size);
+ System.arraycopy(bits, 0, newBits, 0, bits.length);
+ this.bits = newBits;
+ }
+ }
+
+ /**
+ * @param i bit to get
+ * @return true iff bit i is set
+ */
+ public boolean get(int i) {
+ return (bits[i >> 5] & (1 << (i & 0x1F))) != 0;
+ }
+
+ /**
+ * Sets bit i.
+ *
+ * @param i bit to set
+ */
+ public void set(int i) {
+ bits[i >> 5] |= 1 << (i & 0x1F);
+ }
+
+ /**
+ * Flips bit i.
+ *
+ * @param i bit to set
+ */
+ public void flip(int i) {
+ bits[i >> 5] ^= 1 << (i & 0x1F);
+ }
+
+ /**
+ * Sets a block of 32 bits, starting at bit i.
+ *
+ * @param i first bit to set
+ * @param newBits the new value of the next 32 bits. Note again that the least-significant bit
+ * corresponds to bit i, the next-least-significant to i+1, and so on.
+ */
+ public void setBulk(int i, int newBits) {
+ bits[i >> 5] = newBits;
+ }
+
+ /**
+ * Clears all bits (sets to false).
+ */
+ public void clear() {
+ int max = bits.length;
+ for (int i = 0; i < max; i++) {
+ bits[i] = 0;
+ }
+ }
+
+ /**
+ * Efficient method to check if a range of bits is set, or not set.
+ *
+ * @param start start of range, inclusive.
+ * @param end end of range, exclusive
+ * @param value if true, checks that bits in range are set, otherwise checks that they are not set
+ * @return true iff all bits are set or not set in range, according to value argument
+ * @throws IllegalArgumentException if end is less than or equal to start
+ */
+ public boolean isRange(int start, int end, boolean value) {
+ if (end < start) {
+ throw new IllegalArgumentException();
+ }
+ if (end == start) {
+ return true; // empty range matches
+ }
+ end--; // will be easier to treat this as the last actually set bit -- inclusive
+ int firstInt = start >> 5;
+ int lastInt = end >> 5;
+ for (int i = firstInt; i <= lastInt; i++) {
+ int firstBit = i > firstInt ? 0 : start & 0x1F;
+ int lastBit = i < lastInt ? 31 : end & 0x1F;
+ int mask;
+ if (firstBit == 0 && lastBit == 31) {
+ mask = -1;
+ } else {
+ mask = 0;
+ for (int j = firstBit; j <= lastBit; j++) {
+ mask |= 1 << j;
+ }
+ }
+
+ // Return false if we're looking for 1s and the masked bits[i] isn't all 1s (that is,
+ // equals the mask, or we're looking for 0s and the masked portion is not all 0s
+ if ((bits[i] & mask) != (value ? mask : 0)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void appendBit(boolean bit) {
+ ensureCapacity(size + 1);
+ if (bit) {
+ bits[size >> 5] |= (1 << (size & 0x1F));
+ }
+ size++;
+ }
+
+ /**
+ * Appends the least-significant bits, from value, in order from most-significant to
+ * least-significant. For example, appending 6 bits from 0x000001E will append the bits
+ * 0, 1, 1, 1, 1, 0 in that order.
+ */
+ public void appendBits(int value, int numBits) {
+ if (numBits < 0 || numBits > 32) {
+ throw new IllegalArgumentException("Num bits must be between 0 and 32");
+ }
+ ensureCapacity(size + numBits);
+ for (int numBitsLeft = numBits; numBitsLeft > 0; numBitsLeft--) {
+ appendBit(((value >> (numBitsLeft - 1)) & 0x01) == 1);
+ }
+ }
+
+ public void appendBitArray(BitArray other) {
+ int otherSize = other.getSize();
+ ensureCapacity(size + otherSize);
+ for (int i = 0; i < otherSize; i++) {
+ appendBit(other.get(i));
+ }
+ }
+
+ public void xor(BitArray other) {
+ if (bits.length != other.bits.length) {
+ throw new IllegalArgumentException("Sizes don't match");
+ }
+ for (int i = 0; i < bits.length; i++) {
+ // The last byte could be incomplete (i.e. not have 8 bits in
+ // it) but there is no problem since 0 XOR 0 == 0.
+ bits[i] ^= other.bits[i];
+ }
+ }
+
+ /**
+ *
+ * @param bitOffset first bit to start writing
+ * @param array array to write into. Bytes are written most-significant byte first. This is the opposite
+ * of the internal representation, which is exposed by {@link #getBitArray()}
+ * @param offset position in array to start writing
+ * @param numBytes how many bytes to write
+ */
+ public void toBytes(int bitOffset, byte[] array, int offset, int numBytes) {
+ for (int i = 0; i < numBytes; i++) {
+ int theByte = 0;
+ for (int j = 0; j < 8; j++) {
+ if (get(bitOffset)) {
+ theByte |= 1 << (7 - j);
+ }
+ bitOffset++;
+ }
+ array[offset + i] = (byte) theByte;
+ }
+ }
+
+ /**
+ * @return underlying array of ints. The first element holds the first 32 bits, and the least
+ * significant bit is bit 0.
+ */
+ public int[] getBitArray() {
+ return bits;
+ }
+
+ /**
+ * Reverses all bits in the array.
+ */
+ public void reverse() {
+ int[] newBits = new int[bits.length];
+ int size = this.size;
+ for (int i = 0; i < size; i++) {
+ if (get(size - i - 1)) {
+ newBits[i >> 5] |= 1 << (i & 0x1F);
+ }
+ }
+ bits = newBits;
+ }
+
+ private static int[] makeArray(int size) {
+ return new int[(size + 31) >> 5];
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer(size);
+ for (int i = 0; i < size; i++) {
+ if ((i & 0x07) == 0) {
+ result.append(' ');
+ }
+ result.append(get(i) ? 'X' : '.');
+ }
+ return result.toString();
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/BitMatrix.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/BitMatrix.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/BitMatrix.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/BitMatrix.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+/**
+ *
Represents a 2D matrix of bits. In function arguments below, and throughout the common
+ * module, x is the column position, and y is the row position. The ordering is always x, y.
+ * The origin is at the top-left.
+ *
+ *
Internally the bits are represented in a 1-D array of 32-bit ints. However, each row begins
+ * with a new int. This is done intentionally so that we can copy out a row into a BitArray very
+ * efficiently.
+ *
+ *
The ordering of bits is row-major. Within each int, the least significant bits are used first,
+ * meaning they represent lower x values. This is compatible with BitArray's implementation.
+ *
+ * @author Sean Owen
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class BitMatrix {
+
+ // TODO: Just like BitArray, these need to be public so ProGuard can inline them.
+ public final int width;
+ public final int height;
+ public final int rowSize;
+ public final int[] bits;
+
+ // A helper to construct a square matrix.
+ public BitMatrix(int dimension) {
+ this(dimension, dimension);
+ }
+
+ public BitMatrix(int width, int height) {
+ if (width < 1 || height < 1) {
+ throw new IllegalArgumentException("Both dimensions must be greater than 0");
+ }
+ this.width = width;
+ this.height = height;
+ this.rowSize = (width + 31) >> 5;
+ bits = new int[rowSize * height];
+ }
+
+ /**
+ *
Gets the requested bit, where true means black.
+ *
+ * @param x The horizontal component (i.e. which column)
+ * @param y The vertical component (i.e. which row)
+ * @return value of given bit in matrix
+ */
+ public boolean get(int x, int y) {
+ int offset = y * rowSize + (x >> 5);
+ return ((bits[offset] >>> (x & 0x1f)) & 1) != 0;
+ }
+
+ /**
+ *
Sets the given bit to true.
+ *
+ * @param x The horizontal component (i.e. which column)
+ * @param y The vertical component (i.e. which row)
+ */
+ public void set(int x, int y) {
+ int offset = y * rowSize + (x >> 5);
+ bits[offset] |= 1 << (x & 0x1f);
+ }
+
+ /**
+ *
Flips the given bit.
+ *
+ * @param x The horizontal component (i.e. which column)
+ * @param y The vertical component (i.e. which row)
+ */
+ public void flip(int x, int y) {
+ int offset = y * rowSize + (x >> 5);
+ bits[offset] ^= 1 << (x & 0x1f);
+ }
+
+ /**
+ * Clears all bits (sets to false).
+ */
+ public void clear() {
+ int max = bits.length;
+ for (int i = 0; i < max; i++) {
+ bits[i] = 0;
+ }
+ }
+
+ /**
+ *
Sets a square region of the bit matrix to true.
+ *
+ * @param left The horizontal position to begin at (inclusive)
+ * @param top The vertical position to begin at (inclusive)
+ * @param width The width of the region
+ * @param height The height of the region
+ */
+ public void setRegion(int left, int top, int width, int height) {
+ if (top < 0 || left < 0) {
+ throw new IllegalArgumentException("Left and top must be nonnegative");
+ }
+ if (height < 1 || width < 1) {
+ throw new IllegalArgumentException("Height and width must be at least 1");
+ }
+ int right = left + width;
+ int bottom = top + height;
+ if (bottom > this.height || right > this.width) {
+ throw new IllegalArgumentException("The region must fit inside the matrix");
+ }
+ for (int y = top; y < bottom; y++) {
+ int offset = y * rowSize;
+ for (int x = left; x < right; x++) {
+ bits[offset + (x >> 5)] |= 1 << (x & 0x1f);
+ }
+ }
+ }
+
+ /**
+ * A fast method to retrieve one row of data from the matrix as a BitArray.
+ *
+ * @param y The row to retrieve
+ * @param row An optional caller-allocated BitArray, will be allocated if null or too small
+ * @return The resulting BitArray - this reference should always be used even when passing
+ * your own row
+ */
+ public BitArray getRow(int y, BitArray row) {
+ if (row == null || row.getSize() < width) {
+ row = new BitArray(width);
+ }
+ int offset = y * rowSize;
+ for (int x = 0; x < rowSize; x++) {
+ row.setBulk(x << 5, bits[offset + x]);
+ }
+ return row;
+ }
+
+ /**
+ * This is useful in detecting a corner of a 'pure' barcode.
+ *
+ * @return {x,y} coordinate of top-left-most 1 bit, or null if it is all white
+ */
+ public int[] getTopLeftOnBit() {
+ int bitsOffset = 0;
+ while (bitsOffset < bits.length && bits[bitsOffset] == 0) {
+ bitsOffset++;
+ }
+ if (bitsOffset == bits.length) {
+ return null;
+ }
+ int y = bitsOffset / rowSize;
+ int x = (bitsOffset % rowSize) << 5;
+
+ int theBits = bits[bitsOffset];
+ int bit = 0;
+ while ((theBits << (31-bit)) == 0) {
+ bit++;
+ }
+ x += bit;
+ return new int[] {x, y};
+ }
+
+ /**
+ * @return The width of the matrix
+ */
+ public int getWidth() {
+ return width;
+ }
+
+ /**
+ * @return The height of the matrix
+ */
+ public int getHeight() {
+ return height;
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof BitMatrix)) {
+ return false;
+ }
+ BitMatrix other = (BitMatrix) o;
+ if (width != other.width || height != other.height ||
+ rowSize != other.rowSize || bits.length != other.bits.length) {
+ return false;
+ }
+ for (int i = 0; i < bits.length; i++) {
+ if (bits[i] != other.bits[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public int hashCode() {
+ int hash = width;
+ hash = 31 * hash + width;
+ hash = 31 * hash + height;
+ hash = 31 * hash + rowSize;
+ for (int i = 0; i < bits.length; i++) {
+ hash = 31 * hash + bits[i];
+ }
+ return hash;
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer(height * (width + 1));
+ for (int y = 0; y < height; y++) {
+ for (int x = 0; x < width; x++) {
+ result.append(get(x, y) ? "X " : " ");
+ }
+ result.append('\n');
+ }
+ return result.toString();
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/BitSource.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/BitSource.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/BitSource.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/BitSource.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+/**
+ *
This provides an easy abstraction to read bits at a time from a sequence of bytes, where the
+ * number of bits read is not often a multiple of 8.
+ *
+ *
This class is thread-safe but not reentrant. Unless the caller modifies the bytes array
+ * it passed in, in which case all bets are off.
+ *
+ * @author Sean Owen
+ */
+public final class BitSource {
+
+ private final byte[] bytes;
+ private int byteOffset;
+ private int bitOffset;
+
+ /**
+ * @param bytes bytes from which this will read bits. Bits will be read from the first byte first.
+ * Bits are read within a byte from most-significant to least-significant bit.
+ */
+ public BitSource(byte[] bytes) {
+ this.bytes = bytes;
+ }
+
+ /**
+ * @param numBits number of bits to read
+ * @return int representing the bits read. The bits will appear as the least-significant
+ * bits of the int
+ * @throws IllegalArgumentException if numBits isn't in [1,32]
+ */
+ public int readBits(int numBits) {
+ if (numBits < 1 || numBits > 32) {
+ throw new IllegalArgumentException();
+ }
+
+ int result = 0;
+
+ // First, read remainder from current byte
+ if (bitOffset > 0) {
+ int bitsLeft = 8 - bitOffset;
+ int toRead = numBits < bitsLeft ? numBits : bitsLeft;
+ int bitsToNotRead = bitsLeft - toRead;
+ int mask = (0xFF >> (8 - toRead)) << bitsToNotRead;
+ result = (bytes[byteOffset] & mask) >> bitsToNotRead;
+ numBits -= toRead;
+ bitOffset += toRead;
+ if (bitOffset == 8) {
+ bitOffset = 0;
+ byteOffset++;
+ }
+ }
+
+ // Next read whole bytes
+ if (numBits > 0) {
+ while (numBits >= 8) {
+ result = (result << 8) | (bytes[byteOffset] & 0xFF);
+ byteOffset++;
+ numBits -= 8;
+ }
+
+ // Finally read a partial byte
+ if (numBits > 0) {
+ int bitsToNotRead = 8 - numBits;
+ int mask = (0xFF >> bitsToNotRead) << bitsToNotRead;
+ result = (result << numBits) | ((bytes[byteOffset] & mask) >> bitsToNotRead);
+ bitOffset += numBits;
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * @return number of bits that can be read successfully
+ */
+ public int available() {
+ return 8 * (bytes.length - byteOffset) - bitOffset;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+import java.util.Hashtable;
+
+/**
+ * Encapsulates a Character Set ECI, according to "Extended Channel Interpretations" 5.3.1.1
+ * of ISO 18004.
+ *
+ * @author Sean Owen
+ */
+public final class CharacterSetECI extends ECI {
+
+ private static Hashtable VALUE_TO_ECI;
+ private static Hashtable NAME_TO_ECI;
+
+ private static void initialize() {
+ VALUE_TO_ECI = new Hashtable(29);
+ NAME_TO_ECI = new Hashtable(29);
+ // TODO figure out if these values are even right!
+ addCharacterSet(0, "Cp437");
+ addCharacterSet(1, new String[] {"ISO8859_1", "ISO-8859-1"});
+ addCharacterSet(2, "Cp437");
+ addCharacterSet(3, new String[] {"ISO8859_1", "ISO-8859-1"});
+ addCharacterSet(4, "ISO8859_2");
+ addCharacterSet(5, "ISO8859_3");
+ addCharacterSet(6, "ISO8859_4");
+ addCharacterSet(7, "ISO8859_5");
+ addCharacterSet(8, "ISO8859_6");
+ addCharacterSet(9, "ISO8859_7");
+ addCharacterSet(10, "ISO8859_8");
+ addCharacterSet(11, "ISO8859_9");
+ addCharacterSet(12, "ISO8859_10");
+ addCharacterSet(13, "ISO8859_11");
+ addCharacterSet(15, "ISO8859_13");
+ addCharacterSet(16, "ISO8859_14");
+ addCharacterSet(17, "ISO8859_15");
+ addCharacterSet(18, "ISO8859_16");
+ addCharacterSet(20, new String[] {"SJIS", "Shift_JIS"});
+ }
+
+ private final String encodingName;
+
+ private CharacterSetECI(int value, String encodingName) {
+ super(value);
+ this.encodingName = encodingName;
+ }
+
+ public String getEncodingName() {
+ return encodingName;
+ }
+
+ private static void addCharacterSet(int value, String encodingName) {
+ CharacterSetECI eci = new CharacterSetECI(value, encodingName);
+ VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
+ NAME_TO_ECI.put(encodingName, eci);
+ }
+
+ private static void addCharacterSet(int value, String[] encodingNames) {
+ CharacterSetECI eci = new CharacterSetECI(value, encodingNames[0]);
+ VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
+ for (int i = 0; i < encodingNames.length; i++) {
+ NAME_TO_ECI.put(encodingNames[i], eci);
+ }
+ }
+
+ /**
+ * @param value character set ECI value
+ * @return {@link CharacterSetECI} representing ECI of given value, or null if it is legal but
+ * unsupported
+ * @throws IllegalArgumentException if ECI value is invalid
+ */
+ public static CharacterSetECI getCharacterSetECIByValue(int value) {
+ if (VALUE_TO_ECI == null) {
+ initialize();
+ }
+ if (value < 0 || value >= 900) {
+ throw new IllegalArgumentException("Bad ECI value: " + value);
+ }
+ return (CharacterSetECI) VALUE_TO_ECI.get(new Integer(value));
+ }
+
+ /**
+ * @param name character set ECI encoding name
+ * @return {@link CharacterSetECI} representing ECI for character encoding, or null if it is legal
+ * but unsupported
+ */
+ public static CharacterSetECI getCharacterSetECIByName(String name) {
+ if (NAME_TO_ECI == null) {
+ initialize();
+ }
+ return (CharacterSetECI) NAME_TO_ECI.get(name);
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/DecoderResult.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/DecoderResult.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/DecoderResult.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/DecoderResult.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+import java.util.Vector;
+
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+/**
+ *
Encapsulates the result of decoding a matrix of bits. This typically
+ * applies to 2D barcode formats. For now it contains the raw bytes obtained,
+ * as well as a String interpretation of those bytes, if applicable.
+ *
+ * @author Sean Owen
+ */
+public final class DecoderResult {
+
+ private final byte[] rawBytes;
+ private final String text;
+ private final Vector byteSegments;
+ private final ErrorCorrectionLevel ecLevel;
+
+ public DecoderResult(byte[] rawBytes, String text, Vector byteSegments, ErrorCorrectionLevel ecLevel) {
+ if (rawBytes == null && text == null) {
+ throw new IllegalArgumentException();
+ }
+ this.rawBytes = rawBytes;
+ this.text = text;
+ this.byteSegments = byteSegments;
+ this.ecLevel = ecLevel;
+ }
+
+ public byte[] getRawBytes() {
+ return rawBytes;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public Vector getByteSegments() {
+ return byteSegments;
+ }
+
+ public ErrorCorrectionLevel getECLevel() {
+ return ecLevel;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/DetectorResult.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/DetectorResult.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/DetectorResult.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/DetectorResult.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+import ext.plantuml.com.google.zxing.ResultPoint;
+
+/**
+ *
Encapsulates the result of detecting a barcode in an image. This includes the raw
+ * matrix of black/white pixels corresponding to the barcode, and possibly points of interest
+ * in the image, like the location of finder patterns or corners of the barcode in the image.
+ *
+ * @author Sean Owen
+ */
+public final class DetectorResult {
+
+ private final BitMatrix bits;
+ private final ResultPoint[] points;
+
+ public DetectorResult(BitMatrix bits, ResultPoint[] points) {
+ this.bits = bits;
+ this.points = points;
+ }
+
+ public BitMatrix getBits() {
+ return bits;
+ }
+
+ public ResultPoint[] getPoints() {
+ return points;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/ECI.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/ECI.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/ECI.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/ECI.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+/**
+ * Superclass of classes encapsulating types ECIs, according to "Extended Channel Interpretations"
+ * 5.3 of ISO 18004.
+ *
+ * @author Sean Owen
+ */
+public abstract class ECI {
+
+ private final int value;
+
+ ECI(int value) {
+ this.value = value;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * @param value ECI value
+ * @return {@link ECI} representing ECI of given value, or null if it is legal but unsupported
+ * @throws IllegalArgumentException if ECI value is invalid
+ */
+ public static ECI getECIByValue(int value) {
+ if (value < 0 || value > 999999) {
+ throw new IllegalArgumentException("Bad ECI value: " + value);
+ }
+ if (value < 900) { // Character set ECIs use 000000 - 000899
+ return CharacterSetECI.getCharacterSetECIByValue(value);
+ }
+ return null;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common.reedsolomon;
+
+/**
+ *
This class contains utility methods for performing mathematical operations over
+ * the Galois Field GF(256). Operations use a given primitive polynomial in calculations.
+ *
+ *
Throughout this package, elements of GF(256) are represented as an int
+ * for convenience and speed (but at the cost of memory).
+ * Only the bottom 8 bits are really used.
+ *
+ * @author Sean Owen
+ */
+public final class GF256 {
+
+ public static final GF256 QR_CODE_FIELD = new GF256(0x011D); // x^8 + x^4 + x^3 + x^2 + 1
+ public static final GF256 DATA_MATRIX_FIELD = new GF256(0x012D); // x^8 + x^5 + x^3 + x^2 + 1
+
+ private final int[] expTable;
+ private final int[] logTable;
+ private final GF256Poly zero;
+ private final GF256Poly one;
+
+ /**
+ * Create a representation of GF(256) using the given primitive polynomial.
+ *
+ * @param primitive irreducible polynomial whose coefficients are represented by
+ * the bits of an int, where the least-significant bit represents the constant
+ * coefficient
+ */
+ private GF256(int primitive) {
+ expTable = new int[256];
+ logTable = new int[256];
+ int x = 1;
+ for (int i = 0; i < 256; i++) {
+ expTable[i] = x;
+ x <<= 1; // x = x * 2; we're assuming the generator alpha is 2
+ if (x >= 0x100) {
+ x ^= primitive;
+ }
+ }
+ for (int i = 0; i < 255; i++) {
+ logTable[expTable[i]] = i;
+ }
+ // logTable[0] == 0 but this should never be used
+ zero = new GF256Poly(this, new int[]{0});
+ one = new GF256Poly(this, new int[]{1});
+ }
+
+ GF256Poly getZero() {
+ return zero;
+ }
+
+ GF256Poly getOne() {
+ return one;
+ }
+
+ /**
+ * @return the monomial representing coefficient * x^degree
+ */
+ GF256Poly buildMonomial(int degree, int coefficient) {
+ if (degree < 0) {
+ throw new IllegalArgumentException();
+ }
+ if (coefficient == 0) {
+ return zero;
+ }
+ int[] coefficients = new int[degree + 1];
+ coefficients[0] = coefficient;
+ return new GF256Poly(this, coefficients);
+ }
+
+ /**
+ * Implements both addition and subtraction -- they are the same in GF(256).
+ *
+ * @return sum/difference of a and b
+ */
+ static int addOrSubtract(int a, int b) {
+ return a ^ b;
+ }
+
+ /**
+ * @return 2 to the power of a in GF(256)
+ */
+ int exp(int a) {
+ return expTable[a];
+ }
+
+ /**
+ * @return base 2 log of a in GF(256)
+ */
+ int log(int a) {
+ if (a == 0) {
+ throw new IllegalArgumentException();
+ }
+ return logTable[a];
+ }
+
+ /**
+ * @return multiplicative inverse of a
+ */
+ int inverse(int a) {
+ if (a == 0) {
+ throw new ArithmeticException();
+ }
+ return expTable[255 - logTable[a]];
+ }
+
+ /**
+ * @param a
+ * @param b
+ * @return product of a and b in GF(256)
+ */
+ int multiply(int a, int b) {
+ if (a == 0 || b == 0) {
+ return 0;
+ }
+ int logSum = logTable[a] + logTable[b];
+ // index is a sped-up alternative to logSum % 255 since sum
+ // is in [0,510]. Thanks to jmsachs for the idea
+ return expTable[(logSum & 0xFF) + (logSum >>> 8)];
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common.reedsolomon;
+
+/**
+ *
Represents a polynomial whose coefficients are elements of GF(256).
+ * Instances of this class are immutable.
+ *
+ *
Much credit is due to William Rucklidge since portions of this code are an indirect
+ * port of his C++ Reed-Solomon implementation.
+ *
+ * @author Sean Owen
+ */
+final class GF256Poly {
+
+ private final GF256 field;
+ private final int[] coefficients;
+
+ /**
+ * @param field the {@link GF256} instance representing the field to use
+ * to perform computations
+ * @param coefficients coefficients as ints representing elements of GF(256), arranged
+ * from most significant (highest-power term) coefficient to least significant
+ * @throws IllegalArgumentException if argument is null or empty,
+ * or if leading coefficient is 0 and this is not a
+ * constant polynomial (that is, it is not the monomial "0")
+ */
+ GF256Poly(GF256 field, int[] coefficients) {
+ if (coefficients == null || coefficients.length == 0) {
+ throw new IllegalArgumentException();
+ }
+ this.field = field;
+ int coefficientsLength = coefficients.length;
+ if (coefficientsLength > 1 && coefficients[0] == 0) {
+ // Leading term must be non-zero for anything except the constant polynomial "0"
+ int firstNonZero = 1;
+ while (firstNonZero < coefficientsLength && coefficients[firstNonZero] == 0) {
+ firstNonZero++;
+ }
+ if (firstNonZero == coefficientsLength) {
+ this.coefficients = field.getZero().coefficients;
+ } else {
+ this.coefficients = new int[coefficientsLength - firstNonZero];
+ System.arraycopy(coefficients,
+ firstNonZero,
+ this.coefficients,
+ 0,
+ this.coefficients.length);
+ }
+ } else {
+ this.coefficients = coefficients;
+ }
+ }
+
+ int[] getCoefficients() {
+ return coefficients;
+ }
+
+ /**
+ * @return degree of this polynomial
+ */
+ int getDegree() {
+ return coefficients.length - 1;
+ }
+
+ /**
+ * @return true iff this polynomial is the monomial "0"
+ */
+ boolean isZero() {
+ return coefficients[0] == 0;
+ }
+
+ /**
+ * @return coefficient of x^degree term in this polynomial
+ */
+ int getCoefficient(int degree) {
+ return coefficients[coefficients.length - 1 - degree];
+ }
+
+ /**
+ * @return evaluation of this polynomial at a given point
+ */
+ int evaluateAt(int a) {
+ if (a == 0) {
+ // Just return the x^0 coefficient
+ return getCoefficient(0);
+ }
+ int size = coefficients.length;
+ if (a == 1) {
+ // Just the sum of the coefficients
+ int result = 0;
+ for (int i = 0; i < size; i++) {
+ result = GF256.addOrSubtract(result, coefficients[i]);
+ }
+ return result;
+ }
+ int result = coefficients[0];
+ for (int i = 1; i < size; i++) {
+ result = GF256.addOrSubtract(field.multiply(a, result), coefficients[i]);
+ }
+ return result;
+ }
+
+ GF256Poly addOrSubtract(GF256Poly other) {
+ if (!field.equals(other.field)) {
+ throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
+ }
+ if (isZero()) {
+ return other;
+ }
+ if (other.isZero()) {
+ return this;
+ }
+
+ int[] smallerCoefficients = this.coefficients;
+ int[] largerCoefficients = other.coefficients;
+ if (smallerCoefficients.length > largerCoefficients.length) {
+ int[] temp = smallerCoefficients;
+ smallerCoefficients = largerCoefficients;
+ largerCoefficients = temp;
+ }
+ int[] sumDiff = new int[largerCoefficients.length];
+ int lengthDiff = largerCoefficients.length - smallerCoefficients.length;
+ // Copy high-order terms only found in higher-degree polynomial's coefficients
+ System.arraycopy(largerCoefficients, 0, sumDiff, 0, lengthDiff);
+
+ for (int i = lengthDiff; i < largerCoefficients.length; i++) {
+ sumDiff[i] = GF256.addOrSubtract(smallerCoefficients[i - lengthDiff], largerCoefficients[i]);
+ }
+
+ return new GF256Poly(field, sumDiff);
+ }
+
+ GF256Poly multiply(GF256Poly other) {
+ if (!field.equals(other.field)) {
+ throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
+ }
+ if (isZero() || other.isZero()) {
+ return field.getZero();
+ }
+ int[] aCoefficients = this.coefficients;
+ int aLength = aCoefficients.length;
+ int[] bCoefficients = other.coefficients;
+ int bLength = bCoefficients.length;
+ int[] product = new int[aLength + bLength - 1];
+ for (int i = 0; i < aLength; i++) {
+ int aCoeff = aCoefficients[i];
+ for (int j = 0; j < bLength; j++) {
+ product[i + j] = GF256.addOrSubtract(product[i + j],
+ field.multiply(aCoeff, bCoefficients[j]));
+ }
+ }
+ return new GF256Poly(field, product);
+ }
+
+ GF256Poly multiply(int scalar) {
+ if (scalar == 0) {
+ return field.getZero();
+ }
+ if (scalar == 1) {
+ return this;
+ }
+ int size = coefficients.length;
+ int[] product = new int[size];
+ for (int i = 0; i < size; i++) {
+ product[i] = field.multiply(coefficients[i], scalar);
+ }
+ return new GF256Poly(field, product);
+ }
+
+ GF256Poly multiplyByMonomial(int degree, int coefficient) {
+ if (degree < 0) {
+ throw new IllegalArgumentException();
+ }
+ if (coefficient == 0) {
+ return field.getZero();
+ }
+ int size = coefficients.length;
+ int[] product = new int[size + degree];
+ for (int i = 0; i < size; i++) {
+ product[i] = field.multiply(coefficients[i], coefficient);
+ }
+ return new GF256Poly(field, product);
+ }
+
+ GF256Poly[] divide(GF256Poly other) {
+ if (!field.equals(other.field)) {
+ throw new IllegalArgumentException("GF256Polys do not have same GF256 field");
+ }
+ if (other.isZero()) {
+ throw new IllegalArgumentException("Divide by 0");
+ }
+
+ GF256Poly quotient = field.getZero();
+ GF256Poly remainder = this;
+
+ int denominatorLeadingTerm = other.getCoefficient(other.getDegree());
+ int inverseDenominatorLeadingTerm = field.inverse(denominatorLeadingTerm);
+
+ while (remainder.getDegree() >= other.getDegree() && !remainder.isZero()) {
+ int degreeDifference = remainder.getDegree() - other.getDegree();
+ int scale = field.multiply(remainder.getCoefficient(remainder.getDegree()), inverseDenominatorLeadingTerm);
+ GF256Poly term = other.multiplyByMonomial(degreeDifference, scale);
+ GF256Poly iterationQuotient = field.buildMonomial(degreeDifference, scale);
+ quotient = quotient.addOrSubtract(iterationQuotient);
+ remainder = remainder.addOrSubtract(term);
+ }
+
+ return new GF256Poly[] { quotient, remainder };
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer(8 * getDegree());
+ for (int degree = getDegree(); degree >= 0; degree--) {
+ int coefficient = getCoefficient(degree);
+ if (coefficient != 0) {
+ if (coefficient < 0) {
+ result.append(" - ");
+ coefficient = -coefficient;
+ } else {
+ if (result.length() > 0) {
+ result.append(" + ");
+ }
+ }
+ if (degree == 0 || coefficient != 1) {
+ int alphaPower = field.log(coefficient);
+ if (alphaPower == 0) {
+ result.append('1');
+ } else if (alphaPower == 1) {
+ result.append('a');
+ } else {
+ result.append("a^");
+ result.append(alphaPower);
+ }
+ }
+ if (degree != 0) {
+ if (degree == 1) {
+ result.append('x');
+ } else {
+ result.append("x^");
+ result.append(degree);
+ }
+ }
+ }
+ }
+ return result.toString();
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common.reedsolomon;
+
+import java.util.Vector;
+
+/**
+ *
Implements Reed-Solomon enbcoding, as the name implies.
+ *
+ * @author Sean Owen
+ * @author William Rucklidge
+ */
+public final class ReedSolomonEncoder {
+
+ private final GF256 field;
+ private final Vector cachedGenerators;
+
+ public ReedSolomonEncoder(GF256 field) {
+ if (!GF256.QR_CODE_FIELD.equals(field)) {
+ throw new IllegalArgumentException("Only QR Code is supported at this time");
+ }
+ this.field = field;
+ this.cachedGenerators = new Vector();
+ cachedGenerators.addElement(new GF256Poly(field, new int[] { 1 }));
+ }
+
+ private GF256Poly buildGenerator(int degree) {
+ if (degree >= cachedGenerators.size()) {
+ GF256Poly lastGenerator = (GF256Poly) cachedGenerators.elementAt(cachedGenerators.size() - 1);
+ for (int d = cachedGenerators.size(); d <= degree; d++) {
+ GF256Poly nextGenerator = lastGenerator.multiply(new GF256Poly(field, new int[] { 1, field.exp(d - 1) }));
+ cachedGenerators.addElement(nextGenerator);
+ lastGenerator = nextGenerator;
+ }
+ }
+ return (GF256Poly) cachedGenerators.elementAt(degree);
+ }
+
+ public void encode(int[] toEncode, int ecBytes) {
+ if (ecBytes == 0) {
+ throw new IllegalArgumentException("No error correction bytes");
+ }
+ int dataBytes = toEncode.length - ecBytes;
+ if (dataBytes <= 0) {
+ throw new IllegalArgumentException("No data bytes provided");
+ }
+ GF256Poly generator = buildGenerator(ecBytes);
+ int[] infoCoefficients = new int[dataBytes];
+ System.arraycopy(toEncode, 0, infoCoefficients, 0, dataBytes);
+ GF256Poly info = new GF256Poly(field, infoCoefficients);
+ info = info.multiplyByMonomial(ecBytes, 1);
+ GF256Poly remainder = info.divide(generator)[1];
+ int[] coefficients = remainder.getCoefficients();
+ int numZeroCoefficients = ecBytes - coefficients.length;
+ for (int i = 0; i < numZeroCoefficients; i++) {
+ toEncode[dataBytes + i] = 0;
+ }
+ System.arraycopy(coefficients, 0, toEncode, dataBytes + numZeroCoefficients, coefficients.length);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common.reedsolomon;
+
+/**
+ *
Thrown when an exception occurs during Reed-Solomon decoding, such as when
+ * there are too many errors to correct.
+ *
+ * @author Sean Owen
+ */
+public final class ReedSolomonException extends Exception {
+
+ public ReedSolomonException(String message) {
+ super(message);
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/StringUtils.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/StringUtils.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/common/StringUtils.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/common/StringUtils.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.common;
+
+import java.util.Hashtable;
+
+import ext.plantuml.com.google.zxing.DecodeHintType;
+
+/**
+ * Common string-related functions.
+ *
+ * @author Sean Owen
+ */
+public final class StringUtils {
+
+ private static final String PLATFORM_DEFAULT_ENCODING =
+ System.getProperty("file.encoding");
+ public static final String SHIFT_JIS = "SJIS";
+ private static final String EUC_JP = "EUC_JP";
+ private static final String UTF8 = "UTF8";
+ private static final String ISO88591 = "ISO8859_1";
+ private static final boolean ASSUME_SHIFT_JIS =
+ SHIFT_JIS.equalsIgnoreCase(PLATFORM_DEFAULT_ENCODING) ||
+ EUC_JP.equalsIgnoreCase(PLATFORM_DEFAULT_ENCODING);
+
+ private StringUtils() {}
+
+ /**
+ * @param bytes bytes encoding a string, whose encoding should be guessed
+ * @param hints decode hints if applicable
+ * @return name of guessed encoding; at the moment will only guess one of:
+ * {@link #SHIFT_JIS}, {@link #UTF8}, {@link #ISO88591}, or the platform
+ * default encoding if none of these can possibly be correct
+ */
+ public static String guessEncoding(byte[] bytes, Hashtable hints) {
+ if (hints != null) {
+ String characterSet = (String) hints.get(DecodeHintType.CHARACTER_SET);
+ if (characterSet != null) {
+ return characterSet;
+ }
+ }
+ // Does it start with the UTF-8 byte order mark? then guess it's UTF-8
+ if (bytes.length > 3 &&
+ bytes[0] == (byte) 0xEF &&
+ bytes[1] == (byte) 0xBB &&
+ bytes[2] == (byte) 0xBF) {
+ return UTF8;
+ }
+ // For now, merely tries to distinguish ISO-8859-1, UTF-8 and Shift_JIS,
+ // which should be by far the most common encodings. ISO-8859-1
+ // should not have bytes in the 0x80 - 0x9F range, while Shift_JIS
+ // uses this as a first byte of a two-byte character. If we see this
+ // followed by a valid second byte in Shift_JIS, assume it is Shift_JIS.
+ // If we see something else in that second byte, we'll make the risky guess
+ // that it's UTF-8.
+ int length = bytes.length;
+ boolean canBeISO88591 = true;
+ boolean canBeShiftJIS = true;
+ boolean canBeUTF8 = true;
+ int utf8BytesLeft = 0;
+ int maybeDoubleByteCount = 0;
+ int maybeSingleByteKatakanaCount = 0;
+ boolean sawLatin1Supplement = false;
+ boolean sawUTF8Start = false;
+ boolean lastWasPossibleDoubleByteStart = false;
+
+ for (int i = 0;
+ i < length && (canBeISO88591 || canBeShiftJIS || canBeUTF8);
+ i++) {
+
+ int value = bytes[i] & 0xFF;
+
+ // UTF-8 stuff
+ if (value >= 0x80 && value <= 0xBF) {
+ if (utf8BytesLeft > 0) {
+ utf8BytesLeft--;
+ }
+ } else {
+ if (utf8BytesLeft > 0) {
+ canBeUTF8 = false;
+ }
+ if (value >= 0xC0 && value <= 0xFD) {
+ sawUTF8Start = true;
+ int valueCopy = value;
+ while ((valueCopy & 0x40) != 0) {
+ utf8BytesLeft++;
+ valueCopy <<= 1;
+ }
+ }
+ }
+
+ // ISO-8859-1 stuff
+
+ if ((value == 0xC2 || value == 0xC3) && i < length - 1) {
+ // This is really a poor hack. The slightly more exotic characters people might want to put in
+ // a QR Code, by which I mean the Latin-1 supplement characters (e.g. u-umlaut) have encodings
+ // that start with 0xC2 followed by [0xA0,0xBF], or start with 0xC3 followed by [0x80,0xBF].
+ int nextValue = bytes[i + 1] & 0xFF;
+ if (nextValue <= 0xBF &&
+ ((value == 0xC2 && nextValue >= 0xA0) || (value == 0xC3 && nextValue >= 0x80))) {
+ sawLatin1Supplement = true;
+ }
+ }
+ if (value >= 0x7F && value <= 0x9F) {
+ canBeISO88591 = false;
+ }
+
+ // Shift_JIS stuff
+
+ if (value >= 0xA1 && value <= 0xDF) {
+ // count the number of characters that might be a Shift_JIS single-byte Katakana character
+ if (!lastWasPossibleDoubleByteStart) {
+ maybeSingleByteKatakanaCount++;
+ }
+ }
+ if (!lastWasPossibleDoubleByteStart &&
+ ((value >= 0xF0 && value <= 0xFF) || value == 0x80 || value == 0xA0)) {
+ canBeShiftJIS = false;
+ }
+ if (((value >= 0x81 && value <= 0x9F) || (value >= 0xE0 && value <= 0xEF))) {
+ // These start double-byte characters in Shift_JIS. Let's see if it's followed by a valid
+ // second byte.
+ if (lastWasPossibleDoubleByteStart) {
+ // If we just checked this and the last byte for being a valid double-byte
+ // char, don't check starting on this byte. If this and the last byte
+ // formed a valid pair, then this shouldn't be checked to see if it starts
+ // a double byte pair of course.
+ lastWasPossibleDoubleByteStart = false;
+ } else {
+ // ... otherwise do check to see if this plus the next byte form a valid
+ // double byte pair encoding a character.
+ lastWasPossibleDoubleByteStart = true;
+ if (i >= bytes.length - 1) {
+ canBeShiftJIS = false;
+ } else {
+ int nextValue = bytes[i + 1] & 0xFF;
+ if (nextValue < 0x40 || nextValue > 0xFC) {
+ canBeShiftJIS = false;
+ } else {
+ maybeDoubleByteCount++;
+ }
+ // There is some conflicting information out there about which bytes can follow which in
+ // double-byte Shift_JIS characters. The rule above seems to be the one that matches practice.
+ }
+ }
+ } else {
+ lastWasPossibleDoubleByteStart = false;
+ }
+ }
+ if (utf8BytesLeft > 0) {
+ canBeUTF8 = false;
+ }
+
+ // Easy -- if assuming Shift_JIS and no evidence it can't be, done
+ if (canBeShiftJIS && ASSUME_SHIFT_JIS) {
+ return SHIFT_JIS;
+ }
+ if (canBeUTF8 && sawUTF8Start) {
+ return UTF8;
+ }
+ // Distinguishing Shift_JIS and ISO-8859-1 can be a little tough. The crude heuristic is:
+ // - If we saw
+ // - at least 3 bytes that starts a double-byte value (bytes that are rare in ISO-8859-1), or
+ // - over 5% of bytes could be single-byte Katakana (also rare in ISO-8859-1),
+ // - and, saw no sequences that are invalid in Shift_JIS, then we conclude Shift_JIS
+ if (canBeShiftJIS && (maybeDoubleByteCount >= 3 || 20 * maybeSingleByteKatakanaCount > length)) {
+ return SHIFT_JIS;
+ }
+ // Otherwise, we default to ISO-8859-1 unless we know it can't be
+ if (!sawLatin1Supplement && canBeISO88591) {
+ return ISO88591;
+ }
+ // Otherwise, we take a wild guess with platform encoding
+ return PLATFORM_DEFAULT_ENCODING;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,446 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
+
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+
+/**
+ * @author bbrown@google.com (Brian Brown)
+ */
+final class BitMatrixParser {
+
+ private final BitMatrix mappingBitMatrix;
+ private final BitMatrix readMappingMatrix;
+ private final Version version;
+
+ /**
+ * @param bitMatrix {@link BitMatrix} to parse
+ * @throws FormatException if dimension is < 10 or > 144 or not 0 mod 2
+ */
+ BitMatrixParser(BitMatrix bitMatrix) throws FormatException {
+ int dimension = bitMatrix.getHeight();
+ if (dimension < 10 || dimension > 144 || (dimension & 0x01) != 0) {
+ throw FormatException.getFormatInstance();
+ }
+
+ version = readVersion(bitMatrix);
+ this.mappingBitMatrix = extractDataRegion(bitMatrix);
+ // TODO(bbrown): Make this work for rectangular symbols
+ this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getHeight());
+ }
+
+ /**
+ *
Creates the version object based on the dimension of the original bit matrix from
+ * the datamatrix code.
+ *
+ *
See ISO 16022:2006 Table 7 - ECC 200 symbol attributes
+ *
+ * @param bitMatrix Original {@link BitMatrix} including alignment patterns
+ * @return {@link Version} encapsulating the Data Matrix Code's "version"
+ * @throws FormatException if the dimensions of the mapping matrix are not valid
+ * Data Matrix dimensions.
+ */
+ Version readVersion(BitMatrix bitMatrix) throws FormatException {
+
+ if (version != null) {
+ return version;
+ }
+
+ // TODO(bbrown): make this work for rectangular dimensions as well.
+ int numRows = bitMatrix.getHeight();
+ int numColumns = numRows;
+
+ return Version.getVersionForDimensions(numRows, numColumns);
+ }
+
+ /**
+ *
Reads the bits in the {@link BitMatrix} representing the mapping matrix (No alignment patterns)
+ * in the correct order in order to reconstitute the codewords bytes contained within the
+ * Data Matrix Code.
+ *
+ * @return bytes encoded within the Data Matrix Code
+ * @throws FormatException if the exact number of bytes expected is not read
+ */
+ byte[] readCodewords() throws FormatException {
+
+ byte[] result = new byte[version.getTotalCodewords()];
+ int resultOffset = 0;
+
+ int row = 4;
+ int column = 0;
+ // TODO(bbrown): Data Matrix can be rectangular, assuming square for now
+ int numRows = mappingBitMatrix.getHeight();
+ int numColumns = numRows;
+
+ boolean corner1Read = false;
+ boolean corner2Read = false;
+ boolean corner3Read = false;
+ boolean corner4Read = false;
+
+ // Read all of the codewords
+ do {
+ // Check the four corner cases
+ if ((row == numRows) && (column == 0) && !corner1Read) {
+ result[resultOffset++] = (byte) readCorner1(numRows, numColumns);
+ row -= 2;
+ column +=2;
+ corner1Read = true;
+ } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x03) != 0) && !corner2Read) {
+ result[resultOffset++] = (byte) readCorner2(numRows, numColumns);
+ row -= 2;
+ column +=2;
+ corner2Read = true;
+ } else if ((row == numRows+4) && (column == 2) && ((numColumns & 0x07) == 0) && !corner3Read) {
+ result[resultOffset++] = (byte) readCorner3(numRows, numColumns);
+ row -= 2;
+ column +=2;
+ corner3Read = true;
+ } else if ((row == numRows-2) && (column == 0) && ((numColumns & 0x07) == 4) && !corner4Read) {
+ result[resultOffset++] = (byte) readCorner4(numRows, numColumns);
+ row -= 2;
+ column +=2;
+ corner4Read = true;
+ } else {
+ // Sweep upward diagonally to the right
+ do {
+ if ((row < numRows) && (column >= 0) && !readMappingMatrix.get(column, row)) {
+ result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);
+ }
+ row -= 2;
+ column +=2;
+ } while ((row >= 0) && (column < numColumns));
+ row += 1;
+ column +=3;
+
+ // Sweep downward diagonally to the left
+ do {
+ if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(column, row)) {
+ result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);
+ }
+ row += 2;
+ column -=2;
+ } while ((row < numRows) && (column >= 0));
+ row += 3;
+ column +=1;
+ }
+ } while ((row < numRows) || (column < numColumns));
+
+ if (resultOffset != version.getTotalCodewords()) {
+ throw FormatException.getFormatInstance();
+ }
+ return result;
+ }
+
+ /**
+ *
Reads a bit of the mapping matrix accounting for boundary wrapping.
+ *
+ * @param row Row to read in the mapping matrix
+ * @param column Column to read in the mapping matrix
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return value of the given bit in the mapping matrix
+ */
+ boolean readModule(int row, int column, int numRows, int numColumns) {
+ // Adjust the row and column indices based on boundary wrapping
+ if (row < 0) {
+ row += numRows;
+ column += 4 - ((numRows + 4) & 0x07);
+ }
+ if (column < 0) {
+ column += numColumns;
+ row += 4 - ((numColumns + 4) & 0x07);
+ }
+ readMappingMatrix.set(column, row);
+ return mappingBitMatrix.get(column, row);
+ }
+
+ /**
+ *
Reads the 8 bits of the standard Utah-shaped pattern.
+ *
+ *
See ISO 16022:2006, 5.8.1 Figure 6
+ *
+ * @param row Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
+ * @param column Current column in the mapping matrix, anchored at the 8th bit (LSB) of the pattern
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return byte from the utah shape
+ */
+ int readUtah(int row, int column, int numRows, int numColumns) {
+ int currentByte = 0;
+ if (readModule(row - 2, column - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 2, column - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row - 1, column, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(row, column, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ /**
+ *
Reads the 8 bits of the special corner condition 1.
+ *
+ *
See ISO 16022:2006, Figure F.3
+ *
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return byte from the Corner condition 1
+ */
+ int readCorner1(int numRows, int numColumns) {
+ int currentByte = 0;
+ if (readModule(numRows - 1, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(2, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(3, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ /**
+ *
Reads the 8 bits of the special corner condition 2.
+ *
+ *
See ISO 16022:2006, Figure F.4
+ *
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return byte from the Corner condition 2
+ */
+ int readCorner2(int numRows, int numColumns) {
+ int currentByte = 0;
+ if (readModule(numRows - 3, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 2, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 4, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 3, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ /**
+ *
Reads the 8 bits of the special corner condition 3.
+ *
+ *
See ISO 16022:2006, Figure F.5
+ *
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return byte from the Corner condition 3
+ */
+ int readCorner3(int numRows, int numColumns) {
+ int currentByte = 0;
+ if (readModule(numRows - 1, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 3, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 3, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ /**
+ *
Reads the 8 bits of the special corner condition 4.
+ *
+ *
See ISO 16022:2006, Figure F.6
+ *
+ * @param numRows Number of rows in the mapping matrix
+ * @param numColumns Number of columns in the mapping matrix
+ * @return byte from the Corner condition 4
+ */
+ int readCorner4(int numRows, int numColumns) {
+ int currentByte = 0;
+ if (readModule(numRows - 3, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 2, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(numRows - 1, 0, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 2, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(0, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(1, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(2, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ currentByte <<= 1;
+ if (readModule(3, numColumns - 1, numRows, numColumns)) {
+ currentByte |= 1;
+ }
+ return currentByte;
+ }
+
+ /**
+ *
Extracts the data region from a {@link BitMatrix} that contains
+ * alignment patterns.
+ *
+ * @param bitMatrix Original {@link BitMatrix} with alignment patterns
+ * @return BitMatrix that has the alignment patterns removed
+ */
+ BitMatrix extractDataRegion(BitMatrix bitMatrix) {
+ int symbolSizeRows = version.getSymbolSizeRows();
+ int symbolSizeColumns = version.getSymbolSizeColumns();
+
+ // TODO(bbrown): Make this work with rectangular codes
+ if (bitMatrix.getHeight() != symbolSizeRows) {
+ throw new IllegalArgumentException("Dimension of bitMarix must match the version size");
+ }
+
+ int dataRegionSizeRows = version.getDataRegionSizeRows();
+ int dataRegionSizeColumns = version.getDataRegionSizeColumns();
+
+ int numDataRegionsRow = symbolSizeRows / dataRegionSizeRows;
+ int numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
+
+ int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
+ //int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
+
+ // TODO(bbrown): Make this work with rectangular codes
+ BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionRow);
+ for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {
+ int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;
+ for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn) {
+ int dataRegionColumnOffset = dataRegionColumn * dataRegionSizeColumns;
+ for (int i = 0; i < dataRegionSizeRows; ++i) {
+ int readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;
+ int writeRowOffset = dataRegionRowOffset + i;
+ for (int j = 0; j < dataRegionSizeColumns; ++j) {
+ int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;
+ if (bitMatrix.get(readColumnOffset, readRowOffset)) {
+ int writeColumnOffset = dataRegionColumnOffset + j;
+ bitMatrixWithoutAlignment.set(writeColumnOffset, writeRowOffset);
+ }
+ }
+ }
+ }
+ }
+ return bitMatrixWithoutAlignment;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
+
+/**
+ *
Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into
+ * multiple blocks, each of which is a unit of data and error-correction codewords. Each
+ * is represented by an instance of this class.
When Data Matrix Codes use multiple data blocks, they actually interleave the bytes of each of them.
+ * That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
+ * method will separate the data into original blocks.
+ *
+ * @param rawCodewords bytes as read directly from the Data Matrix Code
+ * @param version version of the Data Matrix Code
+ * @return {@link DataBlock}s containing original bytes, "de-interleaved" from representation in the
+ * Data Matrix Code
+ */
+ static DataBlock[] getDataBlocks(byte[] rawCodewords,
+ Version version) {
+ // Figure out the number and size of data blocks used by this version
+ Version.ECBlocks ecBlocks = version.getECBlocks();
+
+ // First count the total number of data blocks
+ int totalBlocks = 0;
+ Version.ECB[] ecBlockArray = ecBlocks.getECBlocks();
+ for (int i = 0; i < ecBlockArray.length; i++) {
+ totalBlocks += ecBlockArray[i].getCount();
+ }
+
+ // Now establish DataBlocks of the appropriate size and number of data codewords
+ DataBlock[] result = new DataBlock[totalBlocks];
+ int numResultBlocks = 0;
+ for (int j = 0; j < ecBlockArray.length; j++) {
+ Version.ECB ecBlock = ecBlockArray[j];
+ for (int i = 0; i < ecBlock.getCount(); i++) {
+ int numDataCodewords = ecBlock.getDataCodewords();
+ int numBlockCodewords = ecBlocks.getECCodewords() + numDataCodewords;
+ result[numResultBlocks++] = new DataBlock(numDataCodewords, new byte[numBlockCodewords]);
+ }
+ }
+
+ // All blocks have the same amount of data, except that the last n
+ // (where n may be 0) have 1 less byte. Figure out where these start.
+ // TODO(bbrown): There is only one case where there is a difference for Data Matrix for size 144
+ int longerBlocksTotalCodewords = result[0].codewords.length;
+ //int shorterBlocksTotalCodewords = longerBlocksTotalCodewords - 1;
+
+ int longerBlocksNumDataCodewords = longerBlocksTotalCodewords - ecBlocks.getECCodewords();
+ int shorterBlocksNumDataCodewords = longerBlocksNumDataCodewords - 1;
+ // The last elements of result may be 1 element shorter for 144 matrix
+ // first fill out as many elements as all of them have minus 1
+ int rawCodewordsOffset = 0;
+ for (int i = 0; i < shorterBlocksNumDataCodewords; i++) {
+ for (int j = 0; j < numResultBlocks; j++) {
+ result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
+ }
+ }
+
+ // Fill out the last data block in the longer ones
+ boolean specialVersion = version.getVersionNumber() == 24;
+ int numLongerBlocks = specialVersion ? 8 : numResultBlocks;
+ for (int j = 0; j < numLongerBlocks; j++) {
+ result[j].codewords[longerBlocksNumDataCodewords - 1] = rawCodewords[rawCodewordsOffset++];
+ }
+
+ // Now add in error correction blocks
+ int max = result[0].codewords.length;
+ for (int i = longerBlocksNumDataCodewords; i < max; i++) {
+ for (int j = 0; j < numResultBlocks; j++) {
+ int iOffset = (specialVersion && j > 7) ? i - 1 : i;
+ result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
+ }
+ }
+
+ if (rawCodewordsOffset != rawCodewords.length) {
+ throw new IllegalArgumentException();
+ }
+
+ return result;
+ }
+
+ int getNumDataCodewords() {
+ return numDataCodewords;
+ }
+
+ byte[] getCodewords() {
+ return codewords;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.datamatrix.decoder;
+
+import ext.plantuml.com.google.zxing.FormatException;
+
+/**
+ * The Version object encapsulates attributes about a particular
+ * size Data Matrix Code.
+ *
+ * @author bbrown@google.com (Brian Brown)
+ */
+public final class Version {
+
+ private static final Version[] VERSIONS = buildVersions();
+
+ private final int versionNumber;
+ private final int symbolSizeRows;
+ private final int symbolSizeColumns;
+ private final int dataRegionSizeRows;
+ private final int dataRegionSizeColumns;
+ private final ECBlocks ecBlocks;
+ private final int totalCodewords;
+
+ private Version(int versionNumber,
+ int symbolSizeRows,
+ int symbolSizeColumns,
+ int dataRegionSizeRows,
+ int dataRegionSizeColumns,
+ ECBlocks ecBlocks) {
+ this.versionNumber = versionNumber;
+ this.symbolSizeRows = symbolSizeRows;
+ this.symbolSizeColumns = symbolSizeColumns;
+ this.dataRegionSizeRows = dataRegionSizeRows;
+ this.dataRegionSizeColumns = dataRegionSizeColumns;
+ this.ecBlocks = ecBlocks;
+
+ // Calculate the total number of codewords
+ int total = 0;
+ int ecCodewords = ecBlocks.getECCodewords();
+ ECB[] ecbArray = ecBlocks.getECBlocks();
+ for (int i = 0; i < ecbArray.length; i++) {
+ ECB ecBlock = ecbArray[i];
+ total += ecBlock.getCount() * (ecBlock.getDataCodewords() + ecCodewords);
+ }
+ this.totalCodewords = total;
+ }
+
+ public int getVersionNumber() {
+ return versionNumber;
+ }
+
+ public int getSymbolSizeRows() {
+ return symbolSizeRows;
+ }
+
+ public int getSymbolSizeColumns() {
+ return symbolSizeColumns;
+ }
+
+ public int getDataRegionSizeRows() {
+ return dataRegionSizeRows;
+ }
+
+ public int getDataRegionSizeColumns() {
+ return dataRegionSizeColumns;
+ }
+
+ public int getTotalCodewords() {
+ return totalCodewords;
+ }
+
+ ECBlocks getECBlocks() {
+ return ecBlocks;
+ }
+
+ /**
+ *
Deduces version information from Data Matrix dimensions.
+ *
+ * @param numRows Number of rows in modules
+ * @param numColumns Number of columns in modules
+ * @return {@link Version} for a Data Matrix Code of those dimensions
+ * @throws FormatException if dimensions do correspond to a valid Data Matrix size
+ */
+ public static Version getVersionForDimensions(int numRows, int numColumns) throws FormatException {
+ if ((numRows & 0x01) != 0 || (numColumns & 0x01) != 0) {
+ throw FormatException.getFormatInstance();
+ }
+
+ // TODO(bbrown): This is doing a linear search through the array of versions.
+ // If we interleave the rectangular versions with the square versions we could
+ // do a binary search.
+ int numVersions = VERSIONS.length;
+ for (int i = 0; i < numVersions; ++i){
+ Version version = VERSIONS[i];
+ if (version.symbolSizeRows == numRows && version.symbolSizeColumns == numColumns) {
+ return version;
+ }
+ }
+
+ throw FormatException.getFormatInstance();
+ }
+
+ /**
+ *
Encapsulates a set of error-correction blocks in one symbol version. Most versions will
+ * use blocks of differing sizes within one version, so, this encapsulates the parameters for
+ * each set of blocks. It also holds the number of error-correction codewords per block since it
+ * will be the same across all blocks within one version.
Encapsualtes the parameters for one error-correction block in one symbol version.
+ * This includes the number of data codewords, and the number of times a block with these
+ * parameters is used consecutively in the Data Matrix code version's format.
+ */
+ static final class ECB {
+ private final int count;
+ private final int dataCodewords;
+
+ private ECB(int count, int dataCodewords) {
+ this.count = count;
+ this.dataCodewords = dataCodewords;
+ }
+
+ int getCount() {
+ return count;
+ }
+
+ int getDataCodewords() {
+ return dataCodewords;
+ }
+ }
+
+ public String toString() {
+ return String.valueOf(versionNumber);
+ }
+
+ /**
+ * See ISO 16022:2006 5.5.1 Table 7
+ */
+ private static Version[] buildVersions() {
+ return new Version[]{
+ new Version(1, 10, 10, 8, 8,
+ new ECBlocks(5, new ECB(1, 3))),
+ new Version(2, 12, 12, 10, 10,
+ new ECBlocks(7, new ECB(1, 5))),
+ new Version(3, 14, 14, 12, 12,
+ new ECBlocks(10, new ECB(1, 8))),
+ new Version(4, 16, 16, 14, 14,
+ new ECBlocks(12, new ECB(1, 12))),
+ new Version(5, 18, 18, 16, 16,
+ new ECBlocks(14, new ECB(1, 18))),
+ new Version(6, 20, 20, 18, 18,
+ new ECBlocks(18, new ECB(1, 22))),
+ new Version(7, 22, 22, 20, 20,
+ new ECBlocks(20, new ECB(1, 30))),
+ new Version(8, 24, 24, 22, 22,
+ new ECBlocks(24, new ECB(1, 36))),
+ new Version(9, 26, 26, 24, 24,
+ new ECBlocks(28, new ECB(1, 44))),
+ new Version(10, 32, 32, 14, 14,
+ new ECBlocks(36, new ECB(1, 62))),
+ new Version(11, 36, 36, 16, 16,
+ new ECBlocks(42, new ECB(1, 86))),
+ new Version(12, 40, 40, 18, 18,
+ new ECBlocks(48, new ECB(1, 114))),
+ new Version(13, 44, 44, 20, 20,
+ new ECBlocks(56, new ECB(1, 144))),
+ new Version(14, 48, 48, 22, 22,
+ new ECBlocks(68, new ECB(1, 174))),
+ new Version(15, 52, 52, 24, 24,
+ new ECBlocks(42, new ECB(2, 102))),
+ new Version(16, 64, 64, 14, 14,
+ new ECBlocks(56, new ECB(2, 140))),
+ new Version(17, 72, 72, 16, 16,
+ new ECBlocks(36, new ECB(4, 92))),
+ new Version(18, 80, 80, 18, 18,
+ new ECBlocks(48, new ECB(4, 114))),
+ new Version(19, 88, 88, 20, 20,
+ new ECBlocks(56, new ECB(4, 144))),
+ new Version(20, 96, 96, 22, 22,
+ new ECBlocks(68, new ECB(4, 174))),
+ new Version(21, 104, 104, 24, 24,
+ new ECBlocks(56, new ECB(6, 136))),
+ new Version(22, 120, 120, 18, 18,
+ new ECBlocks(68, new ECB(6, 175))),
+ new Version(23, 132, 132, 20, 20,
+ new ECBlocks(62, new ECB(8, 163))),
+ new Version(24, 144, 144, 22, 22,
+ new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))),
+ new Version(25, 8, 18, 6, 16,
+ new ECBlocks(7, new ECB(1, 5))),
+ new Version(26, 8, 32, 6, 14,
+ new ECBlocks(11, new ECB(1, 10))),
+ new Version(27, 12, 26, 10, 24,
+ new ECBlocks(14, new ECB(1, 16))),
+ new Version(28, 12, 36, 10, 16,
+ new ECBlocks(18, new ECB(1, 22))),
+ new Version(29, 16, 36, 10, 16,
+ new ECBlocks(24, new ECB(1, 32))),
+ new Version(30, 16, 48, 14, 22,
+ new ECBlocks(28, new ECB(1, 49)))
+ };
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/DecodeHintType.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/DecodeHintType.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/DecodeHintType.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/DecodeHintType.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+import java.io.Reader;
+
+/**
+ * Encapsulates a type of hint that a caller may pass to a barcode reader to help it
+ * more quickly or accurately decode it. It is up to implementations to decide what,
+ * if anything, to do with the information that is supplied.
+ *
+ * @author Sean Owen
+ * @author dswitkin@google.com (Daniel Switkin)
+ * @see Reader#decode(BinaryBitmap,java.util.Hashtable)
+ */
+public final class DecodeHintType {
+
+ // No, we can't use an enum here. J2ME doesn't support it.
+
+ /**
+ * Unspecified, application-specific hint. Maps to an unspecified {@link Object}.
+ */
+ public static final DecodeHintType OTHER = new DecodeHintType();
+
+ /**
+ * Image is a pure monochrome image of a barcode. Doesn't matter what it maps to;
+ * use {@link Boolean#TRUE}.
+ */
+ public static final DecodeHintType PURE_BARCODE = new DecodeHintType();
+
+ /**
+ * Image is known to be of one of a few possible formats.
+ * Maps to a {@link java.util.Vector} of {@link BarcodeFormat}s.
+ */
+ public static final DecodeHintType POSSIBLE_FORMATS = new DecodeHintType();
+
+ /**
+ * Spend more time to try to find a barcode; optimize for accuracy, not speed.
+ * Doesn't matter what it maps to; use {@link Boolean#TRUE}.
+ */
+ public static final DecodeHintType TRY_HARDER = new DecodeHintType();
+
+ /**
+ * Specifies what character encoding to use when decoding, where applicable (type String)
+ */
+ public static final DecodeHintType CHARACTER_SET = new DecodeHintType();
+
+ /**
+ * Allowed lengths of encoded data -- reject anything else. Maps to an int[].
+ */
+ public static final DecodeHintType ALLOWED_LENGTHS = new DecodeHintType();
+
+ /**
+ * Assume Code 39 codes employ a check digit. Maps to {@link Boolean}.
+ */
+ public static final DecodeHintType ASSUME_CODE_39_CHECK_DIGIT = new DecodeHintType();
+
+ /**
+ * The caller needs to be notified via callback when a possible {@link ResultPoint}
+ * is found. Maps to a {@link ResultPointCallback}.
+ */
+ public static final DecodeHintType NEED_RESULT_POINT_CALLBACK = new DecodeHintType();
+
+ private DecodeHintType() {
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/EncodeHintType.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/EncodeHintType.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/EncodeHintType.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/EncodeHintType.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ * These are a set of hints that you may pass to Writers to specify their behavior.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class EncodeHintType {
+
+ /**
+ * Specifies what degree of error correction to use, for example in QR Codes (type Integer).
+ */
+ public static final EncodeHintType ERROR_CORRECTION = new EncodeHintType();
+
+ /**
+ * Specifies what character encoding to use where applicable (type String)
+ */
+ public static final EncodeHintType CHARACTER_SET = new EncodeHintType();
+
+ private EncodeHintType() {
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/FormatException.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/FormatException.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/FormatException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/FormatException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ * Thrown when a barcode was successfully detected, but some aspect of
+ * the content did not conform to the barcode's format rules. This could have
+ * been due to a mis-detection.
+ *
+ * @author Sean Owen
+ */
+public final class FormatException extends ReaderException {
+
+ private static final FormatException instance = new FormatException();
+
+ private FormatException() {
+ // do nothing
+ }
+
+ public static FormatException getFormatInstance() {
+ return instance;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/NotFoundException.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/NotFoundException.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/NotFoundException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/NotFoundException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ * Thrown when a barcode was not found in the image. It might have been
+ * partially detected but could not be confirmed.
+ *
+ * @author Sean Owen
+ */
+public final class NotFoundException extends ReaderException {
+
+ private static final NotFoundException instance = new NotFoundException();
+
+ private NotFoundException() {
+ // do nothing
+ }
+
+ public static NotFoundException getNotFoundInstance() {
+ return instance;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+
+/**
+ * @author Sean Owen
+ */
+final class BitMatrixParser {
+
+ private final BitMatrix bitMatrix;
+ private Version parsedVersion;
+ private FormatInformation parsedFormatInfo;
+
+ /**
+ * @param bitMatrix {@link BitMatrix} to parse
+ * @throws FormatException if dimension is not >= 21 and 1 mod 4
+ */
+ BitMatrixParser(BitMatrix bitMatrix) throws FormatException {
+ int dimension = bitMatrix.getHeight();
+ if (dimension < 21 || (dimension & 0x03) != 1) {
+ throw FormatException.getFormatInstance();
+ }
+ this.bitMatrix = bitMatrix;
+ }
+
+ /**
+ *
Reads format information from one of its two locations within the QR Code.
+ *
+ * @return {@link FormatInformation} encapsulating the QR Code's format info
+ * @throws FormatException if both format information locations cannot be parsed as
+ * the valid encoding of format information
+ */
+ FormatInformation readFormatInformation() throws FormatException {
+
+ if (parsedFormatInfo != null) {
+ return parsedFormatInfo;
+ }
+
+ // Read top-left format info bits
+ int formatInfoBits1 = 0;
+ for (int i = 0; i < 6; i++) {
+ formatInfoBits1 = copyBit(i, 8, formatInfoBits1);
+ }
+ // .. and skip a bit in the timing pattern ...
+ formatInfoBits1 = copyBit(7, 8, formatInfoBits1);
+ formatInfoBits1 = copyBit(8, 8, formatInfoBits1);
+ formatInfoBits1 = copyBit(8, 7, formatInfoBits1);
+ // .. and skip a bit in the timing pattern ...
+ for (int j = 5; j >= 0; j--) {
+ formatInfoBits1 = copyBit(8, j, formatInfoBits1);
+ }
+
+ // Read the top-right/bottom-left pattern too
+ int dimension = bitMatrix.getHeight();
+ int formatInfoBits2 = 0;
+ int iMin = dimension - 8;
+ for (int i = dimension - 1; i >= iMin; i--) {
+ formatInfoBits2 = copyBit(i, 8, formatInfoBits2);
+ }
+ for (int j = dimension - 7; j < dimension; j++) {
+ formatInfoBits2 = copyBit(8, j, formatInfoBits2);
+ }
+
+ parsedFormatInfo = FormatInformation.decodeFormatInformation(formatInfoBits1, formatInfoBits2);
+ if (parsedFormatInfo != null) {
+ return parsedFormatInfo;
+ }
+ throw FormatException.getFormatInstance();
+ }
+
+ /**
+ *
Reads version information from one of its two locations within the QR Code.
+ *
+ * @return {@link Version} encapsulating the QR Code's version
+ * @throws FormatException if both version information locations cannot be parsed as
+ * the valid encoding of version information
+ */
+ Version readVersion() throws FormatException {
+
+ if (parsedVersion != null) {
+ return parsedVersion;
+ }
+
+ int dimension = bitMatrix.getHeight();
+
+ int provisionalVersion = (dimension - 17) >> 2;
+ if (provisionalVersion <= 6) {
+ return Version.getVersionForNumber(provisionalVersion);
+ }
+
+ // Read top-right version info: 3 wide by 6 tall
+ int versionBits = 0;
+ int ijMin = dimension - 11;
+ for (int j = 5; j >= 0; j--) {
+ for (int i = dimension - 9; i >= ijMin; i--) {
+ versionBits = copyBit(i, j, versionBits);
+ }
+ }
+
+ parsedVersion = Version.decodeVersionInformation(versionBits);
+ if (parsedVersion != null && parsedVersion.getDimensionForVersion() == dimension) {
+ return parsedVersion;
+ }
+
+ // Hmm, failed. Try bottom left: 6 wide by 3 tall
+ versionBits = 0;
+ for (int i = 5; i >= 0; i--) {
+ for (int j = dimension - 9; j >= ijMin; j--) {
+ versionBits = copyBit(i, j, versionBits);
+ }
+ }
+
+ parsedVersion = Version.decodeVersionInformation(versionBits);
+ if (parsedVersion != null && parsedVersion.getDimensionForVersion() == dimension) {
+ return parsedVersion;
+ }
+ throw FormatException.getFormatInstance();
+ }
+
+ private int copyBit(int i, int j, int versionBits) {
+ return bitMatrix.get(i, j) ? (versionBits << 1) | 0x1 : versionBits << 1;
+ }
+
+ /**
+ *
Reads the bits in the {@link BitMatrix} representing the finder pattern in the
+ * correct order in order to reconstitute the codewords bytes contained within the
+ * QR Code.
+ *
+ * @return bytes encoded within the QR Code
+ * @throws FormatException if the exact number of bytes expected is not read
+ */
+ byte[] readCodewords() throws FormatException {
+
+ FormatInformation formatInfo = readFormatInformation();
+ Version version = readVersion();
+
+ // Get the data mask for the format used in this QR Code. This will exclude
+ // some bits from reading as we wind through the bit matrix.
+ DataMask dataMask = DataMask.forReference((int) formatInfo.getDataMask());
+ int dimension = bitMatrix.getHeight();
+ dataMask.unmaskBitMatrix(bitMatrix, dimension);
+
+ BitMatrix functionPattern = version.buildFunctionPattern();
+
+ boolean readingUp = true;
+ byte[] result = new byte[version.getTotalCodewords()];
+ int resultOffset = 0;
+ int currentByte = 0;
+ int bitsRead = 0;
+ // Read columns in pairs, from right to left
+ for (int j = dimension - 1; j > 0; j -= 2) {
+ if (j == 6) {
+ // Skip whole column with vertical alignment pattern;
+ // saves time and makes the other code proceed more cleanly
+ j--;
+ }
+ // Read alternatingly from bottom to top then top to bottom
+ for (int count = 0; count < dimension; count++) {
+ int i = readingUp ? dimension - 1 - count : count;
+ for (int col = 0; col < 2; col++) {
+ // Ignore bits covered by the function pattern
+ if (!functionPattern.get(j - col, i)) {
+ // Read a bit
+ bitsRead++;
+ currentByte <<= 1;
+ if (bitMatrix.get(j - col, i)) {
+ currentByte |= 1;
+ }
+ // If we've made a whole byte, save it off
+ if (bitsRead == 8) {
+ result[resultOffset++] = (byte) currentByte;
+ bitsRead = 0;
+ currentByte = 0;
+ }
+ }
+ }
+ }
+ readingUp ^= true; // readingUp = !readingUp; // switch directions
+ }
+ if (resultOffset != version.getTotalCodewords()) {
+ throw FormatException.getFormatInstance();
+ }
+ return result;
+ }
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+/**
+ *
Encapsulates a block of data within a QR Code. QR Codes may split their data into
+ * multiple blocks, each of which is a unit of data and error-correction codewords. Each
+ * is represented by an instance of this class.
+ *
+ * @author Sean Owen
+ */
+final class DataBlock {
+
+ private final int numDataCodewords;
+ private final byte[] codewords;
+
+ private DataBlock(int numDataCodewords, byte[] codewords) {
+ this.numDataCodewords = numDataCodewords;
+ this.codewords = codewords;
+ }
+
+ /**
+ *
When QR Codes use multiple data blocks, they are actually interleaved.
+ * That is, the first byte of data block 1 to n is written, then the second bytes, and so on. This
+ * method will separate the data into original blocks.
+ *
+ * @param rawCodewords bytes as read directly from the QR Code
+ * @param version version of the QR Code
+ * @param ecLevel error-correction level of the QR Code
+ * @return {@link DataBlock}s containing original bytes, "de-interleaved" from representation in the
+ * QR Code
+ */
+ static DataBlock[] getDataBlocks(byte[] rawCodewords,
+ Version version,
+ ErrorCorrectionLevel ecLevel) {
+
+ if (rawCodewords.length != version.getTotalCodewords()) {
+ throw new IllegalArgumentException();
+ }
+
+ // Figure out the number and size of data blocks used by this version and
+ // error correction level
+ Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel);
+
+ // First count the total number of data blocks
+ int totalBlocks = 0;
+ Version.ECB[] ecBlockArray = ecBlocks.getECBlocks();
+ for (int i = 0; i < ecBlockArray.length; i++) {
+ totalBlocks += ecBlockArray[i].getCount();
+ }
+
+ // Now establish DataBlocks of the appropriate size and number of data codewords
+ DataBlock[] result = new DataBlock[totalBlocks];
+ int numResultBlocks = 0;
+ for (int j = 0; j < ecBlockArray.length; j++) {
+ Version.ECB ecBlock = ecBlockArray[j];
+ for (int i = 0; i < ecBlock.getCount(); i++) {
+ int numDataCodewords = ecBlock.getDataCodewords();
+ int numBlockCodewords = ecBlocks.getECCodewordsPerBlock() + numDataCodewords;
+ result[numResultBlocks++] = new DataBlock(numDataCodewords, new byte[numBlockCodewords]);
+ }
+ }
+
+ // All blocks have the same amount of data, except that the last n
+ // (where n may be 0) have 1 more byte. Figure out where these start.
+ int shorterBlocksTotalCodewords = result[0].codewords.length;
+ int longerBlocksStartAt = result.length - 1;
+ while (longerBlocksStartAt >= 0) {
+ int numCodewords = result[longerBlocksStartAt].codewords.length;
+ if (numCodewords == shorterBlocksTotalCodewords) {
+ break;
+ }
+ longerBlocksStartAt--;
+ }
+ longerBlocksStartAt++;
+
+ int shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.getECCodewordsPerBlock();
+ // The last elements of result may be 1 element longer;
+ // first fill out as many elements as all of them have
+ int rawCodewordsOffset = 0;
+ for (int i = 0; i < shorterBlocksNumDataCodewords; i++) {
+ for (int j = 0; j < numResultBlocks; j++) {
+ result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
+ }
+ }
+ // Fill out the last data block in the longer ones
+ for (int j = longerBlocksStartAt; j < numResultBlocks; j++) {
+ result[j].codewords[shorterBlocksNumDataCodewords] = rawCodewords[rawCodewordsOffset++];
+ }
+ // Now add in error correction blocks
+ int max = result[0].codewords.length;
+ for (int i = shorterBlocksNumDataCodewords; i < max; i++) {
+ for (int j = 0; j < numResultBlocks; j++) {
+ int iOffset = j < longerBlocksStartAt ? i : i + 1;
+ result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
+ }
+ }
+ return result;
+ }
+
+ int getNumDataCodewords() {
+ return numDataCodewords;
+ }
+
+ byte[] getCodewords() {
+ return codewords;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+
+/**
+ *
Encapsulates data masks for the data bits in a QR code, per ISO 18004:2006 6.8. Implementations
+ * of this class can un-mask a raw BitMatrix. For simplicity, they will unmask the entire BitMatrix,
+ * including areas used for finder patterns, timing patterns, etc. These areas should be unused
+ * after the point they are unmasked anyway.
+ *
+ *
Note that the diagram in section 6.8.1 is misleading since it indicates that i is column position
+ * and j is row position. In fact, as the text says, i is row position and j is column position.
+ *
+ * @author Sean Owen
+ */
+abstract class DataMask {
+
+ /**
+ * See ISO 18004:2006 6.8.1
+ */
+ private static final DataMask[] DATA_MASKS = {
+ new DataMask000(),
+ new DataMask001(),
+ new DataMask010(),
+ new DataMask011(),
+ new DataMask100(),
+ new DataMask101(),
+ new DataMask110(),
+ new DataMask111(),
+ };
+
+ private DataMask() {
+ }
+
+ /**
+ *
Implementations of this method reverse the data masking process applied to a QR Code and
+ * make its bits ready to read.
+ *
+ * @param bits representation of QR Code bits
+ * @param dimension dimension of QR Code, represented by bits, being unmasked
+ */
+ final void unmaskBitMatrix(BitMatrix bits, int dimension) {
+ for (int i = 0; i < dimension; i++) {
+ for (int j = 0; j < dimension; j++) {
+ if (isMasked(i, j)) {
+ bits.flip(j, i);
+ }
+ }
+ }
+ }
+
+ abstract boolean isMasked(int i, int j);
+
+ /**
+ * @param reference a value between 0 and 7 indicating one of the eight possible
+ * data mask patterns a QR Code may use
+ * @return {@link DataMask} encapsulating the data mask pattern
+ */
+ static DataMask forReference(int reference) {
+ if (reference < 0 || reference > 7) {
+ throw new IllegalArgumentException();
+ }
+ return DATA_MASKS[reference];
+ }
+
+ /**
+ * 000: mask bits for which (x + y) mod 2 == 0
+ */
+ private static class DataMask000 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return ((i + j) & 0x01) == 0;
+ }
+ }
+
+ /**
+ * 001: mask bits for which x mod 2 == 0
+ */
+ private static class DataMask001 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return (i & 0x01) == 0;
+ }
+ }
+
+ /**
+ * 010: mask bits for which y mod 3 == 0
+ */
+ private static class DataMask010 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return j % 3 == 0;
+ }
+ }
+
+ /**
+ * 011: mask bits for which (x + y) mod 3 == 0
+ */
+ private static class DataMask011 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return (i + j) % 3 == 0;
+ }
+ }
+
+ /**
+ * 100: mask bits for which (x/2 + y/3) mod 2 == 0
+ */
+ private static class DataMask100 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return (((i >>> 1) + (j /3)) & 0x01) == 0;
+ }
+ }
+
+ /**
+ * 101: mask bits for which xy mod 2 + xy mod 3 == 0
+ */
+ private static class DataMask101 extends DataMask {
+ boolean isMasked(int i, int j) {
+ int temp = i * j;
+ return (temp & 0x01) + (temp % 3) == 0;
+ }
+ }
+
+ /**
+ * 110: mask bits for which (xy mod 2 + xy mod 3) mod 2 == 0
+ */
+ private static class DataMask110 extends DataMask {
+ boolean isMasked(int i, int j) {
+ int temp = i * j;
+ return (((temp & 0x01) + (temp % 3)) & 0x01) == 0;
+ }
+ }
+
+ /**
+ * 111: mask bits for which ((x+y)mod 2 + xy mod 3) mod 2 == 0
+ */
+ private static class DataMask111 extends DataMask {
+ boolean isMasked(int i, int j) {
+ return ((((i + j) & 0x01) + ((i * j) % 3)) & 0x01) == 0;
+ }
+ }
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+/**
+ *
See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
+ * defined by the QR code standard.
+ *
+ * @author Sean Owen
+ */
+public final class ErrorCorrectionLevel {
+
+ // No, we can't use an enum here. J2ME doesn't support it.
+
+ /**
+ * L = ~7% correction
+ */
+ public static final ErrorCorrectionLevel L = new ErrorCorrectionLevel(0, 0x01, "L");
+ /**
+ * M = ~15% correction
+ */
+ public static final ErrorCorrectionLevel M = new ErrorCorrectionLevel(1, 0x00, "M");
+ /**
+ * Q = ~25% correction
+ */
+ public static final ErrorCorrectionLevel Q = new ErrorCorrectionLevel(2, 0x03, "Q");
+ /**
+ * H = ~30% correction
+ */
+ public static final ErrorCorrectionLevel H = new ErrorCorrectionLevel(3, 0x02, "H");
+
+ private static final ErrorCorrectionLevel[] FOR_BITS = {M, L, H, Q};
+
+ private final int ordinal;
+ private final int bits;
+ private final String name;
+
+ private ErrorCorrectionLevel(int ordinal, int bits, String name) {
+ this.ordinal = ordinal;
+ this.bits = bits;
+ this.name = name;
+ }
+
+ public int ordinal() {
+ return ordinal;
+ }
+
+ public int getBits() {
+ return bits;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String toString() {
+ return name;
+ }
+
+ /**
+ * @param bits int containing the two bits encoding a QR Code's error correction level
+ * @return {@link ErrorCorrectionLevel} representing the encoded error correction level
+ */
+ public static ErrorCorrectionLevel forBits(int bits) {
+ if (bits < 0 || bits >= FOR_BITS.length) {
+ throw new IllegalArgumentException();
+ }
+ return FOR_BITS[bits];
+ }
+
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+/**
+ *
Encapsulates a QR Code's format information, including the data mask used and
+ * error correction level.
+ *
+ * @author Sean Owen
+ * @see DataMask
+ * @see ErrorCorrectionLevel
+ */
+final class FormatInformation {
+
+ private static final int FORMAT_INFO_MASK_QR = 0x5412;
+
+ /**
+ * See ISO 18004:2006, Annex C, Table C.1
+ */
+ private static final int[][] FORMAT_INFO_DECODE_LOOKUP = {
+ {0x5412, 0x00},
+ {0x5125, 0x01},
+ {0x5E7C, 0x02},
+ {0x5B4B, 0x03},
+ {0x45F9, 0x04},
+ {0x40CE, 0x05},
+ {0x4F97, 0x06},
+ {0x4AA0, 0x07},
+ {0x77C4, 0x08},
+ {0x72F3, 0x09},
+ {0x7DAA, 0x0A},
+ {0x789D, 0x0B},
+ {0x662F, 0x0C},
+ {0x6318, 0x0D},
+ {0x6C41, 0x0E},
+ {0x6976, 0x0F},
+ {0x1689, 0x10},
+ {0x13BE, 0x11},
+ {0x1CE7, 0x12},
+ {0x19D0, 0x13},
+ {0x0762, 0x14},
+ {0x0255, 0x15},
+ {0x0D0C, 0x16},
+ {0x083B, 0x17},
+ {0x355F, 0x18},
+ {0x3068, 0x19},
+ {0x3F31, 0x1A},
+ {0x3A06, 0x1B},
+ {0x24B4, 0x1C},
+ {0x2183, 0x1D},
+ {0x2EDA, 0x1E},
+ {0x2BED, 0x1F},
+ };
+
+ /**
+ * Offset i holds the number of 1 bits in the binary representation of i
+ */
+ private static final int[] BITS_SET_IN_HALF_BYTE =
+ {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+
+ private final ErrorCorrectionLevel errorCorrectionLevel;
+ private final byte dataMask;
+
+ private FormatInformation(int formatInfo) {
+ // Bits 3,4
+ errorCorrectionLevel = ErrorCorrectionLevel.forBits((formatInfo >> 3) & 0x03);
+ // Bottom 3 bits
+ dataMask = (byte) (formatInfo & 0x07);
+ }
+
+ static int numBitsDiffering(int a, int b) {
+ a ^= b; // a now has a 1 bit exactly where its bit differs with b's
+ // Count bits set quickly with a series of lookups:
+ return BITS_SET_IN_HALF_BYTE[a & 0x0F] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 4 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 8 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 12 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 16 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 20 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 24 & 0x0F)] +
+ BITS_SET_IN_HALF_BYTE[(a >>> 28 & 0x0F)];
+ }
+
+ /**
+ * @param maskedFormatInfo1 format info indicator, with mask still applied
+ * @param maskedFormatInfo2 second copy of same info; both are checked at the same time
+ * to establish best match
+ * @return information about the format it specifies, or null
+ * if doesn't seem to match any known pattern
+ */
+ static FormatInformation decodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2) {
+ FormatInformation formatInfo = doDecodeFormatInformation(maskedFormatInfo1, maskedFormatInfo2);
+ if (formatInfo != null) {
+ return formatInfo;
+ }
+ // Should return null, but, some QR codes apparently
+ // do not mask this info. Try again by actually masking the pattern
+ // first
+ return doDecodeFormatInformation(maskedFormatInfo1 ^ FORMAT_INFO_MASK_QR,
+ maskedFormatInfo2 ^ FORMAT_INFO_MASK_QR);
+ }
+
+ private static FormatInformation doDecodeFormatInformation(int maskedFormatInfo1, int maskedFormatInfo2) {
+ // Find the int in FORMAT_INFO_DECODE_LOOKUP with fewest bits differing
+ int bestDifference = Integer.MAX_VALUE;
+ int bestFormatInfo = 0;
+ for (int i = 0; i < FORMAT_INFO_DECODE_LOOKUP.length; i++) {
+ int[] decodeInfo = FORMAT_INFO_DECODE_LOOKUP[i];
+ int targetInfo = decodeInfo[0];
+ if (targetInfo == maskedFormatInfo1 || targetInfo == maskedFormatInfo2) {
+ // Found an exact match
+ return new FormatInformation(decodeInfo[1]);
+ }
+ int bitsDifference = numBitsDiffering(maskedFormatInfo1, targetInfo);
+ if (bitsDifference < bestDifference) {
+ bestFormatInfo = decodeInfo[1];
+ bestDifference = bitsDifference;
+ }
+ if (maskedFormatInfo1 != maskedFormatInfo2) {
+ // also try the other option
+ bitsDifference = numBitsDiffering(maskedFormatInfo2, targetInfo);
+ if (bitsDifference < bestDifference) {
+ bestFormatInfo = decodeInfo[1];
+ bestDifference = bitsDifference;
+ }
+ }
+ }
+ // Hamming distance of the 32 masked codes is 7, by construction, so <= 3 bits
+ // differing means we found a match
+ if (bestDifference <= 3) {
+ return new FormatInformation(bestFormatInfo);
+ }
+ return null;
+ }
+
+ ErrorCorrectionLevel getErrorCorrectionLevel() {
+ return errorCorrectionLevel;
+ }
+
+ byte getDataMask() {
+ return dataMask;
+ }
+
+ public int hashCode() {
+ return (errorCorrectionLevel.ordinal() << 3) | (int) dataMask;
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof FormatInformation)) {
+ return false;
+ }
+ FormatInformation other = (FormatInformation) o;
+ return this.errorCorrectionLevel == other.errorCorrectionLevel &&
+ this.dataMask == other.dataMask;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+/**
+ *
See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which
+ * data can be encoded to bits in the QR code standard.
+ *
+ * @author Sean Owen
+ */
+public final class Mode {
+
+ // No, we can't use an enum here. J2ME doesn't support it.
+
+ public static final Mode TERMINATOR = new Mode(new int[]{0, 0, 0}, 0x00, "TERMINATOR"); // Not really a mode...
+ public static final Mode NUMERIC = new Mode(new int[]{10, 12, 14}, 0x01, "NUMERIC");
+ public static final Mode ALPHANUMERIC = new Mode(new int[]{9, 11, 13}, 0x02, "ALPHANUMERIC");
+ public static final Mode STRUCTURED_APPEND = new Mode(new int[]{0, 0, 0}, 0x03, "STRUCTURED_APPEND"); // Not supported
+ public static final Mode BYTE = new Mode(new int[]{8, 16, 16}, 0x04, "BYTE");
+ public static final Mode ECI = new Mode(null, 0x07, "ECI"); // character counts don't apply
+ public static final Mode KANJI = new Mode(new int[]{8, 10, 12}, 0x08, "KANJI");
+ public static final Mode FNC1_FIRST_POSITION = new Mode(null, 0x05, "FNC1_FIRST_POSITION");
+ public static final Mode FNC1_SECOND_POSITION = new Mode(null, 0x09, "FNC1_SECOND_POSITION");
+
+ private final int[] characterCountBitsForVersions;
+ private final int bits;
+ private final String name;
+
+ private Mode(int[] characterCountBitsForVersions, int bits, String name) {
+ this.characterCountBitsForVersions = characterCountBitsForVersions;
+ this.bits = bits;
+ this.name = name;
+ }
+
+ /**
+ * @param bits four bits encoding a QR Code data mode
+ * @return {@link Mode} encoded by these bits
+ * @throws IllegalArgumentException if bits do not correspond to a known mode
+ */
+ public static Mode forBits(int bits) {
+ switch (bits) {
+ case 0x0:
+ return TERMINATOR;
+ case 0x1:
+ return NUMERIC;
+ case 0x2:
+ return ALPHANUMERIC;
+ case 0x3:
+ return STRUCTURED_APPEND;
+ case 0x4:
+ return BYTE;
+ case 0x5:
+ return FNC1_FIRST_POSITION;
+ case 0x7:
+ return ECI;
+ case 0x8:
+ return KANJI;
+ case 0x9:
+ return FNC1_SECOND_POSITION;
+ default:
+ throw new IllegalArgumentException();
+ }
+ }
+
+ /**
+ * @param version version in question
+ * @return number of bits used, in this QR Code symbol {@link Version}, to encode the
+ * count of characters that will follow encoded in this {@link Mode}
+ */
+ public int getCharacterCountBits(Version version) {
+ if (characterCountBitsForVersions == null) {
+ throw new IllegalArgumentException("Character count doesn't apply to this mode");
+ }
+ int number = version.getVersionNumber();
+ int offset;
+ if (number <= 9) {
+ offset = 0;
+ } else if (number <= 26) {
+ offset = 1;
+ } else {
+ offset = 2;
+ }
+ return characterCountBitsForVersions[offset];
+ }
+
+ public int getBits() {
+ return bits;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String toString() {
+ return name;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,586 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.decoder;
+
+import ext.plantuml.com.google.zxing.FormatException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+
+/**
+ * See ISO 18004:2006 Annex D
+ *
+ * @author Sean Owen
+ */
+public final class Version {
+
+ /**
+ * See ISO 18004:2006 Annex D.
+ * Element i represents the raw version bits that specify version i + 7
+ */
+ private static final int[] VERSION_DECODE_INFO = {
+ 0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6,
+ 0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78,
+ 0x1145D, 0x12A17, 0x13532, 0x149A6, 0x15683,
+ 0x168C9, 0x177EC, 0x18EC4, 0x191E1, 0x1AFAB,
+ 0x1B08E, 0x1CC1A, 0x1D33F, 0x1ED75, 0x1F250,
+ 0x209D5, 0x216F0, 0x228BA, 0x2379F, 0x24B0B,
+ 0x2542E, 0x26A64, 0x27541, 0x28C69
+ };
+
+ private static final Version[] VERSIONS = buildVersions();
+
+ private final int versionNumber;
+ private final int[] alignmentPatternCenters;
+ private final ECBlocks[] ecBlocks;
+ private final int totalCodewords;
+
+ private Version(int versionNumber,
+ int[] alignmentPatternCenters,
+ ECBlocks ecBlocks1,
+ ECBlocks ecBlocks2,
+ ECBlocks ecBlocks3,
+ ECBlocks ecBlocks4) {
+ this.versionNumber = versionNumber;
+ this.alignmentPatternCenters = alignmentPatternCenters;
+ this.ecBlocks = new ECBlocks[]{ecBlocks1, ecBlocks2, ecBlocks3, ecBlocks4};
+ int total = 0;
+ int ecCodewords = ecBlocks1.getECCodewordsPerBlock();
+ ECB[] ecbArray = ecBlocks1.getECBlocks();
+ for (int i = 0; i < ecbArray.length; i++) {
+ ECB ecBlock = ecbArray[i];
+ total += ecBlock.getCount() * (ecBlock.getDataCodewords() + ecCodewords);
+ }
+ this.totalCodewords = total;
+ }
+
+ public int getVersionNumber() {
+ return versionNumber;
+ }
+
+ public int[] getAlignmentPatternCenters() {
+ return alignmentPatternCenters;
+ }
+
+ public int getTotalCodewords() {
+ return totalCodewords;
+ }
+
+ public int getDimensionForVersion() {
+ return 17 + 4 * versionNumber;
+ }
+
+ public ECBlocks getECBlocksForLevel(ErrorCorrectionLevel ecLevel) {
+ return ecBlocks[ecLevel.ordinal()];
+ }
+
+ /**
+ *
Deduces version information purely from QR Code dimensions.
+ *
+ * @param dimension dimension in modules
+ * @return {@link Version} for a QR Code of that dimension
+ * @throws FormatException if dimension is not 1 mod 4
+ */
+ public static Version getProvisionalVersionForDimension(int dimension) throws FormatException {
+ if (dimension % 4 != 1) {
+ throw FormatException.getFormatInstance();
+ }
+ try {
+ return getVersionForNumber((dimension - 17) >> 2);
+ } catch (IllegalArgumentException iae) {
+ throw FormatException.getFormatInstance();
+ }
+ }
+
+ public static Version getVersionForNumber(int versionNumber) {
+ if (versionNumber < 1 || versionNumber > 40) {
+ throw new IllegalArgumentException();
+ }
+ return VERSIONS[versionNumber - 1];
+ }
+
+ static Version decodeVersionInformation(int versionBits) {
+ int bestDifference = Integer.MAX_VALUE;
+ int bestVersion = 0;
+ for (int i = 0; i < VERSION_DECODE_INFO.length; i++) {
+ int targetVersion = VERSION_DECODE_INFO[i];
+ // Do the version info bits match exactly? done.
+ if (targetVersion == versionBits) {
+ return getVersionForNumber(i + 7);
+ }
+ // Otherwise see if this is the closest to a real version info bit string
+ // we have seen so far
+ int bitsDifference = FormatInformation.numBitsDiffering(versionBits, targetVersion);
+ if (bitsDifference < bestDifference) {
+ bestVersion = i + 7;
+ bestDifference = bitsDifference;
+ }
+ }
+ // We can tolerate up to 3 bits of error since no two version info codewords will
+ // differ in less than 8 bits.
+ if (bestDifference <= 3) {
+ return getVersionForNumber(bestVersion);
+ }
+ // If we didn't find a close enough match, fail
+ return null;
+ }
+
+ /**
+ * See ISO 18004:2006 Annex E
+ */
+ BitMatrix buildFunctionPattern() {
+ int dimension = getDimensionForVersion();
+ BitMatrix bitMatrix = new BitMatrix(dimension);
+
+ // Top left finder pattern + separator + format
+ bitMatrix.setRegion(0, 0, 9, 9);
+ // Top right finder pattern + separator + format
+ bitMatrix.setRegion(dimension - 8, 0, 8, 9);
+ // Bottom left finder pattern + separator + format
+ bitMatrix.setRegion(0, dimension - 8, 9, 8);
+
+ // Alignment patterns
+ int max = alignmentPatternCenters.length;
+ for (int x = 0; x < max; x++) {
+ int i = alignmentPatternCenters[x] - 2;
+ for (int y = 0; y < max; y++) {
+ if ((x == 0 && (y == 0 || y == max - 1)) || (x == max - 1 && y == 0)) {
+ // No alignment patterns near the three finder paterns
+ continue;
+ }
+ bitMatrix.setRegion(alignmentPatternCenters[y] - 2, i, 5, 5);
+ }
+ }
+
+ // Vertical timing pattern
+ bitMatrix.setRegion(6, 9, 1, dimension - 17);
+ // Horizontal timing pattern
+ bitMatrix.setRegion(9, 6, dimension - 17, 1);
+
+ if (versionNumber > 6) {
+ // Version info, top right
+ bitMatrix.setRegion(dimension - 11, 0, 3, 6);
+ // Version info, bottom left
+ bitMatrix.setRegion(0, dimension - 11, 6, 3);
+ }
+
+ return bitMatrix;
+ }
+
+ /**
+ *
Encapsulates a set of error-correction blocks in one symbol version. Most versions will
+ * use blocks of differing sizes within one version, so, this encapsulates the parameters for
+ * each set of blocks. It also holds the number of error-correction codewords per block since it
+ * will be the same across all blocks within one version.
+ */
+ public static final class ECBlocks {
+ private final int ecCodewordsPerBlock;
+ private final ECB[] ecBlocks;
+
+ ECBlocks(int ecCodewordsPerBlock, ECB ecBlocks) {
+ this.ecCodewordsPerBlock = ecCodewordsPerBlock;
+ this.ecBlocks = new ECB[]{ecBlocks};
+ }
+
+ ECBlocks(int ecCodewordsPerBlock, ECB ecBlocks1, ECB ecBlocks2) {
+ this.ecCodewordsPerBlock = ecCodewordsPerBlock;
+ this.ecBlocks = new ECB[]{ecBlocks1, ecBlocks2};
+ }
+
+ public int getECCodewordsPerBlock() {
+ return ecCodewordsPerBlock;
+ }
+
+ public int getNumBlocks() {
+ int total = 0;
+ for (int i = 0; i < ecBlocks.length; i++) {
+ total += ecBlocks[i].getCount();
+ }
+ return total;
+ }
+
+ public int getTotalECCodewords() {
+ return ecCodewordsPerBlock * getNumBlocks();
+ }
+
+ public ECB[] getECBlocks() {
+ return ecBlocks;
+ }
+ }
+
+ /**
+ *
Encapsualtes the parameters for one error-correction block in one symbol version.
+ * This includes the number of data codewords, and the number of times a block with these
+ * parameters is used consecutively in the QR code version's format.
+ */
+ public static final class ECB {
+ private final int count;
+ private final int dataCodewords;
+
+ ECB(int count, int dataCodewords) {
+ this.count = count;
+ this.dataCodewords = dataCodewords;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ public int getDataCodewords() {
+ return dataCodewords;
+ }
+ }
+
+ public String toString() {
+ return String.valueOf(versionNumber);
+ }
+
+ /**
+ * See ISO 18004:2006 6.5.1 Table 9
+ */
+ private static Version[] buildVersions() {
+ return new Version[]{
+ new Version(1, new int[]{},
+ new ECBlocks(7, new ECB(1, 19)),
+ new ECBlocks(10, new ECB(1, 16)),
+ new ECBlocks(13, new ECB(1, 13)),
+ new ECBlocks(17, new ECB(1, 9))),
+ new Version(2, new int[]{6, 18},
+ new ECBlocks(10, new ECB(1, 34)),
+ new ECBlocks(16, new ECB(1, 28)),
+ new ECBlocks(22, new ECB(1, 22)),
+ new ECBlocks(28, new ECB(1, 16))),
+ new Version(3, new int[]{6, 22},
+ new ECBlocks(15, new ECB(1, 55)),
+ new ECBlocks(26, new ECB(1, 44)),
+ new ECBlocks(18, new ECB(2, 17)),
+ new ECBlocks(22, new ECB(2, 13))),
+ new Version(4, new int[]{6, 26},
+ new ECBlocks(20, new ECB(1, 80)),
+ new ECBlocks(18, new ECB(2, 32)),
+ new ECBlocks(26, new ECB(2, 24)),
+ new ECBlocks(16, new ECB(4, 9))),
+ new Version(5, new int[]{6, 30},
+ new ECBlocks(26, new ECB(1, 108)),
+ new ECBlocks(24, new ECB(2, 43)),
+ new ECBlocks(18, new ECB(2, 15),
+ new ECB(2, 16)),
+ new ECBlocks(22, new ECB(2, 11),
+ new ECB(2, 12))),
+ new Version(6, new int[]{6, 34},
+ new ECBlocks(18, new ECB(2, 68)),
+ new ECBlocks(16, new ECB(4, 27)),
+ new ECBlocks(24, new ECB(4, 19)),
+ new ECBlocks(28, new ECB(4, 15))),
+ new Version(7, new int[]{6, 22, 38},
+ new ECBlocks(20, new ECB(2, 78)),
+ new ECBlocks(18, new ECB(4, 31)),
+ new ECBlocks(18, new ECB(2, 14),
+ new ECB(4, 15)),
+ new ECBlocks(26, new ECB(4, 13),
+ new ECB(1, 14))),
+ new Version(8, new int[]{6, 24, 42},
+ new ECBlocks(24, new ECB(2, 97)),
+ new ECBlocks(22, new ECB(2, 38),
+ new ECB(2, 39)),
+ new ECBlocks(22, new ECB(4, 18),
+ new ECB(2, 19)),
+ new ECBlocks(26, new ECB(4, 14),
+ new ECB(2, 15))),
+ new Version(9, new int[]{6, 26, 46},
+ new ECBlocks(30, new ECB(2, 116)),
+ new ECBlocks(22, new ECB(3, 36),
+ new ECB(2, 37)),
+ new ECBlocks(20, new ECB(4, 16),
+ new ECB(4, 17)),
+ new ECBlocks(24, new ECB(4, 12),
+ new ECB(4, 13))),
+ new Version(10, new int[]{6, 28, 50},
+ new ECBlocks(18, new ECB(2, 68),
+ new ECB(2, 69)),
+ new ECBlocks(26, new ECB(4, 43),
+ new ECB(1, 44)),
+ new ECBlocks(24, new ECB(6, 19),
+ new ECB(2, 20)),
+ new ECBlocks(28, new ECB(6, 15),
+ new ECB(2, 16))),
+ new Version(11, new int[]{6, 30, 54},
+ new ECBlocks(20, new ECB(4, 81)),
+ new ECBlocks(30, new ECB(1, 50),
+ new ECB(4, 51)),
+ new ECBlocks(28, new ECB(4, 22),
+ new ECB(4, 23)),
+ new ECBlocks(24, new ECB(3, 12),
+ new ECB(8, 13))),
+ new Version(12, new int[]{6, 32, 58},
+ new ECBlocks(24, new ECB(2, 92),
+ new ECB(2, 93)),
+ new ECBlocks(22, new ECB(6, 36),
+ new ECB(2, 37)),
+ new ECBlocks(26, new ECB(4, 20),
+ new ECB(6, 21)),
+ new ECBlocks(28, new ECB(7, 14),
+ new ECB(4, 15))),
+ new Version(13, new int[]{6, 34, 62},
+ new ECBlocks(26, new ECB(4, 107)),
+ new ECBlocks(22, new ECB(8, 37),
+ new ECB(1, 38)),
+ new ECBlocks(24, new ECB(8, 20),
+ new ECB(4, 21)),
+ new ECBlocks(22, new ECB(12, 11),
+ new ECB(4, 12))),
+ new Version(14, new int[]{6, 26, 46, 66},
+ new ECBlocks(30, new ECB(3, 115),
+ new ECB(1, 116)),
+ new ECBlocks(24, new ECB(4, 40),
+ new ECB(5, 41)),
+ new ECBlocks(20, new ECB(11, 16),
+ new ECB(5, 17)),
+ new ECBlocks(24, new ECB(11, 12),
+ new ECB(5, 13))),
+ new Version(15, new int[]{6, 26, 48, 70},
+ new ECBlocks(22, new ECB(5, 87),
+ new ECB(1, 88)),
+ new ECBlocks(24, new ECB(5, 41),
+ new ECB(5, 42)),
+ new ECBlocks(30, new ECB(5, 24),
+ new ECB(7, 25)),
+ new ECBlocks(24, new ECB(11, 12),
+ new ECB(7, 13))),
+ new Version(16, new int[]{6, 26, 50, 74},
+ new ECBlocks(24, new ECB(5, 98),
+ new ECB(1, 99)),
+ new ECBlocks(28, new ECB(7, 45),
+ new ECB(3, 46)),
+ new ECBlocks(24, new ECB(15, 19),
+ new ECB(2, 20)),
+ new ECBlocks(30, new ECB(3, 15),
+ new ECB(13, 16))),
+ new Version(17, new int[]{6, 30, 54, 78},
+ new ECBlocks(28, new ECB(1, 107),
+ new ECB(5, 108)),
+ new ECBlocks(28, new ECB(10, 46),
+ new ECB(1, 47)),
+ new ECBlocks(28, new ECB(1, 22),
+ new ECB(15, 23)),
+ new ECBlocks(28, new ECB(2, 14),
+ new ECB(17, 15))),
+ new Version(18, new int[]{6, 30, 56, 82},
+ new ECBlocks(30, new ECB(5, 120),
+ new ECB(1, 121)),
+ new ECBlocks(26, new ECB(9, 43),
+ new ECB(4, 44)),
+ new ECBlocks(28, new ECB(17, 22),
+ new ECB(1, 23)),
+ new ECBlocks(28, new ECB(2, 14),
+ new ECB(19, 15))),
+ new Version(19, new int[]{6, 30, 58, 86},
+ new ECBlocks(28, new ECB(3, 113),
+ new ECB(4, 114)),
+ new ECBlocks(26, new ECB(3, 44),
+ new ECB(11, 45)),
+ new ECBlocks(26, new ECB(17, 21),
+ new ECB(4, 22)),
+ new ECBlocks(26, new ECB(9, 13),
+ new ECB(16, 14))),
+ new Version(20, new int[]{6, 34, 62, 90},
+ new ECBlocks(28, new ECB(3, 107),
+ new ECB(5, 108)),
+ new ECBlocks(26, new ECB(3, 41),
+ new ECB(13, 42)),
+ new ECBlocks(30, new ECB(15, 24),
+ new ECB(5, 25)),
+ new ECBlocks(28, new ECB(15, 15),
+ new ECB(10, 16))),
+ new Version(21, new int[]{6, 28, 50, 72, 94},
+ new ECBlocks(28, new ECB(4, 116),
+ new ECB(4, 117)),
+ new ECBlocks(26, new ECB(17, 42)),
+ new ECBlocks(28, new ECB(17, 22),
+ new ECB(6, 23)),
+ new ECBlocks(30, new ECB(19, 16),
+ new ECB(6, 17))),
+ new Version(22, new int[]{6, 26, 50, 74, 98},
+ new ECBlocks(28, new ECB(2, 111),
+ new ECB(7, 112)),
+ new ECBlocks(28, new ECB(17, 46)),
+ new ECBlocks(30, new ECB(7, 24),
+ new ECB(16, 25)),
+ new ECBlocks(24, new ECB(34, 13))),
+ new Version(23, new int[]{6, 30, 54, 78, 102},
+ new ECBlocks(30, new ECB(4, 121),
+ new ECB(5, 122)),
+ new ECBlocks(28, new ECB(4, 47),
+ new ECB(14, 48)),
+ new ECBlocks(30, new ECB(11, 24),
+ new ECB(14, 25)),
+ new ECBlocks(30, new ECB(16, 15),
+ new ECB(14, 16))),
+ new Version(24, new int[]{6, 28, 54, 80, 106},
+ new ECBlocks(30, new ECB(6, 117),
+ new ECB(4, 118)),
+ new ECBlocks(28, new ECB(6, 45),
+ new ECB(14, 46)),
+ new ECBlocks(30, new ECB(11, 24),
+ new ECB(16, 25)),
+ new ECBlocks(30, new ECB(30, 16),
+ new ECB(2, 17))),
+ new Version(25, new int[]{6, 32, 58, 84, 110},
+ new ECBlocks(26, new ECB(8, 106),
+ new ECB(4, 107)),
+ new ECBlocks(28, new ECB(8, 47),
+ new ECB(13, 48)),
+ new ECBlocks(30, new ECB(7, 24),
+ new ECB(22, 25)),
+ new ECBlocks(30, new ECB(22, 15),
+ new ECB(13, 16))),
+ new Version(26, new int[]{6, 30, 58, 86, 114},
+ new ECBlocks(28, new ECB(10, 114),
+ new ECB(2, 115)),
+ new ECBlocks(28, new ECB(19, 46),
+ new ECB(4, 47)),
+ new ECBlocks(28, new ECB(28, 22),
+ new ECB(6, 23)),
+ new ECBlocks(30, new ECB(33, 16),
+ new ECB(4, 17))),
+ new Version(27, new int[]{6, 34, 62, 90, 118},
+ new ECBlocks(30, new ECB(8, 122),
+ new ECB(4, 123)),
+ new ECBlocks(28, new ECB(22, 45),
+ new ECB(3, 46)),
+ new ECBlocks(30, new ECB(8, 23),
+ new ECB(26, 24)),
+ new ECBlocks(30, new ECB(12, 15),
+ new ECB(28, 16))),
+ new Version(28, new int[]{6, 26, 50, 74, 98, 122},
+ new ECBlocks(30, new ECB(3, 117),
+ new ECB(10, 118)),
+ new ECBlocks(28, new ECB(3, 45),
+ new ECB(23, 46)),
+ new ECBlocks(30, new ECB(4, 24),
+ new ECB(31, 25)),
+ new ECBlocks(30, new ECB(11, 15),
+ new ECB(31, 16))),
+ new Version(29, new int[]{6, 30, 54, 78, 102, 126},
+ new ECBlocks(30, new ECB(7, 116),
+ new ECB(7, 117)),
+ new ECBlocks(28, new ECB(21, 45),
+ new ECB(7, 46)),
+ new ECBlocks(30, new ECB(1, 23),
+ new ECB(37, 24)),
+ new ECBlocks(30, new ECB(19, 15),
+ new ECB(26, 16))),
+ new Version(30, new int[]{6, 26, 52, 78, 104, 130},
+ new ECBlocks(30, new ECB(5, 115),
+ new ECB(10, 116)),
+ new ECBlocks(28, new ECB(19, 47),
+ new ECB(10, 48)),
+ new ECBlocks(30, new ECB(15, 24),
+ new ECB(25, 25)),
+ new ECBlocks(30, new ECB(23, 15),
+ new ECB(25, 16))),
+ new Version(31, new int[]{6, 30, 56, 82, 108, 134},
+ new ECBlocks(30, new ECB(13, 115),
+ new ECB(3, 116)),
+ new ECBlocks(28, new ECB(2, 46),
+ new ECB(29, 47)),
+ new ECBlocks(30, new ECB(42, 24),
+ new ECB(1, 25)),
+ new ECBlocks(30, new ECB(23, 15),
+ new ECB(28, 16))),
+ new Version(32, new int[]{6, 34, 60, 86, 112, 138},
+ new ECBlocks(30, new ECB(17, 115)),
+ new ECBlocks(28, new ECB(10, 46),
+ new ECB(23, 47)),
+ new ECBlocks(30, new ECB(10, 24),
+ new ECB(35, 25)),
+ new ECBlocks(30, new ECB(19, 15),
+ new ECB(35, 16))),
+ new Version(33, new int[]{6, 30, 58, 86, 114, 142},
+ new ECBlocks(30, new ECB(17, 115),
+ new ECB(1, 116)),
+ new ECBlocks(28, new ECB(14, 46),
+ new ECB(21, 47)),
+ new ECBlocks(30, new ECB(29, 24),
+ new ECB(19, 25)),
+ new ECBlocks(30, new ECB(11, 15),
+ new ECB(46, 16))),
+ new Version(34, new int[]{6, 34, 62, 90, 118, 146},
+ new ECBlocks(30, new ECB(13, 115),
+ new ECB(6, 116)),
+ new ECBlocks(28, new ECB(14, 46),
+ new ECB(23, 47)),
+ new ECBlocks(30, new ECB(44, 24),
+ new ECB(7, 25)),
+ new ECBlocks(30, new ECB(59, 16),
+ new ECB(1, 17))),
+ new Version(35, new int[]{6, 30, 54, 78, 102, 126, 150},
+ new ECBlocks(30, new ECB(12, 121),
+ new ECB(7, 122)),
+ new ECBlocks(28, new ECB(12, 47),
+ new ECB(26, 48)),
+ new ECBlocks(30, new ECB(39, 24),
+ new ECB(14, 25)),
+ new ECBlocks(30, new ECB(22, 15),
+ new ECB(41, 16))),
+ new Version(36, new int[]{6, 24, 50, 76, 102, 128, 154},
+ new ECBlocks(30, new ECB(6, 121),
+ new ECB(14, 122)),
+ new ECBlocks(28, new ECB(6, 47),
+ new ECB(34, 48)),
+ new ECBlocks(30, new ECB(46, 24),
+ new ECB(10, 25)),
+ new ECBlocks(30, new ECB(2, 15),
+ new ECB(64, 16))),
+ new Version(37, new int[]{6, 28, 54, 80, 106, 132, 158},
+ new ECBlocks(30, new ECB(17, 122),
+ new ECB(4, 123)),
+ new ECBlocks(28, new ECB(29, 46),
+ new ECB(14, 47)),
+ new ECBlocks(30, new ECB(49, 24),
+ new ECB(10, 25)),
+ new ECBlocks(30, new ECB(24, 15),
+ new ECB(46, 16))),
+ new Version(38, new int[]{6, 32, 58, 84, 110, 136, 162},
+ new ECBlocks(30, new ECB(4, 122),
+ new ECB(18, 123)),
+ new ECBlocks(28, new ECB(13, 46),
+ new ECB(32, 47)),
+ new ECBlocks(30, new ECB(48, 24),
+ new ECB(14, 25)),
+ new ECBlocks(30, new ECB(42, 15),
+ new ECB(32, 16))),
+ new Version(39, new int[]{6, 26, 54, 82, 110, 138, 166},
+ new ECBlocks(30, new ECB(20, 117),
+ new ECB(4, 118)),
+ new ECBlocks(28, new ECB(40, 47),
+ new ECB(7, 48)),
+ new ECBlocks(30, new ECB(43, 24),
+ new ECB(22, 25)),
+ new ECBlocks(30, new ECB(10, 15),
+ new ECB(67, 16))),
+ new Version(40, new int[]{6, 30, 58, 86, 114, 142, 170},
+ new ECBlocks(30, new ECB(19, 118),
+ new ECB(6, 119)),
+ new ECBlocks(28, new ECB(18, 47),
+ new ECB(31, 48)),
+ new ECBlocks(30, new ECB(34, 24),
+ new ECB(34, 25)),
+ new ECBlocks(30, new ECB(20, 15),
+ new ECB(61, 16)))
+ };
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+final class BlockPair {
+
+ private final byte[] dataBytes;
+ private final byte[] errorCorrectionBytes;
+
+ BlockPair(byte[] data, byte[] errorCorrection) {
+ dataBytes = data;
+ errorCorrectionBytes = errorCorrection;
+ }
+
+ public byte[] getDataBytes() {
+ return dataBytes;
+ }
+
+ public byte[] getErrorCorrectionBytes() {
+ return errorCorrectionBytes;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+/**
+ * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a
+ * unsigned container, it's up to you to do byteValue & 0xff at each location.
+ *
+ * JAVAPORT: The original code was a 2D array of ints, but since it only ever gets assigned
+ * -1, 0, and 1, I'm going to use less memory and go with bytes.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ByteMatrix {
+
+ private final byte[][] bytes;
+ private final int width;
+ private final int height;
+
+ public ByteMatrix(int width, int height) {
+ bytes = new byte[height][width];
+ this.width = width;
+ this.height = height;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public byte get(int x, int y) {
+ return bytes[y][x];
+ }
+
+ public byte[][] getArray() {
+ return bytes;
+ }
+
+ public void set(int x, int y, byte value) {
+ bytes[y][x] = value;
+ }
+
+ public void set(int x, int y, int value) {
+ bytes[y][x] = (byte) value;
+ }
+
+ public void set(int x, int y, boolean value) {
+ bytes[y][x] = (byte) (value ? 1 : 0);
+ }
+
+ public void clear(byte value) {
+ for (int y = 0; y < height; ++y) {
+ for (int x = 0; x < width; ++x) {
+ bytes[y][x] = value;
+ }
+ }
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer(2 * width * height + 2);
+ for (int y = 0; y < height; ++y) {
+ for (int x = 0; x < width; ++x) {
+ switch (bytes[y][x]) {
+ case 0:
+ result.append(" 0");
+ break;
+ case 1:
+ result.append(" 1");
+ break;
+ default:
+ result.append(" ");
+ break;
+ }
+ }
+ result.append('\n');
+ }
+ return result.toString();
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,557 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import ext.plantuml.com.google.zxing.EncodeHintType;
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitArray;
+import ext.plantuml.com.google.zxing.common.CharacterSetECI;
+import ext.plantuml.com.google.zxing.common.ECI;
+import ext.plantuml.com.google.zxing.common.reedsolomon.GF256;
+import ext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Version;
+
+/**
+ * @author satorux@google.com (Satoru Takabayashi) - creator
+ * @author dswitkin@google.com (Daniel Switkin) - ported from C++
+ */
+public final class Encoder {
+
+ // The original table is defined in the table 5 of JISX0510:2004 (p.19).
+ private static final int[] ALPHANUMERIC_TABLE = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00-0x0f
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x10-0x1f
+ 36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, // 0x20-0x2f
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, // 0x30-0x3f
+ -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 0x40-0x4f
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, // 0x50-0x5f
+ };
+
+ static final String DEFAULT_BYTE_MODE_ENCODING = "ISO-8859-1";
+
+ private Encoder() {
+ }
+
+ // The mask penalty calculation is complicated. See Table 21 of JISX0510:2004 (p.45) for details.
+ // Basically it applies four rules and summate all penalties.
+ private static int calculateMaskPenalty(ByteMatrix matrix) {
+ int penalty = 0;
+ penalty += MaskUtil.applyMaskPenaltyRule1(matrix);
+ penalty += MaskUtil.applyMaskPenaltyRule2(matrix);
+ penalty += MaskUtil.applyMaskPenaltyRule3(matrix);
+ penalty += MaskUtil.applyMaskPenaltyRule4(matrix);
+ return penalty;
+ }
+
+ /**
+ * Encode "bytes" with the error correction level "ecLevel". The encoding mode will be chosen
+ * internally by chooseMode(). On success, store the result in "qrCode".
+ *
+ * We recommend you to use QRCode.EC_LEVEL_L (the lowest level) for
+ * "getECLevel" since our primary use is to show QR code on desktop screens. We don't need very
+ * strong error correction for this purpose.
+ *
+ * Note that there is no way to encode bytes in MODE_KANJI. We might want to add EncodeWithMode()
+ * with which clients can specify the encoding mode. For now, we don't need the functionality.
+ */
+ public static void encode(String content, ErrorCorrectionLevel ecLevel, QRCode qrCode)
+ throws WriterException {
+ encode(content, ecLevel, null, qrCode);
+ }
+
+ public static void encode(String content, ErrorCorrectionLevel ecLevel, Hashtable hints,
+ QRCode qrCode) throws WriterException {
+
+ String encoding = hints == null ? null : (String) hints.get(EncodeHintType.CHARACTER_SET);
+ if (encoding == null) {
+ encoding = DEFAULT_BYTE_MODE_ENCODING;
+ }
+
+ // Step 1: Choose the mode (encoding).
+ Mode mode = chooseMode(content, encoding);
+
+ // Step 2: Append "bytes" into "dataBits" in appropriate encoding.
+ BitArray dataBits = new BitArray();
+ appendBytes(content, mode, dataBits, encoding);
+ // Step 3: Initialize QR code that can contain "dataBits".
+ int numInputBytes = dataBits.getSizeInBytes();
+ initQRCode(numInputBytes, ecLevel, mode, qrCode);
+
+ // Step 4: Build another bit vector that contains header and data.
+ BitArray headerAndDataBits = new BitArray();
+
+ // Step 4.5: Append ECI message if applicable
+ if (mode == Mode.BYTE && !DEFAULT_BYTE_MODE_ENCODING.equals(encoding)) {
+ CharacterSetECI eci = CharacterSetECI.getCharacterSetECIByName(encoding);
+ if (eci != null) {
+ appendECI(eci, headerAndDataBits);
+ }
+ }
+
+ appendModeInfo(mode, headerAndDataBits);
+
+ int numLetters = mode.equals(Mode.BYTE) ? dataBits.getSizeInBytes() : content.length();
+ appendLengthInfo(numLetters, qrCode.getVersion(), mode, headerAndDataBits);
+ headerAndDataBits.appendBitArray(dataBits);
+
+ // Step 5: Terminate the bits properly.
+ terminateBits(qrCode.getNumDataBytes(), headerAndDataBits);
+
+ // Step 6: Interleave data bits with error correction code.
+ BitArray finalBits = new BitArray();
+ interleaveWithECBytes(headerAndDataBits, qrCode.getNumTotalBytes(), qrCode.getNumDataBytes(),
+ qrCode.getNumRSBlocks(), finalBits);
+
+ // Step 7: Choose the mask pattern and set to "qrCode".
+ ByteMatrix matrix = new ByteMatrix(qrCode.getMatrixWidth(), qrCode.getMatrixWidth());
+ qrCode.setMaskPattern(chooseMaskPattern(finalBits, qrCode.getECLevel(), qrCode.getVersion(),
+ matrix));
+
+ // Step 8. Build the matrix and set it to "qrCode".
+ MatrixUtil.buildMatrix(finalBits, qrCode.getECLevel(), qrCode.getVersion(),
+ qrCode.getMaskPattern(), matrix);
+ qrCode.setMatrix(matrix);
+ // Step 9. Make sure we have a valid QR Code.
+ if (!qrCode.isValid()) {
+ throw new WriterException("Invalid QR code: " + qrCode.toString());
+ }
+ }
+
+ /**
+ * @return the code point of the table used in alphanumeric mode or
+ * -1 if there is no corresponding code in the table.
+ */
+ static int getAlphanumericCode(int code) {
+ if (code < ALPHANUMERIC_TABLE.length) {
+ return ALPHANUMERIC_TABLE[code];
+ }
+ return -1;
+ }
+
+ public static Mode chooseMode(String content) {
+ return chooseMode(content, null);
+ }
+
+ /**
+ * Choose the best mode by examining the content. Note that 'encoding' is used as a hint;
+ * if it is Shift_JIS, and the input is only double-byte Kanji, then we return {@link Mode#KANJI}.
+ */
+ public static Mode chooseMode(String content, String encoding) {
+ if ("Shift_JIS".equals(encoding)) {
+ // Choose Kanji mode if all input are double-byte characters
+ return isOnlyDoubleByteKanji(content) ? Mode.KANJI : Mode.BYTE;
+ }
+ boolean hasNumeric = false;
+ boolean hasAlphanumeric = false;
+ for (int i = 0; i < content.length(); ++i) {
+ char c = content.charAt(i);
+ if (c >= '0' && c <= '9') {
+ hasNumeric = true;
+ } else if (getAlphanumericCode(c) != -1) {
+ hasAlphanumeric = true;
+ } else {
+ return Mode.BYTE;
+ }
+ }
+ if (hasAlphanumeric) {
+ return Mode.ALPHANUMERIC;
+ } else if (hasNumeric) {
+ return Mode.NUMERIC;
+ }
+ return Mode.BYTE;
+ }
+
+ private static boolean isOnlyDoubleByteKanji(String content) {
+ byte[] bytes;
+ try {
+ bytes = content.getBytes("Shift_JIS");
+ } catch (UnsupportedEncodingException uee) {
+ return false;
+ }
+ int length = bytes.length;
+ if (length % 2 != 0) {
+ return false;
+ }
+ for (int i = 0; i < length; i += 2) {
+ int byte1 = bytes[i] & 0xFF;
+ if ((byte1 < 0x81 || byte1 > 0x9F) && (byte1 < 0xE0 || byte1 > 0xEB)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static int chooseMaskPattern(BitArray bits, ErrorCorrectionLevel ecLevel, int version,
+ ByteMatrix matrix) throws WriterException {
+
+ int minPenalty = Integer.MAX_VALUE; // Lower penalty is better.
+ int bestMaskPattern = -1;
+ // We try all mask patterns to choose the best one.
+ for (int maskPattern = 0; maskPattern < QRCode.NUM_MASK_PATTERNS; maskPattern++) {
+ MatrixUtil.buildMatrix(bits, ecLevel, version, maskPattern, matrix);
+ int penalty = calculateMaskPenalty(matrix);
+ if (penalty < minPenalty) {
+ minPenalty = penalty;
+ bestMaskPattern = maskPattern;
+ }
+ }
+ return bestMaskPattern;
+ }
+
+ /**
+ * Initialize "qrCode" according to "numInputBytes", "ecLevel", and "mode". On success,
+ * modify "qrCode".
+ */
+ private static void initQRCode(int numInputBytes, ErrorCorrectionLevel ecLevel, Mode mode,
+ QRCode qrCode) throws WriterException {
+ qrCode.setECLevel(ecLevel);
+ qrCode.setMode(mode);
+
+ // In the following comments, we use numbers of Version 7-H.
+ for (int versionNum = 1; versionNum <= 40; versionNum++) {
+ Version version = Version.getVersionForNumber(versionNum);
+ // numBytes = 196
+ int numBytes = version.getTotalCodewords();
+ // getNumECBytes = 130
+ Version.ECBlocks ecBlocks = version.getECBlocksForLevel(ecLevel);
+ int numEcBytes = ecBlocks.getTotalECCodewords();
+ // getNumRSBlocks = 5
+ int numRSBlocks = ecBlocks.getNumBlocks();
+ // getNumDataBytes = 196 - 130 = 66
+ int numDataBytes = numBytes - numEcBytes;
+ // We want to choose the smallest version which can contain data of "numInputBytes" + some
+ // extra bits for the header (mode info and length info). The header can be three bytes
+ // (precisely 4 + 16 bits) at most. Hence we do +3 here.
+ if (numDataBytes >= numInputBytes + 3) {
+ // Yay, we found the proper rs block info!
+ qrCode.setVersion(versionNum);
+ qrCode.setNumTotalBytes(numBytes);
+ qrCode.setNumDataBytes(numDataBytes);
+ qrCode.setNumRSBlocks(numRSBlocks);
+ // getNumECBytes = 196 - 66 = 130
+ qrCode.setNumECBytes(numEcBytes);
+ // matrix width = 21 + 6 * 4 = 45
+ qrCode.setMatrixWidth(version.getDimensionForVersion());
+ return;
+ }
+ }
+ throw new WriterException("Cannot find proper rs block info (input data too big?)");
+ }
+
+ /**
+ * Terminate bits as described in 8.4.8 and 8.4.9 of JISX0510:2004 (p.24).
+ */
+ static void terminateBits(int numDataBytes, BitArray bits) throws WriterException {
+ int capacity = numDataBytes << 3;
+ if (bits.getSize() > capacity) {
+ throw new WriterException("data bits cannot fit in the QR Code" + bits.getSize() + " > " +
+ capacity);
+ }
+ for (int i = 0; i < 4 && bits.getSize() < capacity; ++i) {
+ bits.appendBit(false);
+ }
+ // Append termination bits. See 8.4.8 of JISX0510:2004 (p.24) for details.
+ // If the last byte isn't 8-bit aligned, we'll add padding bits.
+ int numBitsInLastByte = bits.getSize() & 0x07;
+ if (numBitsInLastByte > 0) {
+ for (int i = numBitsInLastByte; i < 8; i++) {
+ bits.appendBit(false);
+ }
+ }
+ // If we have more space, we'll fill the space with padding patterns defined in 8.4.9 (p.24).
+ int numPaddingBytes = numDataBytes - bits.getSizeInBytes();
+ for (int i = 0; i < numPaddingBytes; ++i) {
+ bits.appendBits(((i & 0x01) == 0) ? 0xEC : 0x11, 8);
+ }
+ if (bits.getSize() != capacity) {
+ throw new WriterException("Bits size does not equal capacity");
+ }
+ }
+
+ /**
+ * Get number of data bytes and number of error correction bytes for block id "blockID". Store
+ * the result in "numDataBytesInBlock", and "numECBytesInBlock". See table 12 in 8.5.1 of
+ * JISX0510:2004 (p.30)
+ */
+ static void getNumDataBytesAndNumECBytesForBlockID(int numTotalBytes, int numDataBytes,
+ int numRSBlocks, int blockID, int[] numDataBytesInBlock,
+ int[] numECBytesInBlock) throws WriterException {
+ if (blockID >= numRSBlocks) {
+ throw new WriterException("Block ID too large");
+ }
+ // numRsBlocksInGroup2 = 196 % 5 = 1
+ int numRsBlocksInGroup2 = numTotalBytes % numRSBlocks;
+ // numRsBlocksInGroup1 = 5 - 1 = 4
+ int numRsBlocksInGroup1 = numRSBlocks - numRsBlocksInGroup2;
+ // numTotalBytesInGroup1 = 196 / 5 = 39
+ int numTotalBytesInGroup1 = numTotalBytes / numRSBlocks;
+ // numTotalBytesInGroup2 = 39 + 1 = 40
+ int numTotalBytesInGroup2 = numTotalBytesInGroup1 + 1;
+ // numDataBytesInGroup1 = 66 / 5 = 13
+ int numDataBytesInGroup1 = numDataBytes / numRSBlocks;
+ // numDataBytesInGroup2 = 13 + 1 = 14
+ int numDataBytesInGroup2 = numDataBytesInGroup1 + 1;
+ // numEcBytesInGroup1 = 39 - 13 = 26
+ int numEcBytesInGroup1 = numTotalBytesInGroup1 - numDataBytesInGroup1;
+ // numEcBytesInGroup2 = 40 - 14 = 26
+ int numEcBytesInGroup2 = numTotalBytesInGroup2 - numDataBytesInGroup2;
+ // Sanity checks.
+ // 26 = 26
+ if (numEcBytesInGroup1 != numEcBytesInGroup2) {
+ throw new WriterException("EC bytes mismatch");
+ }
+ // 5 = 4 + 1.
+ if (numRSBlocks != numRsBlocksInGroup1 + numRsBlocksInGroup2) {
+ throw new WriterException("RS blocks mismatch");
+ }
+ // 196 = (13 + 26) * 4 + (14 + 26) * 1
+ if (numTotalBytes !=
+ ((numDataBytesInGroup1 + numEcBytesInGroup1) *
+ numRsBlocksInGroup1) +
+ ((numDataBytesInGroup2 + numEcBytesInGroup2) *
+ numRsBlocksInGroup2)) {
+ throw new WriterException("Total bytes mismatch");
+ }
+
+ if (blockID < numRsBlocksInGroup1) {
+ numDataBytesInBlock[0] = numDataBytesInGroup1;
+ numECBytesInBlock[0] = numEcBytesInGroup1;
+ } else {
+ numDataBytesInBlock[0] = numDataBytesInGroup2;
+ numECBytesInBlock[0] = numEcBytesInGroup2;
+ }
+ }
+
+ /**
+ * Interleave "bits" with corresponding error correction bytes. On success, store the result in
+ * "result". The interleave rule is complicated. See 8.6 of JISX0510:2004 (p.37) for details.
+ */
+ static void interleaveWithECBytes(BitArray bits, int numTotalBytes,
+ int numDataBytes, int numRSBlocks, BitArray result) throws WriterException {
+
+ // "bits" must have "getNumDataBytes" bytes of data.
+ if (bits.getSizeInBytes() != numDataBytes) {
+ throw new WriterException("Number of bits and data bytes does not match");
+ }
+
+ // Step 1. Divide data bytes into blocks and generate error correction bytes for them. We'll
+ // store the divided data bytes blocks and error correction bytes blocks into "blocks".
+ int dataBytesOffset = 0;
+ int maxNumDataBytes = 0;
+ int maxNumEcBytes = 0;
+
+ // Since, we know the number of reedsolmon blocks, we can initialize the vector with the number.
+ Vector blocks = new Vector(numRSBlocks);
+
+ for (int i = 0; i < numRSBlocks; ++i) {
+ int[] numDataBytesInBlock = new int[1];
+ int[] numEcBytesInBlock = new int[1];
+ getNumDataBytesAndNumECBytesForBlockID(
+ numTotalBytes, numDataBytes, numRSBlocks, i,
+ numDataBytesInBlock, numEcBytesInBlock);
+
+ int size = numDataBytesInBlock[0];
+ byte[] dataBytes = new byte[size];
+ bits.toBytes(8*dataBytesOffset, dataBytes, 0, size);
+ byte[] ecBytes = generateECBytes(dataBytes, numEcBytesInBlock[0]);
+ blocks.addElement(new BlockPair(dataBytes, ecBytes));
+
+ maxNumDataBytes = Math.max(maxNumDataBytes, size);
+ maxNumEcBytes = Math.max(maxNumEcBytes, ecBytes.length);
+ dataBytesOffset += numDataBytesInBlock[0];
+ }
+ if (numDataBytes != dataBytesOffset) {
+ throw new WriterException("Data bytes does not match offset");
+ }
+
+ // First, place data blocks.
+ for (int i = 0; i < maxNumDataBytes; ++i) {
+ for (int j = 0; j < blocks.size(); ++j) {
+ byte[] dataBytes = ((BlockPair) blocks.elementAt(j)).getDataBytes();
+ if (i < dataBytes.length) {
+ result.appendBits(dataBytes[i], 8);
+ }
+ }
+ }
+ // Then, place error correction blocks.
+ for (int i = 0; i < maxNumEcBytes; ++i) {
+ for (int j = 0; j < blocks.size(); ++j) {
+ byte[] ecBytes = ((BlockPair) blocks.elementAt(j)).getErrorCorrectionBytes();
+ if (i < ecBytes.length) {
+ result.appendBits(ecBytes[i], 8);
+ }
+ }
+ }
+ if (numTotalBytes != result.getSizeInBytes()) { // Should be same.
+ throw new WriterException("Interleaving error: " + numTotalBytes + " and " +
+ result.getSizeInBytes() + " differ.");
+ }
+ }
+
+ static byte[] generateECBytes(byte[] dataBytes, int numEcBytesInBlock) {
+ int numDataBytes = dataBytes.length;
+ int[] toEncode = new int[numDataBytes + numEcBytesInBlock];
+ for (int i = 0; i < numDataBytes; i++) {
+ toEncode[i] = dataBytes[i] & 0xFF;
+ }
+ new ReedSolomonEncoder(GF256.QR_CODE_FIELD).encode(toEncode, numEcBytesInBlock);
+
+ byte[] ecBytes = new byte[numEcBytesInBlock];
+ for (int i = 0; i < numEcBytesInBlock; i++) {
+ ecBytes[i] = (byte) toEncode[numDataBytes + i];
+ }
+ return ecBytes;
+ }
+
+ /**
+ * Append mode info. On success, store the result in "bits".
+ */
+ static void appendModeInfo(Mode mode, BitArray bits) {
+ bits.appendBits(mode.getBits(), 4);
+ }
+
+
+ /**
+ * Append length info. On success, store the result in "bits".
+ */
+ static void appendLengthInfo(int numLetters, int version, Mode mode, BitArray bits)
+ throws WriterException {
+ int numBits = mode.getCharacterCountBits(Version.getVersionForNumber(version));
+ if (numLetters > ((1 << numBits) - 1)) {
+ throw new WriterException(numLetters + "is bigger than" + ((1 << numBits) - 1));
+ }
+ bits.appendBits(numLetters, numBits);
+ }
+
+ /**
+ * Append "bytes" in "mode" mode (encoding) into "bits". On success, store the result in "bits".
+ */
+ static void appendBytes(String content, Mode mode, BitArray bits, String encoding)
+ throws WriterException {
+ if (mode.equals(Mode.NUMERIC)) {
+ appendNumericBytes(content, bits);
+ } else if (mode.equals(Mode.ALPHANUMERIC)) {
+ appendAlphanumericBytes(content, bits);
+ } else if (mode.equals(Mode.BYTE)) {
+ append8BitBytes(content, bits, encoding);
+ } else if (mode.equals(Mode.KANJI)) {
+ appendKanjiBytes(content, bits);
+ } else {
+ throw new WriterException("Invalid mode: " + mode);
+ }
+ }
+
+ static void appendNumericBytes(String content, BitArray bits) {
+ int length = content.length();
+ int i = 0;
+ while (i < length) {
+ int num1 = content.charAt(i) - '0';
+ if (i + 2 < length) {
+ // Encode three numeric letters in ten bits.
+ int num2 = content.charAt(i + 1) - '0';
+ int num3 = content.charAt(i + 2) - '0';
+ bits.appendBits(num1 * 100 + num2 * 10 + num3, 10);
+ i += 3;
+ } else if (i + 1 < length) {
+ // Encode two numeric letters in seven bits.
+ int num2 = content.charAt(i + 1) - '0';
+ bits.appendBits(num1 * 10 + num2, 7);
+ i += 2;
+ } else {
+ // Encode one numeric letter in four bits.
+ bits.appendBits(num1, 4);
+ i++;
+ }
+ }
+ }
+
+ static void appendAlphanumericBytes(String content, BitArray bits) throws WriterException {
+ int length = content.length();
+ int i = 0;
+ while (i < length) {
+ int code1 = getAlphanumericCode(content.charAt(i));
+ if (code1 == -1) {
+ throw new WriterException();
+ }
+ if (i + 1 < length) {
+ int code2 = getAlphanumericCode(content.charAt(i + 1));
+ if (code2 == -1) {
+ throw new WriterException();
+ }
+ // Encode two alphanumeric letters in 11 bits.
+ bits.appendBits(code1 * 45 + code2, 11);
+ i += 2;
+ } else {
+ // Encode one alphanumeric letter in six bits.
+ bits.appendBits(code1, 6);
+ i++;
+ }
+ }
+ }
+
+ static void append8BitBytes(String content, BitArray bits, String encoding)
+ throws WriterException {
+ byte[] bytes;
+ try {
+ bytes = content.getBytes(encoding);
+ } catch (UnsupportedEncodingException uee) {
+ throw new WriterException(uee.toString());
+ }
+ for (int i = 0; i < bytes.length; ++i) {
+ bits.appendBits(bytes[i], 8);
+ }
+ }
+
+ static void appendKanjiBytes(String content, BitArray bits) throws WriterException {
+ byte[] bytes;
+ try {
+ bytes = content.getBytes("Shift_JIS");
+ } catch (UnsupportedEncodingException uee) {
+ throw new WriterException(uee.toString());
+ }
+ int length = bytes.length;
+ for (int i = 0; i < length; i += 2) {
+ int byte1 = bytes[i] & 0xFF;
+ int byte2 = bytes[i + 1] & 0xFF;
+ int code = (byte1 << 8) | byte2;
+ int subtracted = -1;
+ if (code >= 0x8140 && code <= 0x9ffc) {
+ subtracted = code - 0x8140;
+ } else if (code >= 0xe040 && code <= 0xebbf) {
+ subtracted = code - 0xc140;
+ }
+ if (subtracted == -1) {
+ throw new WriterException("Invalid byte sequence");
+ }
+ int encoded = ((subtracted >> 8) * 0xc0) + (subtracted & 0xff);
+ bits.appendBits(encoded, 13);
+ }
+ }
+
+ private static void appendECI(ECI eci, BitArray bits) {
+ bits.appendBits(Mode.ECI.getBits(), 4);
+ // This is correct for values up to 127, which is all we need now.
+ bits.appendBits(eci.getValue(), 8);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+/**
+ * @author satorux@google.com (Satoru Takabayashi) - creator
+ * @author dswitkin@google.com (Daniel Switkin) - ported from C++
+ */
+public final class MaskUtil {
+
+ private MaskUtil() {
+ // do nothing
+ }
+
+ // Apply mask penalty rule 1 and return the penalty. Find repetitive cells with the same color and
+ // give penalty to them. Example: 00000 or 11111.
+ public static int applyMaskPenaltyRule1(ByteMatrix matrix) {
+ return applyMaskPenaltyRule1Internal(matrix, true) + applyMaskPenaltyRule1Internal(matrix, false);
+ }
+
+ // Apply mask penalty rule 2 and return the penalty. Find 2x2 blocks with the same color and give
+ // penalty to them.
+ public static int applyMaskPenaltyRule2(ByteMatrix matrix) {
+ int penalty = 0;
+ byte[][] array = matrix.getArray();
+ int width = matrix.getWidth();
+ int height = matrix.getHeight();
+ for (int y = 0; y < height - 1; ++y) {
+ for (int x = 0; x < width - 1; ++x) {
+ int value = array[y][x];
+ if (value == array[y][x + 1] && value == array[y + 1][x] && value == array[y + 1][x + 1]) {
+ penalty += 3;
+ }
+ }
+ }
+ return penalty;
+ }
+
+ // Apply mask penalty rule 3 and return the penalty. Find consecutive cells of 00001011101 or
+ // 10111010000, and give penalty to them. If we find patterns like 000010111010000, we give
+ // penalties twice (i.e. 40 * 2).
+ public static int applyMaskPenaltyRule3(ByteMatrix matrix) {
+ int penalty = 0;
+ byte[][] array = matrix.getArray();
+ int width = matrix.getWidth();
+ int height = matrix.getHeight();
+ for (int y = 0; y < height; ++y) {
+ for (int x = 0; x < width; ++x) {
+ // Tried to simplify following conditions but failed.
+ if (x + 6 < width &&
+ array[y][x] == 1 &&
+ array[y][x + 1] == 0 &&
+ array[y][x + 2] == 1 &&
+ array[y][x + 3] == 1 &&
+ array[y][x + 4] == 1 &&
+ array[y][x + 5] == 0 &&
+ array[y][x + 6] == 1 &&
+ ((x + 10 < width &&
+ array[y][x + 7] == 0 &&
+ array[y][x + 8] == 0 &&
+ array[y][x + 9] == 0 &&
+ array[y][x + 10] == 0) ||
+ (x - 4 >= 0 &&
+ array[y][x - 1] == 0 &&
+ array[y][x - 2] == 0 &&
+ array[y][x - 3] == 0 &&
+ array[y][x - 4] == 0))) {
+ penalty += 40;
+ }
+ if (y + 6 < height &&
+ array[y][x] == 1 &&
+ array[y + 1][x] == 0 &&
+ array[y + 2][x] == 1 &&
+ array[y + 3][x] == 1 &&
+ array[y + 4][x] == 1 &&
+ array[y + 5][x] == 0 &&
+ array[y + 6][x] == 1 &&
+ ((y + 10 < height &&
+ array[y + 7][x] == 0 &&
+ array[y + 8][x] == 0 &&
+ array[y + 9][x] == 0 &&
+ array[y + 10][x] == 0) ||
+ (y - 4 >= 0 &&
+ array[y - 1][x] == 0 &&
+ array[y - 2][x] == 0 &&
+ array[y - 3][x] == 0 &&
+ array[y - 4][x] == 0))) {
+ penalty += 40;
+ }
+ }
+ }
+ return penalty;
+ }
+
+ // Apply mask penalty rule 4 and return the penalty. Calculate the ratio of dark cells and give
+ // penalty if the ratio is far from 50%. It gives 10 penalty for 5% distance. Examples:
+ // - 0% => 100
+ // - 40% => 20
+ // - 45% => 10
+ // - 50% => 0
+ // - 55% => 10
+ // - 55% => 20
+ // - 100% => 100
+ public static int applyMaskPenaltyRule4(ByteMatrix matrix) {
+ int numDarkCells = 0;
+ byte[][] array = matrix.getArray();
+ int width = matrix.getWidth();
+ int height = matrix.getHeight();
+ for (int y = 0; y < height; ++y) {
+ for (int x = 0; x < width; ++x) {
+ if (array[y][x] == 1) {
+ numDarkCells += 1;
+ }
+ }
+ }
+ int numTotalCells = matrix.getHeight() * matrix.getWidth();
+ double darkRatio = (double) numDarkCells / numTotalCells;
+ return Math.abs((int) (darkRatio * 100 - 50)) / 5 * 10;
+ }
+
+ // Return the mask bit for "getMaskPattern" at "x" and "y". See 8.8 of JISX0510:2004 for mask
+ // pattern conditions.
+ public static boolean getDataMaskBit(int maskPattern, int x, int y) {
+ if (!QRCode.isValidMaskPattern(maskPattern)) {
+ throw new IllegalArgumentException("Invalid mask pattern");
+ }
+ int intermediate, temp;
+ switch (maskPattern) {
+ case 0:
+ intermediate = (y + x) & 0x1;
+ break;
+ case 1:
+ intermediate = y & 0x1;
+ break;
+ case 2:
+ intermediate = x % 3;
+ break;
+ case 3:
+ intermediate = (y + x) % 3;
+ break;
+ case 4:
+ intermediate = ((y >>> 1) + (x / 3)) & 0x1;
+ break;
+ case 5:
+ temp = y * x;
+ intermediate = (temp & 0x1) + (temp % 3);
+ break;
+ case 6:
+ temp = y * x;
+ intermediate = (((temp & 0x1) + (temp % 3)) & 0x1);
+ break;
+ case 7:
+ temp = y * x;
+ intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1);
+ break;
+ default:
+ throw new IllegalArgumentException("Invalid mask pattern: " + maskPattern);
+ }
+ return intermediate == 0;
+ }
+
+ // Helper function for applyMaskPenaltyRule1. We need this for doing this calculation in both
+ // vertical and horizontal orders respectively.
+ private static int applyMaskPenaltyRule1Internal(ByteMatrix matrix, boolean isHorizontal) {
+ int penalty = 0;
+ int numSameBitCells = 0;
+ int prevBit = -1;
+ // Horizontal mode:
+ // for (int i = 0; i < matrix.height(); ++i) {
+ // for (int j = 0; j < matrix.width(); ++j) {
+ // int bit = matrix.get(i, j);
+ // Vertical mode:
+ // for (int i = 0; i < matrix.width(); ++i) {
+ // for (int j = 0; j < matrix.height(); ++j) {
+ // int bit = matrix.get(j, i);
+ int iLimit = isHorizontal ? matrix.getHeight() : matrix.getWidth();
+ int jLimit = isHorizontal ? matrix.getWidth() : matrix.getHeight();
+ byte[][] array = matrix.getArray();
+ for (int i = 0; i < iLimit; ++i) {
+ for (int j = 0; j < jLimit; ++j) {
+ int bit = isHorizontal ? array[i][j] : array[j][i];
+ if (bit == prevBit) {
+ numSameBitCells += 1;
+ // Found five repetitive cells with the same color (bit).
+ // We'll give penalty of 3.
+ if (numSameBitCells == 5) {
+ penalty += 3;
+ } else if (numSameBitCells > 5) {
+ // After five repetitive cells, we'll add the penalty one
+ // by one.
+ penalty += 1;
+ }
+ } else {
+ numSameBitCells = 1; // Include the cell itself.
+ prevBit = bit;
+ }
+ }
+ numSameBitCells = 0; // Clear at each row/column.
+ }
+ return penalty;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,524 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitArray;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+/**
+ * @author satorux@google.com (Satoru Takabayashi) - creator
+ * @author dswitkin@google.com (Daniel Switkin) - ported from C++
+ */
+public final class MatrixUtil {
+
+ private MatrixUtil() {
+ // do nothing
+ }
+
+ private static final int[][] POSITION_DETECTION_PATTERN = {
+ {1, 1, 1, 1, 1, 1, 1},
+ {1, 0, 0, 0, 0, 0, 1},
+ {1, 0, 1, 1, 1, 0, 1},
+ {1, 0, 1, 1, 1, 0, 1},
+ {1, 0, 1, 1, 1, 0, 1},
+ {1, 0, 0, 0, 0, 0, 1},
+ {1, 1, 1, 1, 1, 1, 1},
+ };
+
+ private static final int[][] HORIZONTAL_SEPARATION_PATTERN = {
+ {0, 0, 0, 0, 0, 0, 0, 0},
+ };
+
+ private static final int[][] VERTICAL_SEPARATION_PATTERN = {
+ {0}, {0}, {0}, {0}, {0}, {0}, {0},
+ };
+
+ private static final int[][] POSITION_ADJUSTMENT_PATTERN = {
+ {1, 1, 1, 1, 1},
+ {1, 0, 0, 0, 1},
+ {1, 0, 1, 0, 1},
+ {1, 0, 0, 0, 1},
+ {1, 1, 1, 1, 1},
+ };
+
+ // From Appendix E. Table 1, JIS0510X:2004 (p 71). The table was double-checked by komatsu.
+ private static final int[][] POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE = {
+ {-1, -1, -1, -1, -1, -1, -1}, // Version 1
+ { 6, 18, -1, -1, -1, -1, -1}, // Version 2
+ { 6, 22, -1, -1, -1, -1, -1}, // Version 3
+ { 6, 26, -1, -1, -1, -1, -1}, // Version 4
+ { 6, 30, -1, -1, -1, -1, -1}, // Version 5
+ { 6, 34, -1, -1, -1, -1, -1}, // Version 6
+ { 6, 22, 38, -1, -1, -1, -1}, // Version 7
+ { 6, 24, 42, -1, -1, -1, -1}, // Version 8
+ { 6, 26, 46, -1, -1, -1, -1}, // Version 9
+ { 6, 28, 50, -1, -1, -1, -1}, // Version 10
+ { 6, 30, 54, -1, -1, -1, -1}, // Version 11
+ { 6, 32, 58, -1, -1, -1, -1}, // Version 12
+ { 6, 34, 62, -1, -1, -1, -1}, // Version 13
+ { 6, 26, 46, 66, -1, -1, -1}, // Version 14
+ { 6, 26, 48, 70, -1, -1, -1}, // Version 15
+ { 6, 26, 50, 74, -1, -1, -1}, // Version 16
+ { 6, 30, 54, 78, -1, -1, -1}, // Version 17
+ { 6, 30, 56, 82, -1, -1, -1}, // Version 18
+ { 6, 30, 58, 86, -1, -1, -1}, // Version 19
+ { 6, 34, 62, 90, -1, -1, -1}, // Version 20
+ { 6, 28, 50, 72, 94, -1, -1}, // Version 21
+ { 6, 26, 50, 74, 98, -1, -1}, // Version 22
+ { 6, 30, 54, 78, 102, -1, -1}, // Version 23
+ { 6, 28, 54, 80, 106, -1, -1}, // Version 24
+ { 6, 32, 58, 84, 110, -1, -1}, // Version 25
+ { 6, 30, 58, 86, 114, -1, -1}, // Version 26
+ { 6, 34, 62, 90, 118, -1, -1}, // Version 27
+ { 6, 26, 50, 74, 98, 122, -1}, // Version 28
+ { 6, 30, 54, 78, 102, 126, -1}, // Version 29
+ { 6, 26, 52, 78, 104, 130, -1}, // Version 30
+ { 6, 30, 56, 82, 108, 134, -1}, // Version 31
+ { 6, 34, 60, 86, 112, 138, -1}, // Version 32
+ { 6, 30, 58, 86, 114, 142, -1}, // Version 33
+ { 6, 34, 62, 90, 118, 146, -1}, // Version 34
+ { 6, 30, 54, 78, 102, 126, 150}, // Version 35
+ { 6, 24, 50, 76, 102, 128, 154}, // Version 36
+ { 6, 28, 54, 80, 106, 132, 158}, // Version 37
+ { 6, 32, 58, 84, 110, 136, 162}, // Version 38
+ { 6, 26, 54, 82, 110, 138, 166}, // Version 39
+ { 6, 30, 58, 86, 114, 142, 170}, // Version 40
+ };
+
+ // Type info cells at the left top corner.
+ private static final int[][] TYPE_INFO_COORDINATES = {
+ {8, 0},
+ {8, 1},
+ {8, 2},
+ {8, 3},
+ {8, 4},
+ {8, 5},
+ {8, 7},
+ {8, 8},
+ {7, 8},
+ {5, 8},
+ {4, 8},
+ {3, 8},
+ {2, 8},
+ {1, 8},
+ {0, 8},
+ };
+
+ // From Appendix D in JISX0510:2004 (p. 67)
+ private static final int VERSION_INFO_POLY = 0x1f25; // 1 1111 0010 0101
+
+ // From Appendix C in JISX0510:2004 (p.65).
+ private static final int TYPE_INFO_POLY = 0x537;
+ private static final int TYPE_INFO_MASK_PATTERN = 0x5412;
+
+ // Set all cells to -1. -1 means that the cell is empty (not set yet).
+ //
+ // JAVAPORT: We shouldn't need to do this at all. The code should be rewritten to begin encoding
+ // with the ByteMatrix initialized all to zero.
+ public static void clearMatrix(ByteMatrix matrix) {
+ matrix.clear((byte) -1);
+ }
+
+ // Build 2D matrix of QR Code from "dataBits" with "ecLevel", "version" and "getMaskPattern". On
+ // success, store the result in "matrix" and return true.
+ public static void buildMatrix(BitArray dataBits, ErrorCorrectionLevel ecLevel, int version,
+ int maskPattern, ByteMatrix matrix) throws WriterException {
+ clearMatrix(matrix);
+ embedBasicPatterns(version, matrix);
+ // Type information appear with any version.
+ embedTypeInfo(ecLevel, maskPattern, matrix);
+ // Version info appear if version >= 7.
+ maybeEmbedVersionInfo(version, matrix);
+ // Data should be embedded at end.
+ embedDataBits(dataBits, maskPattern, matrix);
+ }
+
+ // Embed basic patterns. On success, modify the matrix and return true.
+ // The basic patterns are:
+ // - Position detection patterns
+ // - Timing patterns
+ // - Dark dot at the left bottom corner
+ // - Position adjustment patterns, if need be
+ public static void embedBasicPatterns(int version, ByteMatrix matrix) throws WriterException {
+ // Let's get started with embedding big squares at corners.
+ embedPositionDetectionPatternsAndSeparators(matrix);
+ // Then, embed the dark dot at the left bottom corner.
+ embedDarkDotAtLeftBottomCorner(matrix);
+
+ // Position adjustment patterns appear if version >= 2.
+ maybeEmbedPositionAdjustmentPatterns(version, matrix);
+ // Timing patterns should be embedded after position adj. patterns.
+ embedTimingPatterns(matrix);
+ }
+
+ // Embed type information. On success, modify the matrix.
+ public static void embedTypeInfo(ErrorCorrectionLevel ecLevel, int maskPattern, ByteMatrix matrix)
+ throws WriterException {
+ BitArray typeInfoBits = new BitArray();
+ makeTypeInfoBits(ecLevel, maskPattern, typeInfoBits);
+
+ for (int i = 0; i < typeInfoBits.getSize(); ++i) {
+ // Place bits in LSB to MSB order. LSB (least significant bit) is the last value in
+ // "typeInfoBits".
+ boolean bit = typeInfoBits.get(typeInfoBits.getSize() - 1 - i);
+
+ // Type info bits at the left top corner. See 8.9 of JISX0510:2004 (p.46).
+ int x1 = TYPE_INFO_COORDINATES[i][0];
+ int y1 = TYPE_INFO_COORDINATES[i][1];
+ matrix.set(x1, y1, bit);
+
+ if (i < 8) {
+ // Right top corner.
+ int x2 = matrix.getWidth() - i - 1;
+ int y2 = 8;
+ matrix.set(x2, y2, bit);
+ } else {
+ // Left bottom corner.
+ int x2 = 8;
+ int y2 = matrix.getHeight() - 7 + (i - 8);
+ matrix.set(x2, y2, bit);
+ }
+ }
+ }
+
+ // Embed version information if need be. On success, modify the matrix and return true.
+ // See 8.10 of JISX0510:2004 (p.47) for how to embed version information.
+ public static void maybeEmbedVersionInfo(int version, ByteMatrix matrix) throws WriterException {
+ if (version < 7) { // Version info is necessary if version >= 7.
+ return; // Don't need version info.
+ }
+ BitArray versionInfoBits = new BitArray();
+ makeVersionInfoBits(version, versionInfoBits);
+
+ int bitIndex = 6 * 3 - 1; // It will decrease from 17 to 0.
+ for (int i = 0; i < 6; ++i) {
+ for (int j = 0; j < 3; ++j) {
+ // Place bits in LSB (least significant bit) to MSB order.
+ boolean bit = versionInfoBits.get(bitIndex);
+ bitIndex--;
+ // Left bottom corner.
+ matrix.set(i, matrix.getHeight() - 11 + j, bit);
+ // Right bottom corner.
+ matrix.set(matrix.getHeight() - 11 + j, i, bit);
+ }
+ }
+ }
+
+ // Embed "dataBits" using "getMaskPattern". On success, modify the matrix and return true.
+ // For debugging purposes, it skips masking process if "getMaskPattern" is -1.
+ // See 8.7 of JISX0510:2004 (p.38) for how to embed data bits.
+ public static void embedDataBits(BitArray dataBits, int maskPattern, ByteMatrix matrix)
+ throws WriterException {
+ int bitIndex = 0;
+ int direction = -1;
+ // Start from the right bottom cell.
+ int x = matrix.getWidth() - 1;
+ int y = matrix.getHeight() - 1;
+ while (x > 0) {
+ // Skip the vertical timing pattern.
+ if (x == 6) {
+ x -= 1;
+ }
+ while (y >= 0 && y < matrix.getHeight()) {
+ for (int i = 0; i < 2; ++i) {
+ int xx = x - i;
+ // Skip the cell if it's not empty.
+ if (!isEmpty(matrix.get(xx, y))) {
+ continue;
+ }
+ boolean bit;
+ if (bitIndex < dataBits.getSize()) {
+ bit = dataBits.get(bitIndex);
+ ++bitIndex;
+ } else {
+ // Padding bit. If there is no bit left, we'll fill the left cells with 0, as described
+ // in 8.4.9 of JISX0510:2004 (p. 24).
+ bit = false;
+ }
+
+ // Skip masking if mask_pattern is -1.
+ if (maskPattern != -1) {
+ if (MaskUtil.getDataMaskBit(maskPattern, xx, y)) {
+ bit = !bit;
+ }
+ }
+ matrix.set(xx, y, bit);
+ }
+ y += direction;
+ }
+ direction = -direction; // Reverse the direction.
+ y += direction;
+ x -= 2; // Move to the left.
+ }
+ // All bits should be consumed.
+ if (bitIndex != dataBits.getSize()) {
+ throw new WriterException("Not all bits consumed: " + bitIndex + '/' + dataBits.getSize());
+ }
+ }
+
+ // Return the position of the most significant bit set (to one) in the "value". The most
+ // significant bit is position 32. If there is no bit set, return 0. Examples:
+ // - findMSBSet(0) => 0
+ // - findMSBSet(1) => 1
+ // - findMSBSet(255) => 8
+ public static int findMSBSet(int value) {
+ int numDigits = 0;
+ while (value != 0) {
+ value >>>= 1;
+ ++numDigits;
+ }
+ return numDigits;
+ }
+
+ // Calculate BCH (Bose-Chaudhuri-Hocquenghem) code for "value" using polynomial "poly". The BCH
+ // code is used for encoding type information and version information.
+ // Example: Calculation of version information of 7.
+ // f(x) is created from 7.
+ // - 7 = 000111 in 6 bits
+ // - f(x) = x^2 + x^1 + x^0
+ // g(x) is given by the standard (p. 67)
+ // - g(x) = x^12 + x^11 + x^10 + x^9 + x^8 + x^5 + x^2 + 1
+ // Multiply f(x) by x^(18 - 6)
+ // - f'(x) = f(x) * x^(18 - 6)
+ // - f'(x) = x^14 + x^13 + x^12
+ // Calculate the remainder of f'(x) / g(x)
+ // x^2
+ // __________________________________________________
+ // g(x) )x^14 + x^13 + x^12
+ // x^14 + x^13 + x^12 + x^11 + x^10 + x^7 + x^4 + x^2
+ // --------------------------------------------------
+ // x^11 + x^10 + x^7 + x^4 + x^2
+ //
+ // The remainder is x^11 + x^10 + x^7 + x^4 + x^2
+ // Encode it in binary: 110010010100
+ // The return value is 0xc94 (1100 1001 0100)
+ //
+ // Since all coefficients in the polynomials are 1 or 0, we can do the calculation by bit
+ // operations. We don't care if cofficients are positive or negative.
+ public static int calculateBCHCode(int value, int poly) {
+ // If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1
+ // from 13 to make it 12.
+ int msbSetInPoly = findMSBSet(poly);
+ value <<= msbSetInPoly - 1;
+ // Do the division business using exclusive-or operations.
+ while (findMSBSet(value) >= msbSetInPoly) {
+ value ^= poly << (findMSBSet(value) - msbSetInPoly);
+ }
+ // Now the "value" is the remainder (i.e. the BCH code)
+ return value;
+ }
+
+ // Make bit vector of type information. On success, store the result in "bits" and return true.
+ // Encode error correction level and mask pattern. See 8.9 of
+ // JISX0510:2004 (p.45) for details.
+ public static void makeTypeInfoBits(ErrorCorrectionLevel ecLevel, int maskPattern, BitArray bits)
+ throws WriterException {
+ if (!QRCode.isValidMaskPattern(maskPattern)) {
+ throw new WriterException("Invalid mask pattern");
+ }
+ int typeInfo = (ecLevel.getBits() << 3) | maskPattern;
+ bits.appendBits(typeInfo, 5);
+
+ int bchCode = calculateBCHCode(typeInfo, TYPE_INFO_POLY);
+ bits.appendBits(bchCode, 10);
+
+ BitArray maskBits = new BitArray();
+ maskBits.appendBits(TYPE_INFO_MASK_PATTERN, 15);
+ bits.xor(maskBits);
+
+ if (bits.getSize() != 15) { // Just in case.
+ throw new WriterException("should not happen but we got: " + bits.getSize());
+ }
+ }
+
+ // Make bit vector of version information. On success, store the result in "bits" and return true.
+ // See 8.10 of JISX0510:2004 (p.45) for details.
+ public static void makeVersionInfoBits(int version, BitArray bits) throws WriterException {
+ bits.appendBits(version, 6);
+ int bchCode = calculateBCHCode(version, VERSION_INFO_POLY);
+ bits.appendBits(bchCode, 12);
+
+ if (bits.getSize() != 18) { // Just in case.
+ throw new WriterException("should not happen but we got: " + bits.getSize());
+ }
+ }
+
+ // Check if "value" is empty.
+ private static boolean isEmpty(int value) {
+ return value == -1;
+ }
+
+ // Check if "value" is valid.
+ private static boolean isValidValue(int value) {
+ return (value == -1 || // Empty.
+ value == 0 || // Light (white).
+ value == 1); // Dark (black).
+ }
+
+ private static void embedTimingPatterns(ByteMatrix matrix) throws WriterException {
+ // -8 is for skipping position detection patterns (size 7), and two horizontal/vertical
+ // separation patterns (size 1). Thus, 8 = 7 + 1.
+ for (int i = 8; i < matrix.getWidth() - 8; ++i) {
+ int bit = (i + 1) % 2;
+ // Horizontal line.
+ if (!isValidValue(matrix.get(i, 6))) {
+ throw new WriterException();
+ }
+ if (isEmpty(matrix.get(i, 6))) {
+ matrix.set(i, 6, bit);
+ }
+ // Vertical line.
+ if (!isValidValue(matrix.get(6, i))) {
+ throw new WriterException();
+ }
+ if (isEmpty(matrix.get(6, i))) {
+ matrix.set(6, i, bit);
+ }
+ }
+ }
+
+ // Embed the lonely dark dot at left bottom corner. JISX0510:2004 (p.46)
+ private static void embedDarkDotAtLeftBottomCorner(ByteMatrix matrix) throws WriterException {
+ if (matrix.get(8, matrix.getHeight() - 8) == 0) {
+ throw new WriterException();
+ }
+ matrix.set(8, matrix.getHeight() - 8, 1);
+ }
+
+ private static void embedHorizontalSeparationPattern(int xStart, int yStart,
+ ByteMatrix matrix) throws WriterException {
+ // We know the width and height.
+ if (HORIZONTAL_SEPARATION_PATTERN[0].length != 8 || HORIZONTAL_SEPARATION_PATTERN.length != 1) {
+ throw new WriterException("Bad horizontal separation pattern");
+ }
+ for (int x = 0; x < 8; ++x) {
+ if (!isEmpty(matrix.get(xStart + x, yStart))) {
+ throw new WriterException();
+ }
+ matrix.set(xStart + x, yStart, HORIZONTAL_SEPARATION_PATTERN[0][x]);
+ }
+ }
+
+ private static void embedVerticalSeparationPattern(int xStart, int yStart,
+ ByteMatrix matrix) throws WriterException {
+ // We know the width and height.
+ if (VERTICAL_SEPARATION_PATTERN[0].length != 1 || VERTICAL_SEPARATION_PATTERN.length != 7) {
+ throw new WriterException("Bad vertical separation pattern");
+ }
+ for (int y = 0; y < 7; ++y) {
+ if (!isEmpty(matrix.get(xStart, yStart + y))) {
+ throw new WriterException();
+ }
+ matrix.set(xStart, yStart + y, VERTICAL_SEPARATION_PATTERN[y][0]);
+ }
+ }
+
+ // Note that we cannot unify the function with embedPositionDetectionPattern() despite they are
+ // almost identical, since we cannot write a function that takes 2D arrays in different sizes in
+ // C/C++. We should live with the fact.
+ private static void embedPositionAdjustmentPattern(int xStart, int yStart,
+ ByteMatrix matrix) throws WriterException {
+ // We know the width and height.
+ if (POSITION_ADJUSTMENT_PATTERN[0].length != 5 || POSITION_ADJUSTMENT_PATTERN.length != 5) {
+ throw new WriterException("Bad position adjustment");
+ }
+ for (int y = 0; y < 5; ++y) {
+ for (int x = 0; x < 5; ++x) {
+ if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
+ throw new WriterException();
+ }
+ matrix.set(xStart + x, yStart + y, POSITION_ADJUSTMENT_PATTERN[y][x]);
+ }
+ }
+ }
+
+ private static void embedPositionDetectionPattern(int xStart, int yStart,
+ ByteMatrix matrix) throws WriterException {
+ // We know the width and height.
+ if (POSITION_DETECTION_PATTERN[0].length != 7 || POSITION_DETECTION_PATTERN.length != 7) {
+ throw new WriterException("Bad position detection pattern");
+ }
+ for (int y = 0; y < 7; ++y) {
+ for (int x = 0; x < 7; ++x) {
+ if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
+ throw new WriterException();
+ }
+ matrix.set(xStart + x, yStart + y, POSITION_DETECTION_PATTERN[y][x]);
+ }
+ }
+ }
+
+ // Embed position detection patterns and surrounding vertical/horizontal separators.
+ private static void embedPositionDetectionPatternsAndSeparators(ByteMatrix matrix) throws WriterException {
+ // Embed three big squares at corners.
+ int pdpWidth = POSITION_DETECTION_PATTERN[0].length;
+ // Left top corner.
+ embedPositionDetectionPattern(0, 0, matrix);
+ // Right top corner.
+ embedPositionDetectionPattern(matrix.getWidth() - pdpWidth, 0, matrix);
+ // Left bottom corner.
+ embedPositionDetectionPattern(0, matrix.getWidth() - pdpWidth, matrix);
+
+ // Embed horizontal separation patterns around the squares.
+ int hspWidth = HORIZONTAL_SEPARATION_PATTERN[0].length;
+ // Left top corner.
+ embedHorizontalSeparationPattern(0, hspWidth - 1, matrix);
+ // Right top corner.
+ embedHorizontalSeparationPattern(matrix.getWidth() - hspWidth,
+ hspWidth - 1, matrix);
+ // Left bottom corner.
+ embedHorizontalSeparationPattern(0, matrix.getWidth() - hspWidth, matrix);
+
+ // Embed vertical separation patterns around the squares.
+ int vspSize = VERTICAL_SEPARATION_PATTERN.length;
+ // Left top corner.
+ embedVerticalSeparationPattern(vspSize, 0, matrix);
+ // Right top corner.
+ embedVerticalSeparationPattern(matrix.getHeight() - vspSize - 1, 0, matrix);
+ // Left bottom corner.
+ embedVerticalSeparationPattern(vspSize, matrix.getHeight() - vspSize,
+ matrix);
+ }
+
+ // Embed position adjustment patterns if need be.
+ private static void maybeEmbedPositionAdjustmentPatterns(int version, ByteMatrix matrix)
+ throws WriterException {
+ if (version < 2) { // The patterns appear if version >= 2
+ return;
+ }
+ int index = version - 1;
+ int[] coordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index];
+ int numCoordinates = POSITION_ADJUSTMENT_PATTERN_COORDINATE_TABLE[index].length;
+ for (int i = 0; i < numCoordinates; ++i) {
+ for (int j = 0; j < numCoordinates; ++j) {
+ int y = coordinates[i];
+ int x = coordinates[j];
+ if (x == -1 || y == -1) {
+ continue;
+ }
+ // If the cell is unset, we embed the position adjustment pattern here.
+ if (isEmpty(matrix.get(x, y))) {
+ // -2 is necessary since the x/y coordinates point to the center of the pattern, not the
+ // left top corner.
+ embedPositionAdjustmentPattern(x - 2, y - 2, matrix);
+ }
+ }
+ }
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode.encoder;
+
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.decoder.Mode;
+
+/**
+ * @author satorux@google.com (Satoru Takabayashi) - creator
+ * @author dswitkin@google.com (Daniel Switkin) - ported from C++
+ */
+public final class QRCode {
+
+ public static final int NUM_MASK_PATTERNS = 8;
+
+ private Mode mode;
+ private ErrorCorrectionLevel ecLevel;
+ private int version;
+ private int matrixWidth;
+ private int maskPattern;
+ private int numTotalBytes;
+ private int numDataBytes;
+ private int numECBytes;
+ private int numRSBlocks;
+ private ByteMatrix matrix;
+
+ public QRCode() {
+ mode = null;
+ ecLevel = null;
+ version = -1;
+ matrixWidth = -1;
+ maskPattern = -1;
+ numTotalBytes = -1;
+ numDataBytes = -1;
+ numECBytes = -1;
+ numRSBlocks = -1;
+ matrix = null;
+ }
+
+ // Mode of the QR Code.
+ public Mode getMode() {
+ return mode;
+ }
+
+ // Error correction level of the QR Code.
+ public ErrorCorrectionLevel getECLevel() {
+ return ecLevel;
+ }
+
+ // Version of the QR Code. The bigger size, the bigger version.
+ public int getVersion() {
+ return version;
+ }
+
+ // ByteMatrix width of the QR Code.
+ public int getMatrixWidth() {
+ return matrixWidth;
+ }
+
+ // Mask pattern of the QR Code.
+ public int getMaskPattern() {
+ return maskPattern;
+ }
+
+ // Number of total bytes in the QR Code.
+ public int getNumTotalBytes() {
+ return numTotalBytes;
+ }
+
+ // Number of data bytes in the QR Code.
+ public int getNumDataBytes() {
+ return numDataBytes;
+ }
+
+ // Number of error correction bytes in the QR Code.
+ public int getNumECBytes() {
+ return numECBytes;
+ }
+
+ // Number of Reedsolomon blocks in the QR Code.
+ public int getNumRSBlocks() {
+ return numRSBlocks;
+ }
+
+ // ByteMatrix data of the QR Code.
+ public ByteMatrix getMatrix() {
+ return matrix;
+ }
+
+
+ // Return the value of the module (cell) pointed by "x" and "y" in the matrix of the QR Code. They
+ // call cells in the matrix "modules". 1 represents a black cell, and 0 represents a white cell.
+ public int at(int x, int y) {
+ // The value must be zero or one.
+ int value = matrix.get(x, y);
+ if (!(value == 0 || value == 1)) {
+ // this is really like an assert... not sure what better exception to use?
+ throw new RuntimeException("Bad value");
+ }
+ return value;
+ }
+
+ // Checks all the member variables are set properly. Returns true on success. Otherwise, returns
+ // false.
+ public boolean isValid() {
+ return
+ // First check if all version are not uninitialized.
+ mode != null &&
+ ecLevel != null &&
+ version != -1 &&
+ matrixWidth != -1 &&
+ maskPattern != -1 &&
+ numTotalBytes != -1 &&
+ numDataBytes != -1 &&
+ numECBytes != -1 &&
+ numRSBlocks != -1 &&
+ // Then check them in other ways..
+ isValidMaskPattern(maskPattern) &&
+ numTotalBytes == numDataBytes + numECBytes &&
+ // ByteMatrix stuff.
+ matrix != null &&
+ matrixWidth == matrix.getWidth() &&
+ // See 7.3.1 of JISX0510:2004 (p.5).
+ matrix.getWidth() == matrix.getHeight(); // Must be square.
+ }
+
+ // Return debug String.
+ public String toString() {
+ StringBuffer result = new StringBuffer(200);
+ result.append("<<\n");
+ result.append(" mode: ");
+ result.append(mode);
+ result.append("\n ecLevel: ");
+ result.append(ecLevel);
+ result.append("\n version: ");
+ result.append(version);
+ result.append("\n matrixWidth: ");
+ result.append(matrixWidth);
+ result.append("\n maskPattern: ");
+ result.append(maskPattern);
+ result.append("\n numTotalBytes: ");
+ result.append(numTotalBytes);
+ result.append("\n numDataBytes: ");
+ result.append(numDataBytes);
+ result.append("\n numECBytes: ");
+ result.append(numECBytes);
+ result.append("\n numRSBlocks: ");
+ result.append(numRSBlocks);
+ if (matrix == null) {
+ result.append("\n matrix: null\n");
+ } else {
+ result.append("\n matrix:\n");
+ result.append(matrix.toString());
+ }
+ result.append(">>\n");
+ return result.toString();
+ }
+
+ public void setMode(Mode value) {
+ mode = value;
+ }
+
+ public void setECLevel(ErrorCorrectionLevel value) {
+ ecLevel = value;
+ }
+
+ public void setVersion(int value) {
+ version = value;
+ }
+
+ public void setMatrixWidth(int value) {
+ matrixWidth = value;
+ }
+
+ public void setMaskPattern(int value) {
+ maskPattern = value;
+ }
+
+ public void setNumTotalBytes(int value) {
+ numTotalBytes = value;
+ }
+
+ public void setNumDataBytes(int value) {
+ numDataBytes = value;
+ }
+
+ public void setNumECBytes(int value) {
+ numECBytes = value;
+ }
+
+ public void setNumRSBlocks(int value) {
+ numRSBlocks = value;
+ }
+
+ // This takes ownership of the 2D array.
+ public void setMatrix(ByteMatrix value) {
+ matrix = value;
+ }
+
+ // Check if "mask_pattern" is valid.
+ public static boolean isValidMaskPattern(int maskPattern) {
+ return maskPattern >= 0 && maskPattern < NUM_MASK_PATTERNS;
+ }
+
+ // Return true if the all values in the matrix are binary numbers.
+ //
+ // JAVAPORT: This is going to be super expensive and unnecessary, we should not call this in
+ // production. I'm leaving it because it may be useful for testing. It should be removed entirely
+ // if ByteMatrix is changed never to contain a -1.
+ /*
+ private static boolean EverythingIsBinary(final ByteMatrix matrix) {
+ for (int y = 0; y < matrix.height(); ++y) {
+ for (int x = 0; x < matrix.width(); ++x) {
+ int value = matrix.get(y, x);
+ if (!(value == 0 || value == 1)) {
+ // Found non zero/one value.
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+ */
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing.qrcode;
+
+import java.util.Hashtable;
+
+import ext.plantuml.com.google.zxing.BarcodeFormat;
+import ext.plantuml.com.google.zxing.EncodeHintType;
+import ext.plantuml.com.google.zxing.Writer;
+import ext.plantuml.com.google.zxing.WriterException;
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import ext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix;
+import ext.plantuml.com.google.zxing.qrcode.encoder.Encoder;
+import ext.plantuml.com.google.zxing.qrcode.encoder.QRCode;
+
+/**
+ * This object renders a QR Code as a BitMatrix 2D array of greyscale values.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class QRCodeWriter implements Writer {
+
+ private static final int QUIET_ZONE_SIZE = 4;
+
+ public BitMatrix encode(String contents, BarcodeFormat format, int multiple) throws WriterException {
+
+ return encode(contents, format, multiple, null);
+ }
+
+ public BitMatrix encode(String contents, BarcodeFormat format, int multiple, Hashtable hints) throws WriterException {
+
+ if (contents == null || contents.length() == 0) {
+ throw new IllegalArgumentException("Found empty contents");
+ }
+
+ if (format != BarcodeFormat.QR_CODE) {
+ throw new IllegalArgumentException("Can only encode QR_CODE, but got " + format);
+ }
+
+ ErrorCorrectionLevel errorCorrectionLevel = ErrorCorrectionLevel.L;
+ if (hints != null) {
+ ErrorCorrectionLevel requestedECLevel = (ErrorCorrectionLevel) hints.get(EncodeHintType.ERROR_CORRECTION);
+ if (requestedECLevel != null) {
+ errorCorrectionLevel = requestedECLevel;
+ }
+ }
+
+ QRCode code = new QRCode();
+ Encoder.encode(contents, errorCorrectionLevel, hints, code);
+ return renderResult(code, multiple);
+ }
+
+ // Note that the input matrix uses 0 == white, 1 == black, while the output
+ // matrix uses
+ // 0 == black, 255 == white (i.e. an 8 bit greyscale bitmap).
+ private static BitMatrix renderResult(QRCode code, int multiple) {
+ ByteMatrix input = code.getMatrix();
+ int inputWidth = input.getWidth();
+ int inputHeight = input.getHeight();
+ int qrWidth = inputWidth + (QUIET_ZONE_SIZE << 1);
+ int qrHeight = inputHeight + (QUIET_ZONE_SIZE << 1);
+ // int outputWidth = Math.max(width, qrWidth);
+ // int outputHeight = Math.max(height, qrHeight);
+
+ // int multiple = Math.min(outputWidth / qrWidth, outputHeight /
+ // qrHeight);
+ // Padding includes both the quiet zone and the extra white pixels to
+ // accommodate the requested
+ // dimensions. For example, if input is 25x25 the QR will be 33x33
+ // including the quiet zone.
+ // If the requested size is 200x160, the multiple will be 4, for a QR of
+ // 132x132. These will
+ // handle all the padding from 100x100 (the actual QR) up to 200x160.
+ int leftPadding = QUIET_ZONE_SIZE * multiple;
+ int topPadding = QUIET_ZONE_SIZE * multiple;
+
+ BitMatrix output = new BitMatrix(qrWidth * multiple, qrHeight * multiple);
+
+ for (int inputY = 0, outputY = topPadding; inputY < inputHeight; inputY++, outputY += multiple) {
+ // Write the contents of this row of the barcode
+ for (int inputX = 0, outputX = leftPadding; inputX < inputWidth; inputX++, outputX += multiple) {
+ if (input.get(inputX, inputY) == 1) {
+ output.setRegion(outputX, outputY, multiple, multiple);
+ }
+ }
+ }
+
+ return output;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/ReaderException.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/ReaderException.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/ReaderException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/ReaderException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ * The general exception class throw when something goes wrong during decoding of a barcode.
+ * This includes, but is not limited to, failing checksums / error correction algorithms, being
+ * unable to locate finder timing patterns, and so on.
+ *
+ * @author Sean Owen
+ */
+public abstract class ReaderException extends Exception {
+
+ // TODO: Currently we throw up to 400 ReaderExceptions while scanning a single 240x240 image before
+ // rejecting it. This involves a lot of overhead and memory allocation, and affects both performance
+ // and latency on continuous scan clients. In the future, we should change all the decoders not to
+ // throw exceptions for routine events, like not finding a barcode on a given row. Instead, we
+ // should return error codes back to the callers, and simply delete this class. In the mean time, I
+ // have altered this class to be as lightweight as possible, by ignoring the exception string, and
+ // by disabling the generation of stack traces, which is especially time consuming. These are just
+ // temporary measures, pending the big cleanup.
+
+ //private static final ReaderException instance = new ReaderException();
+
+ // EXCEPTION TRACKING SUPPORT
+ // Identifies who is throwing exceptions and how often. To use:
+ //
+ // 1. Uncomment these lines and the code below which uses them.
+ // 2. Uncomment the two corresponding lines in j2se/CommandLineRunner.decode()
+ // 3. Change core to build as Java 1.5 temporarily
+// private static int exceptionCount = 0;
+// private static Map throwers = new HashMap(32);
+
+ ReaderException() {
+ // do nothing
+ }
+
+ //public static ReaderException getInstance() {
+// Exception e = new Exception();
+// // Take the stack frame before this one.
+// StackTraceElement stack = e.getStackTrace()[1];
+// String key = stack.getClassName() + "." + stack.getMethodName() + "(), line " +
+// stack.getLineNumber();
+// if (throwers.containsKey(key)) {
+// Integer value = throwers.get(key);
+// value++;
+// throwers.put(key, value);
+// } else {
+// throwers.put(key, 1);
+// }
+// exceptionCount++;
+
+ //return instance;
+ //}
+
+// public static int getExceptionCountAndReset() {
+// int temp = exceptionCount;
+// exceptionCount = 0;
+// return temp;
+// }
+//
+// public static String getThrowersAndReset() {
+// StringBuilder builder = new StringBuilder(1024);
+// Object[] keys = throwers.keySet().toArray();
+// for (int x = 0; x < keys.length; x++) {
+// String key = (String) keys[x];
+// Integer value = throwers.get(key);
+// builder.append(key);
+// builder.append(": ");
+// builder.append(value);
+// builder.append("\n");
+// }
+// throwers.clear();
+// return builder.toString();
+// }
+
+ // Prevent stack traces from being taken
+ // srowen says: huh, my IDE is saying this is not an override. native methods can't be overridden?
+ // This, at least, does not hurt. Because we use a singleton pattern here, it doesn't matter anyhow.
+ public final Throwable fillInStackTrace() {
+ return null;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/ResultPoint.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/ResultPoint.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/ResultPoint.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/ResultPoint.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2007 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ *
Encapsulates a point of interest in an image containing a barcode. Typically, this
+ * would be the location of a finder pattern or the corner of the barcode, for example.
+ *
+ * @author Sean Owen
+ */
+public class ResultPoint {
+
+ private final float x;
+ private final float y;
+
+ public ResultPoint(float x, float y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public final float getX() {
+ return x;
+ }
+
+ public final float getY() {
+ return y;
+ }
+
+ public boolean equals(Object other) {
+ if (other instanceof ResultPoint) {
+ ResultPoint otherPoint = (ResultPoint) other;
+ return x == otherPoint.x && y == otherPoint.y;
+ }
+ return false;
+ }
+
+ public int hashCode() {
+ return 31 * Float.floatToIntBits(x) + Float.floatToIntBits(y);
+ }
+
+ public String toString() {
+ StringBuffer result = new StringBuffer(25);
+ result.append('(');
+ result.append(x);
+ result.append(',');
+ result.append(y);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ *
Orders an array of three ResultPoints in an order [A,B,C] such that AB < AC and
+ * BC < AC and the angle between BC and BA is less than 180 degrees.
+ */
+ public static void orderBestPatterns(ResultPoint[] patterns) {
+
+ // Find distances between pattern centers
+ float zeroOneDistance = distance(patterns[0], patterns[1]);
+ float oneTwoDistance = distance(patterns[1], patterns[2]);
+ float zeroTwoDistance = distance(patterns[0], patterns[2]);
+
+ ResultPoint pointA, pointB, pointC;
+ // Assume one closest to other two is B; A and C will just be guesses at first
+ if (oneTwoDistance >= zeroOneDistance && oneTwoDistance >= zeroTwoDistance) {
+ pointB = patterns[0];
+ pointA = patterns[1];
+ pointC = patterns[2];
+ } else if (zeroTwoDistance >= oneTwoDistance && zeroTwoDistance >= zeroOneDistance) {
+ pointB = patterns[1];
+ pointA = patterns[0];
+ pointC = patterns[2];
+ } else {
+ pointB = patterns[2];
+ pointA = patterns[0];
+ pointC = patterns[1];
+ }
+
+ // Use cross product to figure out whether A and C are correct or flipped.
+ // This asks whether BC x BA has a positive z component, which is the arrangement
+ // we want for A, B, C. If it's negative, then we've got it flipped around and
+ // should swap A and C.
+ if (crossProductZ(pointA, pointB, pointC) < 0.0f) {
+ ResultPoint temp = pointA;
+ pointA = pointC;
+ pointC = temp;
+ }
+
+ patterns[0] = pointA;
+ patterns[1] = pointB;
+ patterns[2] = pointC;
+ }
+
+
+ /**
+ * @return distance between two points
+ */
+ public static float distance(ResultPoint pattern1, ResultPoint pattern2) {
+ float xDiff = pattern1.getX() - pattern2.getX();
+ float yDiff = pattern1.getY() - pattern2.getY();
+ return (float) Math.sqrt((double) (xDiff * xDiff + yDiff * yDiff));
+ }
+
+ /**
+ * Returns the z component of the cross product between vectors BC and BA.
+ */
+ private static float crossProductZ(ResultPoint pointA, ResultPoint pointB, ResultPoint pointC) {
+ float bX = pointB.x;
+ float bY = pointB.y;
+ return ((pointC.x - bX) * (pointA.y - bY)) - ((pointC.y - bY) * (pointA.x - bX));
+ }
+
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/WriterException.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/WriterException.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/WriterException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/WriterException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+/**
+ * A base class which covers the range of exceptions which may occur when encoding a barcode using
+ * the Writer framework.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class WriterException extends Exception {
+
+ public WriterException() {
+ super();
+ }
+
+ public WriterException(String message) {
+ super(message);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/Writer.java plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/Writer.java
--- plantuml-1.2017.15/src/ext/plantuml/com/google/zxing/Writer.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/ext/plantuml/com/google/zxing/Writer.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ext.plantuml.com.google.zxing;
+
+import java.util.Hashtable;
+
+import ext.plantuml.com.google.zxing.common.BitMatrix;
+
+/**
+ * The base class for all objects which encode/generate a barcode image.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public interface Writer {
+
+ /**
+ * Encode a barcode using the default settings.
+ *
+ * @param contents The contents to encode in the barcode
+ * @param format The barcode format to generate
+ * @param width The preferred width in pixels
+ * @param height The preferred height in pixels
+ * @return The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
+ */
+ BitMatrix encode(String contents, BarcodeFormat format, int multiple)
+ throws WriterException;
+
+ /**
+ *
+ * @param contents The contents to encode in the barcode
+ * @param format The barcode format to generate
+ * @param width The preferred width in pixels
+ * @param height The preferred height in pixels
+ * @param hints Additional parameters to supply to the encoder
+ * @return The generated barcode as a Matrix of unsigned bytes (0 == black, 255 == white)
+ */
+ BitMatrix encode(String contents, BarcodeFormat format, int multiple, Hashtable hints)
+ throws WriterException;
+
+}
diff -Nru plantuml-1.2017.15/src/gen/lib/cdt/dtdisc__c.java plantuml-1.2018.9/src/gen/lib/cdt/dtdisc__c.java
--- plantuml-1.2017.15/src/gen/lib/cdt/dtdisc__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/cdt/dtdisc__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -54,6 +54,7 @@
import h._dtdisc_s;
import h._dtlink_s;
import smetana.core.CString;
+import smetana.core.size_t;
public class dtdisc__c {
//1 9k44uhd5foylaeoekf3llonjq
@@ -124,19 +125,15 @@
//3 507t9jcy6v9twvl30rs9i2nwi
// static void* dtmemory(Dt_t* dt,void* addr,size_t size,Dtdisc_t* disc)
-public static Object dtmemory(Object... arg) {
-UNSUPPORTED("18b3dn3pevbf7ajed6fftvnzk"); // static void* dtmemory(Dt_t* dt,void* addr,size_t size,Dtdisc_t* disc)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("cmb0rxzo3c2wr18j0upjz9iml"); // if(addr)
-UNSUPPORTED("bn1cyxafod2777wzl55qh14xq"); // { if(size == 0)
+public static Object dtmemory(_dt_s dt, Object addr, size_t size, _dtdisc_s disc) {
+if(addr!=null) {
+UNSUPPORTED("bn1cyxafod2777wzl55qh14xq"); // if(size == 0)
UNSUPPORTED("15j5ccp5owse1ebc5ljhbzg59"); // { free(addr);
UNSUPPORTED("aihzmr4oo3tuh6kkxwtn9tlbd"); // return ((void*)0);
UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
UNSUPPORTED("9ed8imo9cbvwtwe92qmavoqko"); // else return realloc(addr,size);
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("ew5p7pzg1fmdih1t3u25rqz6y"); // else return size > 0 ? malloc(size) : ((void*)0);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
+}
+else return size.isStrictPositive() ? size.malloc() : null;
throw new UnsupportedOperationException();
}
diff -Nru plantuml-1.2017.15/src/gen/lib/cgraph/graph__c.java plantuml-1.2018.9/src/gen/lib/cgraph/graph__c.java
--- plantuml-1.2017.15/src/gen/lib/cgraph/graph__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/cgraph/graph__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -241,7 +241,8 @@
rv.getStruct("disc").setPtr("mem", memdisc);
rv.getStruct("state").setPtr("mem", memclosure);
rv.getStruct("disc").setPtr("id", ((proto != null && proto.getPtr("id") != null) ? proto.getPtr("id") : Z.z().AgIdDisc.amp()));
- rv.getStruct("disc").setPtr("io", ((proto != null && proto.getPtr("io") != null) ? proto.getPtr("io") : Z.z().AgIdDisc.amp()));
+ // Translation bug in next line: should be AgIoDisc and not AgIdDisc
+ // rv.getStruct("disc").setPtr("io", ((proto != null && proto.getPtr("io") != null) ? proto.getPtr("io") : Z.z().AgIdDisc.amp()));
rv.setBoolean("callbacks_enabled", (N(0)));
return rv;
} finally {
diff -Nru plantuml-1.2017.15/src/gen/lib/common/arrows__c.java plantuml-1.2018.9/src/gen/lib/common/arrows__c.java
--- plantuml-1.2017.15/src/gen/lib/common/arrows__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/arrows__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -68,6 +68,7 @@
import smetana.core.MutableDouble;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -934,7 +935,7 @@
ENTERING("9eellwhg4gsa2pdszpeqihs2d","arrowEndClip");
try {
final __struct__ inside_context = JUtils.from(inside_t.class);
- final __array_of_struct__ sp = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ sp = __array_of_struct_impl__.malloc(pointf.class, 4);
double elen;
MutableDouble elen2 = new MutableDouble(0);
elen = arrow_length(e, eflag);
@@ -971,7 +972,7 @@
ENTERING("q7y4oxn0paexbgynmtg2zmiv","arrowStartClip");
try {
final __struct__ inside_context = JUtils.from(inside_t.class);
- final __array_of_struct__ sp = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ sp = __array_of_struct_impl__.malloc(pointf.class, 4);
double slen;
MutableDouble slen2 = new MutableDouble(0);
slen = arrow_length(e, sflag);
diff -Nru plantuml-1.2017.15/src/gen/lib/common/emit__c.java plantuml-1.2018.9/src/gen/lib/common/emit__c.java
--- plantuml-1.2017.15/src/gen/lib/common/emit__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/emit__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -58,6 +58,7 @@
import smetana.core.CString;
import smetana.core.JUtils;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -1444,8 +1445,8 @@
}
}
else { /* else refine the segment */
- final __array_of_struct__ left = __array_of_struct__.malloc(pointf.class, 4);
- final __array_of_struct__ right = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ left = __array_of_struct_impl__.malloc(pointf.class, 4);
+ final __array_of_struct__ right = __array_of_struct_impl__.malloc(pointf.class, 4);
Bezier (cp, 3, 0.5, left.asPtr(), right.asPtr());
update_bb_bz(bb, left);
update_bb_bz(bb, right);
diff -Nru plantuml-1.2017.15/src/gen/lib/common/labels__c.java plantuml-1.2018.9/src/gen/lib/common/labels__c.java
--- plantuml-1.2017.15/src/gen/lib/common/labels__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/labels__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -1085,8 +1085,8 @@
h_len = strlen(h_str);
tl = ED_label(obj.castTo(Agedge_s.class));
if (tl!=null) {
-UNSUPPORTED("88b430s6vk0irhr2k7x9crz9l"); // l_str = tl->text;
-UNSUPPORTED("5hjl5oveu3muui5b0fffh0dz2"); // if (str) l_len = strlen(l_str);
+ l_str = tl.getCString("text");
+ if (str!=null) l_len = strlen(l_str);
}
if (agisdirected(agroot(agraphof(agtail((obj.castTo(Agedge_s.class)))))))
e_str = new CString("->");
diff -Nru plantuml-1.2017.15/src/gen/lib/common/postproc__c.java plantuml-1.2018.9/src/gen/lib/common/postproc__c.java
--- plantuml-1.2017.15/src/gen/lib/common/postproc__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/postproc__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -44,18 +44,26 @@
*
*/
package gen.lib.common;
+import static gen.lib.cgraph.attr__c.agattr;
import static gen.lib.cgraph.edge__c.agfstout;
import static gen.lib.cgraph.edge__c.aghead;
import static gen.lib.cgraph.edge__c.agnxtout;
import static gen.lib.cgraph.edge__c.agtail;
+import static gen.lib.cgraph.graph__c.agnnodes;
import static gen.lib.cgraph.id__c.agnameof;
import static gen.lib.cgraph.node__c.agfstnode;
import static gen.lib.cgraph.node__c.agnxtnode;
import static gen.lib.cgraph.obj__c.agroot;
import static gen.lib.common.geom__c.ccwrotatepf;
+import static gen.lib.common.memory__c.zmalloc;
+import static gen.lib.common.splines__c.getsplinepoints;
+import static gen.lib.common.utils__c.late_bool;
+import static gen.lib.label.xlabels__c.placeLabels;
import static smetana.core.JUtils.NEQ;
+import static smetana.core.JUtils.sizeof;
import static smetana.core.JUtilsDebug.ENTERING;
import static smetana.core.JUtilsDebug.LEAVING;
+import static smetana.core.Macro.AGRAPH;
import static smetana.core.Macro.ED_edge_type;
import static smetana.core.Macro.ED_head_label;
import static smetana.core.Macro.ED_label;
@@ -72,8 +80,13 @@
import static smetana.core.Macro.GD_label_pos;
import static smetana.core.Macro.GD_n_cluster;
import static smetana.core.Macro.GD_rankdir;
+import static smetana.core.Macro.INT_MAX;
+import static smetana.core.Macro.MAX;
+import static smetana.core.Macro.MIN;
import static smetana.core.Macro.N;
import static smetana.core.Macro.ND_coord;
+import static smetana.core.Macro.ND_height;
+import static smetana.core.Macro.ND_width;
import static smetana.core.Macro.ND_xlabel;
import static smetana.core.Macro.NOT;
import static smetana.core.Macro.UNSUPPORTED;
@@ -87,10 +100,13 @@
import h.label_params_t;
import h.object_t;
import h.pointf;
+import h.splines;
import h.textlabel_t;
import h.xlabel_t;
+import smetana.core.CString;
import smetana.core.JUtils;
import smetana.core.Z;
+import smetana.core.__ptr__;
import smetana.core.__struct__;
public class postproc__c {
@@ -975,24 +991,25 @@
//3 av67wf2xi70ncgl90j1ttrjjs
// static pointf edgeHeadpoint (Agedge_t* e)
-public static Object edgeHeadpoint(Object... arg) {
-UNSUPPORTED("2zzd7mrm2u540dwuyzehozffj"); // static pointf
-UNSUPPORTED("ckf4uk77aptax4a60w2nhrdzl"); // edgeHeadpoint (Agedge_t* e)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("6tl9mepc2bett364jduh2q4mf"); // splines *spl;
-UNSUPPORTED("3hs99atzl1l857khumt6ycmbh"); // bezier *bez;
-UNSUPPORTED("26m18ntdxgq9wp5vlh2x7auh5"); // if ((spl = getsplinepoints(e)) == NULL) {
+public static __struct__ edgeHeadpoint(Agedge_s e) {
+ return edgeHeadpoint_(e).copy();
+}
+private static __struct__ edgeHeadpoint_(Agedge_s e) {
+ splines spl;
+ __ptr__ bez;
+ spl = getsplinepoints(e);
+if (spl == null) {
UNSUPPORTED("9wdrv4uc4c7ssn0qpmxgz5eu1"); // pointf p;
UNSUPPORTED("ezy0ey6dn5uqp6peuorn615x6"); // p.x = p.y = 0;
UNSUPPORTED("68kasxgknec72r19lohbk6n3q"); // return p;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("mjw3aaq1rghmemky1iymklp4"); // bez = &spl->list[spl->size - 1];
-UNSUPPORTED("5g1i4pbq9il9iba3urs6bxfa0"); // if (bez->eflag) {
-UNSUPPORTED("5vt6gwb8d8689fuwqbt5uhb12"); // return bez->ep;
-UNSUPPORTED("c07up7zvrnu2vhzy6d7zcu94g"); // } else {
+}
+bez = spl.getArrayOfPtr("list").plus(spl.getInt("size") - 1).getPtr();
+// bez = &spl->list[spl->size - 1];
+if (bez.getBoolean("eflag")) {
+ return bez.getStruct("ep");
+} else {
UNSUPPORTED("6qzm0hh4pxrspfbvxearcz9z8"); // return bez->list[bez->size - 1];
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
+}
throw new UnsupportedOperationException();
}
@@ -1002,22 +1019,19 @@
//3 1ca6fh8ns5bgzfzcz8al4eh4k
// static boxf adjustBB (object_t* objp, boxf bb)
-public static Object adjustBB(Object... arg) {
-UNSUPPORTED("d5qt6s97burjfu5qe0oxyyrmr"); // static boxf
-UNSUPPORTED("2gtud943baz3kfj1vqqhjeaj4"); // adjustBB (object_t* objp, boxf bb)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1ilrhzyqh05f2u3j3vzg0ys8u"); // pointf ur;
-UNSUPPORTED("a4qac74i3mtrli231q9zmy8pn"); // /* Adjust bounding box */
-UNSUPPORTED("cgmwicrpoafwh8qt3zob8r2ye"); // bb.LL.x = MIN(bb.LL.x, objp->pos.x);
-UNSUPPORTED("dqb32jehkpiyfzbiwusv0ex1n"); // bb.LL.y = MIN(bb.LL.y, objp->pos.y);
-UNSUPPORTED("coywjj9bhu737b59inwiumkbc"); // ur.x = objp->pos.x + objp->sz.x;
-UNSUPPORTED("4zg7x4gv3ox92n323b2vzaq32"); // ur.y = objp->pos.y + objp->sz.y;
-UNSUPPORTED("p351si3o2tnvdcb1o5i8et1b"); // bb.UR.x = MAX(bb.UR.x, ur.x);
-UNSUPPORTED("4a11bd6b7vdmcwc7r71y9k37z"); // bb.UR.y = MAX(bb.UR.y, ur.y);
-UNSUPPORTED("5v5hh30squmit8o2i5hs25eig"); // return bb;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
+public static __struct__ adjustBB(__ptr__ objp, __struct__ bb) {
+ return adjustBB_(objp, bb.copy()).copy();
+}
+private static __struct__ adjustBB_(__ptr__ objp, __struct__ bb) {
+ final __struct__ ur = JUtils.from(pointf.class);
+ /* Adjust bounding box */
+ bb.getStruct("LL").setDouble("x", MIN(bb.getStruct("LL").getDouble("x"), objp.getPtr("pos").getDouble("x")));
+ bb.getStruct("LL").setDouble("y", MIN(bb.getStruct("LL").getDouble("y"), objp.getPtr("pos").getDouble("y")));
+ ur.setDouble("x", objp.getPtr("pos").getDouble("x") + objp.getPtr("sz").getDouble("x"));
+ ur.setDouble("y", objp.getPtr("pos").getDouble("y") + objp.getPtr("sz").getDouble("y"));
+ bb.getStruct("UR").setDouble("x", MAX(bb.getStruct("UR").getDouble("x"), ur.getDouble("x")));
+ bb.getStruct("UR").setDouble("y", MAX(bb.getStruct("UR").getDouble("y"), ur.getDouble("y")));
+ return bb;
}
@@ -1025,28 +1039,25 @@
//3 3mefe722uemyoa0czmkkw6hjb
// static void addXLabel (textlabel_t* lp, object_t* objp, xlabel_t* xlp, int initObj, pointf pos)
-public static Object addXLabel(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("as13cbda9pe3uxi34emdcyw49"); // addXLabel (textlabel_t* lp, object_t* objp, xlabel_t* xlp, int initObj, pointf pos)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("47i4tbdfy05npmfnxoa2ljezv"); // if (initObj) {
-UNSUPPORTED("4brnnjtxt9czl9vlvf1hi62hq"); // objp->sz.x = 0;
-UNSUPPORTED("8vps14u07wyyud2ryypqvjgog"); // objp->sz.y = 0;
-UNSUPPORTED("eiw9ykn654ml54rs1bw0lf55b"); // objp->pos = pos;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("7e3xcf5dxjm2knry7yygcx3zv"); // if (Flip) {
+public static void addXLabel(textlabel_t lp, __ptr__ objp, __ptr__ xlp, int initObj, __struct__ pos) {
+ addXLabel_(lp, objp, xlp, initObj, pos.copy());
+}
+private static void addXLabel_(textlabel_t lp, __ptr__ objp, __ptr__ xlp, int initObj, __struct__ pos) {
+if (initObj!=0) {
+ objp.getStruct("sz").setDouble("x", 0);
+ objp.getStruct("sz").setDouble("y", 0);
+ objp.setStruct("pos", pos);
+}
+if (Z.z().Flip) {
UNSUPPORTED("99tzt7erbvtfsbo0jbdz0lc8m"); // xlp->sz.x = lp->dimen.y;
UNSUPPORTED("6v5t3ysaisj27bwc0r9zg3rpd"); // xlp->sz.y = lp->dimen.x;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("1nyzbeonram6636b1w955bypn"); // else {
-UNSUPPORTED("3fr3ccpgshd8wywufcfat4rf5"); // xlp->sz = lp->dimen;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("jd8wxj8hvqwupmayd743a386"); // xlp->lbl = lp;
-UNSUPPORTED("1z3b8kb1emm8lvcqvu8sm8r7j"); // xlp->set = 0;
-UNSUPPORTED("a1r2pwxgnrpltol41p04axtld"); // objp->lbl = xlp;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
+}
+else {
+ xlp.setStruct("sz", lp.getStruct("dimen"));
+}
+xlp.setPtr("lbl", lp);
+xlp.setInt("set", 0);
+objp.setPtr("lbl", xlp);
}
@@ -1054,25 +1065,28 @@
//3 dwxd5kvlanbcxqfuncjg0ea54
// static boxf addLabelObj (textlabel_t* lp, object_t* objp, boxf bb)
-public static Object addLabelObj(Object... arg) {
-UNSUPPORTED("d5qt6s97burjfu5qe0oxyyrmr"); // static boxf
-UNSUPPORTED("9yg6tco97jfdkxvya77inw8xx"); // addLabelObj (textlabel_t* lp, object_t* objp, boxf bb)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("7e3xcf5dxjm2knry7yygcx3zv"); // if (Flip) {
+public static __struct__ addLabelObj(textlabel_t lp, __ptr__ objp, __struct__ bb) {
+ // WARNING!! STRUCT
+ return addLabelObj_(lp, objp, bb.copy()).copy();
+}
+private static __struct__ addLabelObj_(textlabel_t lp, __ptr__ objp, __struct__ bb) {
+ ENTERING("b8tjygxnwny5qoiir1mha1d62","map_point");
+ try {
+ if (Z.z().Flip) {
UNSUPPORTED("6z2yrwq81gtsk3q9c5pofow1x"); // objp->sz.x = lp->dimen.y;
UNSUPPORTED("8xsm9kavrekjrsydqe1wh1pu"); // objp->sz.y = lp->dimen.x;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("1nyzbeonram6636b1w955bypn"); // else {
-UNSUPPORTED("40zw1ce6j4iw8dzvp9musrk6g"); // objp->sz.x = lp->dimen.x;
-UNSUPPORTED("3kmv74u3ihq63ptaixci1tlt5"); // objp->sz.y = lp->dimen.y;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("ekb3vmkpcdegpnlbuvebyijm8"); // objp->pos = lp->pos;
-UNSUPPORTED("6c49iw60twquhten0558iva1c"); // objp->pos.x -= (objp->sz.x) / 2.0;
-UNSUPPORTED("alrfakfz0nqemd3xl3m9q2gm4"); // objp->pos.y -= (objp->sz.y) / 2.0;
-UNSUPPORTED("5r3oym45e21gwxn3nsjucxlbi"); // return adjustBB(objp, bb);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
+ }
+ else {
+ objp.getPtr("sz").setDouble("x", lp.getStruct("dimen").getDouble("x"));
+ objp.getPtr("sz").setDouble("y", lp.getStruct("dimen").getDouble("y"));
+ }
+ objp.setStruct("pos", lp.getStruct("pos"));
+ objp.getStruct("pos").setDouble("x", objp.getStruct("pos").getDouble("x") - (objp.getStruct("sz").getDouble("x") / 2.0 ));
+ objp.getStruct("pos").setDouble("y", objp.getStruct("pos").getDouble("y") - (objp.getStruct("sz").getDouble("y") / 2.0 ));
+ return adjustBB(objp, bb);
+ } finally {
+ LEAVING("dajapw16wus3rwimkrk5ihi2b","map_point");
+ }
}
@@ -1080,25 +1094,28 @@
//3 b8tjygxnwny5qoiir1mha1d62
// static boxf addNodeObj (node_t* np, object_t* objp, boxf bb)
-public static Object addNodeObj(Object... arg) {
-UNSUPPORTED("d5qt6s97burjfu5qe0oxyyrmr"); // static boxf
-UNSUPPORTED("cdh6qqtv45t605q7je7xomi2j"); // addNodeObj (node_t* np, object_t* objp, boxf bb)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("7e3xcf5dxjm2knry7yygcx3zv"); // if (Flip) {
-UNSUPPORTED("1ri5uimcd1z58iix8tp528l1m"); // objp->sz.x = ((ND_height(np))*(double)72);
-UNSUPPORTED("6r5gwwhz3sjxrssh8yo3v5c3v"); // objp->sz.y = ((ND_width(np))*(double)72);
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("1nyzbeonram6636b1w955bypn"); // else {
-UNSUPPORTED("6cuxjl9g4nxwyz58c201qdb94"); // objp->sz.x = ((ND_width(np))*(double)72);
-UNSUPPORTED("e3zk2j9kbexxv2xbsgu3pser6"); // objp->sz.y = ((ND_height(np))*(double)72);
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("d6gkdf4gkfagwtb6mkhxxvqrc"); // objp->pos = ND_coord(np);
-UNSUPPORTED("6c49iw60twquhten0558iva1c"); // objp->pos.x -= (objp->sz.x) / 2.0;
-UNSUPPORTED("alrfakfz0nqemd3xl3m9q2gm4"); // objp->pos.y -= (objp->sz.y) / 2.0;
-UNSUPPORTED("5r3oym45e21gwxn3nsjucxlbi"); // return adjustBB(objp, bb);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
+public static __struct__ addNodeObj(Agnode_s np, __ptr__ objp, __struct__ bb) {
+ // WARNING!! STRUCT
+ return addNodeObj_(np, objp, bb.copy()).copy();
+}
+public static __struct__ addNodeObj_(Agnode_s np, __ptr__ objp, __struct__ bb) {
+ENTERING("b8tjygxnwny5qoiir1mha1d62","map_point");
+try {
+ if (Z.z().Flip) {
+ UNSUPPORTED("1ri5uimcd1z58iix8tp528l1m"); // objp->sz.x = ((ND_height(np))*(double)72);
+ UNSUPPORTED("6r5gwwhz3sjxrssh8yo3v5c3v"); // objp->sz.y = ((ND_width(np))*(double)72);
+ }
+ else {
+ objp.getPtr("sz").setDouble("x", ((ND_width(np))*(double)72));
+ objp.getPtr("sz").setDouble("y", ((ND_height(np))*(double)72));
+ }
+ objp.setPtr("pos", ND_coord(np));
+ objp.getPtr("pos").setDouble("x", objp.getPtr("pos").getDouble("x") - objp.getPtr("sz").getDouble("x") / 2.0);
+ objp.getPtr("pos").setDouble("y", objp.getPtr("pos").getDouble("y") - objp.getPtr("sz").getDouble("y") / 2.0);
+ return adjustBB(objp, bb);
+} finally {
+ LEAVING("dajapw16wus3rwimkrk5ihi2b","map_point");
+}
}
@@ -1163,10 +1180,10 @@
final __struct__ ur = JUtils.from(pointf.class);
textlabel_t lp;
final __struct__ params = JUtils.from(label_params_t.class);
- object_t objs;
- xlabel_t lbls;
- object_t objp;
- xlabel_t xlp;
+ __ptr__ objs;
+ __ptr__ lbls;
+ __ptr__ objp;
+ __ptr__ xlp;
Agsym_s force;
int et = (GD_flags(gp) & (7 << 1));
if (N(GD_has_labels(gp) & (1 << 4)) &&
@@ -1175,56 +1192,59 @@
N(GD_has_labels(gp) & (1 << 1)) &&
(N(GD_has_labels(gp) & (1 << 0)) || Z.z().EdgeLabelsDone!=0))
return;
-UNSUPPORTED("27ppdplfezcqw6rdrkzyrr8yg"); // for (np = agfstnode(gp); np; np = agnxtnode(gp, np)) {
-UNSUPPORTED("eezvruvdh9ueqsgad8k5xzbqi"); // if (ND_xlabel(np)) {
+ for (np = agfstnode(gp); np!=null; np = agnxtnode(gp, np)) {
+ if (ND_xlabel(np)!=null) {
UNSUPPORTED("6oje33bnpp4jv5mclsrrhl005"); // if (ND_xlabel(np)->set)
UNSUPPORTED("cfkrw6t4lrs7dfgx86sgrz26"); // n_set_lbls++;
UNSUPPORTED("5c97f6vfxny0zz35l2bu4maox"); // else
UNSUPPORTED("26eewzzknvqt2nbcrqds5fmti"); // n_nlbls++;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("41dpbku41lh3gpb30ds9ex6aa"); // for (ep = agfstout(gp, np); ep; ep = agnxtout(gp, ep)) {
-UNSUPPORTED("9c5vwy3kfweqsgk827cpj3d6q"); // if (ED_xlabel(ep)) {
+ }
+ for (ep = agfstout(gp, np); ep!=null; ep = agnxtout(gp, ep)) {
+ if (ED_xlabel(ep)!=null) {
UNSUPPORTED("appkettxihy2o612jk6fahbnh"); // if (ED_xlabel(ep)->set)
UNSUPPORTED("8k2rclvg6eaoph9r2pz4620xq"); // n_set_lbls++;
UNSUPPORTED("14y6caappoxe17mogr979qf75"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL)))
UNSUPPORTED("q3t8uxncrxc4n8rtuabtzxya"); // n_elbls++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("1mk50yh8pbs8jzn7h8otaonfd"); // if (ED_head_label(ep)) {
-UNSUPPORTED("4xstfnjw4gi0ja4inv8o0n8z"); // if (ED_head_label(ep)->set)
-UNSUPPORTED("8k2rclvg6eaoph9r2pz4620xq"); // n_set_lbls++;
-UNSUPPORTED("14y6caappoxe17mogr979qf75"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL)))
-UNSUPPORTED("q3t8uxncrxc4n8rtuabtzxya"); // n_elbls++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("4micw28bcx68bfiqihi9ruani"); // if (ED_tail_label(ep)) {
+ }
+ if (ED_head_label(ep)!=null) {
+ if (ED_head_label(ep).getBoolean("set"))
+ n_set_lbls++;
+ else if (((et != (0 << 1)) && (ED_spl(ep) != null)))
+ n_elbls++;
+ }
+ if (ED_tail_label(ep)!=null) {
UNSUPPORTED("abwl715n01quq34u2qs1kn9xn"); // if (ED_tail_label(ep)->set)
UNSUPPORTED("8k2rclvg6eaoph9r2pz4620xq"); // n_set_lbls++;
UNSUPPORTED("14y6caappoxe17mogr979qf75"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL)))
UNSUPPORTED("q3t8uxncrxc4n8rtuabtzxya"); // n_elbls++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("92f340ohb0u21xl6jgpc2hieo"); // if (ED_label(ep)) {
-UNSUPPORTED("5skvrpmqqjq5cj6a8uiylmjsw"); // if (ED_label(ep)->set)
-UNSUPPORTED("8k2rclvg6eaoph9r2pz4620xq"); // n_set_lbls++;
-UNSUPPORTED("14y6caappoxe17mogr979qf75"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL)))
-UNSUPPORTED("q3t8uxncrxc4n8rtuabtzxya"); // n_elbls++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("2uqg2vrduqxs9hk9hmamj7wlu"); // if (GD_has_labels(gp) & (1 << 3))
+ }
+ if (ED_label(ep)!=null) {
+ if (ED_label(ep).getBoolean("set"))
+ n_set_lbls++;
+ else if (((et != (0 << 1)) && (ED_spl(ep) != null)))
+ n_elbls++;
+ }
+ }
+ }
+ if ((GD_has_labels(gp) & (1 << 3))!=0)
UNSUPPORTED("4z3bgexjlrmdrfgpdaajems8q"); // n_clbls = countClusterLabels (gp);
-UNSUPPORTED("19labxj7f93ljlhkpmrde0zgt"); // /* A label for each unpositioned external label */
-UNSUPPORTED("5kla6rwar4q1ig2olguocajn6"); // n_lbls = n_nlbls + n_elbls;
-UNSUPPORTED("apjqar4agmf5jlfd88kbn4f4d"); // if (n_lbls == 0) return;
-UNSUPPORTED("4j54hc42lgojcuorb9p42tlr"); // /* An object for each node, each positioned external label, any cluster label,
-UNSUPPORTED("adxf9gd6tasafb302px9vqgum"); // * and all unset edge labels and xlabels.
-UNSUPPORTED("795vpnc8yojryr8b46aidsu69"); // */
-UNSUPPORTED("6id92o3db6qu5zuuj8q40n3zn"); // n_objs = agnnodes(gp) + n_set_lbls + n_clbls + n_elbls;
-UNSUPPORTED("3e10kvi719e134x675xgwi1tj"); // objp = objs = (object_t*)zmalloc((n_objs)*sizeof(object_t));
-UNSUPPORTED("6z86cmeenod2nx8ej72n0qotk"); // xlp = lbls = (xlabel_t*)zmalloc((n_lbls)*sizeof(xlabel_t));
-UNSUPPORTED("f2nzvg1xnr11v28w2feg923cs"); // bb.LL = pointfof(INT_MAX, INT_MAX);
-UNSUPPORTED("7tttoj8cnxfqgnq2aagnnav48"); // bb.UR = pointfof(-INT_MAX, -INT_MAX);
-UNSUPPORTED("27ppdplfezcqw6rdrkzyrr8yg"); // for (np = agfstnode(gp); np; np = agnxtnode(gp, np)) {
-UNSUPPORTED("38hh82sue091x6ybm9e34wy61"); // bb = addNodeObj (np, objp, bb);
-UNSUPPORTED("ex5hwora23t1cl8hpjo4uvphm"); // if ((lp = ND_xlabel(np))) {
+ /* A label for each unpositioned external label */
+ n_lbls = n_nlbls + n_elbls;
+ if (n_lbls == 0) return;
+ /* An object for each node, each positioned external label, any cluster label,
+ * and all unset edge labels and xlabels.
+ */
+ n_objs = agnnodes(gp) + n_set_lbls + n_clbls + n_elbls;
+ objs = zmalloc(sizeof(object_t.class, n_objs));
+ objp = objs;
+ lbls = zmalloc(sizeof(xlabel_t.class, n_lbls));
+ xlp = lbls;
+ bb.setStruct("LL", pointfof(INT_MAX, INT_MAX));
+ bb.setStruct("UR", pointfof(-INT_MAX, -INT_MAX));
+ for (np = agfstnode(gp); np!=null; np = agnxtnode(gp, np)) {
+ bb.___(addNodeObj (np, objp, bb));
+ lp = ND_xlabel(np);
+ if (lp != null) {
UNSUPPORTED("d5pjy3dwui27jfdz550cy0cln"); // if (lp->set) {
UNSUPPORTED("cls7z8l7wi371a4wrec0viqil"); // objp++;
UNSUPPORTED("3zy3jhlqyioeyh9mlrspjjgc6"); // bb = addLabelObj (lp, objp, bb);
@@ -1233,28 +1253,30 @@
UNSUPPORTED("2msn58w2dse7pbq2esv7awk4r"); // addXLabel (lp, objp, xlp, 0, ur);
UNSUPPORTED("1zpq9rd3nn9kjrmun8ivs9zx5"); // xlp++;
UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("bhbvoj12subdn6905juhiubo2"); // objp++;
-UNSUPPORTED("41dpbku41lh3gpb30ds9ex6aa"); // for (ep = agfstout(gp, np); ep; ep = agnxtout(gp, ep)) {
-UNSUPPORTED("9zaprre819fwswan5wvid0h6g"); // if ((lp = ED_label(ep))) {
-UNSUPPORTED("5dapykbxjvnhw0dpi7jfpcazk"); // if (lp->set) {
-UNSUPPORTED("7rwrlod7lkgin3rnnzy3iw2rw"); // bb = addLabelObj (lp, objp, bb);
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("dfnmpe0hri6ksye0gnxssi4zz"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL))) {
+ }
+ objp = objp.plus(1);
+ for (ep = agfstout(gp, np); ep!=null; ep = agnxtout(gp, ep)) {
+ lp = ED_label(ep);
+ if (lp != null) {
+ if (lp.getBoolean("set")) {
+ bb.___(addLabelObj (lp, objp, bb));
+ }
+ else if (((et != (0 << 1)) && (ED_spl(ep) != null))) {
UNSUPPORTED("9ffmrymv8cg4h4b3ea97t9qbp"); // addXLabel (lp, objp, xlp, 1, edgeMidpoint(gp, ep));
UNSUPPORTED("808184nt3k6cxj5dsg27yvpvg"); // xlp++;
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("d28blrbmwwqp80cyksuz7dwx9"); // else {
+}
+else {
UNSUPPORTED("3ia66n3hqrwmh3hybkoh6f8wa"); // agerr(AGWARN, "no position for edge with label %s",
UNSUPPORTED("9npeksy1st7v005znerttzzzv"); // ED_label(ep)->text);
UNSUPPORTED("2yi9az7ibt7j9bwztjilyo0v2"); // continue;
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("d23ocobgp22a33eopdnqe9o4u"); // objp++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("a5mn7dpum21w95ku1l27m9rpk"); // if ((lp = ED_tail_label(ep))) {
-UNSUPPORTED("5dapykbxjvnhw0dpi7jfpcazk"); // if (lp->set) {
+}
+objp = objp.plus(1);
+ }
+ lp = ED_tail_label(ep);
+ if (lp != null) {
+if (lp.getBoolean("set")) {
UNSUPPORTED("7rwrlod7lkgin3rnnzy3iw2rw"); // bb = addLabelObj (lp, objp, bb);
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
+}
UNSUPPORTED("dfnmpe0hri6ksye0gnxssi4zz"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL))) {
UNSUPPORTED("bqc6ukxlmt6l3osbpsmqbzutc"); // addXLabel (lp, objp, xlp, 1, edgeTailpoint(ep));
UNSUPPORTED("808184nt3k6cxj5dsg27yvpvg"); // xlp++;
@@ -1264,24 +1286,26 @@
UNSUPPORTED("cf9qaysecgkvv4165la4uu6cb"); // ED_tail_label(ep)->text);
UNSUPPORTED("2yi9az7ibt7j9bwztjilyo0v2"); // continue;
UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("cls7z8l7wi371a4wrec0viqil"); // objp++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("6rvkuvq5nj7p2za2zqxf74l3c"); // if ((lp = ED_head_label(ep))) {
-UNSUPPORTED("5dapykbxjvnhw0dpi7jfpcazk"); // if (lp->set) {
+ objp = objp.plus(1);
+ }
+ lp = ED_head_label(ep);
+ if (lp != null) {
+if (lp.getBoolean("set")) {
UNSUPPORTED("7rwrlod7lkgin3rnnzy3iw2rw"); // bb = addLabelObj (lp, objp, bb);
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("dfnmpe0hri6ksye0gnxssi4zz"); // else if (((et != (0 << 1)) && (ED_spl(ep) != NULL))) {
-UNSUPPORTED("7gewvtwwzj3unxzrtbqpwduzg"); // addXLabel (lp, objp, xlp, 1, edgeHeadpoint(ep));
-UNSUPPORTED("808184nt3k6cxj5dsg27yvpvg"); // xlp++;
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("d28blrbmwwqp80cyksuz7dwx9"); // else {
+}
+else if (((et != (0 << 1)) && (ED_spl(ep) != null))) {
+addXLabel (lp, objp, xlp, 1, edgeHeadpoint(ep));
+xlp = xlp.plus(1);
+}
+else {
UNSUPPORTED("8nrkavpg9ifts9yylhfijn9rp"); // agerr(AGWARN, "no position for edge with head label %s",
UNSUPPORTED("a5omwtwd411hsfrc37d8t6m8b"); // ED_head_label(ep)->text);
UNSUPPORTED("2yi9az7ibt7j9bwztjilyo0v2"); // continue;
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("cls7z8l7wi371a4wrec0viqil"); // objp++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("1pb88fhz51khiwboqgii8qayw"); // if ((lp = ED_xlabel(ep))) {
+}
+ objp = objp.plus(1);
+ }
+ lp = ED_xlabel(ep);
+ if (lp != null) {
UNSUPPORTED("5dapykbxjvnhw0dpi7jfpcazk"); // if (lp->set) {
UNSUPPORTED("7rwrlod7lkgin3rnnzy3iw2rw"); // bb = addLabelObj (lp, objp, bb);
UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
@@ -1295,20 +1319,20 @@
UNSUPPORTED("2yi9az7ibt7j9bwztjilyo0v2"); // continue;
UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
UNSUPPORTED("cls7z8l7wi371a4wrec0viqil"); // objp++;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("5zntyu3vcfnjveucnumrmbjig"); // if (n_clbls) {
+ }
+ }
+}
+if (n_clbls!=0) {
UNSUPPORTED("48ipxdlv7xlti99g0yhi5zuai"); // cinfo_t info;
UNSUPPORTED("7c5iohb8t706p273ae1lxal8r"); // info.bb = bb;
UNSUPPORTED("b1474fakrbyw7p5ja42jgv90c"); // info.objp = objp;
UNSUPPORTED("6ygw8idplugc5u6w7ro3gakmb"); // info = addClusterObj (gp, info);
UNSUPPORTED("1l2cwgzediv4hztjhtm052rl3"); // bb = info.bb;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("79ifzl4zpx3wbd5szboa2x2vb"); // force = (agattr(gp,AGRAPH,"forcelabels",NULL));
-UNSUPPORTED("1if7tdbcs4rwvb0polsdlbfh4"); // params.force = late_bool(gp, force, NOT(0));
-UNSUPPORTED("2ol916ffwy0e2vxinxn4v4sgt"); // params.bb = bb;
-UNSUPPORTED("25rb35acbkepp55u3bkjxb1gc"); // placeLabels(objs, n_objs, lbls, n_lbls, ¶ms);
+}
+force = (agattr(gp,AGRAPH,new CString("forcelabels"),null));
+params.setBoolean("force", late_bool(gp, force, 1));
+params.setStruct("bb", bb);
+placeLabels(objs, n_objs, lbls, n_lbls, params.amp());
UNSUPPORTED("2di5wqm6caczzl6bvqe35ry8y"); // if (Verbose)
UNSUPPORTED("4iypau1fdov37qnq2ub6iq5ra"); // printData(objs, n_objs, lbls, n_lbls, ¶ms);
UNSUPPORTED("52mefujap7scy273ud7nyj9hn"); // xlp = lbls;
diff -Nru plantuml-1.2017.15/src/gen/lib/common/routespl__c.java plantuml-1.2018.9/src/gen/lib/common/routespl__c.java
--- plantuml-1.2017.15/src/gen/lib/common/routespl__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/routespl__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -80,6 +80,7 @@
import smetana.core.Z;
import smetana.core.__array_of_ptr__;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -765,8 +766,8 @@
ENTERING("7ebl6qohcfpf1b9ucih5r9qgp","simpleSplineRoute");
try {
final __struct__ pl = JUtils.from(Ppoly_t.class), spl = JUtils.from(Ppoly_t.class);
- final __array_of_struct__ eps = __array_of_struct__.malloc(pointf.class, 2);
- final __array_of_struct__ evs = __array_of_struct__.malloc(pointf.class, 2);
+ final __array_of_struct__ eps = __array_of_struct_impl__.malloc(pointf.class, 2);
+ final __array_of_struct__ evs = __array_of_struct_impl__.malloc(pointf.class, 2);
int i;
eps.plus(0).setDouble("x", tp.getDouble("x"));
eps.plus(0).setDouble("y", tp.getDouble("y"));
@@ -857,7 +858,7 @@
try {
int bi, si, splinepi;
double t;
- final __array_of_struct__ sp = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ sp = __array_of_struct_impl__.malloc(pointf.class, 4);
int num_div = delta * boxn;
for (splinepi = 0; splinepi + 3 < pn; splinepi += 3) {
for (si = 0; si <= num_div; si++) {
@@ -906,8 +907,8 @@
final __struct__ poly = JUtils.from(Ppoly_t.class);
final __struct__ pl = JUtils.from(Ppoly_t.class), spl = JUtils.from(Ppoly_t.class);
int splinepi;
- final __array_of_struct__ eps = __array_of_struct__.malloc(pointf.class, 2);
- final __array_of_struct__ evs = __array_of_struct__.malloc(pointf.class, 2);
+ final __array_of_struct__ eps = __array_of_struct_impl__.malloc(pointf.class, 2);
+ final __array_of_struct__ evs = __array_of_struct_impl__.malloc(pointf.class, 2);
int edgei, prev, next;
int pi=0, bi;
__array_of_ptr__ boxes;
@@ -1249,8 +1250,12 @@
bb.getStruct("UR").setDouble("x", xy);
r = 0;
}
- else if (d == 1)
-UNSUPPORTED("eg1w87s0blk4i583rqumhmv6n"); // xy = ba.getStruct("UR").getDouble("y"), ba.getStruct("UR").getDouble("y") = bb.getStruct("LL").getDouble("y"), bb.getStruct("LL").getDouble("y") = xy, d = 0;
+ else if (d == 1) {
+ xy = (int)(ba.getStruct("UR").getDouble("y"));
+ ba.getStruct("UR").setDouble("y", bb.getStruct("LL").getDouble("y"));
+ bb.getStruct("LL").setDouble("y", xy);
+ d = 0;
+ }
else if (u == 1)
UNSUPPORTED("5kcd52bwvbxxs0md0enfs100u"); // xy = ba.getStruct("LL").getDouble("y"), ba.getStruct("LL").getDouble("y") = bb.getStruct("UR").getDouble("y"), bb.getStruct("UR").getDouble("y") = xy, u = 0;
for (i = 0; i < errs - 1; i++) {
diff -Nru plantuml-1.2017.15/src/gen/lib/common/splines__c.java plantuml-1.2018.9/src/gen/lib/common/splines__c.java
--- plantuml-1.2017.15/src/gen/lib/common/splines__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/splines__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -99,6 +99,7 @@
import smetana.core.JUtils;
import smetana.core.MutableDouble;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -793,8 +794,8 @@
public static void bezier_clip(__ptr__ inside_context, __ptr__ inside, __array_of_struct__ sp, boolean left_inside) {
ENTERING("q4t1ywnk3wm1vyh5seoj7xye","bezier_clip");
try {
- final __array_of_struct__ seg = __array_of_struct__.malloc(pointf.class, 4);
- final __array_of_struct__ best = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ seg = __array_of_struct_impl__.malloc(pointf.class, 4);
+ final __array_of_struct__ best = __array_of_struct_impl__.malloc(pointf.class, 4);
final __struct__ pt = JUtils.from(pointf.class), opt = JUtils.from(pointf.class);
__ptr__ left, right;
final MutableDouble low = new MutableDouble(0), high = new MutableDouble(0);
@@ -852,7 +853,7 @@
try {
int i;
double save_real_size;
- final __array_of_struct__ c = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ c = __array_of_struct_impl__.malloc(pointf.class, 4);
save_real_size = ND_rw(n);
for (i = 0; i < 4; i++) {
c.plus(i).setDouble("x", curve.plus(i).getDouble("x") - ND_coord(n).getDouble("x"));
@@ -1001,7 +1002,7 @@
break;
arrow_clip(fe, hn, ps, start, end, newspl, info);
for (i = start[0]; i < end[0] + 4; ) {
- final __array_of_struct__ cp = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ cp = __array_of_struct_impl__.malloc(pointf.class, 4);
newspl.getArrayOfPtr("list").plus(i - start[0]).setStruct(ps.plus(i).getStruct());
cp.plus(0).setStruct(ps.plus(i).getStruct());
i++;
@@ -1716,7 +1717,7 @@
final ST_pointf tp = new ST_pointf(), hp = new ST_pointf(), np = new ST_pointf();
Agnode_s n;
Agedge_s e;
- final __array_of_struct__ points = __array_of_struct__.malloc(pointf.class, 1000);
+ final __array_of_struct__ points = __array_of_struct_impl__.malloc(pointf.class, 1000);
int pointn;
e = (Agedge_s) edges.plus(ind).getPtr();
n = agtail(e);
diff -Nru plantuml-1.2017.15/src/gen/lib/common/utils__c.java plantuml-1.2018.9/src/gen/lib/common/utils__c.java
--- plantuml-1.2017.15/src/gen/lib/common/utils__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/common/utils__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -68,6 +68,7 @@
import static smetana.core.JUtils.tolower;
import static smetana.core.JUtilsDebug.ENTERING;
import static smetana.core.JUtilsDebug.LEAVING;
+import static smetana.core.Macro.ED_head_label;
import static smetana.core.Macro.ED_head_port;
import static smetana.core.Macro.ED_label;
import static smetana.core.Macro.ED_label_ontop;
@@ -94,6 +95,7 @@
import h.Agnode_s;
import h.Agraph_s;
import h.Agsym_s;
+import h.ST_Agsym_s;
import h.ST_boxf;
import h.ST_port;
import h.boxf;
@@ -109,6 +111,7 @@
import smetana.core.Memory;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -932,11 +935,9 @@
//3 87ifze04q7qzigjj1fb9y9by2
// boolean late_bool(void *obj, attrsym_t * attr, int def)
-public static Object late_bool(Object... arg) {
-UNSUPPORTED("4p67t5j48pxpmswky3dw3s392"); // boolean late_bool(void *obj, attrsym_t * attr, int def)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("183nee60g5fytepk82gop4u8s"); // if (attr == (void *)0)
-UNSUPPORTED("1jfc1szr9lzyizq62jp9jz7ah"); // return def;
+public static boolean late_bool(__ptr__ obj, Agsym_s attr, int def) {
+if (attr == null)
+ return def!=0;
UNSUPPORTED("a0kh1y5n8u59z0xo7mag3zmt6"); // return mapbool(agxget(obj, attr));
UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
@@ -1074,12 +1075,12 @@
ENTERING("6p0ey2c2ujk2o7h221p0b4xon","Bezier");
try {
int i, j; /* Index variables */
- final __array_of_struct__ Vtemp[] = new __array_of_struct__[] { __array_of_struct__.malloc(pointf.class, 5+1),
- __array_of_struct__.malloc(pointf.class, 5+1),
- __array_of_struct__.malloc(pointf.class, 5+1),
- __array_of_struct__.malloc(pointf.class, 5+1),
- __array_of_struct__.malloc(pointf.class, 5+1),
- __array_of_struct__.malloc(pointf.class, 5+1) };
+ final __array_of_struct__ Vtemp[] = new __array_of_struct__[] { __array_of_struct_impl__.malloc(pointf.class, 5+1),
+ __array_of_struct_impl__.malloc(pointf.class, 5+1),
+ __array_of_struct_impl__.malloc(pointf.class, 5+1),
+ __array_of_struct_impl__.malloc(pointf.class, 5+1),
+ __array_of_struct_impl__.malloc(pointf.class, 5+1),
+ __array_of_struct_impl__.malloc(pointf.class, 5+1) };
/* Copy control points */
for (j = 0; j <= degree; j++) {
Vtemp[0].plus(j).setStruct(V.plus(j).getStruct());
@@ -1500,18 +1501,16 @@
//3 ak3pxrdrq900wymudwnjmbito
// static void initFontLabelEdgeAttr(edge_t * e, struct fontinfo *fi, struct fontinfo *lfi)
-public static Object initFontLabelEdgeAttr(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("64kdcuymwqrq619sxnmgnuyal"); // initFontLabelEdgeAttr(edge_t * e, struct fontinfo *fi,
-UNSUPPORTED("rd78u02b7ldtc7gt7aw5t8fz"); // struct fontinfo *lfi)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("9rkwm6oonv051kf4hnage0877"); // if (!fi->fontname) initFontEdgeAttr(e, fi);
-UNSUPPORTED("aok5f09eydgwsqtsl0xmmhft"); // lfi->fontsize = late_double(e, E_labelfontsize, fi->fontsize, 1.0);
-UNSUPPORTED("aviu0lhq8s4ez3n8cil4bwac6"); // lfi->fontname = late_nnstring(e, E_labelfontname, fi->fontname);
-UNSUPPORTED("75il36n46r24ag5njqgshp8xz"); // lfi->fontcolor = late_nnstring(e, E_labelfontcolor, fi->fontcolor);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
+public static void initFontLabelEdgeAttr(Agedge_s e, fontinfo fi, fontinfo lfi) {
+ENTERING("ak3pxrdrq900wymudwnjmbito","initFontLabelEdgeAttr");
+try {
+ if (N(fi.getPtr("fontname"))) initFontEdgeAttr(e, fi);
+ lfi.setDouble("fontsize", late_double(e, Z.z().E_labelfontsize, fi.getDouble("fontsize"), 1.0));
+ lfi.setPtr("fontname", late_nnstring(e, Z.z().E_labelfontname, fi.getCString("fontname")));
+ lfi.setPtr("fontcolor", late_nnstring(e, Z.z().E_labelfontcolor, fi.getCString("fontcolor")));
+} finally {
+LEAVING("ak3pxrdrq900wymudwnjmbito","initFontLabelEdgeAttr");
+}
}
@@ -1599,10 +1598,10 @@
}
/* vladimir */
if (Z.z().E_headlabel!=null && (str = agxget(e, Z.z().E_headlabel))!=null && (str.charAt(0)!='\0')) {
-UNSUPPORTED("cgznvdnh671wl8jq8q3tyhv1r"); // initFontLabelEdgeAttr(e, &fi, &lfi);
-UNSUPPORTED("6nfh8swason2akjp45hm0o5b0"); // (((Agedgeinfo_t*)(((Agobj_t*)(e))->data))->head_label) = make_label((void*)e, str, (aghtmlstr(str) ? (1 << 1) : (0 << 1)),
-UNSUPPORTED("eu3ztkfva2x87y72tnu7vv4re"); // lfi.fontsize, lfi.fontname, lfi.fontcolor);
-UNSUPPORTED("axtvdewh7zhtm1diu8c6dprx4"); // (((Agraphinfo_t*)(((Agobj_t*)(sg))->data))->has_labels) |= (1 << 1);
+ initFontLabelEdgeAttr(e, fi.amp(), lfi.amp());
+ ED_head_label(e, make_label(e, str, (aghtmlstr(str)!=0 ? (1 << 1) : (0 << 1)),
+ lfi.getDouble("fontsize"), lfi.getCString("fontname"), lfi.getCString("fontcolor")));
+ GD_has_labels(sg, GD_has_labels(sg) | (1 << 1));
}
if (Z.z().E_taillabel!=null && (str = agxget(e, Z.z().E_taillabel))!=null && (str.charAt(0)!='\0')) {
UNSUPPORTED("6y6e1y496y6j6a6065nfesr8o"); // if (!lfi.fontname)
diff -Nru plantuml-1.2017.15/src/gen/lib/dotgen/decomp__c.java plantuml-1.2018.9/src/gen/lib/dotgen/decomp__c.java
--- plantuml-1.2017.15/src/gen/lib/dotgen/decomp__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/dotgen/decomp__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -76,6 +76,7 @@
import smetana.core.JUtils;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__struct__;
public class decomp__c {
@@ -790,7 +791,7 @@
ENTERING("c5u5lnfbu0pmlk6vsvyrdj8ep","search_component");
try {
int c, i;
- __array_of_struct__ vec = __array_of_struct__.malloc(elist.class, 4);
+ __array_of_struct__ vec = __array_of_struct_impl__.malloc(elist.class, 4);
Agnode_s other;
Agedge_s e;
add_to_component(n);
diff -Nru plantuml-1.2017.15/src/gen/lib/dotgen/dotsplines__c.java plantuml-1.2018.9/src/gen/lib/dotgen/dotsplines__c.java
--- plantuml-1.2017.15/src/gen/lib/dotgen/dotsplines__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/dotgen/dotsplines__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -143,6 +143,7 @@
import smetana.core.Memory;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
@@ -1716,7 +1717,7 @@
final __struct__ poly = JUtils.from(Ppoly_t.class);
int pn[] = new int[1];
Agedge_s e = (Agedge_s) edges.plus(ind).getPtr();
- final __array_of_struct__ points = __array_of_struct__.malloc(pointf.class, 10);
+ final __array_of_struct__ points = __array_of_struct_impl__.malloc(pointf.class, 10);
final __struct__ tp = JUtils.from(pointf.class), hp = JUtils.from(pointf.class);
int i, pointn;
double leftend, rightend, ctrx=0, ctry=0, miny, maxy;
@@ -1865,7 +1866,7 @@
ENTERING("8kqyzk43ovc2sq6jegua6ytp","makeSimpleFlat");
try {
Agedge_s e = (Agedge_s) edges.plus(ind).getPtr();
- final __array_of_struct__ points = __array_of_struct__.malloc(pointf.class, 10);
+ final __array_of_struct__ points = __array_of_struct_impl__.malloc(pointf.class, 10);
final __struct__ tp = JUtils.from(pointf.class), hp = JUtils.from(pointf.class);
int i, pointn;
double stepy, dy;
@@ -2109,7 +2110,7 @@
int boxn, i, ydelta;
int pn[] = new int[1];
Agedge_s f;
- final __array_of_struct__ points = __array_of_struct__.malloc(pointf.class, 7);
+ final __array_of_struct__ points = __array_of_struct_impl__.malloc(pointf.class, 7);
tn = agtail(e);
hn = aghead(e);
for (f = ED_to_virt(e); ED_to_virt(f)!=null; f = ED_to_virt(f));
diff -Nru plantuml-1.2017.15/src/gen/lib/gvc/gvc__c.java plantuml-1.2018.9/src/gen/lib/gvc/gvc__c.java
--- plantuml-1.2017.15/src/gen/lib/gvc/gvc__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/gvc/gvc__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,8 +45,9 @@
*/
package gen.lib.gvc;
import static gen.lib.cgraph.attr__c.agattr;
-import static gen.lib.gvc.gvconfig__c.gvconfig;
+import static gen.lib.common.textspan__c.textfont_dict_open;
import static gen.lib.gvc.gvcontext__c.gvNEWcontext;
+import static gen.lib.gvc.gvtextlayout__c.gvtextlayout_select;
import static smetana.core.JUtilsDebug.ENTERING;
import static smetana.core.JUtilsDebug.LEAVING;
import static smetana.core.Macro.AGNODE;
@@ -167,7 +168,10 @@
agattr(null, AGNODE, new CString("label"), new CString("\\N"));
/* default to no builtins, demand loading enabled */
gvc = (GVC_s) gvNEWcontext(null, (NOT(0)));
- gvconfig(gvc, false); /* configure for available plugins */
+ /* builtins don't require LTDL */
+ gvc.setInt("config_found", 0);
+ gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
+ textfont_dict_open(gvc); /* initialize font dict */
return gvc;
} finally {
LEAVING("f3vdhir2c7dz3pvmx9d3m4lx1","gvContext");
diff -Nru plantuml-1.2017.15/src/gen/lib/gvc/gvconfig__c.java plantuml-1.2018.9/src/gen/lib/gvc/gvconfig__c.java
--- plantuml-1.2017.15/src/gen/lib/gvc/gvconfig__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/gvc/gvconfig__c.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info: http://plantuml.com
- *
- * If you like this project or if you find it useful, you can support us at:
- *
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- *
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- *
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- *
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- *
- * You may obtain a copy of the License at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package gen.lib.gvc;
-import static gen.lib.common.textspan__c.textfont_dict_open;
-import static gen.lib.gvc.gvtextlayout__c.gvtextlayout_select;
-import static smetana.core.JUtilsDebug.ENTERING;
-import static smetana.core.JUtilsDebug.LEAVING;
-import static smetana.core.Macro.UNSUPPORTED;
-import h.GVC_s;
-import h.lt_symlist_t;
-import smetana.core.CString;
-
-public class gvconfig__c {
-//1 2digov3edok6d5srhgtlmrycs
-// extern lt_symlist_t lt_preloaded_symbols[]
-
-
-//1 baedz5i9est5csw3epz3cv7z
-// typedef Ppoly_t Ppolyline_t
-
-
-//1 9k44uhd5foylaeoekf3llonjq
-// extern Dtmethod_t* Dtset
-
-
-//1 1ahfywsmzcpcig2oxm7pt9ihj
-// extern Dtmethod_t* Dtbag
-
-
-//1 anhghfj3k7dmkudy2n7rvt31v
-// extern Dtmethod_t* Dtoset
-
-
-//1 5l6oj1ux946zjwvir94ykejbc
-// extern Dtmethod_t* Dtobag
-
-
-//1 2wtf222ak6cui8cfjnw6w377z
-// extern Dtmethod_t* Dtlist
-
-
-//1 d1s1s6ibtcsmst88e3057u9r7
-// extern Dtmethod_t* Dtstack
-
-
-//1 axa7mflo824p6fspjn1rdk0mt
-// extern Dtmethod_t* Dtqueue
-
-
-//1 ega812utobm4xx9oa9w9ayij6
-// extern Dtmethod_t* Dtdeque
-
-
-//1 cyfr996ur43045jv1tjbelzmj
-// extern Dtmethod_t* Dtorder
-
-
-//1 wlofoiftbjgrrabzb2brkycg
-// extern Dtmethod_t* Dttree
-
-
-//1 12bds94t7voj7ulwpcvgf6agr
-// extern Dtmethod_t* Dthash
-
-
-//1 9lqknzty480cy7zsubmabkk8h
-// extern Dtmethod_t _Dttree
-
-
-//1 bvn6zkbcp8vjdhkccqo1xrkrb
-// extern Dtmethod_t _Dthash
-
-
-//1 9lidhtd6nsmmv3e7vjv9e10gw
-// extern Dtmethod_t _Dtlist
-
-
-//1 34ujfamjxo7xn89u90oh2k6f8
-// extern Dtmethod_t _Dtqueue
-
-
-//1 3jy4aceckzkdv950h89p4wjc8
-// extern Dtmethod_t _Dtstack
-
-
-//1 8dfqgf3u1v830qzcjqh9o8ha7
-// extern Agmemdisc_t AgMemDisc
-
-
-//1 18k2oh2t6llfsdc5x0wlcnby8
-// extern Agiddisc_t AgIdDisc
-
-
-//1 a4r7hi80gdxtsv4hdoqpyiivn
-// extern Agiodisc_t AgIoDisc
-
-
-//1 bnzt5syjb7mgeru19114vd6xx
-// extern Agdisc_t AgDefaultDisc
-
-
-//1 35y2gbegsdjilegaribes00mg
-// extern Agdesc_t Agdirected, Agstrictdirected, Agundirected, Agstrictundirected
-
-
-//1 c2rygslq6bcuka3awmvy2b3ow
-// typedef Agsubnode_t Agnoderef_t
-
-
-//1 xam6yv0dcsx57dtg44igpbzn
-// typedef Dtlink_t Agedgeref_t
-
-
-
-
-//3 btaticnvqvav6giyqk5dhvl0b
-// static gvplugin_package_t * gvplugin_package_record(GVC_t * gvc, char *path, char *name)
-public static Object gvplugin_package_record(Object... arg) {
-UNSUPPORTED("d0v4w7mmhzyohr3cydmk39msc"); // static gvplugin_package_t * gvplugin_package_record(GVC_t * gvc, char *path, char *name)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("3l201ckgkdpkadl64dgd5t34a"); // gvplugin_package_t *package = gmalloc(sizeof(gvplugin_package_t));
-UNSUPPORTED("e1ux222fnf2pzhlllspc0n9z6"); // package->path = (path) ? strdup(path) : NULL;
-UNSUPPORTED("6tx9kbkb680t4nrzo9h6wmxt7"); // package->name = strdup(name);
-UNSUPPORTED("2ddoa0el03kdry52dvxdp02xi"); // package->next = gvc->packages;
-UNSUPPORTED("2wtcp1phunrqzsy2eyeelnisd"); // gvc->packages = package;
-UNSUPPORTED("1cvdn1usbhmpxzhmfo5t0qhv0"); // return package;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 7b32j8w9cd211oy7f26zd2ld6
-// void gvconfig_plugin_install_from_library(GVC_t * gvc, char *path, gvplugin_library_t *library)
-public static Object gvconfig_plugin_install_from_library(Object... arg) {
-UNSUPPORTED("9qlio5kiswebv40u9nmcxh1um"); // void gvconfig_plugin_install_from_library(GVC_t * gvc, char *path, gvplugin_library_t *library)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1tb07tzg54jallfz0upl62c1g"); // gvplugin_api_t *apis;
-UNSUPPORTED("2ihbo5t1nbmg4dq1qvwi9sqoh"); // gvplugin_installed_t *types;
-UNSUPPORTED("as58mgqb4uw4c8n4sdq7m0qz3"); // gvplugin_package_t *package;
-UNSUPPORTED("b17di9c7wgtqm51bvsyxz6e2f"); // int i;
-UNSUPPORTED("21xt0dglbm2xme4gg1b8b9tfl"); // package = gvplugin_package_record(gvc, path, library->packagename);
-UNSUPPORTED("44g9muiwx72zahb9xx5xzmfyv"); // for (apis = library->apis; (types = apis->types); apis++) {
-UNSUPPORTED("bslr2lh149d2y32qozijhg1pj"); // for (i = 0; types[i].type; i++) {
-UNSUPPORTED("7xl5c8mkdfmtazqddql72rl4l"); // gvplugin_install(gvc, apis->api, types[i].type,
-UNSUPPORTED("81elyir1t9mhizwx6bh2dy6fc"); // types[i].quality, package, &types[i]);
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 a0u25p4ndz2d3mpylo4jnz9cc
-// static void gvconfig_plugin_install_builtins(GVC_t * gvc)
-public static void gvconfig_plugin_install_builtins(GVC_s gvc) {
-ENTERING("a0u25p4ndz2d3mpylo4jnz9cc","gvconfig_plugin_install_builtins");
-try {
- lt_symlist_t s;
- CString name;
- if (gvc.getStruct("common").getPtr("builtins") == null) return;
-UNSUPPORTED("5h6ty7bll7yb1rvxiy8b1a17y"); // for (s = gvc->common.builtins; (name = s->name); s++)
-UNSUPPORTED("efvffxomvrmz7nbrcbcvananw"); // if (name[0] == 'g' && strstr(name, "_LTX_library"))
-UNSUPPORTED("95pie5przmmzrwnym8ye97v2e"); // gvconfig_plugin_install_from_library(gvc, NULL,
-UNSUPPORTED("ezsy5hnc71vs70pla8x24w5py"); // (gvplugin_library_t *)(s->address));
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-} finally {
-LEAVING("a0u25p4ndz2d3mpylo4jnz9cc","gvconfig_plugin_install_builtins");
-}
-}
-
-
-
-
-//3 f5fyxnkmknydgjt6dtc035z9w
-// void gvconfig(GVC_t * gvc, boolean rescan)
-public static void gvconfig(GVC_s gvc, boolean rescan) {
-ENTERING("f5fyxnkmknydgjt6dtc035z9w","gvconfig");
-try {
- /* builtins don't require LTDL */
- gvconfig_plugin_install_builtins(gvc);
- gvc.setInt("config_found", 0);
- gvtextlayout_select(gvc); /* choose best available textlayout plugin immediately */
- textfont_dict_open(gvc); /* initialize font dict */
-} finally {
-LEAVING("f5fyxnkmknydgjt6dtc035z9w","gvconfig");
-}
-}
-
-
-}
diff -Nru plantuml-1.2017.15/src/gen/lib/gvc/gvusershape__c.java plantuml-1.2018.9/src/gen/lib/gvc/gvusershape__c.java
--- plantuml-1.2017.15/src/gen/lib/gvc/gvusershape__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/gvc/gvusershape__c.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,977 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info: http://plantuml.com
- *
- * If you like this project or if you find it useful, you can support us at:
- *
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- *
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- *
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- *
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- *
- * You may obtain a copy of the License at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package gen.lib.gvc;
-import static smetana.core.Macro.UNSUPPORTED;
-
-public class gvusershape__c {
-//1 2digov3edok6d5srhgtlmrycs
-// extern lt_symlist_t lt_preloaded_symbols[]
-
-
-//1 baedz5i9est5csw3epz3cv7z
-// typedef Ppoly_t Ppolyline_t
-
-
-//1 9k44uhd5foylaeoekf3llonjq
-// extern Dtmethod_t* Dtset
-
-
-//1 1ahfywsmzcpcig2oxm7pt9ihj
-// extern Dtmethod_t* Dtbag
-
-
-//1 anhghfj3k7dmkudy2n7rvt31v
-// extern Dtmethod_t* Dtoset
-
-
-//1 5l6oj1ux946zjwvir94ykejbc
-// extern Dtmethod_t* Dtobag
-
-
-//1 2wtf222ak6cui8cfjnw6w377z
-// extern Dtmethod_t* Dtlist
-
-
-//1 d1s1s6ibtcsmst88e3057u9r7
-// extern Dtmethod_t* Dtstack
-
-
-//1 axa7mflo824p6fspjn1rdk0mt
-// extern Dtmethod_t* Dtqueue
-
-
-//1 ega812utobm4xx9oa9w9ayij6
-// extern Dtmethod_t* Dtdeque
-
-
-//1 cyfr996ur43045jv1tjbelzmj
-// extern Dtmethod_t* Dtorder
-
-
-//1 wlofoiftbjgrrabzb2brkycg
-// extern Dtmethod_t* Dttree
-
-
-//1 12bds94t7voj7ulwpcvgf6agr
-// extern Dtmethod_t* Dthash
-
-
-//1 9lqknzty480cy7zsubmabkk8h
-// extern Dtmethod_t _Dttree
-
-
-//1 bvn6zkbcp8vjdhkccqo1xrkrb
-// extern Dtmethod_t _Dthash
-
-
-//1 9lidhtd6nsmmv3e7vjv9e10gw
-// extern Dtmethod_t _Dtlist
-
-
-//1 34ujfamjxo7xn89u90oh2k6f8
-// extern Dtmethod_t _Dtqueue
-
-
-//1 3jy4aceckzkdv950h89p4wjc8
-// extern Dtmethod_t _Dtstack
-
-
-//1 8dfqgf3u1v830qzcjqh9o8ha7
-// extern Agmemdisc_t AgMemDisc
-
-
-//1 18k2oh2t6llfsdc5x0wlcnby8
-// extern Agiddisc_t AgIdDisc
-
-
-//1 a4r7hi80gdxtsv4hdoqpyiivn
-// extern Agiodisc_t AgIoDisc
-
-
-//1 bnzt5syjb7mgeru19114vd6xx
-// extern Agdisc_t AgDefaultDisc
-
-
-//1 35y2gbegsdjilegaribes00mg
-// extern Agdesc_t Agdirected, Agstrictdirected, Agundirected, Agstrictundirected
-
-
-//1 c2rygslq6bcuka3awmvy2b3ow
-// typedef Agsubnode_t Agnoderef_t
-
-
-//1 xam6yv0dcsx57dtg44igpbzn
-// typedef Dtlink_t Agedgeref_t
-
-
-//1 9jp96pa73kseya3w6sulxzok6
-// extern char *Gvimagepath
-
-
-//1 c6f8whijgjwwagjigmxlwz3gb
-// extern char *HTTPServerEnVar
-
-
-//1 9brvabw9vk27d2nrq4p8tf971
-// static Dict_t *ImageDict
-
-
-//1 9pk2f9zg2k7nxk2pay6uw1ecz
-// static knowntype_t knowntypes[] =
-
-
-
-
-//3 afsdkf8ez5ohl6dd2prle0bgt
-// static int imagetype (usershape_t *us)
-public static Object imagetype(Object... arg) {
-UNSUPPORTED("7vhzi3i3q0uu1byz03i34arpi"); // static int imagetype (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("4xkzi87btn54hoh901yqje0t2"); // char header[20];
-UNSUPPORTED("34btb8w1kvws7rrywxitht2dt"); // char line[200];
-UNSUPPORTED("b17di9c7wgtqm51bvsyxz6e2f"); // int i;
-UNSUPPORTED("ayo4w7poqzsosr46zq587rive"); // if (us->f && fread(header, 1, 20, us->f) == 20) {
-UNSUPPORTED("4f6p9x65zgxhi7g72c6rr85ez"); // for (i = 0; i < sizeof(knowntypes) / sizeof(knowntype_t); i++) {
-UNSUPPORTED("ken197schvdfnlj4tbd1ajsg"); // if (!memcmp (header, knowntypes[i].template, knowntypes[i].size)) {
-UNSUPPORTED("boxmes4yvhbhxz864uev9jrkn"); // us->stringtype = knowntypes[i].stringtype;
-UNSUPPORTED("ot0inunld2mj1q1v9ubb1meg"); // us->type = knowntypes[i].type;
-UNSUPPORTED("itn78hlno7a8ug22ta41xds5"); // if (us->type == FT_XML) {
-UNSUPPORTED("152itmr8zxm9bdyohwofdarej"); // /* check for SVG in case of XML */
-UNSUPPORTED("3hr9t6mkxbajyo66bbwwo671x"); // while (fgets(line, sizeof(line), us->f) != (void *)0) {
-UNSUPPORTED("3t6168qdbfqfv25fv7zx4xfms"); // if (!memcmp(line, "stringtype = "svg";
-UNSUPPORTED("ano6zabqu54wu0a40t35lj2q8"); // return (us->type = FT_SVG);
-UNSUPPORTED("3rk33w1xf0jaka2h033sgnx06"); // }
-UNSUPPORTED("dkxvw03k2gg9anv4dbze06axd"); // }
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("f1kxll0fswekbe2gwilmen2m7"); // else if (us->type == FT_RIFF) {
-UNSUPPORTED("cm5s3kh98e66k97v45ofiyv82"); // /* check for WEBP in case of RIFF */
-UNSUPPORTED("4ma0gwqxr9j5qek6xkrskevsl"); // if (!memcmp(header+8, "WEBP", sizeof("WEBP")-1)) {
-UNSUPPORTED("3zasc2uxnxlgetbuyifmr97bf"); // us->stringtype = "webp";
-UNSUPPORTED("cgno6et27of87vw0o38rnarxx"); // return (us->type = FT_WEBP);
-UNSUPPORTED("dkxvw03k2gg9anv4dbze06axd"); // }
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("60vq78txdp1vk965f5jgtlboc"); // return us->type;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("775efiysp2o60ingiihr8o6kq"); // us->stringtype = "(lib)";
-UNSUPPORTED("acr9g7qhtz1yhdxvbzfapnlad"); // us->type = FT_NULL;
-UNSUPPORTED("7yivuk2g5w938mbst7quo3jxa"); // return FT_NULL;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 bnikn3k3s008dmhsa2qu6lh34
-// static boolean get_int_lsb_first (FILE *f, unsigned int sz, unsigned int *val)
-public static Object get_int_lsb_first(Object... arg) {
-UNSUPPORTED("cj03ffwnafffjxcznknyyp45b"); // static boolean get_int_lsb_first (FILE *f, unsigned int sz, unsigned int *val)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("70g3qubiio6uxhg2gxt141bff"); // int ch, i;
-UNSUPPORTED("f3wi4z18bhg0unx5i47wp28hb"); // *val = 0;
-UNSUPPORTED("6p1fgfnk4itt60e21fa48roiq"); // for (i = 0; i < sz; i++) {
-UNSUPPORTED("7zywfbf1jevwjemy5yzpfiiza"); // ch = fgetc(f);
-UNSUPPORTED("1t7v5vi7ec6r3mhla23o1v3w2"); // if (feof(f))
-UNSUPPORTED("6f1138i13x0xz1bf1thxgjgka"); // return 0;
-UNSUPPORTED("1ewc3hwvqjod1e2ou7c4u02h1"); // *val |= (ch << 8*i);
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("4si0cf97a5sfd9ozuunds9goz"); // return (!(0));
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 87ifzytv1xgex4vf4ffa1fx28
-// static boolean get_int_msb_first (FILE *f, unsigned int sz, unsigned int *val)
-public static Object get_int_msb_first(Object... arg) {
-UNSUPPORTED("ad8pamcrkweeq9xmkgw9docv9"); // static boolean get_int_msb_first (FILE *f, unsigned int sz, unsigned int *val)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("70g3qubiio6uxhg2gxt141bff"); // int ch, i;
-UNSUPPORTED("f3wi4z18bhg0unx5i47wp28hb"); // *val = 0;
-UNSUPPORTED("6p1fgfnk4itt60e21fa48roiq"); // for (i = 0; i < sz; i++) {
-UNSUPPORTED("7zywfbf1jevwjemy5yzpfiiza"); // ch = fgetc(f);
-UNSUPPORTED("1t7v5vi7ec6r3mhla23o1v3w2"); // if (feof(f))
-UNSUPPORTED("6f1138i13x0xz1bf1thxgjgka"); // return 0;
-UNSUPPORTED("ac2fcmmhoviu6vu7od03xd2fz"); // *val <<= 8;
-UNSUPPORTED("2aeq31k5bdbmozogiex8thool"); // *val |= ch;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("4si0cf97a5sfd9ozuunds9goz"); // return (!(0));
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 e6zw0qebmgir30wjyodre1w3q
-// static unsigned int svg_units_convert(double n, char *u)
-public static Object svg_units_convert(Object... arg) {
-UNSUPPORTED("1q167s10zcp2ohq3mqsaucn6q"); // static unsigned int svg_units_convert(double n, char *u)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("as83qujnkumxgvltowl9k84pa"); // if (strcmp(u, "in") == 0)
-UNSUPPORTED("cz9p5u3tzm0vtfcypzsqjjznz"); // return ROUND(n * 72);
-UNSUPPORTED("a3ea8buut0466me8422yze7nk"); // if (strcmp(u, "px") == 0)
-UNSUPPORTED("17k340tdedf8kyw8jjau617ji"); // return ROUND(n * 72 / 96);
-UNSUPPORTED("e1voxws30sz7bauvt2nz3e43i"); // if (strcmp(u, "pc") == 0)
-UNSUPPORTED("dgfrr8ul58nbz256i7zg3dfnv"); // return ROUND(n * 72 / 6);
-UNSUPPORTED("3zt4017at03z9nmfg4b6j33nl"); // if (strcmp(u, "pt") == 0 || strcmp(u, "\"") == 0) /* ugly!! - if there are no inits then the %2s get the trailing '"' */
-UNSUPPORTED("3bme0piy1kqu5q9y4eqbrr5fm"); // return ROUND(n);
-UNSUPPORTED("4kvfi7mn3m1cvs8748w6apqe6"); // if (strcmp(u, "cm") == 0)
-UNSUPPORTED("40fcy0h4yq1mhgc6sig41xkiz"); // return ROUND(n * ((double)72 * 0.393700787));
-UNSUPPORTED("795vmm17p8fultyx81btq2qj7"); // if (strcmp(u, "mm") == 0)
-UNSUPPORTED("2p58445vgby41tw5y37sb952f"); // return ROUND(n * ((double)72 * 0.0393700787));
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-//1 48cx4t8oc5776gxxsx3wj1459
-// static char* svg_attr_value_re =
-
-
-//1 urpt4udx4umgv15x10ssv67m
-// static regex_t re, *pre = (void *)0
-
-
-
-
-//3 di4bxm03m9srcwmfu82mzqtu
-// static void svg_size (usershape_t *us)
-public static Object svg_size(Object... arg) {
-UNSUPPORTED("3bpommb3a197xaax86ebpnapc"); // static void svg_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("16qpk89sms5wm32xxhdjsrhj1"); // unsigned int w = 0, h = 0;
-UNSUPPORTED("3bfgwfzonzqutm2m3s241ggmq"); // double n, x0, y0, x1, y1;
-UNSUPPORTED("5urpczqwzlgz812axw5w07irp"); // char u[10];
-UNSUPPORTED("e7xkcvvhzn89z17vzxp5d9wqf"); // char *attribute, *value, *re_string;
-UNSUPPORTED("34btb8w1kvws7rrywxitht2dt"); // char line[200];
-UNSUPPORTED("1kfdqzk554dccavlk1sr8hc6k"); // boolean wFlag = 0, hFlag = 0;
-UNSUPPORTED("txcitt9410z35lsx2a1qr3zb"); // regmatch_t re_pmatch[4];
-UNSUPPORTED("2elnezsihato03euhhcjmczz6"); // /* compile on first use */
-UNSUPPORTED("b3qk4y1nm971zossf7ba67c39"); // if (! pre) {
-UNSUPPORTED("4k0rhf891tka3e5fomw7gygix"); // if (regcomp(&re, svg_attr_value_re, REG_EXTENDED) != 0) {
-UNSUPPORTED("bvbawrzsgnxy8a4de3iuwaeqb"); // agerr(AGERR,"cannot compile regular expression %s", svg_attr_value_re);
-UNSUPPORTED("klxoy56t7b20wxnwqm0qoofz"); // }
-UNSUPPORTED("9let8u6jhsriwmr05bp3gwoy5"); // pre = &re;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("7iygf89yc0kwp5pocixawdaed"); // fseek(us->f, 0, SEEK_SET);
-UNSUPPORTED("40jwwwlrum66g8u94aha46ac6"); // while (fgets(line, sizeof(line), us->f) != (void *)0 && (!wFlag || !hFlag)) {
-UNSUPPORTED("1d8ii0hljelb18gmpwwrtvano"); // re_string = line;
-UNSUPPORTED("5bh0ae9np7zl19gk8h3h9317e"); // while (regexec(&re, re_string, 4, re_pmatch, 0) == 0) {
-UNSUPPORTED("b355fkvcamz9jmg27def9b8x3"); // re_string[re_pmatch[1].rm_eo] = '\0';
-UNSUPPORTED("aef3m3p3zi96h0zt0sjw03lj4"); // re_string[re_pmatch[2].rm_eo] = '\0';
-UNSUPPORTED("eipkd5535u39a7ub3xbstkeu2"); // attribute = re_string + re_pmatch[1].rm_so;
-UNSUPPORTED("bqe4861o77yhd2c4hm2q9ryqg"); // value = re_string + re_pmatch[2].rm_so;
-UNSUPPORTED("c9y0ykkvqmbho7jwq1hq2v8rg"); // re_string += re_pmatch[0].rm_eo + 1;
-UNSUPPORTED("4x0vivqfmvb5kxu3yv8zlj0z8"); // if (strcmp(attribute,"width") == 0) {
-UNSUPPORTED("cjoilrknjlp3580a79aeduafs"); // if (sscanf(value, "%lf%2s", &n, u) == 2) {
-UNSUPPORTED("5804xn01sb0nsqc4oand73j71"); // w = svg_units_convert(n, u);
-UNSUPPORTED("boxr36cof383w0qjpos68wr3p"); // wFlag = (!(0));
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("coem1appm7al4by2xogxcf79v"); // else if (sscanf(value, "%lf", &n) == 1) {
-UNSUPPORTED("d20bsvecsbla4zfrgr8vs0axk"); // w = svg_units_convert(n, "pt");
-UNSUPPORTED("boxr36cof383w0qjpos68wr3p"); // wFlag = (!(0));
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("bokpcg0aj7i7sody2nk55sn1m"); // if (hFlag)
-UNSUPPORTED("czyohktf9bkx4udfqhx42f4lu"); // break;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("349wmcj9pjfzzogsgqytbecep"); // else if (strcmp(attribute,"height") == 0) {
-UNSUPPORTED("cjoilrknjlp3580a79aeduafs"); // if (sscanf(value, "%lf%2s", &n, u) == 2) {
-UNSUPPORTED("4e8rpne5p90nqhwswzkila8du"); // h = svg_units_convert(n, u);
-UNSUPPORTED("75lsnpofiu7aq6tvk1bytezfx"); // hFlag = (!(0));
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("318wbwzbtyt293618awt8oi7j"); // else if (sscanf(value, "%lf", &n) == 1) {
-UNSUPPORTED("8roq2ozo7ghuukkquxg4vi3o8"); // h = svg_units_convert(n, "pt");
-UNSUPPORTED("75lsnpofiu7aq6tvk1bytezfx"); // hFlag = (!(0));
-UNSUPPORTED("6eq5kf0bj692bokt0bixy1ixh"); // }
-UNSUPPORTED("3f72eveov59pnntffs33fh1o9"); // if (wFlag)
-UNSUPPORTED("czyohktf9bkx4udfqhx42f4lu"); // break;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("evrgwvbtefbhi8c4vpurqyncz"); // else if (strcmp(attribute,"viewBox") == 0
-UNSUPPORTED("7knynrz6icv4twtp5re2u2tyu"); // && sscanf(value, "%lf %lf %lf %lf", &x0,&y0,&x1,&y1) == 4) {
-UNSUPPORTED("b75jl7dtq9qf4ike38i53sb5b"); // w = x1 - x0 + 1;
-UNSUPPORTED("ccjsgjzpqovbgplagso2d6wvk"); // h = y1 - y0 + 1;
-UNSUPPORTED("agh2p3816w463hvgmt7pji00p"); // wFlag = (!(0));
-UNSUPPORTED("b0kbr8vydi49ibjics3e3mlip"); // hFlag = (!(0));
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("6t98dcecgbvbvtpycwiq2ynnj"); // }
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("avyq4e4me4o2pteunxjmfehds"); // us->w = w;
-UNSUPPORTED("evkuhplkb5xfea6ln3h8f6ly2"); // us->h = h;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 2phgl4coa8enkvltpf0938lit
-// static void png_size (usershape_t *us)
-public static Object png_size(Object... arg) {
-UNSUPPORTED("5qra9bwfkjw5syv0odudm6gam"); // static void png_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8l3f9beos057zjxgk0cdj323o"); // unsigned int w, h;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("3135bp24afhqdzs2uj5l7sjr1"); // fseek(us->f, 16, SEEK_SET);
-UNSUPPORTED("1luxqut1mknrn8qp0yakx9czw"); // if (get_int_msb_first(us->f, 4, &w) && get_int_msb_first(us->f, 4, &h)) {
-UNSUPPORTED("73axoa9apyrx2829eqsezmfik"); // us->w = w;
-UNSUPPORTED("993qcme7jlmcsi918hu491ld5"); // us->h = h;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 lqow6tkjqnnbqz6msa6cmzlk
-// static void ico_size (usershape_t *us)
-public static Object ico_size(Object... arg) {
-UNSUPPORTED("6eqck7knu0bxd3sib3fpca2hf"); // static void ico_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8l3f9beos057zjxgk0cdj323o"); // unsigned int w, h;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("bunso4je5hrb29m4984fw7bh6"); // fseek(us->f, 6, SEEK_SET);
-UNSUPPORTED("875b5zt62o9flpi731becymv4"); // if (get_int_msb_first(us->f, 1, &w) && get_int_msb_first(us->f, 1, &h)) {
-UNSUPPORTED("73axoa9apyrx2829eqsezmfik"); // us->w = w;
-UNSUPPORTED("993qcme7jlmcsi918hu491ld5"); // us->h = h;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 dleljswqxf1oa4gzr8l8fomcl
-// static void webp_size (usershape_t *us)
-public static Object webp_size(Object... arg) {
-UNSUPPORTED("dl59ajg8cu2fj1vuagj6pumce"); // static void webp_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8l3f9beos057zjxgk0cdj323o"); // unsigned int w, h;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("3mt62dnri0kt6p9g6nmf6x78i"); // fseek(us->f, 15, SEEK_SET);
-UNSUPPORTED("bro476e5tdpqu4kqzjhadepr8"); // if (fgetc(us->f) == 'X') { //VP8X
-UNSUPPORTED("ciyvs7xrf1sc336ipavk7gjbs"); // fseek(us->f, 24, SEEK_SET);
-UNSUPPORTED("77gjxe5g6u7c6371ziwedefxf"); // if (get_int_lsb_first(us->f, 4, &w) && get_int_lsb_first(us->f, 4, &h)) {
-UNSUPPORTED("9htwijlhm4ad9uo70xn5d5tvl"); // us->w = w;
-UNSUPPORTED("3hh8nl3qystuq8wcwsm411fej"); // us->h = h;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("bwt2eurukj3m7fsbr441rf1pj"); // else { //VP8
-UNSUPPORTED("5fthwx7kwgddogs4n4fsbb0o8"); // fseek(us->f, 26, SEEK_SET);
-UNSUPPORTED("621fvdyd12vnbfyxpw6j0z7cr"); // if (get_int_lsb_first(us->f, 2, &w) && get_int_lsb_first(us->f, 2, &h)) {
-UNSUPPORTED("9htwijlhm4ad9uo70xn5d5tvl"); // us->w = w;
-UNSUPPORTED("3hh8nl3qystuq8wcwsm411fej"); // us->h = h;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 2s3ms72agp5gyfqz15zbpp3u1
-// static void gif_size (usershape_t *us)
-public static Object gif_size(Object... arg) {
-UNSUPPORTED("ac8be5d24wrrx24tnddiukvl7"); // static void gif_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8l3f9beos057zjxgk0cdj323o"); // unsigned int w, h;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("bunso4je5hrb29m4984fw7bh6"); // fseek(us->f, 6, SEEK_SET);
-UNSUPPORTED("ezkdvuggkyj11n6ca6xrhm72g"); // if (get_int_lsb_first(us->f, 2, &w) && get_int_lsb_first(us->f, 2, &h)) {
-UNSUPPORTED("73axoa9apyrx2829eqsezmfik"); // us->w = w;
-UNSUPPORTED("993qcme7jlmcsi918hu491ld5"); // us->h = h;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 bpjeya6em7jp6m6l86m6t4u4a
-// static void bmp_size (usershape_t *us)
-public static Object bmp_size(Object... arg) {
-UNSUPPORTED("ba2pylwi2xu10asnonw92pxw1"); // static void bmp_size (usershape_t *us) {
-UNSUPPORTED("ct1272vz7j34sqkcwzdiq2x0i"); // unsigned int size_x_msw, size_x_lsw, size_y_msw, size_y_lsw;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("9b418veiss4t0o7s8cqq28owo"); // fseek (us->f, 16, SEEK_SET);
-UNSUPPORTED("1q9kmvi2ajod9wlev8s5p50rv"); // if ( get_int_lsb_first (us->f, 2, &size_x_msw) &&
-UNSUPPORTED("5f5k6cp1ota9f8a2ciircybdh"); // get_int_lsb_first (us->f, 2, &size_x_lsw) &&
-UNSUPPORTED("9n6cqmhzmbkf1vt9fyu6zw0kp"); // get_int_lsb_first (us->f, 2, &size_y_msw) &&
-UNSUPPORTED("cid929pl3ogyk2kecod7opvz0"); // get_int_lsb_first (us->f, 2, &size_y_lsw) ) {
-UNSUPPORTED("a6g25f4k8ew6jja5m9rnccf5o"); // us->w = size_x_msw << 16 | size_x_lsw;
-UNSUPPORTED("8exqj264llut5d629ydwne5k2"); // us->h = size_y_msw << 16 | size_y_lsw;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 c7yvo5wd816hjqxejnluaol0a
-// static void jpeg_size (usershape_t *us)
-public static Object jpeg_size(Object... arg) {
-UNSUPPORTED("c8uakwctlakoj06f07juq8r2a"); // static void jpeg_size (usershape_t *us) {
-UNSUPPORTED("3o57tczyjy6z9uvry23b9xkw5"); // unsigned int marker, length, size_x, size_y, junk;
-UNSUPPORTED("4ylph99ph3r2v7uhxyd2hq0io"); // /* These are the markers that follow 0xff in the file.
-UNSUPPORTED("1pzctl0feh1bhiqnxtmawvxg4"); // * Other markers implicitly have a 2-byte length field that follows.
-UNSUPPORTED("795vpnc8yojryr8b46aidsu69"); // */
-UNSUPPORTED("1lgv3mem6buwpyuef4b9h8rzp"); // static unsigned char standalone_markers [] = {
-UNSUPPORTED("e00djw6cjtdaxejgnewp8nus6"); // 0x01, /* Temporary */
-UNSUPPORTED("1urwngq6m3z6m5mr3egwgq9mr"); // 0xd0, 0xd1, 0xd2, 0xd3, /* Reset */
-UNSUPPORTED("e1vwc4842h5c84ojr8w3onuno"); // 0xd4, 0xd5, 0xd6,
-UNSUPPORTED("1uig2kz9nbo8j6vj3r7493n8"); // 0xd7,
-UNSUPPORTED("927bzm317ui2xj8ugbwhm5xb7"); // 0xd8, /* Start of image */
-UNSUPPORTED("9ybi9mcsggfw3zbh6zn9hotef"); // 0xd9, /* End of image */
-UNSUPPORTED("fbagrxdnmyjkvt7zaukczscg"); // 0
-UNSUPPORTED("9u8qqu9tw95qjbv3cxv3hj4bd"); // };
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("5owjshc6gmd9o9lmekzcl6rvg"); // while ((!(0))) {
-UNSUPPORTED("7kq4b2hkhf3vcx97hwoelgcxz"); // /* Now we must be at a 0xff or at a series of 0xff's.
-UNSUPPORTED("cga1geam6con9djkcofzmw0ko"); // * If that is not the case, or if we're at EOF, then there's
-UNSUPPORTED("exr8s1ongonmgsucjdf4zsmb4"); // * a parsing error.
-UNSUPPORTED("3vesx4cskuo1q42jvwmoum2xs"); // */
-UNSUPPORTED("79jgtuw1xg9dgik49e3hx1068"); // if (! get_int_msb_first (us->f, 1, &marker))
-UNSUPPORTED("3zyp4vhegf9dl2g8a4ffmxah8"); // return;
-UNSUPPORTED("e7cevpg68ih107a2ggfgkq1la"); // if (marker == 0xff)
-UNSUPPORTED("9j8yk6fxm4tnpr3yrev0f9bhm"); // continue;
-UNSUPPORTED("99hdbrpbwvb3lwfyhz43xnoxf"); // /* Ok.. marker now read. If it is not a stand-alone marker,
-UNSUPPORTED("b7dntxmllxk3wzmg9mclxs71r"); // * then continue. If it's a Start Of Frame (0xc?), then we're there.
-UNSUPPORTED("8aramua11q89c43osky6tgha5"); // * If it's another marker with a length field, then skip ahead
-UNSUPPORTED("5w0fy7m3152rri519xzsydb2w"); // * over that length field.
-UNSUPPORTED("3vesx4cskuo1q42jvwmoum2xs"); // */
-UNSUPPORTED("7itrbaa4e2u9uh86wydx2r1wq"); // /* A stand-alone... */
-UNSUPPORTED("7m1dttkv67ixwryn1ukl94hel"); // if (strchr ((char*)standalone_markers, marker))
-UNSUPPORTED("9j8yk6fxm4tnpr3yrev0f9bhm"); // continue;
-UNSUPPORTED("sb3rjk9k59soh7qvm0qpkzoh"); // /* Incase of a 0xc0 marker: */
-UNSUPPORTED("6u3lv1x78jskc1qjam25s00h1"); // if (marker == 0xc0) {
-UNSUPPORTED("4kucipi8uw6ujeuh489csoowf"); // /* Skip length and 2 lengths. */
-UNSUPPORTED("30gcyw02iuybxoyj28nhlbwbl"); // if ( get_int_msb_first (us->f, 3, &junk) &&
-UNSUPPORTED("b6ypup1v81rta7mfh68arftfd"); // get_int_msb_first (us->f, 2, &size_x) &&
-UNSUPPORTED("f2mbg2ezlyocn5228wkhy658f"); // get_int_msb_first (us->f, 2, &size_y) ) {
-UNSUPPORTED("eps17wh894vxn0oojbitsn1lr"); // /* Store length. */
-UNSUPPORTED("danamcguxf0st13b0euh47y8v"); // us->h = size_x;
-UNSUPPORTED("gva1bl1ygb6xzrrjwpma3dpp"); // us->w = size_y;
-UNSUPPORTED("7g94ubxa48a1yi3mf9v521b7c"); // }
-UNSUPPORTED("6cprbghvenu9ldc0ez1ifc63q"); // return;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("7jc4v9i136pgfvwakfui3aupm"); // /* Incase of a 0xc2 marker: */
-UNSUPPORTED("a1ww3q31w3xsq697vt32phj9d"); // if (marker == 0xc2) {
-UNSUPPORTED("7xwfuqyvolr45lp6gdcnmqyna"); // /* Skip length and one more byte */
-UNSUPPORTED("dhyz02dvhk6z01p9nh8knpdnp"); // if (! get_int_msb_first (us->f, 3, &junk))
-UNSUPPORTED("6an8ocqq0sjru42k4aathe94m"); // return;
-UNSUPPORTED("7b106vc3jzqz2eyjlo758xw2n"); // /* Get length and store. */
-UNSUPPORTED("akbj7dadm0nq5ujmuwiw50ukl"); // if ( get_int_msb_first (us->f, 2, &size_x) &&
-UNSUPPORTED("f2mbg2ezlyocn5228wkhy658f"); // get_int_msb_first (us->f, 2, &size_y) ) {
-UNSUPPORTED("danamcguxf0st13b0euh47y8v"); // us->h = size_x;
-UNSUPPORTED("gva1bl1ygb6xzrrjwpma3dpp"); // us->w = size_y;
-UNSUPPORTED("7g94ubxa48a1yi3mf9v521b7c"); // }
-UNSUPPORTED("6cprbghvenu9ldc0ez1ifc63q"); // return;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("9qz6tc2665rtirz7egtertjyl"); // /* Any other marker is assumed to be followed by 2 bytes length. */
-UNSUPPORTED("5xvajayqclvcxxqkozzorzbdi"); // if (! get_int_msb_first (us->f, 2, &length))
-UNSUPPORTED("3zyp4vhegf9dl2g8a4ffmxah8"); // return;
-UNSUPPORTED("cv5sg5k6hy1kwgiinb4i5xr6"); // fseek (us->f, length - 2, SEEK_CUR);
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 9vi0gtfjnp35ie6bx15grm4gp
-// static void ps_size (usershape_t *us)
-public static Object ps_size(Object... arg) {
-UNSUPPORTED("8kctdt9asc26knxxydik2v8ug"); // static void ps_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("18vi5vqd0r4k0kxsl3h3rwa4y"); // char line[BUFSIZ];
-UNSUPPORTED("4qk2wsv83bxm1lchsnd6splfr"); // boolean saw_bb;
-UNSUPPORTED("5rcgzsa5rlhtyjz964tcthts2"); // int lx, ly, ux, uy;
-UNSUPPORTED("5fewhg0dt0vbugqk2bmyfr34l"); // char* linep;
-UNSUPPORTED("891wob6d9fi1zsdfvumw7tx5y"); // us->dpi = 72;
-UNSUPPORTED("7iygf89yc0kwp5pocixawdaed"); // fseek(us->f, 0, SEEK_SET);
-UNSUPPORTED("w6asn9e9wasakvoc3kn19lwt"); // saw_bb = 0;
-UNSUPPORTED("cpypiyiyiq875wcq5pix66en2"); // while (fgets(line, sizeof(line), us->f)) {
-UNSUPPORTED("7vmkqwijdn7elebqrq3q3qqlv"); // /* PostScript accepts \r as EOL, so using fgets () and looking for a
-UNSUPPORTED("ccqysd4ji4ezs2u937a1tq93k"); // * bounding box comment at the beginning doesn't work in this case.
-UNSUPPORTED("a548nncd0y8n2a01c5z3akmhg"); // * As a heuristic, we first search for a bounding box comment in line.
-UNSUPPORTED("djrf0gim2rh71i0skg41uw6zn"); // * This obviously fails if not all of the numbers make it into the
-UNSUPPORTED("x3dg0lfzyp7yc2hldpo3cbge"); // * current buffer. This shouldn't be a problem, as the comment is
-UNSUPPORTED("4uvbwtwj71pylu4bfe3pu79le"); // * typically near the beginning, and so should be read within the first
-UNSUPPORTED("426auswwt3iw0kmtesztdy9ff"); // * BUFSIZ bytes (even on Windows where this is 512).
-UNSUPPORTED("62wb43w2xc6ex6hootjubbx22"); // */
-UNSUPPORTED("8iwr2d3ooqy0tw5eisixpectn"); // if (!(linep = strstr (line, "%%BoundingBox:")))
-UNSUPPORTED("6hqli9m8yickz1ox1qfgtdbnd"); // continue;
-UNSUPPORTED("2s519tr2mhoj177f79vzllnyq"); // if (sscanf (linep, "%%%%BoundingBox: %d %d %d %d", &lx, &ly, &ux, &uy) == 4) {
-UNSUPPORTED("6dekl3sp6brld4uq5ep5859l3"); // saw_bb = (!(0));
-UNSUPPORTED("ai3czg6gaaxspsmndknpyvuiu"); // break;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("8p3jjm43yrzygpor71hdkfs1g"); // if (saw_bb) {
-UNSUPPORTED("5dym7sjpxsgdgav57jvyuohe8"); // us->x = lx;
-UNSUPPORTED("da04q03gf0w4upkkrsn74w1dc"); // us->y = ly;
-UNSUPPORTED("6mpj1u4n7cyggpme1vsa6je8t"); // us->w = ux - lx;
-UNSUPPORTED("dqnhfatraydhv6fdx3gsi22ao"); // us->h = uy - ly;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 87i5xtm6lbxo4asqfnu0v9rz1
-// static unsigned char nxtc (stream_t* str)
-public static Object nxtc(Object... arg) {
-UNSUPPORTED("at0aua2ntxsp0j1h4yidmr4si"); // static unsigned char
-UNSUPPORTED("9rrtdlhn8kugpol3lky8rgp5n"); // nxtc (stream_t* str)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("9jyosg56ecd165ua22kq89ggj"); // if (fgets(str->buf, BUFSIZ, str->fp)) {
-UNSUPPORTED("bo88dnmxymbe4e1rppc0ex9ve"); // str->s = str->buf;
-UNSUPPORTED("8tdhptj2ed5dv8sew624q4jec"); // return *(str->s);
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("278hcy3fayv5vclqcgtpjbzdi"); // return '\0';
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 2fq3qaeuu4gjr89xmwwy7i4xe
-// static void skipWS (stream_t* str)
-public static Object skipWS(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("cactz8998uk8ou1c5zwtwg601"); // skipWS (stream_t* str)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("10sir32iwi5l2jyfgp65pihto"); // unsigned char c;
-UNSUPPORTED("91zm214vvm6477gtei1ggjkef"); // while ((c = (*(str->s)?*(str->s):nxtc(str)))) {
-UNSUPPORTED("dilzs0pemy12rvmpnko0iel59"); // if (isspace(c)) (str->s++);
-UNSUPPORTED("9wafzg86cpce49qfuv8wsl6in"); // else return;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 dwmuhk2xjfndhxozxfrdz5nk8
-// static int scanNum (char* tok, double* dp)
-public static Object scanNum(Object... arg) {
-UNSUPPORTED("eyp5xkiyummcoc88ul2b6tkeg"); // static int
-UNSUPPORTED("eq0ltrbhzwt422rffdlm4d20e"); // scanNum (char* tok, double* dp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("bkz9mqmemp1ljxdwdbu8xv3e9"); // char* endp;
-UNSUPPORTED("avrsd77b596s5g291ozzdpxf8"); // double d = strtod(tok, &endp);
-UNSUPPORTED("2qoq2nf2jpfoyc68njwm2ajkq"); // if (tok == endp) return 1;
-UNSUPPORTED("636uh4i1x8w844yxwd2u322d1"); // *dp = d;
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 dhjmc8hrpmiohrejyu72mrhno
-// static void getNum (stream_t* str, char* buf)
-public static Object getNum(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("doymhclp9a2fukna3vd3r7xf8"); // getNum (stream_t* str, char* buf)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("bsj3r19ko668lwj5fqk8tlbhc"); // int len = 0;
-UNSUPPORTED("wrvu9u7a8j6i6y6552zncxfk"); // char c;
-UNSUPPORTED("936voey3mecmlo6hla9hyrmun"); // skipWS(str);
-UNSUPPORTED("tuyymjn2lfs038e1rm6hbw8w"); // while ((c = (*(str->s)?*(str->s):nxtc(str))) && (isdigit(c) || (c == '.'))) {
-UNSUPPORTED("4rvasxp4ert1zz5jaasrqeft1"); // buf[len++] = c;
-UNSUPPORTED("8vm8y5ewr5ra87d4f8exah65d"); // (str->s++);
-UNSUPPORTED("5zs9wc8ip6zkde4o33aadh30c"); // if (len == BUFSIZ-1) break;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("3w01p3l63zt07scumxz12foyc"); // buf[len] = '\0';
-UNSUPPORTED("b9185t6i77ez1ac587ul8ndnc"); // return;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 6kdhce4shbkw92wtfgufyqecs
-// static int boxof (stream_t* str, boxf* bp)
-public static Object boxof(Object... arg) {
-UNSUPPORTED("eyp5xkiyummcoc88ul2b6tkeg"); // static int
-UNSUPPORTED("d810hoc5e8uu0odpm097odpfu"); // boxof (stream_t* str, boxf* bp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1z7b1t0srtne632sd3ma9jbp7"); // char tok[BUFSIZ];
-UNSUPPORTED("araz8ffm0d5v424qzgyh7bsvy"); // skipWS(str);
-UNSUPPORTED("1uwfhdftjs4loqhg7ecaermjd"); // if ((*(str->s)?*(str->s):nxtc(str)) != '[') return 1;
-UNSUPPORTED("8vm8y5ewr5ra87d4f8exah65d"); // (str->s++);
-UNSUPPORTED("6jh13u8w5qiy4ij2ebx6zmqwa"); // getNum(str, tok);
-UNSUPPORTED("1m5wgiebygd9j5o6m68etvwh0"); // if (scanNum(tok,&bp->LL.x)) return 1;
-UNSUPPORTED("6jh13u8w5qiy4ij2ebx6zmqwa"); // getNum(str, tok);
-UNSUPPORTED("9bcg5vhxd4fqd8ykkbivfm3d4"); // if (scanNum(tok,&bp->LL.y)) return 1;
-UNSUPPORTED("6jh13u8w5qiy4ij2ebx6zmqwa"); // getNum(str, tok);
-UNSUPPORTED("1z0q9nrhj393zbs1mok3h84tf"); // if (scanNum(tok,&bp->UR.x)) return 1;
-UNSUPPORTED("6jh13u8w5qiy4ij2ebx6zmqwa"); // getNum(str, tok);
-UNSUPPORTED("247082ftkwl5jzjorvyt3sgcl"); // if (scanNum(tok,&bp->UR.y)) return 1;
-UNSUPPORTED("c9ckhc8veujmwcw0ar3u3zld4"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 dedr09vl6y9ax357arh6tayi
-// static int bboxPDF (FILE* fp, boxf* bp)
-public static Object bboxPDF(Object... arg) {
-UNSUPPORTED("eyp5xkiyummcoc88ul2b6tkeg"); // static int
-UNSUPPORTED("9icxkxwqm6flp3sl9ulkp4fyd"); // bboxPDF (FILE* fp, boxf* bp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("f3gl6562biaxa4139uus0d370"); // stream_t str;
-UNSUPPORTED("5pjh3c3u4lxh1jdyyk966intb"); // char* s;
-UNSUPPORTED("8c7x8di5w36ib05qan9z4sl9"); // char buf[BUFSIZ];
-UNSUPPORTED("8w39jbbwqjx63enrf5fdvcm9r"); // while (fgets(buf, BUFSIZ, fp)) {
-UNSUPPORTED("b7wioadlc5j3p2q8w7tsq1gam"); // if ((s = strstr(buf,"/MediaBox"))) {
-UNSUPPORTED("ecmojjd7fnaeah045va2t5eg8"); // str.buf = buf;
-UNSUPPORTED("5k89yh945d2crbir8397vkavv"); // str.s = s+(sizeof("/MediaBox")-1);
-UNSUPPORTED("dj08qw9n5j8nlqx752hipu46u"); // str.fp = fp;
-UNSUPPORTED("uhua7rc3vef3nawzjyh3w1k5"); // return boxof(&str,bp);
-UNSUPPORTED("yoqd73ulpi5tn8snro7dt3jc"); // }
-UNSUPPORTED("8nzcpbtoi924xzu8ze3z6dbft"); // }
-UNSUPPORTED("eleqpc2p2r3hvma6tipoy7tr"); // return 1;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 3fdvwmb09jpyu6h40pj206vv3
-// static void pdf_size (usershape_t *us)
-public static Object pdf_size(Object... arg) {
-UNSUPPORTED("97swmsrhwped1e1n72fyev1ai"); // static void pdf_size (usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("2lzsl1e035wt5epd1h8f4bn8m"); // boxf bb;
-UNSUPPORTED("7337vyphkrv1lekq0dncy8j6s"); // us->dpi = 0;
-UNSUPPORTED("7iygf89yc0kwp5pocixawdaed"); // fseek(us->f, 0, SEEK_SET);
-UNSUPPORTED("cu1kld68jk8qm12c9f0n61vyd"); // if ( ! bboxPDF (us->f, &bb)) {
-UNSUPPORTED("14kgzu9x57imt127uyibumhif"); // us->x = bb.LL.x;
-UNSUPPORTED("51rq1d6stvtvjgfta18hxoiyg"); // us->y = bb.LL.y;
-UNSUPPORTED("encm75ymc6wgridj70fk0jf47"); // us->w = bb.UR.x - bb.LL.x;
-UNSUPPORTED("dy52i81burd516zy265e83wel"); // us->h = bb.UR.y - bb.LL.y;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 cxhbj2es2sky90cnd8qf89prs
-// static void usershape_close (Dict_t * dict, void * p, Dtdisc_t * disc)
-public static Object usershape_close(Object... arg) {
-UNSUPPORTED("b7or8sf6zjmnj6wjf08brm0r"); // static void usershape_close (Dict_t * dict, void * p, Dtdisc_t * disc)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("58pwyr0d4numnoai5v987l5ml"); // usershape_t *us = (usershape_t *)p;
-UNSUPPORTED("ad2wgtudijnm3bp4549lrva3l"); // if (us->f)
-UNSUPPORTED("13i1v3mxl0sjnx4rgaden880d"); // fclose(us->f);
-UNSUPPORTED("e5bs4fy1a1v5ptm2bcrm2m9ai"); // if (us->data && us->datafree)
-UNSUPPORTED("1wod8ffcoluizmoc72db2htxb"); // us->datafree(us);
-UNSUPPORTED("73p2w162ujnuoboekx5udlion"); // free (us);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-//1 es7jtx4lx7bg26412fcjit8ri
-// static Dtdisc_t ImageDictDisc =
-
-
-
-
-//3 9msk7qh9auq8w21r32k0ffcsa
-// usershape_t *gvusershape_find(char *name)
-public static Object gvusershape_find(Object... arg) {
-UNSUPPORTED("a9366bkr4gt4nvcj5bnkjrtrd"); // usershape_t *gvusershape_find(char *name)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("exneoozy5g8al0a8y6fxb88zv"); // usershape_t *us;
-UNSUPPORTED("265kxn69043hh3vmr1ma8pbpg"); // assert(name);
-UNSUPPORTED("1av8we70pcc0ni7489zk2ttcg"); // assert(name[0]);
-UNSUPPORTED("4qhyd93m9v57fwb1anljrxfd3"); // if (!ImageDict)
-UNSUPPORTED("45tfw7tcm68298aro2tdiv8pc"); // return (void *)0;
-UNSUPPORTED("dzt5b4nn4x2oidxk4g4wzt8et"); // us = (*(((Dt_t*)(ImageDict))->searchf))((ImageDict),(void*)(name),0001000);
-UNSUPPORTED("2iqrgjc97xskxvw6791yf0sl7"); // return us;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 3cgay03dg8pq23kln9kuc0ym5
-// boolean gvusershape_file_access(usershape_t *us)
-public static Object gvusershape_file_access(Object... arg) {
-UNSUPPORTED("dm8po5i2hu4arliyfc2ea2a47"); // boolean gvusershape_file_access(usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8u0o5i27i1no60qjs9r4os0f9"); // static int usershape_files_open_cnt;
-UNSUPPORTED("vadeh8lzzwz0ugk6azcwaayu"); // const char *fn;
-UNSUPPORTED("7gqi0ait1bhc4v9zl8rnn0wbs"); // assert(us);
-UNSUPPORTED("xlffgd4fqdckxg2nbs0mxtlj"); // assert(us->name);
-UNSUPPORTED("fk4kdjctgb13swd2h14t0yvh"); // assert(us->name[0]);
-UNSUPPORTED("ad2wgtudijnm3bp4549lrva3l"); // if (us->f)
-UNSUPPORTED("1te90msr6mhllwn4y3ghlahc0"); // fseek(us->f, 0, SEEK_SET);
-UNSUPPORTED("1nyzbeonram6636b1w955bypn"); // else {
-UNSUPPORTED("d6n6b94e02ntmefeqcoo0ueon"); // if (! (fn = safefile(us->name))) {
-UNSUPPORTED("778vwup2lml5qa9eyxd88416u"); // agerr(AGWARN, "Filename \"%s\" is unsafe\n", us->name);
-UNSUPPORTED("6f1138i13x0xz1bf1thxgjgka"); // return 0;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("31rnydpzhmzclqs3q4flw9ce2"); // us->f = fopen(fn, "r");
-UNSUPPORTED("cmb2imwpnm4tgu1dm9r5tgtj5"); // if (us->f == (void *)0) {
-UNSUPPORTED("ebzon8h2oywxvasmfmyhnw5pq"); // agerr(AGWARN, "%s while opening %s\n", strerror(errno), fn);
-UNSUPPORTED("6f1138i13x0xz1bf1thxgjgka"); // return 0;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("e17a7n92m8ieuby8sa8jm1r3o"); // if (usershape_files_open_cnt >= 50)
-UNSUPPORTED("c9jo9gbhp1on7wctnk1o7q8vu"); // us->nocache = (!(0));
-UNSUPPORTED("9352ql3e58qs4fzapgjfrms2s"); // else
-UNSUPPORTED("81eb64f0supcvkt4drj4djmby"); // usershape_files_open_cnt++;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("3ebwn2weruwgdz4tfaxj2htek"); // assert(us->f);
-UNSUPPORTED("4si0cf97a5sfd9ozuunds9goz"); // return (!(0));
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 9y4wcbk4jp03lbul2i25xzmp6
-// void gvusershape_file_release(usershape_t *us)
-public static Object gvusershape_file_release(Object... arg) {
-UNSUPPORTED("6i3sc3o39zrjf80hb57rmbe1t"); // void gvusershape_file_release(usershape_t *us)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("5a8j5zrw7vbgoyy4ogtlsywui"); // if (us->nocache) {
-UNSUPPORTED("47xp2oczqdec6db0z36u2n84r"); // if (us->f) {
-UNSUPPORTED("bzvrsl2iafc3pw0qughvm761m"); // fclose(us->f);
-UNSUPPORTED("amwbxewujlnkm7a19q6zl4xq0"); // us->f = (void *)0;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 8gvu7lmp0zomg3yy0a76n8pjh
-// static usershape_t *gvusershape_open (char *name)
-public static Object gvusershape_open(Object... arg) {
-UNSUPPORTED("5kyko9vxn3aqt1awhp5hd8c6a"); // static usershape_t *gvusershape_open (char *name)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("exneoozy5g8al0a8y6fxb88zv"); // usershape_t *us;
-UNSUPPORTED("265kxn69043hh3vmr1ma8pbpg"); // assert(name);
-UNSUPPORTED("4qhyd93m9v57fwb1anljrxfd3"); // if (!ImageDict)
-UNSUPPORTED("7tvne0duj1fh44ndje8hlq8nt"); // ImageDict = dtopen(&ImageDictDisc, Dttree);
-UNSUPPORTED("be9pwrhxzz4ia299kongm87uq"); // if (! (us = gvusershape_find(name))) {
-UNSUPPORTED("9suqlrwjg77jwdm7tlgzsc0by"); // if (! (us = zmalloc(sizeof(usershape_t))))
-UNSUPPORTED("7f8nrnyuywny79cpzv6a49d8v"); // return (void *)0;
-UNSUPPORTED("6viwgw3bdyvknckol3dsh1s5v"); // us->name = agstrdup (0, name);
-UNSUPPORTED("ewc238znlsx5axoejodocqoyp"); // if (!gvusershape_file_access(us))
-UNSUPPORTED("7f8nrnyuywny79cpzv6a49d8v"); // return (void *)0;
-UNSUPPORTED("4i933mk1cyf6xcljbpn69na20"); // assert(us->f);
-UNSUPPORTED("43qnzsg978s9yom42c0n33wx3"); // switch(imagetype(us)) {
-UNSUPPORTED("7eenfnk5yzoj21g2agitce6kx"); // case FT_NULL:
-UNSUPPORTED("azdoxaxgz4fzzdoeyruqj36jk"); // if (!(us->data = (void*)find_user_shape(us->name)))
-UNSUPPORTED("9mepm6hu7uqhpdwcg60h6pc3o"); // agerr(AGWARN, "\"%s\" was not found as a file or as a shape library member\n", us->name);
-UNSUPPORTED("9bu5332flxhc1ivhmzuiqcjdh"); // free(us);
-UNSUPPORTED("6948880uywn56ppo1fuqbm2rt"); // return (void *)0;
-UNSUPPORTED("9ekmvj13iaml5ndszqyxa8eq"); // break;
-UNSUPPORTED("4p4ayucon7vqli1ylni5hjrfb"); // case FT_GIF:
-UNSUPPORTED("c68gkmazl6aratmtonsx4fan9"); // gif_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("7da7e6aavwlcxg7eglorxy23g"); // case FT_PNG:
-UNSUPPORTED("ubixbe52lmq7uzqie7h12582"); // png_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("9ysbcxl45mbfo0lhfihqfby4d"); // case FT_BMP:
-UNSUPPORTED("9xqkpupuhywfcx0rkky4pnu5q"); // bmp_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("bhf95qvvxhf47ek76yf2a45l0"); // case FT_JPEG:
-UNSUPPORTED("bq0stf6n5x5tzvjir50smcifq"); // jpeg_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("bazpzxo4uq0pwp7j4k94ngrtz"); // case FT_PS:
-UNSUPPORTED("7bs1bijtavu2jceudpors0jbp"); // ps_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("8xv8jf3eindz5gftkzluercwh"); // case FT_WEBP:
-UNSUPPORTED("91d89xyv6dtk8a479p0cfwyy7"); // webp_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("c8km9iw5nmks5lp6jl9j5s5q2"); // case FT_SVG:
-UNSUPPORTED("a147xv5hgfkmevlpr3jb7fzci"); // svg_size(us);
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("242ztnyfnn9hx8sb3u5z3omun"); // case FT_PDF:
-UNSUPPORTED("9ef2eux36pp9nf00d1ijmfbhm"); // pdf_size(us);
-UNSUPPORTED("9ekmvj13iaml5ndszqyxa8eq"); // break;
-UNSUPPORTED("3h2lioytqam297xdu0a7l0y6w"); // case FT_ICO:
-UNSUPPORTED("dj7xjql9twvpafx4qoyb07ra8"); // ico_size(us);
-UNSUPPORTED("9ekmvj13iaml5ndszqyxa8eq"); // break;
-UNSUPPORTED("90yyikfl7j30g6npbi9n0jxyw"); // // case FT_TIFF:
-UNSUPPORTED("72cnoy8x3q67t6323yzwcdim8"); // // tiff_size(us);
-UNSUPPORTED("1sbah8d4teszwq6tgzsohjpba"); // // break;
-UNSUPPORTED("2hkvwieff33mlzyovvk76tpzn"); // case FT_EPS: /* no eps_size code available */
-UNSUPPORTED("bt2g0yhsy3c7keqyftf3c98ut"); // default:
-UNSUPPORTED("7f9nr53m374zf5jnncru7yfn6"); // break;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("1ju3i4hja8fc5wwdkk9ed70t0"); // gvusershape_file_release(us);
-UNSUPPORTED("6ovs68xjm9urfsh1qtosv57gi"); // (*(((Dt_t*)(ImageDict))->searchf))((ImageDict),(void*)(us),0000001);
-UNSUPPORTED("e7wyuaoyszuqilaizfjv1mnp9"); // return us;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("7xahvc82av8lspjlm80i6ycqx"); // gvusershape_file_release(us);
-UNSUPPORTED("2iqrgjc97xskxvw6791yf0sl7"); // return us;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1uc6t1ylgvem0d3xb73wkh6k5
-// point gvusershape_size_dpi (usershape_t* us, pointf dpi)
-public static Object gvusershape_size_dpi(Object... arg) {
-UNSUPPORTED("5vjx3ewef6ht20ld1et4ghr4y"); // point
-UNSUPPORTED("5mxbu6cb95ay6dfs0i5n8icbs"); // gvusershape_size_dpi (usershape_t* us, pointf dpi)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("e5r3mj8btrkw973m7l0rritko"); // point rv;
-UNSUPPORTED("6n6sowowfpx2bppltl0zu5v7v"); // if (!us) {
-UNSUPPORTED("4zusj5p9eg9pazvp0px1fxvhy"); // rv.x = rv.y = -1;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("1nyzbeonram6636b1w955bypn"); // else {
-UNSUPPORTED("8egqtg148lkga2f8fnti0xikl"); // if (us->dpi != 0) {
-UNSUPPORTED("appsmczgq79si2bttb9rrlf1n"); // dpi.x = dpi.y = us->dpi;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("8z1a50vlhe7l1e7lnn7h5r90w"); // rv.x = us->w * 72 / dpi.x;
-UNSUPPORTED("b8wlsi5z8klt27ehe7vr9ue61"); // rv.y = us->h * 72 / dpi.y;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("v7vqc9l7ge2bfdwnw11z7rzi"); // return rv;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1vqiwf4q9iqmxqvd9e5qa1vo7
-// point gvusershape_size(graph_t * g, char *name)
-public static Object gvusershape_size(Object... arg) {
-UNSUPPORTED("3a8kgtxwhe9qi1f5wde0npt4d"); // point gvusershape_size(graph_t * g, char *name)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("e5r3mj8btrkw973m7l0rritko"); // point rv;
-UNSUPPORTED("aj7pw6lpv6z6nan96bx4pdfu2"); // pointf dpi;
-UNSUPPORTED("114dkd9d0mrkmtgl0ncfy2y88"); // static char* oldpath;
-UNSUPPORTED("709e07k0mmaqqdi3botr9zj87"); // usershape_t* us;
-UNSUPPORTED("d5ucq7enfbvarib2hwpi6y9qi"); // /* no shape file, no shape size */
-UNSUPPORTED("crs7cps8buaugcwtbezaqxd0q"); // if (!name || (*name == '\0')) {
-UNSUPPORTED("4zusj5p9eg9pazvp0px1fxvhy"); // rv.x = rv.y = -1;
-UNSUPPORTED("cs1ejkx9cw658cl8cagdzqrzm"); // return rv;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("24me4s4cte11xoie4uxxwajbs"); // if (!HTTPServerEnVar && (oldpath != Gvimagepath)) {
-UNSUPPORTED("ba3zx115acxf5hiob55lfwvhd"); // oldpath = Gvimagepath;
-UNSUPPORTED("63hyc3s3c95h5g1lp6aypzd8k"); // if (ImageDict) {
-UNSUPPORTED("50x4kwt6y5jkwbeqmhvki188q"); // dtclose(ImageDict);
-UNSUPPORTED("75t9qfgcu2fz0o59mjqh5rruv"); // ImageDict = (void *)0;
-UNSUPPORTED("flupwh3kosf3fkhkxllllt1"); // }
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("d77jz2hp035qgnn72uyy7evkj"); // if ((dpi.y = GD_drawing(g)->dpi) >= 1.0)
-UNSUPPORTED("8kboj4mypdab20ax7qfuq8oyp"); // dpi.x = dpi.y;
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("6buslnzh8a0nuwlk9wkfaytt8"); // dpi.x = dpi.y = (double)DEFAULT_DPI;
-UNSUPPORTED("16h3qy8ek57tauhtrw8xkodar"); // us = gvusershape_open (name);
-UNSUPPORTED("6tq0lkl6cmjltetu68liok738"); // rv = gvusershape_size_dpi (us, dpi);
-UNSUPPORTED("v7vqc9l7ge2bfdwnw11z7rzi"); // return rv;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-}
diff -Nru plantuml-1.2017.15/src/gen/lib/gvc/regex_win32__c.java plantuml-1.2018.9/src/gen/lib/gvc/regex_win32__c.java
--- plantuml-1.2017.15/src/gen/lib/gvc/regex_win32__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/gvc/regex_win32__c.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,3083 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info: http://plantuml.com
- *
- * If you like this project or if you find it useful, you can support us at:
- *
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- *
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- *
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- *
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- *
- * You may obtain a copy of the License at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package gen.lib.gvc;
-import static smetana.core.Macro.UNSUPPORTED;
-
-public class regex_win32__c {
-//1 11gt8s6kgcau21nr404v703de
-// static char re_syntax_table[256]
-
-
-
-
-//3 70j25rmarcwvzsh361zahv8zo
-// static void init_syntax_once ()
-public static Object init_syntax_once(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("efoxnnabz2ejqjq7yhilggwkl"); // init_syntax_once ()
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("ch8iyg809c0lyd0bc1ytqve9u"); // register int c;
-UNSUPPORTED("e5h3t56qntljcivxieh5a2mkl"); // static int done = 0;
-UNSUPPORTED("97t7ymgg630qac6285iprjw9v"); // if (done)
-UNSUPPORTED("z22f11bf96kkfe4raxc9v85x"); // return;
-UNSUPPORTED("9t38w19yl5jyjw7oodb9irryl"); // bzero (re_syntax_table, sizeof re_syntax_table);
-UNSUPPORTED("2rmhh76mmq03za3zgh7h64oxo"); // for (c = 'a'; c <= 'z'; c++)
-UNSUPPORTED("c9iqf6ajwc71dgjf9wrkrmbc4"); // re_syntax_table[c] = 1;
-UNSUPPORTED("7su4oyfxw838uiaf1heiygrem"); // for (c = 'A'; c <= 'Z'; c++)
-UNSUPPORTED("c9iqf6ajwc71dgjf9wrkrmbc4"); // re_syntax_table[c] = 1;
-UNSUPPORTED("3204uyvac8xoymt69hx2jb6xy"); // for (c = '0'; c <= '9'; c++)
-UNSUPPORTED("c9iqf6ajwc71dgjf9wrkrmbc4"); // re_syntax_table[c] = 1;
-UNSUPPORTED("bh45yjprswi5um0lyt9x4oony"); // re_syntax_table['_'] = 1;
-UNSUPPORTED("2py1y9xsuhv2b6cmhyzmcm7c5"); // done = 1;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-//1 cnkdb29e6yd10874mh5xc3onb
-// typedef long int s_reg_t
-
-
-//1 112kj8zza71a63rts3ariqovo
-// typedef unsigned long int active_reg_t
-
-
-//1 5mb2m65nd4m3w2de4v3md7o7m
-// typedef unsigned long int reg_syntax_t
-
-
-//1 289hb08yhe1j84wgbo0riknbd
-// extern reg_syntax_t re_syntax_options
-
-
-//1 3tctp51mbz3u1lyv5hope3jn4
-// typedef int regoff_t
-
-
-//1 5bxw12pxo297kjn20mqjfmb86
-// reg_syntax_t re_syntax_options
-
-
-
-
-//3 cxgvt7ypgdfqf2pew3m9adw9i
-// reg_syntax_t re_set_syntax(reg_syntax_t syntax)
-public static Object re_set_syntax(Object... arg) {
-UNSUPPORTED("1jmrr8fkrd2tsxzkjzybt7zfh"); // reg_syntax_t
-UNSUPPORTED("54rdixdzkwy1r5i8yfr9pfenx"); // re_set_syntax(reg_syntax_t syntax)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8mpejiyi92887r7wji6mys7nq"); // reg_syntax_t ret = re_syntax_options;
-UNSUPPORTED("4kgq73hxpobga7t16qgh5znpe"); // re_syntax_options = syntax;
-UNSUPPORTED("f3b7mj138albdr4lodyomke0z"); // return ret;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-//1 4vl073wk5uvf75of82q0v5yyo
-// static const char *re_error_msgid[] =
-
-
-//1 1nsczrbp8olzcxwsty8y22p1n
-// static int re_max_failures = 20000
-
-
-//1 bktlq1f2qk5dg76humjskteaa
-// static char reg_unset_dummy
-
-
-//1 1lj2324om1rijb97q9h9lxrhv
-// typedef unsigned regnum_t
-
-
-//1 e3zkpgg5cfqoq1zcfbcl2p5au
-// typedef long pattern_offset_t
-
-
-
-
-//3 b8oct2odjhnzacejd6swmozqo
-// static reg_errcode_t regex_compile (const char *pattern, size_t size, reg_syntax_t syntax, struct re_pattern_buffer *bufp)
-public static Object regex_compile(Object... arg) {
-UNSUPPORTED("9aerjmw5n52ektwk47t1r9bh0"); // static reg_errcode_t
-UNSUPPORTED("d6mg3ls5pg233p4i2fdv7ex1n"); // regex_compile (const char *pattern,
-UNSUPPORTED("6t71eiupt12wdbfduq8n5i2sz"); // size_t size,
-UNSUPPORTED("rg73gczoqylzcinp4bt2p1bw"); // reg_syntax_t syntax,
-UNSUPPORTED("86tpwausdjloqigvxe0g3anqv"); // struct re_pattern_buffer *bufp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("7mnubzvdt62l8vdiefqprs10u"); // /* We fetch characters from PATTERN here. Even though PATTERN is
-UNSUPPORTED("a1g4ovz742smqh486dhwytetq"); // `char *' (i.e., signed), we declare these variables as unsigned, so
-UNSUPPORTED("6yz29a8qermrzbhvqskuno14k"); // they can be reliably used as array indices. */
-UNSUPPORTED("9zgwtw1nsbdz6hcmyfrgkt63h"); // register unsigned char c, c1;
-UNSUPPORTED("4z9j463uvcrdj4sj8xj9ye9py"); // /* A random temporary spot in PATTERN. */
-UNSUPPORTED("7ccacvizh7wnu163gfkc81hu9"); // const char *p1;
-UNSUPPORTED("a293r2jyasseioor4io0pp504"); // /* Points to the end of the buffer, where we should append. */
-UNSUPPORTED("5o1tyy96cneoiw799jnb2n7ke"); // register unsigned char *b;
-UNSUPPORTED("cb629v9wydhjaoevjdzc89oy7"); // /* Keeps track of unclosed groups. */
-UNSUPPORTED("dgr9dbgbyc1ook38b1euoeouv"); // compile_stack_type compile_stack;
-UNSUPPORTED("39kpylizmi208i8v5yv2jhjp1"); // /* Points to the current (ending) position in the pattern. */
-UNSUPPORTED("9mu7yzuommm5kljxb28ceesow"); // const char *p = pattern;
-UNSUPPORTED("9ok1q4b2nv6m90q14x6i0k0vm"); // const char *pend = pattern + size;
-UNSUPPORTED("3oga1grlge5vw6xitb7bzcjw9"); // /* How to translate the characters in the pattern. */
-UNSUPPORTED("b6qhkmvrybk31a74eyxl9sf73"); // char * translate = bufp->translate;
-UNSUPPORTED("34h9x8riezst40pxo4ww0500r"); // /* Address of the count-byte of the most recently inserted `exactn'
-UNSUPPORTED("a8lirzoby6qul9ds74xai8gbs"); // command. This makes it possible to tell if a new exact-match
-UNSUPPORTED("6w2dibeuk4g54m7pwlej7e8g8"); // character can be added to that command or if the character requires
-UNSUPPORTED("atv0mvbd2maopv2ing97xuaph"); // a new `exactn' command. */
-UNSUPPORTED("s22nw5te3tpx7wkcpookrrve"); // unsigned char *pending_exact = 0;
-UNSUPPORTED("er4ntnybigvcvnva5ls2gkx9f"); // /* Address of start of the most recently finished expression.
-UNSUPPORTED("d9z7cp97wfgynilwmgxdn4w5p"); // This tells, e.g., postfix * where to find the start of its
-UNSUPPORTED("cwisfez4xccc9t277piikcz7u"); // operand. Reset at the beginning of groups and alternatives. */
-UNSUPPORTED("5319mhfghffljm52aipkegz7i"); // unsigned char *laststart = 0;
-UNSUPPORTED("asyqn8tnmhbn0u8yih4eowlsv"); // /* Address of beginning of regexp, or inside of last group. */
-UNSUPPORTED("2prv77rl1a0ic6cloa505n74"); // unsigned char *begalt;
-UNSUPPORTED("1mpmicgb0aqvs4efkuf1423bb"); // /* Place in the uncompiled pattern (i.e., the {) to
-UNSUPPORTED("6vlkvivbip6585ngqifn0yut3"); // which to go back if the interval is invalid. */
-UNSUPPORTED("dhc5wj4xmde53jd8j5mmpspo2"); // const char *beg_interval;
-UNSUPPORTED("3gbwrgdnq67nw2ais7b1oaood"); // /* Address of the place where a forward jump should go to the end of
-UNSUPPORTED("39t3zafmxkdw0y4k5jpg705xl"); // the containing expression. Each alternative of an `or' -- except the
-UNSUPPORTED("7ax9rzx6regnwitqwud6fas5h"); // last -- ends with a forward jump of this sort. */
-UNSUPPORTED("c8bejewn623onq21mfqd22e2w"); // unsigned char *fixup_alt_jump = 0;
-UNSUPPORTED("a0p6z20zonf6yhyd6u7i62l1f"); // /* Counts open-groups as they are encountered. Remembered for the
-UNSUPPORTED("f3mw4fx5ayqshia0u0wfwq612"); // matching close-group on the compile stack, so the same register
-UNSUPPORTED("albygnk4x6lv0oonnbwcx9zse"); // number is put in the stop_memory as the start_memory. */
-UNSUPPORTED("1jexufhhoiubt850z3ndj8ej5"); // regnum_t regnum = 0;
-UNSUPPORTED("7481cz4i3vyo797cewvok0k4c"); // /* Initialize the compile stack. */
-UNSUPPORTED("ao1ytyamhvicfeyzqsidalxsk"); // compile_stack.stack = ((compile_stack_elt_t *) malloc ((32) * sizeof (compile_stack_elt_t)));
-UNSUPPORTED("3pmfpvmkfjp9kx78cvcxd6cpy"); // if (compile_stack.stack == (void *)0)
-UNSUPPORTED("ex5zj292r0bm8ons2oenc7d53"); // return REG_ESPACE;
-UNSUPPORTED("6rth766rpftr2lf9tsj3ipcy3"); // compile_stack.size = 32;
-UNSUPPORTED("7l76n0edqpze4bfgwt0jnlr23"); // compile_stack.avail = 0;
-UNSUPPORTED("4d5adh0083zve5yjpmlxli8h1"); // /* Initialize the pattern buffer. */
-UNSUPPORTED("6qgussdbr9ruavpzcr0y58ts9"); // bufp->syntax = syntax;
-UNSUPPORTED("c9tm2xzkehz9kbyrn2bkv3dwg"); // bufp->fastmap_accurate = 0;
-UNSUPPORTED("91jbv9it8qe6sah0sxn6nd4w2"); // bufp->not_bol = bufp->not_eol = 0;
-UNSUPPORTED("3rafz8q4yl9qbchg80xvodlsy"); // /* Set `used' to zero, so that if we return an error, the pattern
-UNSUPPORTED("b6wnwmphpmnza6rdw0x8yy5kj"); // printer (for debugging) will think there's no pattern. We reset it
-UNSUPPORTED("8xe4i97w2l1mmth54di1u7rrd"); // at the end. */
-UNSUPPORTED("b65vrlaj7a5mdhjx1m4vm2kzu"); // bufp->used = 0;
-UNSUPPORTED("5v5ffm48jpbjz5t7q75z95oqu"); // /* Always count groups, whether or not bufp->no_sub is set. */
-UNSUPPORTED("fcycoe4nhtup93j74aqh2jlu"); // bufp->re_nsub = 0;
-UNSUPPORTED("57cfyb08w4wnczh1o759ayl4l"); // /* Initialize the syntax table. */
-UNSUPPORTED("eoiuv77ltbli38ssdpi2gptkk"); // init_syntax_once ();
-UNSUPPORTED("f0l0ry0lbt2gj40a13217dx11"); // if (bufp->allocated == 0)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("eblz85b36y9pboxm6zt66xr2h"); // if (bufp->buffer)
-UNSUPPORTED("53s3p7apfgsn3pkcwkqznue34"); // { /* If zero allocated, but buffer is non-null, try to realloc
-UNSUPPORTED("3mwc7vljmgej2pox1thi77h1t"); // enough space. This loses if buffer's address is bogus, but
-UNSUPPORTED("2hni8mwtvtzlrz7iztjmo1gkm"); // that is the user's responsibility. */
-UNSUPPORTED("4soy7dr6bhuvmx7k9nk1d0ql8"); // ((bufp->buffer) = (unsigned char *) realloc (bufp->buffer, (32) * sizeof (unsigned char)));
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("17v9yg0xtevf2uu5v3tmolocu"); // { /* Caller did not allocate a buffer. Do it for them. */
-UNSUPPORTED("6fravsvvcv922fixqgd9sfp3z"); // bufp->buffer = ((unsigned char *) malloc ((32) * sizeof (unsigned char)));
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("4as6xhocbf55x8cvv0z11to2x"); // if (!bufp->buffer) return (free (compile_stack.stack), REG_ESPACE);
-UNSUPPORTED("af932qywpz9q6n0xek5lztd84"); // bufp->allocated = 32;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("5mg602ef37gzyyfswwutbcqs8"); // begalt = b = bufp->buffer;
-UNSUPPORTED("89ht4djrhvh6xphi9py7k3pam"); // /* Loop through the uncompiled pattern until we're at the end. */
-UNSUPPORTED("5r7butg5genmj9dzegcwao4et"); // while (p != pend)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("42vbjcv24l0oaozyfwaw4j5nc"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("719kmsx403baae0d0ox2gyi3a"); // switch (c)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("32y7yv66mqjhrdqaf9ck9oi4y"); // case '^':
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("3j5jurrtqcxdphc3jlcg8lu39"); // if ( /* If at start of pattern, it's an operator. */
-UNSUPPORTED("acrtuah53gidq3uywocguoav"); // p == pattern + 1
-UNSUPPORTED("bs7cbfp1wd9jknqlj749u3bj3"); // /* If context independent, it's an operator. */
-UNSUPPORTED("9sznx5vvd3orgqcisdh571wv9"); // || syntax & (((((unsigned long int) 1) << 1) << 1) << 1)
-UNSUPPORTED("7gzhx2l4j1gaba7epz2kdwhlj"); // /* Otherwise, depends on what's come before. */
-UNSUPPORTED("10earmgj12izv0tbj9aimxmji"); // || at_begline_loc_p (pattern, p, syntax))
-UNSUPPORTED("clssp7ivct1ku99qbhyb7dtzy"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (begline); } while (0);
-UNSUPPORTED("euvqyl9ihnvv92dr2v2zshlo"); // else
-UNSUPPORTED("dxpbgmfj2w220xy1q99fxje94"); // goto normal_char;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("9ogqrievi7oirs7cd4cs33egg"); // case '$':
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("hai791a97htfukh6iawb46oz"); // if ( /* If at end of pattern, it's an operator. */
-UNSUPPORTED("a0h309uru3crtdmsxpji7m2j3"); // p == pend
-UNSUPPORTED("bs7cbfp1wd9jknqlj749u3bj3"); // /* If context independent, it's an operator. */
-UNSUPPORTED("9sznx5vvd3orgqcisdh571wv9"); // || syntax & (((((unsigned long int) 1) << 1) << 1) << 1)
-UNSUPPORTED("2iqqtdvj90ata5pvx2o27gw4s"); // /* Otherwise, depends on what's next. */
-UNSUPPORTED("67wgd1do640yncemi3ce0qj90"); // || at_endline_loc_p (p, pend, syntax))
-UNSUPPORTED("35lv6vfpgmavt421g5ug4tdbc"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (endline); } while (0);
-UNSUPPORTED("euvqyl9ihnvv92dr2v2zshlo"); // else
-UNSUPPORTED("dxpbgmfj2w220xy1q99fxje94"); // goto normal_char;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("4yw8evd0fubkfck5nezds5dhn"); // case '+':
-UNSUPPORTED("f0rooqc2e80a2plohrq4c3c91"); // case '?':
-UNSUPPORTED("1ku9g8vhwccbudpz9e300f03z"); // if ((syntax & (((unsigned long int) 1) << 1))
-UNSUPPORTED("7sxu3x1nkq0rp14piw14s336e"); // || (syntax & ((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("ak9il2l94xwmflwso0qxuq07i"); // handle_plus:
-UNSUPPORTED("77sjlj9q2m2icdnuxqgd896ux"); // case '*':
-UNSUPPORTED("bog9pqkld0m0t6ypotbesbb2s"); // /* If there is no previous pattern... */
-UNSUPPORTED("6horrl50ttv3j0vlv0d550qe5"); // if (!laststart)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("8qgst65bgbkg69wykq7paitn0"); // if (syntax & (((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("4zp3pjt3o3sewewdrckac5e7t"); // return (free (compile_stack.stack), REG_BADRPT);
-UNSUPPORTED("2ji76vo0qsyt5ldqyext7tdsg"); // else if (!(syntax & ((((((unsigned long int) 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("2vnh9foicn3ppcbpvb6hdon87"); // /* Are we optimizing this jump? */
-UNSUPPORTED("60ry57pj80rgxp87816o6vpy2"); // boolean keep_string_p = 0;
-UNSUPPORTED("6qwgte4fwcf1xqfiuge2ssau3"); // /* 1 means zero (many) matches is allowed. */
-UNSUPPORTED("7z75b80h28y72skvw3v96x2y5"); // char zero_times_ok = 0, many_times_ok = 0;
-UNSUPPORTED("a3pm3eb949njdi5ypawoqc46v"); // /* If there is a sequence of repetition chars, collapse it
-UNSUPPORTED("dovcg85ak5c45w4j2nz1vphpt"); // down to just one (the right one). We can't combine
-UNSUPPORTED("enmqxu33e2oz4v7ad1h3regi1"); // interval operators with these because of, e.g., `a{2}*',
-UNSUPPORTED("2ic453t1t5s0w63b328mvtw1h"); // which should only match an even number of `a's. */
-UNSUPPORTED("1nx31c51hb376ceydwsae35jq"); // for (;;)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("1998skt4l5yp1v1sml3xtum0t"); // zero_times_ok |= c != '+';
-UNSUPPORTED("d4p0t1ujgqb32xcytuivs2m0m"); // many_times_ok |= c != '?';
-UNSUPPORTED("891uwttbfnv5bc58wpbg1fhgl"); // if (p == pend)
-UNSUPPORTED("1fg4xctmq8acy7m0oob45guaz"); // break;
-UNSUPPORTED("1ph6d2iv2trnwdx326iuetr4g"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("do4ccpdwh7h97tg1nxsm8tt4d"); // if (c == '*'
-UNSUPPORTED("b9cokjueamyv69axw1ekph5qa"); // || (!(syntax & (((unsigned long int) 1) << 1)) && (c == '+' || c == '?')))
-UNSUPPORTED("c6tldeu5ffnykyfto7hi9ixau"); // ;
-UNSUPPORTED("4zyx7dzchkorh28bz90x76p2g"); // else if (syntax & (((unsigned long int) 1) << 1) && c == '\\')
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("e9xhg2qnbm79uk0vrkf792u29"); // if (p == pend) return (free (compile_stack.stack), REG_EESCAPE);
-UNSUPPORTED("518hxi8xgn35zetedpma2oo2k"); // do {if (p == pend) return REG_EEND; c1 = (unsigned char) *p++; if (translate) c1 = (unsigned char) translate[c1]; } while (0);
-UNSUPPORTED("31364dtwzgpxty30b38zc4zkj"); // if (!(c1 == '+' || c1 == '?'))
-UNSUPPORTED("el767oi7fhlc4apdbx8dsvnk6"); // {
-UNSUPPORTED("2t22wkw5f3ffgm4ga51u5nrej"); // p--;
-UNSUPPORTED("2t22wkw5f3ffgm4ga51u5nrej"); // p--;
-UNSUPPORTED("brutz3uly6r5jyimug3eb5y9n"); // break;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("e31jqqw74li41ohhn86f6dom7"); // c = c1;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("5cyajgw0lqe5reqenlh6er6vk"); // p--;
-UNSUPPORTED("7vckzntfuo1ibi8r53gsfg8al"); // break;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("5usbancvr06c7aua10b6rnz2v"); // /* If we get here, we found another repeat character. */
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("4z09n9ulcj74vli0m0kclo5i"); // /* Star, etc. applied to an empty pattern is equivalent
-UNSUPPORTED("1ixkehs9qjp0ehix96jklbcfm"); // to an empty pattern. */
-UNSUPPORTED("60xmx571g6e7xq9uvs63uu1eq"); // if (!laststart)
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("hi54423z7c97klm7jyc2i54y"); // /* Now we know whether or not zero matches is allowed
-UNSUPPORTED("cdhyalprzmam31a4ky61gdsu5"); // and also whether or not two or more matches is allowed. */
-UNSUPPORTED("82umz1mp8urx9qjjtqh65sk5"); // if (many_times_ok)
-UNSUPPORTED("8omf20fupbos0ngb4nxaz3sj"); // { /* More than one repetition is allowed, so put in at the
-UNSUPPORTED("6vwybrs5isd11ynby19imvgnc"); // end a backward relative jump from `b' to before the next
-UNSUPPORTED("7k3po89z1y12gwpxracwd1zwr"); // jump we're going to put in below (which jumps from
-UNSUPPORTED("497rlrbp2r6kokgq8fic5z8li"); // laststart to after this jump).
-UNSUPPORTED("elt3pujxvh1j9wbns2s7urafl"); // But if we are at the `*' in the exact sequence `.*\n',
-UNSUPPORTED("aq9r7pdk4mwsuo46v85xd7nle"); // insert an unconditional jump backwards to the .,
-UNSUPPORTED("afees40xo77whl3qvfrsjg0p2"); // instead of the beginning of the loop. This way we only
-UNSUPPORTED("2f6wchn2e63ok4vso04jpeozp"); // push a failure point once, instead of every time
-UNSUPPORTED("2mne6btvrwz6ly84kpb5k8fz2"); // through the loop. */
-UNSUPPORTED("9fy78dg2q1uu4c2t1zsyaestf"); // ;
-UNSUPPORTED("7osfsgzoickbv6hh4uet35ib8"); // /* Allocate the space for the jump. */
-UNSUPPORTED("38dw1m55ji4uptkiga2iwgab7"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("2v0jxylpfaawr8vdl2dov0us5"); // /* We know we are not at the first character of the pattern,
-UNSUPPORTED("djrrtgjb76xh1l5pw5u4kxcnv"); // because laststart was nonzero. And we've already
-UNSUPPORTED("5f4ly8ng2ytcbc7ypdbpa8e11"); // incremented `p', by the way, to be the character after
-UNSUPPORTED("4as3ltw89z2kch0mrty7q58ey"); // the `*'. Do we have to do something analogous here
-UNSUPPORTED("d3grtqmpebse1zxznnwl3jm7c"); // for null bytes, because of RE_DOT_NOT_NULL? */
-UNSUPPORTED("vbl73uentmynsl9r6evk8ulc"); // if ((translate ? (char) translate[(unsigned char) (*(p - 2))] : (*(p - 2))) == (translate ? (char) translate[(unsigned char) ('.')] : ('.'))
-UNSUPPORTED("3lbv5kv4tdnxzqobvqv6gz12l"); // && zero_times_ok
-UNSUPPORTED("1ykhfelz1q80iguwwtohwqvm2"); // && p < pend && (translate ? (char) translate[(unsigned char) (*p)] : (*p)) == (translate ? (char) translate[(unsigned char) ('\n')] : ('\n'))
-UNSUPPORTED("bxrp4x7jxoo38mvd9ft3k5db"); // && !(syntax & ((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("741cloh2pdrplimiiruq6t4ct"); // { /* We have .*\n. */
-UNSUPPORTED("317e9s7jnbmgql8x4fdezgmv0"); // store_op1 (jump, b, (int) ((laststart) - (b) - 3));
-UNSUPPORTED("8ryrgqjl7v6ohb01o5em2psns"); // keep_string_p = 1;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("3ksp6xs2pd8hkq033e06g4a00"); // /* Anything else. */
-UNSUPPORTED("4ab5zrwtdkltgbt8onvdet2r1"); // store_op1 (maybe_pop_jump, b, (int) ((laststart - 3) - (b) - 3));
-UNSUPPORTED("f4gsd1otghvhc8czjmw8qq776"); // /* We've added more stuff to the buffer. */
-UNSUPPORTED("7hdmsj9mi4jwnv83ar1ez4kwn"); // b += 3;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("7htghz4zhsf1uqpwp6ytvbhih"); // /* On failure, jump from laststart to b + 3, which will be the
-UNSUPPORTED("c630s54imd7p1b0raogcspf6p"); // end of the buffer after this jump is inserted. */
-UNSUPPORTED("5i16nim58sq8mvfckzqrj7q7e"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("e1gqwwg06ek9zwsxdqko22t8"); // insert_op1 (keep_string_p ? on_failure_keep_string_jump
-UNSUPPORTED("od51xm1io9lvsdmwr60fm9nx"); // : on_failure_jump,
-UNSUPPORTED("demgpwduvdu6c55lzwftle76m"); // laststart, (int) ((b + 3) - (
-UNSUPPORTED("a887hw7h3lz3jofwz10uxjcdp"); // laststart) - 3), b);
-UNSUPPORTED("1t3kkww9qyeskw70p028ll4r1"); // pending_exact = 0;
-UNSUPPORTED("1jpgahganw1gip7gnwn5n2vx6"); // b += 3;
-UNSUPPORTED("38n9qcy0vfr2upedrm1d6by5o"); // if (!zero_times_ok)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("15rx6swjp6qikvp0jmiy5rm4m"); // /* At least one repetition is required, so insert a
-UNSUPPORTED("5xq4uy1msul1zhp9ptz49bbvn"); // `dummy_failure_jump' before the initial
-UNSUPPORTED("3q62p85szhotzr22iijxb1lzh"); // `on_failure_jump' instruction of the loop. This
-UNSUPPORTED("5ukburrf5iegq4x208czcfxp7"); // effects a skip over that instruction the first time
-UNSUPPORTED("9zr6wiepyct1g2798ohlu821l"); // we hit that loop. */
-UNSUPPORTED("38dw1m55ji4uptkiga2iwgab7"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("caftp211etknfq81tggr97kq3"); // insert_op1 (dummy_failure_jump, laststart, (int) ((laststart + 6) - (laststart) - 3), b);
-UNSUPPORTED("7hdmsj9mi4jwnv83ar1ez4kwn"); // b += 3;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("a2evu0k4b91gqn1jmn3a0jwzw"); // case '.':
-UNSUPPORTED("5nlf7z9fx92ejvc0jjc27l3ks"); // laststart = b;
-UNSUPPORTED("14r433r50a5mz9kdbq4siwjqy"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (anychar); } while (0);
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("7r93xgyv26x925aap3ia8ymon"); // case '[':
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("2dyj1s6d9ag4nvt1f1crrdjfn"); // boolean had_char_class = 0;
-UNSUPPORTED("4a3jhscbb3cd0w52yk8g7bkhm"); // if (p == pend) return (free (compile_stack.stack), REG_EBRACK);
-UNSUPPORTED("18lthbap52pmrc5qc0gdkqazi"); // /* Ensure that we have enough space to push a charset: the
-UNSUPPORTED("64im3as1hhwe4tfm27p855icz"); // opcode, the length count, and the bitset; 34 bytes in all. */
-UNSUPPORTED("dtfdonlqdk0z7gsn1s36st33w"); // while ((unsigned long) (b - bufp->buffer + (34)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("8dx5294ey8snj5idlltwvrhb1"); // laststart = b;
-UNSUPPORTED("610aa188uk96qcj24orwjx8fs"); // /* We test `*p == '^' twice, instead of using an if
-UNSUPPORTED("5bc7brntk24ooxfmk1srxj8cb"); // statement, so we only need one BUF_PUSH. */
-UNSUPPORTED("f50kr5oskb25svx2g868njm8n"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (*p == '^' ? charset_not : charset); } while (0);
-UNSUPPORTED("8evba7dkivr9l77jkvcmqcwz8"); // if (*p == '^')
-UNSUPPORTED("6qmpdja8bt371mk2seyaa2gbr"); // p++;
-UNSUPPORTED("7cikubv9dt5tpzkohonns5grc"); // /* Remember the first position in the bracket expression. */
-UNSUPPORTED("ams11hw6png742la6sel3atlf"); // p1 = p;
-UNSUPPORTED("7xg1okqa5l3piclyijoek8ed8"); // /* Push the number of bytes in the bitmap. */
-UNSUPPORTED("attsgdtz0wo8uzzx0jzzakd9s"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) ((1 << 8) / 8); } while (0);
-UNSUPPORTED("9i1ubvjzgw51kylobwxvkoguf"); // /* Clear the whole map. */
-UNSUPPORTED("3yt3lfhbs0hx9w9ci87vt4p51"); // bzero (b, (1 << 8) / 8);
-UNSUPPORTED("2m8299zx4gtxg4ncikd476gkx"); // /* charset_not matches newline according to a syntax bit. */
-UNSUPPORTED("16flegxkvnil6me4t0kb73hcj"); // if ((re_opcode_t) b[-2] == charset_not
-UNSUPPORTED("44gymzta58w37g7hbxz29z8ht"); // && (syntax & ((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("bm4wsfgshzu6e47pvkdqzgoz6"); // (b[((unsigned char) ('\n')) / 8] |= 1 << (((unsigned char) '\n') % 8));
-UNSUPPORTED("2dle8bszohkrok9ivamd6wqu8"); // /* Read in characters and ranges, setting map bits. */
-UNSUPPORTED("1nx31c51hb376ceydwsae35jq"); // for (;;)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("6jfb28a8r43ndwdevd7rrjlb2"); // if (p == pend) return (free (compile_stack.stack), REG_EBRACK);
-UNSUPPORTED("1ph6d2iv2trnwdx326iuetr4g"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("djf8gjrarnydrvlu8tzndsd4t"); // /* \ might escape characters inside [...] and [^...]. */
-UNSUPPORTED("89w50n0xz0xx1wgf8ls0sce25"); // if ((syntax & ((unsigned long int) 1)) && c == '\\')
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("e9xhg2qnbm79uk0vrkf792u29"); // if (p == pend) return (free (compile_stack.stack), REG_EESCAPE);
-UNSUPPORTED("518hxi8xgn35zetedpma2oo2k"); // do {if (p == pend) return REG_EEND; c1 = (unsigned char) *p++; if (translate) c1 = (unsigned char) translate[c1]; } while (0);
-UNSUPPORTED("d1ssg2hoazmd76m91z40sp5sn"); // (b[((unsigned char) (c1)) / 8] |= 1 << (((unsigned char) c1) % 8));
-UNSUPPORTED("cke4ze78n6mw03utm8hpk0ozq"); // continue;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("bvll4h37ech1nvv3p44tc97ia"); // /* Could be the end of the bracket expression. If it's
-UNSUPPORTED("464yveauwiujz5tkl76ikld18"); // not (i.e., when the bracket expression is `[]' so
-UNSUPPORTED("ekv9yerdywogeillz767k3yq9"); // far), the ']' character bit gets set way below. */
-UNSUPPORTED("39qeut34k7f0lyjj4z495n6am"); // if (c == ']' && p != p1 + 1)
-UNSUPPORTED("1fg4xctmq8acy7m0oob45guaz"); // break;
-UNSUPPORTED("d3v48zs419s4mxk9yyv5xgccj"); // /* Look ahead to see if it's a range when the last thing
-UNSUPPORTED("65vqnx3pinl0sxqecc7937imc"); // was a character class. */
-UNSUPPORTED("8dtiybchqrzjmzzltkvknsq96"); // if (had_char_class && c == '-' && *p != ']')
-UNSUPPORTED("8zurthmteo7b71btgvw1ke4rg"); // return (free (compile_stack.stack), REG_ERANGE);
-UNSUPPORTED("d3v48zs419s4mxk9yyv5xgccj"); // /* Look ahead to see if it's a range when the last thing
-UNSUPPORTED("5wt9bnagn7y3isqyb5kxh04s7"); // was a character: if this is a hyphen not at the
-UNSUPPORTED("342gxn589rm7wkuq6jbilt9fr"); // beginning or the end of a list, then it's the range
-UNSUPPORTED("8a0p71nhvq7jckckna5u4qr7t"); // operator. */
-UNSUPPORTED("bfxjivoy25rc3bw7qrspkzv1k"); // if (c == '-'
-UNSUPPORTED("93mph3xo98uvv6qn8e4tbid15"); // && !(p - 2 >= pattern && p[-2] == '[')
-UNSUPPORTED("1ce2lptewofyiq5ojhwc5va79"); // && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
-UNSUPPORTED("5e843qj23bor49sf7nbcpwezc"); // && *p != ']')
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("f3s9czjbpp43p2benwj88e4vz"); // reg_errcode_t ret
-UNSUPPORTED("bgzy0fkxhr0j88bt28d2oeo7m"); // = compile_range (&p, pend, translate, syntax, b);
-UNSUPPORTED("6to7cm3b6s0m5pujlkqqm3m2x"); // if (ret != REG_NOERROR) return (free (compile_stack.stack), ret);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("65gxrs7y9lu8v93z6nz75m4ck"); // else if (p[0] == '-' && p[1] != ']')
-UNSUPPORTED("5av67x62ybjftr7suvc3tfqay"); // { /* This handles ranges made up of characters only. */
-UNSUPPORTED("cmimxguouw0qbcmhrejq3dnrm"); // reg_errcode_t ret;
-UNSUPPORTED("6th47hqx3651aqvqnkzfm9yhl"); // /* Move past the `-'. */
-UNSUPPORTED("518hxi8xgn35zetedpma2oo2k"); // do {if (p == pend) return REG_EEND; c1 = (unsigned char) *p++; if (translate) c1 = (unsigned char) translate[c1]; } while (0);
-UNSUPPORTED("8tyv3mj3db8ezfohi5j249qg9"); // ret = compile_range (&p, pend, translate, syntax, b);
-UNSUPPORTED("6to7cm3b6s0m5pujlkqqm3m2x"); // if (ret != REG_NOERROR) return (free (compile_stack.stack), ret);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("60ee1e25m2s16fec1vpvlz4n7"); // /* See if we're at the beginning of a possible character
-UNSUPPORTED("5paafwhmjbew6wm1r82cmglhi"); // class. */
-UNSUPPORTED("1fxr5b7xujuw4t8tdfwstlhb5"); // else if (syntax & ((((unsigned long int) 1) << 1) << 1) && c == '[' && *p == ':')
-UNSUPPORTED("c6rvznitpculxv2jbhy4ncxyq"); // { /* Leave room for the null. */
-UNSUPPORTED("35kxjv2sfddffc4bqeyh4imoc"); // char str[6 + 1];
-UNSUPPORTED("eqri2rfe7jnz1m2rij615jaj1"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("d4co4ddeumifnjey3eestnfzq"); // c1 = 0;
-UNSUPPORTED("4w2zfigedythaavjy46j6zdev"); // /* If pattern is `[[:'. */
-UNSUPPORTED("7eef052f6ws02kwwd07t2gogt"); // if (p == pend) return (free (compile_stack.stack), REG_EBRACK);
-UNSUPPORTED("6rl79w31o26w7y9v243bzntd1"); // for (;;)
-UNSUPPORTED("el767oi7fhlc4apdbx8dsvnk6"); // {
-UNSUPPORTED("5rs5zp1k5smyekvir9pcnto9c"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("5epbd4u9xrfpj6miw9wkaw3as"); // if (c == ':' || c == ']' || p == pend
-UNSUPPORTED("1xzx4vfazvv793wm3hh5e4ixz"); // || c1 == 6)
-UNSUPPORTED("1lzsscwayr2ygeagix6ouorzi"); // break;
-UNSUPPORTED("a6wcfy57u3wkrc8jiwpoxhutg"); // str[c1++] = c;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("6hm7an9ruv18077h9go7vsgf4"); // str[c1] = '\0';
-UNSUPPORTED("bi9fgjbp9y3y2pyuu9tszhyox"); // /* If isn't a word bracketed by `[:' and:`]':
-UNSUPPORTED("7nvg1ljm6ad0h7g7s60ej9uca"); // undo the ending character, the letters, and leave
-UNSUPPORTED("2272ea1yqp1bpznxgbrxbp00w"); // the leading `:' and `[' (but set bits for them). */
-UNSUPPORTED("5tqbx68w26ea5218a43fyowz3"); // if (c == ':' && *p == ']')
-UNSUPPORTED("el767oi7fhlc4apdbx8dsvnk6"); // {
-UNSUPPORTED("dicsp7memxlin76m5jtuhk6dv"); // int ch;
-UNSUPPORTED("74i3rk9pefjb3y4b7o4aa2iq9"); // boolean is_alnum = ((strcmp (str, "alnum") == 0));
-UNSUPPORTED("89wnjt7xu39ig5ibxfz800la7"); // boolean is_alpha = ((strcmp (str, "alpha") == 0));
-UNSUPPORTED("70u6gm5ko26rbqgsh5w8iswjq"); // boolean is_blank = ((strcmp (str, "blank") == 0));
-UNSUPPORTED("1aaohxjchuctfrlc9v29p77u8"); // boolean is_cntrl = ((strcmp (str, "cntrl") == 0));
-UNSUPPORTED("74upuhtioo8extzco95rwsrj8"); // boolean is_digit = ((strcmp (str, "digit") == 0));
-UNSUPPORTED("44vvyq4v0mo3kf1e60wcz5pq1"); // boolean is_graph = ((strcmp (str, "graph") == 0));
-UNSUPPORTED("ampk1k6gw3p7tnpd7rlk9zpbh"); // boolean is_lower = ((strcmp (str, "lower") == 0));
-UNSUPPORTED("dfcf36k8u7asts9g1790th87m"); // boolean is_print = ((strcmp (str, "print") == 0));
-UNSUPPORTED("94toygdeo23h0nswi5ypjemuj"); // boolean is_punct = ((strcmp (str, "punct") == 0));
-UNSUPPORTED("5gzado7yzz8iw3b7wmsnnv1c"); // boolean is_space = ((strcmp (str, "space") == 0));
-UNSUPPORTED("brptc46jbde0ytz2cf57z0qj9"); // boolean is_upper = ((strcmp (str, "upper") == 0));
-UNSUPPORTED("6y30d6k6j6v6mo0u34x84x7pi"); // boolean is_xdigit = ((strcmp (str, "xdigit") == 0));
-UNSUPPORTED("5xbajy2nf78y44rt7wqi0ipvw"); // if (!(((strcmp (str, "alpha") == 0)) || ((strcmp (str, "upper") == 0)) || ((strcmp (str, "lower") == 0)) || ((strcmp (str, "digit") == 0)) || ((strcmp (str, "alnum") == 0)) || ((strcmp (str, "xdigit") == 0)) || ((strcmp (str, "space") == 0)) || ((strcmp (str, "print") == 0)) || ((strcmp (str, "punct") == 0)) || ((strcmp (str, "graph") == 0)) || ((strcmp (str, "cntrl") == 0)) || ((strcmp (str, "blank") == 0))))
-UNSUPPORTED("9roq2o5jp44jioxvumhpzhasp"); // return (free (compile_stack.stack), REG_ECTYPE);
-UNSUPPORTED("b01volng00k0jszlwguip1za2"); // /* Throw away the ] at the end of the character
-UNSUPPORTED("6v4ad7tk28ej4z6x4p9zfn9ip"); // class. */
-UNSUPPORTED("5rs5zp1k5smyekvir9pcnto9c"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("ahygyv10li3nm82zryhpg9mbm"); // if (p == pend) return (free (compile_stack.stack), REG_EBRACK);
-UNSUPPORTED("e0htyvo32yvtsowvtr07q7jcw"); // for (ch = 0; ch < 1 << 8; ch++)
-UNSUPPORTED("ednrjrwumcyqj77ytrr2eszv"); // {
-UNSUPPORTED("3k2ocusl5iq9ds3ppdqj68572"); // /* This was split into 3 if's to
-UNSUPPORTED("9gbw8s1phg1eyew1sfpr5kp3f"); // avoid an arbitrary limit in some compiler. */
-UNSUPPORTED("2cntwsg5hxbdi0ckf9y8w0mnq"); // if ( (is_alnum && (1 && isalnum (ch)))
-UNSUPPORTED("1zgfij4s84eufjba2ozx3lkrk"); // || (is_alpha && (1 && isalpha (ch)))
-UNSUPPORTED("bqa0xuagje3ikuybu56a5lsfa"); // || (is_blank && ((ch) == ' ' || (ch) == '\t'))
-UNSUPPORTED("dnw7neodbiod4p16f06qsugzl"); // || (is_cntrl && (1 && iscntrl (ch))))
-UNSUPPORTED("6qfn7xakyg09tnfa2ie1sh8p6"); // (b[((unsigned char) (ch)) / 8] |= 1 << (((unsigned char) ch) % 8));
-UNSUPPORTED("6a1x5lr2tbh4dux8kqoyovq6z"); // if ( (is_digit && (1 && isdigit (ch)))
-UNSUPPORTED("6uh9v7mcu8jqpc8ab1xqdpupe"); // || (is_graph && (1 && isprint (ch) && !isspace (ch)))
-UNSUPPORTED("2kza3pwfg7co598ybwubyyjtb"); // || (is_lower && (1 && islower (ch)))
-UNSUPPORTED("2ve5o48kbom0zknpyyo4nrw8b"); // || (is_print && (1 && isprint (ch))))
-UNSUPPORTED("6qfn7xakyg09tnfa2ie1sh8p6"); // (b[((unsigned char) (ch)) / 8] |= 1 << (((unsigned char) ch) % 8));
-UNSUPPORTED("eu7igk6hg1s58sklwzk61h4b7"); // if ( (is_punct && (1 && ispunct (ch)))
-UNSUPPORTED("eu3t6ngjxiw3bd3n428dpndsz"); // || (is_space && (1 && isspace (ch)))
-UNSUPPORTED("cyrylgd8tsf5lm7q40ozat1u6"); // || (is_upper && (1 && isupper (ch)))
-UNSUPPORTED("6uhsgqbeke0ipkactcwfponfm"); // || (is_xdigit && (1 && isxdigit (ch))))
-UNSUPPORTED("6qfn7xakyg09tnfa2ie1sh8p6"); // (b[((unsigned char) (ch)) / 8] |= 1 << (((unsigned char) ch) % 8));
-UNSUPPORTED("d10pfpemohjrojtw32b9u288j"); // if ( translate && (is_upper || is_lower)
-UNSUPPORTED("dn91c7ek6aq14v8orwpui41nf"); // && ((1 && isupper (ch)) || (1 && islower (ch))))
-UNSUPPORTED("6qfn7xakyg09tnfa2ie1sh8p6"); // (b[((unsigned char) (ch)) / 8] |= 1 << (((unsigned char) ch) % 8));
-UNSUPPORTED("4mlmk54q1pd097btjgvhds4or"); // }
-UNSUPPORTED("377au4sk1ya757gr7n0hqcmrn"); // had_char_class = 1;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("61qf7b2jxc7j3knm5ts69f0b6"); // else
-UNSUPPORTED("el767oi7fhlc4apdbx8dsvnk6"); // {
-UNSUPPORTED("7m4co85wi9arl9dcdfqpb4za8"); // c1++;
-UNSUPPORTED("20tgbjihyvtowact7dzcr1ecf"); // while (c1--)
-UNSUPPORTED("8je1mldqzk080hkvqxenba16t"); // p--;
-UNSUPPORTED("48kiij4wie0njh1vtga7it2dv"); // (b[((unsigned char) ('[')) / 8] |= 1 << (((unsigned char) '[') % 8));
-UNSUPPORTED("dv206lne3atc9xm9yvrhv1ybg"); // (b[((unsigned char) (':')) / 8] |= 1 << (((unsigned char) ':') % 8));
-UNSUPPORTED("41vc3rnsrwhzg40t2l6ddpjfb"); // had_char_class = 0;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("nugbt1in6a1t1qaxqdyyi3ep"); // had_char_class = 0;
-UNSUPPORTED("17maz3hujafwurweozb151wdn"); // (b[((unsigned char) (c)) / 8] |= 1 << (((unsigned char) c) % 8));
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("ehzhyhula77mysp4xro2dci8t"); // /* Discard any (non)matching list bytes that are all 0 at the
-UNSUPPORTED("el3n9zylp6tlrb6d73napyvmy"); // end of the map. Decrease the map-length byte too. */
-UNSUPPORTED("5aojv97eoyl5m04xfurgaavwm"); // while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
-UNSUPPORTED("ajlocpcq3igxmb5gmsoqvv2es"); // b[-1]--;
-UNSUPPORTED("bhvngkxhzl8kmmso1yya535k3"); // b += b[-1];
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("6bh4kues0yl62d5yxc9atvjif"); // case '(':
-UNSUPPORTED("10vjrts0i5hyw8tlbrt0z7rxn"); // if (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("bmyrcl5ximm9vy0tneijgrytk"); // goto handle_open;
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("1e0dw1ejy35o3woadzbcsm7fr"); // case ')':
-UNSUPPORTED("10vjrts0i5hyw8tlbrt0z7rxn"); // if (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("3s6h8cwqnf4sxe6ctgnhnea58"); // goto handle_close;
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("e3rwmj3a70hs7pld4kwdx60mn"); // case '\n':
-UNSUPPORTED("70gx6eoougt8rlinl56yw83xr"); // if (syntax & (((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("5jivfhwm58xf3nhm2fe6mhe63"); // goto handle_alt;
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("4alxh05h1fjl2sladyp35v6wj"); // case '|':
-UNSUPPORTED("3torkuptfbkp3zjwrckz7pqdn"); // if (syntax & (((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("5jivfhwm58xf3nhm2fe6mhe63"); // goto handle_alt;
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("4pyfskl7wp2jd81x0kmp62qoi"); // case '{':
-UNSUPPORTED("5b1d1n2on553ca86p9l993tzn"); // if (syntax & (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) && syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("48zoic9u273bq7o6wfz7y7fsv"); // goto handle_interval;
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("uivpjrr5me8j92jky5okan1c"); // goto normal_char;
-UNSUPPORTED("5350k8qj9jz4pvuqs0weppxzm"); // case '\\':
-UNSUPPORTED("drfl8x3xhp9nddd3popxg4kkf"); // if (p == pend) return (free (compile_stack.stack), REG_EESCAPE);
-UNSUPPORTED("27v1be7swlc5n86wdyk7yqicm"); // /* Do not translate the character after the \, so that we can
-UNSUPPORTED("aimxtldmdqlup4n4gcasbmjpm"); // distinguish, e.g., \B from \b, even if we normally would
-UNSUPPORTED("8y750xv4fwoof20pgyb54iljp"); // translate, e.g., B to b. */
-UNSUPPORTED("emr80p3t30z3qcchdf6qsg7op"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; } while (0);
-UNSUPPORTED("1wwqm41fujo96fngaibe11cs"); // switch (c)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("8jxolljx883gvj5ry1lre79rm"); // case '(':
-UNSUPPORTED("59nlrexduxa9d2pv4p8p4wfyn"); // if (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("duzsz5s9lw56m1on7ajxgk9o2"); // goto normal_backslash;
-UNSUPPORTED("1mo91efxfidrlkj7o2hpimm5g"); // handle_open:
-UNSUPPORTED("cc2g9mgbjo7991epy9celv5dq"); // bufp->re_nsub++;
-UNSUPPORTED("e816ua3kiygoarxwt4u3kjw2e"); // regnum++;
-UNSUPPORTED("abfkotx8f2o71l3ungy2dc61b"); // if ((compile_stack.avail == compile_stack.size))
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("5r9ltvya89zzc88t9p8g86dxp"); // ((compile_stack.stack) = (
-UNSUPPORTED("5q6n9lfuwcrd4xf1g8vam0mqg"); // compile_stack_elt_t *) realloc (compile_stack.stack, (compile_stack.size << 1) * sizeof (
-UNSUPPORTED("2a7bsn9w2iinvqmd970g996fq"); // compile_stack_elt_t)));
-UNSUPPORTED("dsrcc4quas84hhfjjm5yh2be8"); // if (compile_stack.stack == (void *)0) return REG_ESPACE;
-UNSUPPORTED("8kq2kc3jebolynu1cy6403pl0"); // compile_stack.size <<= 1;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("e0bq2fat5uym1sf4darkcwl7v"); // /* These are the values to restore when we hit end of this
-UNSUPPORTED("3vpixvd7xctqmc3ngtezp4xh4"); // group. They are all relative offsets, so that if the
-UNSUPPORTED("2v6zztbhem2o09k7pqvggwe8h"); // whole pattern moves because of realloc, they will still
-UNSUPPORTED("57di400em2riuffwpvny0f24u"); // be valid. */
-UNSUPPORTED("8rxnof37j5xup2c6z4diq79ou"); // (compile_stack.stack[compile_stack.avail]).begalt_offset = begalt - bufp->buffer;
-UNSUPPORTED("9nay0qlhefwna3c6dilyk0ljp"); // (compile_stack.stack[compile_stack.avail]).fixup_alt_jump
-UNSUPPORTED("aq269vu0tq0y8wvt7vg6y41u8"); // = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
-UNSUPPORTED("f2a1p7nj50nhzemnvvv85l9wp"); // (compile_stack.stack[compile_stack.avail]).laststart_offset = b - bufp->buffer;
-UNSUPPORTED("3ikd9wh2ibpe6fnfbwac6mal"); // (compile_stack.stack[compile_stack.avail]).regnum = regnum;
-UNSUPPORTED("1222t3yuwlm1hv92xmzgstlpj"); // /* We will eventually replace the 0 with the number of
-UNSUPPORTED("b5a63c42wobd53sp3c64zj34u"); // groups inner to this one. But do not push a
-UNSUPPORTED("1indupc2ufbt22ci1btaoi3w1"); // start_memory for groups beyond the last one we can
-UNSUPPORTED("clbbjbwg9b4yr40r3qt26gayn"); // represent in the compiled pattern. */
-UNSUPPORTED("dn6qx81h224i04gen8lz36bur"); // if (regnum <= 255)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("b55i0sl0dvhuj7r94cz8uascg"); // (compile_stack.stack[compile_stack.avail]).inner_group_offset = b - bufp->buffer + 2;
-UNSUPPORTED("crcx4g4ali1dijvt94wdz6nsm"); // do { while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (start_memory); *b++ = (unsigned char) (regnum); *b++ = (unsigned char) (0); } while (0);
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("94rzmxep7enhqkfnp2762ytyy"); // compile_stack.avail++;
-UNSUPPORTED("dphv9qka2txhy68rnsif6jynt"); // fixup_alt_jump = 0;
-UNSUPPORTED("dvt6va09huijx10zufnnjqgl3"); // laststart = 0;
-UNSUPPORTED("90zo4it529eaunfkfdxoxrdgj"); // begalt = b;
-UNSUPPORTED("dvj2nuag66y7el3zrpla0153y"); // /* If we've reached MAX_REGNUM groups, then this open
-UNSUPPORTED("2u4e034ze821746znru3h0b45"); // won't actually generate any code, so we'll have to
-UNSUPPORTED("dk5vb9d5gkrw8sibofm4qt4ue"); // clear pending_exact explicitly. */
-UNSUPPORTED("7s8z4qnugzgnbuvds8u8a5jep"); // pending_exact = 0;
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("f58m8dl8wsiu09tv3k6hddsnz"); // case ')':
-UNSUPPORTED("8rxf228e9g6ihw68iqgw5ye4v"); // if (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)) goto normal_backslash;
-UNSUPPORTED("7yogipyu9e9xkgapyvsso5js4"); // if ((compile_stack.avail == 0)) {
-UNSUPPORTED("8jaoyupj1e28u8vqk14htwrtv"); // if (syntax & (((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("7twsisd1xmsx52xuobbqhozvn"); // goto normal_backslash;
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("dn8ttvbrvj1svr73kt4zmcugv"); // return (free (compile_stack.stack), REG_ERPAREN);
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3bc4i0fs7quuiznm2wabuv57g"); // handle_close:
-UNSUPPORTED("cba08qms5w8uqvkd4p9iqz909"); // if (fixup_alt_jump)
-UNSUPPORTED("1lzprxcdmzqjb9whh02ptkgin"); // { /* Push a dummy failure point at the end of the
-UNSUPPORTED("cc7pak11xcdny8f782y93y6d4"); // alternative for a possible future
-UNSUPPORTED("4iprb2tgw3ra22d8s7u4ny04z"); // `pop_failure_jump' to pop. See comments at
-UNSUPPORTED("il2pao7ylwdupdmwkc63wt74"); // `push_dummy_failure' in `re_match_2'. */
-UNSUPPORTED("bsoqdb55d2fj7nrshha8baj79"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (push_dummy_failure); } while (0);
-UNSUPPORTED("bsg3cvulx3vuba3c4g7h8wi9e"); // /* We allocated space for this jump when we assigned
-UNSUPPORTED("81pcbxblcl9t5t7fqo3daz26"); // to `fixup_alt_jump', in the `handle_alt' case below. */
-UNSUPPORTED("42dp50c2b5kexwd7wxmwewwe1"); // store_op1 (jump_past_alt, fixup_alt_jump, (int) ((b - 1) - (fixup_alt_jump) - 3));
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("172uzd85uuznm53m6t1nv9ke5"); // /* See similar code for backslashed left paren above. */
-UNSUPPORTED("7yogipyu9e9xkgapyvsso5js4"); // if ((compile_stack.avail == 0)) {
-UNSUPPORTED("8jaoyupj1e28u8vqk14htwrtv"); // if (syntax & (((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("6gqrsbcf35slq98fdu38ysotz"); // goto normal_char;
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("dn8ttvbrvj1svr73kt4zmcugv"); // return (free (compile_stack.stack), REG_ERPAREN);
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("eniovbcxrkcn8texhpvd1c3j"); // /* Since we just checked for an empty stack above, this
-UNSUPPORTED("oah0j3x85xy0y5snf99b5uto"); // ``can't happen''. */
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("zxem7lefmt7jmq1sphx8jq5d"); // /* We don't just want to restore into `regnum', because
-UNSUPPORTED("eshff1bkln1euqcvo55z6arar"); // later groups should continue to be numbered higher,
-UNSUPPORTED("hyn2g413dbg1jtec9jsz3ujb"); // as in `(ab)c(de)' -- the second group is #2. */
-UNSUPPORTED("e26xy4hqgvbad7pusqf04i868"); // regnum_t this_group_regnum;
-UNSUPPORTED("6n0r61042a9cp17p8uaa2pvkk"); // compile_stack.avail--;
-UNSUPPORTED("b8x4vi5eywvcxrfzoej5bwryf"); // begalt = bufp->buffer + (compile_stack.stack[compile_stack.avail]).begalt_offset;
-UNSUPPORTED("1xvm5ivpx5tz8e199a7p2rmqz"); // fixup_alt_jump
-UNSUPPORTED("4umag2hy9kw4kqozrwydhawfq"); // = (compile_stack.stack[compile_stack.avail]).fixup_alt_jump
-UNSUPPORTED("5gcmnf7zgwup5dbu5kddwwfq5"); // ? bufp->buffer + (compile_stack.stack[compile_stack.avail]).fixup_alt_jump - 1
-UNSUPPORTED("1gewh4lotwkkm4iqn6ggzwkoq"); // : 0;
-UNSUPPORTED("85k6r2lf00egr6wmh6ynrl2p5"); // laststart = bufp->buffer + (compile_stack.stack[compile_stack.avail]).laststart_offset;
-UNSUPPORTED("8hnnnyzrlgnojw4fgthz9m20m"); // this_group_regnum = (compile_stack.stack[compile_stack.avail]).regnum;
-UNSUPPORTED("dlko1f9w54peneqoca91cgrci"); // /* If we've reached MAX_REGNUM groups, then this open
-UNSUPPORTED("74txdb0o7dhsdiultkxutc0e7"); // won't actually generate any code, so we'll have to
-UNSUPPORTED("185wciv8bzl59e6kldksp04w4"); // clear pending_exact explicitly. */
-UNSUPPORTED("47qf9noup192j3ixvbaqfafxw"); // pending_exact = 0;
-UNSUPPORTED("askuaehvoj7enatduzagqwmbk"); // /* We're at the end of the group, so now we know how many
-UNSUPPORTED("autf5q3thbf8mmptmgx0msnh4"); // groups were inside this one. */
-UNSUPPORTED("a8riafizqdv5zjapabhopp72g"); // if (this_group_regnum <= 255)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("2wmjb2xbz36ytg6g1bgfd4hb1"); // unsigned char *inner_group_loc
-UNSUPPORTED("bzfdj6g2ck20pq1mb50l27a9v"); // = bufp->buffer + (compile_stack.stack[compile_stack.avail]).inner_group_offset;
-UNSUPPORTED("el3pwrfnbqiexy2sk0rffy0cf"); // *inner_group_loc = regnum - this_group_regnum;
-UNSUPPORTED("cguv9rjc1iive3bv1yez75f03"); // do { while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (stop_memory); *b++ = (unsigned char) (this_group_regnum); *b++ = (unsigned char) (
-UNSUPPORTED("7sev1sdu00ye0rtlo3hndpvge"); // regnum - this_group_regnum); } while (0);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("1r6y7bujaca34ru0thv040wer"); // case '|': /* `\|'. */
-UNSUPPORTED("46dgptds7v1z98qko5xqgje7h"); // if (syntax & ((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) || syntax & (((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("duzsz5s9lw56m1on7ajxgk9o2"); // goto normal_backslash;
-UNSUPPORTED("4zdduwo0bies2nyvyh3rkqec5"); // handle_alt:
-UNSUPPORTED("eh6qytrwlnojjauu38ckl7ieo"); // if (syntax & ((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("71lbycb6i00gg9x1a2qrb3eip"); // /* Insert before the previous alternative a jump which
-UNSUPPORTED("7e4xxb42diyggtjzhyj0r4iht"); // jumps to this alternative if the former fails. */
-UNSUPPORTED("12a3mmfyhz3lv9g634sbhwpnl"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("e3r36lsf9nfoaplwmusccx2ko"); // insert_op1 (on_failure_jump, begalt, (int) ((b + 6) - (begalt) - 3), b);
-UNSUPPORTED("7s8z4qnugzgnbuvds8u8a5jep"); // pending_exact = 0;
-UNSUPPORTED("ebm7g0g1nuacoouvopi1thit2"); // b += 3;
-UNSUPPORTED("2oav1ek69wp16iydew6ok9ox8"); // /* The alternative before this one has a jump after it
-UNSUPPORTED("cmcbmjy59tx8k81e3ek6xwlvq"); // which gets executed if it gets matched. Adjust that
-UNSUPPORTED("7jb4wxi0em6v0jucfjtw3a4up"); // jump so it will jump to this alternative's analogous
-UNSUPPORTED("5zlorzwitjp83i56wns9w8u0r"); // jump (put in below, which in turn will jump to the next
-UNSUPPORTED("3y12zjyrd8x7fd4xc7uz7wk9b"); // (if any) alternative's such jump, etc.). The last such
-UNSUPPORTED("7oj6n4fel5k5oe1hc1w024dj5"); // jump jumps to the correct final destination. A picture:
-UNSUPPORTED("ey74hniulk9kz47tqr8by3ul4"); // _____ _____
-UNSUPPORTED("ded5vl0okjroo4lbzal107hid"); // | | | |
-UNSUPPORTED("8dlq9vw86vwqva8uk09fpjhnz"); // | v | v
-UNSUPPORTED("6xr500bohtokobmkx1m276vk2"); // a | b | c
-UNSUPPORTED("k27r9mjl8i2jpghyf3yd76ss"); // If we are at `b', then fixup_alt_jump right now points to a
-UNSUPPORTED("9jlwvx46zdiyc0cgpc9aichx2"); // three-byte space after `a'. We'll put in the jump, set
-UNSUPPORTED("7gw6bsjyzgswrermi9mrvnnd9"); // fixup_alt_jump to right after `b', and leave behind three
-UNSUPPORTED("996t1kfvkq1wsgyy9twl2hmf5"); // bytes which we'll fill in when we get to after `c'. */
-UNSUPPORTED("cba08qms5w8uqvkd4p9iqz909"); // if (fixup_alt_jump)
-UNSUPPORTED("1na9w390cmfhlvzr6zo51tmtb"); // store_op1 (jump_past_alt, fixup_alt_jump, (int) ((b) - (fixup_alt_jump) - 3));
-UNSUPPORTED("8ed964065ejrs0q6lzv94yez1"); // /* Mark and leave space for a jump after this alternative,
-UNSUPPORTED("25baag8i46m3zhww0ac4k5o0x"); // to be filled in later either by next alternative or
-UNSUPPORTED("87vumt536jh7giifqd1s7e35m"); // when know we're at the end of a series of alternatives. */
-UNSUPPORTED("ev3p48k8fo943q12gph5h8h5i"); // fixup_alt_jump = b;
-UNSUPPORTED("12a3mmfyhz3lv9g634sbhwpnl"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("ebm7g0g1nuacoouvopi1thit2"); // b += 3;
-UNSUPPORTED("dvt6va09huijx10zufnnjqgl3"); // laststart = 0;
-UNSUPPORTED("90zo4it529eaunfkfdxoxrdgj"); // begalt = b;
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("99gf69q37flmk5nul07d806ch"); // case '{':
-UNSUPPORTED("eh7o49r6vtoc1lilgh11tvn4b"); // /* If \{ is a literal. */
-UNSUPPORTED("bpfokxd4igwyfns09495mnyj8"); // if (!(syntax & (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("5qn7772e7nzkqvtlkiys53olq"); // /* If we're at `\{' and it's not the open-interval
-UNSUPPORTED("8a0p71nhvq7jckckna5u4qr7t"); // operator. */
-UNSUPPORTED("cswuz8yxul8hsi2ysw71xb9rz"); // || ((syntax & (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)) && (syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("d0s744fq2fs9l9aaekpxlqj4e"); // || (p - 2 == pattern && p == pend))
-UNSUPPORTED("duzsz5s9lw56m1on7ajxgk9o2"); // goto normal_backslash;
-UNSUPPORTED("bxsvs3tj432mvaj55kae5o9ue"); // handle_interval:
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("ey78j6wwy5vn22b5iutepsjvj"); // /* If got here, then the syntax allows intervals. */
-UNSUPPORTED("22u5dv9jzoa3qwk32b1729l4r"); // /* At least (most) this many matches must be made. */
-UNSUPPORTED("8hhxunayr90degkndrot61r2v"); // int lower_bound = -1, upper_bound = -1;
-UNSUPPORTED("b3m9z0v48oef8fma37xkjtew6"); // beg_interval = p - 1;
-UNSUPPORTED("891uwttbfnv5bc58wpbg1fhgl"); // if (p == pend)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("cbdohhh0bm6q3vbmnwn4e1vyq"); // if (syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ckqpiwbyjnqn5cpwu2kw8rzbb"); // goto unfetch_interval;
-UNSUPPORTED("61qf7b2jxc7j3knm5ts69f0b6"); // else
-UNSUPPORTED("5ln10oel04ejmsrfm7uzyxmm3"); // return (free (compile_stack.stack), REG_EBRACE);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("3imw63qg7eb3mef09yezz6uj7"); // { if (p != pend) { do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0); while ((1 && isdigit (c))) { if (lower_bound < 0) lower_bound = 0; lower_bound = lower_bound * 10 + c - '0'; if (p == pend) break; do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0); } } };
-UNSUPPORTED("1uyn0tiw7bqjiss70oyjn9l7f"); // if (c == ',')
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("5xu6gzc4kvvybje2lnr7qdjka"); // { if (p != pend) { do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0); while ((1 && isdigit (c))) { if (upper_bound < 0) upper_bound = 0; upper_bound = upper_bound * 10 + c - '0'; if (p == pend) break; do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0); } } };
-UNSUPPORTED("36f9x0yetwobrju6guskv8zsf"); // if (upper_bound < 0) upper_bound = (0x7fff);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("76by7r7x6guk4yvf4na11j7fa"); // /* Interval such as `{1}' => match exactly once. */
-UNSUPPORTED("7oi51mz0kxn0ljkpu564jd1zz"); // upper_bound = lower_bound;
-UNSUPPORTED("7ec3ilddc87ddo0ohyphhvkag"); // if (lower_bound < 0 || upper_bound > (0x7fff)
-UNSUPPORTED("dg03lkmdnpyic7onasg3rhqv3"); // || lower_bound > upper_bound)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("cbdohhh0bm6q3vbmnwn4e1vyq"); // if (syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ckqpiwbyjnqn5cpwu2kw8rzbb"); // goto unfetch_interval;
-UNSUPPORTED("61qf7b2jxc7j3knm5ts69f0b6"); // else
-UNSUPPORTED("dncd6ntkh4fds08gm3c4f7y7z"); // return (free (compile_stack.stack), REG_BADBR);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("8zi6rfr6252dxyzqv0myhm4xm"); // if (!(syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("3nwh4wgghtnfkscuiwfo0cu3y"); // if (c != '\\') return (free (compile_stack.stack), REG_EBRACE);
-UNSUPPORTED("eqri2rfe7jnz1m2rij615jaj1"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("7yy5bnz36zs5pyi05n1qbbyfx"); // if (c != '}')
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("cbdohhh0bm6q3vbmnwn4e1vyq"); // if (syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ckqpiwbyjnqn5cpwu2kw8rzbb"); // goto unfetch_interval;
-UNSUPPORTED("61qf7b2jxc7j3knm5ts69f0b6"); // else
-UNSUPPORTED("dncd6ntkh4fds08gm3c4f7y7z"); // return (free (compile_stack.stack), REG_BADBR);
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("5wvp3nau0n8tyg9q5a45z6lyw"); // /* We just parsed a valid interval. */
-UNSUPPORTED("8abj2dxygzm4q2t6cik367htu"); // /* If it's invalid to have no preceding re. */
-UNSUPPORTED("7jmcihqsic23w36x8uyw6rgq0"); // if (!laststart)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("dhcq2d5ztdbu4o4zvyapxw6nh"); // if (syntax & (((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("1m9o7j67m70ez7l1kcm89n5hu"); // return (free (compile_stack.stack), REG_BADRPT);
-UNSUPPORTED("cd9am2nn7ebpy7n4jg9h1ufr4"); // else if (syntax & ((((((unsigned long int) 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("9bhpbnocq89hcx0yaaav9o55q"); // laststart = b;
-UNSUPPORTED("61qf7b2jxc7j3knm5ts69f0b6"); // else
-UNSUPPORTED("ckqpiwbyjnqn5cpwu2kw8rzbb"); // goto unfetch_interval;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("4gb3yehghg1r4z81pfpjdfvgt"); // /* If the upper bound is zero, don't want to succeed at
-UNSUPPORTED("aatlwtk51r4vhf2pwijmg9mp2"); // all; jump from `laststart' to `b + 3', which will be
-UNSUPPORTED("5qe2o1vhmd60525scpziso3qd"); // the end of the buffer after we insert the jump. */
-UNSUPPORTED("7mu4hmjs37m7lx095ek5vdxxv"); // if (upper_bound == 0)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("a881bhs9uyxvv8hkudjh48ded"); // while ((unsigned long) (b - bufp->buffer + (3)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("1iszfmgzsydg6wplo0b3rdscs"); // insert_op1 (jump, laststart, (int) ((b + 3) - (laststart) - 3), b);
-UNSUPPORTED("ef7wtmbarkb4uc7wd67hvt8vg"); // b += 3;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("er56h1ofqtaixpmzkkaco2esj"); // /* Otherwise, we have a nontrivial interval. When
-UNSUPPORTED("as06jnzy16oy1d2k8yrsmnzce"); // we're all done, the pattern will look like:
-UNSUPPORTED("2sy9ixs1qds1ov6cizjv2ekst"); // set_number_at
-UNSUPPORTED("57q8h3cnrxlq45gvr3k5coz5l"); // set_number_at
-UNSUPPORTED("9nr6blw8qubgah89xl4e7nkc9"); // succeed_n
-UNSUPPORTED("3jejf324x7ol07x2qsz7dal9u"); //
-UNSUPPORTED("91gylqgyabjgru87d2uf6v0sb"); // jump_n
-UNSUPPORTED("3ef68fn6o1w25y5pabsc3ly4g"); // (The upper bound and `jump_n' are omitted if
-UNSUPPORTED("bk78ox2ujcbxp08sj3dypdu4d"); // `upper_bound' is 1, though.) */
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("efpf0x8clufa77cutrnkx4lcj"); // { /* If the upper bound is > 1, we need to insert
-UNSUPPORTED("dzt6navygpg7km0wu0um9ly47"); // more at the end of the loop. */
-UNSUPPORTED("bj2zq9uzbacy1f5scg45mc8o7"); // unsigned nbytes = 10 + (upper_bound > 1) * 10;
-UNSUPPORTED("a3dj4ob1sccvwmhsasm69xe72"); // while ((unsigned long) (b - bufp->buffer + (nbytes)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0);
-UNSUPPORTED("1su4wz7ud8htx57ifpl7dvcjb"); // /* Initialize lower bound of the `succeed_n', even
-UNSUPPORTED("9j79ov5k583ecforn4p7uyj07"); // though it will be set during matching by its
-UNSUPPORTED("8e98bgll3zoiy6g3o125b3q2f"); // attendant `set_number_at' (inserted next),
-UNSUPPORTED("53ep471y7ys6dzp9yufebyily"); // because `re_compile_fastmap' needs to know.
-UNSUPPORTED("14vynt5c8wnonl64olb8ttvtd"); // Jump to the `jump_n' we might insert below. */
-UNSUPPORTED("70iuvqfyzlre4zcn83hksrxn8"); // insert_op2 (succeed_n, laststart, (int) ((
-UNSUPPORTED("5pma6876qpamutcafga5yib97"); // b + 5 +(upper_bound > 1) * 5) - (laststart) - 3),
-UNSUPPORTED("6vch8eo9jutmcjre2de6d9gbd"); // lower_bound, b);
-UNSUPPORTED("43kr4g9sdi8c4jh0s5i56vuom"); // b += 5;
-UNSUPPORTED("9wq1ll164vusxqbxnhcmfglr2"); // /* Code to initialize the lower bound. Insert
-UNSUPPORTED("8pvo9br1w68oucw65nlm51oyr"); // before the `succeed_n'. The `5' is the last two
-UNSUPPORTED("a0wkdu3a33nzfqwoi97ucrydd"); // bytes of this `set_number_at', plus 3 bytes of
-UNSUPPORTED("3f5d3pqpnky1yym79bby1sz14"); // the following `succeed_n'. */
-UNSUPPORTED("6tnprwkxn86sjk70t31xuoner"); // insert_op2 (set_number_at, laststart, 5, lower_bound, b);
-UNSUPPORTED("43kr4g9sdi8c4jh0s5i56vuom"); // b += 5;
-UNSUPPORTED("oi58bgxgyehr7fep6gg7b30i"); // if (upper_bound > 1)
-UNSUPPORTED("8k5l99ygyd8csogbu2fv5zo"); // { /* More than one repetition is allowed, so
-UNSUPPORTED("dfqu908jf8ce7624rr03va1d4"); // append a backward jump to the `succeed_n'
-UNSUPPORTED("3bwv4hhwkxq1dxz91v6urcgft"); // that starts this interval.
-UNSUPPORTED("9d1i5cmg65d2yqlnnwhhgb10d"); // When we've reached this during matching,
-UNSUPPORTED("a4w172v3cp6ffpdtc6uecy35z"); // we'll have matched the interval once, so
-UNSUPPORTED("ek50qyp6pxt5f0d13fhqk7gb3"); // jump back only `upper_bound - 1' times. */
-UNSUPPORTED("cw1t4ts9rzslpfolcfywhn3qn"); // store_op2 (jump_n, b, (int) ((laststart + 5) - (b) - 3),
-UNSUPPORTED("3bkogjbp2zrhl1e57w52wgtur"); // upper_bound - 1);
-UNSUPPORTED("e4xjnlgh2lwxl5rgrsy1t0lzp"); // b += 5;
-UNSUPPORTED("9eb4sjjix0zbs0m5165ieamk0"); // /* The location we want to set is the second
-UNSUPPORTED("5y1422w9b3ttxiq7uxejd8dl7"); // parameter of the `jump_n'; that is `b-2' as
-UNSUPPORTED("7pbl00qw1iwl2shqi1boj4s0o"); // an absolute address. `laststart' will be
-UNSUPPORTED("8nzimsq57reptkqovcwmi5is2"); // the `set_number_at' we're about to insert;
-UNSUPPORTED("8zphslv1mlv2s77w43gkoi1ul"); // `laststart+3' the number to set, the source
-UNSUPPORTED("d2f41o7p6x4ikqydu4firrznx"); // for the relative address. But we are
-UNSUPPORTED("ykrtets348ms6o03g441goo7"); // inserting into the middle of the pattern --
-UNSUPPORTED("8wbqzkcrlw3e1ea51h8blhurv"); // so everything is getting moved up by 5.
-UNSUPPORTED("a3f2u6qy5p003dtis6m0fpvl1"); // Conclusion: (b - 2) - (laststart + 3) + 5,
-UNSUPPORTED("5emb5r1kvteh6n0qces39m5f2"); // i.e., b - laststart.
-UNSUPPORTED("3zbu3199lym6vc2u1vakclmn6"); // We insert this at the beginning of the loop
-UNSUPPORTED("csmu8b2er6ytie5e9nt8t4ii4"); // so that if we fail during matching, we'll
-UNSUPPORTED("6i50gsk8v7o3h2xgwwmiiftk6"); // reinitialize the bounds. */
-UNSUPPORTED("87vlmr3dcbomq11myh4sw1fl6"); // insert_op2 (set_number_at, laststart, b - laststart,
-UNSUPPORTED("9qs8k9xnugrbv80hqanlzsj0k"); // upper_bound - 1, b);
-UNSUPPORTED("e4xjnlgh2lwxl5rgrsy1t0lzp"); // b += 5;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("47qf9noup192j3ixvbaqfafxw"); // pending_exact = 0;
-UNSUPPORTED("5bsb6g154mdvmrq2r8pg7c57z"); // beg_interval = (void *)0;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("4g8id4otqpbtngfcwz2lvm1dj"); // unfetch_interval:
-UNSUPPORTED("2uaon9lzacwcq3uk6um6vhs5b"); // /* If an invalid interval, match the characters as literals. */
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("del20sog75q2qfuqvkporgtm0"); // p = beg_interval;
-UNSUPPORTED("34xptp017sapmiseov6178cf4"); // beg_interval = (void *)0;
-UNSUPPORTED("biznyjdfohe9yytw4pz3d8dox"); // /* normal_char and normal_backslash need `c'. */
-UNSUPPORTED("criokqqji74yuk47n1jhnpq75"); // do {if (p == pend) return REG_EEND; c = (unsigned char) *p++; if (translate) c = (unsigned char) translate[c]; } while (0);
-UNSUPPORTED("axdhegkjispkpmlj1rwmr7893"); // if (!(syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("szfu82l2yyl4abpqquds47zb"); // if (p > pattern && p[-1] == '\\')
-UNSUPPORTED("4pgdoo1pi0fajdrnqd2gl86zc"); // goto normal_backslash;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("dxpbgmfj2w220xy1q99fxje94"); // goto normal_char;
-UNSUPPORTED("28ro2br1t858h9e64b2eclvsh"); // case 'w':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("bzlbs3vmfi1kf0101kec4qyco"); // laststart = b;
-UNSUPPORTED("br0jt3hvd6j06mrnfv1j1du2c"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (wordchar); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("cgixiaqx7fff7w14lfzv9un9b"); // case 'W':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("bzlbs3vmfi1kf0101kec4qyco"); // laststart = b;
-UNSUPPORTED("csd38b3d31jeqlokfvq1k1w8f"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (notwordchar); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("56yutn3bw63gli62ao6byqpz6"); // case '<':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("bvnndrb6xvkus381wvq683jko"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (wordbeg); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("b27z9bdaut5nhut2j9qtvrc6x"); // case '>':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("9x7h5ccf7d8cb7d008zc3fvnn"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (wordend); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("1lgl6j1beved5wkn8lbc9pj9v"); // case 'b':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("ee4emtgp2qmp2if03ztroprzx"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (wordbound); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("1rh1jh861iaq6ptkgabcumr89"); // case 'B':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("f1o6i9gjd99gwklmvn8viskl6"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (notwordbound); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("59swrjh32j9w6w9fnlmqjwqhm"); // case '`':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("21zy7115epyqb00qfyrak2wlh"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (begbuf); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("enp735bu0pvi1g2slk3f3xjlt"); // case '\'':
-UNSUPPORTED("f3s47ztvpkb3579t2leyzyw26"); // if (re_syntax_options & (((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("efz3fdd9mbv7nl371w3u6ezhv"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (endbuf); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("5p5kyaam049yzq965bmdz6nnh"); // case '1': case '2': case '3': case '4': case '5':
-UNSUPPORTED("9hv7da8hbwl3dpaoiieu3rdte"); // case '6': case '7': case '8': case '9':
-UNSUPPORTED("8x9ia20e11qngbvg3030t63ib"); // if (syntax & ((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("984azd04wqga97vlg77nqw3hl"); // c1 = c - '0';
-UNSUPPORTED("2j8gb2lyb8b45sk2yf69wj6rw"); // if (c1 > regnum)
-UNSUPPORTED("3t049zz47oarl9dkg8euljouk"); // return (free (compile_stack.stack), REG_ESUBREG);
-UNSUPPORTED("b52s0xefwdzq23ebdsm2l635g"); // /* Can't back reference to a subexpression if inside of it. */
-UNSUPPORTED("289fpytgoqtnz6sbd26j596ma"); // if (group_in_compile_stack (compile_stack, (regnum_t) c1))
-UNSUPPORTED("ck4wdxm4o1ub3048vodmtvy6s"); // goto normal_char;
-UNSUPPORTED("bzlbs3vmfi1kf0101kec4qyco"); // laststart = b;
-UNSUPPORTED("ayh7963cwi35nzazymns2xr4j"); // do { while ((unsigned long) (b - bufp->buffer + (2)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (duplicate); *b++ = (unsigned char) (c1); } while (0);
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("10rhhnvrykevpmqtifs3vfsbn"); // case '+':
-UNSUPPORTED("5d03wz66bdkv7mubtsqfqptwh"); // case '?':
-UNSUPPORTED("cmtz225wrrfrtyrfnva1w0xyx"); // if (syntax & (((unsigned long int) 1) << 1))
-UNSUPPORTED("1e36xo9vcfmetpl665flebmxr"); // goto handle_plus;
-UNSUPPORTED("ex6jbb36b02x7vzl22fq0yh2l"); // else
-UNSUPPORTED("duzsz5s9lw56m1on7ajxgk9o2"); // goto normal_backslash;
-UNSUPPORTED("623zujkdt9es8v0w13jz9jw8x"); // default:
-UNSUPPORTED("beo8prktwmjyif35z778zfw1g"); // normal_backslash:
-UNSUPPORTED("d6o76edxq0225kqke2hja81jl"); // /* You might think it would be useful for \ to mean
-UNSUPPORTED("3ifiyvf5lf26yw26enbob7qmu"); // not to translate; but if we don't translate it
-UNSUPPORTED("ecuhc5c6wpoj7vpzvjyv5x62r"); // it will never match anything. */
-UNSUPPORTED("1nghju7haq80s0kj7x01pojis"); // c = (translate ? (char) translate[(unsigned char) (c)] : (c));
-UNSUPPORTED("dxpbgmfj2w220xy1q99fxje94"); // goto normal_char;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("comxch6w0lbi64ejq9m4p0u7o"); // default:
-UNSUPPORTED("egnm0qedqx5klxttjvckp1nh0"); // /* Expects the character in `c'. */
-UNSUPPORTED("4qeb36tm7edhyh2kuighgnt3l"); // normal_char:
-UNSUPPORTED("1fk2r6llu2tyc89u61aqedfcu"); // /* If no exactn currently being built. */
-UNSUPPORTED("dvgbrbk801umnqbk21dcl1jqt"); // if (!pending_exact
-UNSUPPORTED("4sk1dp6gncxrc6q5vqax6q1ff"); // /* If last exactn not at current position. */
-UNSUPPORTED("8ta654rp3f80109ds7wainnbo"); // || pending_exact + *pending_exact + 1 != b
-UNSUPPORTED("77sazmv1hkm382fcbfgk2amhz"); // /* We have only one byte following the exactn for the count. */
-UNSUPPORTED("195b1d4l8t8zfx7373dninfqs"); // || *pending_exact == (1 << 8) - 1
-UNSUPPORTED("dfhnk487nvojvngpft8d1m5m6"); // /* If followed by a repetition operator. */
-UNSUPPORTED("3ub8lclci64fyijvq4kh6b7wv"); // || *p == '*' || *p == '^'
-UNSUPPORTED("eus82vo98skwtodf1ct43m3j2"); // || ((syntax & (((unsigned long int) 1) << 1))
-UNSUPPORTED("c35rzowssstcdv8ruusljr55b"); // ? *p == '\\' && (p[1] == '+' || p[1] == '?')
-UNSUPPORTED("an9wblbb8w5ryyrzneu7n5ko8"); // : (*p == '+' || *p == '?'))
-UNSUPPORTED("9fpdj9n2jjcr421s2g9z3r4i5"); // || ((syntax & (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("doucnd8aksv0c0n2qke841f3d"); // && ((syntax & ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("3d5qlx6ctgmlvlyvps6mliwz5"); // ? *p == '{'
-UNSUPPORTED("5g4kw7ayxlcp3eufwirvf96oj"); // : (p[0] == '\\' && p[1] == '{'))))
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("nbxskwykyxkuuturxjw7zviw"); // /* Start building a new exactn. */
-UNSUPPORTED("bzlbs3vmfi1kf0101kec4qyco"); // laststart = b;
-UNSUPPORTED("ejmhwadfnfrzhgtdtjhon9thk"); // do { while ((unsigned long) (b - bufp->buffer + (2)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (exactn); *b++ = (unsigned char) (0); } while (0);
-UNSUPPORTED("3d84yn9kh97rpe3bpdhnhbnpc"); // pending_exact = b - 1;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("2k7zblp37vmofrhji8gga03t0"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (c); } while (0);
-UNSUPPORTED("cib3f9ag6ywox7sedgbxkkmzk"); // (*pending_exact)++;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("61b5pg30vl032ddas1lgz7fom"); // } /* switch (c) */
-UNSUPPORTED("9758gpbrep7p4gr36dhunt05n"); // } /* while p != pend */
-UNSUPPORTED("93p2q85dy4ac5kim9nivyn79p"); // /* Through the pattern now. */
-UNSUPPORTED("1owvoxb3fhlen2k6t0r5ai42z"); // if (fixup_alt_jump)
-UNSUPPORTED("13s484p9xd2bw2xbz1wlvdo2i"); // store_op1 (jump_past_alt, fixup_alt_jump, (int) ((b) - (fixup_alt_jump) - 3));
-UNSUPPORTED("aprj6xezpwmu3a179m5g8vbya"); // if (!(compile_stack.avail == 0))
-UNSUPPORTED("3qkjmx7dwj6otc7vge7e62fak"); // return (free (compile_stack.stack), REG_EPAREN);
-UNSUPPORTED("bif9tomfcf0bfh8yujmms4e00"); // /* If we don't want backtracking, force success
-UNSUPPORTED("6in6drehljv4k3imbk7ay9paw"); // the first time we reach the end of the compiled pattern. */
-UNSUPPORTED("65u4ochrazrfxoz1im3b6cxt5"); // if (syntax & ((((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1))
-UNSUPPORTED("2gp9v2s1qkxulysls2k1go519"); // do { while ((unsigned long) (b - bufp->buffer + (1)) > bufp->allocated) do { unsigned char *old_buffer = bufp->buffer; if (bufp->allocated == (1L << 16)) return REG_ESIZE; bufp->allocated <<= 1; if (bufp->allocated > (1L << 16)) bufp->allocated = (1L << 16); bufp->buffer = (unsigned char *) realloc ((bufp->buffer), (bufp->allocated)); if (bufp->buffer == (void *)0) return REG_ESPACE; if (old_buffer != bufp->buffer) { b = (b - old_buffer) + bufp->buffer; begalt = (begalt - old_buffer) + bufp->buffer; if (fixup_alt_jump) fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer; if (laststart) laststart = (laststart - old_buffer) + bufp->buffer; if (pending_exact) pending_exact = (pending_exact - old_buffer) + bufp->buffer; } } while (0); *b++ = (unsigned char) (succeed); } while (0);
-UNSUPPORTED("cvaeac7ysy55222mdduh1aku9"); // free (compile_stack.stack);
-UNSUPPORTED("588061fcmtocd9luhfsdk74at"); // /* We have succeeded; set the length of the buffer. */
-UNSUPPORTED("7at4a9mth8j1h0n9mhg91s816"); // bufp->used = b - bufp->buffer;
-UNSUPPORTED("cwwrkrko9fc4redgkt1b13h6d"); // return REG_NOERROR;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1a5b1tkqolinqh3eydzvc550l
-// static void store_op1 (re_opcode_t op, unsigned char *loc, int arg)
-public static Object store_op1(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("eili3inuq1bw9eshdmskywxtg"); // store_op1 (re_opcode_t op,
-UNSUPPORTED("eqn95cpnpj01ulxvedlp62t24"); // unsigned char *loc,
-UNSUPPORTED("4bho2a0suqymuq2e9rqlexiq3"); // int arg)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1hzyviac306vd3ph2a79xocx7"); // *loc = (unsigned char) op;
-UNSUPPORTED("bmuizeo6n9t1qzeegovoyri2g"); // do { (loc + 1)[0] = (arg) & 0377; (loc + 1)[1] = (arg) >> 8; } while (0);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1dmpl1eqm04oq44hm3nqojfqi
-// static void store_op2(re_opcode_t op, unsigned char *loc, int arg1, int arg2)
-public static Object store_op2(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("3uuxvmysdrpmrqq4esv6u5jvy"); // store_op2(re_opcode_t op,
-UNSUPPORTED("a8vol3cdyfu7j1q063xc83pt0"); // unsigned char *loc,
-UNSUPPORTED("dk2zk2gteycj6jwc1rcuw4jot"); // int arg1,
-UNSUPPORTED("afi4spwfrmjjgwzrd48g2eu1g"); // int arg2)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1hzyviac306vd3ph2a79xocx7"); // *loc = (unsigned char) op;
-UNSUPPORTED("6ula40dcnni5p95iedvl6iz0p"); // do { (loc + 1)[0] = (arg1) & 0377; (loc + 1)[1] = (arg1) >> 8; } while (0);
-UNSUPPORTED("692n1w538qervykzhu59yxbnn"); // do { (loc + 3)[0] = (arg2) & 0377; (loc + 3)[1] = (arg2) >> 8; } while (0);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 4oawjz5vt9t86ibo8qr5a5ot7
-// static void insert_op1(re_opcode_t op, unsigned char *loc, int arg, unsigned char *end)
-public static Object insert_op1(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("9kqafhtvgqir3019lsqbgnaik"); // insert_op1(re_opcode_t op,
-UNSUPPORTED("eqn95cpnpj01ulxvedlp62t24"); // unsigned char *loc,
-UNSUPPORTED("epz3wdlgykwaxdrfpx2zq4v1l"); // int arg,
-UNSUPPORTED("ebratu77atbhul7tuupzmelvf"); // unsigned char *end)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("169hmon34dm6xedl4afpa0i1j"); // register unsigned char *pfrom = end;
-UNSUPPORTED("45zeyp0r8qs22j0ji3pvdf6z6"); // register unsigned char *pto = end + 3;
-UNSUPPORTED("3022v7vf3t5s8s2dsxql29xo4"); // while (pfrom != loc)
-UNSUPPORTED("648ldcfu6yydgsxc2w4dn9lep"); // *--pto = *--pfrom;
-UNSUPPORTED("a9874mjpfiitct058pp2hkjid"); // store_op1 (op, loc, arg);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 v4p3krro14wk7jqs0uz06n05
-// static void insert_op2(re_opcode_t op, unsigned char *loc, int arg1, int arg2, unsigned char *end)
-public static Object insert_op2(Object... arg) {
-UNSUPPORTED("e2z2o5ybnr5tgpkt8ty7hwan1"); // static void
-UNSUPPORTED("2udn0ng3gbc8cd8v2x946r2ss"); // insert_op2(re_opcode_t op,
-UNSUPPORTED("eqn95cpnpj01ulxvedlp62t24"); // unsigned char *loc,
-UNSUPPORTED("9nlhn9pgj5kcxamj9gw78b0qw"); // int arg1,
-UNSUPPORTED("e6ty8yiwetqhvokp26upcjwjt"); // int arg2,
-UNSUPPORTED("ebratu77atbhul7tuupzmelvf"); // unsigned char *end)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("169hmon34dm6xedl4afpa0i1j"); // register unsigned char *pfrom = end;
-UNSUPPORTED("b1q68dlnzwnkjo4hd7zcri3hx"); // register unsigned char *pto = end + 5;
-UNSUPPORTED("3022v7vf3t5s8s2dsxql29xo4"); // while (pfrom != loc)
-UNSUPPORTED("648ldcfu6yydgsxc2w4dn9lep"); // *--pto = *--pfrom;
-UNSUPPORTED("cd1n16p68qnglebcy01f0qn6l"); // store_op2 (op, loc, arg1, arg2);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 e4latxw6wysh73m40r7m5x3jb
-// static boolean at_begline_loc_p(const char *pattern, const char *p, reg_syntax_t syntax)
-public static Object at_begline_loc_p(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("dvoumivore2yi3vu64r9o17rz"); // at_begline_loc_p(const char *pattern,
-UNSUPPORTED("1ysotgxi8uwyxakudbb9firnu"); // const char *p,
-UNSUPPORTED("3yknuo3jrjif745axkby3960n"); // reg_syntax_t syntax)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("8jnr30ihhlcqx0p7qembtdxv2"); // const char *prev = p - 2;
-UNSUPPORTED("7v8vzv9bs9dhey9spvhvxxgyp"); // boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
-UNSUPPORTED("ef16816hd7el6q6461fnw6p1l"); // return
-UNSUPPORTED("dumav0wvej216wv8szi4x00s7"); // /* After a subexpression? */
-UNSUPPORTED("3ki59spy9w7z11gtdahfx1ew3"); // (*prev == '(' && (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) || prev_prev_backslash))
-UNSUPPORTED("ck5g71shir4kf9n8pbhvzz9ti"); // /* After an alternative? */
-UNSUPPORTED("6zvsscasxk7x2dzo9s2jr9okc"); // || (*prev == '|' && (syntax & (((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) || prev_prev_backslash));
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1c0buhtq2gms7qzzw7ql4drl1
-// static boolean at_endline_loc_p(const char *p, const char *pend, reg_syntax_t syntax)
-public static Object at_endline_loc_p(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("8w70icoej05avtfcbstpra0d"); // at_endline_loc_p(const char *p,
-UNSUPPORTED("eououd67tewr9lfimix16skdn"); // const char *pend,
-UNSUPPORTED("3yknuo3jrjif745axkby3960n"); // reg_syntax_t syntax)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("eh8pwbqqa4049a7x1lhsxtsc1"); // const char *next = p;
-UNSUPPORTED("4wxnm7brzem3ywa9ptyl6m3he"); // boolean next_backslash = *next == '\\';
-UNSUPPORTED("6yvr1bnbn14453b6eonom0ubu"); // const char *next_next = p + 1 < pend ? p + 1 : 0;
-UNSUPPORTED("ef16816hd7el6q6461fnw6p1l"); // return
-UNSUPPORTED("5zilqqenoq1qg4oaqhst16iny"); // /* Before a subexpression? */
-UNSUPPORTED("bt1ckpmadq6m2rwsptz7rdax4"); // (syntax & (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) ? *next == ')'
-UNSUPPORTED("ch55eypsczed6pggvuky7qg54"); // : next_backslash && next_next && *next_next == ')')
-UNSUPPORTED("cguaa6op9dr0opeabtp5b3ucn"); // /* Before an alternative? */
-UNSUPPORTED("8fq9j881kguwbavolyyz6299l"); // || (syntax & (((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) ? *next == '|'
-UNSUPPORTED("84irf5dgp7xptskletavd7lcl"); // : next_backslash && next_next && *next_next == '|');
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 35rs0qiyjwppzg2ck5atwxnul
-// static boolean group_in_compile_stack(compile_stack_type compile_stack, regnum_t regnum)
-public static Object group_in_compile_stack(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("aja1fo6z3x54rgftvbds69e"); // group_in_compile_stack(compile_stack_type compile_stack,
-UNSUPPORTED("ddun09npytwyxleyy5nr14lky"); // regnum_t regnum)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("dfroqi0gdjuzge2bbdy5jzym0"); // int this_element;
-UNSUPPORTED("cf73uwdus915lin6frmrap08w"); // for (this_element = compile_stack.avail - 1;
-UNSUPPORTED("d8j8jtpe5iq1esx7uzvbvm14l"); // this_element >= 0;
-UNSUPPORTED("1xpv8yktiv0jzqarajl3v79zc"); // this_element--)
-UNSUPPORTED("bq2imq1log4s4jzgs1z1rv2lj"); // if (compile_stack.stack[this_element].regnum == regnum)
-UNSUPPORTED("8qe9dt2l8vdfqmmg989im37zb"); // return 1;
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 b8zwgtmxpoyrzfdfecydtrxda
-// static reg_errcode_t compile_range(const char **p_ptr, const char *pend, char * translate, reg_syntax_t syntax, unsigned char *b)
-public static Object compile_range(Object... arg) {
-UNSUPPORTED("9aerjmw5n52ektwk47t1r9bh0"); // static reg_errcode_t
-UNSUPPORTED("banxmfbwacgp17kgyqg9m8x68"); // compile_range(const char **p_ptr,
-UNSUPPORTED("ejc17tabtd2x12qzehf5o0sdm"); // const char *pend,
-UNSUPPORTED("cgokv0yhej0pe8aib1t4cxlz2"); // char * translate,
-UNSUPPORTED("1em1aqal71wcsn34n49xy07nb"); // reg_syntax_t syntax,
-UNSUPPORTED("3n1ptb0viq6trnbcy4c86udvu"); // unsigned char *b)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1m07wmw0rmjh2kja0xep3mall"); // unsigned this_char;
-UNSUPPORTED("yjjwp976mzzqbaq4la5vjvo"); // const char *p = *p_ptr;
-UNSUPPORTED("77gsk1nkdba3ni503f93jkxhi"); // unsigned int range_start, range_end;
-UNSUPPORTED("d8twi4xwvpjc0n8mumv8b1ht6"); // if (p == pend)
-UNSUPPORTED("94ycrvh63vkb1re4zpw8hjmuq"); // return REG_ERANGE;
-UNSUPPORTED("9fsyho4e2hiebyqb8qkinfir7"); // /* Even though the pattern is a signed `char *', we need to fetch
-UNSUPPORTED("3pyxw5ydi3c4tot9rd8kfdojm"); // with unsigned char *'s; if the high bit of the pattern character
-UNSUPPORTED("4cd58zz07lkzfj8p5blv29zy6"); // is set, the range endpoints will be negative if we fetch using a
-UNSUPPORTED("5loab6k7g2in3add2emwojqiz"); // signed char *.
-UNSUPPORTED("ktiibovpw3rzck0paixyi46"); // We also want to fetch the endpoints without translating them; the
-UNSUPPORTED("44ikyyh3eyhoi57l6n4hpq24u"); // appropriate translation is done in the bit-setting loop below. */
-UNSUPPORTED("234jza0nhkmiwh04ymakixz0n"); // /* The SVR4 compiler on the 3B2 had trouble with unsigned const char *. */
-UNSUPPORTED("bakbcowbgzdyup9hjat04heth"); // range_start = ((const unsigned char *) p)[-2];
-UNSUPPORTED("6thno4r8eqqdp5ffdk4l4xs3o"); // range_end = ((const unsigned char *) p)[0];
-UNSUPPORTED("eyt8946jvpa0gtrnsnyalwh7j"); // /* Have to increment the pointer into the pattern string, so the
-UNSUPPORTED("3xddmz8ld8kco5vdujzs1mda5"); // caller isn't still at the ending character. */
-UNSUPPORTED("3fa4923s6t6yycjm4mwp7vra6"); // (*p_ptr)++;
-UNSUPPORTED("deim4fwtozk7jqq58t4co6tpz"); // /* If the start is after the end, the range is empty. */
-UNSUPPORTED("a8txh7awa0h63gqw46mc6cesc"); // if (range_start > range_end)
-UNSUPPORTED("4heoi1bxvv6q4nbsuw4o3n2up"); // return syntax & ((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) ? REG_ERANGE : REG_NOERROR;
-UNSUPPORTED("c04gtbipb7crea92dxobvfr2o"); // /* Here we see why `this_char' has to be larger than an `unsigned
-UNSUPPORTED("1ylkxbvyuwl7mimub9q6r3fad"); // char' -- the range is inclusive, so if `range_end' == 0xff
-UNSUPPORTED("1sabxy9r3dw93krw4s4a7jvs5"); // (assuming 8-bit characters), we would otherwise go into an infinite
-UNSUPPORTED("akcgy517agwm89djtay996rlu"); // loop, since all characters <= 0xff. */
-UNSUPPORTED("8ascd4lg2uczakrabmoc2tbxc"); // for (this_char = range_start; this_char <= range_end; this_char++)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("96hzw7fz10m1eg84p3h8xw6md"); // (b[((unsigned char) ((translate ? (char) translate[(unsigned char) (this_char)] : (this_char)))) / 8] |= 1 << (((unsigned char) (translate ? (char) translate[(unsigned char) (this_char)] : (this_char))) % 8));
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("cwwrkrko9fc4redgkt1b13h6d"); // return REG_NOERROR;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 2w5dx8i20qj29gqbasz6ieo34
-// int re_compile_fastmap(struct re_pattern_buffer *bufp)
-public static Object re_compile_fastmap(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("bq6qjjl5z4ymj67dzg1sxznk"); // re_compile_fastmap(struct re_pattern_buffer *bufp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("9e6bnowy6jfhnib5uev3scpsu"); // int j, k;
-UNSUPPORTED("5dndxq85ri0pdc1zsswjws66p"); // fail_stack_type fail_stack;
-UNSUPPORTED("5vwwchpo0x2nq1kweizvzpx7r"); // char *destination;
-UNSUPPORTED("4hjgjnhp72gq4oozv5vrn8v10"); // register char *fastmap = bufp->fastmap;
-UNSUPPORTED("1j52put1dns981rqf534qs3le"); // unsigned char *pattern = bufp->buffer;
-UNSUPPORTED("1jmcmh4kbvfcpijmdwn6jc3nj"); // unsigned char *p = pattern;
-UNSUPPORTED("b53ls4akw5mhgh7jwfepoi7vo"); // register unsigned char *pend = pattern + bufp->used;
-UNSUPPORTED("cs2p9nwy2lugscf16o02dzs8e"); // /* Assume that each path through the pattern can be null until
-UNSUPPORTED("9dmmpbml2ftmau9q3col8nnct"); // proven otherwise. We set this false at the bottom of switch
-UNSUPPORTED("b68s3vc4td13a333tqb4omf2a"); // statement, to which we get only if a particular path doesn't
-UNSUPPORTED("et7h2ks857zgdavpz3yc5qe44"); // match the empty string. */
-UNSUPPORTED("51ynrqjxzi49qavh1cav2tkft"); // boolean path_can_be_null = 1;
-UNSUPPORTED("1gbvpj2yj85p505am5rilkj6r"); // /* We aren't doing a `succeed_n' to begin with. */
-UNSUPPORTED("5xxc75r9op15sgdu02o4lgxav"); // boolean succeed_n_p = 0;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("bbul77ox50tuvngn3t4agr5uo"); // do { fail_stack.stack = (fail_stack_elt_t *) alloca (5 * sizeof (fail_stack_elt_t)); if (fail_stack.stack == (void *)0) return -2; fail_stack.size = 5; fail_stack.avail = 0; } while (0);
-UNSUPPORTED("bzen69xwi5iake0fs9avj7zyk"); // bzero (fastmap, 1 << 8); /* Assume nothing's valid. */
-UNSUPPORTED("5t1sb7m6db0rmhvndw9dbiev3"); // bufp->fastmap_accurate = 1; /* It will be when we're done. */
-UNSUPPORTED("6jtlz1qyfqnlyp421hyq8of6x"); // bufp->can_be_null = 0;
-UNSUPPORTED("epinmskuv2cgr5ahv1yieh4wx"); // while (1)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("d9novosz5eiozbi3d0qtrp39a"); // if (p == pend || *p == succeed)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("6kmea0xiqrfcm0nj8n7td2oex"); // /* We have reached the (effective) end of pattern. */
-UNSUPPORTED("m3xwmrnky21zpg13i5rj47jr"); // if (!(fail_stack.avail == 0))
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("44fedf1x4d76z1qso6huhgzfg"); // bufp->can_be_null |= path_can_be_null;
-UNSUPPORTED("dr8ubpktswy9oks8vqmi0x94x"); // /* Reset for next path. */
-UNSUPPORTED("cqqk40u5ykr4up1khyq0hdreu"); // path_can_be_null = 1;
-UNSUPPORTED("701062lrplwck0vemijk6tqcn"); // p = fail_stack.stack[--fail_stack.avail].pointer;
-UNSUPPORTED("9rd1yahrea8hsebjyzzz61sl3"); // continue;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("a9id4zq8rzlovc4blpl12mdrm"); // /* We should never be about to go beyond the end of the pattern. */
-UNSUPPORTED("cf8srqrmhz47tb7zdgoe9ufhv"); // ;
-UNSUPPORTED("3d9jhchhw3lu8yajca4mi058b"); // switch (((re_opcode_t) *p++))
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("6y2d5u8u0sy9seg0d2wbqhh5e"); // /* I guess the idea here is to simply not bother with a fastmap
-UNSUPPORTED("mj34lm9e61u2qvfpqzkhd5io"); // if a backreference is used, since it's too hard to figure out
-UNSUPPORTED("9citude1apedkbhbg4qz50zt8"); // the fastmap for the corresponding group. Setting
-UNSUPPORTED("a0ktcb92qa12q41u9ncckmzua"); // `can_be_null' stops `re_search_2' from using the fastmap, so
-UNSUPPORTED("4rjoi86n2xfyhdheaakalexzv"); // that is all we do. */
-UNSUPPORTED("9zkejga7r0tbainhrb6zuw9os"); // case duplicate:
-UNSUPPORTED("crvpgpa1og37lio7o6tvycmsg"); // bufp->can_be_null = 1;
-UNSUPPORTED("7s6msojra17ajwq7l7wrmhhbx"); // goto done;
-UNSUPPORTED("cr9angfhvv1ykkzaoo7x91pyz"); // /* Following are the cases which match a character. These end
-UNSUPPORTED("5u9igxod775u9rmzhdtoj0uux"); // with `break'. */
-UNSUPPORTED("cw984demptqbnja38a25p2xi1"); // case exactn:
-UNSUPPORTED("99pcdhcif67xm8lp80laisjza"); // fastmap[p[1]] = 1;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("2ro4nzmlhhrmitxu9446arhlo"); // case charset:
-UNSUPPORTED("d5oxjemm2desl63l2fbifejay"); // for (j = *p++ * 8 - 1; j >= 0; j--)
-UNSUPPORTED("34lg6n1mkddxpy07uf61o2pq1"); // if (p[j / 8] & (1 << (j % 8)))
-UNSUPPORTED("ac5wgoqadttw9m0eqkmq93vpu"); // fastmap[j] = 1;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("2zj0t91dpl66cu75cb0h2j1hu"); // case charset_not:
-UNSUPPORTED("cagpd8yl8h3c4v8e4gh3f0z2w"); // /* Chars beyond end of map must be allowed. */
-UNSUPPORTED("7zzkrrvc3sqjxvhrr4s309imh"); // for (j = *p * 8; j < (1 << 8); j++)
-UNSUPPORTED("b1s3rgvbln9pwub90llybu41x"); // fastmap[j] = 1;
-UNSUPPORTED("d5oxjemm2desl63l2fbifejay"); // for (j = *p++ * 8 - 1; j >= 0; j--)
-UNSUPPORTED("a9l035zjjirwoyk53mqv16l5n"); // if (!(p[j / 8] & (1 << (j % 8))))
-UNSUPPORTED("ac5wgoqadttw9m0eqkmq93vpu"); // fastmap[j] = 1;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("buxp1030z7swkjl42wovj9hxd"); // case wordchar:
-UNSUPPORTED("erc7fe209pzd8kqxh3h4huo03"); // for (j = 0; j < (1 << 8); j++)
-UNSUPPORTED("e6f90hjwdfaen2gl195u9sabh"); // if (re_syntax_table[j] == 1)
-UNSUPPORTED("ac5wgoqadttw9m0eqkmq93vpu"); // fastmap[j] = 1;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("7frlpnfuvuphd3bzoulwg4vsr"); // case notwordchar:
-UNSUPPORTED("erc7fe209pzd8kqxh3h4huo03"); // for (j = 0; j < (1 << 8); j++)
-UNSUPPORTED("d6si8hs1n9s2q5b16vyt9ka5x"); // if (re_syntax_table[j] != 1)
-UNSUPPORTED("ac5wgoqadttw9m0eqkmq93vpu"); // fastmap[j] = 1;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("1bv8e740f9rna5i036bo292wc"); // case anychar:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("czlnu0hbyndj2sl7bud8algx4"); // int fastmap_newline = fastmap['\n'];
-UNSUPPORTED("2q6r1vdt5x04pt3p41rzto4yl"); // /* `.' matches anything ... */
-UNSUPPORTED("5ftk445qjdfu62ddixb4p6q0i"); // for (j = 0; j < (1 << 8); j++)
-UNSUPPORTED("ac5wgoqadttw9m0eqkmq93vpu"); // fastmap[j] = 1;
-UNSUPPORTED("93vg14cvrax6ffdlubqre52zy"); // /* ... except perhaps newline. */
-UNSUPPORTED("53qidfpnvywpfz8jbsitg0hk2"); // if (!(bufp->syntax & ((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1)))
-UNSUPPORTED("9wuk4mwn83ls1g7lick6497yp"); // fastmap['\n'] = fastmap_newline;
-UNSUPPORTED("e47uuia66ybg7wem8m4h8zf1m"); // /* Return if we have already set `can_be_null'; if we have,
-UNSUPPORTED("5o7fl6yjw81x2g5sww79aih3s"); // then the fastmap is irrelevant. Something's wrong here. */
-UNSUPPORTED("3750ces0c2deqeyn6w33ndhis"); // else if (bufp->can_be_null)
-UNSUPPORTED("380tmjmsc0f2y0m6vckz8g0ox"); // goto done;
-UNSUPPORTED("4nfkkkamxp2xfq2r2eg5c5880"); // /* Otherwise, have to check alternative paths. */
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("anhhi3sf756j0lcm11sy9nyfc"); // case no_op:
-UNSUPPORTED("7zj5ggx1l6hln4ude6h5p4hgw"); // case begline:
-UNSUPPORTED("8pqai98vstdak51ot078dn1ut"); // case endline:
-UNSUPPORTED("889sq08u5lsi3c6y2z7adu8ex"); // case begbuf:
-UNSUPPORTED("cx4ezn3s02koh0pq7idm2xvxc"); // case endbuf:
-UNSUPPORTED("a8jtmsnmpa4937exo9nhopyyb"); // case wordbound:
-UNSUPPORTED("2jqqzr491mztwr9h8hvs55ja1"); // case notwordbound:
-UNSUPPORTED("991vlwoc47i8p67jyv2qapdhy"); // case wordbeg:
-UNSUPPORTED("65os7te2jc1i6uacyszvy5spd"); // case wordend:
-UNSUPPORTED("9446ac5zvkn7r9yqkh2brh10l"); // case push_dummy_failure:
-UNSUPPORTED("ci4p4wle87mwq773w72esmnae"); // continue;
-UNSUPPORTED("f41u8fntqiy246yy3btlg6w1v"); // case jump_n:
-UNSUPPORTED("6coluo8cd7scxlqwnbvt3jqs5"); // case pop_failure_jump:
-UNSUPPORTED("d7ziafib9p2sa0rqh34hv3hwj"); // case maybe_pop_jump:
-UNSUPPORTED("9a1qj2mhg3oh4ehsjpp4d81on"); // case jump:
-UNSUPPORTED("7ifq76or69643hqib3roiq9f4"); // case jump_past_alt:
-UNSUPPORTED("ejqzfph0mmtiqin1hmi981bzm"); // case dummy_failure_jump:
-UNSUPPORTED("ddwq2jxcrhkxhe1dqkaf3heul"); // do { do { (j) = *(p) & 0377; (j) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("3s98ctay3wrlwmgbs6jycommh"); // p += j;
-UNSUPPORTED("4aknhsfjvky2yxmkba43w40on"); // if (j > 0)
-UNSUPPORTED("6ux57x1tcbm5aung2xa8i26f1"); // continue;
-UNSUPPORTED("1gcc9mlki3vcqxqcamgw15psl"); // /* Jump backward implies we just went through the body of a
-UNSUPPORTED("dhbf21he6r14900wxjfhl23n8"); // loop and matched nothing. Opcode jumped to should be
-UNSUPPORTED("b1z48ihpqy8w68mtnyaogzkre"); // `on_failure_jump' or `succeed_n'. Just treat it like an
-UNSUPPORTED("8sudhkuaiqtvp0rzeztrzphwa"); // ordinary jump. For a * loop, it has pushed its failure
-UNSUPPORTED("14e2cgrthjy5xos3c84nxu3b8"); // point already; if so, discard that as redundant. */
-UNSUPPORTED("eq8dnm5llhgszut0h62teamny"); // if ((re_opcode_t) *p != on_failure_jump
-UNSUPPORTED("8sbpd0r7b4u37kj9inzim8nty"); // && (re_opcode_t) *p != succeed_n)
-UNSUPPORTED("6ux57x1tcbm5aung2xa8i26f1"); // continue;
-UNSUPPORTED("4s6jr3tssbvzb5ee96md1ncoi"); // p++;
-UNSUPPORTED("ddwq2jxcrhkxhe1dqkaf3heul"); // do { do { (j) = *(p) & 0377; (j) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("3s98ctay3wrlwmgbs6jycommh"); // p += j;
-UNSUPPORTED("7s373wkpewfatxsumkd67pyu7"); // /* If what's on the stack is where we are now, pop it. */
-UNSUPPORTED("80wyvh0vjsiujqym2stjdj4wh"); // if (!(fail_stack.avail == 0)
-UNSUPPORTED("a3ueg01xdmhuq0grmerpgbvbb"); // && fail_stack.stack[fail_stack.avail - 1].pointer == p)
-UNSUPPORTED("3s1nxe7g3rfik4tqx98en3cd8"); // fail_stack.avail--;
-UNSUPPORTED("ci4p4wle87mwq773w72esmnae"); // continue;
-UNSUPPORTED("992rmruvdtrxnk46307iiqyjo"); // case on_failure_jump:
-UNSUPPORTED("753el6ua6knou432p32d1kbcc"); // case on_failure_keep_string_jump:
-UNSUPPORTED("ceceofttw3ld7litzqabu648u"); // handle_on_failure_jump:
-UNSUPPORTED("665sufie9pj8i06aycoqewann"); // do { do { (j) = *(p) & 0377; (j) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("dc5yaeh41cb0brsq1pv7799eq"); // /* For some patterns, e.g., `(a?)?', `p+j' here points to the
-UNSUPPORTED("2t3hud6hrminx80odtyp1iwa7"); // end of the pattern. We don't want to push such a point,
-UNSUPPORTED("547mpa99j3jp91cc97q8bgppy"); // since when we restore it above, entering the switch will
-UNSUPPORTED("d41nubecflssie5s3le3qh9ij"); // increment `p' past the end of the pattern. We don't need
-UNSUPPORTED("2a6fei9v5xjokdzwz2ib426kh"); // to push such a point since we obviously won't find any more
-UNSUPPORTED("9kvyfd4vo7d8i4eapffyigb8w"); // fastmap entries beyond `pend'. Such a pattern can match
-UNSUPPORTED("921h84ug24r379ndj6u4ti857"); // the null string, though. */
-UNSUPPORTED("a3exq030sp29tpsjuxvbncjka"); // if (p + j < pend)
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("6actr5ig2vfyitfzjmpn5gcvs"); // if (!(((fail_stack.avail == fail_stack.size) && !((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) ? 0 : ((fail_stack).stack[(fail_stack).avail++].pointer = p + j, 1)))
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("9fy78dg2q1uu4c2t1zsyaestf"); // ;
-UNSUPPORTED("cyqv0odsj3l93ykpf16zgxlh5"); // return -2;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("c0op0grmjt3kp22s10twqy66r"); // else
-UNSUPPORTED("crvpgpa1og37lio7o6tvycmsg"); // bufp->can_be_null = 1;
-UNSUPPORTED("3rb9irs4dl9mnesxjmb9f42vt"); // if (succeed_n_p)
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("vdcz3hf29s758qnvg2tdn3vc"); // do { do { (k) = *(p) & 0377; (k) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0); /* Skip the n. */
-UNSUPPORTED("501xoe7qse6xea1u7i29ck0mi"); // succeed_n_p = 0;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("bam1am28aekae7y6j816hx07n"); // continue;
-UNSUPPORTED("bdrmz6krrbsihqbsklz1j7d7a"); // case succeed_n:
-UNSUPPORTED("3gsxz3wc6v485diavavhdc980"); // /* Get to the number of times to succeed. */
-UNSUPPORTED("8mazj3o2k4ts6oo83xpc0clf6"); // p += 2;
-UNSUPPORTED("8o2myd39fg1ragrtinpt906a8"); // /* Increment p past the n for when k != 0. */
-UNSUPPORTED("4chyl5sa2aguucbi2603y1r7c"); // do { do { (k) = *(p) & 0377; (k) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("6zxjfjfmip0xaqdemcjjztblg"); // if (k == 0)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("b4wfmlrv6zbxvwrfouk2eo7kw"); // p -= 4;
-UNSUPPORTED("909biyv92rbqo3ayb2nd8yidv"); // succeed_n_p = 1; /* Spaghetti code alert. */
-UNSUPPORTED("1ubpxbj2kbf7554qirpm1k0mw"); // goto handle_on_failure_jump;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("ci4p4wle87mwq773w72esmnae"); // continue;
-UNSUPPORTED("dmqxgjrlj5ddxj88dw919ujoj"); // case set_number_at:
-UNSUPPORTED("9stirsnvehglwumsosptm8ngk"); // p += 4;
-UNSUPPORTED("ci4p4wle87mwq773w72esmnae"); // continue;
-UNSUPPORTED("6c0ei34e676sv2kl1dxfzm5lm"); // case start_memory:
-UNSUPPORTED("3q89uw4g68y7kyiitvliyykpb"); // case stop_memory:
-UNSUPPORTED("8mazj3o2k4ts6oo83xpc0clf6"); // p += 2;
-UNSUPPORTED("ci4p4wle87mwq773w72esmnae"); // continue;
-UNSUPPORTED("comxch6w0lbi64ejq9m4p0u7o"); // default:
-UNSUPPORTED("55kbrxcqu6yyh19ldzw88t99r"); // abort (); /* We have listed all the cases. */
-UNSUPPORTED("88ufjis6u0ijo8dyph0trsd9f"); // } /* switch *p++ */
-UNSUPPORTED("cwq7qsz40n4bhj5dg5eym4pub"); // /* Getting here means we have found the possible starting
-UNSUPPORTED("9cuw6gsavq5jezett5z0kqhtr"); // characters for one path of the pattern -- and that the empty
-UNSUPPORTED("1nuw25jxiky0vsokzstwqjshg"); // string does not match. We need not follow this path further.
-UNSUPPORTED("ir1qnihuj9d2pchsx533wqak"); // Instead, look at the next alternative (remembered on the
-UNSUPPORTED("2yh8to75n640o6rt44ql2gpr1"); // stack), or quit if no more. The test at the top of the loop
-UNSUPPORTED("48eepx7kyfmje1rnq1bcr79sq"); // does these things. */
-UNSUPPORTED("7b7dtwbvg82guicn1qbjlrm0i"); // path_can_be_null = 0;
-UNSUPPORTED("9iqvxxuyvmn0bkipb04jv1fp2"); // p = pend;
-UNSUPPORTED("8qk14yz36d7vk72ifwa7qiujq"); // } /* while p */
-UNSUPPORTED("fe2n2uj632yqtenyvepbd4on"); // /* Set `can_be_null' for the last path (also the first path, if the
-UNSUPPORTED("eoc9k5utu0yxlarln062f7ebo"); // pattern is empty). */
-UNSUPPORTED("3uys3oae24dxx6zj9f9r0b80z"); // bufp->can_be_null |= path_can_be_null;
-UNSUPPORTED("c1mu8v1bx1gc9xwu0pmd4wrmg"); // done:
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 aql5ifimwt0liaidklmsf048e
-// void re_set_registers(struct re_pattern_buffer *bufp, struct re_registers *regs, unsigned num_regs, regoff_t *starts, regoff_t *ends)
-public static Object re_set_registers(Object... arg) {
-UNSUPPORTED("c01vxogao855zs8fe94tpim9g"); // void
-UNSUPPORTED("4aeowny9csghzgfhys3rxd4bb"); // re_set_registers(struct re_pattern_buffer *bufp,
-UNSUPPORTED("v08al94r6tf851td77qv1lrw"); // struct re_registers *regs,
-UNSUPPORTED("cws3mkdihiuxfnp7ty29mle8p"); // unsigned num_regs,
-UNSUPPORTED("3bn37bfn6icqtacq0lj8zj9cg"); // regoff_t *starts,
-UNSUPPORTED("aqc83ygcz30vhx0fxtyw3a3gc"); // regoff_t *ends)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("d3ztzcne2cr4fi3m42q2opwfy"); // if (num_regs)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("9z36hkw7bkc2nch28htx6k0sp"); // bufp->regs_allocated = 1;
-UNSUPPORTED("atb5wuee0ohtv7w4cswzrtdfh"); // regs->num_regs = num_regs;
-UNSUPPORTED("6xqxd9992s4jjhafwdu58y4w3"); // regs->start = starts;
-UNSUPPORTED("1dplqbibwb9py7ly7iqtemaka"); // regs->end = ends;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("5err36958fxwo1a5uvi85wj9r"); // bufp->regs_allocated = 0;
-UNSUPPORTED("3jgm69kgp5moxxlzgyht3brgv"); // regs->num_regs = 0;
-UNSUPPORTED("1b975m061jnwz38mhlafj6a72"); // regs->start = regs->end = (regoff_t *) 0;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 8wxth458oyuuwe1d7zeibvlq3
-// int re_search(struct re_pattern_buffer *bufp, const char *string, int size, int startpos, int range, struct re_registers *regs)
-public static Object re_search(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("5punk3p7482f96e5oexdvqbus"); // re_search(struct re_pattern_buffer *bufp,
-UNSUPPORTED("bagvrj9iq4kkqcdgysmduv9t1"); // const char *string,
-UNSUPPORTED("1xy13yd3ws9kwbjft9qc97kcx"); // int size,
-UNSUPPORTED("9ohmanngcm89n339btr8asvfv"); // int startpos,
-UNSUPPORTED("23b7j6n4wp3b1b28bigxtgmnl"); // int range,
-UNSUPPORTED("erz9qq7ug4oj13nqxxy6jbbsy"); // struct re_registers *regs)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("5eefi20lbvtfppz7qla7ovjwv"); // return re_search_2 (bufp, (void *)0, 0, string, size, startpos, range,
-UNSUPPORTED("et83rvt66i87q8ub41vrx6w5v"); // regs, size);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 6aljedusbc3m5z49o0khre2m2
-// int re_search_2(struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int startpos, int range, struct re_registers *regs, int stop)
-public static Object re_search_2(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("5usfyqpnmi7csbuxwbxofoyw7"); // re_search_2(struct re_pattern_buffer *bufp,
-UNSUPPORTED("74m54b0hvpnb34rks2y7z9363"); // const char *string1,
-UNSUPPORTED("8nls60axvgy7utfkk3mgzdwb2"); // int size1,
-UNSUPPORTED("1iaduxc33uthqae9ewpgmxil1"); // const char *string2,
-UNSUPPORTED("dqei6asi26pdc31aztct1a8je"); // int size2,
-UNSUPPORTED("3w9t84zdf75a4tulh53r5von1"); // int startpos,
-UNSUPPORTED("5u62quyw1qekgwt8o4pnjcc5l"); // int range,
-UNSUPPORTED("5f39e12vpxsielezt5ujbqvho"); // struct re_registers *regs,
-UNSUPPORTED("7bd44vcdrb5ytkbgi2jb4dl2s"); // int stop)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("3z4qqbm5080y3sn2lfr6rs0nk"); // int val;
-UNSUPPORTED("4hjgjnhp72gq4oozv5vrn8v10"); // register char *fastmap = bufp->fastmap;
-UNSUPPORTED("e2n10ohqvssxiromz1ghi94lp"); // register char * translate = bufp->translate;
-UNSUPPORTED("iaij8d98sbsjgborym38smlw"); // int total_size = size1 + size2;
-UNSUPPORTED("cjv924qhstzo4k8fa23nn3y5t"); // int endpos = startpos + range;
-UNSUPPORTED("7etis36i9hk8smvitf2zjrk21"); // /* Check for out-of-range STARTPOS. */
-UNSUPPORTED("dtj4vp5xpp6ux07kkppwzg5ao"); // if (startpos < 0 || startpos > total_size)
-UNSUPPORTED("f3a98gxettwtewduvje9y3524"); // return -1;
-UNSUPPORTED("abu2iwp6rjr8ppylnna5u9yqs"); // /* Fix up RANGE if it might eventually take us outside
-UNSUPPORTED("9hmt2lbj7vhejhpf2d95tq14f"); // the virtual concatenation of STRING1 and STRING2.
-UNSUPPORTED("d3ccdgft2wzndli7yy75yesc6"); // Make sure we won't move STARTPOS below 0 or above TOTAL_SIZE. */
-UNSUPPORTED("7ynt8jnrj8clotz4nfyn2ysy9"); // if (endpos < 0)
-UNSUPPORTED("5ra97p6qdpo5phvpk9fwd2h3j"); // range = 0 - startpos;
-UNSUPPORTED("9w57i1mbsaq0ywxj3y6q7577v"); // else if (endpos > total_size)
-UNSUPPORTED("6boq6ulbdze7abapaemgg7svh"); // range = total_size - startpos;
-UNSUPPORTED("ds4p5oizcxuw4xycv8l0vcqdv"); // /* If the search isn't to be a backwards one, don't waste time in a
-UNSUPPORTED("djej1eoe004hvk7gffedre39u"); // search for a pattern that must be anchored. */
-UNSUPPORTED("cvy0dazfbe38ki1z0hsl3dn1l"); // if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("bpeukjf6wgkfxtlskf398co2v"); // if (startpos > 0)
-UNSUPPORTED("1bjpmpr3p20x2b029ko5zgklx"); // return -1;
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("ad8lfo0w7g7423hbhmk3ljtia"); // range = 1;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("86solugecvztzl7zf0cnd6cvd"); // /* Update the fastmap now if not correct already. */
-UNSUPPORTED("1d8z3kbyyw3rdl2mysjgwzxjl"); // if (fastmap && !bufp->fastmap_accurate)
-UNSUPPORTED("ckj45nonmakbapzpe7kn1d15x"); // if (re_compile_fastmap (bufp) == -2)
-UNSUPPORTED("kh5ykxeb4qomvs3j2wfbfj0v"); // return -2;
-UNSUPPORTED("78edqutsfw99a52tozy5vek1b"); // /* Loop through the string, looking for a place to start matching. */
-UNSUPPORTED("3s761dh42eu37yg4q6j6rw0kx"); // for (;;)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("4sxzib864bpin10halp8eff8a"); // /* If a fastmap is supplied, skip quickly over characters that
-UNSUPPORTED("d5j6rsa3cqak3dmcpdugforyy"); // cannot be the start of a match. If the pattern can match the
-UNSUPPORTED("bwce0xep6mggs5v11uftrozcs"); // null string, however, we don't need to skip characters; we want
-UNSUPPORTED("12gdm8hdukh6bx7z396xe3zzf"); // the first null string. */
-UNSUPPORTED("cj0pagb4mphhjuy0gimrygb50"); // if (fastmap && startpos < total_size && !bufp->can_be_null)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("6ofes2gdk56aoc5qpr3f4zr4a"); // if (range > 0) /* Searching forwards. */
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("67v7cteuwrvbevvug4l85mak"); // register const char *d;
-UNSUPPORTED("25rc040ywtpg6wfpwl19bnpyo"); // register int lim = 0;
-UNSUPPORTED("9qdwkju7e5sftfnsb8qapaizw"); // int irange = range;
-UNSUPPORTED("1wkzshwijxvvgs068kb4ducku"); // if (startpos < size1 && startpos + range >= size1)
-UNSUPPORTED("eiy4fhjr94xbrb2h7bvte577b"); // lim = range - (size1 - startpos);
-UNSUPPORTED("eu28a1ugba5e46l0ni4uhl4a"); // d = (startpos >= size1 ? string2 - size1 : string1) + startpos;
-UNSUPPORTED("cvmf6f97q523j1gxuc06p4zaw"); // /* Written out as an if-else to avoid testing `translate'
-UNSUPPORTED("42arvib5v1138qds1m4gq8ifq"); // inside the loop. */
-UNSUPPORTED("c1esipwvnh5vdk2nuoqprrzy9"); // if (translate)
-UNSUPPORTED("99bsp1v6500gcigrncj819bmz"); // while (range > lim
-UNSUPPORTED("7dwf7n5ce54ua4203lrcvsgyi"); // && !fastmap[(unsigned char)
-UNSUPPORTED("7fd297npapod0yzvmotp0ad6j"); // translate[(unsigned char) *d++]])
-UNSUPPORTED("ede1n2qkk5dq4dchoitn0ij36"); // range--;
-UNSUPPORTED("ex6jbb36b02x7vzl22fq0yh2l"); // else
-UNSUPPORTED("d6y3y331fli9a7o5dfc8fwn41"); // while (range > lim && !fastmap[(unsigned char) *d++])
-UNSUPPORTED("ede1n2qkk5dq4dchoitn0ij36"); // range--;
-UNSUPPORTED("7ov5wkldv7ip6gr3qqe7r9fwz"); // startpos += irange - range;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("bvrbbagbquje7me47zpel7bq4"); // else /* Searching backwards. */
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("84cdrx9bovy6vauwg0lqjqewy"); // register char c = (size1 == 0 || startpos >= size1
-UNSUPPORTED("4e056gfwhytvjg4a7elynhkew"); // ? string2[startpos - size1]
-UNSUPPORTED("8xrw0w684a0sbx04150wtf94o"); // : string1[startpos]);
-UNSUPPORTED("37wt6pwingk4yq2cmuffily2s"); // if (!fastmap[(unsigned char) (translate ? (char) translate[(unsigned char) (c)] : (c))])
-UNSUPPORTED("8vj5bzh7lvr4w2s7svhv0kgxc"); // goto advance;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("cgimbkjo920x6t1512vxlx8ko"); // /* If can't match the null string, and that's all we have left, fail. */
-UNSUPPORTED("445mlipz9ii8giv4yb08sv90e"); // if (range >= 0 && startpos == total_size && fastmap
-UNSUPPORTED("10kowgvu386ep80mmzt22sc9v"); // && !bufp->can_be_null)
-UNSUPPORTED("1bjpmpr3p20x2b029ko5zgklx"); // return -1;
-UNSUPPORTED("5ry8yqv40slwqwx0mofc5x95i"); // val = re_match_2_internal (bufp, string1, size1, string2, size2,
-UNSUPPORTED("3cfs2qe5fkkt6t09tbm9q025r"); // startpos, regs, stop);
-UNSUPPORTED("2djilouwt96a4942a9xk0bq2j"); // if (val >= 0)
-UNSUPPORTED("4bosd0hhkhi65o9tz6w39sd4r"); // return startpos;
-UNSUPPORTED("7mnsrrb2kz0jaysx2jmdwxxhs"); // if (val == -2)
-UNSUPPORTED("9hr24f7mnlogxg6ehbtrhe9ys"); // return -2;
-UNSUPPORTED("5ztyn3js8nuvtozugmyim7k2"); // advance:
-UNSUPPORTED("48h8uf83j8j6i9dl6uwpnxoai"); // if (!range)
-UNSUPPORTED("d1pumbibe8xz2i7gr1wj6zdak"); // break;
-UNSUPPORTED("9qvrpsi6e30j6d028sbxm75m8"); // else if (range > 0)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("9tfu9zglyv6ato7noi8by9cx7"); // range--;
-UNSUPPORTED("bpejet1xdfpyxq7gb5gygl6c6"); // startpos++;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("c1l5bq4p029ozyiuq76a11c6c"); // range++;
-UNSUPPORTED("1fnqbyp4904zoq2u6a0h2xo1u"); // startpos--;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("8azkpi8o0wzdufa90lw8hpt6q"); // return -1;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 cese97kukrkyoho0nl5aeefuf
-// int re_match(struct re_pattern_buffer *bufp, const char *string, int size, int pos, struct re_registers *regs)
-public static Object re_match(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("dv1reldaciy8oglpt3lvrj467"); // re_match(struct re_pattern_buffer *bufp,
-UNSUPPORTED("c9d38ul1z2b760kkkwbmup6aq"); // const char *string,
-UNSUPPORTED("8ax0ba4mtdwcwwg0ygxfl2hyx"); // int size,
-UNSUPPORTED("5wdd1vovm572huu99r72nr8kp"); // int pos,
-UNSUPPORTED("ly5zx6ikzskn7s3qibi5tipo"); // struct re_registers *regs)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("f3va2gee7dhwlha1g39azqlfa"); // int result = re_match_2_internal (bufp, (void *)0, 0, string, size,
-UNSUPPORTED("ea7wwobss2bdmnj8fhllcq46k"); // pos, regs, size);
-UNSUPPORTED("e73y2609z2557xahrcvzmcb8e"); // return result;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 4bis6vnixbumphbwvjkcy4c2n
-// int re_match_2(struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int pos, struct re_registers *regs, int stop)
-public static Object re_match_2(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("bo3qvsxgxy71pt7n5tjlfpl7q"); // re_match_2(struct re_pattern_buffer *bufp,
-UNSUPPORTED("8xwssdsckjeb1q0lmxlu07pk5"); // const char *string1,
-UNSUPPORTED("chena2gcw8p49mjvwjotj1ue5"); // int size1,
-UNSUPPORTED("7kll64nft07fqgencnx9f2u3h"); // const char *string2,
-UNSUPPORTED("12hpd55p7b671svle7njxpr6c"); // int size2,
-UNSUPPORTED("eyuz74k3yno3lawo6tmqeahqh"); // int pos,
-UNSUPPORTED("5du4j7mghegymbd75ui1ml4fw"); // struct re_registers *regs,
-UNSUPPORTED("2hcygji7llu5b02n114djuqj0"); // int stop)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("a2u8v8zl4azq1kujf4s4cuii1"); // int result = re_match_2_internal (bufp, string1, size1, string2, size2,
-UNSUPPORTED("7l7rv6dwb5eaxilwku2m9z8we"); // pos, regs, stop);
-UNSUPPORTED("e73y2609z2557xahrcvzmcb8e"); // return result;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 2xc3iz0d568vx4ken91tl6gyt
-// static int re_match_2_internal(struct re_pattern_buffer *bufp, const char *string1, int size1, const char *string2, int size2, int pos, struct re_registers *regs, int stop)
-public static Object re_match_2_internal(Object... arg) {
-UNSUPPORTED("eyp5xkiyummcoc88ul2b6tkeg"); // static int
-UNSUPPORTED("6pa1vmha3pyewzpq2e2wsz00n"); // re_match_2_internal(struct re_pattern_buffer *bufp,
-UNSUPPORTED("4itq0umd8n4zaefp01c54wxac"); // const char *string1,
-UNSUPPORTED("2da6uko1m9uyu226zvu3kgswo"); // int size1,
-UNSUPPORTED("62ljq7ee0r8hkx89qdr6zrcj1"); // const char *string2,
-UNSUPPORTED("eu49m9ze4ikwzobpj8jmx8zjf"); // int size2,
-UNSUPPORTED("fsoirv97r4lbqxpez1e1kh6l"); // int pos,
-UNSUPPORTED("5das77r3z9spuajdb6a5zoqcg"); // struct re_registers *regs,
-UNSUPPORTED("9byy70s4d1i719ix6yy7okfe0"); // int stop)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("n8hlkyr29gxgnkj4x75w0pbu"); // /* General temporaries. */
-UNSUPPORTED("5rwd4tuvikkbfw1s56awbwtbe"); // int mcnt;
-UNSUPPORTED("7ijkchsbw8xrlcbwdzkzy7sg5"); // unsigned char *p1;
-UNSUPPORTED("6wjea7744xso80td4x9ur7whp"); // /* Just past the end of the corresponding string. */
-UNSUPPORTED("1fqaa6ix61rs3yld0danksdzt"); // const char *end1, *end2;
-UNSUPPORTED("4qjvhq2dmvddcpe2sq02ul57e"); // /* Pointers into string1 and string2, just past the last characters in
-UNSUPPORTED("e2o1kagsjdr4x6alq0db0ex6"); // each to consider matching. */
-UNSUPPORTED("3lcnzq2ymn1yaonefakdi2gf9"); // const char *end_match_1, *end_match_2;
-UNSUPPORTED("2x1qwx7dh9vq9oyh9l2ffuhki"); // /* Where we are in the data, and the end of the current string. */
-UNSUPPORTED("44aamau4r9tm9tp5eks2hjeeg"); // const char *d, *dend;
-UNSUPPORTED("1v5unbhjqcfvkvfh3bwyzig4m"); // /* Where we are in the pattern, and the end of the pattern. */
-UNSUPPORTED("7juswz68hsy9xygg4vwwp1dk4"); // unsigned char *p = bufp->buffer;
-UNSUPPORTED("egc1gcrry7bqm2rmed1tbm4p7"); // register unsigned char *pend = p + bufp->used;
-UNSUPPORTED("e8rkyc240i479ffdjn5bis1o6"); // /* Mark the opcode just after a start_memory, so we can test for an
-UNSUPPORTED("asrb0rht6g8nqkxfrpbqqwhji"); // empty subpattern when we get to the stop_memory. */
-UNSUPPORTED("1xod1essveohmbzqsm3chxtaa"); // unsigned char *just_past_start_mem = 0;
-UNSUPPORTED("5cqk44skhero82pev2rwsxqod"); // /* We use this to map every character in the string. */
-UNSUPPORTED("b6qhkmvrybk31a74eyxl9sf73"); // char * translate = bufp->translate;
-UNSUPPORTED("clib1bwajaiu950opbz65380n"); // /* Failure point stack. Each place that can handle a failure further
-UNSUPPORTED("3lyfugbo3isunzbvdm5i0o4cj"); // down the line pushes a failure point on this stack. It consists of
-UNSUPPORTED("1w6peyhoigpqgnv3qujk00vnp"); // restart, regend, and reg_info for all registers corresponding to
-UNSUPPORTED("8qdk2kexk0h3w8v82dc1gi8fc"); // the subexpressions we're currently inside, plus the number of such
-UNSUPPORTED("c464idhhkc8aqmfjb0s7zn2jq"); // registers, and, finally, two char *'s. The first char * is where
-UNSUPPORTED("d39bcwihp0jxqnlaq775160n0"); // to resume scanning the pattern; the second one is where to resume
-UNSUPPORTED("bt7bl5ufgmqudglf331090q99"); // scanning the strings. If the latter is zero, the failure point is
-UNSUPPORTED("dxhf42bpkithht6k5midiilvm"); // a ``dummy''; if a failure happens and the failure point is a dummy,
-UNSUPPORTED("7k01qsxjsxh1mzfj3zkxymge4"); // it gets discarded and the next next one is tried. */
-UNSUPPORTED("5dndxq85ri0pdc1zsswjws66p"); // fail_stack_type fail_stack;
-UNSUPPORTED("3ussoc6j234lhv666usd1ujlb"); // /* We fill all the registers internally, independent of what we
-UNSUPPORTED("7hukvye8ngqw8xf4c86mq7ksb"); // return, for use in backreferences. The number here includes
-UNSUPPORTED("800kciibxx8zzy7gqlip12chx"); // an element for register zero. */
-UNSUPPORTED("9te8xao6v2wvrtemmbarxo8r7"); // size_t num_regs = bufp->re_nsub + 1;
-UNSUPPORTED("69fqftzbp36nb88gj0hyzt7n5"); // /* The currently active registers. */
-UNSUPPORTED("210a4lsg6g1jyyakcj1y0z9co"); // active_reg_t lowest_active_reg = ((1 << 8) + 1);
-UNSUPPORTED("cav7rdafkpj7lnazs9bzo4f01"); // active_reg_t highest_active_reg = (1 << 8);
-UNSUPPORTED("9lffam35cw7ao19j9sq1na2kz"); // /* Information on the contents of registers. These are pointers into
-UNSUPPORTED("ezs9s06ouogq0bo54g0m18dwg"); // the input strings; they record just what was matched (on this
-UNSUPPORTED("cnjuuaptdt6ott2ct87p0obeb"); // attempt) by a subexpression part of the pattern, that is, the
-UNSUPPORTED("74e8guuvf2ep3sm5wuwk3pvak"); // regnum-th regstart pointer points to where in the pattern we began
-UNSUPPORTED("3bvo1nxt2ti5kli33880w0y4f"); // matching and the regnum-th regend points to right after where we
-UNSUPPORTED("btmswfvhn3ofbmow8ypu5e13p"); // stopped matching the regnum-th subexpression. (The zeroth register
-UNSUPPORTED("1kngd0q79bcbooydkquebsoaf"); // keeps track of what the whole pattern matches.) */
-UNSUPPORTED("3bagrvj67tgg2hcld2oq7uq12"); // const char **regstart, **regend;
-UNSUPPORTED("cj6z5o1u5gz9fj1ldc50421nu"); // /* If a group that's operated upon by a repetition operator fails to
-UNSUPPORTED("9h8hefhboxbyq3lbhmtfl4dbe"); // match anything, then the register for its start will need to be
-UNSUPPORTED("269993sksx5a7dxx2skmjmuv0"); // restored because it will have been set to wherever in the string we
-UNSUPPORTED("8sl9yewrsty5lu2b0b5210k4l"); // are when we last see its open-group operator. Similarly for a
-UNSUPPORTED("64mro6c1shytou2fsehv14t6e"); // register's end. */
-UNSUPPORTED("dzseh4slrayug3iyhvd08tt7k"); // const char **old_regstart, **old_regend;
-UNSUPPORTED("60rk8kklgq8pft794dlh37glr"); // /* The is_active field of reg_info helps us keep track of which (possibly
-UNSUPPORTED("bavzn3th9ptlj1baje3pfbu2r"); // nested) subexpressions we are currently in. The matched_something
-UNSUPPORTED("3wklpcvgm1mxc3ncudzv3u7er"); // field of reg_info[reg_num] helps us tell whether or not we have
-UNSUPPORTED("9owj5d6jjiwrr65xe8b66ynmg"); // matched any of the pattern so far this time through the reg_num-th
-UNSUPPORTED("5o4rfc4vl6f2f4i6gl8zb2c12"); // subexpression. These two fields get reset each time through any
-UNSUPPORTED("jainf18l355wvb9svfolzfyu"); // loop their register is in. */
-UNSUPPORTED("cldhi92ebvv3qkzk7hcp1acpx"); // register_info_type *reg_info;
-UNSUPPORTED("3tm9df4zwjcbf5wzasl5vbo41"); // /* The following record the register info as found in the above
-UNSUPPORTED("62fw4aryj1l9mpyzofxartoaf"); // variables when we find a match better than any we've seen before.
-UNSUPPORTED("3yswh3sslq5jxfw5qiqyposlu"); // This happens as we backtrack through the failure points, which in
-UNSUPPORTED("7fwl7a78gtt9lpholdubg8h20"); // turn happens only if we have not yet matched the entire string. */
-UNSUPPORTED("bv3kpg4ykugxqsd55m9yhp5af"); // unsigned best_regs_set = 0;
-UNSUPPORTED("boct5aaty3lmh8421fbwe811s"); // const char **best_regstart, **best_regend;
-UNSUPPORTED("4rxhejgld2fxwm1gablnrag3j"); // /* Logically, this is `best_regend[0]'. But we don't want to have to
-UNSUPPORTED("7qi1q2tujh3qj95sucmglupqv"); // allocate space for that if we're not allocating space for anything
-UNSUPPORTED("awo7q2rkwc6jlfdsam4my1k84"); // else (see below). Also, we never need info about register 0 for
-UNSUPPORTED("2f9d4yn8chlunlz3lckbg2mw0"); // any of the other register vectors, and it seems rather a kludge to
-UNSUPPORTED("dixl88kjwfhphwh4xmk51px61"); // treat `best_regend' differently than the rest. So we keep track of
-UNSUPPORTED("lthy8n6i428ea9wqx66x5syo"); // the end of the best match so far in a separate variable. We
-UNSUPPORTED("1g3sl9fbv6pwfi9bysp5k62i"); // initialize this to NULL so that when we backtrack the first time
-UNSUPPORTED("ek5k7ui0tsvl05jargwtlh04g"); // and need to test it, it's not garbage. */
-UNSUPPORTED("274v72hhp6qzltud0qx3natuw"); // const char *match_end = (void *)0;
-UNSUPPORTED("ce5dox5nl3mnb89gapdwnz2co"); // /* This helps SET_REGS_MATCHED avoid doing redundant work. */
-UNSUPPORTED("7rtu9eogaexvklmhbd0nvi8rq"); // int set_regs_matched_done = 0;
-UNSUPPORTED("6f52yhx59atis4v6w50r78tpr"); // /* Used when we pop values we don't care about. */
-UNSUPPORTED("cuer8lfpvninqja7rr37wv7vr"); // const char **reg_dummy;
-UNSUPPORTED("1tfv2eq96tkv3dnxi9htt3ogy"); // register_info_type *reg_info_dummy;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("bbul77ox50tuvngn3t4agr5uo"); // do { fail_stack.stack = (fail_stack_elt_t *) alloca (5 * sizeof (fail_stack_elt_t)); if (fail_stack.stack == (void *)0) return -2; fail_stack.size = 5; fail_stack.avail = 0; } while (0);
-UNSUPPORTED("f2odxckhb2j0jb0skzptkj1li"); // /* Do not bother to initialize all the register variables if there are
-UNSUPPORTED("7rdujqxkgmrsifkkjc8uc4uf8"); // no groups in the pattern, as it takes a fair amount of time. If
-UNSUPPORTED("a8btab3qm6qk1ruzu54espdbw"); // there are groups, we include space for register 0 (the whole
-UNSUPPORTED("2fkpn3ylgs86igj0rin9q175c"); // pattern), even though we never use it, since it simplifies the
-UNSUPPORTED("a82pq8o4xe5vl6izykmrmv80p"); // array indexing. We should fix this. */
-UNSUPPORTED("3b6nyivy298vtrccdf2yz5zfy"); // if (bufp->re_nsub)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("3s4x1dwphpxvwftzx6myntwof"); // regstart = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("2q4zpv4cg2m1hlu19z7n20v0i"); // regend = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("dncg8rhgtq841coamkzozn70f"); // old_regstart = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("dyvpshht388f50j2qsprkqq31"); // old_regend = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("dprck6oszi2zdnvn8ranbm5ax"); // best_regstart = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("3dm3mock6ighuyjpbnckimggr"); // best_regend = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("5732hglv8omqh0obbstzw9ovr"); // reg_info = ((register_info_type *) alloca ((num_regs) * sizeof (register_info_type)));
-UNSUPPORTED("4itgi9p0hm10q9gc8ligcmjw9"); // reg_dummy = ((const char * *) alloca ((num_regs) * sizeof (const char *)));
-UNSUPPORTED("2w784gfhj47yvqr5bkl3rnvb1"); // reg_info_dummy = ((register_info_type *) alloca ((num_regs) * sizeof (register_info_type)));
-UNSUPPORTED("bknt92c4iiz2fki0ya4b4zu9l"); // if (!(regstart && regend && old_regstart && old_regend && reg_info
-UNSUPPORTED("bvpk762fja9xad61rr2ecsbun"); // && best_regstart && best_regend && reg_dummy && reg_info_dummy))
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("8f1nfq1jn2ejt7ub9midgshrh"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("7ivse5do9752etnc6lpwep4id"); // return -2;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("9hkjvu3lvnwrjs0wre7judo3c"); // /* We must initialize all our variables to NULL, so that
-UNSUPPORTED("45j98q6y8yuy75ls6dsgx1k64"); // `FREE_VARIABLES' doesn't try to free them. */
-UNSUPPORTED("2lkorxvitynsptmav1g59ixmb"); // regstart = regend = old_regstart = old_regend = best_regstart
-UNSUPPORTED("bzn1un5rdvzm7al9b58svbna4"); // = best_regend = reg_dummy = (void *)0;
-UNSUPPORTED("d9o9396ai0y6hfmg0mj1ebkq3"); // reg_info = reg_info_dummy = (register_info_type *) (void *)0;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("8w78v1mfbuuwhx2hypx8jcldw"); // /* The starting position is bogus. */
-UNSUPPORTED("a4wmr8zj9xfpfbqugg1rwnak2"); // if (pos < 0 || pos > size1 + size2)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("7sq147wjkuyi93ra9jbzwkvbf"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("62ko03w39aomt1h9y758mag0k"); // return -1;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("cqf83jwvi6ehnlngujy4qchdu"); // /* Initialize subexpression text positions to -1 to mark ones that no
-UNSUPPORTED("57srgq1s42r2qebxntv9z4v5k"); // start_memory/stop_memory has been seen for. Also initialize the
-UNSUPPORTED("1ow37crla9qcqw19bbyb805t9"); // register information struct. */
-UNSUPPORTED("9ydw7k6i7j7x2k6zngd59rojt"); // for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("2kyhfd6kl7ms8bwg1wlvfqwap"); // regstart[mcnt] = regend[mcnt]
-UNSUPPORTED("2kl8ke0fnk9nauyk9zokcxkoj"); // = old_regstart[mcnt] = old_regend[mcnt] = (®_unset_dummy);
-UNSUPPORTED("91q00i6munm3i7qie7rj8jfei"); // ((reg_info[mcnt]).bits.match_null_string_p) = 3;
-UNSUPPORTED("afk8kaqsmcxqe0q6zubefocrn"); // ((reg_info[mcnt]).bits.is_active) = 0;
-UNSUPPORTED("df366kaag3ynqzmm60vrmh0vx"); // ((reg_info[mcnt]).bits.matched_something) = 0;
-UNSUPPORTED("5mtz90agac60yikyx4k2p0tcy"); // ((reg_info[mcnt]).bits.ever_matched_something) = 0;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("j5sjexwvtormmkwlvyyw0j3m"); // /* We move `string1' into `string2' if the latter's empty -- but not if
-UNSUPPORTED("22snitog4zamx1t4ccq83m95r"); // `string1' is null. */
-UNSUPPORTED("e5i3kugt3ww6rnm9voflfgawq"); // if (size2 == 0 && string1 != (void *)0)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("e42qfjjyl84hogtxnpbthj5rz"); // string2 = string1;
-UNSUPPORTED("crben3jjw8pci91x5lvrk4w8q"); // size2 = size1;
-UNSUPPORTED("f01lcid5mzfewcivqnd332urs"); // string1 = 0;
-UNSUPPORTED("5c8judheb0ofzkgdnwqnml8z0"); // size1 = 0;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("e172015pwzssq7c0vo2tq5aq1"); // end1 = string1 + size1;
-UNSUPPORTED("4m5wyc9k9qkl4sfiwwyvvla1h"); // end2 = string2 + size2;
-UNSUPPORTED("92k1xad7xyoitcixjggddz2xx"); // /* Compute where to stop matching, within the two strings. */
-UNSUPPORTED("6gdkxgosf1sannyt40j9kmngq"); // if (stop <= size1)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("6cypxpgmpeoi6emdah5s9k61u"); // end_match_1 = string1 + stop;
-UNSUPPORTED("14iyugw7zeo04abwg6k9mz77r"); // end_match_2 = string2;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("ubox1xzc7tf43rh7nzqo0y2w"); // end_match_1 = end1;
-UNSUPPORTED("g15ad7lvemt1j3tfd3b2wy5n"); // end_match_2 = string2 + stop - size1;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("b72xjrsh15ceq6n0mp9o3dr3b"); // /* `p' scans through the pattern as `d' scans through the data.
-UNSUPPORTED("ee8kj3n0j7z3zgw3x29pr4iwg"); // `dend' is the end of the input string that `d' points within. `d'
-UNSUPPORTED("9ht9fo2bvlr07alij7ev6sc64"); // is advanced into the following input string whenever necessary, but
-UNSUPPORTED("delvy2rsoiwhe79dztx86nhlo"); // this happens before fetching; therefore, at the beginning of the
-UNSUPPORTED("4fil0e4w6u5hnt1i6cgmhslcj"); // loop, `d' can be pointing at the end of a string, but it cannot
-UNSUPPORTED("3m773nmhi0vb3kvwhk5zj1fvx"); // equal `string2'. */
-UNSUPPORTED("1sztmr22bzx9qg638iuxf0qcf"); // if (size1 > 0 && pos <= size1)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("effnp1jm0qoqpcub7rcliiklk"); // d = string1 + pos;
-UNSUPPORTED("a3z31vmcwv4izh4gaf0zzu63f"); // dend = end_match_1;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("a6h3karx5gb77i5icjwtr70s"); // d = string2 + pos - size1;
-UNSUPPORTED("2mh3yoyin5cy0p7onls0cxs88"); // dend = end_match_2;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("5i0sddp616zsw63jk38od62l4"); // ;
-UNSUPPORTED("99zhv2pwx2q8a48j197pw6xt4"); // /* This loops over pattern commands. It exits by returning from the
-UNSUPPORTED("7e60h1pt63bigon94i6v0grl5"); // function if the match is complete, or it drops through if the match
-UNSUPPORTED("b3n3kmzfara10ikrekjiv0woz"); // fails at this starting point in the input data. */
-UNSUPPORTED("3s761dh42eu37yg4q6j6rw0kx"); // for (;;)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("cf8srqrmhz47tb7zdgoe9ufhv"); // ;
-UNSUPPORTED("coqe9flw9y84q7eb1xt2wxm8v"); // if (p == pend)
-UNSUPPORTED("a41002aq4p23pyz97pvq70zys"); // { /* End of pattern means we might have succeeded. */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("c3on5mrar07ygte8kqbl2hntc"); // /* If we haven't matched the entire string, and we want the
-UNSUPPORTED("apgoqswuwqwo0jdc88f1g6zjk"); // longest match, try backtracking. */
-UNSUPPORTED("6quev9lqtkd3rm2zf8o08q0d4"); // if (d != end_match_2)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("84ttk9zo6qwdugyag6bsfijsa"); // /* 1 if this match ends in the same string (string1 or string2)
-UNSUPPORTED("3d7aa3i6sz2b5v1rdku8mfkve"); // as the best previous match. */
-UNSUPPORTED("99rxk6hqfc6820y8brqyzr1ix"); // boolean same_str_p = ((size1 && string1 <= (match_end) && (match_end) <= string1 + size1)
-UNSUPPORTED("5h23tai9w26g9uu3555t1s2ko"); // == (dend == end_match_1));
-UNSUPPORTED("a9j7f142ppbm4bfda6vllbzkt"); // /* 1 if this match is the best seen so far. */
-UNSUPPORTED("7ssv33yt0mo7z7naegb53acst"); // boolean best_match_p;
-UNSUPPORTED("406ocol9hh6qa1tg01aqw4fm4"); // /* AIX compiler got confused when this was combined
-UNSUPPORTED("doec2mp5fgho754yj67fiufk6"); // with the previous declaration. */
-UNSUPPORTED("3olytwmx4gzy8yajx9lv0w470"); // if (same_str_p)
-UNSUPPORTED("b8puesm16uljvnmkyguxlpjz2"); // best_match_p = d > match_end;
-UNSUPPORTED("ex6jbb36b02x7vzl22fq0yh2l"); // else
-UNSUPPORTED("8g5axzy7uh94mclmd8107jt4r"); // best_match_p = !(dend == end_match_1);
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("61g695v6madw50govi0fpaymy"); // if (!(fail_stack.avail == 0))
-UNSUPPORTED("c5mtgdtcl0w9vn5m7roo5mclf"); // { /* More failure points to try. */
-UNSUPPORTED("6k0fj673itx4y90om89cfw4au"); // /* If exceeds best match so far, save it. */
-UNSUPPORTED("8lvy2hc2kk7wk0osmu4kt3b46"); // if (!best_regs_set || best_match_p)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("c1z8tnsgrw2hio3750gukv093"); // best_regs_set = 1;
-UNSUPPORTED("6cvml1s44f1rz7ut1p9732o24"); // match_end = d;
-UNSUPPORTED("a6r7lto035pp3gvk1bdixang2"); // ;
-UNSUPPORTED("5lgbvvnv5vugg8j3y9jm7tmto"); // for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
-UNSUPPORTED("1fi5w21ki1vo1jwyr4xwgm27n"); // {
-UNSUPPORTED("36h25f46gwl1bjkvlv2hi12al"); // best_regstart[mcnt] = regstart[mcnt];
-UNSUPPORTED("38u63aln2507yexeleac5i5f6"); // best_regend[mcnt] = regend[mcnt];
-UNSUPPORTED("bf03xtomlwkahoqno8ua4cbpc"); // }
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("3cl1in74qmmbb26vs4qw3mcuv"); // goto fail;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("9608e8vynn7blihqg1sa5x6hm"); // /* If no failure points, don't restore garbage. And if
-UNSUPPORTED("cvm5ogwjizby9vpz4bh4t4kmf"); // last match is real best match, don't restore second
-UNSUPPORTED("5019dps6elcptg07efvg8ytlp"); // best one. */
-UNSUPPORTED("31h7b1f1py5xliuo37yr49j0e"); // else if (best_regs_set && !best_match_p)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("51sj2rq6npgedmtb80qyu24n8"); // restore_best_regs:
-UNSUPPORTED("eassx3c83qc4vxc85c75b9qjl"); // /* Restore best match. It may happen that `dend ==
-UNSUPPORTED("5pm2irkm5dt0s4qwuwz8u3q1h"); // end_match_1' while the restored d is in string2.
-UNSUPPORTED("bc82mepahwmg9x3r4zc1uhtn2"); // For example, the pattern `x.*y.*z' against the
-UNSUPPORTED("dux3vuywslng2dhkfnnw5vg60"); // strings `x-' and `y-z-', if the two strings are
-UNSUPPORTED("8xrw6nr4f038b5khvfblfbvnn"); // not consecutive in memory. */
-UNSUPPORTED("c6tldeu5ffnykyfto7hi9ixau"); // ;
-UNSUPPORTED("20z1s97l71qromoe39rg38hm2"); // d = match_end;
-UNSUPPORTED("3ue7lk6sdffqfud3cceri8m8b"); // dend = ((d >= string1 && d <= end1)
-UNSUPPORTED("67n43dsreslafvliflcrjntcd"); // ? end_match_1 : end_match_2);
-UNSUPPORTED("7f2q0145iwgp8w2wsim63zj7m"); // for (mcnt = 1; (unsigned) mcnt < num_regs; mcnt++)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("f2o08vllkyap6mdqirtbkpmpk"); // regstart[mcnt] = best_regstart[mcnt];
-UNSUPPORTED("3pqb99yerpeb7fyy71o36q7nc"); // regend[mcnt] = best_regend[mcnt];
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("7qpxyrpi9p8bv5o56myo9c2dh"); // } /* d != end_match_2 */
-UNSUPPORTED("eo36u7f29du5zdvcxohew6ccd"); // succeed_label:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ch5rhljwem9e6yq0bvid9b9dj"); // /* If caller wants register contents data back, do it. */
-UNSUPPORTED("1yp4u3stmh22ubjzoa5psbbuy"); // if (regs && !bufp->no_sub)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("3kol441pj0oa248vzhp3vv7ls"); // /* Have the register data arrays been allocated? */
-UNSUPPORTED("1gzi6m8z4rjss7i9b9wcz0nhw"); // if (bufp->regs_allocated == 0)
-UNSUPPORTED("bfr9pjr2qri3sxl2k6brn5xer"); // { /* No. So allocate them with malloc. We need one
-UNSUPPORTED("eo5lmm6txjqzwpnc51q2rr86p"); // extra element beyond `num_regs' for the `-1' marker
-UNSUPPORTED("1qr602sxafqljujgz9tt6qcf9"); // GNU code uses. */
-UNSUPPORTED("w1tdx38yyrw1sowe6ghaj2nk"); // regs->num_regs = ((30) > (num_regs + 1) ? (30) : (num_regs + 1));
-UNSUPPORTED("be8i44ggcohl9z9hz4rhqk56n"); // regs->start = ((regoff_t *) malloc ((regs->num_regs) * sizeof (regoff_t)));
-UNSUPPORTED("cyfi6zngbv1dslzcl7x1sr152"); // regs->end = ((regoff_t *) malloc ((regs->num_regs) * sizeof (regoff_t)));
-UNSUPPORTED("cxow73omypjzg053jt8epepo8"); // if (regs->start == (void *)0 || regs->end == (void *)0)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("eb9qndp4gf1s242vxc2lh5maj"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("dqq88wul2lqxsx8tregfubikv"); // return -2;
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("i0ztbbhawtrpj2duc3ya6kdq"); // bufp->regs_allocated = 1;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("6c4alibipwc6an6jcy479a3m"); // else if (bufp->regs_allocated == 1)
-UNSUPPORTED("73h0ws2srjiuc9g7nvfsil3p7"); // { /* Yes. If we need more elements than were already
-UNSUPPORTED("3k4931vs4niesagz1oxg57nbg"); // allocated, reallocate them. If we need fewer, just
-UNSUPPORTED("e6dbjm0iyzngr68xmg81z2z0m"); // leave it alone. */
-UNSUPPORTED("djowzzvskdbwjag9m9fnha4jh"); // if (regs->num_regs < num_regs + 1)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("9xesw41tb2u8ao5widm29kiyp"); // regs->num_regs = num_regs + 1;
-UNSUPPORTED("87dmzxu9te8vokzvs3irtuxov"); // ((regs->start) = (regoff_t *) realloc (regs->start, (regs->num_regs) * sizeof (regoff_t)));
-UNSUPPORTED("6e6qfl2iibo9mkatufr410gra"); // ((regs->end) = (regoff_t *) realloc (regs->end, (regs->num_regs) * sizeof (regoff_t)));
-UNSUPPORTED("1vrn0xsco7imnquwgs11osuf6"); // if (regs->start == (void *)0 || regs->end == (void *)0)
-UNSUPPORTED("1fi5w21ki1vo1jwyr4xwgm27n"); // {
-UNSUPPORTED("93c8iop6pb7zwgnohfyvit0s"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("7l01rs860ssm9kixuhgx9hdbq"); // return -2;
-UNSUPPORTED("bf03xtomlwkahoqno8ua4cbpc"); // }
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("ex6jbb36b02x7vzl22fq0yh2l"); // else
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("3fvt2dndjzd64gdhzxvql5d8b"); // /* These braces fend off a "empty body in an else-statement"
-UNSUPPORTED("2luomnvf5pqa41oaxy8f8r9or"); // warning under GCC when assert expands to nothing. */
-UNSUPPORTED("c6tldeu5ffnykyfto7hi9ixau"); // ;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("87z47ijxyqp3enbpawsz2ln6c"); // /* Convert the pointer data in `regstart' and `regend' to
-UNSUPPORTED("2au9uvntej9ho5mvvkamw1j5w"); // indices. Register zero has to be set differently,
-UNSUPPORTED("7hnlk3p3u0dhyz803a3lfbxnj"); // since we haven't kept track of any info for it. */
-UNSUPPORTED("35mb19qsz9130m513vyoka7y0"); // if (regs->num_regs > 0)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("9009sy5tyjmheeqydo5wo4kwq"); // regs->start[0] = pos;
-UNSUPPORTED("edxcovxefspqos0b0zuq6z7ha"); // regs->end[0] = ((dend == end_match_1)
-UNSUPPORTED("99qit228aypztxnllw89nwokv"); // ? ((regoff_t) (d - string1))
-UNSUPPORTED("4aa9l4flk3x9zqpcce1dwt1ta"); // : ((regoff_t) (d - string2 + size1)));
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("egg8arm7ozeve9mx29jgkz7bs"); // /* Go through the first `min (num_regs, regs->num_regs)'
-UNSUPPORTED("9c1fouoack9c0oqkqs0d1tbyn"); // registers, since that is all we initialized. */
-UNSUPPORTED("76y0zjrbtva0kjq7q5c1wths1"); // for (mcnt = 1; (unsigned) mcnt < ((num_regs) < (regs->num_regs) ? (num_regs) : (regs->num_regs));
-UNSUPPORTED("1eh3h1x9wgjp35deszyvz3o6e"); // mcnt++)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("b0l8ghi3p5kmv8ns6tw59wvuu"); // if (((regstart[mcnt]) == (®_unset_dummy)) || ((regend[mcnt]) == (®_unset_dummy)))
-UNSUPPORTED("nmubntmt76n8354k37ekf09c"); // regs->start[mcnt] = regs->end[mcnt] = -1;
-UNSUPPORTED("ecas48ylhxx9t2hquqr1nnwzj"); // else
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("elvx8lxakvbaqd1oax9ecwh6w"); // regs->start[mcnt]
-UNSUPPORTED("2ftoc2pu10jb5p4scmxq2z1j2"); // = (regoff_t) ((size1 && string1 <= (regstart[mcnt]) && (regstart[mcnt]) <= string1 + size1) ? ((regoff_t) ((regstart[mcnt]) - string1)) : ((regoff_t) ((regstart[mcnt]) - string2 + size1)));
-UNSUPPORTED("eblc8kac69cvh0xmx81t3z7qw"); // regs->end[mcnt]
-UNSUPPORTED("7lahjjs9zz1e6q38t501ceam8"); // = (regoff_t) ((size1 && string1 <= (regend[mcnt]) && (regend[mcnt]) <= string1 + size1) ? ((regoff_t) ((regend[mcnt]) - string1)) : ((regoff_t) ((regend[mcnt]) - string2 + size1)));
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("dud4yeckicq4pijwz9m705cmx"); // /* If the regs structure we return has more elements than
-UNSUPPORTED("dg2liz6izarfhgllr7c0lvfzx"); // were in the pattern, set the extra elements to -1. If
-UNSUPPORTED("bgul1odz2k47e5yo08ifpsxux"); // we (re)allocated the registers, this is the case,
-UNSUPPORTED("8pq9l6jwi4wy8aly679isfqnx"); // because we always allocate enough to have at least one
-UNSUPPORTED("ccbog2f5misacunpi5lovnpm0"); // -1 at the end. */
-UNSUPPORTED("3rm0qbtrqgfau6g7gecmhdspm"); // for (mcnt = num_regs; (unsigned) mcnt < regs->num_regs; mcnt++)
-UNSUPPORTED("129q7ylakhk2gu6j7p4jpz372"); // regs->start[mcnt] = regs->end[mcnt] = -1;
-UNSUPPORTED("93qdoi4cltvsoa26wtattpcrj"); // } /* regs && !bufp->no_sub */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("4wc9t8vouh3w18pod77gkuoaz"); // mcnt = d - pos - ((dend == end_match_1)
-UNSUPPORTED("48tr2aou1bn895ggwv1qgo056"); // ? string1
-UNSUPPORTED("e9wr9ptogadx1o3labo85tlgf"); // : string2 - size1);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("8f1nfq1jn2ejt7ub9midgshrh"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("c0a9sr78bshk0e2ijyxlzxg7h"); // return mcnt;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("b0kkxy3zkf3f430688gewaj4w"); // /* Otherwise match next pattern command. */
-UNSUPPORTED("3d9jhchhw3lu8yajca4mi058b"); // switch (((re_opcode_t) *p++))
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("1cr7m9kscv8emiq2bhdx0l21"); // /* Ignore these. Used to ignore the n of succeed_n's which
-UNSUPPORTED("4p7fiu2s102akmzhjtzxqkrdi"); // currently have n == 0. */
-UNSUPPORTED("anhhi3sf756j0lcm11sy9nyfc"); // case no_op:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("8xm4dpngfjaadz6e2suqjuja7"); // case succeed:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("97sc3afg030x5rva8s655k37e"); // goto succeed_label;
-UNSUPPORTED("bsqnanqt8sp33wb2pm6xt6ulq"); // /* Match the next n pattern characters exactly. The following
-UNSUPPORTED("4hpiyumzwmrkzpbtwhyro0nin"); // byte in the pattern defines n, and the n bytes after that
-UNSUPPORTED("126jkfju6a6kncm4twhsy8b50"); // are the characters to match. */
-UNSUPPORTED("cw984demptqbnja38a25p2xi1"); // case exactn:
-UNSUPPORTED("e299xchgd28m8kehs3yk4j0m0"); // mcnt = *p++;
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("bh28o7qdz7h0u89in1fxom93a"); // /* This is written out as an if-else so we don't waste time
-UNSUPPORTED("87zph5xuncm4m58n4ggl0buj8"); // testing `translate' inside the loop. */
-UNSUPPORTED("7jj6ay2afdj7lpspqsgwusj6m"); // if (translate)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("af97jdpx3vxfjkevna4yd8iu3"); // do
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("664ue5cxfdx7fkvvgla8dw3ko"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("4nbfd88egqevnftfub4el1t0p"); // if ((unsigned char) translate[(unsigned char) *d++]
-UNSUPPORTED("c44weohee2ybnj7w12bc184r0"); // != (unsigned char) *p++)
-UNSUPPORTED("bkcykqhkoe9lpop9i2qgzu9yp"); // goto fail;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("74t2bggypeoowelqm6xtisx30"); // while (--mcnt);
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("af97jdpx3vxfjkevna4yd8iu3"); // do
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("664ue5cxfdx7fkvvgla8dw3ko"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("aozx58qal2txvazcjwrwyio1g"); // if (*d++ != (char) *p++) goto fail;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("74t2bggypeoowelqm6xtisx30"); // while (--mcnt);
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("2o2dzkzmcvnlj1d5ychre7cqo"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("7tks8jmj7cqrcj4nyqm3djfno"); // /* Match any character except possibly a newline or a null. */
-UNSUPPORTED("1bv8e740f9rna5i036bo292wc"); // case anychar:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("6l2kf5tzbvscsr8vy2bos6ng7"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("avzqzqv7s0tr2npgctz1b2ana"); // if ((!(bufp->syntax & ((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1)) && (translate ? (char) translate[(unsigned char) (*d)] : (*d)) == '\n')
-UNSUPPORTED("83t3ma7nbx7fiz0zawdo05ob2"); // || (bufp->syntax & (((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) && (translate ? (char) translate[(unsigned char) (*d)] : (*d)) == '\000'))
-UNSUPPORTED("etjodgz127fwk1r4166wqxg7n"); // goto fail;
-UNSUPPORTED("2o2dzkzmcvnlj1d5ychre7cqo"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("p26x5fh4zcf5ddyi146lh558"); // d++;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("2ro4nzmlhhrmitxu9446arhlo"); // case charset:
-UNSUPPORTED("2zj0t91dpl66cu75cb0h2j1hu"); // case charset_not:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("8n4s0kz2yj50t5rvnitti5hyl"); // register unsigned char c;
-UNSUPPORTED("deppcas7zridwg11cevwayois"); // boolean not = (re_opcode_t) *(p - 1) == charset_not;
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("6mf4c0e1oxwfped5hh8u7fz2n"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("9aaydk7f3la99u6jfo9kyxp5i"); // c = (translate ? (char) translate[(unsigned char) (*d)] : (*d)); /* The character to match. */
-UNSUPPORTED("cc3v2ndt3kmkt0r26mvu8ftfi"); // /* Cast to `unsigned' instead of `unsigned char' in case the
-UNSUPPORTED("2szsk231obr0m7gvx69h0jje"); // bit list is a full 32 bytes long. */
-UNSUPPORTED("2bmmfw3dqxl0rnfrjgzxlk2gw"); // if (c < (unsigned) (*p * 8)
-UNSUPPORTED("721an1atvtz1g2jzxegur68o9"); // && p[1 + c / 8] & (1 << (c % 8)))
-UNSUPPORTED("16fenxsijr0vmtxzyb8psvofo"); // not = !not;
-UNSUPPORTED("9pg86i2witmji2iwfc6jhm9j8"); // p += 1 + *p;
-UNSUPPORTED("6rkrjn87jai9lq2d129w2h7g8"); // if (!not) goto fail;
-UNSUPPORTED("632iqprva0k4cq9az0mwgy0ua"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("2ddfcenepkfjkw5qk64bs5pjs"); // d++;
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ax93bd9x56qib5q0g9wvm2qcy"); // /* The beginning of a group is represented by start_memory.
-UNSUPPORTED("e38f63tkhbflv1p396hknxdwy"); // The arguments are the register number in the next byte, and the
-UNSUPPORTED("c64u5xem18b4mqy79877eqfcs"); // number of groups inner to this one in the next. The text
-UNSUPPORTED("dbdk515uk79zg5hip4kru378u"); // matched within the group is recorded (in the internal
-UNSUPPORTED("8j4ek9641uur5fxjgkizkb06i"); // registers data structure) under the register number. */
-UNSUPPORTED("6c0ei34e676sv2kl1dxfzm5lm"); // case start_memory:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("dus38gizylomi1jon9xa9a9gi"); // /* Find out if this group can match the empty string. */
-UNSUPPORTED("1e0kjdjtknuzgjuge4nu2rvvv"); // p1 = p; /* To send to group_match_null_string_p. */
-UNSUPPORTED("1lvbl8fbh2kfnyp76ial3wyge"); // if (((reg_info[*p]).bits.match_null_string_p) == 3)
-UNSUPPORTED("1yvuh3ye9g4wks9vy2jwlla11"); // ((reg_info[*p]).bits.match_null_string_p)
-UNSUPPORTED("crq9r37sdaimjd51v7rr5rifz"); // = group_match_null_string_p (&p1, pend, reg_info);
-UNSUPPORTED("ea7tbs2n5vp5hwe31r9ym79d1"); // /* Save the position in the string where we were the last time
-UNSUPPORTED("b64kvidnxk3y1txigfo1pl99t"); // we were at this open-group operator in case the group is
-UNSUPPORTED("6w4zb5o8illk23kubyigl5wig"); // operated upon by a repetition operator, e.g., with `(a*)*b'
-UNSUPPORTED("9d7meouvzhwtqek5lj1q19d3n"); // against `ab'; then we want to ignore where we are now in
-UNSUPPORTED("elzx65ahdc47yfgprdxj1sjl1"); // the string in case this attempt to match fails. */
-UNSUPPORTED("1qsu4c7bkuq3vofwjjijw1e3k"); // old_regstart[*p] = ((reg_info[*p]).bits.match_null_string_p)
-UNSUPPORTED("6fd5qfd27ra7djj22yvjcis5j"); // ? ((regstart[*p]) == (®_unset_dummy)) ? d : regstart[*p]
-UNSUPPORTED("eg76mx8hl74su6aktlwej5s9l"); // : regstart[*p];
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("837i1cwpv2l0eyw1m5ly72e5q"); // regstart[*p] = d;
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("1pjvhqen01q14gt1u2ipmfn78"); // ((reg_info[*p]).bits.is_active) = 1;
-UNSUPPORTED("7yf870aytlplqgsdoktbv23o8"); // ((reg_info[*p]).bits.matched_something) = 0;
-UNSUPPORTED("5qe9dgngpf1z0x2gaouwzuh33"); // /* Clear this whenever we change the register activity status. */
-UNSUPPORTED("dckkxudermmywleu21wcsh6wk"); // set_regs_matched_done = 0;
-UNSUPPORTED("4v5t4lf3m98srbm2dhq6otf2z"); // /* This is the new highest active register. */
-UNSUPPORTED("3z1903inbnuh0u7jl2xrmgjwy"); // highest_active_reg = *p;
-UNSUPPORTED("c5um95y8m6g52hnhowkayvp2f"); // /* If nothing was active before, this is the new lowest active
-UNSUPPORTED("33rqqd71rbnr2br416p5pko3h"); // register. */
-UNSUPPORTED("bbhu9dtas1n5xtephxw36fi5o"); // if (lowest_active_reg == ((1 << 8) + 1))
-UNSUPPORTED("2zewvmpnwbg7dwzrf032pngut"); // lowest_active_reg = *p;
-UNSUPPORTED("247xejwk6ewf4ot2xglm0foep"); // /* Move past the register number and inner group count. */
-UNSUPPORTED("8mazj3o2k4ts6oo83xpc0clf6"); // p += 2;
-UNSUPPORTED("9h673b93wmz9abfvqdehryv9v"); // just_past_start_mem = p;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("958t8ufjo5g39llb7x2vk8gey"); // /* The stop_memory opcode represents the end of a group. Its
-UNSUPPORTED("3diz7dyrj8z41hkn0gv0u90nj"); // arguments are the same as start_memory's: the register
-UNSUPPORTED("ancmrtd12048bir4um1a42lk2"); // number, and the number of inner groups. */
-UNSUPPORTED("3q89uw4g68y7kyiitvliyykpb"); // case stop_memory:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("6myxkco5k76etfo4hu8yr5wbc"); // /* We need to save the string position the last time we were at
-UNSUPPORTED("79ss3fgfp7q2srolhcfv565wc"); // this close-group operator in case the group is operated
-UNSUPPORTED("4g7o1h1hqyb3ed7o7xoukat2e"); // upon by a repetition operator, e.g., with `((a*)*(b*)*)*'
-UNSUPPORTED("7ya5jxfxzzwl6gbtsm5gp06kq"); // against `aba'; then we want to ignore where we are now in
-UNSUPPORTED("elzx65ahdc47yfgprdxj1sjl1"); // the string in case this attempt to match fails. */
-UNSUPPORTED("6tbn6td0l64kefdcsz4l5v4aq"); // old_regend[*p] = ((reg_info[*p]).bits.match_null_string_p)
-UNSUPPORTED("6ei747c3h9zuuwuuoeuutcbvc"); // ? ((regend[*p]) == (®_unset_dummy)) ? d : regend[*p]
-UNSUPPORTED("8mmdpk59qqy95iwnf47y5p6dl"); // : regend[*p];
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("1g18yrcifqxtxpfho7si6eeta"); // regend[*p] = d;
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("7vycocnhdpq8h26dxroqf6qv3"); // /* This register isn't active anymore. */
-UNSUPPORTED("7ntazk8yalx2z9fbvgnqmgjyj"); // ((reg_info[*p]).bits.is_active) = 0;
-UNSUPPORTED("5qe9dgngpf1z0x2gaouwzuh33"); // /* Clear this whenever we change the register activity status. */
-UNSUPPORTED("dckkxudermmywleu21wcsh6wk"); // set_regs_matched_done = 0;
-UNSUPPORTED("42clmiwrmzlsyiozfpc5z4nc9"); // /* If this was the only register active, nothing is active
-UNSUPPORTED("1ujxcs2n921afe94v57lwlhbh"); // anymore. */
-UNSUPPORTED("63r84tgp0e98zrp5vtjft0j7v"); // if (lowest_active_reg == highest_active_reg)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("8kmp96mmwzp28qyx61vh0flaz"); // lowest_active_reg = ((1 << 8) + 1);
-UNSUPPORTED("7x2sqxkjont50piw66yo0dtpp"); // highest_active_reg = (1 << 8);
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("c1jewz2a8ue76qm3v9zzr62p2"); // { /* We must scan for the new highest active register, since
-UNSUPPORTED("decsayupwmti5a04jbhouqvoo"); // it isn't necessarily one less than now: consider
-UNSUPPORTED("2xmzbvq25xm2umlpe67f0xxcl"); // (a(b)c(d(e)f)g). When group 3 ends, after the f), the
-UNSUPPORTED("epks85v9quym7a8m6zf2fqi3"); // new highest active register is 1. */
-UNSUPPORTED("2txbhcyz9wjvsf90upkqlpnc2"); // unsigned char r = *p - 1;
-UNSUPPORTED("5734gbg5fpueutgkx1nymooqp"); // while (r > 0 && !((reg_info[r]).bits.is_active))
-UNSUPPORTED("bdia7d21cgyoa54eec4z33p89"); // r--;
-UNSUPPORTED("8n4iy0kw6ecl8rffe6zhoim7f"); // /* If we end up at register zero, that means that we saved
-UNSUPPORTED("euyoh0d7li8ww59zhb7bcmwss"); // the registers as the result of an `on_failure_jump', not
-UNSUPPORTED("9b4zvqn8u6k8s7opuitogjuop"); // a `start_memory', and we jumped to past the innermost
-UNSUPPORTED("2qdslp2g91aru02gnj2jzfngo"); // `stop_memory'. For example, in ((.)*) we save
-UNSUPPORTED("c49yz0o5hen5lvybntd5j2fns"); // registers 1 and 2 as a result of the *, but when we pop
-UNSUPPORTED("eqfql6meyzhinquampkweqzy6"); // back to the second ), we are at the stop_memory 1.
-UNSUPPORTED("3y5zlgk5fpwzvouq2l6ssxmd1"); // Thus, nothing is active. */
-UNSUPPORTED("34eseuqzde8opwrs60ycvdlou"); // if (r == 0)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("6sxj2komvl2u668mxzv7uw1bk"); // lowest_active_reg = ((1 << 8) + 1);
-UNSUPPORTED("4wvntivmvrdiicobd01fuopc1"); // highest_active_reg = (1 << 8);
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("ex6jbb36b02x7vzl22fq0yh2l"); // else
-UNSUPPORTED("2gpimcvwuqcsn5m8kxgtrur9s"); // highest_active_reg = r;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("6tnujp0ji1y0x3qf7nnoewlwi"); // /* If just failed to match something this time around with a
-UNSUPPORTED("c2a0wegxd9akp346q7kd756xk"); // group that's operated on by a repetition operator, try to
-UNSUPPORTED("5sojth3d9jro95jciohpo41gv"); // force exit from the ``loop'', and restore the register
-UNSUPPORTED("6y1gydjqgpmctcds7f5sg7r7a"); // information for this group that we had before trying this
-UNSUPPORTED("7k609wk6ordqikf4gj9wim2mb"); // last match. */
-UNSUPPORTED("drsdlw7kcvkqlu9vl2ekb5pva"); // if ((!((reg_info[*p]).bits.matched_something)
-UNSUPPORTED("djhystklzfwsz99ch5tg2mdul"); // || just_past_start_mem == p - 1)
-UNSUPPORTED("73puidl4bjed2y05glwuha2tr"); // && (p + 2) < pend)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("5bmgzdh5rp0tqqvuep6upitw5"); // boolean is_a_jump_n = 0;
-UNSUPPORTED("6i6e11jwv13din36enbo5swaa"); // p1 = p + 2;
-UNSUPPORTED("wr9bhelppzmwslf6sw3zxs9m"); // mcnt = 0;
-UNSUPPORTED("8y47wte4d9uar38b22v7dqq3g"); // switch ((re_opcode_t) *p1++)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("bok1esp1zekmbuklmyk3rk5rx"); // case jump_n:
-UNSUPPORTED("38gwuf75sc2x4fup5mqsis4x6"); // is_a_jump_n = 1;
-UNSUPPORTED("a8ugqe6z5croeioatypl4otaw"); // case pop_failure_jump:
-UNSUPPORTED("75n3w229uzeshyir5i61r1043"); // case maybe_pop_jump:
-UNSUPPORTED("6l3m2qx4riktyve4e2l0wh9fe"); // case jump:
-UNSUPPORTED("dnliw06x9ef4nef4vszyc6y2o"); // case dummy_failure_jump:
-UNSUPPORTED("4sq4b65a0bh8lf919g64pqica"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("c286v7bq7t229rlti3rgsn6i4"); // if (is_a_jump_n)
-UNSUPPORTED("70d9iq4l9znncby73z47xsgqd"); // p1 += 2;
-UNSUPPORTED("1fg4xctmq8acy7m0oob45guaz"); // break;
-UNSUPPORTED("cyzkq50b2b248lxpi6lj66jqs"); // default:
-UNSUPPORTED("2oxjzlotqn0ba3akkxgs9h02q"); // /* do nothing */ ;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("8yasklhrgy6q7ca1rahwnp80l"); // p1 += mcnt;
-UNSUPPORTED("efql51mwt6tl2tkzt0wc69svs"); // /* If the next operation is a jump backwards in the pattern
-UNSUPPORTED("b1jwyhb9r9kdtn75700ivpm08"); // to an on_failure_jump right before the start_memory
-UNSUPPORTED("32ioduqtcldpe0p955ukfx3zq"); // corresponding to this stop_memory, exit from the loop
-UNSUPPORTED("7u1pbravuknawsh6n44eiljij"); // by forcing a failure after pushing on the stack the
-UNSUPPORTED("1rtxd5d0unekapkzuv0h8bfs9"); // on_failure_jump's jump in the pattern, and d. */
-UNSUPPORTED("49ilcm43sqxuhnrflxjzpkyrz"); // if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump
-UNSUPPORTED("bbntf9gewbymuo5dr9q61l4ad"); // && (re_opcode_t) p1[3] == start_memory && p1[4] == *p)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("82lu6y87gmwdhb71nwh4nyhlo"); // /* If this group ever matched anything, then restore
-UNSUPPORTED("2hafp02wsznqsqyi5m15pval5"); // what its registers were before trying this last
-UNSUPPORTED("d7lxjfsfhmoewr3xbgu83ccq6"); // failed match, e.g., with `(a*)*b' against `ab' for
-UNSUPPORTED("2a1hjbfps60tel0gx3rexgyr7"); // regstart[1], and, e.g., with `((a*)*(b*)*)*'
-UNSUPPORTED("c9ye99yclkdsse5qxjva6xyqv"); // against `aba' for regend[3].
-UNSUPPORTED("dwcg6me58csfjm6h83aoldo1o"); // Also restore the registers for inner groups for,
-UNSUPPORTED("ainjqejclhkthdqm7hwkfddil"); // e.g., `((a*)(b*))*' against `aba' (register 3 would
-UNSUPPORTED("8je91go3933r1lpui4r55qp19"); // otherwise get trashed). */
-UNSUPPORTED("1eohn7q2w1elvkijli82m25w4"); // if (((reg_info[*p]).bits.ever_matched_something))
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("bah7hcsvx8y54udzheryy1hzy"); // unsigned r;
-UNSUPPORTED("8akg97mqbnr924ugno750b17t"); // ((reg_info[*p]).bits.ever_matched_something) = 0;
-UNSUPPORTED("7m9djhctqynaualhx1nqdnjc0"); // /* Restore this and inner groups' (if any) registers. */
-UNSUPPORTED("7js4crblmtp6bs951tlz5pibu"); // for (r = *p; r < (unsigned) *p + (unsigned) *(p + 1);
-UNSUPPORTED("41t6k9ezn45tjk4rj4o95hvw7"); // r++)
-UNSUPPORTED("1fi5w21ki1vo1jwyr4xwgm27n"); // {
-UNSUPPORTED("89r32r5193oexr1uoui24rp55"); // regstart[r] = old_regstart[r];
-UNSUPPORTED("ie5lviszvuyotv6i5dfa0pe5"); // /* xx why this test? */
-UNSUPPORTED("caayksps71ouk9rtbgpk336bb"); // if (old_regend[r] >= regstart[r])
-UNSUPPORTED("13lqnupq8b5xodzv3xff3oze1"); // regend[r] = old_regend[r];
-UNSUPPORTED("bf03xtomlwkahoqno8ua4cbpc"); // }
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("3aju47l7l855mt7l00l7xg11q"); // p1++;
-UNSUPPORTED("4sq4b65a0bh8lf919g64pqica"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("a9p5b9oxka3gxpe3wgzvhfj4b"); // do { char *destination; s_reg_t this_reg; ; ; ; ; ; ; ; while (((fail_stack).size - (fail_stack).avail) < (((0 ? 0 : highest_active_reg - lowest_active_reg + 1) * 3) + 4)) { if (!((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) return -2; ; ; } ; if (1) for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; this_reg++) { ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regstart[this_reg]); ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regend[this_reg]); ; ; ; ; ; ; fail_stack.stack[fail_stack.avail++] = (reg_info[this_reg].word); } ; fail_stack.stack[fail_stack.avail++].integer = (lowest_active_reg); ; fail_stack.stack[fail_stack.avail++].integer = (highest_active_reg); ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (p1 + mcnt); ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (d); ; ; } while (0);
-UNSUPPORTED("3cl1in74qmmbb26vs4qw3mcuv"); // goto fail;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("2wofa1c2dglau2ufwmcabib0n"); // /* Move past the register number and the inner group count. */
-UNSUPPORTED("8mazj3o2k4ts6oo83xpc0clf6"); // p += 2;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("7ckwgnb7aasatvtyteljdqc2k"); // /* \ has been turned into a `duplicate' command which is
-UNSUPPORTED("dmy8z2x1ttnsvz6kx6l9j4rtv"); // followed by the numeric value of as the register number. */
-UNSUPPORTED("9zkejga7r0tbainhrb6zuw9os"); // case duplicate:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("27u228yvq9k655bp1tq40v02i"); // register const char *d2, *dend2;
-UNSUPPORTED("bq38n54ifn0fjxun9mtdpyxkj"); // int regno = *p++; /* Get which register to match against. */
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("91m4oa28hi3m5f5icw5pumfab"); // /* Can't back reference a group which we've never matched. */
-UNSUPPORTED("9r6debcfgkrh9r4029g0p2tsz"); // if (((regstart[regno]) == (®_unset_dummy)) || ((regend[regno]) == (®_unset_dummy)))
-UNSUPPORTED("1k6xdu198jqq8v2oj3209y50s"); // goto fail;
-UNSUPPORTED("dng36k157gcr0rr6l2hysesr7"); // /* Where in input to try to start matching. */
-UNSUPPORTED("209civ9l0k19m94b62pp4080r"); // d2 = regstart[regno];
-UNSUPPORTED("eexsdzuwnhjynwkc8g0u6hnwm"); // /* Where to stop matching; if both the place to start and
-UNSUPPORTED("bup7nhzrolgesclm7ac7j3pke"); // the place to stop matching are in the same string, then
-UNSUPPORTED("8kg60w180bvkgrv4dgbrd491u"); // set to the place to stop, otherwise, for now have to use
-UNSUPPORTED("9tumayloc0nncf60m1sfzkjhl"); // the end of the first string. */
-UNSUPPORTED("9dfy4gfwxkdnc83mqwy6mg4hw"); // dend2 = (((size1 && string1 <= (regstart[regno]) && (regstart[regno]) <= string1 + size1)
-UNSUPPORTED("c0t5y6icuv24moevxaqu2h4zx"); // == (size1 && string1 <= (regend[regno]) && (regend[regno]) <= string1 + size1))
-UNSUPPORTED("ebo6m6ze117x4ioed7wvc6omz"); // ? regend[regno] : end_match_1);
-UNSUPPORTED("1nx31c51hb376ceydwsae35jq"); // for (;;)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("6bj5pjn8kja9qic9u7at0g4va"); // /* If necessary, advance to next segment in register
-UNSUPPORTED("8qcz04tc3rbrg7kjuf9xezhks"); // contents. */
-UNSUPPORTED("braae8dlluapap8zd5o6ihc1u"); // while (d2 == dend2)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("47ijn5xqcu6vix8sa88nyj6g3"); // if (dend2 == end_match_2) break;
-UNSUPPORTED("5wcf12qydzz346az1zp6sbphr"); // if (dend2 == regend[regno]) break;
-UNSUPPORTED("36wliwq9pfherfng9wg1z2930"); // /* End of string1 => advance to string2. */
-UNSUPPORTED("97sxan60njmrt6lx6dhy0t35a"); // d2 = string2;
-UNSUPPORTED("yedssw060ohvbc7klzkqa7ky"); // dend2 = regend[regno];
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("a3i8zhtb0tt9m1ilvwxr0yry6"); // /* At end of register contents => success */
-UNSUPPORTED("9zvbjhvrz5uc7k4zmhbwdfvr6"); // if (d2 == dend2) break;
-UNSUPPORTED("afb4xzyk6gdokmo985hyfw8c9"); // /* If necessary, advance to next segment in data. */
-UNSUPPORTED("ey839udf98rupfliazw91iwf4"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("ecd7rg6163cvfm8v1rtt0jtpb"); // /* How many characters left in this segment to match. */
-UNSUPPORTED("az6v71e6bfrxdlm5zelm70aji"); // mcnt = dend - d;
-UNSUPPORTED("96v7a28oxrisen4iasx18f02h"); // /* Want how many consecutive characters we can match in
-UNSUPPORTED("1iug3sdumn7i4romdq11ea8gc"); // one shot, so, if necessary, adjust the count. */
-UNSUPPORTED("k5cjd1jaihwrz80htbwhcz1k"); // if (mcnt > dend2 - d2)
-UNSUPPORTED("8sygn6fz8wegxhzaxpof9nfdy"); // mcnt = dend2 - d2;
-UNSUPPORTED("cq9zkdhm0s7gm3of2ojllwxev"); // /* Compare that many; failure if mismatch, else move
-UNSUPPORTED("cwb3st7nyauiej3bt6si7nk"); // past them. */
-UNSUPPORTED("8yrz36iknz8u14syi843ya22w"); // if (translate
-UNSUPPORTED("1csum7liyqa4kjt5vzjgwl055"); // ? bcmp_translate (d, d2, mcnt, translate)
-UNSUPPORTED("2mfklscfw9ja01nrbw8irsd34"); // : bcmp (d, d2, mcnt))
-UNSUPPORTED("3cl1in74qmmbb26vs4qw3mcuv"); // goto fail;
-UNSUPPORTED("ejde9u9b01jxuvulwaibu252x"); // d += mcnt, d2 += mcnt;
-UNSUPPORTED("egy6z5e2fbinnxr0gts3znpv4"); // /* Do this because we've match some characters. */
-UNSUPPORTED("b1re2muw6n42ivurg658dizzz"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("if344u3tlfkgjfkh9bwgpq8a"); // /* begline matches the empty string at the beginning of the string
-UNSUPPORTED("ezwcv5j2ponvqm9xcbipsht8u"); // (unless `not_bol' is set in `bufp'), and, if
-UNSUPPORTED("5elzkvlxjqh3r6z34t1j5y21o"); // `newline_anchor' is set, after newlines. */
-UNSUPPORTED("7zj5ggx1l6hln4ude6h5p4hgw"); // case begline:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("9vfz6wya8x71wz4tl74mnon03"); // if (((d) == (size1 ? string1 : string2) || !size2))
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("5xiy4c6bz8y6xryzgmegy61lb"); // if (!bufp->not_bol) break;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("5vfekfkt5mncyuqxnse5u327k"); // else if (d[-1] == '\n' && bufp->newline_anchor)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("cmda966opn67h0f3cl7lk5oaa"); // /* In all other cases, we fail. */
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("6ab5d4s6v9zc6g10652lkpfxb"); // /* endline is the dual of begline. */
-UNSUPPORTED("8pqai98vstdak51ot078dn1ut"); // case endline:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ruaqj050rr07ll8b70yjadcf"); // if (((d) == end2))
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("3zg6eo8m095cishibd0umbzff"); // if (!bufp->not_eol) break;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("1n7gdt1mnk1dwyec8i0pk3vkx"); // /* We have to ``prefetch'' the next character. */
-UNSUPPORTED("67ozwfkze7vtbzog58zzkcvh7"); // else if ((d == end1 ? *string2 : *d) == '\n'
-UNSUPPORTED("8whjciz1pz1blross2jpqly5f"); // && bufp->newline_anchor)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("1aa2xpr66utsdr273h0vay7rp"); // /* Match at the very beginning of the data. */
-UNSUPPORTED("889sq08u5lsi3c6y2z7adu8ex"); // case begbuf:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("9vfz6wya8x71wz4tl74mnon03"); // if (((d) == (size1 ? string1 : string2) || !size2))
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("4z8rppnva31fi9mwshpp8kxvw"); // /* Match at the very end of the data. */
-UNSUPPORTED("cx4ezn3s02koh0pq7idm2xvxc"); // case endbuf:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ruaqj050rr07ll8b70yjadcf"); // if (((d) == end2))
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("3wki3bf5yoz1vc1fprg2lncya"); // /* on_failure_keep_string_jump is used to optimize `.*\n'. It
-UNSUPPORTED("pql30urhclx8h7lod7pnj4ip"); // pushes NULL as the value for the string on the stack. Then
-UNSUPPORTED("dzwsld9trwycslc5k99jr9muh"); // `pop_failure_point' will keep the current value for the
-UNSUPPORTED("3xl98pouep4b4iwcgj8vvabvc"); // string, instead of restoring it. To see why, consider
-UNSUPPORTED("8wxp3mbfp1jdn6hlq6djbv5gj"); // matching `foo\nbar' against `.*\n'. The .* matches the foo;
-UNSUPPORTED("djf7x62cv5c4kahfoqaehjrk9"); // then the . fails against the \n. But the next thing we want
-UNSUPPORTED("4n6sotfrko2ssux5cwdwroytq"); // to do is match the \n against the \n; if we restored the
-UNSUPPORTED("9gm1fhuma2g5732wasioh293h"); // string value, we would be back at the foo.
-UNSUPPORTED("9pocj5oo194wevmdb2pun171k"); // Because this is used only in specific cases, we don't need to
-UNSUPPORTED("22xw129jbwcohdom5on8mruf1"); // check all the things that `on_failure_jump' does, to make
-UNSUPPORTED("ov1lrnfw4f23mi84a3odmle4"); // sure the right things get saved on the stack. Hence we don't
-UNSUPPORTED("8xgl4y5ygq098dtwrbuwey6gq"); // share its code. The only reason to push anything on the
-UNSUPPORTED("by06u3v9h2tr9d1hfpggutrts"); // stack at all is that otherwise we would have to change
-UNSUPPORTED("cd2otw100j4q2pgbijt7jkkzt"); // `anychar's code to do something besides goto fail in this
-UNSUPPORTED("32dqefvhlxi1u35k3ewta7mrl"); // case; that seems worse than this. */
-UNSUPPORTED("753el6ua6knou432p32d1kbcc"); // case on_failure_keep_string_jump:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("cxpumlm6doboe0ubkx51bqcx1"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("4l5nbs7foacbvjtuv07q72uuo"); // do { char *destination; s_reg_t this_reg; ; ; ; ; ; ; ; while (((fail_stack).size - (fail_stack).avail) < (((0 ? 0 : highest_active_reg - lowest_active_reg + 1) * 3) + 4)) { if (!((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) return -2; ; ; } ; if (1) for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; this_reg++) { ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regstart[this_reg]); ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regend[this_reg]); ; ; ; ; ; ; fail_stack.stack[fail_stack.avail++] = (reg_info[this_reg].word); } ; fail_stack.stack[fail_stack.avail++].integer = (lowest_active_reg); ; fail_stack.stack[fail_stack.avail++].integer = (highest_active_reg); ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (p + mcnt); ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) ((void *)0); ; ; } while (0);
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("18mowhc7dokjwwbpjm3c0jjz3"); // /* Uses of on_failure_jump:
-UNSUPPORTED("6hohd1mhntprbr29uarcgbh63"); // Each alternative starts with an on_failure_jump that points
-UNSUPPORTED("9ltnucad533b0qouy73o7txqh"); // to the beginning of the next alternative. Each alternative
-UNSUPPORTED("56exr10nxswdfl6el06yzn1kl"); // except the last ends with a jump that in effect jumps past
-UNSUPPORTED("7mx68jjud7wzo6avh55bb818j"); // the rest of the alternatives. (They really jump to the
-UNSUPPORTED("9nytxeg7tfysw0cho7phep44z"); // ending jump of the following alternative, because tensioning
-UNSUPPORTED("ax1r80aorhdnf7k83i580xkrd"); // these jumps is a hassle.)
-UNSUPPORTED("b3w92k7mmdeshyrsyx5j12h3g"); // Repeats start with an on_failure_jump that points past both
-UNSUPPORTED("aef21o4yg56obwkotdy9xg0ho"); // the repetition text and either the following jump or
-UNSUPPORTED("3wjc6x34irsiejqg1kbgn3iyt"); // pop_failure_jump back to this on_failure_jump. */
-UNSUPPORTED("992rmruvdtrxnk46307iiqyjo"); // case on_failure_jump:
-UNSUPPORTED("c776gsd8agjizu0u6zgrf49u3"); // on_failure:
-UNSUPPORTED("7xijz1d7skix4nbsjyzbkawyz"); // ;
-UNSUPPORTED("6rhr1dl5qu710655mp1bqo0i6"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("7xijz1d7skix4nbsjyzbkawyz"); // ;
-UNSUPPORTED("f46w21fc8pt03jhpnaepq03um"); // /* If this on_failure_jump comes right before a group (i.e.,
-UNSUPPORTED("4osoy23qvwvclpht018wy5fe"); // the original * applied to a group), save the information
-UNSUPPORTED("bfbi4c30km7bjt8vdpfguqx3b"); // for that group and all inner ones, so that if we fail back
-UNSUPPORTED("1ra232qtft0mi461dabhedxp4"); // to this point, the group's information will be correct.
-UNSUPPORTED("b2mqhhpsbx6j245sm4leiu3dn"); // For example, in \(a*\)*\1, we need the preceding group,
-UNSUPPORTED("6do6go4hsy6lmqykgor4s9ygv"); // and in \(zz\(a*\)b*\)\2, we need the inner group. */
-UNSUPPORTED("enwxe23t405zzw5yadk743a5r"); // /* We can't use `p' to check ahead because we push
-UNSUPPORTED("6yxbydq88le4or0xwwq5siqmw"); // a failure point to `p + mcnt' after we do this. */
-UNSUPPORTED("di4spe1yrvg37sczy634usb7k"); // p1 = p;
-UNSUPPORTED("816d2v18z6b4clqeuef1am657"); // /* We need to skip no_op's before we look for the
-UNSUPPORTED("ch11lyve93ighowv1prcy2j8k"); // start_memory in case this on_failure_jump is happening as
-UNSUPPORTED("6qg7rlv2r0m6k4j5x75pimlaa"); // the result of a completed succeed_n, as in \(a\)\{1,3\}b\1
-UNSUPPORTED("978ibng6ccfuidf65t6s6mgq0"); // against aba. */
-UNSUPPORTED("ajcmgk4q2zko19taooby9ydhf"); // while (p1 < pend && (re_opcode_t) *p1 == no_op)
-UNSUPPORTED("4hemvstzejy8d3hmd82kukj7v"); // p1++;
-UNSUPPORTED("6srqj3lww8szsp64bd64yus7k"); // if (p1 < pend && (re_opcode_t) *p1 == start_memory)
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("54s4csu4aujalr4c0swqowr5k"); // /* We have a new highest active register now. This will
-UNSUPPORTED("4ig8j5bvaq59fsf9hfdn1q5ys"); // get reset at the start_memory we are about to get to,
-UNSUPPORTED("6aatr095mst5lfh4soia9qpg2"); // but we will have saved all the registers relevant to
-UNSUPPORTED("2a6e61mk8qy9pwnls9zifuok6"); // this repetition op, as described above. */
-UNSUPPORTED("50t6ewzx8ghn8hjs3qg8z17sc"); // highest_active_reg = *(p1 + 1) + *(p1 + 2);
-UNSUPPORTED("bxlrtrilu12d2jxucjuex0vfp"); // if (lowest_active_reg == ((1 << 8) + 1))
-UNSUPPORTED("6li0h0b9p3vauo9vgyypu8fux"); // lowest_active_reg = *(p1 + 1);
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("7xijz1d7skix4nbsjyzbkawyz"); // ;
-UNSUPPORTED("4637n0f945d4uznxowpb1ha4i"); // do { char *destination; s_reg_t this_reg; ; ; ; ; ; ; ; while (((fail_stack).size - (fail_stack).avail) < (((0 ? 0 : highest_active_reg - lowest_active_reg + 1) * 3) + 4)) { if (!((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) return -2; ; ; } ; if (1) for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; this_reg++) { ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regstart[this_reg]); ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regend[this_reg]); ; ; ; ; ; ; fail_stack.stack[fail_stack.avail++] = (reg_info[this_reg].word); } ; fail_stack.stack[fail_stack.avail++].integer = (lowest_active_reg); ; fail_stack.stack[fail_stack.avail++].integer = (highest_active_reg); ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (p + mcnt); ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (d); ; ; } while (0);
-UNSUPPORTED("d1pumbibe8xz2i7gr1wj6zdak"); // break;
-UNSUPPORTED("ezli68qam5jhg7sd2n0z30pa1"); // /* A smart repeat ends with `maybe_pop_jump'.
-UNSUPPORTED("5d7n4fkgg5a38sjzmkhaoa8hl"); // We change it to either `pop_failure_jump' or `jump'. */
-UNSUPPORTED("d7ziafib9p2sa0rqh34hv3hwj"); // case maybe_pop_jump:
-UNSUPPORTED("cxpumlm6doboe0ubkx51bqcx1"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("4i49ynnzyaszs2krb0aw4uqa0"); // register unsigned char *p2 = p;
-UNSUPPORTED("8b4raalmwo7274mwsk0kcdlbp"); // /* Compare the beginning of the repeat with what in the
-UNSUPPORTED("6ox8v5j7jznz10vsvok39lx6h"); // pattern follows its end. If we can establish that there
-UNSUPPORTED("1qm38p3f1vojknhw7v973ela0"); // is nothing that they would both match, i.e., that we
-UNSUPPORTED("2wnj0iemov40iryz5lsfp3zi5"); // would have to backtrack because of (as in, e.g., `a*a')
-UNSUPPORTED("9zp4vdc61w9qqpto61p74x8x0"); // then we can change to pop_failure_jump, because we'll
-UNSUPPORTED("cdtoaohseagznp9y8u81kbpru"); // never have to backtrack.
-UNSUPPORTED("63w8z2r32mq0x6xowpwds9vjb"); // This is not true in the case of alternatives: in
-UNSUPPORTED("a98qcnnc9pzff1gk8kfj32f1i"); // `(a|ab)*' we do need to backtrack to the `ab' alternative
-UNSUPPORTED("errex35giie09vkvn4e9fe4zk"); // (e.g., if the string was `ab'). But instead of trying to
-UNSUPPORTED("1147ja0a6sr58jg8z4hjs19ji"); // detect that here, the alternative has put on a dummy
-UNSUPPORTED("64mr7nyur7w7m85zrdx15fqli"); // failure point which is what we will end up popping. */
-UNSUPPORTED("amvyb0hgs5zfdebpexntlvwfd"); // /* Skip over open/close-group commands.
-UNSUPPORTED("2lx4i6yu241papyqk442d7gf1"); // If what follows this loop is a ...+ construct,
-UNSUPPORTED("1pvxwmxmctfoyisu33wn2tgym"); // look at what begins its body, since we will have to
-UNSUPPORTED("8tbga6r8dqnryesfg5bmccsge"); // match at least one of that. */
-UNSUPPORTED("9nuuiq5ff5vu3ehueiarndup8"); // while (1)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("2dak6ikzsj12jm54tispfishb"); // if (p2 + 2 < pend
-UNSUPPORTED("7yw7v0svrd5pmn1jcqlc4e3u1"); // && ((re_opcode_t) *p2 == stop_memory
-UNSUPPORTED("2yx468hmjjmhvuzxlu2jyltzc"); // || (re_opcode_t) *p2 == start_memory))
-UNSUPPORTED("4hgr2e6ls0cizy5kicpo9i13a"); // p2 += 3;
-UNSUPPORTED("1yuf55oz0qpsj5aqp5h5fpr42"); // else if (p2 + 6 < pend
-UNSUPPORTED("bw2og6j9w6s47jv3rzusqgra5"); // && (re_opcode_t) *p2 == dummy_failure_jump)
-UNSUPPORTED("6ennx95kxfn7n27tkdpz2xiun"); // p2 += 6;
-UNSUPPORTED("a4hbs6luulhltmygux2zimbcc"); // else
-UNSUPPORTED("1fg4xctmq8acy7m0oob45guaz"); // break;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("d2fh23u27kss8fzwuwtp0p6sf"); // p1 = p + mcnt;
-UNSUPPORTED("90n7ynf24mp5fmsi2nznee8aj"); // /* p1[0] ... p1[2] are the `on_failure_jump' corresponding
-UNSUPPORTED("4vso45anytez4cjlpkfnzk1ul"); // to the `maybe_finalize_jump' of this case. Examine what
-UNSUPPORTED("b0juiqz00zb3viboquom9nj05"); // follows. */
-UNSUPPORTED("66jpg0e4bmb6ltcah5ku9m5wf"); // /* If we're at the end of the pattern, we can change. */
-UNSUPPORTED("5xkeog52k82g0w44z3mfurqp7"); // if (p2 == pend)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("e25zbxyj1st10oslj3hfvjw9a"); // /* Consider what happens when matching ":\(.*\)"
-UNSUPPORTED("1qa8sj8fsagixe1jkmm9j7s4u"); // against ":/". I don't really understand this code
-UNSUPPORTED("bawpwuc0i5d4c4v2365l038h3"); // yet. */
-UNSUPPORTED("5zj568kdmyc87wog3sgbfzsd2"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("9fy78dg2q1uu4c2t1zsyaestf"); // ;
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("2wredhzqyuxjyd1qy0vxr02p6"); // else if ((re_opcode_t) *p2 == exactn
-UNSUPPORTED("5439ysolyacwtm0iroxxof9ja"); // || (bufp->newline_anchor && (re_opcode_t) *p2 == endline))
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("6ailij025yibbye551dmh9is0"); // register unsigned char c
-UNSUPPORTED("68vch1mgcskmseij0qhms2rl9"); // = *p2 == (unsigned char) endline ? '\n' : p2[2];
-UNSUPPORTED("1yo80wyjqsiw1t17we6c8a6gr"); // if ((re_opcode_t) p1[3] == exactn && p1[5] != c)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("agl6h59gsalgrbxzq7fk4n0vn"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("czvlqjtrpajrtul735yf6cmfz"); // ;
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("exal5xqo67c7zaxk3gaoj3n0i"); // else if ((re_opcode_t) p1[3] == charset
-UNSUPPORTED("e0kae24mabhgjjynwkmainteq"); // || (re_opcode_t) p1[3] == charset_not)
-UNSUPPORTED("3trws9zymzc11hz9w8m2b4fl9"); // {
-UNSUPPORTED("do2ngnlega9hi7rlbi6pwnera"); // int not = (re_opcode_t) p1[3] == charset_not;
-UNSUPPORTED("5f33xcwhul4d1gb3t7lj27aam"); // if (c < (unsigned char) (p1[4] * 8)
-UNSUPPORTED("78cradlgzgss8hx6xr31uun4d"); // && p1[5 + c / 8] & (1 << (c % 8)))
-UNSUPPORTED("7n22hwonng6xigiqxvbruxroo"); // not = !not;
-UNSUPPORTED("dpe5oc4fbt7r8mffvrkacad7a"); // /* `not' is equal to 1 if c would match, which means
-UNSUPPORTED("bqyj06a9kascwc6t354y5gh61"); // that we can't change to pop_failure_jump. */
-UNSUPPORTED("z5vz9r2m8zndo9aeyvz3w07z"); // if (!not)
-UNSUPPORTED("el767oi7fhlc4apdbx8dsvnk6"); // {
-UNSUPPORTED("6aq9gjy2dwkpua80yonp1njtn"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("4eruune9bfskm05zy5ipimp2s"); // ;
-UNSUPPORTED("b5m0ttlk23avgs4i47o8lbzg1"); // }
-UNSUPPORTED("2v7ai112w6nt2xgs1gbzo22oe"); // }
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3ra1229golg94oou1y8zbvkkp"); // else if ((re_opcode_t) *p2 == charset)
-UNSUPPORTED("9aq2ft2quyeattze0cwemwweo"); // {
-UNSUPPORTED("auubej4lkmydm7wamwki5zgyp"); // if ((re_opcode_t) p1[3] == exactn
-UNSUPPORTED("6zebpplfmgrbk07lmll1yrrsi"); // && ! ((int) p2[1] * 8 > (int) p1[4]
-UNSUPPORTED("9wp8kzivj0sustlx4ftn0l36h"); // && (p2[2 + p1[4] / 8]
-UNSUPPORTED("eyu63dq7uwiiwzvudc2gopty4"); // & (1 << (p1[4] % 8)))))
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("8azfcbpc7h84lhyicbrd2yjqp"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("a6r7lto035pp3gvk1bdixang2"); // ;
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("dcwjh55x5f2wjp4ezmipdxn2b"); // else if ((re_opcode_t) p1[3] == charset_not)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("7gajjg3j6bbfnu7tfpv8vd1he"); // int idx;
-UNSUPPORTED("dxd6z46rfort3j8amp5v1n0wb"); // /* We win if the charset_not inside the loop
-UNSUPPORTED("5r3347hzknz05fu925j2m38f9"); // lists every character listed in the charset after. */
-UNSUPPORTED("drl6mtwfmrng8pxbu6xzqfb18"); // for (idx = 0; idx < (int) p2[1]; idx++)
-UNSUPPORTED("9gmmtilb47lw5pq4j4sejrbj"); // if (! (p2[2 + idx] == 0
-UNSUPPORTED("74zwa83c3pcunsiarfams873p"); // || (idx < (int) p1[4]
-UNSUPPORTED("3ytcwj384elha7evsxusun8r2"); // && ((p2[2 + idx] & ~ p1[5 + idx]) == 0))))
-UNSUPPORTED("1lzsscwayr2ygeagix6ouorzi"); // break;
-UNSUPPORTED("etst8xjhq076idz2ki2lkc3kl"); // if (idx == p2[1])
-UNSUPPORTED("1fi5w21ki1vo1jwyr4xwgm27n"); // {
-UNSUPPORTED("gi02bd0hnoko53b18tp6muxp"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("7ia8gpv947o65avjiwl96gln5"); // ;
-UNSUPPORTED("bf03xtomlwkahoqno8ua4cbpc"); // }
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("bfp6jy3jhgcx1qlqs2ugtk84o"); // else if ((re_opcode_t) p1[3] == charset)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("7gajjg3j6bbfnu7tfpv8vd1he"); // int idx;
-UNSUPPORTED("3gf62oi7ics60q83j50ht4j54"); // /* We win if the charset inside the loop
-UNSUPPORTED("axtgnnoh8n7p39m9fbbxipnxm"); // has no overlap with the one after the loop. */
-UNSUPPORTED("6fsyvlzx4skvg5xqoif9n2bli"); // for (idx = 0;
-UNSUPPORTED("6d7whyux0667vbtt3aoh8j8mc"); // idx < (int) p2[1] && idx < (int) p1[4];
-UNSUPPORTED("d4o8f5f71ai8ygtqvrs77062h"); // idx++)
-UNSUPPORTED("b029onao79pzr7fwgf9oboalu"); // if ((p2[2 + idx] & p1[5 + idx]) != 0)
-UNSUPPORTED("1lzsscwayr2ygeagix6ouorzi"); // break;
-UNSUPPORTED("6whqfrc9hpkwoqoqk2cpgstzz"); // if (idx == p2[1] || idx == p1[4])
-UNSUPPORTED("1fi5w21ki1vo1jwyr4xwgm27n"); // {
-UNSUPPORTED("gi02bd0hnoko53b18tp6muxp"); // p[-3] = (unsigned char) pop_failure_jump;
-UNSUPPORTED("7ia8gpv947o65avjiwl96gln5"); // ;
-UNSUPPORTED("bf03xtomlwkahoqno8ua4cbpc"); // }
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("13jcwbk3vyfh9xrmwi5hbe7so"); // }
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("dtbtyud0b7t5ily0nm0qkjrov"); // p -= 2; /* Point at relative address again. */
-UNSUPPORTED("9hexwrt0gnjztdabmcy13w96a"); // if ((re_opcode_t) p[-1] != pop_failure_jump)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("ca1ptlw6k6dixmzbwm3a4iusp"); // p[-1] = (unsigned char) jump;
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("578iyred8hniiy6kj99i6zcx7"); // goto unconditional_jump;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("et4hfzxq1ccol7oenwuqop34c"); // /* Note fall through. */
-UNSUPPORTED("evkl6mpyrcnjwer6edp6j9emc"); // /* The end of a simple repeat has a pop_failure_jump back to
-UNSUPPORTED("2jcckuegby5tkaf50t6wemnmz"); // its matching on_failure_jump, where the latter will push a
-UNSUPPORTED("5971g2j40ktdkl0khlo1gpoy6"); // failure point. The pop_failure_jump takes off failure
-UNSUPPORTED("byi3j1ugndbk3u7yo028ikqz3"); // points put on by this pop_failure_jump's matching
-UNSUPPORTED("48etkzu6pax8j2rcmbcbd2s1k"); // on_failure_jump; we got through the pattern to here from the
-UNSUPPORTED("8f9as95a103nww8jbbn2vx61n"); // matching on_failure_jump, so didn't fail. */
-UNSUPPORTED("6coluo8cd7scxlqwnbvt3jqs5"); // case pop_failure_jump:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("aaykmyayp7k026o2rgh0xnxtt"); // /* We need to pass separate storage for the lowest and
-UNSUPPORTED("3w39tfh3tm57hhf0ob12sj5yk"); // highest registers, even though we don't care about the
-UNSUPPORTED("angsr7u35nqld9m876d6dx7xq"); // actual values. Otherwise, we will restore only one
-UNSUPPORTED("4ixesek08pb5l67pi00fqsriy"); // register from the stack, since lowest will == highest in
-UNSUPPORTED("1rzihep5lcgvrl52235a9a2uy"); // `pop_failure_point'. */
-UNSUPPORTED("9m9v5kmsap0mtdznppskik3k"); // active_reg_t dummy_low_reg, dummy_high_reg;
-UNSUPPORTED("5z662sre8crmvzwkqdm96nybf"); // unsigned char *pdummy;
-UNSUPPORTED("35v2cyfyscndlz7rd41acza4q"); // const char *sdummy;
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("3g97rrgu1b7a7ep0xjxi3013b"); // { s_reg_t this_reg; const unsigned char *string_temp; ; ; ; ; ; ; ; string_temp = fail_stack.stack[--fail_stack.avail].pointer; if (string_temp != (void *)0) sdummy = (const char *) string_temp; ; ; ; pdummy = (unsigned char *) fail_stack.stack[--fail_stack.avail].pointer; ; ; dummy_high_reg = (active_reg_t) fail_stack.stack[--fail_stack.avail].integer; ;
-UNSUPPORTED("1zjxjg81gnrzmbjfvorezv23b"); // dummy_low_reg = (active_reg_t) fail_stack.stack[--fail_stack.avail].integer; ; if (1) for (this_reg = dummy_high_reg; this_reg >=
-UNSUPPORTED("5y05eeb8zcu1hnp1r7u72wea0"); // dummy_low_reg; this_reg--) { ; reg_info_dummy[this_reg].word = fail_stack.stack[--fail_stack.avail]; ; reg_dummy[this_reg] = (const char *) fail_stack.stack[--fail_stack.avail].pointer; ;
-UNSUPPORTED("170qj0cyzc65li5h2h8nibj1a"); // reg_dummy[this_reg] = (const char *) fail_stack.stack[--fail_stack.avail].pointer; ; } else { for (this_reg = highest_active_reg; this_reg > dummy_high_reg; this_reg--) { reg_info_dummy[this_reg].word.integer = 0; reg_dummy[this_reg] = 0;
-UNSUPPORTED("o5cb1sy4lw7ahxhb9ir34ywe"); // reg_dummy[this_reg] = 0; } highest_active_reg = dummy_high_reg; } set_regs_matched_done = 0; ; };
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("et4hfzxq1ccol7oenwuqop34c"); // /* Note fall through. */
-UNSUPPORTED("7jzfafc0e4ysay5587d498v0g"); // unconditional_jump:
-UNSUPPORTED("7xijz1d7skix4nbsjyzbkawyz"); // ;
-UNSUPPORTED("lbfv20cb4iwb8ilhovngktwp"); // /* Note fall through. */
-UNSUPPORTED("6d0r5m74qtbvaned81fau8l5f"); // /* Unconditionally jump (without popping any failure points). */
-UNSUPPORTED("9a1qj2mhg3oh4ehsjpp4d81on"); // case jump:
-UNSUPPORTED("39nxr5mia7bkm0tyl5uoxm1i0"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0); /* Get the amount to jump. */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ard612jdkjyh07vvh6p7xec5q"); // p += mcnt; /* Do the jump. */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("6eoc6h9g64ctzuyv0zhwzsp88"); // /* We need this opcode so we can detect where alternatives end
-UNSUPPORTED("6m0nust2xxmwf4b1plaq3zle2"); // in `group_match_null_string_p' et al. */
-UNSUPPORTED("7ifq76or69643hqib3roiq9f4"); // case jump_past_alt:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("8efvwfkzonjvc0xgk7ss31fh2"); // goto unconditional_jump;
-UNSUPPORTED("eiucbu410s7gabqq4tu08bg8c"); // /* Normally, the on_failure_jump pushes a failure point, which
-UNSUPPORTED("ctsxylfj3puoijkz434hjg4jg"); // then gets popped at pop_failure_jump. We will end up at
-UNSUPPORTED("7ociskstxycbbkh41vyojlnby"); // pop_failure_jump, also, and with a pattern of, say, `a+', we
-UNSUPPORTED("7n2w2rey1jvho9kvlfgz2mero"); // are skipping over the on_failure_jump, so we have to push
-UNSUPPORTED("ciwekfad3iz5mqjje8hiorvda"); // something meaningless for pop_failure_jump to pop. */
-UNSUPPORTED("ejqzfph0mmtiqin1hmi981bzm"); // case dummy_failure_jump:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("csbowj5rzwk0s0pqd3urbka91"); // /* It doesn't matter what we push for the string here. What
-UNSUPPORTED("4qwf1zf8lyqii172mcx2gdsms"); // the code at `fail' tests is the value for the pattern. */
-UNSUPPORTED("359ip48et2ofltl9170r6hayz"); // do { char *destination; s_reg_t this_reg; ; ; ; ; ; ; ; while (((fail_stack).size - (fail_stack).avail) < (((0 ? 0 : highest_active_reg - lowest_active_reg + 1) * 3) + 4)) { if (!((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) return -2; ; ; } ; if (1) for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; this_reg++) { ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regstart[this_reg]); ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regend[this_reg]); ; ; ; ; ; ; fail_stack.stack[fail_stack.avail++] = (reg_info[this_reg].word); } ; fail_stack.stack[fail_stack.avail++].integer = (lowest_active_reg); ; fail_stack.stack[fail_stack.avail++].integer = (highest_active_reg); ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (0); ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (0); ; ; } while (0);
-UNSUPPORTED("8efvwfkzonjvc0xgk7ss31fh2"); // goto unconditional_jump;
-UNSUPPORTED("9mevu5auyy39j4yiw0b2j9h2o"); // /* At the end of an alternative, we need to push a dummy failure
-UNSUPPORTED("d2uf5y4x1b2hmxla6j6tlr1rb"); // point in case we are followed by a `pop_failure_jump', because
-UNSUPPORTED("rnnvhhghy5jgw4jg1fhty1td"); // we don't want the failure point for the alternative to be
-UNSUPPORTED("dkubbc7oql3ppqcdkgq9qelbn"); // popped. For example, matching `(a|ab)*' against `aab'
-UNSUPPORTED("8eoqcy9m0jjec5bxgkzbvg1c7"); // requires that we match the `ab' alternative. */
-UNSUPPORTED("9446ac5zvkn7r9yqkh2brh10l"); // case push_dummy_failure:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("c992qnyh0yle1kop18y31trwb"); // /* See comments just above at `dummy_failure_jump' about the
-UNSUPPORTED("5synfaxsw4ed7tb33m3un4m4s"); // two zeroes. */
-UNSUPPORTED("359ip48et2ofltl9170r6hayz"); // do { char *destination; s_reg_t this_reg; ; ; ; ; ; ; ; while (((fail_stack).size - (fail_stack).avail) < (((0 ? 0 : highest_active_reg - lowest_active_reg + 1) * 3) + 4)) { if (!((fail_stack).size > (unsigned) (re_max_failures * (5 * 3 + 4)) ? 0 : ((fail_stack).stack = (fail_stack_elt_t *) (destination = (char *) alloca (((fail_stack).size << 1) * sizeof(fail_stack_elt_t)), bcopy ((fail_stack).stack, destination, (fail_stack).size * sizeof(fail_stack_elt_t)), destination), (fail_stack).stack == (void *)0 ? 0 : ((fail_stack).size <<= 1, 1)))) return -2; ; ; } ; if (1) for (this_reg = lowest_active_reg; this_reg <= highest_active_reg; this_reg++) { ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regstart[this_reg]); ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (regend[this_reg]); ; ; ; ; ; ; fail_stack.stack[fail_stack.avail++] = (reg_info[this_reg].word); } ; fail_stack.stack[fail_stack.avail++].integer = (lowest_active_reg); ; fail_stack.stack[fail_stack.avail++].integer = (highest_active_reg); ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (0); ; ; ; fail_stack.stack[fail_stack.avail++].pointer = (unsigned char *) (0); ; ; } while (0);
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("cch41i8kiaadul49ef19omdn3"); // /* Have to succeed matching what follows at least n times.
-UNSUPPORTED("8nb8fa32tplp2rqeqbr6hbn7m"); // After that, handle like `on_failure_jump'. */
-UNSUPPORTED("bdrmz6krrbsihqbsklz1j7d7a"); // case succeed_n:
-UNSUPPORTED("84ijqow5jif2ajlhwgtdm91f7"); // do { (mcnt) = *(p + 2) & 0377; (mcnt) += ((((unsigned char) (*((p + 2) + 1))) ^ 128) - 128) << 8; } while (0);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("bgjxyv37kr5myctgyhh94vsi6"); // /* Originally, this is how many times we HAVE to succeed. */
-UNSUPPORTED("4hf4aztjmayqr0tjd70d8mo5l"); // if (mcnt > 0)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("e8xmciie2t26hwi49v7e64msh"); // mcnt--;
-UNSUPPORTED("f0uzigopn4c90eyozalab8dsx"); // p += 2;
-UNSUPPORTED("3trn8e2hbd5q9a392rlo55y4x"); // do { do { (p)[0] = (mcnt) & 0377; (p)[1] = (mcnt) >> 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("ach1i5r2ivzzx0xwwovmzz94b"); // else if (mcnt == 0)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("8kebz7kyb83b0vya08j7g1h0s"); // p[2] = (unsigned char) no_op;
-UNSUPPORTED("7naalvvwte5koasfwykgk8jy7"); // p[3] = (unsigned char) no_op;
-UNSUPPORTED("evigqo62udorsulmaru504u73"); // goto on_failure;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("f41u8fntqiy246yy3btlg6w1v"); // case jump_n:
-UNSUPPORTED("84ijqow5jif2ajlhwgtdm91f7"); // do { (mcnt) = *(p + 2) & 0377; (mcnt) += ((((unsigned char) (*((p + 2) + 1))) ^ 128) - 128) << 8; } while (0);
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("45q1dm5e8czy7dfyydg2p0qre"); // /* Originally, this is how many times we CAN jump. */
-UNSUPPORTED("c925pgmxvmas9boqu5ovt7bwp"); // if (mcnt)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("e8xmciie2t26hwi49v7e64msh"); // mcnt--;
-UNSUPPORTED("bj0025yphmeva1dnjc83w2d82"); // do { (p + 2)[0] = (mcnt) & 0377; (p + 2)[1] = (mcnt) >> 8; } while (0);
-UNSUPPORTED("e4kt1tmmevqvy3cbyk6xnznck"); // ;
-UNSUPPORTED("578iyred8hniiy6kj99i6zcx7"); // goto unconditional_jump;
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("6xb6uhe949e197w3856eykp9b"); // /* If don't have to jump any more, skip over the rest of command. */
-UNSUPPORTED("cunk7vpvzj28y1x4gn62gxpce"); // else
-UNSUPPORTED("4g9g5t2dqwtbpe7orh2oew0y9"); // p += 4;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("dmqxgjrlj5ddxj88dw919ujoj"); // case set_number_at:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("5pj3hnv50h51ji8ogyd48xedj"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("d2fh23u27kss8fzwuwtp0p6sf"); // p1 = p + mcnt;
-UNSUPPORTED("5pj3hnv50h51ji8ogyd48xedj"); // do { do { (mcnt) = *(p) & 0377; (mcnt) += ((((unsigned char) (*((p) + 1))) ^ 128) - 128) << 8; } while (0); (p) += 2; } while (0);
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("7iin6qwm1f2j9sjclecva957u"); // do { (p1)[0] = (mcnt) & 0377; (p1)[1] = (mcnt) >> 8; } while (0);
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("a8jtmsnmpa4937exo9nhopyyb"); // case wordbound:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("1q5kvi9ggao878ze57ikl6vuk"); // boolean prevchar, thischar;
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("dugr1bul8t32joy65do0a7h6d"); // if (((d) == (size1 ? string1 : string2) || !size2) || ((d) == end2))
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("8ijy2sdya91ygss8ru67qxx66"); // prevchar = (re_syntax_table[(d - 1) == end1 ? *string2 :(d - 1) == string2 - 1 ? *(end1 - 1) : *(d - 1)] == 1);
-UNSUPPORTED("33zxkfaori9emq7m5ssmpr1rd"); // thischar = (re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1);
-UNSUPPORTED("79ooz7jacd1z2sfddoakjbcze"); // if (prevchar != thischar)
-UNSUPPORTED("7mosouhqcis2k8sbg88g9wol8"); // break;
-UNSUPPORTED("etjodgz127fwk1r4166wqxg7n"); // goto fail;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("2jqqzr491mztwr9h8hvs55ja1"); // case notwordbound:
-UNSUPPORTED("4vdjxw5o61xlsk38ouw1wsypc"); // {
-UNSUPPORTED("1q5kvi9ggao878ze57ikl6vuk"); // boolean prevchar, thischar;
-UNSUPPORTED("6mnx06fa3p4n9bhd9htqjy0il"); // ;
-UNSUPPORTED("dugr1bul8t32joy65do0a7h6d"); // if (((d) == (size1 ? string1 : string2) || !size2) || ((d) == end2))
-UNSUPPORTED("1k6xdu198jqq8v2oj3209y50s"); // goto fail;
-UNSUPPORTED("8ijy2sdya91ygss8ru67qxx66"); // prevchar = (re_syntax_table[(d - 1) == end1 ? *string2 :(d - 1) == string2 - 1 ? *(end1 - 1) : *(d - 1)] == 1);
-UNSUPPORTED("33zxkfaori9emq7m5ssmpr1rd"); // thischar = (re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1);
-UNSUPPORTED("79ooz7jacd1z2sfddoakjbcze"); // if (prevchar != thischar)
-UNSUPPORTED("1k6xdu198jqq8v2oj3209y50s"); // goto fail;
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("3e08x1y395304nd0y3uwffvim"); // }
-UNSUPPORTED("991vlwoc47i8p67jyv2qapdhy"); // case wordbeg:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("721tzo9yoqf86tjgrubhs6lcg"); // if ((re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1) && (((d) == (size1 ? string1 : string2) || !size2) || !(re_syntax_table[(d - 1) == end1 ? *string2 :(d - 1) == string2 - 1 ? *(end1 - 1) : *(d - 1)] == 1)))
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("65os7te2jc1i6uacyszvy5spd"); // case wordend:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("88nu0py5i2vups7wk3tj8wcf4"); // if (!((d) == (size1 ? string1 : string2) || !size2) && (re_syntax_table[(d - 1) == end1 ? *string2 :(d - 1) == string2 - 1 ? *(end1 - 1) : *(d - 1)] == 1)
-UNSUPPORTED("1a0r7hi8r1po69cu5fxqrw4u8"); // && (!(re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1) || ((d) == end2)))
-UNSUPPORTED("605r8o1isen77125aqrohs6ac"); // break;
-UNSUPPORTED("9s7xl8jyc2iazjidoga852mei"); // goto fail;
-UNSUPPORTED("buxp1030z7swkjl42wovj9hxd"); // case wordchar:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("6l2kf5tzbvscsr8vy2bos6ng7"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("7qor4v3lsqk2266u914165c3w"); // if (!(re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1))
-UNSUPPORTED("etjodgz127fwk1r4166wqxg7n"); // goto fail;
-UNSUPPORTED("2o2dzkzmcvnlj1d5ychre7cqo"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("p26x5fh4zcf5ddyi146lh558"); // d++;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("7frlpnfuvuphd3bzoulwg4vsr"); // case notwordchar:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("6l2kf5tzbvscsr8vy2bos6ng7"); // while (d == dend) { if (dend == end_match_2) goto fail; d = string2; dend = end_match_2; };
-UNSUPPORTED("7efqv32ta2jk6dolelm1jju58"); // if ((re_syntax_table[(d) == end1 ? *string2 :(d) == string2 - 1 ? *(end1 - 1) : *(d)] == 1))
-UNSUPPORTED("etjodgz127fwk1r4166wqxg7n"); // goto fail;
-UNSUPPORTED("2o2dzkzmcvnlj1d5ychre7cqo"); // do { if (!set_regs_matched_done) { active_reg_t r; set_regs_matched_done = 1; for (r = lowest_active_reg; r <= highest_active_reg; r++) { ((reg_info[r]).bits.matched_something) = ((reg_info[r]).bits.ever_matched_something) = 1; } } } while (0);
-UNSUPPORTED("p26x5fh4zcf5ddyi146lh558"); // d++;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("comxch6w0lbi64ejq9m4p0u7o"); // default:
-UNSUPPORTED("4ga2fk86no0o6rms0bh0zuh4t"); // abort ();
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("9vmmpq61luc1cbbupgqomzlw5"); // continue; /* Successfully executed one pattern command; keep going. */
-UNSUPPORTED("9ndw6vvwoffc31wvgwvgra578"); // /* We goto here if a matching operation fails. */
-UNSUPPORTED("1x3juxkh7bw5pjqp84ugtlmce"); // fail:
-UNSUPPORTED("6j68ym8upocfb9ipivxd80ark"); // if (!(fail_stack.avail == 0))
-UNSUPPORTED("92q1l5zz5c3sr57dyzmui3e99"); // { /* A restart point is known. Restore to that state. */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("ayzf7vhhjnbynnstdi6n454f4"); // { s_reg_t this_reg; const unsigned char *string_temp; ; ; ; ; ; ; ; string_temp = fail_stack.stack[--fail_stack.avail].pointer; if (string_temp != (void *)0) d = (const char *) string_temp; ; ; ; p = (unsigned char *) fail_stack.stack[--fail_stack.avail].pointer; ; ; highest_active_reg = (active_reg_t) fail_stack.stack[--fail_stack.avail].integer; ;
-UNSUPPORTED("cb1z2qn566ao3l0dqcxiow6dp"); // lowest_active_reg = (active_reg_t) fail_stack.stack[--fail_stack.avail].integer; ; if (1) for (this_reg = highest_active_reg; this_reg >=
-UNSUPPORTED("2g0zjfujimxzkr97d2g902f35"); // lowest_active_reg; this_reg--) { ; reg_info[this_reg].word = fail_stack.stack[--fail_stack.avail]; ; regend[this_reg] = (const char *) fail_stack.stack[--fail_stack.avail].pointer; ;
-UNSUPPORTED("2qadsytv032wa95wodwip6p4p"); // regstart[this_reg] = (const char *) fail_stack.stack[--fail_stack.avail].pointer; ; } else { for (this_reg = highest_active_reg; this_reg > highest_active_reg; this_reg--) { reg_info[this_reg].word.integer = 0; regend[this_reg] = 0;
-UNSUPPORTED("1sgt5yrkh4wqtk60f39qhmqyh"); // regstart[this_reg] = 0; } highest_active_reg = highest_active_reg; } set_regs_matched_done = 0; ; };
-UNSUPPORTED("a59azprq7sley0l2fkpr8iplf"); // /* If this failure point is a dummy, try the next one. */
-UNSUPPORTED("27dzlpjb6otkjse11xs60aoen"); // if (!p)
-UNSUPPORTED("etjodgz127fwk1r4166wqxg7n"); // goto fail;
-UNSUPPORTED("5ezd84f3c0gvxbdr48go3nu9d"); // /* If we failed to the end of the pattern, don't examine *p. */
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("enro4gwm81mrbyp937vtdmluy"); // if (p < pend)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("5bmgzdh5rp0tqqvuep6upitw5"); // boolean is_a_jump_n = 0;
-UNSUPPORTED("6rryel9f7nixy5bn6j0bu5pim"); // /* If failed to a backwards jump that's part of a repetition
-UNSUPPORTED("6lkiil4jkazqh0sr2kuzl2a6n"); // loop, need to pop this failure point and use the next one. */
-UNSUPPORTED("3ov8y2d12vzh7q5i3tuyoelxe"); // switch ((re_opcode_t) *p)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("bok1esp1zekmbuklmyk3rk5rx"); // case jump_n:
-UNSUPPORTED("38gwuf75sc2x4fup5mqsis4x6"); // is_a_jump_n = 1;
-UNSUPPORTED("75n3w229uzeshyir5i61r1043"); // case maybe_pop_jump:
-UNSUPPORTED("a8ugqe6z5croeioatypl4otaw"); // case pop_failure_jump:
-UNSUPPORTED("6l3m2qx4riktyve4e2l0wh9fe"); // case jump:
-UNSUPPORTED("84b1pj26tamclxb0mw5nrxg5g"); // p1 = p + 1;
-UNSUPPORTED("4sq4b65a0bh8lf919g64pqica"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("8ocr60qo89yr0vtq5dj8v1owo"); // p1 += mcnt;
-UNSUPPORTED("6cxswairiyne2bjb1dmz6d26z"); // if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n)
-UNSUPPORTED("ekvd2x03u6gf8ylhhxyq7h336"); // || (!is_a_jump_n
-UNSUPPORTED("cw8zksvsbjm3lb2eh5chm46x2"); // && (re_opcode_t) *p1 == on_failure_jump))
-UNSUPPORTED("bkcykqhkoe9lpop9i2qgzu9yp"); // goto fail;
-UNSUPPORTED("1fg4xctmq8acy7m0oob45guaz"); // break;
-UNSUPPORTED("cyzkq50b2b248lxpi6lj66jqs"); // default:
-UNSUPPORTED("2oxjzlotqn0ba3akkxgs9h02q"); // /* do nothing */ ;
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("9g1qr2dsx4ng98gqf2c94flil"); // if (d >= string1 && d <= end1)
-UNSUPPORTED("eb6uc0689wgv8mqsvkm38mu5z"); // dend = end_match_1;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("8dc5stfweb0p9s0z2aqvucjp7"); // break; /* Matching at this starting point really fails. */
-UNSUPPORTED("7mfls4p0ojvjkaotqvjflu5ht"); // } /* for (;;) */
-UNSUPPORTED("78m9mze1ip3qflmasmayufoml"); // if (best_regs_set)
-UNSUPPORTED("2mqxvuzj0ksk0m6oea72s11bm"); // goto restore_best_regs;
-UNSUPPORTED("d7ubx9odh5b3nkaac1zt1epbl"); // do { ; if ((void*) regstart) ((void)0); (void*) regstart = (void *)0; if ((void*) regend) ((void)0); (void*) regend = (void *)0; if ((void*) old_regstart) ((void)0); (void*) old_regstart = (void *)0; if ((void*) old_regend) ((void)0); (void*) old_regend = (void *)0; if ((void*) best_regstart) ((void)0); (void*) best_regstart = (void *)0; if ((void*) best_regend) ((void)0); (void*) best_regend = (void *)0; if ((void*) reg_info) ((void)0); (void*) reg_info = (void *)0; if ((void*) reg_dummy) ((void)0); (void*) reg_dummy = (void *)0; if ((void*) reg_info_dummy) ((void)0); (void*) reg_info_dummy = (void *)0; } while (0);
-UNSUPPORTED("2k1latznr3ux22xinn931zwue"); // return -1; /* Failure to match. */
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 cq5u8rqlecamd29odxfaybq58
-// static boolean group_match_null_string_p(unsigned char **p, unsigned char *end, register_info_type *reg_info)
-public static Object group_match_null_string_p(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("7fmzghcqs81ua3tkzybmg2t5u"); // group_match_null_string_p(unsigned char **p,
-UNSUPPORTED("2800cclhjee5reqodgs0uz6jp"); // unsigned char *end,
-UNSUPPORTED("1zudh11exsdumrcui0azslboo"); // register_info_type *reg_info)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("5rwd4tuvikkbfw1s56awbwtbe"); // int mcnt;
-UNSUPPORTED("dbm120px96ap42fmbuxy5yrj5"); // /* Point to after the args to the start_memory. */
-UNSUPPORTED("bjzqlm993x9boruj0kyeol53l"); // unsigned char *p1 = *p + 2;
-UNSUPPORTED("azfsm7rfz2u17du52a0mrfyoq"); // while (p1 < end)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("23a56718i3eh15dzfmbft7w8p"); // /* Skip over opcodes that can match nothing, and return true or
-UNSUPPORTED("bbrge68fsb7cmb7ocyo176sox"); // false, as appropriate, when we get to one that can't, or to the
-UNSUPPORTED("9nn48i9apg1r7w3mm0yftr0gb"); // matching stop_memory. */
-UNSUPPORTED("3kakimebymsdj9dnon7o0iz9v"); // switch ((re_opcode_t) *p1)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("dpdkpfbea8z9xx4m3qriv0ks"); // /* Could be either a loop or a series of alternatives. */
-UNSUPPORTED("992rmruvdtrxnk46307iiqyjo"); // case on_failure_jump:
-UNSUPPORTED("4hemvstzejy8d3hmd82kukj7v"); // p1++;
-UNSUPPORTED("18pz18zbmozo48uq20alb8ok5"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("7ysd5uwx66rnhuasuke0gw17h"); // /* If the next operation is not a jump backwards in the
-UNSUPPORTED("chqkvvtqui6nji6p4nqjnxnc0"); // pattern. */
-UNSUPPORTED("clp8uz1ldh06ksh93asr2xtu6"); // if (mcnt >= 0)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("9vuq76qui8wedzsb144fnx8dd"); // /* Go through the on_failure_jumps of the alternatives,
-UNSUPPORTED("4k14n5k0mqv0fovwitf4alxzx"); // seeing if any of the alternatives cannot match nothing.
-UNSUPPORTED("clkpepohs7tguzyn8ncluhakf"); // The last alternative starts with only a jump,
-UNSUPPORTED("49dbeehco6191jqwdivzoevhh"); // whereas the rest start with on_failure_jump and end
-UNSUPPORTED("6h3f5m3yjc34la8qgzsbzbcsv"); // with a jump, e.g., here is the pattern for `a|b|c':
-UNSUPPORTED("9m5jtr9332etcn1h5ctckidp4"); // /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6
-UNSUPPORTED("ck48ad3kd04evjrca6aqzw2g"); // /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3
-UNSUPPORTED("6vxw9gryj1dxtxoycbews4j87"); // /exactn/1/c
-UNSUPPORTED("3p6xfpp9zbgix9sb10dz2cfhd"); // So, we have to first go through the first (n-1)
-UNSUPPORTED("cp25hojwgralgldniw273kdj3"); // alternatives and then deal with the last one separately. */
-UNSUPPORTED("9a0det71z82exleln86167ddq"); // /* Deal with the first (n-1) alternatives, which start
-UNSUPPORTED("az6wcsp2m1rn4g8e9nkvxomfi"); // with an on_failure_jump (see above) that jumps to right
-UNSUPPORTED("cip7j7cjuis96j2g1tyo2fogf"); // past a jump_past_alt. */
-UNSUPPORTED("am40qiyqgt5i95zqw8gmfb43f"); // while ((re_opcode_t) p1[mcnt-3] == jump_past_alt)
-UNSUPPORTED("4hzaau620c4rh7xorkrmxfut7"); // {
-UNSUPPORTED("2lhz8ag4lccpzb4fzqq8rviyo"); // /* `mcnt' holds how many bytes long the alternative
-UNSUPPORTED("bu59ahle478dwgxifr5a81zrn"); // is, including the ending `jump_past_alt' and
-UNSUPPORTED("4xvr333ml76572j0cidzpewwy"); // its number. */
-UNSUPPORTED("6tqlvyqvppynpnuuf3j8ebtlu"); // if (!alt_match_null_string_p (p1, p1 + mcnt - 3,
-UNSUPPORTED("3cqjfljoigoe1s3yctsmb49io"); // reg_info))
-UNSUPPORTED("5eqwqroxusaik54ze9ykumu4w"); // return 0;
-UNSUPPORTED("1nweigx3aj1nu16la9727cgek"); // /* Move to right after this alternative, including the
-UNSUPPORTED("9wjlfe40zk6mcnijph9zw3skr"); // jump_past_alt. */
-UNSUPPORTED("8ocr60qo89yr0vtq5dj8v1owo"); // p1 += mcnt;
-UNSUPPORTED("7me1al3m500othjustdgp25s8"); // /* Break if it's the beginning of an n-th alternative
-UNSUPPORTED("bsa0fgfj9n2wksuh9f164m03i"); // that doesn't begin with an on_failure_jump. */
-UNSUPPORTED("dxkrs3xxv5uhishofpjt2j6mb"); // if ((re_opcode_t) *p1 != on_failure_jump)
-UNSUPPORTED("7vckzntfuo1ibi8r53gsfg8al"); // break;
-UNSUPPORTED("dcrlv6lsj26x00kq7h5mb1tft"); // /* Still have to check that it's not an n-th
-UNSUPPORTED("ehy9rg3hrcurcpp2ofykuu16t"); // alternative that starts with an on_failure_jump. */
-UNSUPPORTED("3aju47l7l855mt7l00l7xg11q"); // p1++;
-UNSUPPORTED("4sq4b65a0bh8lf919g64pqica"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("7i4x97abeu0pj34gwgukjoe00"); // if ((re_opcode_t) p1[mcnt-3] != jump_past_alt)
-UNSUPPORTED("bho20rvti5y7pi0voz7il3e40"); // {
-UNSUPPORTED("7v0khgzw96aytjvy24azi9yi3"); // /* Get to the beginning of the n-th alternative. */
-UNSUPPORTED("d58xf2hqair572yx3r8pofa0e"); // p1 -= 3;
-UNSUPPORTED("b4o9itamiw6ccgnlojl73v2fx"); // break;
-UNSUPPORTED("ad3bk4xnx8bgy7plhun3c0mvv"); // }
-UNSUPPORTED("2tfish0jog6m8uhlhaokmzvm3"); // }
-UNSUPPORTED("j8cvgeroqesrtqchx5ejvs06"); // /* Deal with the last alternative: go back and get number
-UNSUPPORTED("b74m2a2e9cgu2v8i8t1u5b2x1"); // of the `jump_past_alt' just before it. `mcnt' contains
-UNSUPPORTED("cu400hxya6t1qs6iquuqabq0s"); // the length of the alternative. */
-UNSUPPORTED("26bdoghsw938ft3sgehp275kx"); // do { (mcnt) = *(p1 - 2) & 0377; (mcnt) += ((((unsigned char) (*((p1 - 2) + 1))) ^ 128) - 128) << 8; } while (0);
-UNSUPPORTED("3xtanhdz88xahyfe15omt5obd"); // if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
-UNSUPPORTED("4h8qa3kxqmv2m8g445wmasnl"); // return 0;
-UNSUPPORTED("f53vent58m68zyw39fxmgqbr0"); // p1 += mcnt; /* Get past the n-th alternative. */
-UNSUPPORTED("9euvgwd19qm3deiwc663wdzb0"); // } /* if mcnt > 0 */
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("3q89uw4g68y7kyiitvliyykpb"); // case stop_memory:
-UNSUPPORTED("1qe3sa29ntp5400stzdrrbgdg"); // ;
-UNSUPPORTED("8jfkppp2w8v4t5gyqcelvinb4"); // *p = p1 + 2;
-UNSUPPORTED("15lnhn427yvuetx9312e81jrg"); // return 1;
-UNSUPPORTED("comxch6w0lbi64ejq9m4p0u7o"); // default:
-UNSUPPORTED("ir4atstqu8v5sqigzqbwdop4"); // if (!common_op_match_null_string_p (&p1, end, reg_info))
-UNSUPPORTED("bwb5ofkxp13uiyvgbvx70039w"); // return 0;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("55ht7a89z8ua4oqsrrwpapvpg"); // } /* while p1 < end */
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 azrkydvahepcjvkkru2gdwg0m
-// static boolean alt_match_null_string_p(unsigned char *p, unsigned char *end, register_info_type *reg_info)
-public static Object alt_match_null_string_p(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("7z4yu5m5t5mwjca6t6wpfajrj"); // alt_match_null_string_p(unsigned char *p,
-UNSUPPORTED("91jh331pn45y9rnhwhm4fiavm"); // unsigned char *end,
-UNSUPPORTED("ereoaeyy0phqbbu5cnhfb78ew"); // register_info_type *reg_info)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("5rwd4tuvikkbfw1s56awbwtbe"); // int mcnt;
-UNSUPPORTED("15ytldlmpb2i6cvtxquvhjs2m"); // unsigned char *p1 = p;
-UNSUPPORTED("azfsm7rfz2u17du52a0mrfyoq"); // while (p1 < end)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("3e0wppcum116c0gyks4koglo6"); // /* Skip over opcodes that can match nothing, and break when we get
-UNSUPPORTED("ei8lrs2smmn3h63q7rpj9sd0o"); // to one that can't. */
-UNSUPPORTED("3kakimebymsdj9dnon7o0iz9v"); // switch ((re_opcode_t) *p1)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("5n9m839emxb8of9xbq805onsd"); // /* It's a loop. */
-UNSUPPORTED("992rmruvdtrxnk46307iiqyjo"); // case on_failure_jump:
-UNSUPPORTED("4hemvstzejy8d3hmd82kukj7v"); // p1++;
-UNSUPPORTED("18pz18zbmozo48uq20alb8ok5"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("28bkn6qebb96emlyztm3kg6wt"); // p1 += mcnt;
-UNSUPPORTED("ctqmerohp1f69mb1v1t20jx33"); // break;
-UNSUPPORTED("comxch6w0lbi64ejq9m4p0u7o"); // default:
-UNSUPPORTED("ir4atstqu8v5sqigzqbwdop4"); // if (!common_op_match_null_string_p (&p1, end, reg_info))
-UNSUPPORTED("bwb5ofkxp13uiyvgbvx70039w"); // return 0;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("eixc7qyme2j14k5zjjghyiexn"); // } /* while p1 < end */
-UNSUPPORTED("3tcgz4dupb6kw5tdk7n3pca2l"); // return 1;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 7hv0wkt4lrkp5whfzuke2qytb
-// static boolean common_op_match_null_string_p(unsigned char **p, unsigned char *end, register_info_type *reg_info)
-public static Object common_op_match_null_string_p(Object... arg) {
-UNSUPPORTED("etarlz3ybg3wdofiesiw8dwbq"); // static boolean
-UNSUPPORTED("8k0shz76dhg3w8h6nz5pjbbu2"); // common_op_match_null_string_p(unsigned char **p,
-UNSUPPORTED("28yc2ksklc2vvzt1s5ynbtv0f"); // unsigned char *end,
-UNSUPPORTED("6qhd2068gir26rtqc477pm6m1"); // register_info_type *reg_info)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("5rwd4tuvikkbfw1s56awbwtbe"); // int mcnt;
-UNSUPPORTED("7n9r83dkya7i0zuq00imgrukd"); // boolean ret;
-UNSUPPORTED("7ju59c3dbukl0mz5vgjdoozn5"); // int reg_no;
-UNSUPPORTED("87zyg7fzbf21hmhh461pn9zf9"); // unsigned char *p1 = *p;
-UNSUPPORTED("qr7u5j2ref5m7rf6d3wqgmps"); // switch ((re_opcode_t) *p1++)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("cf4augtxav7j1ap91bbu3vwy1"); // case no_op:
-UNSUPPORTED("30ts9llmyexduvfuq7fczrer8"); // case begline:
-UNSUPPORTED("db3lgui4636z7pglgbzpqe54h"); // case endline:
-UNSUPPORTED("8fekxuxe035cl7l6pccwsy7fh"); // case begbuf:
-UNSUPPORTED("16msnj7hxrfentkv031ct5vc3"); // case endbuf:
-UNSUPPORTED("bcaajfoyi3jhpmdxhguo7iofc"); // case wordbeg:
-UNSUPPORTED("bkapw3yogqx0sw1ngisv3mb5d"); // case wordend:
-UNSUPPORTED("9pqp8vzoeyor0e1x4eqhthk8m"); // case wordbound:
-UNSUPPORTED("7hyd3tgheqr4untlslak7uheb"); // case notwordbound:
-UNSUPPORTED("dtx9szdvwh3uhziubh9zvgbk5"); // break;
-UNSUPPORTED("1olrmh5xaxc4lppwfnwemvaej"); // case start_memory:
-UNSUPPORTED("4rjnecf4q32xuk4ie6vozpkfh"); // reg_no = *p1;
-UNSUPPORTED("cf8srqrmhz47tb7zdgoe9ufhv"); // ;
-UNSUPPORTED("eluoqmhl3j8dyk8hyv680sy72"); // ret = group_match_null_string_p (&p1, end, reg_info);
-UNSUPPORTED("8hm5umlf6osua8zn0w4y735nh"); // /* Have to set this here in case we're checking a group which
-UNSUPPORTED("8xeab9le3ct3b2q7y6ly9yrhh"); // contains a group and a back reference to it. */
-UNSUPPORTED("5kozscfkat4mdav2anbiib5hw"); // if (((reg_info[reg_no]).bits.match_null_string_p) == 3)
-UNSUPPORTED("7qym75wzdha4x8u9v6fik2mwy"); // ((reg_info[reg_no]).bits.match_null_string_p) = ret;
-UNSUPPORTED("4cj58wdjt8jr4gsngmucb56o0"); // if (!ret)
-UNSUPPORTED("9co1titw8ibive55ugr6yfqa4"); // return 0;
-UNSUPPORTED("dtx9szdvwh3uhziubh9zvgbk5"); // break;
-UNSUPPORTED("608rfpgf7ytuxs7hkgnig1by5"); // /* If this is an optimized succeed_n for zero times, make the jump. */
-UNSUPPORTED("9agy5bj4opmh2vksf6lpzm8cd"); // case jump:
-UNSUPPORTED("9ngggpjqcpnq88nnkxr6y7vpq"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("1fxhzdbiknha03fye9yen0bje"); // if (mcnt >= 0)
-UNSUPPORTED("blqj2uomfewkrosqhn5f7bu73"); // p1 += mcnt;
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("9co1titw8ibive55ugr6yfqa4"); // return 0;
-UNSUPPORTED("dtx9szdvwh3uhziubh9zvgbk5"); // break;
-UNSUPPORTED("e7ahhsjjo9f2hw3bbtucupqlw"); // case succeed_n:
-UNSUPPORTED("9gimh1u1p2gmf0q5weiqpbbop"); // /* Get to the number of times to succeed. */
-UNSUPPORTED("1xi9qxsoaehueyjhabvspqapk"); // p1 += 2;
-UNSUPPORTED("9ngggpjqcpnq88nnkxr6y7vpq"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("1ju62vxdlb0sw55v80s2h9p8i"); // if (mcnt == 0)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("9o2tf6im70km8pb1v0mz4tbhc"); // p1 -= 4;
-UNSUPPORTED("18pz18zbmozo48uq20alb8ok5"); // do { do { (mcnt) = *(p1) & 0377; (mcnt) += ((((unsigned char) (*((p1) + 1))) ^ 128) - 128) << 8; } while (0); (p1) += 2; } while (0);
-UNSUPPORTED("28bkn6qebb96emlyztm3kg6wt"); // p1 += mcnt;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("9co1titw8ibive55ugr6yfqa4"); // return 0;
-UNSUPPORTED("dtx9szdvwh3uhziubh9zvgbk5"); // break;
-UNSUPPORTED("8qjtjs80wrz4f6y4td1b7mvma"); // case duplicate:
-UNSUPPORTED("asaad7roragv1dquu2i7eek6v"); // if (!((reg_info[*p1]).bits.match_null_string_p))
-UNSUPPORTED("9co1titw8ibive55ugr6yfqa4"); // return 0;
-UNSUPPORTED("dtx9szdvwh3uhziubh9zvgbk5"); // break;
-UNSUPPORTED("75h4k3rjfi85b2x98vw0ydipc"); // case set_number_at:
-UNSUPPORTED("4n2daij5pdw7lao7n4sjeg0jt"); // p1 += 4;
-UNSUPPORTED("p0mt8wznalavjdm44ot4ykl7"); // default:
-UNSUPPORTED("7clvngmkw0ra8af8a3iq45vx"); // /* All other opcodes mean we cannot match the empty string. */
-UNSUPPORTED("7opo20y2y6rg5i89ocvk6qi3c"); // return 0;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("7aoui9hygj5j6kdd0rxq44xxu"); // *p = p1;
-UNSUPPORTED("3tcgz4dupb6kw5tdk7n3pca2l"); // return 1;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 bmn9h3qza6i9e7dqjjfrybinz
-// static int bcmp_translate(const char *s1, const char *s2, register int len, char * translate)
-public static Object bcmp_translate(Object... arg) {
-UNSUPPORTED("eyp5xkiyummcoc88ul2b6tkeg"); // static int
-UNSUPPORTED("49tjvn2d5kzof9i3764qd8gth"); // bcmp_translate(const char *s1,
-UNSUPPORTED("5uinwhadus9kwopd7lyrqnv1a"); // const char *s2,
-UNSUPPORTED("cmbl8wi47y4b1fybqcgqp3cad"); // register int len,
-UNSUPPORTED("buglwifdxboeujcjzksjh6swn"); // char * translate)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("1ugbvzngjn5o1kzerkwa4adyp"); // register const unsigned char *p1 = (const unsigned char *) s1;
-UNSUPPORTED("180lhbq291ugus1sv6zq5b3l5"); // register const unsigned char *p2 = (const unsigned char *) s2;
-UNSUPPORTED("6wkqjlkf1iustuo36c77rrlrr"); // while (len)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("ezhykxoqbj0p9ighugfp2pi29"); // if (translate[*p1++] != translate[*p2++]) return 1;
-UNSUPPORTED("bzd5vvu7ht1mg1wbv21csikm0"); // len--;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("5oxhd3fvp0gfmrmz12vndnjt"); // return 0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 34ah0o8fvtlfnsffbxiyqyidp
-// const char * re_compile_pattern(const char *pattern, size_t length, struct re_pattern_buffer *bufp)
-public static Object re_compile_pattern(Object... arg) {
-UNSUPPORTED("6j2ty6zxx5788lqe504lttmv9"); // const char *
-UNSUPPORTED("840rb5ffowq19aqwebzlrs0ix"); // re_compile_pattern(const char *pattern,
-UNSUPPORTED("dl8tq4y4w9kpglxq4nad9nbg9"); // size_t length,
-UNSUPPORTED("aoahpx5nic1p28er7zbeilibx"); // struct re_pattern_buffer *bufp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("3e5irvh3tz7ehf2px38xbca06"); // reg_errcode_t ret;
-UNSUPPORTED("5e5qu4o19kt10axby5ksjp1wz"); // /* GNU code is written to assume at least RE_NREGS registers will be set
-UNSUPPORTED("aj16ee11rx90k6v260pcrptdx"); // (and at least one extra will be -1). */
-UNSUPPORTED("45osi16xhss2jxm7u3qpsz7c8"); // bufp->regs_allocated = 0;
-UNSUPPORTED("1s5igzhlf8kjprjkw59u0qgie"); // /* And GNU code determines whether or not to get register information
-UNSUPPORTED("4guz1aey6odyu4c6y9tmn7zks"); // by passing null for the REGS argument to re_match, etc., not by
-UNSUPPORTED("52atj9kiaa2ty4xp5v9tsxd36"); // setting no_sub. */
-UNSUPPORTED("bbp8v34kk2eq5jyypmrxegzfj"); // bufp->no_sub = 0;
-UNSUPPORTED("9zh94yub2h9x6jb5ygl7zj9j3"); // /* Match anchors at newline. */
-UNSUPPORTED("e5hvlkcul9024me3za5w0z09"); // bufp->newline_anchor = 1;
-UNSUPPORTED("f3zeg0ozvbzdxvagvz40uveju"); // ret = regex_compile (pattern, length, re_syntax_options, bufp);
-UNSUPPORTED("2ymc69pz5pg0nhr5joxv3v743"); // if (!ret)
-UNSUPPORTED("4mszslwsjcaxojerluqjpsu2v"); // return (void *)0;
-UNSUPPORTED("d6waz7r04hy6vrqylyux3566y"); // return (re_error_msgid[(int) ret]);
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 ark6qnryn24fu1bsbt5806lp
-// int regcomp(regex_t *preg, const char *pattern, int cflags)
-public static Object regcomp(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("blyavrrspx8u7mmx6skbsrpuy"); // regcomp(regex_t *preg,
-UNSUPPORTED("ez93viyirx32wiwx9ilmwnk2u"); // const char *pattern,
-UNSUPPORTED("s47pwvnf26eqviz0566rtafr"); // int cflags)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("3e5irvh3tz7ehf2px38xbca06"); // reg_errcode_t ret;
-UNSUPPORTED("arhekyz17wtkt6jcym8vpwl49"); // reg_syntax_t syntax
-UNSUPPORTED("cbdjhw8vkpou2zuaqsu38y9nq"); // = (cflags & 1) ?
-UNSUPPORTED("79wzspap1pncga08fi5fl45p3"); // ((((((unsigned long int) 1) << 1) << 1) | ((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | ((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)) | (((((unsigned long int) 1) << 1) << 1) << 1) | ((((((unsigned long int) 1) << 1) << 1) << 1) << 1) | ((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)) : ((((((unsigned long int) 1) << 1) << 1) | ((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | (((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) | ((((((((((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1)) | (((unsigned long int) 1) << 1));
-UNSUPPORTED("2c2dfk6a0ejxysnnaajue8m3p"); // /* regex_compile will allocate the space for the compiled pattern. */
-UNSUPPORTED("ciyvseirt32x5s8n7w8wi9s8b"); // preg->buffer = 0;
-UNSUPPORTED("b766kips3z6tm9tifbomnvtmy"); // preg->allocated = 0;
-UNSUPPORTED("2ne52scg87du6fvmgx4iz1ysx"); // preg->used = 0;
-UNSUPPORTED("dxwa3e8lqasfevebnvit8vz60"); // /* Don't bother to use a fastmap when searching. This simplifies the
-UNSUPPORTED("d5umtgupwg9d4iorhfyjyv8h5"); // REG_NEWLINE case: if we used a fastmap, we'd have to put all the
-UNSUPPORTED("ci8pjdo3b21gzu9zuu8df58su"); // characters after newlines into the fastmap. This way, we just try
-UNSUPPORTED("b5ux13ie7uoiwgtxbhqxccoi6"); // every character. */
-UNSUPPORTED("57t8as5xu3zastwhuvl9x5qvx"); // preg->fastmap = 0;
-UNSUPPORTED("enpzhkdq6ocdhen3xvl8ye5na"); // if (cflags & (1 << 1))
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("nujvj3hueebzfkhe2zarvfil"); // unsigned i;
-UNSUPPORTED("1pg69zbhom0cik7h8kn6t7y3g"); // preg->translate
-UNSUPPORTED("4nsrzyk2btcgmsdqjm2ar3vro"); // = (char *) malloc (256
-UNSUPPORTED("121bcje0610pzlltu9346d7c4"); // * sizeof (*(char *)0));
-UNSUPPORTED("bg80cnygjx78pa8v3kgmb63z4"); // if (preg->translate == (void *)0)
-UNSUPPORTED("ez6fz5kzz38v9ggr3wcumi254"); // return (int) REG_ESPACE;
-UNSUPPORTED("1vzdm7mgve5oi32ohhuqg8i00"); // /* Map uppercase characters to corresponding lowercase ones. */
-UNSUPPORTED("d532lt7aisdb9o1mkdskq134t"); // for (i = 0; i < 256; i++)
-UNSUPPORTED("aty2mttvyracw7p9x8sls4efr"); // preg->translate[i] = (1 && isupper (i)) ? tolower (i) : i;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("c74ru7c24sev3knmidtcsy39e"); // preg->translate = (void *)0;
-UNSUPPORTED("a5kyad26nzmqkixgei1o847n"); // /* If REG_NEWLINE is set, newlines are treated differently. */
-UNSUPPORTED("db72pzje2ov1p3o5omyykyi7e"); // if (cflags & ((1 << 1) << 1))
-UNSUPPORTED("bpj2wmqxauupj14jn3tkadfjh"); // { /* REG_NEWLINE implies neither . nor [^...] match newline. */
-UNSUPPORTED("359fgbemkmx8zzoobn2anh8hi"); // syntax &= ~((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1);
-UNSUPPORTED("6g64qw2xiqubh3y7z9htmuzh5"); // syntax |= ((((((((((unsigned long int) 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1) << 1);
-UNSUPPORTED("ciyi7qvu3im41264ljmdkdzcl"); // /* It also changes the matching behavior. */
-UNSUPPORTED("8qz1elzfwgfxjvri21nioniys"); // preg->newline_anchor = 1;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("div10atae09n36x269sl208r1"); // else
-UNSUPPORTED("2vftf31ujo45k9qv67n4ycbkv"); // preg->newline_anchor = 0;
-UNSUPPORTED("cx4zfp27tpwfh8xisrvqqbgks"); // preg->no_sub = !!(cflags & (((1 << 1) << 1) << 1));
-UNSUPPORTED("2x159h0yz24rnjci2cq7y1ntz"); // /* POSIX says a null character in the pattern terminates it, so we
-UNSUPPORTED("d66drlhc8quicmkt8miicu0ea"); // can use strlen here in compiling the pattern. */
-UNSUPPORTED("d0cg1xygicxugayg5yya59guo"); // ret = regex_compile (pattern, strlen (pattern), syntax, preg);
-UNSUPPORTED("erkyjok9d0k2psk0sb56f6vvz"); // /* POSIX doesn't distinguish between an unmatched open-group and an
-UNSUPPORTED("1u6sohla9epfpyet1i7nzcgad"); // unmatched close-group: both are REG_EPAREN. */
-UNSUPPORTED("3e5v05pv5yk1o9jdj6bh0zg5w"); // if (ret == REG_ERPAREN) ret = REG_EPAREN;
-UNSUPPORTED("7ancqvxv19g9moyznhw9my8xj"); // // printf("done with regcomp\n");
-UNSUPPORTED("f3hb5xwlfzeslhmq4ytwr8pgd"); // return (int) ret;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 9wdgvv1gwc1o7f0w05768p2i3
-// int regexec(const regex_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags)
-public static Object regexec(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("2v3o1uaqb2zp3puxfw779kms2"); // regexec(const regex_t *preg,
-UNSUPPORTED("ekpgp0iac0e6o9udtd55uiuly"); // const char *string,
-UNSUPPORTED("dvlw3353jood9rlb0w1geec5z"); // size_t nmatch,
-UNSUPPORTED("2864eyed7whs62o97tq2npado"); // regmatch_t pmatch[],
-UNSUPPORTED("3i4rg5r8fnniwlx6ybr4n906a"); // int eflags)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("7p7i4cv4qt10ow22vl9znw72j"); // int ret;
-UNSUPPORTED("82u0gsptykltdsomlyhj9rk19"); // struct re_registers regs;
-UNSUPPORTED("9z47qt0zii8jvt2jglo0lgszf"); // regex_t private_preg;
-UNSUPPORTED("6tsm0ylmo6ex2b24vcrr2cim7"); // int len = strlen (string);
-UNSUPPORTED("17kwuhblkqgc3mdapwyc395sz"); // boolean want_reg_info = !preg->no_sub && nmatch > 0;
-UNSUPPORTED("agwedmhzs0prdnnlk9jnsfg9c"); // private_preg = *preg;
-UNSUPPORTED("13e7wtxa8hlobsw8k2nqqg3r3"); // private_preg.not_bol = !!(eflags & 1);
-UNSUPPORTED("57scmexrxxrwf0l9nzr1szrpt"); // private_preg.not_eol = !!(eflags & (1 << 1));
-UNSUPPORTED("mql47hhdnpgkjou517m3726f"); // /* The user has told us exactly how many registers to return
-UNSUPPORTED("cqy8u5p4xwvs8y4q6w7fce3xv"); // information about, via `nmatch'. We have to pass that on to the
-UNSUPPORTED("3rosx96qxeg0kqk0uxh7l1cl8"); // matching routines. */
-UNSUPPORTED("c013ob9fi1fg0vxd1oam5865g"); // private_preg.regs_allocated = 2;
-UNSUPPORTED("9rkeiv1fdp19eb173sjfltu2t"); // if (want_reg_info)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("8a02jnbpnzttrw1ayq7w5mj62"); // regs.num_regs = nmatch;
-UNSUPPORTED("aoe6tbrgjwbzymn65261rgcum"); // regs.start = ((regoff_t *) malloc ((nmatch) * sizeof (regoff_t)));
-UNSUPPORTED("3hfltfy7wmk9a24vq9wzlmq9v"); // regs.end = ((regoff_t *) malloc ((nmatch) * sizeof (regoff_t)));
-UNSUPPORTED("7njv4u89envwukxkawqtq0oto"); // if (regs.start == (void *)0 || regs.end == (void *)0)
-UNSUPPORTED("873f3rccmawjgt3m3uqo8p3ci"); // return (int) REG_NOMATCH;
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("a8yuopeuk07ow83nm5njscoxn"); // /* Perform the searching operation. */
-UNSUPPORTED("cwamuwhai30lyfbzzvibn401x"); // ret = re_search (&private_preg, string, len,
-UNSUPPORTED("6jnlnbkqqmvrtbxyne0meo7jt"); // /* start: */ 0, /* range: */ len,
-UNSUPPORTED("1xnfnhd8hk3tln4va3uu7f2wm"); // want_reg_info ? ®s : (struct re_registers *) 0);
-UNSUPPORTED("86oesm7mqi9hv2n08zwleh73m"); // /* Copy the register information to the POSIX structure. */
-UNSUPPORTED("9rkeiv1fdp19eb173sjfltu2t"); // if (want_reg_info)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("ce73wb0bbrngqy808tp6ppsrq"); // if (ret >= 0)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("bxs4m6oognafzhor2ww93b692"); // unsigned r;
-UNSUPPORTED("8soywsau32kjtl93ct4sxxyma"); // for (r = 0; r < nmatch; r++)
-UNSUPPORTED("5k2digv672hnrndhc9ktw0oii"); // {
-UNSUPPORTED("cfq91dne0qag57cuzkcw5mxcg"); // pmatch[r].rm_so = regs.start[r];
-UNSUPPORTED("gibau4k00r5dzlvk4kcbwb56"); // pmatch[r].rm_eo = regs.end[r];
-UNSUPPORTED("b86ovw6olwwo6gnqlt1wqqzb4"); // }
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("c0xnifbhwrr011t5ogyy7sxk4"); // /* If we needed the temporary register info, free the space now. */
-UNSUPPORTED("ec72z8dmt4gcwsz42a7ubbvgx"); // free (regs.start);
-UNSUPPORTED("8gandm25f5zvbvckszq77jha"); // free (regs.end);
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("7dob0tgisyvw4rk6jg4viupyw"); // /* We want zero return to mean success, unlike `re_search'. */
-UNSUPPORTED("246hp3joht768z00rf97n4yvo"); // return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 6u3voe6b7jao3ubd49rpvpmmx
-// size_t regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
-public static Object regerror(Object... arg) {
-UNSUPPORTED("4hv4edbckfpx53agqilues063"); // size_t
-UNSUPPORTED("72xsdxwxd93qf4oxx4jyhdo8z"); // regerror(int errcode,
-UNSUPPORTED("asif8gxw337t4n3r3vlc5nfry"); // const regex_t *preg,
-UNSUPPORTED("7k1ct0qwx3daob1tp19njd6q0"); // char *errbuf,
-UNSUPPORTED("dx6x6qmmym6uzf7roqbw9kvt"); // size_t errbuf_size)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("91x25pzkmtzqo9hslez13lges"); // const char *msg;
-UNSUPPORTED("6m38jprvakqd3ls3jeotcz1xg"); // size_t msg_size;
-UNSUPPORTED("adpjyd1odey6jlw7vkjk429xt"); // if (errcode < 0
-UNSUPPORTED("8ybd3hnsngs38rh8ddk8q0w26"); // || errcode >= (int) (sizeof (re_error_msgid)
-UNSUPPORTED("c9vfuy341wx3rri8wvq9sua5s"); // / sizeof (re_error_msgid[0])))
-UNSUPPORTED("7u1uewk6wx5joexwehp38vlng"); // /* Only error codes returned by the rest of the code should be passed
-UNSUPPORTED("6hlmqhjzj6vqjlpwwklal6m89"); // to this routine. If we are given anything else, or if other regex
-UNSUPPORTED("cbs38fwyo0gkko91u7cenjci"); // code generates an invalid error code, then the program has a bug.
-UNSUPPORTED("8or7291qatc4r8j81dj07fgb4"); // Dump core so we can fix it. */
-UNSUPPORTED("68wdgoila4oldpk4gdc6i6uc3"); // abort ();
-UNSUPPORTED("4yci96v8pzj722abptwqxdkso"); // msg = (re_error_msgid[errcode]);
-UNSUPPORTED("dujj3eb9b3zvr0euc5s4itcj"); // msg_size = strlen (msg) + 1; /* Includes the null. */
-UNSUPPORTED("6oho364pztumj8yc7uc6bsusm"); // if (errbuf_size != 0)
-UNSUPPORTED("6pjalxixg8dnhbhc46pm6e6ay"); // {
-UNSUPPORTED("4oxtwxt5zv8auje423kp2f05r"); // if (msg_size > errbuf_size)
-UNSUPPORTED("9ua540u2gx5jpu302s81qfxhi"); // {
-UNSUPPORTED("3cof3rq3oujwsp8nrbb9snh96"); // strncpy (errbuf, msg, errbuf_size - 1);
-UNSUPPORTED("17sh1j757ozjg8a39nvcnmean"); // errbuf[errbuf_size - 1] = 0;
-UNSUPPORTED("7nxu74undh30brb8laojud3f9"); // }
-UNSUPPORTED("1knjyao8ci3w18zqqcnmnitir"); // else
-UNSUPPORTED("6ru8c1linplme96gzmn6v9ezn"); // strcpy (errbuf, msg);
-UNSUPPORTED("4mhlpjofolwivhm0tl8cxznly"); // }
-UNSUPPORTED("ban7kvxs6qguwfg0cz79w2fqe"); // return msg_size;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-
-
-//3 1ydg62ufhooqvgftuuovy004y
-// void regfree(regex_t *preg)
-public static Object regfree(Object... arg) {
-UNSUPPORTED("c01vxogao855zs8fe94tpim9g"); // void
-UNSUPPORTED("yxtwt5xf8mgfwucdzaq8xg0"); // regfree(regex_t *preg)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("axv8f27k41wevzbd8jorfk8em"); // if (preg->buffer != (void *)0)
-UNSUPPORTED("4krgfpqw59bwla8p73a5potcs"); // free (preg->buffer);
-UNSUPPORTED("duswsbmztnkjw8nmmpoanyq0l"); // preg->buffer = (void *)0;
-UNSUPPORTED("b766kips3z6tm9tifbomnvtmy"); // preg->allocated = 0;
-UNSUPPORTED("2ne52scg87du6fvmgx4iz1ysx"); // preg->used = 0;
-UNSUPPORTED("ac48j1opcvu8p6bmkvhdmubhe"); // if (preg->fastmap != (void *)0)
-UNSUPPORTED("43aaw7li7lbfcd1lewzzyp7to"); // free (preg->fastmap);
-UNSUPPORTED("4lv04h2kcmrw99yqy6i26w8g4"); // preg->fastmap = (void *)0;
-UNSUPPORTED("5e92vh1r7ol7emrm0ijcg45a9"); // preg->fastmap_accurate = 0;
-UNSUPPORTED("e4iva4m5k6n7oj8enuvyimttj"); // if (preg->translate != (void *)0)
-UNSUPPORTED("4mliivt4jjgt9njb860f17323"); // free (preg->translate);
-UNSUPPORTED("7c5ulxpurhe3moa5q2eu01tom"); // preg->translate = (void *)0;
-UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
-
-throw new UnsupportedOperationException();
-}
-
-
-}
diff -Nru plantuml-1.2017.15/src/gen/lib/label/index__c.java plantuml-1.2018.9/src/gen/lib/label/index__c.java
--- plantuml-1.2017.15/src/gen/lib/label/index__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/label/index__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -44,7 +44,13 @@
*
*/
package gen.lib.label;
+import static gen.lib.label.node__c.*;
+import static gen.lib.common.memory__c.zmalloc;
+import static smetana.core.JUtils.sizeof;
import static smetana.core.Macro.UNSUPPORTED;
+import h.RTree;
+import h._Node_t___;
+import smetana.core.__ptr__;
public class index__c {
@@ -105,6 +111,140 @@
throw new UnsupportedOperationException();
}
+///* Allocate space for a node in the list used in DeletRect to
+// * store Nodes that are too empty.
+// */
+//static struct ListNode *RTreeNewListNode(void)
+//{
+// return (struct ListNode*)zmalloc(sizeof(struct ListNode));
+//}
+//
+///* Add a node to the reinsertion list. All its branches will later
+// * be reinserted into the index structure.
+// */
+//static int RTreeReInsert(RTree_t * rtp, Node_t * n, struct ListNode **ee)
+//{
+// register struct ListNode *l;
+//
+// if (!(l = RTreeNewListNode()))
+// return -1;
+// l->node = n;
+// l->next = *ee;
+// *ee = l;
+// return 0;
+//}
+//
+//RTree_t *RTreeOpen()
+public static __ptr__ RTreeOpen() {
+ RTree rtp;
+ rtp = (RTree) zmalloc(sizeof(RTree.class));
+ if (rtp!=null)
+ rtp.setPtr("root", RTreeNewIndex(rtp));
+ return rtp;
+}
+
+///* Make a new index, empty. Consists of a single node. */
+//Node_t *RTreeNewIndex(RTree_t * rtp)
+public static _Node_t___ RTreeNewIndex(RTree rtp) {
+ _Node_t___ x;
+ x = RTreeNewNode(rtp);
+// x->level = 0; /* leaf */
+// rtp->LeafCount++;
+// return x;
+//}
+ throw new UnsupportedOperationException();
+}
+//
+//static int RTreeClose2(RTree_t * rtp, Node_t * n)
+//{
+// int i;
+//
+// if (n->level > 0) {
+// for (i = 0; i < 64; i++) {
+// if (!n->branch[i].child)
+// continue;
+// if (!RTreeClose2(rtp, n->branch[i].child)) {
+// free(n->branch[i].child);
+// DisconBranch(n, i);
+// rtp->EntryCount--;
+// if (rtp->StatFlag)
+// rtp->ElimCount++;
+// }
+// }
+// } else {
+// for (i = 0; i < 64; i++) {
+// if (!n->branch[i].child)
+// continue;
+// // free(n->branch[i].child);
+// DisconBranch(n, i);
+// rtp->EntryCount--;
+// if (rtp->StatFlag)
+// rtp->ElimCount++;
+// }
+// //free(n);
+// }
+// return 0;
+//}
+//
+//int RTreeClose(RTree_t * rtp)
+//{
+// RTreeClose2(rtp, rtp->root);
+// free(rtp->root);
+// free(rtp);
+// return 0;
+//}
+//
+//
+///* RTreeSearch in an index tree or subtree for all data retangles that
+//** overlap the argument rectangle.
+//** Returns the number of qualifying data rects.
+//*/
+//LeafList_t *RTreeSearch(RTree_t * rtp, Node_t * n, Rect_t * r)
+//{
+// register int i;
+// LeafList_t *llp = 0;
+//
+// assert(n);
+// assert(n->level >= 0);
+// assert(r);
+//
+// rtp->SeTouchCount++;
+//
+// if (n->level > 0) { /* this is an internal node in the tree */
+// for (i = 0; i < 64; i++)
+// if (n->branch[i].child && Overlap(r, &n->branch[i].rect)) {
+// LeafList_t *tlp = RTreeSearch(rtp, n->branch[i].child, r);
+// if (llp) {
+// LeafList_t *xlp = llp;
+// while (xlp->next)
+// xlp = xlp->next;
+// xlp->next = tlp;
+// } else
+// llp = tlp;
+// }
+// } else { /* this is a leaf node */
+// for (i = 0; i < 64; i++) {
+// if (n->branch[i].child && Overlap(r, &n->branch[i].rect)) {
+// llp = RTreeLeafListAdd(llp, (Leaf_t *) & n->branch[i]);
+//
+//
+//
+// }
+// }
+// }
+// return llp;
+//}
+//
+///* Insert a data rectangle into an index structure.
+//** RTreeInsert provides for splitting the root;
+//** returns 1 if root was split, 0 if it was not.
+//** The level argument specifies the number of steps up from the leaf
+//** level to insert; e.g. a data rectangle goes in at level = 0.
+//** RTreeInsert2 does the recursion.
+//*/
+//static int RTreeInsert2(RTree_t *, Rect_t *, void *, Node_t *, Node_t **,
+// int);
+///*static int RTreeInsert2(RTree_t*, Rect_t*, int, Node_t*, Node_t**, int); */
diff -Nru plantuml-1.2017.15/src/gen/lib/label/node__c.java plantuml-1.2018.9/src/gen/lib/label/node__c.java
--- plantuml-1.2017.15/src/gen/lib/label/node__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/label/node__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,18 +45,19 @@
*/
package gen.lib.label;
import static smetana.core.Macro.UNSUPPORTED;
+import h.RTree;
+import h._Node_t___;
+import smetana.core.Memory;
public class node__c {
//3 9uj7ni1m6q6drtoh56w82d6m4
// Node_t *RTreeNewNode(RTree_t * rtp)
-public static Object RTreeNewNode(Object... arg) {
-UNSUPPORTED("6r87cuk0qgu4wqagr86fr5tts"); // Node_t *RTreeNewNode(RTree_t * rtp)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("7wl3hkaktfhqdqsm6ubxboo1q"); // register Node_t *n;
-UNSUPPORTED("4bwg40kiiowl2obspxcr4saa2"); // rtp->NodeCount++;
-UNSUPPORTED("azoy4bfuupxwp4mi8hfbfb78g"); // n = (Node_t *) malloc(sizeof(Node_t));
+public static _Node_t___ RTreeNewNode(RTree rtp) {
+ _Node_t___ n;
+ rtp.setInt("NodeCount", rtp.getInt("NodeCount") + 1);
+ n = (_Node_t___) Memory.malloc(_Node_t___.class);
UNSUPPORTED("a4ey5uckjqallol1ktyqe35bv"); // InitNode(n);
UNSUPPORTED("69hc24ic55i66g8tf2ne42327"); // return n;
UNSUPPORTED("c24nfmv9i7o5eoqaymbibp7m7"); // }
diff -Nru plantuml-1.2017.15/src/gen/lib/label/xlabels__c.java plantuml-1.2018.9/src/gen/lib/label/xlabels__c.java
--- plantuml-1.2017.15/src/gen/lib/label/xlabels__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/label/xlabels__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -44,7 +44,19 @@
*
*/
package gen.lib.label;
+import static gen.lib.cdt.dtopen__c.dtopen;
+import static gen.lib.common.memory__c.zmalloc;
+import static gen.lib.label.index__c.RTreeOpen;
+import static smetana.core.JUtils.sizeof;
+import static smetana.core.Macro.N;
import static smetana.core.Macro.UNSUPPORTED;
+import h.BestPos_t;
+import h.XLabels_t;
+import h._dt_s;
+import h._dtdisc_s;
+import h.label_params_t;
+import smetana.core.Z;
+import smetana.core.__ptr__;
public class xlabels__c {
//1 9k44uhd5foylaeoekf3llonjq
@@ -123,8 +135,7 @@
//3 5p3ac8qk4gnne5hj1dc21ysi
// static int icompare(Dt_t * dt, void * v1, void * v2, Dtdisc_t * disc)
-public static Object icompare(Object... arg) {
-UNSUPPORTED("bpbhsdw4fe10xdxxfuegnvqt2"); // static int icompare(Dt_t * dt, void * v1, void * v2, Dtdisc_t * disc)
+public static int icompare(_dt_s dt, __ptr__ v1, __ptr__ v2, _dtdisc_s disc) {
UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
UNSUPPORTED("ehks25fxahyjbjd4lm6ryh9su"); // int k1 = *((int *) v1), k2 = *((int *) v2);
UNSUPPORTED("6in30ubiocmaih693f0arymgc"); // return k1 - k2;
@@ -138,24 +149,22 @@
//3 88mbfm305igsr7cew5qx6yldp
// static XLabels_t *xlnew(object_t * objs, int n_objs, xlabel_t * lbls, int n_lbls, label_params_t * params)
-public static Object xlnew(Object... arg) {
-UNSUPPORTED("3le94zdf67vws2boexolzlx7k"); // static XLabels_t *xlnew(object_t * objs, int n_objs,
-UNSUPPORTED("cb2wq8p902q5tlc1mh5hikgi2"); // xlabel_t * lbls, int n_lbls,
-UNSUPPORTED("bz8hxsdu70exdmt52dnayj0c7"); // label_params_t * params)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("bkrrqfyt0mc9r9usgj4c7t9zs"); // XLabels_t *xlp;
-UNSUPPORTED("5tfjcsm3vbxebkz2ev3uqptnx"); // xlp = (XLabels_t*)zmalloc(sizeof(XLabels_t));
-UNSUPPORTED("evg8rhuwggcno9jwcrub0i4y4"); // /* used to load the rtree in hilbert space filling curve order */
-UNSUPPORTED("8yj6rj5llf2mw5pp8tt355a7o"); // if (!(xlp->hdx = dtopen(&Hdisc, Dtobag))) {
+public static XLabels_t xlnew(__ptr__ objs, int n_objs, __ptr__ lbls, int n_lbls, label_params_t params) {
+__ptr__ xlp;
+xlp = zmalloc(sizeof(XLabels_t.class));
+/* used to load the rtree in hilbert space filling curve order */
+xlp.setPtr("hdx", dtopen(Z.z().Hdisc.amp(), Z.z().Dtobag));
+if (N(xlp.getPtr("hdx"))) {
UNSUPPORTED("4t1y5iinm4310lkpvbal1spve"); // fprintf(stderr, "out of memory\n");
UNSUPPORTED("3m406diamp5s5kwcqtwo4pshf"); // goto bad;
-UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("1bzq9uxiqzj7l6llb7e6gti7e"); // /* for querying intersection candidates */
+}
+/* for querying intersection candidates */
+xlp.setPtr("spdx", RTreeOpen());
UNSUPPORTED("7elrkgy2129t2ut4mi03dhf75"); // if (!(xlp->spdx = RTreeOpen())) {
UNSUPPORTED("4t1y5iinm4310lkpvbal1spve"); // fprintf(stderr, "out of memory\n");
UNSUPPORTED("3m406diamp5s5kwcqtwo4pshf"); // goto bad;
UNSUPPORTED("dvgyxsnyeqqnyzq696k3vskib"); // }
-UNSUPPORTED("85lb5m2umu5izyudq40of0dgi"); // /* save arg pointers in the handle */
+/* save arg pointers in the handle */
UNSUPPORTED("ava6c0wrmq2d6j1i4j7bd1lpp"); // xlp->objs = objs;
UNSUPPORTED("85sh2ov52z31nsy9mk5su9p5p"); // xlp->n_objs = n_objs;
UNSUPPORTED("3et8g76wlkf60sgxrmi3z1vom"); // xlp->lbls = lbls;
@@ -804,14 +813,10 @@
//3 brqgbskh3z4ah8infjompibvu
// int placeLabels(object_t * objs, int n_objs, xlabel_t * lbls, int n_lbls, label_params_t * params)
-public static Object placeLabels(Object... arg) {
-UNSUPPORTED("etrjsq5w49uo9jq5pzifohkqw"); // int
-UNSUPPORTED("ec68cktfb4yv5ddz6c3prlrlz"); // placeLabels(object_t * objs, int n_objs,
-UNSUPPORTED("5ldon0a05p5rangda7ft97vpf"); // xlabel_t * lbls, int n_lbls, label_params_t * params)
-UNSUPPORTED("erg9i1970wdri39osu8hx2a6e"); // {
-UNSUPPORTED("ch9su7givqwexp175hzif4dga"); // int r, i;
-UNSUPPORTED("ac14qcqjljksbh1ulqbhsnrnb"); // BestPos_t bp;
-UNSUPPORTED("as2y5lue6yv2statqso3a65vn"); // XLabels_t *xlp = xlnew(objs, n_objs, lbls, n_lbls, params);
+public static int placeLabels(__ptr__ objs, int n_objs, __ptr__ lbls, int n_lbls, label_params_t params) {
+int r, i;
+BestPos_t bp;
+XLabels_t xlp = xlnew(objs, n_objs, lbls, n_lbls, params);
UNSUPPORTED("dm5w2lmehr2rv6b2yi2v83i3g"); // if ((r = xlinitialize(xlp)) < 0)
UNSUPPORTED("bt8wt6mqb316pv7egiekltb74"); // return r;
UNSUPPORTED("8izrf1sxed8y2dmpz5ju27b6h"); // /* Place xlabel_t* lp near lp->obj so that the rectangle whose lower-left
diff -Nru plantuml-1.2017.15/src/gen/lib/pathplan/route__c.java plantuml-1.2018.9/src/gen/lib/pathplan/route__c.java
--- plantuml-1.2017.15/src/gen/lib/pathplan/route__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/pathplan/route__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -60,6 +60,7 @@
import smetana.core.Memory;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
import smetana.core.jmp_buf;
@@ -271,7 +272,7 @@
private static int splinefits_w_(__ptr__ edges, int edgen, final __struct__ pa, final __struct__ va, final __struct__ pb, final __struct__ vb, __ptr__ inps, int inpn) {
ENTERING("987ednrgu5qo9dzhpiox47mhb","splinefits");
try {
- final __array_of_struct__ sps = __array_of_struct__.malloc(pointf.class, 4);
+ final __array_of_struct__ sps = __array_of_struct_impl__.malloc(pointf.class, 4);
double a, b;
int pi;
int forceflag;
@@ -344,7 +345,7 @@
double roots[] = new double[4];
int rooti, rootn;
int ei;
- final __array_of_struct__ lps = __array_of_struct__.malloc(pointf.class, 2);
+ final __array_of_struct__ lps = __array_of_struct_impl__.malloc(pointf.class, 2);
final __struct__ ip = JUtils.from(pointf.class);
double t, ta, tb, tc, td;
for (ei = 0; ei < edgen; ei++) {
diff -Nru plantuml-1.2017.15/src/gen/lib/pathplan/shortest__c.java plantuml-1.2018.9/src/gen/lib/pathplan/shortest__c.java
--- plantuml-1.2017.15/src/gen/lib/pathplan/shortest__c.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/gen/lib/pathplan/shortest__c.java 2018-07-27 21:59:19.000000000 +0000
@@ -63,6 +63,7 @@
import smetana.core.Memory;
import smetana.core.Z;
import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_struct_impl__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
import smetana.core.jmp_buf;
@@ -121,7 +122,7 @@
final __struct__ p1 = JUtils.from(pointf.class), p2 = JUtils.from(pointf.class), p3 = JUtils.from(pointf.class);
int trii, trij, ftrii, ltrii;
int ei;
- final __array_of_struct__ epnls = __array_of_struct__.malloc(pointnlink_t.class, 2);
+ final __array_of_struct__ epnls = __array_of_struct_impl__.malloc(pointnlink_t.class, 2);
pointnlink_t lpnlp=null, rpnlp=null, pnlp=null;
triangle_t trip;
int splitindex;
diff -Nru plantuml-1.2017.15/src/h/_Node_t___.java plantuml-1.2018.9/src/h/_Node_t___.java
--- plantuml-1.2017.15/src/h/_Node_t___.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/_Node_t___.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,69 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.__ptr__;
+
+//2 aqoki3wwzhqcy2mpz21vzdona
+
+public interface _Node_t___ extends __ptr__ {
+ public static List DEFINITION = Arrays.asList(
+"typedef struct Node",
+"{",
+"int count",
+"int level",
+"struct Branch branch[64]",
+"}",
+"Node_t");
+}
+
+// typedef struct Node {
+// int count;
+// int level; /* 0 is leaf, others positive */
+// struct Branch branch[64];
+// } Node_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/_Note_t___.java plantuml-1.2018.9/src/h/_Note_t___.java
--- plantuml-1.2017.15/src/h/_Note_t___.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/_Note_t___.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info: http://plantuml.com
- *
- * If you like this project or if you find it useful, you can support us at:
- *
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- *
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- *
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- *
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- *
- * You may obtain a copy of the License at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aqoki3wwzhqcy2mpz21vzdona
-
-public interface _Note_t___ extends __ptr__ {
- public static List DEFINITION = Arrays.asList(
-"typedef struct Node",
-"{",
-"int count",
-"int level",
-"struct Branch branch[64]",
-"}",
-"Node_t");
-}
-
-// typedef struct Node {
-// int count;
-// int level; /* 0 is leaf, others positive */
-// struct Branch branch[64];
-// } Node_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_adjmatrix_t.java plantuml-1.2018.9/src/h/ST_adjmatrix_t.java
--- plantuml-1.2017.15/src/h/ST_adjmatrix_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_adjmatrix_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,139 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_integer__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfInteger;
+import smetana.core.amiga.StarStruct;
+
+public class ST_adjmatrix_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_adjmatrix_t() {
+ this(null);
+ }
+
+ public ST_adjmatrix_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct adjmatrix_t",
+ // "{",
+ private int nrows, ncols;
+
+ // "char *data",
+ private StarArrayOfInteger data;
+
+ // "}",
+ // "adjmatrix_t");
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("ncols")) {
+ this.ncols = data;
+ return;
+ }
+ if (fieldName.equals("nrows")) {
+ this.nrows = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("nrows")) {
+ return this.nrows;
+ }
+ if (fieldName.equals("ncols")) {
+ return this.ncols;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("data")) {
+ this.data = (StarArrayOfInteger) newData;
+ return data;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __array_of_integer__ getArrayOfInteger(String fieldName) {
+ if (fieldName.equals("data")) {
+ return data.getInternalArray();
+ }
+ return super.getArrayOfInteger(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("data")) {
+ return data;
+ }
+ return super.getPtr(fieldName);
+ }
+}
+
+// typedef struct adjmatrix_t {
+// int nrows, ncols;
+// char *data;
+// } adjmatrix_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agattr_s.java plantuml-1.2018.9/src/h/ST_Agattr_s.java
--- plantuml-1.2017.15/src/h/ST_Agattr_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agattr_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,125 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_cstring__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfCString;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agattr_s extends UnsupportedStructAndPtr {
+
+ private final ST_Agrec_s h = new ST_Agrec_s(this); /* common data header */
+ public ST_dt_s dict; /* shared dict to interpret attr field */
+ public StarArrayOfCString str; /* the attribute string values */
+
+ private final StarStruct parent;
+
+ public ST_Agattr_s() {
+ this(null);
+ }
+
+ public ST_Agattr_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("dict")) {
+ return dict;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("dict")) {
+ this.dict = (ST_dt_s) newData;
+ return dict;
+ }
+ if (fieldName.equals("str")) {
+ this.str = (StarArrayOfCString) newData;
+ return str;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __array_of_cstring__ getArrayOfCString(String fieldName) {
+ if (fieldName.equals("str")) {
+ return str.getInternalArray();
+ }
+ return super.getArrayOfCString(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agrec_s.class) {
+ return h;
+ // return h.amp();
+ }
+ return super.castTo(dest);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agattr_s",
+ // "{",
+ // "Agrec_t h",
+ // "Dict_t *dict",
+ // "char **str",
+ // "}");
+}
+
+// struct Agattr_s { /* dynamic string attributes */
+// Agrec_t h; /* common data header */
+// Dict_t *dict; /* shared dict to interpret attr field */
+// char **str; /* the attribute string values */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agcbstack_s.java plantuml-1.2018.9/src/h/ST_Agcbstack_s.java
--- plantuml-1.2017.15/src/h/ST_Agcbstack_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agcbstack_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,80 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agcbstack_s extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_Agcbstack_s() {
+ this(null);
+ }
+
+ public ST_Agcbstack_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agcbstack_s",
+ // "{",
+ // "Agcbdisc_t *f",
+ // "void *state",
+ // "Agcbstack_t *prev",
+ // "}");
+}
+
+// struct Agcbstack_s { /* object event callbacks */
+// Agcbdisc_t *f; /* methods */
+// void *state; /* closure */
+// Agcbstack_t *prev; /* kept in a stack, unlike other disciplines */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agclos_s.java plantuml-1.2018.9/src/h/ST_Agclos_s.java
--- plantuml-1.2017.15/src/h/ST_Agclos_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agclos_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,203 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.ArrayOfInteger;
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_integer__;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agclos_s extends UnsupportedStructAndPtr {
+ public final ST_Agdisc_s disc = new ST_Agdisc_s(this); /* resource discipline functions */
+ public final ST_Agdstate_s state = new ST_Agdstate_s(this); /* resource closures */
+ public ST_dt_s strdict;
+ private final int[] seq = new int[3];
+ // "unsigned long seq[3]",
+ public ST_Agcbstack_s cb;
+ public boolean callbacks_enabled; /* issue user callbacks or hold them? */
+
+ // "Dict_t *lookup_by_name[3]",
+ // "Dict_t *lookup_by_id[3]",
+ private final ArrayOfThreePtrDict_t lookup_by_id = new ArrayOfThreePtrDict_t();
+
+ static class ArrayOfThreePtrDict_t extends UnsupportedArrayOfPtr implements __array_of_ptr__ {
+ private final List list;
+ private final int pos;
+
+ private ArrayOfThreePtrDict_t(List list, int pos) {
+ this.list = list;
+ this.pos = pos;
+ }
+
+ ArrayOfThreePtrDict_t() {
+ this(new ArrayList(), 0);
+ for (int i = 0; i < 3; i++) {
+ list.add(null);
+ }
+ }
+
+ @Override
+ public __array_of_ptr__ plus(int delta) {
+ return new ArrayOfThreePtrDict_t(list, pos + delta);
+ }
+
+ @Override
+ public __ptr__ getPtr() {
+ return list.get(0);
+ }
+
+ }
+
+ private final StarStruct parent;
+
+ public ST_Agclos_s() {
+ this(null);
+ }
+
+ public ST_Agclos_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("callbacks_enabled")) {
+ return callbacks_enabled;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("strdict")) {
+ return strdict;
+ }
+ if (fieldName.equals("cb")) {
+ return cb;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("strdict")) {
+ this.strdict = (ST_dt_s) newData;
+ return strdict;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("disc")) {
+ return disc;
+ }
+ if (fieldName.equals("state")) {
+ return state;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("callbacks_enabled")) {
+ this.callbacks_enabled = data;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public __array_of_integer__ getArrayOfInteger(String fieldName) {
+ if (fieldName.equals("seq")) {
+ return new ArrayOfInteger(seq, 0);
+ }
+ return super.getArrayOfInteger(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("lookup_by_id")) {
+ return lookup_by_id;
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ // public interface ST_Agclos_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agclos_s",
+ // "{",
+ // "Agdisc_t disc",
+ // "Agdstate_t state",
+ // "Dict_t *strdict",
+ // "unsigned long seq[3]",
+ // "Agcbstack_t *cb",
+ // "unsigned char callbacks_enabled",
+ // "Dict_t *lookup_by_name[3]",
+ // "Dict_t *lookup_by_id[3]",
+ // "}");
+}
+
+// struct Agclos_s {
+// Agdisc_t disc; /* resource discipline functions */
+// Agdstate_t state; /* resource closures */
+// Dict_t *strdict; /* shared string dict */
+// unsigned long seq[3]; /* local object sequence number counter */
+// Agcbstack_t *cb; /* user and system callback function stacks */
+// unsigned char callbacks_enabled; /* issue user callbacks or hold them? */
+// Dict_t *lookup_by_name[3];
+// Dict_t *lookup_by_id[3];
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agdatadict_s.java plantuml-1.2018.9/src/h/ST_Agdatadict_s.java
--- plantuml-1.2017.15/src/h/ST_Agdatadict_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agdatadict_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,139 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agdatadict_s extends UnsupportedStructAndPtr {
+
+ private final ST_Agrec_s h = new ST_Agrec_s(this); /* installed in list of graph recs */
+ public ST_dt_s n;
+ public ST_dt_s e;
+ public ST_dt_s g;
+
+ private final StarStruct parent;
+
+ public ST_Agdatadict_s() {
+ this(null);
+ }
+
+ public ST_Agdatadict_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("dict.n")) {
+ this.n = (ST_dt_s) newData;
+ return n;
+ }
+ if (fieldName.equals("dict.e")) {
+ this.e = (ST_dt_s) newData;
+ return e;
+ }
+ if (fieldName.equals("dict.g")) {
+ this.g = (ST_dt_s) newData;
+ return g;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("dict.n")) {
+ return n;
+ }
+ if (fieldName.equals("dict.e")) {
+ return e;
+ }
+ if (fieldName.equals("dict.g")) {
+ return g;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agrec_s.class) {
+ return h.amp();
+ }
+ return super.castTo(dest);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agdatadict_s",
+ // "{",
+ // "Agrec_t h",
+ // "struct",
+ // "{",
+ // "Dict_t *n, *e, *g",
+ // "}",
+ // "dict",
+ // "}");
+}
+
+// struct Agdatadict_s { /* set of dictionaries per graph */
+// Agrec_t h; /* installed in list of graph recs */
+// struct {
+// Dict_t *n, *e, *g;
+// } dict;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agdesc_s.java plantuml-1.2018.9/src/h/ST_Agdesc_s.java
--- plantuml-1.2017.15/src/h/ST_Agdesc_s.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agdesc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -47,7 +47,6 @@
import smetana.core.HardcodedStruct;
import smetana.core.UnsupportedStarStruct;
-import smetana.core.UnsupportedStruct;
import smetana.core.UnsupportedStructAndPtr;
import smetana.core.__struct__;
import smetana.core.amiga.Area;
diff -Nru plantuml-1.2017.15/src/h/ST_Agdisc_s.java plantuml-1.2018.9/src/h/ST_Agdisc_s.java
--- plantuml-1.2017.15/src/h/ST_Agdisc_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agdisc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,113 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agdisc_s extends UnsupportedStructAndPtr {
+
+ public ST_Agmemdisc_s.Amp mem;
+ public ST_Agiddisc_s.Amp id;
+ public ST_Agiodisc_s.Amp io;
+
+ private final StarStruct parent;
+
+ public ST_Agdisc_s() {
+ this(null);
+ }
+
+ public ST_Agdisc_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("mem")) {
+ this.mem = (ST_Agmemdisc_s.Amp) newData;
+ return mem;
+ }
+ if (fieldName.equals("id")) {
+ this.id = (ST_Agiddisc_s.Amp) newData;
+ return id;
+ }
+ // if (fieldName.equals("io")) {
+ // this.io = (ST_Agiodisc_s.Amp) newData;
+ // return io;
+ // }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("mem")) {
+ return mem;
+ }
+ if (fieldName.equals("id")) {
+ return id;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agdisc_s",
+ // "{",
+ // "Agmemdisc_t *mem",
+ // "Agiddisc_t *id",
+ // "Agiodisc_t *io",
+ // "}");
+}
+
+// struct Agdisc_s { /* user's discipline */
+// Agmemdisc_t *mem;
+// Agiddisc_t *id;
+// Agiodisc_t *io;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agdstate_s.java plantuml-1.2018.9/src/h/ST_Agdstate_s.java
--- plantuml-1.2017.15/src/h/ST_Agdstate_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agdstate_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,108 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agdstate_s extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public __ptr__ mem;
+ public __ptr__ id;
+
+ public ST_Agdstate_s() {
+ this(null);
+ }
+
+ public ST_Agdstate_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("mem")) {
+ this.mem = newData;
+ return mem;
+ }
+ if (fieldName.equals("id")) {
+ this.id = newData;
+ return id;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("mem")) {
+ return mem;
+ }
+ if (fieldName.equals("id")) {
+ return id;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agdstate_s",
+ // "{",
+ // "void *mem",
+ // "void *id",
+ // "}");
+}
+
+// struct Agdstate_s {
+// void *mem;
+// void *id;
+// /* IO must be initialized and finalized outside Cgraph,
+// * and channels (FILES) are passed as void* arguments. */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agedgeinfo_t.java plantuml-1.2018.9/src/h/ST_Agedgeinfo_t.java
--- plantuml-1.2017.15/src/h/ST_Agedgeinfo_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agedgeinfo_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,368 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_Agedgeinfo_t() {
+ this(null);
+ }
+
+ public ST_Agedgeinfo_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+
+ private ST_splines spl;
+ private final ST_port tail_port = new ST_port(this), head_port = new ST_port(this);
+ private ST_textlabel_t label, head_label, tail_label, xlabel;
+ private int edge_type;
+ private int adjacent;
+ private boolean label_ontop;
+ // "unsigned char gui_state",
+ private ST_Agedge_s to_orig;
+ // "void *alg",
+ // "double factor",
+ private double dist;
+ // "Ppolyline_t path",
+ private int showboxes;
+ private boolean conc_opp_flag;
+ private int xpenalty;
+ private int weight;
+ private int cutvalue, tree_index;
+ private int count;
+ private int minlen;
+
+ private ST_Agedge_s to_virt;
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ ST_Agedgeinfo_t this2 = (ST_Agedgeinfo_t) other;
+ this.hdr.copyDataFrom((__struct__) this2.hdr);
+ this.spl = this2.spl;
+ this.tail_port.copyDataFrom((__struct__) this2.tail_port);
+ this.head_port.copyDataFrom((__struct__) this2.head_port);
+ this.label = this2.label;
+ this.head_label = this2.head_label;
+ this.tail_label = this2.tail_label;
+ this.xlabel = this2.xlabel;
+ this.edge_type = this2.edge_type;
+ this.adjacent = this2.adjacent;
+ this.label_ontop = this2.label_ontop;
+ this.to_orig = this2.to_orig;
+ this.dist = this2.dist;
+ this.showboxes = this2.showboxes;
+ this.conc_opp_flag = this2.conc_opp_flag;
+ this.xpenalty = this2.xpenalty;
+ this.weight = this2.weight;
+ this.cutvalue = this2.cutvalue;
+ this.tree_index = this2.tree_index;
+ this.count = this2.count;
+ this.minlen = this2.minlen;
+ this.to_virt = this2.to_virt;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public __ptr__ castTo(Class dest) {
+ return ST_Agedgeinfo_t.this.castTo(dest);
+ }
+
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agrec_s.class) {
+ return hdr;
+ }
+ if (dest == Agedgeinfo_t.class) {
+ return this;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("tail_port")) {
+ this.tail_port.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("head_port")) {
+ this.head_port.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("label_ontop")) {
+ this.label_ontop = data;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("dist")) {
+ this.dist = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("minlen")) {
+ this.minlen = data;
+ return;
+ }
+ if (fieldName.equals("weight")) {
+ this.weight = data;
+ return;
+ }
+ if (fieldName.equals("cutvalue")) {
+ this.cutvalue = data;
+ return;
+ }
+ if (fieldName.equals("tree_index")) {
+ this.tree_index = data;
+ return;
+ }
+ if (fieldName.equals("count")) {
+ this.count = data;
+ return;
+ }
+ if (fieldName.equals("xpenalty")) {
+ this.xpenalty = data;
+ return;
+ }
+ if (fieldName.equals("showboxes")) {
+ this.showboxes = data;
+ return;
+ }
+ if (fieldName.equals("edge_type")) {
+ this.edge_type = data;
+ return;
+ }
+ if (fieldName.equals("adjacent")) {
+ this.adjacent = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("dist")) {
+ return this.dist;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("conc_opp_flag")) {
+ return this.conc_opp_flag;
+ }
+ if (fieldName.equals("label_ontop")) {
+ return this.label_ontop;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("minlen")) {
+ return this.minlen;
+ }
+ if (fieldName.equals("weight")) {
+ return this.weight;
+ }
+ if (fieldName.equals("cutvalue")) {
+ return this.cutvalue;
+ }
+ if (fieldName.equals("tree_index")) {
+ return this.tree_index;
+ }
+ if (fieldName.equals("count")) {
+ return this.count;
+ }
+ if (fieldName.equals("xpenalty")) {
+ return this.xpenalty;
+ }
+ if (fieldName.equals("showboxes")) {
+ return this.showboxes;
+ }
+ if (fieldName.equals("edge_type")) {
+ return this.edge_type;
+ }
+ if (fieldName.equals("adjacent")) {
+ return this.adjacent;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("to_virt")) {
+ return this.to_virt;
+ }
+ if (fieldName.equals("to_orig")) {
+ return this.to_orig;
+ }
+ if (fieldName.equals("label")) {
+ return this.label;
+ }
+ if (fieldName.equals("spl")) {
+ return this.spl;
+ }
+ if (fieldName.equals("xlabel")) {
+ return this.xlabel;
+ }
+ if (fieldName.equals("head_label")) {
+ return this.head_label;
+ }
+ if (fieldName.equals("tail_label")) {
+ return this.tail_label;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("tail_port")) {
+ return this.tail_port;
+ }
+ if (fieldName.equals("head_port")) {
+ return this.head_port;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("to_virt")) {
+ if (newData instanceof ST_Agedge_s.Amp) {
+ this.to_virt = ((ST_Agedge_s.Amp) newData).getObject();
+ } else {
+ this.to_virt = (ST_Agedge_s) newData;
+ }
+ return this.to_virt;
+ }
+ if (fieldName.equals("to_orig")) {
+ if (newData instanceof ST_Agedge_s.Amp) {
+ this.to_orig = ((ST_Agedge_s.Amp) newData).getObject();
+ } else {
+ this.to_orig = (ST_Agedge_s) newData;
+ }
+ return this.to_orig;
+ }
+ if (fieldName.equals("spl")) {
+ this.spl = (ST_splines) newData;
+ return this.spl;
+ }
+ if (fieldName.equals("label")) {
+ this.label = (ST_textlabel_t) newData;
+ return this.label;
+ }
+ if (fieldName.equals("head_label")) {
+ this.head_label = (ST_textlabel_t) newData;
+ return this.head_label;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+}
+
+// typedef struct Agedgeinfo_t {
+// Agrec_t hdr;
+// splines *spl;
+// port tail_port, head_port;
+// textlabel_t *label, *head_label, *tail_label, *xlabel;
+// char edge_type;
+// char adjacent; /* true for flat edge with adjacent nodes */
+// char label_ontop;
+// unsigned char gui_state; /* Edge state for GUI ops */
+// edge_t *to_orig; /* for dot's shapes.c */
+// void *alg;
+//
+//
+// double factor;
+// double dist;
+// Ppolyline_t path;
+//
+//
+// unsigned char showboxes;
+// boolean conc_opp_flag;
+// short xpenalty;
+// int weight;
+// int cutvalue, tree_index;
+// short count;
+// unsigned short minlen;
+// edge_t *to_virt;
+//
+// } Agedgeinfo_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agedgepair_s.java plantuml-1.2018.9/src/h/ST_Agedgepair_s.java
--- plantuml-1.2017.15/src/h/ST_Agedgepair_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agedgepair_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,97 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agedgepair_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public final ST_Agedge_s out = new ST_Agedge_s(this);
+ public final ST_Agedge_s in = new ST_Agedge_s(this);
+
+ private final StarStruct parent;
+
+ public ST_Agedgepair_s() {
+ this(null);
+ }
+
+ public ST_Agedgepair_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("out")) {
+ return out;
+ }
+ if (fieldName.equals("in")) {
+ return in;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agedgepair_s",
+ // "{",
+ // "Agedge_t out, in",
+ // "}");
+}
+
+// struct Agedgepair_s {
+// Agedge_t out, in;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agedge_s.java plantuml-1.2018.9/src/h/ST_Agedge_s.java
--- plantuml-1.2017.15/src/h/ST_Agedge_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agedge_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,315 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_Agrec_s.Amp;
+import smetana.core.HardcodedStruct;
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agedge_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ private final ST_Agobj_s base = new ST_Agobj_s(this);
+ private final ST_dtlink_s id_link = new ST_dtlink_s(this);
+ private final ST_dtlink_s seq_link = new ST_dtlink_s(this);
+ private ST_Agnode_s node;
+
+ @Override
+ public void copyDataFrom(__ptr__ arg) {
+ if (arg instanceof Amp) {
+ arg = ((Amp) arg).getObject();
+ }
+ ST_Agedge_s this2 = (ST_Agedge_s) arg;
+ this.base.copyDataFrom((__struct__) this2.base);
+ this.id_link.copyDataFrom((__struct__) this2.id_link);
+ this.seq_link.copyDataFrom((__struct__) this2.seq_link);
+ this.node = this2.node;
+ }
+
+ private final StarStruct parent;
+
+ public ST_Agedge_s() {
+ this(null);
+ }
+
+ public ST_Agedge_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ if (other instanceof Amp) {
+ Amp other2 = (Amp) other;
+ return this == other2.me;
+ }
+ ST_Agedge_s other2 = (ST_Agedge_s) other;
+ return this == other2;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agedge_s me;
+
+ public Amp(ST_Agedge_s me) {
+ this.me = me;
+ }
+
+ public ST_Agedge_s getObject() {
+ return me;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ if (other instanceof ST_Agedge_s) {
+ ST_Agedge_s other2 = (ST_Agedge_s) other;
+ return this.me == other2;
+ }
+ Amp other2 = (Amp) other;
+ return this.me == other2.me;
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ return ST_Agedge_s.this.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agedge_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ ST_Agedge_s.this.copyDataFrom(other);
+ }
+
+ @Override
+ public void copyDataFrom(__ptr__ other) {
+ ST_Agedge_s.this.copyDataFrom(other);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agedge_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return ST_Agedge_s.this.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ plus(int pointerMove) {
+ ST_Agedgepair_s pair = (ST_Agedgepair_s) me.parent;
+ // Order=out, in
+ if (pair.out == me && pointerMove == 1) {
+ return pair.in;
+ }
+ if (pair.in == me && pointerMove == -1) {
+ return pair.out;
+ }
+ return super.plus(pointerMove);
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agedge_s::seq_link")) {
+ return seq_link;
+ }
+ if (offset.toString().equals("h.Agedge_s::id_link")) {
+ return id_link;
+ }
+ System.err.println("offset1=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agedge_s::seq_link")) {
+ return seq_link;
+ }
+ if (offset.toString().equals("h.Agedge_s::id_link")) {
+ return id_link;
+ }
+ System.err.println("offset2=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public __ptr__ plus(int pointerMove) {
+ ST_Agedgepair_s pair = (ST_Agedgepair_s) parent;
+ // Order=out, in
+ if (pair.out == this && pointerMove == 1) {
+ return pair.in;
+ }
+ if (pair.in == this && pointerMove == -1) {
+ return pair.out;
+ }
+ return super.plus(pointerMove);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agobj_s.class) {
+ return base;
+ }
+ if (dest == Agedge_s.class) {
+ return this;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("node")) {
+ if (newData instanceof ST_Agnode_s.Amp) {
+ this.node = ((ST_Agnode_s.Amp) newData).getObject();
+ } else {
+ this.node = (ST_Agnode_s) newData;
+ }
+ return node;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("node")) {
+ return node;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("base")) {
+ return base;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ public StarStruct from_seq_link(ST_dtlink_s from) {
+ if (from == seq_link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+ public StarStruct from_id_link(ST_dtlink_s from) {
+ if (from == id_link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+ public static size_t sizeof_starstar_empty(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return STStarArrayOfPointer.malloc(nb);
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ if (old instanceof STStarArrayOfPointer) {
+ STStarArrayOfPointer old2 = (STStarArrayOfPointer) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ // if (old instanceof StarArrayOfPtr) {
+ // StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ // old2.realloc(nb);
+ // return old2;
+ // }
+ return super.realloc(old);
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+ };
+ }
+
+ // public interface ST_Agedge_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agedge_s",
+ // "{",
+ // "Agobj_t base",
+ // "Dtlink_t id_link",
+ // "Dtlink_t seq_link",
+ // "Agnode_t *node",
+ // "}");
+}
+
+// struct Agedge_s {
+// Agobj_t base;
+// Dtlink_t id_link; /* main graph only */
+// Dtlink_t seq_link;
+// Agnode_t *node; /* the endpoint node */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agiddisc_s.java plantuml-1.2018.9/src/h/ST_Agiddisc_s.java
--- plantuml-1.2017.15/src/h/ST_Agiddisc_s.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agiddisc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -51,7 +51,6 @@
import smetana.core.__ptr__;
import smetana.core.amiga.StarStruct;
-
public class ST_Agiddisc_s extends UnsupportedStruct {
public CFunction open;
@@ -64,33 +63,34 @@
@Override
public StarStruct amp() {
- return new UnsupportedStarStruct() {
- @Override
- public Object call(String fieldName, Object... args) {
- if (fieldName.equals("open")) {
- return open.exe(args);
- }
- if (fieldName.equals("map")) {
- return map.exe(args);
- }
- if (fieldName.equals("idregister")) {
- return idregister.exe(args);
- }
- if (fieldName.equals("print")) {
- return print.exe(args);
- }
- return super.call(fieldName, args);
- }
+ return new Amp();
+ }
- @Override
- public __ptr__ getPtr(String fieldName) {
- if (fieldName.equals("print")) {
- return print;
- }
- return super.getPtr(fieldName);
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("open")) {
+ return open.exe(args);
+ }
+ if (fieldName.equals("map")) {
+ return map.exe(args);
}
+ if (fieldName.equals("idregister")) {
+ return idregister.exe(args);
+ }
+ if (fieldName.equals("print")) {
+ return print.exe(args);
+ }
+ return super.call(fieldName, args);
+ }
- };
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("print")) {
+ return print;
+ }
+ return super.getPtr(fieldName);
+ }
}
// public static List DEFINITION = Arrays.asList(
diff -Nru plantuml-1.2017.15/src/h/ST_Agiodisc_s.java plantuml-1.2018.9/src/h/ST_Agiodisc_s.java
--- plantuml-1.2017.15/src/h/ST_Agiodisc_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agiodisc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,105 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+import smetana.core.CFunction;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStruct;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agiodisc_s extends UnsupportedStruct {
+
+ public CFunction afread;
+ public CFunction putstr;
+ public CFunction flush;
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+// @Override
+// public Object call(String fieldName, Object... args) {
+// if (fieldName.equals("open")) {
+// return open.exe(args);
+// }
+// if (fieldName.equals("map")) {
+// return map.exe(args);
+// }
+// if (fieldName.equals("idregister")) {
+// return idregister.exe(args);
+// }
+// if (fieldName.equals("print")) {
+// return print.exe(args);
+// }
+// return super.call(fieldName, args);
+// }
+//
+// @Override
+// public __ptr__ getPtr(String fieldName) {
+// if (fieldName.equals("print")) {
+// return print;
+// }
+// return super.getPtr(fieldName);
+// }
+ }
+
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agiodisc_s",
+ // "{",
+ // "int (*afread) (void *chan, char *buf, int bufsize)",
+ // "int (*putstr) (void *chan, const char *str)",
+ // "int (*flush) (void *chan)",
+ // "}");
+}
+
+// struct Agiodisc_s {
+// int (*afread) (void *chan, char *buf, int bufsize);
+// int (*putstr) (void *chan, const char *str);
+// int (*flush) (void *chan); /* sync */
+// /* error messages? */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agmemdisc_s.java plantuml-1.2018.9/src/h/ST_Agmemdisc_s.java
--- plantuml-1.2017.15/src/h/ST_Agmemdisc_s.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agmemdisc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -60,19 +60,20 @@
@Override
public StarStruct amp() {
- return new UnsupportedStarStruct() {
+ return new Amp();
+ }
- @Override
- public Object call(String fieldName, Object... args) {
- if (fieldName.equals("open")) {
- return open.exe(args);
- }
- if (fieldName.equals("alloc")) {
- return alloc.exe(args);
- }
- return super.call(fieldName, args);
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("open")) {
+ return open.exe(args);
+ }
+ if (fieldName.equals("alloc")) {
+ return alloc.exe(args);
}
- };
+ return super.call(fieldName, args);
+ }
}
// public static List DEFINITION = Arrays.asList(
diff -Nru plantuml-1.2017.15/src/h/ST_Agnodeinfo_t.java plantuml-1.2018.9/src/h/ST_Agnodeinfo_t.java
--- plantuml-1.2017.15/src/h/ST_Agnodeinfo_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agnodeinfo_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,519 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_Agnodeinfo_t() {
+ this(null);
+ }
+
+ public ST_Agnodeinfo_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+
+ private ST_shape_desc shape;
+ private ST_polygon_t shape_info;
+ private final ST_pointf coord = new ST_pointf(this);
+ private double width, height;
+
+ // "boxf bb",
+ private double ht, lw, rw;
+ private ST_textlabel_t label;
+ private ST_textlabel_t xlabel;
+ // "void *alg",
+ private ST_Agedge_s alg = null;
+ // "char state",
+ // "unsigned char gui_state",
+ // "boolean clustnode",
+ // "unsigned char pinned",
+ private int id, heapindex, hops;
+ // "double *pos, dist",
+ private int showboxes;
+
+ private boolean has_port;
+ // "node_t* rep",
+ // "node_t *set",
+ private int node_type, mark, onstack;
+ private int ranktype, weight_class;
+ private ST_Agnode_s next;
+ private ST_Agnode_s prev;
+ // "elist in, out, flat_out, flat_in, other",
+ private final ST_elist in = new ST_elist(this);
+ private final ST_elist out = new ST_elist(this);
+ private final ST_elist flat_out = new ST_elist(this);
+ private final ST_elist flat_in = new ST_elist(this);
+ private final ST_elist other = new ST_elist(this);
+ private ST_Agraph_s.Amp clust;
+ private int UF_size;
+
+ private ST_Agnode_s UF_parent;
+
+ private ST_Agnode_s inleaf, outleaf;
+ private int rank, order;
+ private double mval;
+ private final ST_elist save_in = new ST_elist(this);
+ private final ST_elist save_out = new ST_elist(this);
+ private final ST_elist tree_in = new ST_elist(this);
+ private final ST_elist tree_out = new ST_elist(this);
+ private ST_Agedge_s par;
+ private int low, lim;
+ private int priority;
+
+ // "double pad[1]",
+ // "}",
+ // "Agnodeinfo_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agrec_s.class) {
+ return hdr;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("width")) {
+ this.width = data;
+ return;
+ }
+ if (fieldName.equals("height")) {
+ this.height = data;
+ return;
+ }
+ if (fieldName.equals("ht")) {
+ this.ht = data;
+ return;
+ }
+ if (fieldName.equals("lw")) {
+ this.lw = data;
+ return;
+ }
+ if (fieldName.equals("rw")) {
+ this.rw = data;
+ return;
+ }
+ if (fieldName.equals("mval")) {
+ this.mval = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("width")) {
+ return this.width;
+ }
+ if (fieldName.equals("height")) {
+ return this.height;
+ }
+ if (fieldName.equals("ht")) {
+ return this.ht;
+ }
+ if (fieldName.equals("lw")) {
+ return this.lw;
+ }
+ if (fieldName.equals("rw")) {
+ return this.rw;
+ }
+ if (fieldName.equals("mval")) {
+ return this.mval;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("mark")) {
+ this.mark = data ? 1 : 0;
+ return;
+ }
+ if (fieldName.equals("onstack")) {
+ this.onstack = data ? 1 : 0;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("showboxes")) {
+ this.showboxes = data;
+ return;
+ }
+ if (fieldName.equals("UF_size")) {
+ this.UF_size = data;
+ return;
+ }
+ if (fieldName.equals("mark")) {
+ this.mark = data;
+ return;
+ }
+ if (fieldName.equals("onstack")) {
+ this.onstack = data;
+ return;
+ }
+ if (fieldName.equals("priority")) {
+ this.priority = data;
+ return;
+ }
+ if (fieldName.equals("node_type")) {
+ this.node_type = data;
+ return;
+ }
+ if (fieldName.equals("rank")) {
+ this.rank = data;
+ return;
+ }
+ if (fieldName.equals("order")) {
+ this.order = data;
+ return;
+ }
+ if (fieldName.equals("ranktype")) {
+ this.ranktype = data;
+ return;
+ }
+ if (fieldName.equals("low")) {
+ this.low = data;
+ return;
+ }
+ if (fieldName.equals("lim")) {
+ this.lim = data;
+ return;
+ }
+ if (fieldName.equals("weight_class")) {
+ this.weight_class = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("UF_size")) {
+ return this.UF_size;
+ }
+ if (fieldName.equals("ranktype")) {
+ return this.ranktype;
+ }
+ if (fieldName.equals("mark")) {
+ return this.mark;
+ }
+ if (fieldName.equals("onstack")) {
+ return this.onstack;
+ }
+ if (fieldName.equals("priority")) {
+ return this.priority;
+ }
+ if (fieldName.equals("node_type")) {
+ return this.node_type;
+ }
+ if (fieldName.equals("rank")) {
+ return this.rank;
+ }
+ if (fieldName.equals("order")) {
+ return this.order;
+ }
+ if (fieldName.equals("ranktype")) {
+ return this.ranktype;
+ }
+ if (fieldName.equals("low")) {
+ return this.low;
+ }
+ if (fieldName.equals("lim")) {
+ return this.lim;
+ }
+ if (fieldName.equals("weight_class")) {
+ return this.weight_class;
+ }
+ if (fieldName.equals("id")) {
+ return this.id;
+ }
+ if (fieldName.equals("heapindex")) {
+ return this.heapindex;
+ }
+ if (fieldName.equals("hops")) {
+ return this.hops;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("onstack")) {
+ return this.onstack != 0;
+ }
+ if (fieldName.equals("has_port")) {
+ return this.has_port;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("shape")) {
+ this.shape = (ST_shape_desc) newData;
+ return shape;
+ }
+ if (fieldName.equals("shape_info")) {
+ this.shape_info = (ST_polygon_t) newData;
+ return shape_info;
+ }
+ if (fieldName.equals("label")) {
+ this.label = (ST_textlabel_t) newData;
+ return label;
+ }
+ if (fieldName.equals("clust")) {
+ if (newData instanceof ST_Agraph_s) {
+ this.clust = (h.ST_Agraph_s.Amp) ((ST_Agraph_s) newData).amp();
+ } else {
+ this.clust = (ST_Agraph_s.Amp) newData;
+ }
+ return clust;
+ }
+ if (fieldName.equals("next")) {
+ this.next = (ST_Agnode_s) newData;
+ return next;
+ }
+ if (fieldName.equals("prev")) {
+ if (newData instanceof ST_Agnode_s.Amp) {
+ this.prev = ((ST_Agnode_s.Amp) newData).getObject();
+ } else {
+ this.prev = (ST_Agnode_s) newData;
+ }
+ return prev;
+ }
+ if (fieldName.equals("UF_parent")) {
+ this.UF_parent = (ST_Agnode_s) newData;
+ return UF_parent;
+ }
+ if (fieldName.equals("par")) {
+ if (newData instanceof ST_Agedge_s.Amp) {
+ this.par = ((ST_Agedge_s.Amp) newData).getObject();
+ } else {
+ this.par = (ST_Agedge_s) newData;
+ }
+ return par;
+ }
+ if (fieldName.equals("alg")) {
+ this.alg = (ST_Agedge_s) alg;
+ return alg;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("shape")) {
+ return shape;
+ }
+ if (fieldName.equals("label")) {
+ return label;
+ }
+ if (fieldName.equals("UF_parent")) {
+ return UF_parent;
+ }
+ if (fieldName.equals("next")) {
+ return next;
+ }
+ if (fieldName.equals("prev")) {
+ return prev;
+ }
+ if (fieldName.equals("clust")) {
+ return clust;
+ }
+ if (fieldName.equals("inleaf")) {
+ return inleaf;
+ }
+ if (fieldName.equals("outleaf")) {
+ return outleaf;
+ }
+ if (fieldName.equals("alg")) {
+ return alg;
+ }
+ if (fieldName.equals("par")) {
+ return par;
+ }
+ if (fieldName.equals("xlabel")) {
+ return xlabel;
+ }
+ if (fieldName.equals("shape_info")) {
+ return shape_info;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("in")) {
+ return in;
+ }
+ if (fieldName.equals("out")) {
+ return out;
+ }
+ if (fieldName.equals("flat_out")) {
+ return flat_out;
+ }
+ if (fieldName.equals("flat_in")) {
+ return flat_in;
+ }
+ if (fieldName.equals("other")) {
+ return other;
+ }
+ if (fieldName.equals("save_in")) {
+ return save_in;
+ }
+ if (fieldName.equals("save_out")) {
+ return save_out;
+ }
+ if (fieldName.equals("tree_in")) {
+ return tree_in;
+ }
+ if (fieldName.equals("tree_out")) {
+ return tree_out;
+ }
+ if (fieldName.equals("coord")) {
+ return coord;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("save_in")) {
+ save_in.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("save_out")) {
+ save_out.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("out")) {
+ out.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("in")) {
+ in.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+}
+
+// typedef struct Agnodeinfo_t {
+// Agrec_t hdr;
+// shape_desc *shape;
+// void *shape_info;
+// pointf coord;
+// double width, height; /* inches */
+// boxf bb;
+// double ht, lw, rw;
+// textlabel_t *label;
+// textlabel_t *xlabel;
+// void *alg;
+// char state;
+// unsigned char gui_state; /* Node state for GUI ops */
+// boolean clustnode;
+//
+//
+// unsigned char pinned;
+// int id, heapindex, hops;
+// double *pos, dist;
+//
+//
+// unsigned char showboxes;
+// boolean has_port;
+// node_t* rep;
+// node_t *set;
+//
+// /* fast graph */
+// char node_type, mark, onstack;
+// char ranktype, weight_class;
+// node_t *next, *prev;
+// elist in, out, flat_out, flat_in, other;
+// graph_t *clust;
+//
+// /* for union-find and collapsing nodes */
+// int UF_size;
+// node_t *UF_parent;
+// node_t *inleaf, *outleaf;
+//
+// /* for placing nodes */
+// int rank, order; /* initially, order = 1 for ordered edges */
+// double mval;
+// elist save_in, save_out;
+//
+// /* for network-simplex */
+// elist tree_in, tree_out;
+// edge_t *par;
+// int low, lim;
+// int priority;
+//
+// double pad[1];
+//
+//
+// } Agnodeinfo_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agnode_s.java plantuml-1.2018.9/src/h/ST_Agnode_s.java
--- plantuml-1.2017.15/src/h/ST_Agnode_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agnode_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,231 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agnode_s extends UnsupportedStructAndPtr {
+
+ private final ST_Agobj_s base = new ST_Agobj_s(this);
+ private ST_Agraph_s root;
+ private ST_Agsubnode_s mainsub = new ST_Agsubnode_s(this);
+
+ private final StarStruct parent;
+
+ public ST_Agnode_s() {
+ this(null);
+ }
+
+ public ST_Agnode_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agnode_s me;
+
+ public Amp(ST_Agnode_s me) {
+ this.me = me;
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agobj_s.class) {
+ return base.amp();
+ }
+ if (dest == Agnode_s.class) {
+ return me;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return ST_Agnode_s.this.getStruct();
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agnode_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agnode_s.this.setPtr(fieldName, newData);
+ }
+
+ public ST_Agnode_s getObject() {
+ return me;
+ }
+
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agnode_s.class) {
+ return this;
+ }
+ if (dest == Agobj_s.class) {
+ return base;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ if (other instanceof Amp) {
+ Amp other2 = (Amp) other;
+ return this == other2.me;
+ }
+ ST_Agnode_s other2 = (ST_Agnode_s) other;
+ return this == other2;
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("base")) {
+ return base;
+ }
+ if (fieldName.equals("mainsub")) {
+ return mainsub;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("root")) {
+ this.root = (ST_Agraph_s) newData;
+ return root;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("root")) {
+ return root;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ public static size_t sizeof_starstar_empty(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return STStarArrayOfPointer.malloc(nb);
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+ };
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_Agnode_s.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ if (old instanceof STStarArrayOfPointer) {
+ STStarArrayOfPointer old2 = (STStarArrayOfPointer) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ if (old instanceof StarArrayOfPtr) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ return super.realloc(old);
+ }
+ };
+ }
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agnode_s",
+ // "{",
+ // "Agobj_t base",
+ // "Agraph_t *root",
+ // "Agsubnode_t mainsub",
+ // "}");
+}
+
+// struct Agnode_s {
+// Agobj_t base;
+// Agraph_t *root;
+// Agsubnode_t mainsub; /* embedded for main graph */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agobj_s.java plantuml-1.2018.9/src/h/ST_Agobj_s.java
--- plantuml-1.2017.15/src/h/ST_Agobj_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agobj_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,187 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agobj_s extends UnsupportedStructAndPtr implements WithParent, HardcodedStruct {
+
+ public final ST_Agtag_s tag = new ST_Agtag_s(this);
+ public ST_Agrec_s.Amp data;
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ ST_Agobj_s this2 = (ST_Agobj_s) other;
+ this.tag.copyDataFrom((__struct__) this2.tag);
+ this.data = this2.data;
+
+ }
+
+ private final StarStruct parent;
+
+ public ST_Agobj_s() {
+ this(null);
+ }
+
+ public ST_Agobj_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return ST_Agobj_s.this.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agobj_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agobj_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ return ST_Agobj_s.this.castTo(dest);
+ }
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agobj_s.class) {
+ return this;
+ }
+ if (dest == Agraph_s.class && parent instanceof ST_Agraph_s) {
+ return (ST_Agraph_s) parent;
+ }
+ if (dest == Agnode_s.class && parent instanceof ST_Agnode_s) {
+ return (ST_Agnode_s) parent;
+ }
+ if (dest == Agedge_s.class && parent instanceof ST_Agedge_s) {
+ return (ST_Agedge_s) parent;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("data")) {
+ if (newData instanceof ST_Agnodeinfo_t) {
+ ST_Agnodeinfo_t info = (ST_Agnodeinfo_t) newData;
+ newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
+ } else if (newData instanceof ST_Agedgeinfo_t) {
+ ST_Agedgeinfo_t info = (ST_Agedgeinfo_t) newData;
+ newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
+ } else if (newData instanceof ST_Agedgeinfo_t.Amp) {
+ ST_Agedgeinfo_t.Amp info = (ST_Agedgeinfo_t.Amp) newData;
+ newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
+ }
+ if (newData instanceof ST_Agrec_s) {
+ this.data = (ST_Agrec_s.Amp) ((ST_Agrec_s) newData).amp();
+ } else {
+ this.data = (ST_Agrec_s.Amp) newData;
+ }
+ return data;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("data")) {
+ return data;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("tag")) {
+ return tag;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("tag")) {
+ this.tag.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ // public interface ST_Agobj_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agobj_s",
+ // "{",
+ // "Agtag_t tag",
+ // "Agrec_t *data",
+ // "}");
+}
+
+// struct Agobj_s {
+// Agtag_t tag;
+// Agrec_t *data;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agraphinfo_t.java plantuml-1.2018.9/src/h/ST_Agraphinfo_t.java
--- plantuml-1.2017.15/src/h/ST_Agraphinfo_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agraphinfo_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,592 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_struct__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+ // /* to generate code */
+ private ST_layout_t drawing;
+ private ST_textlabel_t label; /* if the cluster has a title */
+ private final ST_boxf bb = new ST_boxf(this); /* bounding box */
+ // pointf border[4]; /* sizes of margins for graph labels */
+ private final ST_pointf border[] = new ST_pointf[] { new ST_pointf(), new ST_pointf(), new ST_pointf(),
+ new ST_pointf() };
+ // unsigned char gui_state; /* Graph state for GUI ops */
+ private int has_labels;
+ // boolean has_images;
+ private int charset; /* input character set */
+ private int rankdir;
+ private double ht1, ht2; /* below and above extremal ranks */
+ private int flags;
+ // void *alg;
+ private ST_GVC_s gvc; /* context for "globals" over multiple graphs */
+ private CFunction cleanup;
+ // void (*cleanup) (graph_t * g); /* function to deallocate layout-specific data */
+ //
+ //
+ // /* to place nodes */
+ // node_t **neato_nlist;
+ // int move;
+ // double **dist, **spring, **sum_t, ***t;
+ // unsigned short ndim;
+ // unsigned short odim;
+ //
+ //
+ // /* to have subgraphs */
+ private int n_cluster;
+ // graph_t **clust; /* clusters are in clust[1..n_cluster] !!! */
+ private StarArrayOfPtr clust;
+ private ST_Agraph_s dotroot;
+ private ST_Agnode_s nlist;
+ private StarArrayOfPtr rank;
+ private ST_Agraph_s parent; /* containing cluster (not parent subgraph) */
+ // int level; /* cluster nesting level (not node level!) */
+ // node_t *minrep, *maxrep; /* set leaders for min and max rank */
+ //
+ // /* fast graph node list */
+ private final ST_nlist_t comp = new ST_nlist_t(this);
+ // /* connected components */
+ private ST_Agnode_s minset, maxset; /* set leaders */
+ private int n_nodes;
+ // /* includes virtual */
+ private int minrank, maxrank;
+ //
+ // /* various flags */
+ private int has_flat_edges;
+ // boolean has_sourcerank;
+ // boolean has_sinkrank;
+ private int showboxes;
+ private int fontnames; /* to override mangling in SVG */
+ //
+ private int nodesep, ranksep;
+ private ST_Agnode_s ln, rn; /* left, right nodes of bounding box */
+ //
+ // /* for clusters */
+ // node_t *leader, **rankleader;
+ private ST_Agnode_s leader;
+ private STStarArrayOfPointer rankleader;
+ private boolean expanded;
+ private int installed;
+ // char set_type;
+ private int label_pos;
+ private int exact_ranksep;
+
+ private final StarStruct parent_;
+
+ public ST_Agraphinfo_t() {
+ this(null);
+ }
+
+ public ST_Agraphinfo_t(StarStruct parent) {
+ this.parent_ = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ class ArrayOfFour extends UnsupportedArrayOfStruct {
+
+ final private int pos;
+
+ public ArrayOfFour(int pos) {
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_struct__ plus(int delta) {
+ return new ArrayOfFour(pos + delta);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return border[pos];
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ border[pos].copyDataFrom(value);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return getStruct().getDouble(fieldName);
+ }
+
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ if (fieldName.equals("border")) {
+ return new ArrayOfFour(0);
+ }
+ return super.getArrayOfStruct(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("comp")) {
+ return this.comp;
+ }
+ if (fieldName.equals("bb")) {
+ return this.bb;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agrec_s.class) {
+ return hdr.amp();
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("gvc")) {
+ this.gvc = (ST_GVC_s) newData;
+ return gvc;
+ }
+ if (fieldName.equals("drawing")) {
+ this.drawing = (ST_layout_t) newData;
+ return drawing;
+ }
+ if (fieldName.equals("dotroot")) {
+ this.dotroot = (ST_Agraph_s) newData;
+ return dotroot;
+ }
+ if (fieldName.equals("parent")) {
+ if (newData instanceof ST_Agraph_s.Amp) {
+ this.parent = ((ST_Agraph_s.Amp) newData).getObject();
+ } else {
+ this.parent = (ST_Agraph_s) newData;
+ }
+ return parent;
+ }
+ if (fieldName.equals("clust")) {
+ this.clust = (StarArrayOfPtr) newData;
+ return clust;
+ }
+ if (fieldName.equals("label")) {
+ this.label = (ST_textlabel_t) newData;
+ return label;
+ }
+ if (fieldName.equals("maxset")) {
+ this.maxset = (ST_Agnode_s) newData;
+ return maxset;
+ }
+ if (fieldName.equals("minset")) {
+ this.minset = (ST_Agnode_s) newData;
+ return minset;
+ }
+ if (fieldName.equals("nlist")) {
+ if (newData instanceof ST_Agnode_s.Amp) {
+ this.nlist = ((ST_Agnode_s.Amp) newData).getObject();
+ } else {
+ this.nlist = (ST_Agnode_s) newData;
+ }
+ return nlist;
+ }
+ if (fieldName.equals("leader")) {
+ this.leader = (ST_Agnode_s) newData;
+ return leader;
+ }
+ if (fieldName.equals("rankleader")) {
+ this.rankleader = (STStarArrayOfPointer) newData;
+ return rankleader;
+ }
+ if (fieldName.equals("rank")) {
+ this.rank = (StarArrayOfPtr) newData;
+ return rank;
+ }
+ if (fieldName.equals("ln")) {
+ this.ln = (ST_Agnode_s) newData;
+ return ln;
+ }
+ if (fieldName.equals("rn")) {
+ this.rn = (ST_Agnode_s) newData;
+ return rn;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("drawing")) {
+ return drawing;
+ }
+ if (fieldName.equals("gvc")) {
+ return gvc;
+ }
+ if (fieldName.equals("parent")) {
+ return parent;
+ }
+ if (fieldName.equals("dotroot")) {
+ return dotroot;
+ }
+ if (fieldName.equals("clust")) {
+ return clust;
+ }
+ if (fieldName.equals("label")) {
+ return label;
+ }
+ if (fieldName.equals("maxset")) {
+ return maxset;
+ }
+ if (fieldName.equals("minset")) {
+ return minset;
+ }
+ if (fieldName.equals("nlist")) {
+ return nlist;
+ }
+ if (fieldName.equals("leader")) {
+ return leader;
+ }
+ if (fieldName.equals("rankleader")) {
+ return rankleader;
+ }
+ if (fieldName.equals("rank")) {
+ return rank;
+ }
+ if (fieldName.equals("ln")) {
+ return ln;
+ }
+ if (fieldName.equals("rn")) {
+ return rn;
+ }
+ if (fieldName.equals("cleanup")) {
+ return cleanup;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("expanded")) {
+ this.expanded = data;
+ return;
+ }
+ if (fieldName.equals("has_flat_edges")) {
+ this.has_flat_edges = data ? 1 : 0;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("charset")) {
+ this.charset = data;
+ return;
+ }
+ if (fieldName.equals("rankdir")) {
+ this.rankdir = data;
+ return;
+ }
+ if (fieldName.equals("nodesep")) {
+ this.nodesep = data;
+ return;
+ }
+ if (fieldName.equals("ranksep")) {
+ this.ranksep = data;
+ return;
+ }
+ if (fieldName.equals("showboxes")) {
+ this.showboxes = data;
+ return;
+ }
+ if (fieldName.equals("fontnames")) {
+ this.fontnames = data;
+ return;
+ }
+ if (fieldName.equals("flags")) {
+ this.flags = data;
+ return;
+ }
+ if (fieldName.equals("has_labels")) {
+ this.has_labels = data;
+ return;
+ }
+ if (fieldName.equals("n_cluster")) {
+ this.n_cluster = data;
+ return;
+ }
+ if (fieldName.equals("label_pos")) {
+ this.label_pos = data;
+ return;
+ }
+ if (fieldName.equals("n_nodes")) {
+ this.n_nodes = data;
+ return;
+ }
+ if (fieldName.equals("maxrank")) {
+ this.maxrank = data;
+ return;
+ }
+ if (fieldName.equals("minrank")) {
+ this.minrank = data;
+ return;
+ }
+ if (fieldName.equals("installed")) {
+ this.installed = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("expanded")) {
+ return expanded;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("flags")) {
+ return flags;
+ }
+ if (fieldName.equals("charset")) {
+ return charset;
+ }
+ if (fieldName.equals("rankdir")) {
+ return rankdir;
+ }
+ if (fieldName.equals("has_labels")) {
+ return has_labels;
+ }
+ if (fieldName.equals("n_cluster")) {
+ return n_cluster;
+ }
+ if (fieldName.equals("label_pos")) {
+ return label_pos;
+ }
+ if (fieldName.equals("n_nodes")) {
+ return n_nodes;
+ }
+ if (fieldName.equals("maxrank")) {
+ return maxrank;
+ }
+ if (fieldName.equals("minrank")) {
+ return minrank;
+ }
+ if (fieldName.equals("has_flat_edges")) {
+ return has_flat_edges;
+ }
+ if (fieldName.equals("installed")) {
+ return installed;
+ }
+ if (fieldName.equals("exact_ranksep")) {
+ return exact_ranksep;
+ }
+ if (fieldName.equals("nodesep")) {
+ return nodesep;
+ }
+ if (fieldName.equals("ranksep")) {
+ return ranksep;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("ht1")) {
+ return ht1;
+ }
+ if (fieldName.equals("ht2")) {
+ return ht2;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("ht1")) {
+ this.ht1 = data;
+ return;
+ }
+ if (fieldName.equals("ht2")) {
+ this.ht2 = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct Agraphinfo_t",
+ // "{",
+ // "Agrec_t hdr",
+ // "layout_t *drawing",
+ // "textlabel_t *label",
+ // "boxf bb",
+ // "pointf border[4]",
+ // "unsigned char gui_state",
+ // "unsigned char has_labels",
+ // "boolean has_images",
+ // "unsigned char charset",
+ // "int rankdir",
+ // "double ht1, ht2",
+ // "unsigned short flags",
+ // "void *alg",
+ // "GVC_t *gvc",
+ // "void (*cleanup) (graph_t * g)",
+ // "node_t **neato_nlist",
+ // "int move",
+ // "double **dist, **spring, **sum_t, ***t",
+ // "unsigned short ndim",
+ // "unsigned short odim",
+ // "int n_cluster",
+ // "graph_t **clust",
+ // "graph_t *dotroot",
+ // "node_t *nlist",
+ // "rank_t *rank",
+ // "graph_t *parent",
+ // "int level",
+ // "node_t *minrep, *maxrep",
+ // "nlist_t comp",
+ // "node_t *minset, *maxset",
+ // "long n_nodes",
+ // "short minrank, maxrank",
+ // "boolean has_flat_edges",
+ // "boolean has_sourcerank",
+ // "boolean has_sinkrank",
+ // "unsigned char showboxes",
+ // "fontname_kind fontnames",
+ // "int nodesep, ranksep",
+ // "node_t *ln, *rn",
+ // "node_t *leader, **rankleader",
+ // "boolean expanded",
+ // "char installed",
+ // "char set_type",
+ // "char label_pos",
+ // "boolean exact_ranksep",
+ // "}",
+ // "Agraphinfo_t");
+}
+
+// typedef struct Agraphinfo_t {
+// Agrec_t hdr;
+// /* to generate code */
+// layout_t *drawing;
+// textlabel_t *label; /* if the cluster has a title */
+// boxf bb; /* bounding box */
+// pointf border[4]; /* sizes of margins for graph labels */
+// unsigned char gui_state; /* Graph state for GUI ops */
+// unsigned char has_labels;
+// boolean has_images;
+// unsigned char charset; /* input character set */
+// int rankdir;
+// double ht1, ht2; /* below and above extremal ranks */
+// unsigned short flags;
+// void *alg;
+// GVC_t *gvc; /* context for "globals" over multiple graphs */
+// void (*cleanup) (graph_t * g); /* function to deallocate layout-specific data */
+//
+//
+// /* to place nodes */
+// node_t **neato_nlist;
+// int move;
+// double **dist, **spring, **sum_t, ***t;
+// unsigned short ndim;
+// unsigned short odim;
+//
+//
+// /* to have subgraphs */
+// int n_cluster;
+// graph_t **clust; /* clusters are in clust[1..n_cluster] !!! */
+// graph_t *dotroot;
+// node_t *nlist;
+// rank_t *rank;
+// graph_t *parent; /* containing cluster (not parent subgraph) */
+// int level; /* cluster nesting level (not node level!) */
+// node_t *minrep, *maxrep; /* set leaders for min and max rank */
+//
+// /* fast graph node list */
+// nlist_t comp;
+// /* connected components */
+// node_t *minset, *maxset; /* set leaders */
+// long n_nodes;
+// /* includes virtual */
+// short minrank, maxrank;
+//
+// /* various flags */
+// boolean has_flat_edges;
+// boolean has_sourcerank;
+// boolean has_sinkrank;
+// unsigned char showboxes;
+// fontname_kind fontnames; /* to override mangling in SVG */
+//
+// int nodesep, ranksep;
+// node_t *ln, *rn; /* left, right nodes of bounding box */
+//
+// /* for clusters */
+// node_t *leader, **rankleader;
+// boolean expanded;
+// char installed;
+// char set_type;
+// char label_pos;
+// boolean exact_ranksep;
+//
+//
+// } Agraphinfo_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agraph_s.java plantuml-1.2018.9/src/h/ST_Agraph_s.java
--- plantuml-1.2017.15/src/h/ST_Agraph_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agraph_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,341 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agraph_s extends UnsupportedStructAndPtr {
+
+ public final ST_Agobj_s base = new ST_Agobj_s(this);
+ public final ST_Agdesc_s desc = new ST_Agdesc_s(this);
+ public final ST_dtlink_s link = new ST_dtlink_s(this);
+
+ public ST_dt_s n_seq; /* the node set in sequence */
+ public ST_dt_s n_id; /* the node set indexed by ID */
+ public ST_dt_s e_seq; /* holders for edge sets */
+ public ST_dt_s e_id; /* holders for edge sets */
+ public ST_dt_s g_dict; /* subgraphs - descendants */
+ public ST_Agraph_s parent; /* subgraphs - ancestors */
+ // Agraph_t *parent, *root; /* subgraphs - ancestors */
+ public ST_Agraph_s root; /* subgraphs - ancestors */
+ public ST_Agclos_s clos; /* shared resources */
+
+ private final StarStruct _parent;
+
+ public ST_Agraph_s() {
+ this(null);
+ }
+
+ public ST_Agraph_s(StarStruct parent) {
+ this._parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return _parent;
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("desc")) {
+ desc.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agraph_s me;
+
+ public Amp(ST_Agraph_s me) {
+ this.me = me;
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agraph_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return ST_Agraph_s.this.getStruct();
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return ST_Agraph_s.this.getStruct(fieldName);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ if (other instanceof Amp) {
+ Amp other2 = (Amp) other;
+ return this.me == other2.me;
+ }
+ if (other instanceof ST_Agraph_s) {
+ ST_Agraph_s other2 = (ST_Agraph_s) other;
+ return this.me == other2;
+ }
+ return super.isSameThan(other);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agobj_s.class) {
+ return base.amp();
+ }
+ if (dest == Agraph_s.class) {
+ return ST_Agraph_s.this;
+ }
+
+ return super.castTo(dest);
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ OFFSET offset = OFFSET.fromInt(virtualBytes);
+ // if (offset.toString().equals("h.Agedge_s::seq_link")) {
+ // return seq_link;
+ // }
+ if (offset.toString().equals("h.Agraph_s::link")) {
+ return link;
+ }
+ System.err.println("offset176=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ public ST_Agraph_s getObject() {
+ return me;
+ }
+
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ OFFSET offset = OFFSET.fromInt(virtualBytes);
+ // if (offset.toString().equals("h.Agedge_s::seq_link")) {
+ // return seq_link;
+ // }
+ if (offset.toString().equals("h.Agraph_s::link")) {
+ return link;
+ }
+ System.err.println("offset156=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("desc")) {
+ return desc;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("clos")) {
+ this.clos = (ST_Agclos_s) newData;
+ return clos;
+ }
+ if (fieldName.equals("root")) {
+ this.root = (ST_Agraph_s) newData;
+ return root;
+ }
+ if (fieldName.equals("n_seq")) {
+ this.n_seq = (ST_dt_s) newData;
+ return n_seq;
+ }
+ if (fieldName.equals("n_id")) {
+ this.n_id = (ST_dt_s) newData;
+ return n_id;
+ }
+ if (fieldName.equals("e_seq")) {
+ this.e_seq = (ST_dt_s) newData;
+ return e_seq;
+ }
+ if (fieldName.equals("e_id")) {
+ this.e_id = (ST_dt_s) newData;
+ return e_id;
+ }
+ if (fieldName.equals("g_dict")) {
+ this.g_dict = (ST_dt_s) newData;
+ return g_dict;
+ }
+ if (fieldName.equals("parent")) {
+ this.parent = (ST_Agraph_s) newData;
+ return parent;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("clos")) {
+ return clos;
+ }
+ if (fieldName.equals("root")) {
+ return root;
+ }
+ if (fieldName.equals("parent")) {
+ return parent;
+ }
+ if (fieldName.equals("n_id")) {
+ return n_id;
+ }
+ if (fieldName.equals("n_seq")) {
+ return n_seq;
+ }
+ if (fieldName.equals("e_id")) {
+ return e_id;
+ }
+ if (fieldName.equals("e_seq")) {
+ return e_seq;
+ }
+ if (fieldName.equals("g_dict")) {
+ return g_dict;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agobj_s.class) {
+ return base;
+ }
+ if (dest == Agraph_s.class) {
+ return this;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ ST_Agraph_s other2 = (ST_Agraph_s) other;
+ return this == other2;
+ }
+
+ public StarStruct from_link(ST_dtlink_s from) {
+ if (from == link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_Agraph_s.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+
+ //
+ // public interface ST_Agraph_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agraph_s",
+ // "{",
+ // "Agobj_t base",
+ // "Agdesc_t desc",
+ // "Dtlink_t link",
+ // "Dict_t *n_seq",
+ // "Dict_t *n_id",
+ // "Dict_t *e_seq, *e_id",
+ // "Dict_t *g_dict",
+ // "Agraph_t *parent, *root",
+ // "Agclos_t *clos",
+ // "}");
+}
+
+// struct Agraph_s {
+// Agobj_t base;
+// Agdesc_t desc;
+// Dtlink_t link;
+// Dict_t *n_seq; /* the node set in sequence */
+// Dict_t *n_id; /* the node set indexed by ID */
+// Dict_t *e_seq, *e_id; /* holders for edge sets */
+// Dict_t *g_dict; /* subgraphs - descendants */
+// Agraph_t *parent, *root; /* subgraphs - ancestors */
+// Agclos_t *clos; /* shared resources */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agrec_s.java plantuml-1.2018.9/src/h/ST_Agrec_s.java
--- plantuml-1.2017.15/src/h/ST_Agrec_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agrec_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,197 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agrec_s extends UnsupportedStructAndPtr implements WithParent {
+
+ public CString name;
+ public ST_Agrec_s.Amp next;
+
+ private final StarStruct parent;
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ if (other instanceof ST_Agedgeinfo_t && parent instanceof ST_Agedgeinfo_t) {
+ parent.copyDataFrom(other);
+ return;
+ }
+ ST_Agrec_s this2 = (ST_Agrec_s) other;
+ this.name = this2.name;
+ this.next = this2.next;
+ }
+
+ public ST_Agrec_s() {
+ this(null);
+ }
+
+ public ST_Agrec_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agrec_s me;
+
+ public Amp(ST_Agrec_s me) {
+ this.me = me;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ Amp other2 = (Amp) other;
+ return this.me == other2.me;
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agrec_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agrec_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ return ST_Agrec_s.this.castTo(dest);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ return ST_Agrec_s.this.getCString(fieldName);
+ }
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ ST_Agrec_s.this.copyDataFrom(other);
+ }
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("name")) {
+ return name;
+ }
+ return super.getCString(fieldName);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agdatadict_s.class && getParent() instanceof ST_Agdatadict_s) {
+ return (ST_Agdatadict_s) getParent();
+ }
+ if (dest == Agattr_s.class && getParent() instanceof ST_Agattr_s) {
+ return (ST_Agattr_s) getParent();
+ }
+ if (dest == Agraphinfo_t.class && getParent() instanceof ST_Agraphinfo_t) {
+ return (ST_Agraphinfo_t) getParent();
+ }
+ if (dest == Agnodeinfo_t.class && getParent() instanceof ST_Agnodeinfo_t) {
+ return (ST_Agnodeinfo_t) getParent();
+ }
+ if (dest == Agedgeinfo_t.class && getParent() instanceof ST_Agedgeinfo_t) {
+ return (ST_Agedgeinfo_t) getParent();
+ }
+ System.err.println("dest=" + dest);
+ System.err.println("getParent=" + getParent().getClass());
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("name")) {
+ this.name = (CString) newData;
+ return name;
+ }
+ if (fieldName.equals("next")) {
+ if (newData instanceof ST_Agrec_s) {
+ this.next = (ST_Agrec_s.Amp) ((ST_Agrec_s) newData).amp();
+ } else {
+ this.next = (ST_Agrec_s.Amp) newData;
+ }
+ return next;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("next")) {
+ return next;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agrec_s",
+ // "{",
+ // "char *name",
+ // "Agrec_t *next",
+ // "}");
+}
+
+// struct Agrec_s {
+// char *name;
+// Agrec_t *next;
+// /* following this would be any programmer-defined data */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agsubnode_s.java plantuml-1.2018.9/src/h/ST_Agsubnode_s.java
--- plantuml-1.2017.15/src/h/ST_Agsubnode_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agsubnode_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,238 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_splineInfo.Amp;
+import smetana.core.HardcodedStruct;
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Agsubnode_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public final ST_dtlink_s seq_link = new ST_dtlink_s(this);
+ public final ST_dtlink_s id_link = new ST_dtlink_s(this);
+ public Agnode_s node;
+ public ST_dtlink_s.Amp in_id;
+ public ST_dtlink_s.Amp out_id;
+ public ST_dtlink_s.Amp in_seq;
+ public ST_dtlink_s.Amp out_seq;
+
+ public ST_Agsubnode_s() {
+ this(null);
+ }
+
+ public ST_Agsubnode_s(StarStruct parent) {
+ }
+
+ public StarStruct from_id_link(ST_dtlink_s from) {
+ if (from == id_link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+ public StarStruct from_seq_link(ST_dtlink_s from) {
+ if (from == seq_link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agsubnode_s me;
+
+ public Amp(ST_Agsubnode_s me) {
+ this.me = me;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ Amp other2 = (Amp) other;
+ return this.me == other2.me;
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agsubnode_s::id_link")) {
+ return id_link.amp();
+ }
+ if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
+ return seq_link.amp();
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agsubnode_s.class) {
+ return this;
+ }
+ System.err.println("dest=" + dest);
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agsubnode_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_Agsubnode_s.this.getPtr(fieldName);
+ }
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agsubnode_s::id_link")) {
+ return id_link.amp();
+ }
+ if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
+ return seq_link.amp();
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == Agsubnode_s.class) {
+ return this;
+ }
+ System.err.println("dest=" + dest);
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("node")) {
+ this.node = (Agnode_s) newData;
+ return node;
+ }
+ if (fieldName.equals("in_id")) {
+ this.in_id = (h.ST_dtlink_s.Amp) newData;
+ return in_id;
+ }
+ if (fieldName.equals("out_seq")) {
+ this.out_seq = (h.ST_dtlink_s.Amp) newData;
+ return out_seq;
+ }
+ if (fieldName.equals("out_id")) {
+ this.out_id = (h.ST_dtlink_s.Amp) newData;
+ return out_id;
+ }
+ if (fieldName.equals("seq_link")) {
+ this.seq_link.copyDataFrom(newData);
+ return seq_link;
+ }
+ if (fieldName.equals("in_seq")) {
+ this.in_seq = (h.ST_dtlink_s.Amp) newData;
+ return in_seq;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("node")) {
+ return node;
+ }
+ if (fieldName.equals("in_id")) {
+ return in_id;
+ }
+ if (fieldName.equals("out_seq")) {
+ return out_seq;
+ }
+ if (fieldName.equals("out_id")) {
+ return out_id;
+ }
+ if (fieldName.equals("in_seq")) {
+ return in_seq;
+ }
+ return super.getPtr(fieldName);
+ }
+
+
+ // public interface ST_Agsubnode_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agsubnode_s",
+ // "{",
+ // "Dtlink_t seq_link",
+ // "Dtlink_t id_link",
+ // "Agnode_t *node",
+ // "Dtlink_t *in_id, *out_id",
+ // "Dtlink_t *in_seq, *out_seq",
+ // "}");
+}
+
+// struct Agsubnode_s { /* the node-per-graph-or-subgraph record */
+// Dtlink_t seq_link; /* must be first */
+// Dtlink_t id_link;
+// Agnode_t *node; /* the object */
+// Dtlink_t *in_id, *out_id; /* by node/ID for random access */
+// Dtlink_t *in_seq, *out_seq; /* by node/sequence for serial access */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Agsym_s.java plantuml-1.2018.9/src/h/ST_Agsym_s.java
--- plantuml-1.2017.15/src/h/ST_Agsym_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Agsym_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,218 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.HardcodedStruct;
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+//2 38c2s12koxcpi2c7vwl72qrsp
+
+public class ST_Agsym_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+ public final ST_dtlink_s link = new ST_dtlink_s(this);
+
+ public CString name; /* attribute's name */
+ public CString defval; /* its default value for initialization */
+
+ public int id; /* its index in attr[] */
+ public int kind; /* referent object type */
+ public int fixed; /* immutable value */
+ public int print; /* always print */
+
+ public ST_Agsym_s(StarStruct parent) {
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agsym_s::name")) {
+ return name;
+ }
+ if (offset.toString().equals("h.Agsym_s::link")) {
+ return link;
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ public ST_Agsym_s() {
+ this(null);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ private final ST_Agsym_s me;
+
+ public Amp(ST_Agsym_s me) {
+ this.me = me;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ Amp other2 = (Amp) other;
+ return this.me == other2.me;
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.Agsym_s::name")) {
+ return name;
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ return ST_Agsym_s.this.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_Agsym_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ return ST_Agsym_s.this.getCString(fieldName);
+ }
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("name")) {
+ this.name = (CString) newData;
+ return name;
+ }
+ if (fieldName.equals("defval")) {
+ this.defval = (CString) newData;
+ return defval;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("kind")) {
+ this.kind = data;
+ return;
+ }
+ if (fieldName.equals("id")) {
+ this.id = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("kind")) {
+ return kind;
+ }
+ if (fieldName.equals("id")) {
+ return id;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("defval")) {
+ return defval;
+ }
+ if (fieldName.equals("name")) {
+ return name;
+ }
+ return super.getCString(fieldName);
+ }
+
+ public StarStruct from_link(ST_dtlink_s from) {
+ if (from == link) {
+ return amp();
+ }
+ throw new IllegalArgumentException();
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct Agsym_s",
+ // "{",
+ // "Dtlink_t link",
+ // "char *name",
+ // "char *defval",
+ // "int id",
+ // "unsigned char kind",
+ // "unsigned char fixed",
+ // "unsigned char print",
+ // "}");
+}
+
+// struct Agsym_s { /* symbol in one of the above dictionaries */
+// Dtlink_t link;
+// char *name; /* attribute's name */
+// char *defval; /* its default value for initialization */
+// int id; /* its index in attr[] */
+// unsigned char kind; /* referent object type */
+// unsigned char fixed; /* immutable value */
+// unsigned char print; /* always print */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/STArray.java plantuml-1.2018.9/src/h/STArray.java
--- plantuml-1.2017.15/src/h/STArray.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/STArray.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,156 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.Area;
+import smetana.core.amiga.StarArrayOfPtr;
+
+public class STArray extends UnsupportedArrayOfPtr {
+
+ private final int pos;
+ private final List list;
+ private final Class clazz;
+
+ public STArray(int pos, List list, Class clazz) {
+ this.pos = pos;
+ this.list = list;
+ this.clazz = clazz;
+ }
+
+ @Override
+ public int comparePointerInternal(__array_of_ptr__ other) {
+ STArray other2 = (STArray) other;
+ if (this.list != other2.list) {
+ throw new IllegalArgumentException();
+ }
+ return this.pos - other2.pos;
+ }
+
+ public STArray(int size, int pos, Class clazz) {
+ this.pos = pos;
+ this.list = new ArrayList();
+ this.clazz = clazz;
+ for (int i = 0; i < size; i++) {
+ try {
+ this.list.add((O) clazz.newInstance());
+ } catch (Exception e) {
+ throw new IllegalStateException(e.toString());
+ }
+ }
+ }
+
+ @Override
+ public void realloc(size_t nb) {
+ realloc(nb.getInternalNb());
+ }
+
+ @Override
+ public void realloc(int nb) {
+ while (list.size() < nb) {
+ try {
+ this.list.add((O) clazz.newInstance());
+ } catch (Exception e) {
+ throw new IllegalStateException(e.toString());
+ }
+ }
+ }
+
+ @Override
+ public __array_of_ptr__ plus(int delta) {
+ return new STArray(pos + delta, this.list, clazz);
+ }
+
+ @Override
+ public __array_of_ptr__ move(int delta) {
+ return new STArray(pos + delta, this.list, clazz);
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ list.get(pos).setStruct(value);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return list.get(pos).getStruct();
+ // return list.get(pos);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return list.get(pos).getStruct(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr() {
+ return list.get(pos).amp();
+ }
+
+ @Override
+ public __ptr__ asPtr() {
+ return new StarArrayOfPtr(this);
+ }
+
+ @Override
+ public void setPtr(__ptr__ value) {
+ list.set(pos, (O) value.getStruct());
+ }
+
+ @Override
+ public Area getInternal(final int idx) {
+ return list.get(pos + idx);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/h/ST_aspect_t.java plantuml-1.2018.9/src/h/ST_aspect_t.java
--- plantuml-1.2017.15/src/h/ST_aspect_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_aspect_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,133 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_aspect_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_aspect_t() {
+ this(null);
+ }
+
+ public ST_aspect_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct aspect_t",
+ // "{",
+ // "double targetAR",
+ // "double combiAR",
+ private int prevIterations;
+ private int curIterations;
+ private int nextIter;
+ private int nPasses;
+ private int badGraph;
+
+ // "}",
+ // "aspect_t");
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("nextIter")) {
+ return this.nextIter;
+ }
+ if (fieldName.equals("nPasses")) {
+ return this.nPasses;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("nextIter")) {
+ this.nextIter = data;
+ return;
+ }
+ if (fieldName.equals("badGraph")) {
+ this.badGraph = data;
+ return;
+ }
+ if (fieldName.equals("nPasses")) {
+ this.nPasses = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("badGraph")) {
+ return this.badGraph != 0;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+}
+
+// typedef struct aspect_t {
+// double targetAR; /* target aspect ratio */
+// double combiAR;
+// int prevIterations; /* no. of iterations in previous pass */
+// int curIterations; /* no. of iterations in current pass */
+// int nextIter; /* dynamically adjusted no. of iterations */
+// int nPasses; /* bound on no. of top-level passes */
+// int badGraph; /* hack: set if graph is disconnected or has
+// * clusters. If so, turn off aspect */
+// } aspect_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_bezier.java plantuml-1.2018.9/src/h/ST_bezier.java
--- plantuml-1.2017.15/src/h/ST_bezier.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_bezier.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,251 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_bezier extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_bezier() {
+ this(null);
+ }
+
+ public ST_bezier(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "{",
+ // "pointf *list",
+ private StarArrayOfPtr list;
+
+ private int size;
+ private int sflag, eflag;
+
+ private final ST_pointf sp = new ST_pointf(this), ep = new ST_pointf(this);
+
+ // "}",
+ // "bezier");
+
+ @Override
+ public void ___(__struct__ other) {
+ ST_bezier this2 = (ST_bezier) other;
+ this.list = this2.list;
+ this.size = this2.size;
+ this.sflag = this2.sflag;
+ this.eflag = this2.eflag;
+ this.sp.copyDataFrom((__struct__) this2.sp);
+ this.ep.copyDataFrom((__struct__) this2.ep);
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_bezier.this.getPtr(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ return ST_bezier.this.getInt(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ return ST_bezier.this.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ return ST_bezier.this.getBoolean(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return ST_bezier.this.getStruct(fieldName);
+ }
+
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("sflag")) {
+ return this.sflag != 0;
+ }
+ if (fieldName.equals("eflag")) {
+ return this.eflag != 0;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("list")) {
+ return list;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("list")) {
+ this.list = (StarArrayOfPtr) newData;
+ return list;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("sp")) {
+ this.sp.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("ep")) {
+ this.ep.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("size")) {
+ this.size = data;
+ return;
+ }
+ if (fieldName.equals("sflag")) {
+ this.sflag = data;
+ return;
+ }
+ if (fieldName.equals("eflag")) {
+ this.eflag = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("size")) {
+ return this.size;
+ }
+ if (fieldName.equals("sflag")) {
+ return this.sflag;
+ }
+ if (fieldName.equals("eflag")) {
+ return this.eflag;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("sp")) {
+ return this.sp;
+ }
+ if (fieldName.equals("ep")) {
+ return this.ep;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("list")) {
+ return this.list.getInternalArray();
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_bezier.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct bezier {
+// pointf *list;
+// int size;
+// int sflag, eflag;
+// pointf sp, ep;
+// } bezier;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_boxf.java plantuml-1.2018.9/src/h/ST_boxf.java
--- plantuml-1.2017.15/src/h/ST_boxf.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_boxf.java 2018-07-27 21:59:19.000000000 +0000
@@ -46,10 +46,12 @@
package h;
import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedSize_t;
import smetana.core.UnsupportedStarStruct;
import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
import smetana.core.amiga.StarStruct;
public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct {
@@ -71,13 +73,23 @@
// }
@Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ copyDataFrom(value);
+ }
+
+ @Override
public __struct__ getStruct(String fieldName) {
- // if (fieldName.equals("LL")) {
- // return LL;
- // }
- // if (fieldName.equals("UR")) {
- // return UR;
- // }
+ if (fieldName.equals("LL")) {
+ return LL;
+ }
+ if (fieldName.equals("UR")) {
+ return UR;
+ }
return super.getStruct(fieldName);
}
@@ -158,6 +170,15 @@
return new Amp();
}
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_boxf.class));
+ }
+ };
+ }
+
// public interface ST_boxf extends __ptr__ {
// public static List DEFINITION = Arrays.asList(
// "typedef struct",
diff -Nru plantuml-1.2017.15/src/h/ST_deque_t.java plantuml-1.2018.9/src/h/ST_deque_t.java
--- plantuml-1.2017.15/src/h/ST_deque_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_deque_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,133 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_deque_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ // "pointnlink_t **pnlps",
+ public __ptr__ pnlps;
+ public int pnlpn, fpnlpi, lpnlpi, apex;
+
+ public ST_deque_t() {
+ this(null);
+ }
+
+ public ST_deque_t(StarStruct parent) {
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("pnlps")) {
+ return pnlps;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("pnlps")) {
+ pnlps = newData;
+ return pnlps;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("pnlpn")) {
+ return pnlpn;
+ }
+ if (fieldName.equals("fpnlpi")) {
+ return fpnlpi;
+ }
+ if (fieldName.equals("lpnlpi")) {
+ return lpnlpi;
+ }
+ if (fieldName.equals("apex")) {
+ return apex;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("pnlpn")) {
+ pnlpn = data;
+ return;
+ }
+ if (fieldName.equals("fpnlpi")) {
+ fpnlpi = data;
+ return;
+ }
+ if (fieldName.equals("lpnlpi")) {
+ lpnlpi = data;
+ return;
+ }
+ if (fieldName.equals("apex")) {
+ apex = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct deque_t",
+ // "{",
+ // "pointnlink_t **pnlps",
+ // "int pnlpn, fpnlpi, lpnlpi, apex",
+ // "}",
+ // "deque_t");
+}
+
+// typedef struct deque_t {
+// pointnlink_t **pnlps;
+// int pnlpn, fpnlpi, lpnlpi, apex;
+// } deque_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_dtdata_s.java plantuml-1.2018.9/src/h/ST_dtdata_s.java
--- plantuml-1.2017.15/src/h/ST_dtdata_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dtdata_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,183 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_dtdisc_s.Amp;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_dtdata_s extends UnsupportedStructAndPtr {
+
+ public int type; /* type of dictionary */
+ public ST_dtlink_s.Amp here; /* finger to last search element */
+ private __ptr__ _htab; /* hash table */
+ // Dtlink_t* _head; /* linked list */
+ // } hh;
+ public int ntab; /* number of hash slots */
+ public int size; /* number of objects */
+ public int loop; /* number of nested loops */
+ public int minp; /* min path before splay, always even */
+
+ private final StarStruct parent;
+
+ public ST_dtdata_s() {
+ this(null);
+ }
+
+ public ST_dtdata_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("here")) {
+ if (newData instanceof ST_dtlink_s) {
+ this.here = (ST_dtlink_s.Amp) ((ST_dtlink_s) newData).amp();
+ } else {
+ this.here = (ST_dtlink_s.Amp) newData;
+ }
+ return here;
+ }
+ if (fieldName.equals("hh._htab")) {
+ this._htab = newData;
+ return _htab;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("here")) {
+ return here;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("type")) {
+ this.type = data;
+ return;
+ }
+ if (fieldName.equals("ntab")) {
+ this.ntab = data;
+ return;
+ }
+ if (fieldName.equals("size")) {
+ this.size = data;
+ return;
+ }
+ if (fieldName.equals("loop")) {
+ this.loop = data;
+ return;
+ }
+ if (fieldName.equals("minp")) {
+ this.minp = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("type")) {
+ return type;
+ }
+ if (fieldName.equals("size")) {
+ return size;
+ }
+ if (fieldName.equals("minp")) {
+ return minp;
+ }
+ return super.getInt(fieldName);
+ }
+
+ // public interface ST_dtdata_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct _dtdata_s",
+ // "{",
+ // "int type",
+ // "Dtlink_t* here",
+ // "union",
+ // "{",
+ // "Dtlink_t** _htab",
+ // "Dtlink_t* _head",
+ // "}",
+ // "hh",
+ // "int ntab",
+ // "int size",
+ // "int loop",
+ // "int minp",
+ // "}");
+}
+
+// struct _dtdata_s
+// { int type; /* type of dictionary */
+// Dtlink_t* here; /* finger to last search element */
+// union
+// { Dtlink_t** _htab; /* hash table */
+// Dtlink_t* _head; /* linked list */
+// } hh;
+// int ntab; /* number of hash slots */
+// int size; /* number of objects */
+// int loop; /* number of nested loops */
+// int minp; /* min path before splay, always even */
+// /* for hash dt, > 0: fixed table size */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_dtdisc_s.java plantuml-1.2018.9/src/h/ST_dtdisc_s.java
--- plantuml-1.2017.15/src/h/ST_dtdisc_s.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dtdisc_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,6 +45,7 @@
*/
package h;
+import h.ST_dtmethod_s.Amp;
import smetana.core.CFunction;
import smetana.core.UnsupportedStarStruct;
import smetana.core.UnsupportedStructAndPtr;
@@ -70,8 +71,12 @@
this(null);
}
- class Amp extends UnsupportedStarStruct {
+ @Override
+ public StarStruct amp() {
+ return new Amp(this);
+ }
+ public class Amp extends UnsupportedStarStruct {
private final ST_dtdisc_s parent;
public Amp(ST_dtdisc_s me) {
@@ -123,12 +128,6 @@
}
return super.setPtr(fieldName, newData);
}
-
- }
-
- @Override
- public StarStruct amp() {
- return new Amp(this);
}
}
diff -Nru plantuml-1.2017.15/src/h/ST_dthold_s.java plantuml-1.2018.9/src/h/ST_dthold_s.java
--- plantuml-1.2017.15/src/h/ST_dthold_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dthold_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,115 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_dthold_s extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_dthold_s() {
+ this(null);
+ }
+
+ public ST_dthold_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "struct _dthold_s",
+ // "{",
+ // "Dtlink_t hdr",
+ // "void* obj",
+ private final ST_dtlink_s hdr = new ST_dtlink_s(this);
+ private __ptr__ obj;
+
+ // "}");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == _dthold_s.class) {
+ return this;
+ }
+ if (dest == _dtlink_s.class) {
+ return hdr;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("obj")) {
+ this.obj = newData;
+ return this.obj;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("obj")) {
+ return this.obj;
+ }
+ return super.getPtr(fieldName);
+ }
+}
+
+// struct _dthold_s
+// { Dtlink_t hdr; /* header */
+// void* obj; /* user object */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_dtlink_s.java plantuml-1.2018.9/src/h/ST_dtlink_s.java
--- plantuml-1.2017.15/src/h/ST_dtlink_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dtlink_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,227 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedC;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_dtlink_s extends UnsupportedStructAndPtr implements WithParent {
+
+ public ST_dtlink_s.Amp right;
+ public ST_dtlink_s.Amp _left;
+ private final StarStruct parent;
+
+ @Override
+ public void copyDataFrom(__struct__ other) {
+ ST_dtlink_s this2 = (ST_dtlink_s) other;
+ this.right = this2.right;
+ this._left = this2._left;
+ }
+
+ public ST_dtlink_s() {
+ this(null);
+ }
+
+ public ST_dtlink_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ public StarStruct getParent() {
+ return parent;
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == _dtlink_s.class) {
+ return amp();
+ // return this;
+ }
+ if (dest == _dthold_s.class) {
+ return new LinkTo_dthold_s();
+ }
+ return super.castTo(dest);
+ }
+
+ class LinkTo_dthold_s extends UnsupportedStructAndPtr {
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("obj")) {
+ return new LinkTo_Obj();
+ }
+ return super.getPtr(fieldName);
+ }
+
+ }
+
+ class LinkTo_Obj extends UnsupportedStructAndPtr {
+
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == _dtlink_s.class) {
+ return this;
+ }
+ if (dest == refstr_t.class && getParent() instanceof ST_refstr_t) {
+ return (ST_refstr_t) getParent();
+ }
+ if (dest == _dthold_s.class && getParent() instanceof ST_dthold_s) {
+ // System.err.println("ITSME");
+ // System.err.println("getParent()=" + getParent());
+ return (ST_dthold_s) getParent();
+
+ }
+ System.err.println("dest=" + dest);
+ return super.castTo(dest);
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ if (virtualBytes < 0) {
+ final OFFSET offset = OFFSET.fromInt(-virtualBytes);
+ if (offset.toString().equals("h.Agsubnode_s::id_link")) {
+ return ((ST_Agsubnode_s) parent).from_id_link(ST_dtlink_s.this);
+ }
+ if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
+ return ((ST_Agsubnode_s) parent).from_seq_link(ST_dtlink_s.this);
+ }
+ if (offset.toString().equals("h.Agsym_s::link")) {
+ return ((ST_Agsym_s) parent).from_link(ST_dtlink_s.this);
+ }
+ if (offset.toString().equals("h.Agedge_s::seq_link")) {
+ return ((ST_Agedge_s) parent).from_seq_link(ST_dtlink_s.this);
+ }
+ if (offset.toString().equals("h.Agedge_s::id_link")) {
+ return ((ST_Agedge_s) parent).from_id_link(ST_dtlink_s.this);
+ }
+ if (offset.toString().equals("h.Agraph_s::link")) {
+ return ((ST_Agraph_s) parent).from_link(ST_dtlink_s.this);
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.refstr_t::s") && parent instanceof ST_refstr_t) {
+ return ((ST_refstr_t) parent).to_s(ST_dtlink_s.this);
+
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_dtlink_s.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_dtlink_s.this.getPtr(fieldName);
+ }
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("hl._left")) {
+ this._left = (ST_dtlink_s.Amp) newData;
+ return _left;
+ }
+ if (fieldName.equals("right")) {
+ this.right = (ST_dtlink_s.Amp) newData;
+ return right;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("hl._left")) {
+ return _left;
+ }
+ if (fieldName.equals("right")) {
+ return right;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ // public interface ST_dtlink_s extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "struct _dtlink_s",
+ // "{",
+ // "Dtlink_t* right",
+ // "union",
+ // "{",
+ // "unsigned int _hash",
+ // "Dtlink_t* _left",
+ // "}",
+ // "hl",
+ // "}");
+}
+
+// struct _dtlink_s
+// { Dtlink_t* right; /* right child */
+// union
+// { unsigned int _hash; /* hash value */
+// Dtlink_t* _left; /* left child */
+// } hl;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_dtmethod_s.java plantuml-1.2018.9/src/h/ST_dtmethod_s.java
--- plantuml-1.2017.15/src/h/ST_dtmethod_s.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dtmethod_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -47,11 +47,11 @@
import smetana.core.CFunction;
import smetana.core.UnsupportedStarStruct;
-import smetana.core.UnsupportedStruct;
+import smetana.core.UnsupportedStructAndPtr;
import smetana.core.__ptr__;
import smetana.core.amiga.StarStruct;
-public class ST_dtmethod_s extends UnsupportedStruct {
+public class ST_dtmethod_s extends UnsupportedStructAndPtr {
public CFunction searchf;
public int type;
@@ -72,30 +72,33 @@
@Override
public StarStruct amp() {
- return new UnsupportedStarStruct() {
- @Override
- public int getInt(String fieldName) {
- if (fieldName.equals("type")) {
- return type;
- }
- return super.getInt(fieldName);
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("type")) {
+ return type;
}
+ return super.getInt(fieldName);
+ }
- @Override
- public __ptr__ getPtr(String fieldName) {
- if (fieldName.equals("searchf")) {
- return searchf;
- }
- return super.getPtr(fieldName);
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("searchf")) {
+ return searchf;
}
+ return super.getPtr(fieldName);
+ }
- @Override
- public Object call(String fieldName, Object... args) {
- if (fieldName.equals("searchf")) {
- return searchf.exe(args);
- }
- return super.call(fieldName, args);
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("searchf")) {
+ return searchf.exe(args);
}
- };
+ return super.call(fieldName, args);
+ }
}
+
}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_dt_s.java plantuml-1.2018.9/src/h/ST_dt_s.java
--- plantuml-1.2017.15/src/h/ST_dt_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_dt_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,206 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_dt_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public CFunction searchf;/* search function */
+
+ public ST_dtdisc_s.Amp disc; /* method to manipulate objs */
+ public ST_dtdata_s data; /* sharable data */
+ public CFunction memoryf;/* function to alloc/free memory */
+ public ST_dtmethod_s.Amp meth; /* dictionary method */
+
+ public int type; /* type information */
+ public int nview; /* number of parent view dictionaries */
+ public ST_dt_s view; /* next on viewpath */
+ public ST_dt_s walk; /* dictionary being walked */
+ public __ptr__ user; /* for user's usage */
+
+ public ST_dt_s() {
+ this(null);
+ }
+
+ public ST_dt_s(StarStruct parent) {
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("searchf")) {
+ this.searchf = (CFunction) newData;
+ return searchf;
+ }
+ if (fieldName.equals("meth")) {
+ this.meth = (ST_dtmethod_s.Amp) newData;
+ return meth;
+ }
+ if (fieldName.equals("disc")) {
+ this.disc = (ST_dtdisc_s.Amp) newData;
+ return disc;
+ }
+ if (fieldName.equals("memoryf")) {
+ this.memoryf = (CFunction) newData;
+ return memoryf;
+ }
+ if (fieldName.equals("view")) {
+ this.view = (ST_dt_s) newData;
+ return view;
+ }
+ if (fieldName.equals("walk")) {
+ this.walk = (ST_dt_s) newData;
+ return walk;
+ }
+ if (fieldName.equals("user")) {
+ this.user = newData;
+ return user;
+ }
+ if (fieldName.equals("data")) {
+ this.data = (ST_dtdata_s) newData;
+ return data;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("disc")) {
+ return disc;
+ }
+ if (fieldName.equals("data")) {
+ return data;
+ }
+ if (fieldName.equals("meth")) {
+ return meth;
+ }
+ if (fieldName.equals("view")) {
+ return view;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("memoryf")) {
+ return this.memoryf.exe(args);
+ }
+ if (fieldName.equals("searchf")) {
+ return this.searchf.exe(args);
+ }
+ return super.call(fieldName, args);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ if (dest == _dt_s.class) {
+ return this;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("type")) {
+ this.type = data;
+ return;
+ }
+ if (fieldName.equals("nview")) {
+ this.nview = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("type")) {
+ return type;
+ }
+ if (fieldName.equals("nview")) {
+ return nview;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ ST_dt_s other2 = (ST_dt_s) other;
+ return this == other2;
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "struct _dt_s",
+ // "{",
+ // "Dtsearch_f searchf",
+ // "Dtdisc_t* disc",
+ // "Dtdata_t* data",
+ // "Dtmemory_f memoryf",
+ // "Dtmethod_t* meth",
+ // "int type",
+ // "int nview",
+ // "Dt_t* view",
+ // "Dt_t* walk",
+ // "void* user",
+ // "}");
+}
+
+// struct _dt_s
+// { Dtsearch_f searchf;/* search function */
+// Dtdisc_t* disc; /* method to manipulate objs */
+// Dtdata_t* data; /* sharable data */
+// Dtmemory_f memoryf;/* function to alloc/free memory */
+// Dtmethod_t* meth; /* dictionary method */
+// int type; /* type information */
+// int nview; /* number of parent view dictionaries */
+// Dt_t* view; /* next on viewpath */
+// Dt_t* walk; /* dictionary being walked */
+// void* user; /* for user's usage */
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_EMPTY.java plantuml-1.2018.9/src/h/ST_EMPTY.java
--- plantuml-1.2017.15/src/h/ST_EMPTY.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_EMPTY.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,73 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_EMPTY extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_EMPTY() {
+ this(null);
+ }
+
+ public ST_EMPTY(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/h/ST_fontinfo.java plantuml-1.2018.9/src/h/ST_fontinfo.java
--- plantuml-1.2017.15/src/h/ST_fontinfo.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_fontinfo.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,164 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_fontinfo extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_fontinfo() {
+ this(null);
+ }
+
+ public ST_fontinfo(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ ST_fontinfo.this.setDouble(fieldName, data);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_fontinfo.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_fontinfo.this.getPtr(fieldName);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return ST_fontinfo.this.getDouble(fieldName);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ return ST_fontinfo.this.getCString(fieldName);
+ }
+
+ }
+
+ // "struct fontinfo",
+ // "{",
+ private double fontsize;
+ private CString fontname;
+ private CString fontcolor;
+
+ // "}");
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("fontsize")) {
+ return this.fontsize;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("fontsize")) {
+ this.fontsize = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("fontname")) {
+ return this.fontname;
+ }
+ if (fieldName.equals("fontcolor")) {
+ return this.fontcolor;
+ }
+ return super.getCString(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("fontname")) {
+ return this.fontname;
+ }
+ if (fieldName.equals("fontcolor")) {
+ return this.fontcolor;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("fontname")) {
+ return this.fontname;
+ }
+ if (fieldName.equals("fontcolor")) {
+ return this.fontcolor;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+}
+
+// struct fontinfo {
+// double fontsize;
+// char *fontname;
+// char *fontcolor;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_GVCOMMON_t.java plantuml-1.2018.9/src/h/ST_GVCOMMON_t.java
--- plantuml-1.2017.15/src/h/ST_GVCOMMON_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_GVCOMMON_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,142 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_GVCOMMON_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ // "typedef struct GVCOMMON_s",
+ // "{",
+ private __ptr__ info;
+ // "char *cmdname",
+ // "int verbose",
+ // "boolean config, auto_outfile_names",
+ // "void (*errorfn) (const char *fmt, ...)",
+ private CFunction errorfn;
+ // "const char **show_boxes",
+ // "const char **lib",
+ // "int viewNum",
+ // "const lt_symlist_t *builtins",
+ private __ptr__ builtins;
+ private boolean demand_loading;
+ // "}",
+ // "GVCOMMON_t");
+
+ private final StarStruct parent;
+
+ public ST_GVCOMMON_t() {
+ this(null);
+ }
+
+ public ST_GVCOMMON_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("info")) {
+ this.info = newData;
+ return newData;
+ }
+ if (fieldName.equals("errorfn")) {
+ this.errorfn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("builtins")) {
+ this.builtins = newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("builtins") && builtins == null) {
+ return builtins;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("demand_loading")) {
+ this.demand_loading = data;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+}
+
+// typedef struct GVCOMMON_s {
+// char **info;
+// char *cmdname;
+// int verbose;
+// boolean config, auto_outfile_names;
+// void (*errorfn) (const char *fmt, ...);
+// const char **show_boxes; /* emit code for correct box coordinates */
+// const char **lib;
+//
+// /* rendering state */
+// int viewNum; /* current view - 1 based count of views,
+// all pages in all layers */
+// const lt_symlist_t *builtins;
+// int demand_loading;
+// } GVCOMMON_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_GVC_s.java plantuml-1.2018.9/src/h/ST_GVC_s.java
--- plantuml-1.2017.15/src/h/ST_GVC_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_GVC_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,212 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_GVC_s extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ // "struct GVC_s",
+ // "{",
+ private final ST_GVCOMMON_t common = new ST_GVCOMMON_t(this);
+ // "char *config_path",
+ private int config_found;
+ // "char **input_filenames",
+ // "GVG_t *gvgs",
+ // "GVG_t *gvg",
+ // "gvplugin_available_t *apis[ +1 +1 +1 +1 +1 ]",
+ // "gvplugin_available_t *api[ +1 +1 +1 +1 +1 ]",
+ // "gvplugin_package_t *packages",
+ // "size_t (*write_fn) (GVJ_t *job, const char *s, size_t len)",
+ // "Dtdisc_t textfont_disc",
+ // "Dt_t *textfont_dt",
+ // "gvplugin_active_textlayout_t textlayout",
+ // "GVJ_t *jobs",
+ // "GVJ_t *job",
+ // "graph_t *g",
+ private final ST_gvplugin_active_layout_t layout = new ST_gvplugin_active_layout_t();
+ // "char *graphname",
+ // "GVJ_t *active_jobs",
+ // "char *pagedir",
+ // "pointf margin",
+ // "pointf pad",
+ // "pointf pageSize",
+ // "point pb",
+ // "boxf bb",
+ // "int rotation",
+ // "boolean graph_sets_pad, graph_sets_margin, graph_sets_pageSize, graph_sets_rotation",
+ // "char *layerDelims",
+ // "char *layerListDelims",
+ // "char *layers",
+ // "char **layerIDs",
+ // "int numLayers",
+ // "int *layerlist",
+ // "char *defaultfontname",
+ // "double defaultfontsize",
+ // "char **defaultlinestyle",
+ // "gvcolor_t bgcolor",
+ // "int fontrenaming",
+ // "}");
+
+ private final StarStruct parent;
+
+ public ST_GVC_s() {
+ this(null);
+ }
+
+ public ST_GVC_s(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("common")) {
+ return common;
+ }
+ if (fieldName.equals("layout")) {
+ return layout;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("config_found")) {
+ this.config_found = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+}
+
+// struct GVC_s {
+// GVCOMMON_t common;
+//
+// char *config_path;
+// boolean config_found;
+//
+// /* gvParseArgs */
+// char **input_filenames; /* null terminated array of input filenames */
+//
+// /* gvNextInputGraph() */
+// GVG_t *gvgs; /* linked list of graphs */
+// GVG_t *gvg; /* current graph */
+//
+// /* plugins */
+//
+// /* APIS expands to "+1 +1 ... +1" to give the number of APIs */
+// gvplugin_available_t *apis[ +1 +1 +1 +1 +1 ]; /* array of linked-list of plugins per api */
+// gvplugin_available_t *api[ +1 +1 +1 +1 +1 ]; /* array of current plugins per api */
+//
+// gvplugin_package_t *packages; /* list of available packages */
+//
+// /* externally provided write() displine */
+// size_t (*write_fn) (GVJ_t *job, const char *s, size_t len);
+//
+// /* fonts and textlayout */
+// Dtdisc_t textfont_disc;
+// Dt_t *textfont_dt;
+// gvplugin_active_textlayout_t textlayout; /* always use best avail for all jobs */
+// // void (*free_layout) (void *layout); /* function for freeing layouts (mostly used by pango) */
+//
+// /* FIXME - everything below should probably move to GVG_t */
+//
+// /* gvrender_config() */
+// GVJ_t *jobs; /* linked list of jobs */
+// GVJ_t *job; /* current job */
+//
+// graph_t *g; /* current graph */
+//
+// /* gvrender_begin_job() */
+// gvplugin_active_layout_t layout;
+//
+// char *graphname; /* name from graph */
+// GVJ_t *active_jobs; /* linked list of active jobs */
+//
+// /* pagination */
+// char *pagedir; /* pagination order */
+// pointf margin; /* margins in graph units */
+// pointf pad; /* pad in graph units */
+// pointf pageSize; /* pageSize in graph units, not including margins */
+// point pb; /* page size - including margins (inches) */
+// boxf bb; /* graph bb in graph units, not including margins */
+// int rotation; /* rotation - 0 = portrait, 90 = landscape */
+// boolean graph_sets_pad, graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
+//
+// /* layers */
+// char *layerDelims; /* delimiters in layer names */
+// char *layerListDelims; /* delimiters between layer ranges */
+// char *layers; /* null delimited list of layer names */
+// char **layerIDs; /* array of layer names */
+// int numLayers; /* number of layers */
+// int *layerlist;
+//
+// /* default font */
+// char *defaultfontname;
+// double defaultfontsize;
+//
+// /* default line style */
+// char **defaultlinestyle;
+//
+// /* render defaults set from graph */
+// gvcolor_t bgcolor; /* background color */
+//
+// /* whether to mangle font names (at least in SVG), usually false */
+// int fontrenaming;
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_gvlayout_engine_s.java plantuml-1.2018.9/src/h/ST_gvlayout_engine_s.java
--- plantuml-1.2017.15/src/h/ST_gvlayout_engine_s.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_gvlayout_engine_s.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,117 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_gvlayout_engine_s extends UnsupportedStructAndPtr {
+
+ private CFunction layout;
+ private CFunction cleanup;
+
+ // "struct gvlayout_engine_s",
+ // "{",
+ // "void (*layout) (graph_t * g)",
+ // "void (*cleanup) (graph_t * g)",
+ // "}");
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("layout")) {
+ this.layout = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("cleanup")) {
+ this.cleanup = (CFunction) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("layout")) {
+ return layout;
+ }
+ if (fieldName.equals("cleanup")) {
+ return cleanup;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_gvlayout_engine_s.this.getPtr(fieldName);
+ }
+
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("layout")) {
+ return layout.exe(args);
+ }
+ if (fieldName.equals("cleanup")) {
+ return cleanup.exe(args);
+ }
+ return super.call(fieldName, args);
+ }
+ }
+}
+
+// struct gvlayout_engine_s {
+// void (*layout) (graph_t * g);
+// void (*cleanup) (graph_t * g);
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_gvlayout_features_t.java plantuml-1.2018.9/src/h/ST_gvlayout_features_t.java
--- plantuml-1.2017.15/src/h/ST_gvlayout_features_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_gvlayout_features_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,90 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_gvlayout_features_t extends UnsupportedStructAndPtr {
+
+ // "typedef struct",
+ // "{",
+ private int flags;
+
+ // "}",
+ // "gvlayout_features_t");
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("flags")) {
+ this.flags = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("flags")) {
+ return flags;
+ }
+ return super.getInt(fieldName);
+ }
+ }
+
+}
+
+// typedef struct {
+// int flags;
+// } gvlayout_features_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_gvplugin_active_layout_t.java plantuml-1.2018.9/src/h/ST_gvplugin_active_layout_t.java
--- plantuml-1.2017.15/src/h/ST_gvplugin_active_layout_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_gvplugin_active_layout_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,104 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+
+public class ST_gvplugin_active_layout_t extends UnsupportedStructAndPtr {
+
+ private ST_gvlayout_engine_s.Amp engine;
+ private int id;
+ private ST_gvlayout_features_t.Amp features;
+ private CString type;
+
+ // "}",
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("type")) {
+ this.type = (CString) newData;
+ return newData;
+ }
+ if (fieldName.equals("engine")) {
+ this.engine = (ST_gvlayout_engine_s.Amp) newData;
+ return newData;
+ }
+ if (fieldName.equals("features")) {
+ this.features = (ST_gvlayout_features_t.Amp) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("engine")) {
+ return engine;
+ }
+ if (fieldName.equals("features")) {
+ return features;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("id")) {
+ this.id = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+}
+
+// typedef struct gvplugin_active_layout_s {
+// gvlayout_engine_t *engine;
+// int id;
+// gvlayout_features_t *features;
+// const char *type;
+// } gvplugin_active_layout_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_gvplugin_installed_t.java plantuml-1.2018.9/src/h/ST_gvplugin_installed_t.java
--- plantuml-1.2017.15/src/h/ST_gvplugin_installed_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_gvplugin_installed_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,140 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_gvplugin_installed_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_gvplugin_installed_t() {
+ this(null);
+ }
+
+ public ST_gvplugin_installed_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private int id;
+ private CString type;
+ private int quality;
+
+ private ST_gvlayout_engine_s.Amp engine;
+ private ST_gvlayout_features_t.Amp features;
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("id")) {
+ this.id = data;
+ return;
+ }
+ if (fieldName.equals("quality")) {
+ this.quality = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("id")) {
+ return this.id;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("type")) {
+ this.type = (CString) newData;
+ return newData;
+ }
+ if (fieldName.equals("engine")) {
+ this.engine = (ST_gvlayout_engine_s.Amp) newData;
+ return newData;
+ }
+ if (fieldName.equals("features")) {
+ this.features = (ST_gvlayout_features_t.Amp) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("type")) {
+ return type;
+ }
+ if (fieldName.equals("engine")) {
+ return engine;
+ }
+ if (fieldName.equals("features")) {
+ return features;
+ }
+ return super.getPtr(fieldName);
+ }
+
+}
+
+// typedef struct {
+// int id; /* an id that is only unique within a package
+// of plugins of the same api.
+// A renderer-type such as "png" in the cairo package
+// has an id that is different from the "ps" type
+// in the same package */
+// const char *type; /* a string name, such as "png" or "ps" that
+// distinguishes different types withing the same
+// (renderer in this case) */
+// int quality; /* an arbitrary integer used for ordering plugins of
+// the same type from different packages */
+// void *engine; /* pointer to the jump table for the plugin */
+// void *features; /* pointer to the feature description
+// void* because type varies by api */
+// } gvplugin_installed_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_HDict_t.java plantuml-1.2018.9/src/h/ST_HDict_t.java
--- plantuml-1.2017.15/src/h/ST_HDict_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_HDict_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,91 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_HDict_t.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_HDict_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_HDict_t() {
+ this(null);
+ }
+
+ public ST_HDict_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+ // "typedef struct obyh",
+ // "{",
+ // "Dtlink_t link",
+ // "int key",
+ // "Leaf_t d",
+ // "}",
+ // "HDict_t");
+}
+
+// typedef struct obyh {
+// Dtlink_t link;
+// int key;
+// Leaf_t d;
+// } HDict_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_IMapEntry_t.java plantuml-1.2018.9/src/h/ST_IMapEntry_t.java
--- plantuml-1.2017.15/src/h/ST_IMapEntry_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_IMapEntry_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,93 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_IMapEntry_t.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_IMapEntry_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_IMapEntry_t() {
+ this(null);
+ }
+
+ public ST_IMapEntry_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+ // "typedef struct IMapEntry_s",
+ // "{",
+ // "Dtlink_t namedict_link",
+ // "Dtlink_t iddict_link",
+ // "unsigned long id",
+ // "char *str",
+ // "}",
+ // "IMapEntry_t");
+}
+
+// typedef struct IMapEntry_s {
+// Dtlink_t namedict_link;
+// Dtlink_t iddict_link;
+// unsigned long id;
+// char *str;
+// } IMapEntry_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_inside_t.java plantuml-1.2018.9/src/h/ST_inside_t.java
--- plantuml-1.2017.15/src/h/ST_inside_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_inside_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,150 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.MutableDoublePtr;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfStruct;
+import smetana.core.amiga.StarStruct;
+
+public class ST_inside_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_inside_t() {
+ this(null);
+ }
+
+ public ST_inside_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef union inside_t",
+ // "{",
+ // "struct",
+ // "{",
+ // "pointf* p",
+ private StarArrayOfStruct p;
+ private MutableDoublePtr r;
+ // "double* r",
+ // "}",
+ // "a",
+ // "struct",
+ // "{",
+ // "node_t* n",
+ private ST_Agnode_s n;
+ private ST_boxf bp;
+
+ // "boxf* bp",
+ // "}",
+ // "s",
+ // "}",
+ // "inside_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_inside_t.this.getPtr(fieldName);
+ }
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("s.n")) {
+ this.n = (ST_Agnode_s) newData;
+ return this.n;
+ }
+ if (fieldName.equals("s.bp")) {
+ this.bp = (ST_boxf) newData;
+ return this.bp;
+ }
+ if (fieldName.equals("a.p")) {
+ this.p = (StarArrayOfStruct) newData;
+ return this.p;
+ }
+ if (fieldName.equals("a.r")) {
+ this.r = (MutableDoublePtr) newData;
+ return this.r;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("s.n")) {
+ return this.n;
+ }
+ if (fieldName.equals("s.bp")) {
+ return this.bp;
+ }
+ if (fieldName.equals("a.p")) {
+ return this.p;
+ }
+ if (fieldName.equals("a.r")) {
+ return this.r;
+ }
+ return super.getPtr(fieldName);
+ }
+
+}
+
+// typedef union inside_t {
+// struct {
+// pointf* p;
+// double* r;
+// } a;
+// struct {
+// node_t* n;
+// boxf* bp;
+// } s;
+// } inside_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_label_params_t.java plantuml-1.2018.9/src/h/ST_label_params_t.java
--- plantuml-1.2017.15/src/h/ST_label_params_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_label_params_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,110 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_label_params_t.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_label_params_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_label_params_t() {
+ this(null);
+ }
+
+ public ST_label_params_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef struct",
+ // "{",
+ private final ST_boxf bb = new ST_boxf(this);
+ private boolean force;
+
+ // "}",
+ // "label_params_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("bb")) {
+ this.bb.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("force")) {
+ this.force = data;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+}
+
+// typedef struct {
+// boxf bb; /* Bounding box of all objects */
+// unsigned char force; /* If true, all labels must be placed */
+// } label_params_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_layout_t.java plantuml-1.2018.9/src/h/ST_layout_t.java
--- plantuml-1.2017.15/src/h/ST_layout_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_layout_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,192 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_layout_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_layout_t() {
+ this(null);
+ }
+
+ public ST_layout_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ }
+
+ private double quantum;
+ private double scale;
+ private double ratio;
+ private double dpi;
+
+ private ST_pointf margin = new ST_pointf(this);
+ private ST_pointf page = new ST_pointf(this);
+ private ST_pointf size = new ST_pointf(this);
+
+ private boolean filled;
+ private boolean landscape;
+ private boolean centered;
+
+ // "ratio_t ratio_kind",
+ private int ratio_kind;
+ // "void* xdots",
+ // "char* id",
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("xdots") && newData == null) {
+ return null;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("margin")) {
+ return margin;
+ }
+ if (fieldName.equals("page")) {
+ return page;
+ }
+ if (fieldName.equals("size")) {
+ return size;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("filled")) {
+ this.filled = data;
+ return;
+ }
+ if (fieldName.equals("landscape")) {
+ this.landscape = data;
+ return;
+ }
+ if (fieldName.equals("centered")) {
+ this.centered = data;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("quantum")) {
+ return this.quantum;
+ }
+ if (fieldName.equals("scale")) {
+ return this.scale;
+ }
+ if (fieldName.equals("ratio")) {
+ return this.ratio;
+ }
+ if (fieldName.equals("dpi")) {
+ return this.dpi;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("quantum")) {
+ this.quantum = data;
+ return;
+ }
+ if (fieldName.equals("scale")) {
+ this.scale = data;
+ return;
+ }
+ if (fieldName.equals("ratio")) {
+ this.ratio = data;
+ return;
+ }
+ if (fieldName.equals("dpi")) {
+ this.dpi = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("ratio_kind")) {
+ return this.ratio_kind;
+ }
+ return super.getInt(fieldName);
+ }
+}
+
+// typedef struct layout_t {
+// double quantum;
+// double scale;
+// double ratio; /* set only if ratio_kind == R_VALUE */
+// double dpi;
+// pointf margin;
+// pointf page;
+// pointf size;
+// boolean filled;
+// boolean landscape;
+// boolean centered;
+// ratio_t ratio_kind;
+// void* xdots;
+// char* id;
+// } layout_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_nodequeue.java plantuml-1.2018.9/src/h/ST_nodequeue.java
--- plantuml-1.2017.15/src/h/ST_nodequeue.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_nodequeue.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,145 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_nodequeue extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_nodequeue() {
+ this(null);
+ }
+
+ public ST_nodequeue(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct nodequeue",
+ // "{",
+ // "node_t **store, **limit, **head, **tail",
+ private StarArrayOfPtr store;
+ private StarArrayOfPtr tail;
+ private StarArrayOfPtr head;
+ private StarArrayOfPtr limit;
+
+ // "}",
+ // "nodequeue");
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("store")) {
+ this.store = (StarArrayOfPtr) newData;
+ return this.store;
+ }
+ if (fieldName.equals("tail")) {
+ this.tail = (StarArrayOfPtr) newData;
+ return this.tail;
+ }
+ if (fieldName.equals("head")) {
+ this.head = (StarArrayOfPtr) newData;
+ return this.head;
+ }
+ if (fieldName.equals("limit")) {
+ this.limit = (StarArrayOfPtr) newData;
+ return this.limit;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("store")) {
+ return this.store.getInternalArray();
+ }
+ if (fieldName.equals("tail")) {
+ return this.tail.getInternalArray();
+ }
+ if (fieldName.equals("head")) {
+ return this.head.getInternalArray();
+ }
+ if (fieldName.equals("limit")) {
+ return this.limit.getInternalArray();
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("store")) {
+ return this.store;
+ }
+ if (fieldName.equals("tail")) {
+ return this.tail;
+ }
+ if (fieldName.equals("head")) {
+ return this.head;
+ }
+ if (fieldName.equals("limit")) {
+ return this.limit;
+ }
+ return super.getPtr(fieldName);
+ }
+}
+
+// typedef struct nodequeue {
+// node_t **store, **limit, **head, **tail;
+// } nodequeue;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Node_t___.java plantuml-1.2018.9/src/h/ST_Node_t___.java
--- plantuml-1.2017.15/src/h/ST_Node_t___.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Node_t___.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,90 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+import h.ST_Node_t___.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Node_t___ extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_Node_t___() {
+ this(null);
+ }
+
+ public ST_Node_t___(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+//"typedef struct Node",
+//"{",
+//"int count",
+//"int level",
+//"struct Branch branch[64]",
+//"}",
+//"Node_t");
+}
+
+// typedef struct Node {
+// int count;
+// int level; /* 0 is leaf, others positive */
+// struct Branch branch[64];
+// } Node_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_object_t.java plantuml-1.2018.9/src/h/ST_object_t.java
--- plantuml-1.2017.15/src/h/ST_object_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_object_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,168 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_object_t.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_object_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_object_t() {
+ this(null);
+ }
+
+ public ST_object_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef struct",
+ // "{",
+ private final ST_pointf pos = new ST_pointf(this);
+ private final ST_pointf sz = new ST_pointf(this);
+ // "xlabel_t *lbl",
+ private StarArrayOfPtr lbl;
+
+ // "}",
+ // "object_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("pos")) {
+ this.pos.copyDataFrom(newData);
+ return newData;
+ }
+ if (fieldName.equals("lbl")) {
+ this.lbl = (StarArrayOfPtr) newData;
+ return this.lbl;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("pos")) {
+ return this.pos;
+ }
+ if (fieldName.equals("sz")) {
+ return this.sz;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("pos")) {
+ this.pos.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("sz")) {
+ this.sz.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("pos")) {
+ return this.pos;
+ }
+ if (fieldName.equals("sz")) {
+ return this.sz;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_object_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct {
+// pointf pos; /* Position of lower-left corner of object */
+// pointf sz; /* Size of object; may be zero for a point */
+// xlabel_t *lbl; /* Label attached to object, or NULL */
+// } object_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_pack_info.java plantuml-1.2018.9/src/h/ST_pack_info.java
--- plantuml-1.2017.15/src/h/ST_pack_info.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_pack_info.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,161 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_pack_info.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_pack_info extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_pack_info() {
+ this(null);
+ }
+
+ public ST_pack_info(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct",
+ // "{",
+ // "float aspect",
+ private int sz;
+ private int margin;
+ private int doSplines;
+ // "pack_mode mode",
+ private int mode;
+ private __ptr__ fixed;
+ // "boolean *fixed",
+ // "packval_t* vals",
+ private __ptr__ vals;
+ private int flags;
+
+ // "}",
+ // "pack_info");
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("flags")) {
+ return this.flags;
+ }
+ if (fieldName.equals("mode")) {
+ return this.mode;
+ }
+ if (fieldName.equals("sz")) {
+ return this.sz;
+ }
+ if (fieldName.equals("margin")) {
+ return this.margin;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("flags")) {
+ this.flags = data;
+ return;
+ }
+ if (fieldName.equals("mode")) {
+ this.mode = data;
+ return;
+ }
+ if (fieldName.equals("sz")) {
+ this.sz = data;
+ return;
+ }
+ if (fieldName.equals("margin")) {
+ this.margin = data;
+ return;
+ }
+ if (fieldName.equals("doSplines")) {
+ this.doSplines = data;
+ return;
+ }
+ if (fieldName.equals("fixed") && data == 0) {
+ this.fixed = null;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("vals") && newData == null) {
+ this.vals = newData;
+ return vals;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+}
+
+// typedef struct {
+// float aspect; /* desired aspect ratio */
+// int sz; /* row/column size size */
+// unsigned int margin; /* margin left around objects, in points */
+// int doSplines; /* use splines in constructing graph shape */
+// pack_mode mode; /* granularity and method */
+// boolean *fixed; /* fixed[i] == true implies g[i] should not be moved */
+// packval_t* vals; /* for arrays, sort numbers */
+// int flags;
+// } pack_info;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_pathend_t.java plantuml-1.2018.9/src/h/ST_pathend_t.java
--- plantuml-1.2017.15/src/h/ST_pathend_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_pathend_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,210 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_struct__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_pathend_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_pathend_t() {
+ this(null);
+ }
+
+ public ST_pathend_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef struct pathend_t",
+ // "{",
+ private final ST_boxf nb = new ST_boxf(this);
+ private final ST_pointf np = new ST_pointf(this);
+ private int sidemask;
+ private int boxn;
+
+ private final ST_boxf boxes[] = new ST_boxf[] { new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
+ new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
+ new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
+ new ST_boxf(), new ST_boxf() };
+
+ // "boxf boxes[20]",
+ // "}",
+ // "pathend_t");
+
+ class ArrayOfTwenty extends UnsupportedArrayOfStruct {
+
+ final private int pos;
+
+ public ArrayOfTwenty(int pos) {
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_struct__ plus(int delta) {
+ return new ArrayOfTwenty(pos + delta);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return boxes[pos];
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ boxes[pos].copyDataFrom(value);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return getStruct().getDouble(fieldName);
+ }
+
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ ST_pathend_t.this.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ return ST_pathend_t.this.getArrayOfStruct(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ return ST_pathend_t.this.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ ST_pathend_t.this.setInt(fieldName, data);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ return ST_pathend_t.this.getStruct(fieldName);
+ }
+
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("np")) {
+ this.np.___(newData);
+ return;
+ }
+ if (fieldName.equals("nb")) {
+ this.nb.___(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("nb")) {
+ return this.nb;
+ }
+ if (fieldName.equals("np")) {
+ return this.np;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("boxn")) {
+ return this.boxn;
+ }
+ if (fieldName.equals("sidemask")) {
+ return this.sidemask;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("boxn")) {
+ this.boxn = data;
+ return;
+ }
+ if (fieldName.equals("sidemask")) {
+ this.sidemask = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ if (fieldName.equals("boxes")) {
+ return new ArrayOfTwenty(0);
+ }
+ return super.getArrayOfStruct(fieldName);
+ }
+
+}
+
+// typedef struct pathend_t {
+// boxf nb; /* the node box */
+// pointf np; /* node port */
+// int sidemask;
+// int boxn;
+// boxf boxes[20];
+// } pathend_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_path.java plantuml-1.2018.9/src/h/ST_path.java
--- plantuml-1.2017.15/src/h/ST_path.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_path.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,160 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_path extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_path() {
+ this(null);
+ }
+
+ public ST_path(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct path",
+ // "{",
+ final ST_port start = new ST_port(this), end = new ST_port(this);
+ private int nbox;
+ // "boxf *boxes",
+ private StarArrayOfPtr boxes;
+
+ private ST_Agedge_s.Amp data;
+
+ // "void *data",
+ // "}",
+ // "path");
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("boxes")) {
+ this.boxes = (StarArrayOfPtr) newData;
+ return this.boxes;
+ }
+ if (fieldName.equals("data")) {
+ if (newData instanceof ST_Agedge_s) {
+ newData = ((ST_Agedge_s) newData).amp();
+ }
+ this.data = (ST_Agedge_s.Amp) newData;
+ return this.data;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("data")) {
+ return this.data;
+ }
+ if (fieldName.equals("boxes")) {
+ return this.boxes;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("start")) {
+ return start;
+ }
+ if (fieldName.equals("end")) {
+ return end;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("boxes")) {
+ return boxes.getInternalArray();
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("nbox")) {
+ return this.nbox;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("nbox")) {
+ this.nbox = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+}
+
+// typedef struct path { /* internal specification for an edge spline */
+// port start, end;
+// int nbox; /* number of subdivisions */
+// boxf *boxes; /* rectangular regions of subdivision */
+// void *data;
+// } path;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_Pedge_t.java plantuml-1.2018.9/src/h/ST_Pedge_t.java
--- plantuml-1.2017.15/src/h/ST_Pedge_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Pedge_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,135 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Pedge_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_Pedge_t() {
+ this(null);
+ }
+
+ public ST_Pedge_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef struct Pedge_t",
+ // "{",
+ // "Ppoint_t a, b",
+ private final ST_pointf a = new ST_pointf(this);
+ private final ST_pointf b = new ST_pointf(this);
+
+ // "}",
+ // "Pedge_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("a")) {
+ return a;
+ }
+ if (fieldName.equals("b")) {
+ return b;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("a")) {
+ this.a.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("b")) {
+ this.b.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_Pedge_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct Pedge_t {
+// Ppoint_t a, b;
+// } Pedge_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_pointf.java plantuml-1.2018.9/src/h/ST_pointf.java
--- plantuml-1.2017.15/src/h/ST_pointf.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_pointf.java 2018-07-27 21:59:19.000000000 +0000
@@ -46,11 +46,13 @@
package h;
import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedSize_t;
import smetana.core.UnsupportedStarStruct;
import smetana.core.UnsupportedStructAndPtr;
import smetana.core.__array_of_ptr__;
import smetana.core.__ptr__;
import smetana.core.__struct__;
+import smetana.core.size_t;
import smetana.core.amiga.Area;
import smetana.core.amiga.StarArrayOfPtr;
import smetana.core.amiga.StarArrayOfStruct;
@@ -97,6 +99,12 @@
public void setStruct(__struct__ value) {
ST_pointf.this.setStruct(value);
}
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ ST_pointf.Amp other2 = (Amp) other;
+ return this.getStruct() == other2.getStruct();
+ }
}
@Override
@@ -113,6 +121,18 @@
this.x = other2.x;
this.y = other2.y;
}
+
+ @Override
+ public void copyDataFrom(__ptr__ value) {
+ final ST_pointf other2 = (ST_pointf) value;
+ this.x = other2.x;
+ this.y = other2.y;
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
@Override
public void memcopyFrom(Area source) {
@@ -199,6 +219,27 @@
public ST_pointf(StarStruct parent) {
}
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_pointf.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
// public interface ST_pointf extends __ptr__ {
// public static List DEFINITION = Arrays.asList(
// "typedef struct pointf_s",
diff -Nru plantuml-1.2017.15/src/h/ST_point.java plantuml-1.2018.9/src/h/ST_point.java
--- plantuml-1.2017.15/src/h/ST_point.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_point.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,122 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_point extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_point() {
+ this(null);
+ }
+
+ public ST_point(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct",
+ // "{",
+ private int x, y;
+
+ // "}",
+ // "point");
+
+ @Override
+ public __struct__ copy() {
+ final ST_point result = new ST_point();
+ result.x = this.x;
+ result.y = this.y;
+ return result;
+ }
+
+ @Override
+ public void ___(__struct__ other) {
+ ST_point this2 = (ST_point) other;
+ this.x = this2.x;
+ this.y = this2.y;
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("x")) {
+ return this.x;
+ }
+ if (fieldName.equals("y")) {
+ return this.y;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("x")) {
+ this.x = data;
+ return;
+ }
+ if (fieldName.equals("y")) {
+ this.y = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+}
+
+// typedef struct { int x, y; } point;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_pointnlink_t.java plantuml-1.2018.9/src/h/ST_pointnlink_t.java
--- plantuml-1.2017.15/src/h/ST_pointnlink_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_pointnlink_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,233 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarArrayOfStruct;
+import smetana.core.amiga.StarStruct;
+
+public class ST_pointnlink_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public ST_pointf.Amp pp;
+ public ST_pointnlink_t.Amp link;
+
+ public ST_pointnlink_t() {
+ this(null);
+ }
+
+ public ST_pointnlink_t(StarStruct parent) {
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("pp")) {
+ return pp;
+ }
+ if (fieldName.equals("link")) {
+ return link;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return ST_pointnlink_t.this;
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_pointnlink_t.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ ST_pointnlink_t.Amp other2 = (Amp) other;
+ return this.getStruct() == other2.getStruct();
+ }
+
+ @Override
+ public Class getRealClass() {
+ return ST_pointnlink_t.class;
+ }
+
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("pp")) {
+ return pp;
+ }
+ if (fieldName.equals("link")) {
+ return link;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("pp")) {
+ if (newData instanceof StarArrayOfPtr) {
+ StarArrayOfPtr tmp = (StarArrayOfPtr) newData;
+ ST_pointf data = (ST_pointf) tmp.getStruct();
+ pp = (ST_pointf.Amp) data.amp();
+ return pp;
+ }
+ if (newData instanceof StarArrayOfStruct) {
+ StarArrayOfStruct tmp = (StarArrayOfStruct) newData;
+ ST_pointf data = (ST_pointf) tmp.getStruct();
+ pp = (ST_pointf.Amp) data.amp();
+ return pp;
+ }
+ System.err.println("newData1=" + newData.getClass());
+ pp = (ST_pointf.Amp) newData;
+ return pp;
+ }
+ if (fieldName.equals("link")) {
+ if (newData == null) {
+ link = null;
+ return link;
+ }
+ if (newData instanceof StarArrayOfPtr) {
+ StarArrayOfPtr tmp = (StarArrayOfPtr) newData;
+ ST_pointnlink_t data = (ST_pointnlink_t) tmp.getStruct();
+ link = (ST_pointnlink_t.Amp) data.amp();
+ return link;
+ }
+ if (newData instanceof StarArrayOfStruct) {
+ StarArrayOfStruct tmp = (StarArrayOfStruct) newData;
+ ST_pointnlink_t data = (ST_pointnlink_t) tmp.getStruct();
+ link = (ST_pointnlink_t.Amp) data.amp();
+ return link;
+ }
+ if (newData instanceof ST_pointnlink_t.Amp) {
+ ST_pointnlink_t.Amp tmp = (ST_pointnlink_t.Amp) newData;
+ link = tmp;
+ return link;
+ }
+ System.err.println("newData2A=" + newData.getClass());
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_pointnlink_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+ };
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ class StarStructAdaptor extends UnsupportedStarStruct {
+ private final ST_pointnlink_t me;
+
+ public StarStructAdaptor(ST_pointnlink_t me) {
+ this.me = me;
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ StarStructAdaptor other2 = (StarStructAdaptor) other;
+ return this.me == other2.me;
+ }
+ }
+
+ @Override
+ public StarStruct getInternalData() {
+ return new StarStructAdaptor(this);
+ }
+
+ public static size_t sizeof_starstar_empty(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return STStarArrayOfPointer.malloc(nb);
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+ };
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct pointnlink_t",
+ // "{",
+ // "Ppoint_t *pp",
+ // "struct pointnlink_t *link",
+ // "}",
+ // "pointnlink_t");
+}
+
+// typedef struct pointnlink_t {
+// Ppoint_t *pp;
+// struct pointnlink_t *link;
+// } pointnlink_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_polygon_t.java plantuml-1.2018.9/src/h/ST_polygon_t.java
--- plantuml-1.2017.15/src/h/ST_polygon_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_polygon_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,221 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public int regular;
+ public int peripheries;
+ public int sides;
+ public double orientation;
+ public double distortion;
+ public double skew;
+ public int option;
+ private StarArrayOfPtr vertices;
+
+ // "pointf *vertices",
+
+ public ST_polygon_t() {
+ this(null);
+ }
+
+ public ST_polygon_t(StarStruct parent) {
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("regular")) {
+ return regular != 0;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("peripheries")) {
+ return peripheries;
+ }
+ if (fieldName.equals("sides")) {
+ return sides;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("orientation")) {
+ return orientation;
+ }
+ if (fieldName.equals("skew")) {
+ return skew;
+ }
+ if (fieldName.equals("distortion")) {
+ return distortion;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_polygon_t.this.getPtr(fieldName);
+ }
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("regular")) {
+ this.regular = data;
+ return;
+ }
+ if (fieldName.equals("peripheries")) {
+ this.peripheries = data;
+ return;
+ }
+ if (fieldName.equals("sides")) {
+ this.sides = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("option")) {
+ return option;
+ }
+ if (fieldName.equals("sides")) {
+ return sides;
+ }
+ if (fieldName.equals("peripheries")) {
+ return peripheries;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("orientation")) {
+ this.orientation = data;
+ return;
+ }
+ if (fieldName.equals("distortion")) {
+ this.distortion = data;
+ return;
+ }
+ if (fieldName.equals("skew")) {
+ this.skew = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ private __ptr__ getVertices() {
+ if (vertices == null) {
+ return null;
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("vertices")) {
+ return vertices;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("vertices") && newData == null) {
+ this.vertices = null;
+ return null;
+ }
+ if (fieldName.equals("vertices") && newData instanceof StarArrayOfPtr) {
+ this.vertices = (StarArrayOfPtr) newData;
+ return null;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct polygon_t",
+ // "{",
+ // "int regular",
+ // "int peripheries",
+ // "int sides",
+ // "double orientation",
+ // "double distortion",
+ // "double skew",
+ // "int option",
+ // "pointf *vertices",
+ // "}",
+ // "polygon_t");
+}
+
+// typedef struct polygon_t { /* mutable shape information for a node */
+// int regular; /* true for symmetric shapes */
+// int peripheries; /* number of periphery lines */
+// int sides; /* number of sides */
+// double orientation; /* orientation of shape (+ve degrees) */
+// double distortion; /* distortion factor - as in trapezium */
+// double skew; /* skew factor - as in parallelogram */
+// int option; /* ROUNDED, DIAGONAL corners, etc. */
+// pointf *vertices; /* array of vertex points */
+// } polygon_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_port.java plantuml-1.2018.9/src/h/ST_port.java
--- plantuml-1.2017.15/src/h/ST_port.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_port.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,8 +45,6 @@
*/
package h;
-import javax.swing.text.html.CSS;
-
import smetana.core.CString;
import smetana.core.HardcodedStruct;
import smetana.core.UnsupportedStarStruct;
diff -Nru plantuml-1.2017.15/src/h/ST_Ppoly_t.java plantuml-1.2018.9/src/h/ST_Ppoly_t.java
--- plantuml-1.2017.15/src/h/ST_Ppoly_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_Ppoly_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,258 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__array_of_struct__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.Area;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarArrayOfStruct;
+import smetana.core.amiga.StarStruct;
+
+public class ST_Ppoly_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ // public List ps1;
+ public StarArrayOfPtr ps2;
+ public int pn;
+
+ public ST_Ppoly_t() {
+ this(null);
+ }
+
+ public ST_Ppoly_t(StarStruct parent) {
+ }
+
+ @Override
+ public __struct__ copy() {
+ ST_Ppoly_t result = new ST_Ppoly_t();
+ result.ps2 = this.ps2;
+ result.pn = this.pn;
+ return result;
+ }
+
+ class Adaptor extends UnsupportedArrayOfPtr {
+
+ final private StarArrayOfStruct newData2;
+ final private int pos;
+
+ public Adaptor(StarArrayOfStruct newData2, int pos) {
+ this.newData2 = newData2;
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_ptr__ move(int delta) {
+ return new Adaptor(newData2, pos + delta);
+ }
+
+ @Override
+ public Area getInternal(int idx) {
+ return newData2.getInternalArray().getInternal(pos + idx);
+ }
+
+ @Override
+ public __ptr__ getPtr() {
+ return newData2.plus(pos).getPtr();
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return newData2.plus(pos).getStruct();
+ }
+
+ @Override
+ public int comparePointerInternal(__array_of_ptr__ other) {
+ return super.comparePointerInternal(other);
+ }
+
+ }
+
+ class Adaptor2 extends UnsupportedArrayOfStruct {
+
+ final private int pos;
+
+ public Adaptor2(int pos) {
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_struct__ plus(int delta) {
+ return new Adaptor2(pos + delta);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return ps2.plus(pos).getStruct();
+ }
+
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("ps")) {
+ if (newData instanceof StarArrayOfStruct) {
+ StarArrayOfStruct newData2 = (StarArrayOfStruct) newData;
+ System.err.println("newData2B=" + newData2);
+ this.ps2 = new StarArrayOfPtr(new Adaptor(newData2, 0));
+ return ps2;
+ }
+ this.ps2 = (StarArrayOfPtr) newData;
+ return ps2;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("ps")) {
+ return ps2;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ if (fieldName.equals("ps")) {
+ return new Adaptor2(0);
+ // return ps2.getArrayOfStruct("ps");
+ }
+ return super.getArrayOfStruct(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("ps")) {
+ return ps2.getInternalArray();
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public void memcopyFrom(Area source) {
+ ST_Ppoly_t source2 = (ST_Ppoly_t) source;
+ this.ps2 = source2.ps2;
+ this.pn = source2.pn;
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("pn")) {
+ this.pn = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("pn")) {
+ return pn;
+ }
+ return super.getInt(fieldName);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("pn")) {
+ return pn;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("pn")) {
+ pn = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("ps")) {
+ return ps2;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("ps")) {
+ ps2 = (StarArrayOfPtr) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct Ppoly_t",
+ // "{",
+ // "Ppoint_t *ps",
+ // "int pn",
+ // "}",
+ // "Ppoly_t");
+}
+
+// typedef struct Ppoly_t {
+// Ppoint_t *ps;
+// int pn;
+// } Ppoly_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_rank_t.java plantuml-1.2018.9/src/h/ST_rank_t.java
--- plantuml-1.2017.15/src/h/ST_rank_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_rank_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,375 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_rank_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_rank_t() {
+ this(null);
+ }
+
+ public ST_rank_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private int n;
+
+ // "node_t **v",
+ private STStarArrayOfPointer v;
+ private int an;
+ // "node_t **av",
+ private STStarArrayOfPointer av;
+
+ private double ht1, ht2;
+ private double pht1, pht2;
+ private boolean candidate;
+ private int valid;
+
+ private int cache_nc;
+ private ST_adjmatrix_t flat;
+
+ // "}",
+ // "rank_t");
+
+ @Override
+ public void setStruct(__struct__ value) {
+ ST_rank_t this2 = (ST_rank_t) value;
+ this.n = this2.n;
+ this.v = this2.v;
+ this.an = this2.an;
+ this.av = this2.av;
+ this.ht1 = this2.ht1;
+ this.ht2 = this2.ht2;
+ this.pht1 = this2.pht1;
+ this.pht2 = this2.pht2;
+ this.candidate = this2.candidate;
+ this.valid = this2.valid;
+ this.cache_nc = this2.cache_nc;
+ this.flat = this2.flat;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public int getInt(String fieldName) {
+ return ST_rank_t.this.getInt(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ return ST_rank_t.this.getArrayOfPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_rank_t.this.getPtr(fieldName);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return ST_rank_t.this.getStruct();
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ return ST_rank_t.this.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ ST_rank_t.this.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ return ST_rank_t.this.getBoolean(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ ST_rank_t.this.setInt(fieldName, data);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return ST_rank_t.this.getDouble(fieldName);
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ ST_rank_t.this.setStruct(value);
+ }
+
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("v")) {
+ return new ArrayOfPtr(v, 0);
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+
+ static class ArrayOfPtr extends UnsupportedArrayOfPtr {
+
+ private final int pos;
+ private final STStarArrayOfPointer tab;
+
+ private ArrayOfPtr(STStarArrayOfPointer tab, int pos) {
+ this.pos = pos;
+ this.tab = tab;
+ }
+
+ @Override
+ public __array_of_ptr__ plus(int delta) {
+ return new ArrayOfPtr(tab, pos + delta);
+ }
+
+ @Override
+ public void setPtr(__ptr__ value) {
+ tab.plus(pos).setPtr(value);
+ }
+
+ @Override
+ public __ptr__ getPtr() {
+ return tab.plus(pos).getPtr();
+ }
+
+ @Override
+ public __ptr__ asPtr() {
+ if (pos == 0) {
+ return tab;
+ }
+ return super.asPtr();
+ }
+
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("n")) {
+ return n;
+ }
+ if (fieldName.equals("an")) {
+ return an;
+ }
+ if (fieldName.equals("cache_nc")) {
+ return cache_nc;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("v")) {
+ return v;
+ }
+ if (fieldName.equals("av")) {
+ return av;
+ }
+ if (fieldName.equals("flat")) {
+ return flat;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("candidate")) {
+ this.candidate = data;
+ return;
+ }
+ if (fieldName.equals("valid")) {
+ this.valid = data ? 1 : 0;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("n")) {
+ this.n = data;
+ return;
+ }
+ if (fieldName.equals("an")) {
+ this.an = data;
+ return;
+ }
+ if (fieldName.equals("valid")) {
+ this.valid = data;
+ return;
+ }
+ if (fieldName.equals("cache_nc")) {
+ this.cache_nc = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("valid")) {
+ return valid != 0;
+ }
+ if (fieldName.equals("candidate")) {
+ return candidate;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("pht1")) {
+ return pht1;
+ }
+ if (fieldName.equals("pht2")) {
+ return pht2;
+ }
+ if (fieldName.equals("ht1")) {
+ return ht1;
+ }
+ if (fieldName.equals("ht2")) {
+ return ht2;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("pht1")) {
+ this.pht1 = data;
+ return;
+ }
+ if (fieldName.equals("pht2")) {
+ this.pht2 = data;
+ return;
+ }
+ if (fieldName.equals("ht1")) {
+ this.ht1 = data;
+ return;
+ }
+ if (fieldName.equals("ht2")) {
+ this.ht2 = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("v")) {
+ this.v = (STStarArrayOfPointer) newData;
+ return v;
+ }
+ if (fieldName.equals("av")) {
+ this.av = (STStarArrayOfPointer) newData;
+ return av;
+ }
+ if (fieldName.equals("flat")) {
+ this.flat = (ST_adjmatrix_t) newData;
+ return flat;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_rank_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct rank_t {
+// int n; /* number of nodes in this rank */
+// node_t **v; /* ordered list of nodes in rank */
+// int an; /* globally allocated number of nodes */
+// node_t **av; /* allocated list of nodes in rank */
+// double ht1, ht2; /* height below/above centerline */
+// double pht1, pht2; /* as above, but only primitive nodes */
+// boolean candidate; /* for transpose () */
+// boolean valid;
+// int cache_nc; /* caches number of crossings */
+// adjmatrix_t *flat;
+// } rank_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_refstr_t.java plantuml-1.2018.9/src/h/ST_refstr_t.java
--- plantuml-1.2017.15/src/h/ST_refstr_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_refstr_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,190 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.OFFSET;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_refstr_t extends UnsupportedStructAndPtr /* implements WithParent */{
+
+ public final ST_dtlink_s link = new ST_dtlink_s(this);
+ public int refcnt;
+ public CString s;
+
+ private final StarStruct parent;
+
+ public ST_refstr_t() {
+ this(null);
+ }
+
+ public ST_refstr_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("refcnt")) {
+ this.refcnt = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("refcnt")) {
+ return refcnt;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("s")) {
+ return s;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.refstr_t::s")) {
+ return s;
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ @Override
+ public Object addVirtualBytes(int virtualBytes) {
+ if (virtualBytes == 0) {
+ return this;
+ }
+ final OFFSET offset = OFFSET.fromInt(virtualBytes);
+ if (offset.toString().equals("h.refstr_t::s")) {
+ return s;
+ }
+ System.err.println("virtualBytes=" + virtualBytes);
+ System.err.println("offset=" + offset);
+ return super.addVirtualBytes(virtualBytes);
+ }
+
+ @Override
+ public __ptr__ castTo(Class dest) {
+ // if (dest == refstr_t.class) {
+ // return this;
+ // }
+ if (dest == _dtlink_s.class) {
+ return link;
+ }
+ return super.castTo(dest);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("s")) {
+ this.s = (CString) newData;
+ this.s.setMyFather(this);
+ return s;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("s")) {
+ return s;
+ }
+ return super.getCString(fieldName);
+ }
+
+ public CString to_s(ST_dtlink_s from) {
+ if (from == link) {
+ return s;
+ }
+ throw new IllegalArgumentException();
+ }
+
+ @Override
+ public Class getRealClass() {
+ return refstr_t.class;
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct refstr_t",
+ // "{",
+ // "Dtlink_t link",
+ // "unsigned long refcnt",
+ // "char *s",
+ // "char store[1]",
+ // "}",
+ // "refstr_t");
+}
+
+// typedef struct refstr_t {
+// Dtlink_t link;
+// unsigned long refcnt;
+// char *s;
+// char store[1]; /* this is actually a dynamic array */
+// } refstr_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_RTree.java plantuml-1.2018.9/src/h/ST_RTree.java
--- plantuml-1.2017.15/src/h/ST_RTree.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_RTree.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,165 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_RTree.Amp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_RTree extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_RTree() {
+ this(null);
+ }
+
+ public ST_RTree(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "struct RTree",
+ // "{",
+ // "Node_t *root",
+ // "SplitQ_t split",
+ // "int MinFill",
+ // "long ElapsedTime",
+ // "float UserTime, SystemTime",
+ // "int Deleting",
+ // "int StatFlag",
+ // "int InsertCount",
+ // "int DeleteCount",
+ // "int ReInsertCount",
+ // "int InSplitCount",
+ // "int DeSplitCount",
+ // "int ElimCount",
+ // "int EvalCount",
+ // "int InTouchCount",
+ // "int DeTouchCount",
+ // "int SeTouchCount",
+ // "int CallCount",
+ // "float SplitMeritSum",
+ // "int RectCount",
+ private int NodeCount;
+ // "int LeafCount, NonLeafCount",
+ // "int EntryCount",
+ // "int SearchCount",
+ // "int HitCount",
+ // "}");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("NodeCount")) {
+ return NodeCount;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("NodeCount")) {
+ this.NodeCount = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+}
+
+// struct RTree {
+// Node_t *root;
+//
+// SplitQ_t split;
+//
+// /* balance criterion for node splitting */
+// int MinFill;
+//
+// /* times */
+// long ElapsedTime;
+// float UserTime, SystemTime;
+//
+// int Deleting;
+//
+// /* variables for statistics */
+// int StatFlag; /* tells if we are counting or not */
+// /* counters affected only when StatFlag set */
+// int InsertCount;
+// int DeleteCount;
+// int ReInsertCount;
+// int InSplitCount;
+// int DeSplitCount;
+// int ElimCount;
+// int EvalCount;
+// int InTouchCount;
+// int DeTouchCount;
+// int SeTouchCount;
+// int CallCount;
+// float SplitMeritSum;
+//
+// /* counters used even when StatFlag not set */
+// int RectCount;
+// int NodeCount;
+// int LeafCount, NonLeafCount;
+// int EntryCount;
+// int SearchCount;
+// int HitCount;
+//
+// };
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_shape_desc.java plantuml-1.2018.9/src/h/ST_shape_desc.java
--- plantuml-1.2017.15/src/h/ST_shape_desc.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_shape_desc.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,128 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_shape_desc extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+ public ST_shape_desc(StarStruct parent) {
+ }
+
+ public ST_shape_desc() {
+ this(null);
+ }
+
+ public CString name;
+ public ST_shape_functions.Amp fns;
+ public ST_polygon_t.Amp polygon;
+ public boolean usershape;
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("name")) {
+ this.name = (CString) newData;
+ return newData;
+ }
+ if (fieldName.equals("fns")) {
+ this.fns = (ST_shape_functions.Amp) newData;
+ return newData;
+ }
+ if (fieldName.equals("polygon")) {
+ this.polygon = (ST_polygon_t.Amp) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("name")) {
+ return name;
+ }
+ return super.getCString(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("fns")) {
+ return fns;
+ }
+ if (fieldName.equals("polygon")) {
+ return polygon;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("usershape")) {
+ return usershape;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct shape_desc",
+ // "{",
+ // "char *name",
+ // "shape_functions *fns",
+ // "polygon_t *polygon",
+ // "boolean usershape",
+ // "}",
+ // "shape_desc");
+}
+
+// typedef struct shape_desc { /* read-only shape descriptor */
+// char *name; /* as read from graph file */
+// shape_functions *fns;
+// polygon_t *polygon; /* base polygon info */
+// boolean usershape;
+// } shape_desc;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_shape_functions.java plantuml-1.2018.9/src/h/ST_shape_functions.java
--- plantuml-1.2017.15/src/h/ST_shape_functions.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_shape_functions.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,160 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_shape_functions extends UnsupportedStructAndPtr {
+
+ public CFunction initfn;
+ public CFunction freefn;
+ public CFunction portfn;
+ public CFunction insidefn;
+ public CFunction pboxfn;
+ public CFunction codefn;
+
+ public ST_shape_functions() {
+ this(null);
+ }
+
+ public ST_shape_functions(StarStruct parent) {
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_shape_functions.this.getPtr(fieldName);
+ }
+
+ @Override
+ public Object call(String fieldName, Object... args) {
+ return ((CFunction) getPtr(fieldName)).exe(args);
+ }
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("initfn")) {
+ return initfn;
+ }
+ if (fieldName.equals("freefn")) {
+ return freefn;
+ }
+ if (fieldName.equals("portfn")) {
+ return portfn;
+ }
+ if (fieldName.equals("insidefn")) {
+ return insidefn;
+ }
+ if (fieldName.equals("pboxfn")) {
+ return pboxfn;
+ }
+ if (fieldName.equals("codefn")) {
+ return codefn;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("initfn")) {
+ this.initfn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("freefn")) {
+ this.freefn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("portfn")) {
+ this.portfn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("insidefn")) {
+ this.insidefn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("pboxfn")) {
+ this.pboxfn = (CFunction) newData;
+ return newData;
+ }
+ if (fieldName.equals("codefn")) {
+ this.codefn = (CFunction) newData;
+ return newData;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct shape_functions",
+ // "{",
+ // "void (*initfn) (node_t *)",
+ // "void (*freefn) (node_t *)",
+ // "port(*portfn) (node_t *, char *, char *)",
+ // "boolean(*insidefn) (inside_t * inside_context, pointf)",
+ // "int (*pboxfn)(node_t* n, port* p, int side, boxf rv[], int *kptr)",
+ // "void (*codefn) (GVJ_t * job, node_t * n)",
+ // "}",
+ // "shape_functions");
+}
+
+// typedef struct shape_functions { /* read-only shape functions */
+// void (*initfn) (node_t *); /* initializes shape from node u.shape_info structure */
+// void (*freefn) (node_t *); /* frees shape from node u.shape_info structure */
+// port(*portfn) (node_t *, char *, char *); /* finds aiming point and slope of port */
+// boolean(*insidefn) (inside_t * inside_context, pointf); /* clips incident gvc->e spline on shape of gvc->n */
+// int (*pboxfn)(node_t* n, port* p, int side, boxf rv[], int *kptr); /* finds box path to reach port */
+// void (*codefn) (GVJ_t * job, node_t * n); /* emits graphics code for node */
+// } shape_functions;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_splineInfo.java plantuml-1.2018.9/src/h/ST_splineInfo.java
--- plantuml-1.2017.15/src/h/ST_splineInfo.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_splineInfo.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,138 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CFunction;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_splineInfo extends UnsupportedStructAndPtr {
+
+ public CFunction swapEnds;
+ public CFunction splineMerge;
+ public boolean ignoreSwap;
+ public boolean isOrtho;
+
+ public ST_splineInfo() {
+ this(null);
+ }
+
+ public ST_splineInfo(StarStruct parent) {
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ return ST_splineInfo.this.getBoolean(fieldName);
+ }
+
+ @Override
+ public Object call(String fieldName, Object... args) {
+ return ST_splineInfo.this.call(fieldName, args);
+ }
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("swapEnds")) {
+ this.swapEnds = (CFunction) newData;
+ return swapEnds;
+ }
+ if (fieldName.equals("splineMerge")) {
+ this.splineMerge = (CFunction) newData;
+ return splineMerge;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public Object call(String fieldName, Object... args) {
+ if (fieldName.equals("swapEnds")) {
+ return swapEnds.exe(args);
+ }
+ if (fieldName.equals("splineMerge")) {
+ return splineMerge.exe(args);
+ }
+ return super.call(fieldName, args);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("ignoreSwap")) {
+ return ignoreSwap;
+ }
+ if (fieldName.equals("isOrtho")) {
+ return isOrtho;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ // public interface ST_splineInfo extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct",
+ // "{",
+ // "boolean(*swapEnds) (edge_t * e)",
+ // "boolean(*splineMerge) (node_t * n)",
+ // "boolean ignoreSwap",
+ // "boolean isOrtho",
+ // "}",
+ // "splineInfo");
+}
+
+// typedef struct {
+// boolean(*swapEnds) (edge_t * e); /* Should head and tail be swapped? */
+// boolean(*splineMerge) (node_t * n); /* Is n a node in the middle of an edge? */
+// boolean ignoreSwap; /* Test for swapped edges if false */
+// boolean isOrtho; /* Orthogonal routing used */
+// } splineInfo;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_spline_info_t.java plantuml-1.2018.9/src/h/ST_spline_info_t.java
--- plantuml-1.2017.15/src/h/ST_spline_info_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_spline_info_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,153 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_spline_info_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_spline_info_t() {
+ this(null);
+ }
+
+ public ST_spline_info_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct",
+ // "{",
+ private int LeftBound, RightBound, Splinesep, Multisep;
+ private StarArrayOfPtr Rank_box;
+
+ // "}",
+ // "spline_info_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+ @Override
+ public int getInt(String fieldName) {
+ return ST_spline_info_t.this.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return ST_spline_info_t.this.getPtr(fieldName);
+ }
+
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("Rank_box")) {
+ this.Rank_box = (StarArrayOfPtr) newData;
+ return this.Rank_box;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("Rank_box")) {
+ return this.Rank_box;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("LeftBound")) {
+ return this.LeftBound;
+ }
+ if (fieldName.equals("RightBound")) {
+ return this.RightBound;
+ }
+ if (fieldName.equals("Splinesep")) {
+ return this.Splinesep;
+ }
+ if (fieldName.equals("Multisep")) {
+ return this.Multisep;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("LeftBound")) {
+ this.LeftBound = data;
+ return;
+ }
+ if (fieldName.equals("RightBound")) {
+ this.RightBound = data;
+ return;
+ }
+ if (fieldName.equals("Splinesep")) {
+ this.Splinesep = data;
+ return;
+ }
+ if (fieldName.equals("Multisep")) {
+ this.Multisep = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+}
+
+// typedef struct {
+// int LeftBound, RightBound, Splinesep, Multisep;
+// boxf* Rank_box;
+// } spline_info_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_splines.java plantuml-1.2018.9/src/h/ST_splines.java
--- plantuml-1.2017.15/src/h/ST_splines.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_splines.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,133 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_splines extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_splines() {
+ this(null);
+ }
+
+ public ST_splines(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct splines",
+ // "{",
+// bezier *list;
+ private StarArrayOfPtr list;
+ private int size;
+
+ // "boxf bb",
+ // "}",
+ // "splines");
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("size")) {
+ this.size = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("size")) {
+ return this.size;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("list")) {
+ this.list = (StarArrayOfPtr) newData;
+ return list;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("list")) {
+ return this.list;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+ if (fieldName.equals("list")) {
+ return this.list.getInternalArray();
+ }
+ return super.getArrayOfPtr(fieldName);
+ }
+}
+
+// typedef struct splines {
+// bezier *list;
+// int size;
+// boxf bb;
+// } splines;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/STStarArrayOfPointer.java plantuml-1.2018.9/src/h/STStarArrayOfPointer.java
--- plantuml-1.2017.15/src/h/STStarArrayOfPointer.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/STStarArrayOfPointer.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,117 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedC;
+import smetana.core.__array_of_integer__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.Area;
+
+public class STStarArrayOfPointer extends UnsupportedC {
+
+ private final int pos;
+ private final List<__ptr__> data;
+
+ public void realloc(int nb) {
+ while (data.size() < nb) {
+ data.add(null);
+ }
+ }
+
+ public static STStarArrayOfPointer malloc(int size) {
+ List<__ptr__> data = new ArrayList<__ptr__>();
+ for (int i = 0; i < size; i++) {
+ data.add(null);
+ }
+ return new STStarArrayOfPointer(0, data);
+ }
+
+ private STStarArrayOfPointer(int pos, List<__ptr__> data) {
+ this.pos = pos;
+ this.data = data;
+ }
+
+ @Override
+ public int comparePointer(__ptr__ other) {
+ final STStarArrayOfPointer this2 = (STStarArrayOfPointer) other;
+ if (this.data != this2.data) {
+ throw new IllegalArgumentException();
+ }
+ return this.pos - this2.pos;
+ }
+
+ @Override
+ public __ptr__ plus(int pointerMove) {
+ return new STStarArrayOfPointer(pos + pointerMove, data);
+ }
+
+ @Override
+ public void setPtr(__ptr__ value) {
+ data.set(pos, value);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ return data.get(pos).getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr() {
+ return data.get(pos);
+ }
+
+ public void swap(int i, int j) {
+ __ptr__ e1 = data.get(i);
+ __ptr__ e2 = data.get(j);
+ data.set(i, e2);
+ data.set(j, e1);
+
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/h/ST_tedge_t.java plantuml-1.2018.9/src/h/ST_tedge_t.java
--- plantuml-1.2017.15/src/h/ST_tedge_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_tedge_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,206 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_Agclos_s.ArrayOfThreePtrDict_t;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
+import smetana.core.amiga.Area;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_tedge_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_tedge_t() {
+ this(null);
+ }
+
+ public ST_tedge_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct tedge_t",
+ // "{",
+ private __ptr__ pnl0p;
+ private __ptr__ pnl1p;
+ // private ST_pointnlink_t.Amp pnl0p;
+ // private ST_pointnlink_t.Amp pnl1p;
+
+ private StarArrayOfPtr ltp;
+ private StarArrayOfPtr rtp;
+
+ // "struct triangle_t *ltp",
+ // "struct triangle_t *rtp",
+ // "}",
+ // "tedge_t");
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("pnl0p")) {
+ return this.pnl0p;
+ }
+ if (fieldName.equals("pnl1p")) {
+ return this.pnl1p;
+ }
+ if (fieldName.equals("ltp")) {
+ return this.ltp;
+ }
+ if (fieldName.equals("rtp")) {
+ return this.rtp;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ // class Singleton extends UnsupportedArrayOfPtr implements __array_of_ptr__ {
+ // private final ST_pointnlink_t.Amp data;
+ //
+ // Singleton(ST_pointnlink_t.Amp data) {
+ // this.data = data;
+ // }
+ //
+ // @Override
+ // public __ptr__ getPtr() {
+ // return data;
+ // }
+ //
+ // @Override
+ // public Area getInternal(int idx) {
+ // if (idx == 0) {
+ // return data;
+ // }
+ // System.err.println("idx=" + idx);
+ // return super.getInternal(idx);
+ // }
+ //
+ // @Override
+ // public String toString() {
+ // return super.toString() + " " + data + " " + data.getStruct();
+ // }
+ //
+ // @Override
+ // public int comparePointerInternal(__array_of_ptr__ other) {
+ // System.err.println("other=" + other);
+ // Singleton other2 = (Singleton) other;
+ // System.err.println("other2.data=" + other2.data);
+ // System.err.println("pnl0p=" + pnl0p);
+ // System.err.println("pnl0p=" + foo(pnl0p));
+ // System.err.println("pnl1p=" + pnl1p);
+ // System.err.println("pnl0p=" + foo(pnl1p));
+ // // TODO Auto-generated method stub
+ // return super.comparePointerInternal(other);
+ // }
+ //
+ // }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ // if (fieldName.equals("pnl0p")) {
+ // this.pnl0p = (ST_pointnlink_t.Amp) newData;
+ // return this.pnl0p;
+ // }
+ if (fieldName.equals("pnl0p")) {
+ if (newData instanceof ST_pointnlink_t.Amp) {
+ this.pnl0p = (ST_pointnlink_t.Amp) newData;
+ // newData = new StarArrayOfPtr(new Singleton((h.ST_pointnlink_t.Amp) newData));
+ } else {
+ this.pnl0p = (StarArrayOfPtr) newData;
+ }
+ return this.pnl0p;
+ }
+ if (fieldName.equals("pnl1p")) {
+ if (newData instanceof ST_pointnlink_t.Amp) {
+ // newData = new StarArrayOfPtr(new Singleton((h.ST_pointnlink_t.Amp) newData));
+ this.pnl1p = (ST_pointnlink_t.Amp) newData;
+ } else {
+ this.pnl1p = (StarArrayOfPtr) newData;
+ }
+ return this.pnl1p;
+ }
+ // if (fieldName.equals("pnl1p")) {
+ // this.pnl1p = (ST_pointnlink_t.Amp) newData;
+ // return this.pnl1p;
+ // }
+ if (fieldName.equals("ltp")) {
+ this.ltp = (StarArrayOfPtr) newData;
+ return this.ltp;
+ }
+ if (fieldName.equals("rtp")) {
+ this.rtp = (StarArrayOfPtr) newData;
+ return this.rtp;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ public String foo(StarArrayOfPtr data) {
+ __array_of_ptr__ array = data.getInternalArray();
+ return array.toString();
+ }
+}
+
+// typedef struct tedge_t {
+// pointnlink_t *pnl0p;
+// pointnlink_t *pnl1p;
+// struct triangle_t *ltp;
+// struct triangle_t *rtp;
+// } tedge_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_textfont_t.java plantuml-1.2018.9/src/h/ST_textfont_t.java
--- plantuml-1.2017.15/src/h/ST_textfont_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_textfont_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,104 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_textfont_t extends UnsupportedStructAndPtr {
+
+ public CString name;
+ public double size;
+
+ public ST_textfont_t() {
+ this(null);
+ }
+
+ public ST_textfont_t(StarStruct parent) {
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("name")) {
+ this.name = (CString) newData;
+ return name;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("size")) {
+ this.size = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ // public interface ST_textfont_t extends __ptr__ {
+ // public static List DEFINITION = Arrays.asList(
+ // "typedef struct",
+ // "{",
+ // "char* name",
+ // "char* color",
+ // "PostscriptAlias *postscript_alias",
+ // "double size",
+ // "unsigned int flags:7",
+ // "unsigned int cnt:(sizeof(unsigned int) * 8 - 7)",
+ // "}",
+ // "textfont_t");
+}
+
+// typedef struct {
+// char* name;
+// char* color;
+// PostscriptAlias *postscript_alias;
+// double size;
+// unsigned int flags:7; /* HTML_UL, HTML_IF, HTML_BF, etc. */
+// unsigned int cnt:(sizeof(unsigned int) * 8 - 7); /* reference count */
+// } textfont_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_textlabel_t.java plantuml-1.2018.9/src/h/ST_textlabel_t.java
--- plantuml-1.2017.15/src/h/ST_textlabel_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_textlabel_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,275 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_textlabel_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_textlabel_t() {
+ this(null);
+ }
+
+ public ST_textlabel_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private CString text, fontname, fontcolor;
+ private int charset;
+ private double fontsize;
+
+ private final ST_pointf dimen = new ST_pointf(this);
+ private final ST_pointf space = new ST_pointf(this);
+ private final ST_pointf pos = new ST_pointf(this);
+
+ // "union",
+ // "{",
+ // "struct",
+ // "{",
+ // private ST_textspan_t span;
+ private __ptr__ span;
+ private int nspans;
+
+ // "}",
+ // "txt",
+ // "htmllabel_t *html",
+ private final __ptr__ html = null;
+ // "}",
+ // "u",
+ private int valign;
+
+ private int set;
+
+ // "boolean html",
+ // "}",
+ // "textlabel_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("dimen")) {
+ return dimen;
+ }
+ if (fieldName.equals("space")) {
+ return space;
+ }
+ if (fieldName.equals("pos")) {
+ return pos;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("space")) {
+ space.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("pos")) {
+ pos.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("text")) {
+ this.text = (CString) newData;
+ return text;
+ }
+ if (fieldName.equals("fontname")) {
+ this.fontname = (CString) newData;
+ return fontname;
+ }
+ if (fieldName.equals("fontcolor")) {
+ this.fontcolor = (CString) newData;
+ return fontcolor;
+ }
+ if (fieldName.equals("u.txt.span")) {
+ this.span = newData;
+ return span;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public CString getCString(String fieldName) {
+ if (fieldName.equals("text")) {
+ return text;
+ }
+ return super.getCString(fieldName);
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("text")) {
+ return text;
+ }
+ if (fieldName.equals("u.txt.span")) {
+ return span;
+ }
+ if (fieldName.equals("fontname")) {
+ return fontname;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("html")) {
+ return html != null;
+ }
+ if (fieldName.equals("set")) {
+ return set != 0;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("fontsize")) {
+ this.fontsize = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("fontsize")) {
+ return this.fontsize;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("charset")) {
+ this.charset = data;
+ return;
+ }
+ if (fieldName.equals("valign")) {
+ this.valign = data;
+ return;
+ }
+ if (fieldName.equals("u.txt.nspans")) {
+ this.nspans = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public void setBoolean(String fieldName, boolean data) {
+ if (fieldName.equals("set")) {
+ this.set = data ? 1 : 0;
+ return;
+ }
+ super.setBoolean(fieldName, data);
+ }
+
+ @Override
+ public boolean isSameThan(StarStruct other) {
+ ST_textlabel_t other2 = (ST_textlabel_t) other;
+ return this == other2;
+ }
+
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("charset")) {
+ return this.charset;
+ }
+ if (fieldName.equals("valign")) {
+ return this.valign;
+ }
+ if (fieldName.equals("u.txt.nspans")) {
+ return this.nspans;
+ }
+ if (fieldName.equals("set")) {
+ return this.set;
+ }
+ return super.getInt(fieldName);
+ }
+
+}
+
+// typedef struct textlabel_t {
+// char *text, *fontname, *fontcolor;
+// int charset;
+// double fontsize;
+// pointf dimen; /* the diagonal size of the label (estimated by layout) */
+// pointf space; /* the diagonal size of the space for the label */
+// /* the rendered label is aligned in this box */
+// /* space does not include pad or margin */
+// pointf pos; /* the center of the space for the label */
+// union {
+// struct {
+// textspan_t *span;
+// short nspans;
+// } txt;
+// htmllabel_t *html;
+// } u;
+// char valign; /* 't' 'c' 'b' */
+// boolean set; /* true if position is set */
+// boolean html; /* true if html label */
+// } textlabel_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_textspan_t.java plantuml-1.2018.9/src/h/ST_textspan_t.java
--- plantuml-1.2017.15/src/h/ST_textspan_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_textspan_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,153 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.CString;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_textspan_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_textspan_t() {
+ this(null);
+ }
+
+ public ST_textspan_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ private CString str;
+
+ // "textfont_t *font",
+ // "void *layout",
+ // "void (*free_layout) (void *layout)",
+ // "double yoffset_layout, yoffset_centerline",
+ private final ST_pointf size = new ST_pointf(this);
+ private int just;
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("size")) {
+ return size;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("just")) {
+ this.just = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("just")) {
+ return this.just;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("str")) {
+ this.str = (CString) newData;
+ return str;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_textspan_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct {
+// char *str; /* stored in utf-8 */
+// textfont_t *font;
+// void *layout;
+// void (*free_layout) (void *layout); /* FIXME - this is ugly */
+// double yoffset_layout, yoffset_centerline;
+// pointf size;
+// char just; /* 'l' 'n' 'r' */ /* FIXME */
+// } textspan_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_tna_t.java plantuml-1.2018.9/src/h/ST_tna_t.java
--- plantuml-1.2017.15/src/h/ST_tna_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_tna_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,180 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_tna_t.Amp;
+import h.ST_triangle_t.ArrayOfThree;
+
+import java.util.Arrays;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_struct__;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_tna_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_tna_t() {
+ this(null);
+ }
+
+ public ST_tna_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct tna_t",
+ // "{",
+ // "Ppoint_t a[2]",
+ // "}",
+ // "tna_t");
+ private double t;
+ private final ST_pointf a[] = new ST_pointf[] { new ST_pointf(), new ST_pointf() };
+
+ class ArrayOfTwo extends UnsupportedArrayOfStruct {
+
+ final private int pos;
+
+ public ArrayOfTwo(int pos) {
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_struct__ plus(int delta) {
+ return new ArrayOfTwo(pos + delta);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return a[pos];
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ a[pos].copyDataFrom(value);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return getStruct().getDouble(fieldName);
+ }
+
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ if (fieldName.equals("a")) {
+ return new ArrayOfTwo(0);
+ }
+ return super.getArrayOfStruct(fieldName);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ if (fieldName.equals("t")) {
+ return this.t;
+ }
+ return super.getDouble(fieldName);
+ }
+
+ @Override
+ public void setDouble(String fieldName, double data) {
+ if (fieldName.equals("t")) {
+ this.t = data;
+ return;
+ }
+ super.setDouble(fieldName, data);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return this;
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_tna_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct tna_t {
+// double t;
+// Ppoint_t a[2];
+// } tna_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_triangle_t.java plantuml-1.2018.9/src/h/ST_triangle_t.java
--- plantuml-1.2017.15/src/h/ST_triangle_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_triangle_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,179 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import h.ST_pathend_t.ArrayOfTwenty;
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_struct__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_triangle_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_triangle_t() {
+ this(null);
+ }
+
+ public ST_triangle_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct triangle_t",
+ // "{",
+ private int mark;
+
+ private final ST_tedge_t e[] = new ST_tedge_t[] { new ST_tedge_t(), new ST_tedge_t(), new ST_tedge_t() };
+
+ class ArrayOfThree extends UnsupportedArrayOfStruct {
+
+ final private int pos;
+
+ public ArrayOfThree(int pos) {
+ this.pos = pos;
+ }
+
+ @Override
+ public __array_of_struct__ plus(int delta) {
+ return new ArrayOfThree(pos + delta);
+ }
+
+ @Override
+ public __struct__ getStruct() {
+ return e[pos];
+ }
+
+ @Override
+ public void setStruct(__struct__ value) {
+ e[pos].copyDataFrom(value);
+ }
+
+ @Override
+ public double getDouble(String fieldName) {
+ return getStruct().getDouble(fieldName);
+ }
+
+ }
+
+ // "struct tedge_t e[3]",
+ // "}",
+ // "triangle_t");
+
+ @Override
+ public int getInt(String fieldName) {
+ if (fieldName.equals("mark")) {
+ return this.mark;
+ }
+ return super.getInt(fieldName);
+ }
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("mark")) {
+ this.mark = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public boolean getBoolean(String fieldName) {
+ if (fieldName.equals("mark")) {
+ return this.mark != 0;
+ }
+ return super.getBoolean(fieldName);
+ }
+
+ @Override
+ public __array_of_struct__ getArrayOfStruct(String fieldName) {
+ if (fieldName.equals("e")) {
+ return new ArrayOfThree(0);
+ }
+ return super.getArrayOfStruct(fieldName);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_triangle_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct triangle_t {
+// int mark;
+// struct tedge_t e[3];
+// } triangle_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_XLabels_t.java plantuml-1.2018.9/src/h/ST_XLabels_t.java
--- plantuml-1.2017.15/src/h/ST_XLabels_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_XLabels_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,116 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_XLabels_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_XLabels_t() {
+ this(null);
+ }
+
+ public ST_XLabels_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ // "typedef struct XLabels_s",
+ // "{",
+ // "object_t *objs",
+ // "int n_objs",
+ // "xlabel_t *lbls",
+ // "int n_lbls",
+ // "label_params_t *params",
+ private ST_dt_s hdx;
+
+ // "RTree_t *spdx",
+ // "}",
+ // "XLabels_t");
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ @Override
+ public __ptr__ getPtr(String fieldName) {
+ if (fieldName.equals("hdx")) {
+ return this.hdx;
+ }
+ return super.getPtr(fieldName);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("hdx")) {
+ this.hdx = (ST_dt_s) newData;
+ return this.hdx;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+}
+
+// typedef struct XLabels_s {
+// object_t *objs;
+// int n_objs;
+// xlabel_t *lbls;
+// int n_lbls;
+// label_params_t *params;
+//
+// Dt_t *hdx; // splay tree keyed with hilbert spatial codes
+// RTree_t *spdx; // rtree
+//
+// } XLabels_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/ST_xlabel_t.java plantuml-1.2018.9/src/h/ST_xlabel_t.java
--- plantuml-1.2017.15/src/h/ST_xlabel_t.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/ST_xlabel_t.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,161 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedSize_t;
+import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__ptr__;
+import smetana.core.__struct__;
+import smetana.core.size_t;
+import smetana.core.amiga.StarArrayOfPtr;
+import smetana.core.amiga.StarStruct;
+
+public class ST_xlabel_t extends UnsupportedStructAndPtr {
+
+ private final StarStruct parent;
+
+ public ST_xlabel_t() {
+ this(null);
+ }
+
+ public ST_xlabel_t(StarStruct parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public StarStruct amp() {
+ return new Amp();
+ }
+
+ public class Amp extends UnsupportedStarStruct {
+
+ }
+
+ // "typedef struct",
+ // "{",
+ final private ST_pointf sz = new ST_pointf(this);
+ final private ST_pointf pos = new ST_pointf(this);
+
+ // "void *lbl",
+ private ST_textlabel_t lbl;
+ private int set;
+
+ // "unsigned char set",
+ // "}",
+ // "xlabel_t");
+
+ @Override
+ public void setInt(String fieldName, int data) {
+ if (fieldName.equals("set")) {
+ this.set = data;
+ return;
+ }
+ super.setInt(fieldName, data);
+ }
+
+ @Override
+ public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+ if (fieldName.equals("lbl")) {
+ this.lbl = (ST_textlabel_t) newData;
+ return this.lbl;
+ }
+ return super.setPtr(fieldName, newData);
+ }
+
+ @Override
+ public __struct__ getStruct(String fieldName) {
+ if (fieldName.equals("sz")) {
+ return this.sz;
+ }
+ if (fieldName.equals("pos")) {
+ return this.pos;
+ }
+ return super.getStruct(fieldName);
+ }
+
+ @Override
+ public void setStruct(String fieldName, __struct__ newData) {
+ if (fieldName.equals("sz")) {
+ this.sz.copyDataFrom(newData);
+ return;
+ }
+ if (fieldName.equals("pos")) {
+ this.pos.copyDataFrom(newData);
+ return;
+ }
+ super.setStruct(fieldName, newData);
+ }
+
+ public static size_t sizeof(final int nb) {
+ return new UnsupportedSize_t(nb) {
+ @Override
+ public Object malloc() {
+ return new StarArrayOfPtr(new STArray(nb, 0, ST_xlabel_t.class));
+ }
+
+ @Override
+ public int getInternalNb() {
+ return nb;
+ }
+
+ @Override
+ public Object realloc(Object old) {
+ StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+ old2.realloc(nb);
+ return old2;
+ }
+ };
+ }
+
+}
+
+// typedef struct {
+// pointf sz; /* Size of label (input) */
+// pointf pos; /* Position of lower-left corner of label (output) */
+// void *lbl; /* Pointer to label in the graph */
+// unsigned char set; /* True if the position has been set (input/output) */
+// } xlabel_t;
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/h/WithParent.java plantuml-1.2018.9/src/h/WithParent.java
--- plantuml-1.2017.15/src/h/WithParent.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/h/WithParent.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,54 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ *
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ *
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.amiga.StarStruct;
+
+public interface WithParent {
+
+ public StarStruct getParent();
+
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/AbstractPSystem.java plantuml-1.2018.9/src/net/sourceforge/plantuml/AbstractPSystem.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/AbstractPSystem.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/AbstractPSystem.java 2018-07-27 21:59:19.000000000 +0000
@@ -56,6 +56,7 @@
public abstract class AbstractPSystem implements Diagram {
private UmlSource source;
+ private Scale scale;
private String getVersion() {
final StringBuilder toAppend = new StringBuilder();
@@ -98,9 +99,9 @@
public DisplayPositionned getTitle() {
if (source == null) {
- return new DisplayPositionned(Display.empty(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
+ return DisplayPositionned.single(Display.empty(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
}
- return new DisplayPositionned(source.getTitle(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
+ return DisplayPositionned.single(source.getTitle(), HorizontalAlignment.CENTER, VerticalAlignment.TOP);
}
public String getWarningOrError() {
@@ -140,6 +141,14 @@
}
}
+ final public void setScale(Scale scale) {
+ this.scale = scale;
+ }
+
+ final public Scale getScale() {
+ return scale;
+ }
+
protected abstract ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption,
long seed) throws IOException;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java plantuml-1.2018.9/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,7 +45,7 @@
import net.sourceforge.plantuml.command.regex.MyPattern;
import net.sourceforge.plantuml.command.regex.Pattern2;
-import com.ctreber.acearth.plugins.markers.Marker;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
public class PSystemXearthFactory extends PSystemBasicFactory {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/acearth/PSystemXearth.java plantuml-1.2018.9/src/net/sourceforge/plantuml/acearth/PSystemXearth.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/acearth/PSystemXearth.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/acearth/PSystemXearth.java 2018-07-27 21:59:19.000000000 +0000
@@ -53,9 +53,9 @@
import net.sourceforge.plantuml.core.DiagramDescription;
import net.sourceforge.plantuml.core.ImageData;
-import com.ctreber.acearth.ACearth;
-import com.ctreber.acearth.ConfigurationACearth;
-import com.ctreber.acearth.plugins.markers.Marker;
+import ext.plantuml.com.ctreber.acearth.ACearth;
+import ext.plantuml.com.ctreber.acearth.ConfigurationACearth;
+import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker;
public class PSystemXearth extends AbstractPSystem {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java 2018-07-27 21:59:19.000000000 +0000
@@ -48,6 +48,7 @@
import net.sourceforge.plantuml.cucadiagram.IEntity;
import net.sourceforge.plantuml.cucadiagram.ILeaf;
import net.sourceforge.plantuml.cucadiagram.LeafType;
+import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.graphic.USymbol;
import net.sourceforge.plantuml.utils.UniqueSequence;
@@ -100,7 +101,7 @@
}
private void updateLasts(final IEntity result) {
- if (result.getLeafType() == LeafType.NOTE) {
+ if (result == null || result.getLeafType() == LeafType.NOTE) {
return;
}
this.lastEntityConsulted = result;
@@ -154,8 +155,9 @@
public IEntity createInnerActivity() {
// Log.println("createInnerActivity A");
final Code code = Code.of("##" + UniqueSequence.getValue());
- final IEntity g = getOrCreateGroup(code, Display.getWithNewlines(code), GroupType.INNER_ACTIVITY,
- getCurrentGroup());
+ gotoGroup2(code, Display.getWithNewlines(code), GroupType.INNER_ACTIVITY, getCurrentGroup(),
+ NamespaceStrategy.SINGLE);
+ final IEntity g = getCurrentGroup();
// g.setRankdir(Rankdir.LEFT_TO_RIGHT);
lastEntityConsulted = null;
lastEntityBrancheConsulted = null;
@@ -175,7 +177,8 @@
if (getCurrentGroup().getGroupType() != GroupType.INNER_ACTIVITY) {
throw new IllegalStateException("type=" + getCurrentGroup().getGroupType());
}
- getOrCreateGroup(code, Display.getWithNewlines("code"), GroupType.CONCURRENT_ACTIVITY, getCurrentGroup());
+ gotoGroup2(code, Display.getWithNewlines("code"), GroupType.CONCURRENT_ACTIVITY, getCurrentGroup(),
+ NamespaceStrategy.SINGLE);
lastEntityConsulted = null;
lastEntityBrancheConsulted = null;
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java 2018-07-27 21:59:19.000000000 +0000
@@ -58,7 +58,9 @@
import net.sourceforge.plantuml.cucadiagram.Link;
import net.sourceforge.plantuml.cucadiagram.LinkDecor;
import net.sourceforge.plantuml.cucadiagram.LinkType;
+import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
import net.sourceforge.plantuml.graphic.color.ColorParser;
import net.sourceforge.plantuml.graphic.color.ColorType;
@@ -84,11 +86,9 @@
new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), //
new RegexLeaf("ARROW_BODY1", "([-.]+)"), //
- new RegexLeaf("ARROW_STYLE1",
- "(?:\\[((?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*)\\])?"), //
+ new RegexLeaf("ARROW_STYLE1", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), //
new RegexLeaf("ARROW_DIRECTION", "(\\*|left|right|up|down|le?|ri?|up?|do?)?"), //
- new RegexLeaf("ARROW_STYLE2",
- "(?:\\[((?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*)\\])?"), //
+ new RegexLeaf("ARROW_STYLE2", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), //
new RegexLeaf("ARROW_BODY2", "([-.]*)\\>"), //
new RegexLeaf("[%s]*"), //
@@ -150,7 +150,7 @@
LinkType type = new LinkType(LinkDecor.ARROW, LinkDecor.NONE);
if ((arrowBody1 + arrowBody2).contains(".")) {
- type = type.getDotted();
+ type = type.goDotted();
}
Link link = new Link(entity1, entity2, type, linkLabel, lenght);
@@ -167,7 +167,7 @@
link.setUrl(urlLink);
}
- CommandLinkClass.applyStyle(arg.getLazzy("ARROW_STYLE", 0), link);
+ link.applyStyle(arg.getLazzy("ARROW_STYLE", 0));
diagram.addLink(link);
return CommandExecutionResult.ok();
@@ -198,8 +198,8 @@
final Code code = Code.of(arg.get("CODE" + suf, 0));
if (code != null) {
if (partition != null) {
- system.getOrCreateGroup(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
- system.getRootGroup());
+ system.gotoGroup2(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
+ system.getRootGroup(), NamespaceStrategy.SINGLE);
}
final IEntity result = system.getOrCreate(code, Display.getWithNewlines(code),
CommandLinkActivity.getTypeIfExisting(system, code));
@@ -216,8 +216,8 @@
if (quoted.get(0) != null) {
final Code quotedCode = Code.of(quoted.get(1) == null ? quoted.get(0) : quoted.get(1));
if (partition != null) {
- system.getOrCreateGroup(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
- system.getRootGroup());
+ system.gotoGroup2(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
+ system.getRootGroup(), NamespaceStrategy.SINGLE);
}
final IEntity result = system.getOrCreate(quotedCode, Display.getWithNewlines(quoted.get(0)),
CommandLinkActivity.getTypeIfExisting(system, quotedCode));
@@ -229,8 +229,8 @@
final Code quotedInvisible = Code.of(arg.get("QUOTED_INVISIBLE" + suf, 0));
if (quotedInvisible != null) {
if (partition != null) {
- system.getOrCreateGroup(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
- system.getRootGroup());
+ system.gotoGroup2(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE,
+ system.getRootGroup(), NamespaceStrategy.SINGLE);
}
final IEntity result = system.getOrCreate(quotedInvisible, Display.getWithNewlines(quotedInvisible),
LeafType.ACTIVITY);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java 2018-07-27 21:59:19.000000000 +0000
@@ -63,7 +63,9 @@
import net.sourceforge.plantuml.cucadiagram.Link;
import net.sourceforge.plantuml.cucadiagram.LinkDecor;
import net.sourceforge.plantuml.cucadiagram.LinkType;
+import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.cucadiagram.Stereotype;
+import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
import net.sourceforge.plantuml.graphic.color.ColorType;
public class CommandLinkLongActivity extends CommandMultilines2 {
@@ -93,11 +95,9 @@
new RegexLeaf("URL", "(" + UrlBuilder.getRegexp() + ")?"), //
new RegexLeaf("ARROW_BODY1", "([-.]+)"), //
- new RegexLeaf("ARROW_STYLE1",
- "(?:\\[((?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*)\\])?"), //
+ new RegexLeaf("ARROW_STYLE1", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), //
new RegexLeaf("ARROW_DIRECTION", "(\\*|left|right|up|down|le?|ri?|up?|do?)?"), //
- new RegexLeaf("ARROW_STYLE2",
- "(?:\\[((?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*)\\])?"), //
+ new RegexLeaf("ARROW_STYLE2", "(?:\\[(" + CommandLinkElement.LINE_STYLE + ")\\])?"), //
new RegexLeaf("ARROW_BODY2", "([-.]*)\\>"), //
new RegexLeaf("[%s]*"), //
@@ -108,11 +108,14 @@
new RegexLeaf("$"));
}
- public CommandExecutionResult executeNow(final ActivityDiagram diagram, BlocLines lines) {
+ protected CommandExecutionResult executeNow(final ActivityDiagram diagram, BlocLines lines) {
lines = lines.trim(false);
final RegexResult line0 = getStartingPattern().matcher(StringUtils.trin(lines.getFirst499()));
final IEntity entity1 = CommandLinkActivity.getEntity(diagram, line0, true);
+ if (entity1 == null) {
+ return CommandExecutionResult.error("No such entity");
+ }
if (line0.get("STEREOTYPE", 0) != null) {
entity1.setStereotype(new Stereotype(line0.get("STEREOTYPE", 0)));
@@ -165,9 +168,14 @@
partition = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(partition);
}
if (partition != null) {
- diagram.getOrCreateGroup(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE, null);
+ diagram.gotoGroup2(Code.of(partition), Display.getWithNewlines(partition), GroupType.PACKAGE, null,
+ NamespaceStrategy.SINGLE);
+ }
+ final IEntity entity2 = diagram.getOrCreate(code, Display.getWithNewlines(display), LeafType.ACTIVITY);
+ if (entity2 == null) {
+ return CommandExecutionResult.error("No such entity");
}
- final IEntity entity2 = diagram.createLeaf(code, Display.getWithNewlines(display), LeafType.ACTIVITY, null);
+
if (partition != null) {
diagram.endGroup();
}
@@ -179,11 +187,8 @@
entity2.setStereotype(new Stereotype(lineLast.get(2)));
}
if (lineLast.get(4) != null) {
- entity2.setSpecificColorTOBEREMOVED(ColorType.BACK, diagram.getSkinParam().getIHtmlColorSet().getColorIfValid(lineLast.get(4)));
- }
-
- if (entity1 == null || entity2 == null) {
- return CommandExecutionResult.error("No such entity");
+ entity2.setSpecificColorTOBEREMOVED(ColorType.BACK, diagram.getSkinParam().getIHtmlColorSet()
+ .getColorIfValid(lineLast.get(4)));
}
final String arrowBody1 = CommandLinkClass.notNull(line0.get("ARROW_BODY1", 0));
@@ -198,7 +203,7 @@
LinkType type = new LinkType(LinkDecor.ARROW, LinkDecor.NONE);
if (arrow.contains(".")) {
- type = type.getDotted();
+ type = type.goDotted();
}
Link link = new Link(entity1, entity2, type, linkLabel, lenght);
final Direction direction = StringUtils.getArrowDirection(arrowBody1 + arrowDirection + arrowBody2 + ">");
@@ -212,7 +217,7 @@
link.setUrl(urlLink);
}
- CommandLinkClass.applyStyle(line0.getLazzy("ARROW_STYLE", 0), link);
+ link.applyStyle(line0.getLazzy("ARROW_STYLE", 0));
diagram.addLink(link);
return CommandExecutionResult.ok();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java 2018-07-27 21:59:19.000000000 +0000
@@ -48,6 +48,7 @@
import net.sourceforge.plantuml.cucadiagram.GroupType;
import net.sourceforge.plantuml.cucadiagram.IEntity;
import net.sourceforge.plantuml.cucadiagram.IGroup;
+import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy;
import net.sourceforge.plantuml.graphic.color.ColorParser;
import net.sourceforge.plantuml.graphic.color.ColorType;
import net.sourceforge.plantuml.graphic.color.Colors;
@@ -79,8 +80,9 @@
protected CommandExecutionResult executeArg(ActivityDiagram diagram, RegexResult arg) {
final Code code = Code.of(StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(arg.get("NAME", 0)));
final IGroup currentPackage = diagram.getCurrentGroup();
- final IEntity p = diagram.getOrCreateGroup(code, Display.getWithNewlines(code), GroupType.PACKAGE,
- currentPackage);
+ diagram.gotoGroup2(code, Display.getWithNewlines(code), GroupType.PACKAGE, currentPackage,
+ NamespaceStrategy.SINGLE);
+ final IEntity p = diagram.getCurrentGroup();
final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
if (colors.isEmpty() == false) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java 2018-07-27 21:59:19.000000000 +0000
@@ -48,8 +48,7 @@
import net.sourceforge.plantuml.UmlDiagramType;
import net.sourceforge.plantuml.Url;
import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
-import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlanes;
+import net.sourceforge.plantuml.activitydiagram3.ftile.SwimlanesC;
import net.sourceforge.plantuml.command.CommandExecutionResult;
import net.sourceforge.plantuml.core.DiagramDescription;
import net.sourceforge.plantuml.core.ImageData;
@@ -57,13 +56,13 @@
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.Rainbow;
import net.sourceforge.plantuml.graphic.TextBlock;
-import net.sourceforge.plantuml.graphic.TextBlockCompressed;
import net.sourceforge.plantuml.graphic.TextBlockRecentred;
-import net.sourceforge.plantuml.graphic.TextBlockUtils;
import net.sourceforge.plantuml.graphic.color.Colors;
import net.sourceforge.plantuml.sequencediagram.NotePosition;
import net.sourceforge.plantuml.sequencediagram.NoteType;
import net.sourceforge.plantuml.ugraphic.ImageBuilder;
+import net.sourceforge.plantuml.ugraphic.comp.CompressionMode;
+import net.sourceforge.plantuml.ugraphic.comp.TextBlockCompressedOnXorY;
public class ActivityDiagram3 extends UmlDiagram {
@@ -73,7 +72,7 @@
private SwimlaneStrategy swimlaneStrategy;
- private final Swimlanes swinlanes = new Swimlanes(getSkinParam(), getPragma());
+ private final SwimlanesC swinlanes = new SwimlanesC(getSkinParam(), getPragma());
private void manageSwimlaneStrategy() {
if (swimlaneStrategy == null) {
@@ -117,6 +116,13 @@
}
}
+ public void addSpot(String spot) {
+ final InstructionSpot ins = new InstructionSpot(spot, nextLinkRenderer(), swinlanes.getCurrentSwimlane());
+ current().add(ins);
+ setNextLinkRendererInternal(LinkRendering.none());
+ manageSwimlaneStrategy();
+ }
+
public CommandExecutionResult addGoto(String name) {
final InstructionGoto ins = new InstructionGoto(swinlanes.getCurrentSwimlane(), name);
current().add(ins);
@@ -186,13 +192,16 @@
throws IOException {
// BUG42
// COMPRESSION
- // TextBlock result = swinlanes;
- TextBlock result = new TextBlockCompressed(swinlanes);
+ TextBlock result = swinlanes;
+ // result = new TextBlockCompressedOnY(CompressionMode.ON_Y, result);
+ // result = new TextBlockCompressedOnXorY(CompressionMode.ON_X, result);
+ result = new TextBlockCompressedOnXorY(CompressionMode.ON_Y, result);
result = new TextBlockRecentred(result);
final ISkinParam skinParam = getSkinParam();
result = new AnnotatedWorker(this, skinParam).addAdd(result);
- final Dimension2D dim = TextBlockUtils.getMinMax(result, fileFormatOption.getDefaultStringBounder())
- .getDimension();
+ // final Dimension2D dim = TextBlockUtils.getMinMax(result, fileFormatOption.getDefaultStringBounder())
+ // .getDimension();
+ final Dimension2D dim = result.getMinMax(fileFormatOption.getDefaultStringBounder()).getDimension();
final double margin = 10;
final double dpiFactor = getDpiFactor(fileFormatOption, Dimension2DDouble.delta(dim, 2 * margin, 0));
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java 2018-07-27 21:59:19.000000000 +0000
@@ -45,6 +45,7 @@
import net.sourceforge.plantuml.activitydiagram3.command.CommandArrowLong3;
import net.sourceforge.plantuml.activitydiagram3.command.CommandBackward3;
import net.sourceforge.plantuml.activitydiagram3.command.CommandBreak;
+import net.sourceforge.plantuml.activitydiagram3.command.CommandCircleSpot3;
import net.sourceforge.plantuml.activitydiagram3.command.CommandElse3;
import net.sourceforge.plantuml.activitydiagram3.command.CommandElseIf2;
import net.sourceforge.plantuml.activitydiagram3.command.CommandElseLegacy1;
@@ -126,6 +127,7 @@
// cmds.add(new CommandGroupEnd3());
cmds.add(new CommandStart3());
cmds.add(new CommandStop3());
+ cmds.add(new CommandCircleSpot3());
cmds.add(new CommandBreak());
cmds.add(new CommandEnd3());
cmds.add(new CommandKill3());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/Branch.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/Branch.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/Branch.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/Branch.java 2018-07-27 21:59:19.000000000 +0000
@@ -149,8 +149,8 @@
return list.getLast();
}
- public boolean isOnlySingleStop() {
- return list.isOnlySingleStop();
+ public boolean isOnlySingleStopOrSpot() {
+ return list.isOnlySingleStopOrSpot();
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java 2018-07-27 21:59:19.000000000 +0000
@@ -72,7 +72,7 @@
new RegexLeaf("$"));
}
- public CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
+ protected CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
lines = lines.removeEmptyColumns();
final RegexResult line0 = getStartingPattern().matcher(StringUtils.trin(lines.getFirst499()));
final Colors colors = color().getColor(line0, diagram.getSkinParam().getIHtmlColorSet());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java 2018-07-27 21:59:19.000000000 +0000
@@ -43,11 +43,13 @@
import net.sourceforge.plantuml.command.regex.RegexOr;
import net.sourceforge.plantuml.command.regex.RegexResult;
import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.descdiagram.command.CommandLinkElement;
import net.sourceforge.plantuml.graphic.Rainbow;
public class CommandArrow3 extends SingleLineCommand2 {
- public static final String STYLE_COLORS = "-\\[((?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*(?:;(?:#\\w+|dotted|dashed|plain|bold|hidden)(?:,#\\w+|,dotted|,dashed|,plain|,bold|,hidden)*)*)\\]->";
+ public static final String STYLE_COLORS = "-\\[(" + CommandLinkElement.LINE_STYLE + "(?:;"
+ + CommandLinkElement.LINE_STYLE + ")*)\\]->";
public CommandArrow3() {
super(getRegexConcat());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java 2018-07-27 21:59:19.000000000 +0000
@@ -70,7 +70,7 @@
new RegexLeaf("$"));
}
- public CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
+ protected CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
lines = lines.removeEmptyColumns();
final RegexResult line0 = getStartingPattern().matcher(StringUtils.trin(lines.getFirst499()));
// final HtmlColor color = diagram.getSkinParam().getIHtmlColorSet().getColorIfValid(line0.get("COLOR", 0));
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandCircleSpot3.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,64 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.command;
+
+import net.sourceforge.plantuml.activitydiagram3.ActivityDiagram3;
+import net.sourceforge.plantuml.command.CommandExecutionResult;
+import net.sourceforge.plantuml.command.SingleLineCommand2;
+import net.sourceforge.plantuml.command.regex.RegexConcat;
+import net.sourceforge.plantuml.command.regex.RegexLeaf;
+import net.sourceforge.plantuml.command.regex.RegexResult;
+
+public class CommandCircleSpot3 extends SingleLineCommand2 {
+
+ public CommandCircleSpot3() {
+ super(getRegexConcat());
+ }
+
+ static RegexConcat getRegexConcat() {
+ return new RegexConcat(//
+ new RegexLeaf("^"), //
+ new RegexLeaf("SPOT", "\\((\\S)\\)"), //
+ new RegexLeaf(";?$"));
+ }
+
+ @Override
+ protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, RegexResult arg) {
+ diagram.addSpot(arg.get("SPOT", 0));
+ return CommandExecutionResult.ok();
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java 2018-07-27 21:59:19.000000000 +0000
@@ -66,7 +66,7 @@
return "(?i)^end[%s]?note$";
}
- public CommandExecutionResult executeNow(final ActivityDiagram3 diagram, BlocLines lines) {
+ protected CommandExecutionResult executeNow(final ActivityDiagram3 diagram, BlocLines lines) {
// final List in = StringUtils.removeEmptyColumns2(lines.subList(1, lines.size() - 1));
final RegexResult line0 = getStartingPattern().matcher(StringUtils.trin(lines.getFirst499()));
lines = lines.subExtract(1, 1);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java 2018-07-27 21:59:19.000000000 +0000
@@ -63,24 +63,27 @@
new RegexLeaf("[%s]+"), //
new RegexOptional(//
new RegexConcat( //
- color().getRegex(),//
+ color("BACK1").getRegex(),//
new RegexLeaf("[%s]+"))), //
- new RegexLeaf("TITLECOLOR", "(?:(#\\w+)[%s]+)?"), //
new RegexLeaf("NAME", "([%g][^%g]+[%g]|\\S+)"), //
+ new RegexOptional(//
+ new RegexConcat( //
+ new RegexLeaf("[%s]+"), //
+ color("BACK2").getRegex())), //
new RegexLeaf("[%s]*\\{?$"));
}
- private static ColorParser color() {
- return ColorParser.simpleColor(ColorType.BACK);
+ private static ColorParser color(String id) {
+ return ColorParser.simpleColor(ColorType.BACK, id);
}
@Override
protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, RegexResult arg) {
final String partitionTitle = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(arg.get("NAME", 0));
- final HtmlColor titleColor = diagram.getSkinParam().getIHtmlColorSet()
- .getColorIfValid(arg.get("TITLECOLOR", 0));
- final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet());
+ final String b1 = arg.get("BACK1", 0);
+ final Colors colors = color(b1 == null ? "BACK2" : "BACK1").getColor(arg,
+ diagram.getSkinParam().getIHtmlColorSet());
final HtmlColor backColorInSkinparam = diagram.getSkinParam().getHtmlColor(ColorParam.partitionBackground,
null, false);
@@ -89,9 +92,10 @@
backColor = colors.getColor(ColorType.BACK);
} else {
backColor = backColorInSkinparam;
-
}
+ final HtmlColor titleColor = colors.getColor(ColorType.HEADER);
+ // Warning : titleColor unused in FTileGroupW
HtmlColor borderColor = diagram.getSkinParam().getHtmlColor(ColorParam.partitionBorder, null, false);
if (borderColor == null) {
borderColor = HtmlColorUtils.BLACK;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java 2018-07-27 21:59:19.000000000 +0000
@@ -74,7 +74,7 @@
}
@Override
- public CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
+ protected CommandExecutionResult executeNow(ActivityDiagram3 diagram, BlocLines lines) {
lines = lines.trim(false);
final RegexResult line0 = getStartingPattern().matcher(StringUtils.trin(lines.getFirst499()));
final RegexResult lineLast = getPatternEnd2().matcher(lines.getLast499().toString());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java 2018-07-27 21:59:19.000000000 +0000
@@ -39,28 +39,22 @@
import java.util.Collections;
import java.util.List;
-import net.sourceforge.plantuml.AlignParam;
+import net.sourceforge.plantuml.AlignmentParam;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.LineParam;
import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.ugraphic.MinMax;
import net.sourceforge.plantuml.ugraphic.UStroke;
import net.sourceforge.plantuml.ugraphic.UTranslate;
public abstract class AbstractFtile extends AbstractTextBlock implements Ftile {
- private final boolean shadowing;
private final ISkinParam skinParam;
- private AbstractFtile(boolean shadowing) {
- this.shadowing = shadowing;
- this.skinParam = null;
- }
-
public AbstractFtile(ISkinParam skinParam) {
- this.shadowing = skinParam.shadowing();
this.skinParam = skinParam;
}
@@ -101,10 +95,31 @@
public Collection getMyChildren() {
throw new UnsupportedOperationException("" + getClass());
- // return Collections.emptyList();
}
public HorizontalAlignment arrowHorizontalAlignment() {
- return skinParam.getHorizontalAlignment(AlignParam.ARROW_MESSAGE_ALIGN, null);
+ return skinParam.getHorizontalAlignment(AlignmentParam.arrowMessageAlignment, null);
+ }
+
+ private FtileGeometry cachedGeometry;
+
+ final public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ if (cachedGeometry == null) {
+ cachedGeometry = calculateDimensionFtile(stringBounder);
+ }
+ return cachedGeometry;
}
+
+ abstract protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder);
+
+ @Override
+ final public MinMax getMinMax(StringBounder stringBounder) {
+ throw new UnsupportedOperationException();
+ // return getMinMaxFtile(stringBounder);
+ }
+
+ // protected MinMax getMinMaxFtile(StringBounder stringBounder) {
+ // throw new UnsupportedOperationException();
+ // }
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java 2018-07-27 21:59:19.000000000 +0000
@@ -221,4 +221,8 @@
return false;
}
+ public double dpiFactor() {
+ return 1;
+ }
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java 2018-07-27 21:59:19.000000000 +0000
@@ -40,8 +40,10 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import net.sourceforge.plantuml.ISkinParam;
@@ -76,7 +78,18 @@
return tile2.getSwimlaneOut();
}
+ private final Map cachedTranslation = new HashMap();
+
public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) {
+ UTranslate result = cachedTranslation.get(child);
+ if (result == null) {
+ result = getTranslateForSlow(child, stringBounder);
+ cachedTranslation.put(child, result);
+ }
+ return result;
+ }
+
+ private UTranslate getTranslateForSlow(Ftile child, StringBounder stringBounder) {
if (child == tile1) {
return getTranslated1(stringBounder);
}
@@ -96,8 +109,8 @@
public void drawU(UGraphic ug) {
final StringBounder stringBounder = ug.getStringBounder();
- ug.apply(getTranslated1(stringBounder)).draw(tile1);
- ug.apply(getTranslated2(stringBounder)).draw(tile2);
+ ug.apply(getTranslateFor(tile1, stringBounder)).draw(tile1);
+ ug.apply(getTranslateFor(tile2, stringBounder)).draw(tile2);
}
public LinkRendering getInLinkRendering() {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileBreak.java 2018-07-27 21:59:19.000000000 +0000
@@ -58,8 +58,9 @@
return "FtileBreak";
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
- return super.calculateDimension(stringBounder).withoutPointOut();
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
+ return calculateDimensionEmpty().withoutPointOut();
}
@Override
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java 2018-07-27 21:59:19.000000000 +0000
@@ -85,7 +85,12 @@
public void drawU(UGraphic ug) {
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
+ return calculateDimensionEmpty();
+ }
+
+ final protected FtileGeometry calculateDimensionEmpty() {
return new FtileGeometry(width, height, width / 2, 0, height);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java 2018-07-27 21:59:19.000000000 +0000
@@ -111,6 +111,10 @@
return factory.stop(swimlane);
}
+ public Ftile spot(Swimlane swimlane, String spot) {
+ return factory.spot(swimlane, spot);
+ }
+
public Ftile activity(Display label, Swimlane swimlane, BoxStyle style, Colors colors) {
return factory.activity(label, swimlane, style, colors);
}
@@ -141,10 +145,11 @@
return factory.assembly(tile1, tile2);
}
- public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes,
- Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward) {
- return factory.repeat(swimlane, swimlaneOut, startLabel, repeat, test, yes, out, color, backRepeatLinkRendering,
- backward);
+ public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test,
+ Display yes, Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward,
+ boolean noOut) {
+ return factory.repeat(swimlane, swimlaneOut, startLabel, repeat, test, yes, out, color,
+ backRepeatLinkRendering, backward, noOut);
}
public Ftile createWhile(Swimlane swimlane, Ftile whileBlock, Display test, Display yes, Display out,
@@ -181,4 +186,5 @@
protected FtileFactory getFactory() {
return factory;
}
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java 2018-07-27 21:59:19.000000000 +0000
@@ -62,6 +62,8 @@
public Ftile end(Swimlane swimlane);
+ public Ftile spot(Swimlane swimlane, String spot);
+
public Ftile activity(Display label, Swimlane swimlane, BoxStyle style, Colors colors);
public Ftile addNote(Ftile ftile, Swimlane swimlane, Collection notes);
@@ -74,8 +76,9 @@
public Ftile assembly(Ftile tile1, Ftile tile2);
- public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes,
- Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward);
+ public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test,
+ Display yes, Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward,
+ boolean noOut);
public Ftile createWhile(Swimlane swimlane, Ftile whileBlock, Display test, Display yes, Display out,
LinkRendering afterEndwhile, HtmlColor color, Instruction specialOut);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java 2018-07-27 21:59:19.000000000 +0000
@@ -47,8 +47,9 @@
this.name = name;
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
- return super.calculateDimension(stringBounder).withoutPointOut();
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
+ return calculateDimensionEmpty().withoutPointOut();
}
public String getName() {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java 2018-07-27 21:59:19.000000000 +0000
@@ -76,7 +76,8 @@
return tile.getSwimlaneOut();
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
return tile.calculateDimension(stringBounder).translate(getTranslate(stringBounder)).fixedHeight(fixedHeight);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java 2018-07-27 21:59:19.000000000 +0000
@@ -61,7 +61,8 @@
return tile.getSwimlaneOut();
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry geo = tile.calculateDimension(stringBounder);
return new FtileGeometry(tile.calculateDimension(stringBounder), geo.getLeft(), geo.getInY());
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java 2018-07-27 21:59:19.000000000 +0000
@@ -85,7 +85,8 @@
return tile.getSwimlaneOut();
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry orig = tile.calculateDimension(stringBounder);
return new FtileGeometry(orig.getWidth() + margin1 + margin2, orig.getHeight(), orig.getLeft() + margin1,
orig.getInY(), orig.getOutY());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java 2018-07-27 21:59:19.000000000 +0000
@@ -74,7 +74,8 @@
return tile.getSwimlaneOut();
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry orig = tile.calculateDimension(stringBounder);
if (orig.getWidth() > maxX) {
throw new IllegalStateException();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java 2018-07-27 21:59:19.000000000 +0000
@@ -58,7 +58,16 @@
ug.draw(getFtileDelegated());
}
+ private FtileGeometry cached;
+
public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ if (cached == null) {
+ this.cached = calculateDimensionSlow(stringBounder);
+ }
+ return this.cached;
+ }
+
+ private FtileGeometry calculateDimensionSlow(StringBounder stringBounder) {
final FtileGeometry orig = getFtileDelegated().calculateDimension(stringBounder);
return new FtileGeometry(orig.getWidth(), orig.getHeight() + margin1 + margin2, orig.getLeft(), orig.getInY()
+ margin1, orig.hasPointOut() ? orig.getOutY() + margin1 : orig.getOutY());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java 2018-07-27 21:59:19.000000000 +0000
@@ -39,6 +39,7 @@
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import net.sourceforge.plantuml.Direction;
@@ -48,11 +49,12 @@
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
import net.sourceforge.plantuml.graphic.TextBlockUtils;
-import net.sourceforge.plantuml.ugraphic.CompressionTransform;
+import net.sourceforge.plantuml.ugraphic.MinMax;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UPolygon;
import net.sourceforge.plantuml.ugraphic.UShape;
import net.sourceforge.plantuml.ugraphic.UTranslate;
+import net.sourceforge.plantuml.ugraphic.comp.CompressionTransform;
public class Snake implements UShape {
@@ -140,10 +142,14 @@
}
private void drawRainbow(UGraphic ug) {
- final List colors = color.getColors();
+ List colors = color.getColors();
final int colorArrowSeparationSpace = color.getColorArrowSeparationSpace();
final double move = 2 + colorArrowSeparationSpace;
final WormMutation mutation = WormMutation.create(worm, move);
+ if (mutation.isDxNegative()) {
+ colors = new ArrayList(colors);
+ Collections.reverse(colors);
+ }
final double globalMove = -1.0 * (colors.size() - 1) / 2.0;
Worm current = worm.moveFirstPoint(mutation.getFirst().multiplyBy(globalMove));
if (mutation.size() > 2) {
@@ -268,4 +274,8 @@
this.emphasizeDirection = direction;
}
+ public boolean doesHorizontalCross(MinMax minMax) {
+ return worm.doesHorizontalCross(minMax);
+ }
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java 2018-07-27 21:59:19.000000000 +0000
@@ -50,7 +50,7 @@
private Display display;
private UTranslate translate = new UTranslate();
- private double totalWidth;
+ private double actualWidth;
public Swimlane(String name) {
this.name = name;
@@ -79,9 +79,9 @@
return translate;
}
- public final void setTranslateAndWidth(UTranslate translate, double totalWidth) {
+ public final void setTranslateAndWidth(UTranslate translate, double actualWidth) {
this.translate = translate;
- this.totalWidth = totalWidth;
+ this.actualWidth = actualWidth;
}
public Colors getColors(ISkinParam skinParam) {
@@ -96,8 +96,8 @@
private Colors colors = Colors.empty();
- public final double getTotalWidth() {
- return totalWidth;
+ public final double getActualWidth() {
+ return actualWidth;
}
public void setColors(Colors colors) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesA.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesA.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesA.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesA.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,309 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile;
+
+import java.awt.geom.Dimension2D;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.plantuml.FontParam;
+import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.Pragma;
+import net.sourceforge.plantuml.activitydiagram3.Instruction;
+import net.sourceforge.plantuml.activitydiagram3.InstructionList;
+import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorAddNote;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorAddUrl;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorAssembly;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorCreateGroup;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorCreateParallel;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorIf;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorRepeat;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileFactoryDelegatorWhile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.UGraphicInterceptorOneSwimlane;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.VCompactFactory;
+import net.sourceforge.plantuml.cucadiagram.Display;
+import net.sourceforge.plantuml.graphic.AbstractTextBlock;
+import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.graphic.TextBlockUtils;
+import net.sourceforge.plantuml.graphic.UGraphicDelegator;
+import net.sourceforge.plantuml.graphic.color.ColorType;
+import net.sourceforge.plantuml.svek.UGraphicForSnake;
+import net.sourceforge.plantuml.ugraphic.LimitFinder;
+import net.sourceforge.plantuml.ugraphic.MinMax;
+import net.sourceforge.plantuml.ugraphic.UChange;
+import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
+import net.sourceforge.plantuml.ugraphic.UChangeColor;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.UShape;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
+import net.sourceforge.plantuml.ugraphic.comp.SlotSet;
+import net.sourceforge.plantuml.utils.MathUtils;
+
+public class SwimlanesA extends AbstractTextBlock implements TextBlock {
+
+ protected final ISkinParam skinParam;;
+ private final Pragma pragma;
+
+ protected final List swimlanes = new ArrayList();
+ private Swimlane currentSwimlane = null;
+
+ private final Instruction root = new InstructionList();
+ private Instruction currentInstruction = root;
+
+ private LinkRendering nextLinkRenderer = LinkRendering.none();
+
+ public SwimlanesA(ISkinParam skinParam, Pragma pragma) {
+ this.skinParam = skinParam;
+ this.pragma = pragma;
+ }
+
+ private FtileFactory getFtileFactory(StringBounder stringBounder) {
+ FtileFactory factory = new VCompactFactory(skinParam, stringBounder);
+ factory = new FtileFactoryDelegatorAddUrl(factory);
+ factory = new FtileFactoryDelegatorAssembly(factory);
+ factory = new FtileFactoryDelegatorIf(factory, pragma);
+ factory = new FtileFactoryDelegatorWhile(factory);
+ factory = new FtileFactoryDelegatorRepeat(factory);
+ factory = new FtileFactoryDelegatorCreateParallel(factory);
+ // factory = new FtileFactoryDelegatorCreateParallelAddingMargin(new
+ // FtileFactoryDelegatorCreateParallel1(factory));
+ factory = new FtileFactoryDelegatorAddNote(factory);
+ factory = new FtileFactoryDelegatorCreateGroup(factory);
+ return factory;
+ }
+
+ public void swimlane(String name, HtmlColor color, Display label) {
+ currentSwimlane = getOrCreate(name);
+ if (color != null) {
+ currentSwimlane.setSpecificColorTOBEREMOVED(ColorType.BACK, color);
+ }
+ if (Display.isNull(label) == false) {
+ currentSwimlane.setDisplay(label);
+ }
+ }
+
+ private Swimlane getOrCreate(String name) {
+ for (Swimlane s : swimlanes) {
+ if (s.getName().equals(name)) {
+ return s;
+ }
+ }
+ final Swimlane result = new Swimlane(name);
+ swimlanes.add(result);
+ return result;
+ }
+
+ class Cross extends UGraphicDelegator {
+
+ private Cross(UGraphic ug) {
+ super(ug);
+ }
+
+ @Override
+ public void draw(UShape shape) {
+ if (shape instanceof Ftile) {
+ final Ftile tile = (Ftile) shape;
+ tile.drawU(this);
+ } else if (shape instanceof Connection) {
+ final Connection connection = (Connection) shape;
+ final Ftile tile1 = connection.getFtile1();
+ final Ftile tile2 = connection.getFtile2();
+
+ if (tile1 == null || tile2 == null) {
+ return;
+ }
+ if (tile1.getSwimlaneOut() != tile2.getSwimlaneIn()) {
+ final ConnectionCross connectionCross = new ConnectionCross(connection);
+ connectionCross.drawU(getUg());
+ }
+ }
+ }
+
+ public UGraphic apply(UChange change) {
+ return new Cross(getUg().apply(change));
+ }
+
+ }
+
+ static protected final double separationMargin = 10;
+
+ private TextBlock full;
+
+ public void drawU(UGraphic ug) {
+ if (full == null) {
+ final FtileFactory factory = getFtileFactory(ug.getStringBounder());
+ full = root.createFtile(factory);
+ if (swimlanes.size() <= 1) {
+ // BUG42
+ full = new TextBlockInterceptorUDrawable(full);
+ }
+ }
+
+ ug = new UGraphicForSnake(ug);
+ if (swimlanes.size() <= 1) {
+ full.drawU(ug);
+ ug.flushUg();
+ return;
+ }
+
+ drawWhenSwimlanes(ug, full);
+ }
+
+ static private void printDebug(UGraphic ug, SlotSet slot, HtmlColor col, TextBlock full) {
+ slot.drawDebugX(ug.apply(new UChangeColor(col)).apply(new UChangeBackColor(col)),
+ full.calculateDimension(ug.getStringBounder()).getHeight());
+
+ }
+
+ protected void drawWhenSwimlanes(final UGraphic ug, TextBlock full) {
+ final StringBounder stringBounder = ug.getStringBounder();
+ final Dimension2D dimensionFull = full.calculateDimension(stringBounder);
+
+ computeSize(ug, full);
+ final UTranslate titleHeightTranslate = getTitleHeightTranslate(stringBounder);
+
+ double x2 = 0;
+ for (Swimlane swimlane : swimlanes) {
+ final HtmlColor back = swimlane.getColors(skinParam).getColor(ColorType.BACK);
+ if (back != null) {
+ final UGraphic background = ug.apply(new UChangeBackColor(back)).apply(new UChangeColor(back))
+ .apply(new UTranslate(x2, 0));
+ background.draw(new URectangle(swimlane.getActualWidth(), dimensionFull.getHeight()
+ + titleHeightTranslate.getDy()));
+ }
+
+ full.drawU(new UGraphicInterceptorOneSwimlane(ug, swimlane).apply(swimlane.getTranslate()).apply(
+ titleHeightTranslate));
+ x2 += swimlane.getActualWidth();
+
+ }
+ final Cross cross = new Cross(ug.apply(titleHeightTranslate));
+ full.drawU(cross);
+ cross.flushUg();
+ }
+
+ protected UTranslate getTitleHeightTranslate(final StringBounder stringBounder) {
+ return new UTranslate();
+ }
+
+ private void computeDrawingWidths(UGraphic ug, TextBlock full) {
+ final StringBounder stringBounder = ug.getStringBounder();
+ for (Swimlane swimlane : swimlanes) {
+ final LimitFinder limitFinder = new LimitFinder(stringBounder, false);
+ final UGraphicInterceptorOneSwimlane interceptor = new UGraphicInterceptorOneSwimlane(new UGraphicForSnake(
+ limitFinder), swimlane);
+ full.drawU(interceptor);
+ interceptor.flushUg();
+ final MinMax minMax = limitFinder.getMinMax();
+ swimlane.setMinMax(minMax);
+ }
+ }
+
+ private void computeSize(UGraphic ug, TextBlock full) {
+ computeDrawingWidths(ug, full);
+ double x1 = 0;
+
+ double swimlaneWidth = skinParam.swimlaneWidth();
+
+ if (swimlaneWidth == ISkinParam.SWIMLANE_WIDTH_SAME) {
+ for (Swimlane swimlane : swimlanes) {
+ swimlaneWidth = Math.max(swimlaneWidth, rawDrawingWidth(swimlane));
+ }
+
+ }
+ for (Swimlane swimlane : swimlanes) {
+ final double swimlaneActualWidth = swimlaneActualWidth(ug.getStringBounder(), swimlaneWidth, swimlane);
+
+ final UTranslate translate = new UTranslate(x1 - swimlane.getMinMax().getMinX() + separationMargin
+ + (swimlaneActualWidth - rawDrawingWidth(swimlane)) / 2.0, 0);
+ swimlane.setTranslateAndWidth(translate, swimlaneActualWidth);
+
+ x1 += swimlaneActualWidth;
+ }
+ }
+
+ protected double swimlaneActualWidth(StringBounder stringBounder, double swimlaneWidth, Swimlane swimlane) {
+ return MathUtils.max(swimlaneWidth, rawDrawingWidth(swimlane));
+ }
+
+ private double rawDrawingWidth(Swimlane swimlane) {
+ return swimlane.getMinMax().getWidth() + 2 * separationMargin;
+ }
+
+ public Dimension2D calculateDimension(StringBounder stringBounder) {
+ return getMinMax(stringBounder).getDimension();
+ }
+
+ public Instruction getCurrent() {
+ return currentInstruction;
+ }
+
+ public void setCurrent(Instruction current) {
+ this.currentInstruction = current;
+ }
+
+ public LinkRendering nextLinkRenderer() {
+ return nextLinkRenderer;
+ }
+
+ public void setNextLinkRenderer(LinkRendering link) {
+ if (link == null) {
+ throw new IllegalArgumentException();
+ }
+ this.nextLinkRenderer = link;
+ }
+
+ public Swimlane getCurrentSwimlane() {
+ return currentSwimlane;
+ }
+
+ private MinMax cachedMinMax;
+
+ @Override
+ public MinMax getMinMax(StringBounder stringBounder) {
+ if (cachedMinMax == null) {
+ cachedMinMax = TextBlockUtils.getMinMax(this, stringBounder);
+ }
+ return cachedMinMax;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesB.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesB.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesB.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesB.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,112 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile;
+
+import net.sourceforge.plantuml.FontParam;
+import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.LineBreakStrategy;
+import net.sourceforge.plantuml.Pragma;
+import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
+import net.sourceforge.plantuml.utils.MathUtils;
+
+public class SwimlanesB extends SwimlanesA {
+
+ public SwimlanesB(ISkinParam skinParam, Pragma pragma) {
+ super(skinParam, pragma);
+ }
+
+ @Override
+ protected void drawWhenSwimlanes(UGraphic ug, TextBlock full) {
+ super.drawWhenSwimlanes(ug, full);
+ double x2 = 0;
+
+ final StringBounder stringBounder = ug.getStringBounder();
+ for (Swimlane swimlane : swimlanes) {
+ final TextBlock swTitle = getTitle(swimlane);
+ final double titleWidth = swTitle.calculateDimension(stringBounder).getWidth();
+ final double posTitle = x2 + (swimlane.getActualWidth() - titleWidth) / 2;
+ swTitle.drawU(ug.apply(new UTranslate(posTitle, 0)));
+ x2 += swimlane.getActualWidth();
+ }
+ }
+
+ private TextBlock getTitle(Swimlane swimlane) {
+ final FontConfiguration fontConfiguration = new FontConfiguration(skinParam, FontParam.SWIMLANE_TITLE, null);
+
+ LineBreakStrategy wrap = getWrap();
+ if (wrap.isAuto()) {
+ wrap = new LineBreakStrategy("" + ((int) swimlane.getActualWidth()));
+ }
+
+ return swimlane.getDisplay().create(fontConfiguration, HorizontalAlignment.LEFT, skinParam, wrap);
+ }
+
+ private LineBreakStrategy getWrap() {
+ LineBreakStrategy wrap = skinParam.swimlaneWrapTitleWidth();
+ if (wrap == LineBreakStrategy.NONE) {
+ wrap = skinParam.wrapWidth();
+ }
+ return wrap;
+ }
+
+ @Override
+ protected double swimlaneActualWidth(StringBounder stringBounder, double swimlaneWidth, Swimlane swimlane) {
+ final double m1 = super.swimlaneActualWidth(stringBounder, swimlaneWidth, swimlane);
+ if (getWrap().isAuto()) {
+ return m1;
+ }
+
+ final double titleWidth = getTitle(swimlane).calculateDimension(stringBounder).getWidth();
+ return MathUtils.max(m1, titleWidth + 2 * separationMargin);
+
+ }
+
+ @Override
+ protected UTranslate getTitleHeightTranslate(final StringBounder stringBounder) {
+ double titlesHeight = 0;
+ for (Swimlane swimlane : swimlanes) {
+ final TextBlock swTitle = getTitle(swimlane);
+ titlesHeight = Math.max(titlesHeight, swTitle.calculateDimension(stringBounder).getHeight());
+ }
+ return new UTranslate(0, titlesHeight);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesC.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesC.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesC.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/SwimlanesC.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,89 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile;
+
+import java.awt.geom.Dimension2D;
+
+import net.sourceforge.plantuml.ColorParam;
+import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.LineParam;
+import net.sourceforge.plantuml.Pragma;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.skin.rose.Rose;
+import net.sourceforge.plantuml.ugraphic.UChangeColor;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.ULine;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
+
+public class SwimlanesC extends SwimlanesB {
+
+ public SwimlanesC(ISkinParam skinParam, Pragma pragma) {
+ super(skinParam, pragma);
+ }
+
+ @Override
+ protected void drawWhenSwimlanes(UGraphic ug, TextBlock full) {
+ super.drawWhenSwimlanes(ug, full);
+ double x2 = 0;
+
+ final StringBounder stringBounder = ug.getStringBounder();
+ final Dimension2D dimensionFull = full.calculateDimension(stringBounder);
+
+ final UTranslate titleHeightTranslate = getTitleHeightTranslate(stringBounder);
+
+ for (Swimlane swimlane : swimlanes) {
+ drawSeparation(ug.apply(new UTranslate(x2, 0)), dimensionFull.getHeight() + titleHeightTranslate.getDy());
+
+ x2 += swimlane.getActualWidth();
+
+ }
+ drawSeparation(ug.apply(new UTranslate(x2, 0)), dimensionFull.getHeight() + titleHeightTranslate.getDy());
+
+ }
+
+ private void drawSeparation(UGraphic ug, double height) {
+ HtmlColor color = skinParam.getHtmlColor(ColorParam.swimlaneBorder, null, false);
+ if (color == null) {
+ color = ColorParam.swimlaneBorder.getDefaultValue();
+ }
+ final UStroke thickness = Rose.getStroke(skinParam, LineParam.swimlaneBorder, 2);
+ ug.apply(thickness).apply(new UChangeColor(color)).draw(new ULine(0, height));
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java 2018-07-27 21:59:19.000000000 +0000
@@ -71,7 +71,6 @@
import net.sourceforge.plantuml.svek.UGraphicForSnake;
import net.sourceforge.plantuml.ugraphic.LimitFinder;
import net.sourceforge.plantuml.ugraphic.MinMax;
-import net.sourceforge.plantuml.ugraphic.SlotSet;
import net.sourceforge.plantuml.ugraphic.UChange;
import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
@@ -81,6 +80,7 @@
import net.sourceforge.plantuml.ugraphic.UShape;
import net.sourceforge.plantuml.ugraphic.UStroke;
import net.sourceforge.plantuml.ugraphic.UTranslate;
+import net.sourceforge.plantuml.ugraphic.comp.SlotSet;
import net.sourceforge.plantuml.utils.MathUtils;
public class Swimlanes extends AbstractTextBlock implements TextBlock {
@@ -113,7 +113,8 @@
factory = new FtileFactoryDelegatorWhile(factory);
factory = new FtileFactoryDelegatorRepeat(factory);
factory = new FtileFactoryDelegatorCreateParallel(factory);
- // factory = new FtileFactoryDelegatorCreateParallelAddingMargin(new FtileFactoryDelegatorCreateParallel1(factory));
+ // factory = new FtileFactoryDelegatorCreateParallelAddingMargin(new
+ // FtileFactoryDelegatorCreateParallel1(factory));
factory = new FtileFactoryDelegatorAddNote(factory);
factory = new FtileFactoryDelegatorCreateGroup(factory);
return factory;
@@ -173,59 +174,26 @@
}
static private final double separationMargin = 10;
+ private TextBlock full;
public void drawU(UGraphic ug) {
- final FtileFactory factory = getFtileFactory(ug.getStringBounder());
- TextBlock full = root.createFtile(factory);
+ if (full == null) {
+ final FtileFactory factory = getFtileFactory(ug.getStringBounder());
+ full = root.createFtile(factory);
+ if (swimlanes.size() <= 1) {
+ // BUG42
+ full = new TextBlockInterceptorUDrawable(full);
+ }
+ }
ug = new UGraphicForSnake(ug);
if (swimlanes.size() <= 1) {
- full = new TextBlockInterceptorUDrawable(full);
- // BUG42
- // full.drawU(ug);
full.drawU(ug);
ug.flushUg();
return;
}
- // if (OptionFlags.SWI2) {
- //
- // final SlotFinderX slotFinder = new SlotFinderX(ug.getStringBounder());
- // drawWhenSwimlanes(slotFinder, full);
- // final SlotSet slotX = slotFinder.getXSlotSet().reverse();
- // //
- // // // final SlotSet ysSlotSet = slotFinder.getYSlotSet().reverse().smaller(5.0);
- // //
- // System.err.println("slotX=" + slotX);
- //
- // printDebug(ug, slotX, HtmlColorUtils.GRAY, full);
- //
- // double x2 = 0;
- // double y2 = 0;
- // final double stepy = 40;
- // int i = 0;
- // final SlotSet deconnectedSwimlanes = new SlotSet();
- // for (Swimlane swimlane : swimlanes) {
- // final UGraphic ug2 = ug.apply(new UChangeColor(HtmlColorUtils.GREEN)).apply(
- // new UChangeBackColor(HtmlColorUtils.GREEN));
- // final double totalWidth = swimlane.getTotalWidth();
- // final SlotSet slot2 = slotX.filter(x2 + separationMargin, x2 + totalWidth - separationMargin);
- // deconnectedSwimlanes.addAll(slot2);
- // // ug2.apply(new UTranslate(x2, y2)).draw(new URectangle(totalWidth, stepy));
- // x2 += totalWidth;
- // y2 += stepy;
- // i++;
- // }
- // // printDebug(ug, deconnectedSwimlanes, HtmlColorUtils.GRAY, full);
- //
- // //
- // final CompressionTransform compressionTransform = new CompressionTransform(deconnectedSwimlanes);
- // // ug = new UGraphicCompress2(ug, compressionTransform);
- // drawWhenSwimlanes(ug, full);
- // } else {
drawWhenSwimlanes(ug, full);
- // }
- // getCollisionDetector(ug, titleHeightTranslate).drawDebug(ug);
}
static private void printDebug(UGraphic ug, SlotSet slot, HtmlColor col, TextBlock full) {
@@ -248,26 +216,24 @@
if (back != null) {
final UGraphic background = ug.apply(new UChangeBackColor(back)).apply(new UChangeColor(back))
.apply(new UTranslate(x2, 0));
- background.draw(new URectangle(swimlane.getTotalWidth(), dimensionFull.getHeight()
+ background.draw(new URectangle(swimlane.getActualWidth(), dimensionFull.getHeight()
+ titleHeightTranslate.getDy()));
}
- // if (OptionFlags.SWI2 == false) {
- final TextBlock swTitle = swimlane.getDisplay().create(getFontConfiguration(), HorizontalAlignment.LEFT,
- skinParam);
+ final TextBlock swTitle = getTitle(swimlane);
final double titleWidth = swTitle.calculateDimension(stringBounder).getWidth();
- final double posTitle = x2 + (swimlane.getTotalWidth() - titleWidth) / 2;
+ final double posTitle = x2 + (swimlane.getActualWidth() - titleWidth) / 2;
swTitle.drawU(ug.apply(new UTranslate(posTitle, 0)));
- // }
drawSeparation(ug.apply(new UTranslate(x2, 0)), dimensionFull.getHeight() + titleHeightTranslate.getDy());
full.drawU(new UGraphicInterceptorOneSwimlane(ug, swimlane).apply(swimlane.getTranslate()).apply(
titleHeightTranslate));
- x2 += swimlane.getTotalWidth();
+ x2 += swimlane.getActualWidth();
}
drawSeparation(ug.apply(new UTranslate(x2, 0)), dimensionFull.getHeight() + titleHeightTranslate.getDy());
+
final Cross cross = new Cross(ug.apply(titleHeightTranslate));
full.drawU(cross);
cross.flushUg();
@@ -303,8 +269,7 @@
final MinMax minMax = swimlane.getMinMax();
final double drawingWidth = minMax.getWidth() + 2 * separationMargin;
- final TextBlock swTitle = swimlane.getDisplay().create(getFontConfiguration(), HorizontalAlignment.LEFT,
- skinParam);
+ final TextBlock swTitle = getTitle(swimlane);
final double titleWidth = swTitle.calculateDimension(stringBounder).getWidth();
final double totalWidth = MathUtils.max(swimlaneWidth, drawingWidth, titleWidth + 2 * separationMargin);
@@ -316,37 +281,10 @@
}
}
- private void computeSizeOld(UGraphic ug, TextBlock full) {
- double x1 = 0;
- final StringBounder stringBounder = ug.getStringBounder();
- for (Swimlane swimlane : swimlanes) {
-
- final LimitFinder limitFinder = new LimitFinder(stringBounder, false);
- final UGraphicInterceptorOneSwimlane interceptor = new UGraphicInterceptorOneSwimlane(new UGraphicForSnake(
- limitFinder), swimlane);
- full.drawU(interceptor);
- interceptor.flushUg();
- final MinMax minMax = limitFinder.getMinMax();
-
- final double drawingWidth = minMax.getWidth() + 2 * separationMargin;
- final TextBlock swTitle = swimlane.getDisplay().create(getFontConfiguration(), HorizontalAlignment.LEFT,
- skinParam);
- final double titleWidth = swTitle.calculateDimension(stringBounder).getWidth();
- final double totalWidth = Math.max(drawingWidth, titleWidth + 2 * separationMargin);
-
- final UTranslate translate = new UTranslate(x1 - minMax.getMinX() + separationMargin
- + (totalWidth - drawingWidth) / 2.0, 0);
- swimlane.setTranslateAndWidth(translate, totalWidth);
-
- x1 += totalWidth;
- }
- }
-
private UTranslate getTitleHeightTranslate(final StringBounder stringBounder) {
double titlesHeight = 0;
for (Swimlane swimlane : swimlanes) {
- final TextBlock swTitle = swimlane.getDisplay().create(getFontConfiguration(), HorizontalAlignment.LEFT,
- skinParam);
+ final TextBlock swTitle = getTitle(swimlane);
titlesHeight = Math.max(titlesHeight, swTitle.calculateDimension(stringBounder).getHeight());
}
@@ -354,24 +292,9 @@
return titleHeightTranslate;
}
- private CollisionDetector getCollisionDetector(UGraphic ug, final UTranslate titleHeightTranslate) {
- final FtileFactory factory = getFtileFactory(ug.getStringBounder());
- final TextBlock full = root.createFtile(factory);
- ug = new UGraphicForSnake(ug);
-
- final CollisionDetector collisionDetector = new CollisionDetector(ug.getStringBounder());
-
- for (Swimlane swimlane : swimlanes) {
- full.drawU(new UGraphicInterceptorOneSwimlane(collisionDetector, swimlane).apply(swimlane.getTranslate())
- .apply(titleHeightTranslate));
- }
-
- collisionDetector.setManageSnakes(true);
- final Cross cross = new Cross(collisionDetector.apply(titleHeightTranslate));
- full.drawU(cross);
- cross.flushUg();
-
- return collisionDetector;
+ private TextBlock getTitle(Swimlane swimlane) {
+ return swimlane.getDisplay().create(getFontConfiguration(), HorizontalAlignment.LEFT, skinParam,
+ skinParam.wrapWidth());
}
private void drawSeparation(UGraphic ug, double height) {
@@ -384,7 +307,7 @@
}
public Dimension2D calculateDimension(StringBounder stringBounder) {
- return TextBlockUtils.getMinMax(this, stringBounder).getDimension();
+ return getMinMax(stringBounder).getDimension();
}
public Instruction getCurrent() {
@@ -410,4 +333,14 @@
return currentSwimlane;
}
+ private MinMax cachedMinMax;
+
+ @Override
+ public MinMax getMinMax(StringBounder stringBounder) {
+ if (cachedMinMax == null) {
+ cachedMinMax = TextBlockUtils.getMinMax(this, stringBounder);
+ }
+ return cachedMinMax;
+ }
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java 2018-07-27 21:59:19.000000000 +0000
@@ -41,7 +41,6 @@
import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
-import net.sourceforge.plantuml.graphic.TextBlockUtils;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UTranslate;
@@ -59,7 +58,8 @@
}
public Dimension2D calculateDimension(StringBounder stringBounder) {
- return TextBlockUtils.getMinMax(this, stringBounder).getDimension();
+ // return TextBlockUtils.getMinMax(this, stringBounder).getDimension();
+ throw new UnsupportedOperationException();
}
}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java 2018-07-27 21:59:19.000000000 +0000
@@ -108,16 +108,16 @@
ISkinParam skinParam, StringBounder stringBounder, FontConfiguration fcArrow, FontConfiguration fcTest) {
final ConditionalBuilder builder = new ConditionalBuilder(swimlane, borderColor, backColor, arrowColor,
ftileFactory, conditionStyle, branch1, branch2, skinParam, stringBounder, fcArrow, fcTest);
- if (isEmptyOrOnlySingleStop(branch2) && isEmptyOrOnlySingleStop(branch1) == false) {
+ if (isEmptyOrOnlySingleStopOrSpot(branch2) && isEmptyOrOnlySingleStopOrSpot(branch1) == false) {
return builder.createDown(builder.branch1, builder.branch2);
}
- if (branch1.isEmpty() && branch2.isOnlySingleStop()) {
+ if (branch1.isEmpty() && branch2.isOnlySingleStopOrSpot()) {
return builder.createDown(builder.branch1, builder.branch2);
}
- if (isEmptyOrOnlySingleStop(branch1) && isEmptyOrOnlySingleStop(branch2) == false) {
+ if (isEmptyOrOnlySingleStopOrSpot(branch1) && isEmptyOrOnlySingleStopOrSpot(branch2) == false) {
return builder.createDown(builder.branch2, builder.branch1);
}
- if (branch2.isEmpty() && branch1.isOnlySingleStop()) {
+ if (branch2.isEmpty() && branch1.isOnlySingleStopOrSpot()) {
return builder.createDown(builder.branch2, builder.branch1);
}
return builder.createWithLinks();
@@ -125,8 +125,8 @@
// return builder.createNude();
}
- private static boolean isEmptyOrOnlySingleStop(Branch branch) {
- return branch.isEmpty() || branch.isOnlySingleStop();
+ private static boolean isEmptyOrOnlySingleStopOrSpot(Branch branch) {
+ return branch.isEmpty() || branch.isOnlySingleStopOrSpot();
}
private Ftile createDown(Branch branch1, Branch branch2) {
@@ -136,11 +136,11 @@
final TextBlock tb2 = getLabelPositive(branch2);
final Ftile diamond1 = getDiamond1(false, tb1, tb2);
final Ftile diamond2 = getDiamond2(branch1, branch2, true);
- if (branch2.isOnlySingleStop()) {
+ if (branch2.isOnlySingleStopOrSpot()) {
return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile1, 10),
arrowColor, ftileFactory, branch2.getFtile(), branch2.getInlinkRenderingColorAndStyle());
}
- if (branch1.isOnlySingleStop()) {
+ if (branch1.isOnlySingleStopOrSpot()) {
return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile2, 10),
arrowColor, ftileFactory, branch1.getFtile(), branch1.getInlinkRenderingColorAndStyle());
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java 2018-07-27 21:59:19.000000000 +0000
@@ -128,7 +128,8 @@
ug.apply(getTranslate2(stringBounder)).draw(tile2);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry dimTotal = calculateDimensionInternal(stringBounder);
if (tile1.calculateDimension(stringBounder).hasPointOut()
|| tile2.calculateDimension(stringBounder).hasPointOut()) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java 2018-07-27 21:59:19.000000000 +0000
@@ -72,13 +72,14 @@
@Override
public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, final Ftile repeat, Display test,
- Display yes, Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward) {
+ Display yes, Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward,
+ boolean noOut) {
final ConditionStyle conditionStyle = skinParam().getConditionStyle();
final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
- final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBackground)
- : color;
+ final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(),
+ ColorParam.activityDiamondBackground) : color;
final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
final LinkRendering endRepeatLinkRendering = repeat.getOutLinkRendering();
@@ -92,7 +93,7 @@
Ftile result = FtileRepeat.create(backRepeatLinkRendering, swimlane, swimlaneOut, backStart, repeat, test, yes,
out, borderColor, backColor, arrowColor, endRepeatLinkColor, conditionStyle, this.skinParam(),
- fcDiamond, fcArrow, backward);
+ fcDiamond, fcArrow, backward, noOut);
final List weldingPoints = repeat.getWeldingPoints();
if (weldingPoints.size() > 0) {
@@ -110,7 +111,8 @@
final UTranslate tr2 = genealogy.getTranslate(diamondBreak, ug.getStringBounder());
final Dimension2D dimDiamond = diamondBreak.calculateDimension(ug.getStringBounder());
- final Snake snake = new Snake(getFtile1().arrowHorizontalAlignment(), arrowColor, Arrows.asToRight());
+ final Snake snake = new Snake(getFtile1().arrowHorizontalAlignment(), arrowColor, Arrows
+ .asToRight());
snake.addPoint(tr1.getDx(), tr1.getDy());
snake.addPoint(0, tr1.getDy());
snake.addPoint(0, tr2.getDy() + dimDiamond.getHeight() / 2);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java 2018-07-27 21:59:19.000000000 +0000
@@ -35,20 +35,33 @@
*/
package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact;
+import java.awt.geom.Dimension2D;
+import java.util.List;
+
import net.sourceforge.plantuml.ColorParam;
import net.sourceforge.plantuml.FontParam;
import net.sourceforge.plantuml.activitydiagram3.Instruction;
import net.sourceforge.plantuml.activitydiagram3.LinkRendering;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Connection;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileBreak;
import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactoryDelegator;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Genealogy;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
+import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint;
import net.sourceforge.plantuml.cucadiagram.Display;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
import net.sourceforge.plantuml.graphic.Rainbow;
import net.sourceforge.plantuml.svek.ConditionStyle;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
public class FtileFactoryDelegatorWhile extends FtileFactoryDelegator {
@@ -60,8 +73,8 @@
public Ftile createWhile(Swimlane swimlane, Ftile whileBlock, Display test, Display yes, Display out,
LinkRendering afterEndwhile, HtmlColor color, Instruction specialOut) {
final HtmlColor borderColor = getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBorder);
- final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(), ColorParam.activityDiamondBackground)
- : color;
+ final HtmlColor backColor = color == null ? getRose().getHtmlColor(skinParam(),
+ ColorParam.activityDiamondBackground) : color;
final Rainbow arrowColor = HtmlColorAndStyle.build(skinParam());
final ConditionStyle conditionStyle = skinParam().getConditionStyle();
@@ -75,8 +88,39 @@
final FontConfiguration fontArrow = new FontConfiguration(skinParam(), FontParam.ARROW, null);
- return FtileWhile.create(swimlane, whileBlock, test, borderColor, backColor, arrowColor, yes, out,
+ Ftile result = FtileWhile.create(swimlane, whileBlock, test, borderColor, backColor, arrowColor, yes, out,
endInlinkColor, afterEndwhile, fontArrow, getFactory(), conditionStyle, fcTest, specialOut);
+
+ final List weldingPoints = whileBlock.getWeldingPoints();
+ if (weldingPoints.size() > 0) {
+ // printAllChild(repeat);
+
+ final Genealogy genealogy = new Genealogy(result);
+
+ final FtileBreak ftileBreak = (FtileBreak) weldingPoints.get(0);
+
+ result = FtileUtils.addConnection(result, new Connection() {
+ public void drawU(UGraphic ug) {
+ final UTranslate tr1 = genealogy.getTranslate(ftileBreak, ug.getStringBounder());
+
+ final Snake snake = new Snake(getFtile1().arrowHorizontalAlignment(), arrowColor, Arrows.asToLeft());
+ snake.addPoint(tr1.getDx(), tr1.getDy());
+ snake.addPoint(Diamond.diamondHalfSize, tr1.getDy());
+ ug.draw(snake);
+ }
+
+ public Ftile getFtile1() {
+ return ftileBreak;
+ }
+
+ public Ftile getFtile2() {
+ return null;
+ }
+
+ });
+ }
+
+ return result;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java 2018-07-27 21:59:19.000000000 +0000
@@ -93,7 +93,8 @@
}
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
double height = 0;
double width = 0;
for (Ftile ftile : forks) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java 2018-07-27 21:59:19.000000000 +0000
@@ -93,7 +93,8 @@
}
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
double height = 0;
double width = 0;
for (Ftile ftile : forks) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java 2018-07-27 21:59:19.000000000 +0000
@@ -38,6 +38,7 @@
import java.awt.geom.Dimension2D;
import java.util.Set;
+import net.sourceforge.plantuml.AlignmentParam;
import net.sourceforge.plantuml.FontParam;
import net.sourceforge.plantuml.ISkinParam;
import net.sourceforge.plantuml.LineParam;
@@ -82,7 +83,7 @@
super(inner.skinParam());
this.backColor = backColor == null ? HtmlColorUtils.WHITE : backColor;
this.inner = FtileUtils.addHorizontalMargin(inner, 10);
- this.borderColor = backColor == null ? HtmlColorUtils.BLACK : borderColor;
+ this.borderColor = borderColor == null ? HtmlColorUtils.BLACK : borderColor;
final UFont font = skinParam.getFont(null, false, FontParam.PARTITION);
final HtmlColor fontColor = skinParam.getFontHtmlColor(null, FontParam.PARTITION);
@@ -130,12 +131,12 @@
return new UTranslate(suppWidth / 2, diffHeightTitle(stringBounder) + headerNoteHeight(stringBounder));
}
- private static MinMax getMinMax(TextBlock tb, StringBounder stringBounder) {
+ private MinMax getInnerMinMax(StringBounder stringBounder) {
final LimitFinder limitFinder = new LimitFinder(stringBounder, false);
final UGraphicForSnake interceptor = new UGraphicForSnake(limitFinder);
final UGraphicInterceptorUDrawable interceptor2 = new UGraphicInterceptorUDrawable(interceptor);
- tb.drawU(interceptor2);
+ inner.drawU(interceptor2);
interceptor2.flushUg();
return limitFinder.getMinMax();
}
@@ -149,9 +150,19 @@
return suppWidth;
}
+ private FtileGeometry cachedInnerDimension;
+
private FtileGeometry getInnerDimension(StringBounder stringBounder) {
+ if (cachedInnerDimension == null) {
+ cachedInnerDimension = getInnerDimensionSlow(stringBounder);
+ }
+ return cachedInnerDimension;
+
+ }
+
+ private FtileGeometry getInnerDimensionSlow(StringBounder stringBounder) {
final FtileGeometry orig = inner.calculateDimension(stringBounder);
- final MinMax minMax = getMinMax(inner, stringBounder);
+ final MinMax minMax = getInnerMinMax(stringBounder);
final double missingWidth = minMax.getMaxX() - orig.getWidth();
if (missingWidth > 0) {
return orig.addDim(missingWidth + 5, 0);
@@ -159,7 +170,8 @@
return orig;
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry orig = getInnerDimension(stringBounder);
final double suppWidth = suppWidth(stringBounder);
final double width = orig.getWidth() + suppWidth;
@@ -184,8 +196,8 @@
final SymbolContext symbolContext = new SymbolContext(backColor, borderColor).withShadow(
skinParam().shadowing()).withStroke(stroke);
- USymbol.FRAME.asBig(name, TextBlockUtils.empty(0, 0), dimTotal.getWidth(), dimTotal.getHeight(), symbolContext)
- .drawU(ug);
+ USymbol.FRAME.asBig(name, inner.skinParam().getHorizontalAlignment(AlignmentParam.packageTitleAlignment, null),
+ TextBlockUtils.empty(0, 0), dimTotal.getWidth(), dimTotal.getHeight(), symbolContext).drawU(ug);
final Dimension2D dimHeaderNote = headerNote.calculateDimension(stringBounder);
headerNote.drawU(ug.apply(new UTranslate(dimTotal.getWidth() - dimHeaderNote.getWidth() - 10,
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java 2018-07-27 21:59:19.000000000 +0000
@@ -271,7 +271,8 @@
ug.apply(getTranslateStop(stringBounder)).draw(stop2);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimStop2 = stop2.calculateDimension(stringBounder);
final FtileGeometry dim1 = tile1.calculateDimension(stringBounder).addDim(0,
getDiamondStopDistance() + dimStop2.getWidth());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java 2018-07-27 21:59:19.000000000 +0000
@@ -341,7 +341,8 @@
}
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry geoDiamond1 = diamond1.calculateDimension(stringBounder);
final FtileGeometry geoThen = thenBlock.calculateDimension(stringBounder);
final FtileGeometry geoDiamond2 = diamond2.calculateDimension(stringBounder);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java 2018-07-27 21:59:19.000000000 +0000
@@ -38,7 +38,6 @@
import java.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -561,7 +560,8 @@
return new FtileGeometry(result, result.getWidth() / 2, 0);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
final List all = new ArrayList(tiles);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java 2018-07-27 21:59:19.000000000 +0000
@@ -571,7 +571,8 @@
return width;
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
final List all = new ArrayList(tiles);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java 2018-07-27 21:59:19.000000000 +0000
@@ -113,7 +113,8 @@
opale.drawU(ug);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
if (withOutPoint) {
return new FtileGeometry(dimTotal, dimTotal.getWidth() / 2, 0, dimTotal.getHeight());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java 2018-07-27 21:59:19.000000000 +0000
@@ -54,6 +54,7 @@
import net.sourceforge.plantuml.activitydiagram3.ftile.ConnectionTranslatable;
import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond;
import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileEmpty;
import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils;
import net.sourceforge.plantuml.activitydiagram3.ftile.Snake;
@@ -111,7 +112,8 @@
public static Ftile create(LinkRendering backRepeatLinkRendering, Swimlane swimlane, Swimlane swimlaneOut,
Ftile backStart, Ftile repeat, Display test, Display yes, Display out, HtmlColor borderColor,
HtmlColor backColor, Rainbow arrowColor, Rainbow endRepeatLinkColor, ConditionStyle conditionStyle,
- ISkinSimple spriteContainer, FontConfiguration fcDiamond, FontConfiguration fcArrow, Ftile backward) {
+ ISkinSimple spriteContainer, FontConfiguration fcDiamond, FontConfiguration fcArrow, Ftile backward,
+ boolean noOut) {
final FontConfiguration fontConfiguration1 = conditionStyle == ConditionStyle.INSIDE ? fcDiamond : fcArrow;
@@ -123,14 +125,19 @@
final Ftile diamond1;
if (backStart == null) {
- diamond1 = new FtileDiamond(repeat.skinParam(), backColor, borderColor, swimlane);
+ diamond1 = new FtileDiamond(repeat.skinParam(), backColor, borderColor, repeat.getSwimlaneIn());
} else {
diamond1 = backStart;
}
final FtileRepeat result;
if (conditionStyle == ConditionStyle.INSIDE) {
- final Ftile diamond2 = new FtileDiamondInside(repeat.skinParam(), backColor, borderColor, swimlaneOut,
- tbTest).withEast(yesTb).withSouth(outTb);
+ final Ftile diamond2;
+ if (noOut && Display.isNull(test)) {
+ diamond2 = new FtileEmpty(repeat.skinParam());
+ } else {
+ diamond2 = new FtileDiamondInside(repeat.skinParam(), backColor, borderColor, swimlaneOut, tbTest)
+ .withEast(yesTb).withSouth(outTb);
+ }
result = new FtileRepeat(repeat, diamond1, diamond2, TextBlockUtils.empty(0, 0), backward);
} else if (conditionStyle == ConditionStyle.DIAMOND) {
final Ftile diamond2 = new FtileDiamond(repeat.skinParam(), backColor, borderColor, swimlane)
@@ -483,7 +490,8 @@
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
return new FtileGeometry(dimTotal, getLeft(stringBounder), 0, dimTotal.getHeight());
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java 2018-07-27 21:59:19.000000000 +0000
@@ -91,7 +91,8 @@
}
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
double height = 0;
double width = 0;
for (Ftile ftile : forks) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java 2018-07-27 21:59:19.000000000 +0000
@@ -38,6 +38,8 @@
import java.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -81,6 +83,14 @@
private final Ftile diamond1;
private final Ftile specialOut;
+ @Override
+ public Collection getMyChildren() {
+ if (specialOut == null) {
+ return Arrays.asList(whileBlock, diamond1);
+ }
+ return Arrays.asList(whileBlock, diamond1, specialOut);
+ }
+
public Set getSwimlanes() {
final Set result = new HashSet(whileBlock.getSwimlanes());
result.add(getSwimlaneIn());
@@ -240,7 +250,6 @@
final double x1 = p1.getX();
final double y1 = p1.getY();
final double x2 = p2.getX() + dimDiamond1.getWidth();
- // final double y2 = p2.getY() + dimDiamond1.getOutY() / 2;
final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2;
final double y2 = p2.getY() + dimDiamond1.getInY() + half;
@@ -258,8 +267,6 @@
ug.apply(new UTranslate(x1, y1bis)).draw(new UEmpty(5, Diamond.diamondHalfSize));
- // ug = ug.apply(new UChangeColor(endInlinkColor)).apply(new UChangeBackColor(endInlinkColor));
- // ug.apply(new UTranslate(xx, (y1 + y2) / 2)).draw(Arrows.asToUp());
}
public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) {
@@ -271,12 +278,13 @@
final Point2D p1 = translate1.getTranslated(ap1);
final Point2D p2 = translate2.getTranslated(ap2);
- final Dimension2D dimDiamond1 = diamond1.calculateDimension(stringBounder);
+ final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder);
final double x1 = p1.getX();
final double y1 = p1.getY();
final double x2 = p2.getX() + dimDiamond1.getWidth();
- final double y2 = p2.getY() + dimDiamond1.getHeight() / 2;
+ final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2;
+ final double y2 = p2.getY() + dimDiamond1.getInY() + half;
snake.addPoint(x1, y1);
snake.addPoint(x1, y1 + Diamond.diamondHalfSize);
@@ -392,8 +400,6 @@
snake.goUnmergeable(MergeStrategy.LIMITED);
ug.draw(snake);
- // ug = ug.apply(new UChangeColor(afterEndwhileColor)).apply(new UChangeBackColor(afterEndwhileColor));
- // ug.apply(new UTranslate(Diamond.diamondHalfSize, (y1 + y2) / 2)).draw(Arrows.asToDown());
final Snake snake2 = new Snake(arrowHorizontalAlignment(), afterEndwhileColor);
snake2.addPoint(Diamond.diamondHalfSize, y2);
@@ -454,7 +460,8 @@
}
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry geoDiamond1 = diamond1.calculateDimension(stringBounder);
FtileGeometry geoWhile = whileBlock.calculateDimension(stringBounder);
final double diff = -geoWhile.getWidth();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java 2018-07-27 21:59:19.000000000 +0000
@@ -199,7 +199,8 @@
ug.apply(getTranslate(stringBounder)).draw(tile);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
final FtileGeometry orig = tile.calculateDimension(stringBounder);
final UTranslate translate = getTranslate(stringBounder);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java 2018-07-27 21:59:19.000000000 +0000
@@ -173,7 +173,8 @@
ug.apply(getTranslate(stringBounder)).draw(tile);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dimTotal = calculateDimensionInternal(stringBounder);
final FtileGeometry orig = tile.calculateDimension(stringBounder);
final UTranslate translate = getTranslate(stringBounder);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderSplit2.java 2018-07-27 21:59:19.000000000 +0000
@@ -111,7 +111,8 @@
}
final Rainbow thinColor = result.getInLinkRendering().getRainbow(HtmlColorAndStyle.build(skinParam()));
- final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), getList().get(0).getSwimlaneIn());
+ // final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), getList().get(0).getSwimlaneIn());
+ final Ftile out = new FtileThinSplit(skinParam(), thinColor.getColor(), swimlane());
result = new FtileAssemblySimple(result, out);
final List conns = new ArrayList();
double x = 0;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java 2018-07-27 21:59:19.000000000 +0000
@@ -55,6 +55,7 @@
import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileBox;
import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileCircleEnd;
+import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileCircleSpot;
import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileCircleStart;
import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileCircleStop;
import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorateIn;
@@ -91,6 +92,12 @@
return new FtileCircleStop(skinParam(), color, swimlane);
}
+ public Ftile spot(Swimlane swimlane, String spot) {
+ // final HtmlColor color = rose.getHtmlColor(skinParam, ColorParam.activityBackground);
+ final UFont font = skinParam.getFont(null, false, FontParam.ACTIVITY);
+ return new FtileCircleSpot(skinParam(), swimlane, spot, font);
+ }
+
public Ftile end(Swimlane swimlane) {
final HtmlColor color = rose.getHtmlColor(skinParam, ColorParam.activityEnd);
return new FtileCircleEnd(skinParam(), color, swimlane);
@@ -116,8 +123,9 @@
return new FtileAssemblySimple(tile1, tile2);
}
- public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes,
- Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward) {
+ public Ftile repeat(Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test,
+ Display yes, Display out, HtmlColor color, LinkRendering backRepeatLinkRendering, Ftile backward,
+ boolean noOut) {
return repeat;
}
@@ -162,5 +170,4 @@
public ISkinParam skinParam() {
return skinParam;
}
-
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java 2018-07-27 21:59:19.000000000 +0000
@@ -81,7 +81,8 @@
this.label = label;
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
double supp = label.calculateDimension(stringBounder).getWidth();
if (supp > 0) {
supp += labelMargin;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java 2018-07-27 21:59:19.000000000 +0000
@@ -82,7 +82,7 @@
private final LinkRendering inRenreding;
private final Swimlane swimlane;
private final BoxStyle style;
- private final ISkinParam skinParam;
+ // private final ISkinParam skinParam;
final public LinkRendering getInLinkRendering() {
return inRenreding;
@@ -119,13 +119,13 @@
public FtileBox(ISkinParam skinParam, Display label, UFont font, Swimlane swimlane, BoxStyle style) {
super(skinParam);
this.style = style;
- this.skinParam = skinParam;
+ // this.skinParam = skinParam;
this.swimlane = swimlane;
this.inRenreding = new LinkRendering(HtmlColorAndStyle.build(skinParam));
final FontConfiguration fc = new FontConfiguration(skinParam, FontParam.ACTIVITY, null);
final Sheet sheet = new CreoleParser(fc, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT),
skinParam, CreoleMode.FULL).createSheet(label);
- this.tb = new SheetBlock2(new SheetBlock1(sheet, LineBreakStrategy.NONE, skinParam.getPadding()), new MyStencil(), new UStroke(1));
+ this.tb = new SheetBlock2(new SheetBlock1(sheet, skinParam.wrapWidth(), skinParam.getPadding()), new MyStencil(), new UStroke(1));
this.print = label.toString();
}
@@ -142,8 +142,8 @@
final double heightTotal = dimTotal.getHeight();
final UDrawable rect = style.getUDrawable(widthTotal, heightTotal, skinParam().shadowing());
- final HtmlColor borderColor = SkinParamUtils.getColor(skinParam, ColorParam.activityBorder, null);
- final HtmlColor backColor = SkinParamUtils.getColor(skinParam, ColorParam.activityBackground, null);
+ final HtmlColor borderColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBorder, null);
+ final HtmlColor backColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBackground, null);
ug = ug.apply(new UChangeColor(borderColor)).apply(new UChangeBackColor(backColor)).apply(getThickness());
rect.drawU(ug);
@@ -151,7 +151,8 @@
tb.drawU(ug.apply(new UTranslate(MARGIN, MARGIN)));
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dim = tb.calculateDimension(stringBounder);
return new FtileGeometry(Dimension2DDouble.delta(dim, 2 * MARGIN, 2 * MARGIN), dim.getWidth() / 2 + MARGIN, 0,
dim.getHeight() + 2 * MARGIN);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java 2018-07-27 21:59:19.000000000 +0000
@@ -111,7 +111,8 @@
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
return new FtileGeometry(SIZE, SIZE, SIZE / 2, 0);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleSpot.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,119 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile.vertical;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+
+import net.sourceforge.plantuml.ColorParam;
+import net.sourceforge.plantuml.FontParam;
+import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.SkinParamUtils;
+import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
+import net.sourceforge.plantuml.graphic.FontConfiguration;
+import net.sourceforge.plantuml.graphic.HtmlColor;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.ugraphic.UCenteredCharacter;
+import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
+import net.sourceforge.plantuml.ugraphic.UChangeColor;
+import net.sourceforge.plantuml.ugraphic.UEllipse;
+import net.sourceforge.plantuml.ugraphic.UFont;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
+
+public class FtileCircleSpot extends AbstractFtile {
+
+ private static final int SIZE = 20;
+
+ private final Swimlane swimlane;
+ private final String spot;
+ private final FontConfiguration fc;
+
+ public FtileCircleSpot(ISkinParam skinParam, Swimlane swimlane, String spot, UFont font) {
+ super(skinParam);
+ this.spot = spot;
+ this.swimlane = swimlane;
+ // this.font = font;
+ this.fc = new FontConfiguration(skinParam, FontParam.ACTIVITY, null);
+ }
+
+ @Override
+ public Collection getMyChildren() {
+ return Collections.emptyList();
+ }
+
+ public Set getSwimlanes() {
+ if (swimlane == null) {
+ return Collections.emptySet();
+ }
+ return Collections.singleton(swimlane);
+ }
+
+ public Swimlane getSwimlaneIn() {
+ return swimlane;
+ }
+
+ public Swimlane getSwimlaneOut() {
+ return swimlane;
+ }
+
+ public void drawU(UGraphic ug) {
+
+ final HtmlColor borderColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBorder, null);
+ final HtmlColor backColor = SkinParamUtils.getColor(skinParam(), ColorParam.activityBackground, null);
+
+ final UEllipse circle = new UEllipse(SIZE, SIZE);
+ if (skinParam().shadowing()) {
+ circle.setDeltaShadow(3);
+ }
+ ug.apply(new UChangeColor(borderColor)).apply(new UChangeBackColor(backColor)).apply(getThickness())
+ .draw(circle);
+
+ ug.apply(new UChangeColor(fc.getColor())).apply(new UTranslate(SIZE / 2, SIZE / 2))
+ .draw(new UCenteredCharacter(spot.charAt(0), fc.getFont()));
+
+ }
+
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
+ return new FtileGeometry(SIZE, SIZE, SIZE / 2, 0, SIZE);
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java 2018-07-27 21:59:19.000000000 +0000
@@ -92,7 +92,8 @@
ug.apply(new UChangeColor(null)).apply(new UChangeBackColor(backColor)).draw(circle);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
return new FtileGeometry(SIZE, SIZE, SIZE / 2, 0, SIZE);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java 2018-07-27 21:59:19.000000000 +0000
@@ -108,7 +108,8 @@
.draw(circleSmall);
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
return new FtileGeometry(SIZE, SIZE, SIZE / 2, 0);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java 2018-07-27 21:59:19.000000000 +0000
@@ -130,7 +130,8 @@
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D dim = calculateDimensionInternal(stringBounder);
return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight());
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java 2018-07-27 21:59:19.000000000 +0000
@@ -150,7 +150,8 @@
return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight());
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D diamond = calculateDimensionAlone(stringBounder);
final Dimension2D north = this.north.calculateDimension(stringBounder);
final double height = diamond.getHeight() + north.getHeight();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java 2018-07-27 21:59:19.000000000 +0000
@@ -152,7 +152,8 @@
return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight());
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final Dimension2D diamond = calculateDimensionAlone(stringBounder);
final Dimension2D north = this.north.calculateDimension(stringBounder);
final double height = diamond.getHeight() + north.getHeight();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java 2018-07-27 21:59:19.000000000 +0000
@@ -161,7 +161,8 @@
return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight());
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final FtileGeometry dimDiamonAlone = calculateDimensionAlone(stringBounder);
final Dimension2D dimWest = west.calculateDimension(stringBounder);
final Dimension2D dimEast = east.calculateDimension(stringBounder);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java 2018-07-27 21:59:19.000000000 +0000
@@ -147,7 +147,8 @@
+ Diamond.diamondHalfSize)));
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
final double suppY1 = north.calculateDimension(stringBounder).getHeight();
final Dimension2D dim = new Dimension2DDouble(Diamond.diamondHalfSize * 2, Diamond.diamondHalfSize * 2 + suppY1);
return new FtileGeometry(dim, dim.getWidth() / 2, suppY1, dim.getHeight());
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileThinSplit.java 2018-07-27 21:59:19.000000000 +0000
@@ -44,7 +44,6 @@
import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.ULine;
@@ -73,7 +72,8 @@
this.last = last;
}
- public FtileGeometry calculateDimension(StringBounder stringBounder) {
+ @Override
+ protected FtileGeometry calculateDimensionFtile(StringBounder stringBounder) {
return new FtileGeometry(width, height, width / 2, 0, height);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java 2018-07-27 21:59:19.000000000 +0000
@@ -47,6 +47,7 @@
import net.sourceforge.plantuml.cucadiagram.LinkStyle;
import net.sourceforge.plantuml.graphic.HtmlColor;
import net.sourceforge.plantuml.graphic.HtmlColorAndStyle;
+import net.sourceforge.plantuml.ugraphic.MinMax;
import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
import net.sourceforge.plantuml.ugraphic.UGraphic;
@@ -70,15 +71,15 @@
throw new IllegalArgumentException();
}
final LinkStyle style = color.getStyle();
- if (style == LinkStyle.INVISIBLE) {
+ if (style.isInvisible()) {
return;
}
ug = ug.apply(new UChangeColor(color2));
ug = ug.apply(new UChangeBackColor(color2));
- if (style == LinkStyle.NORMAL) {
+ if (style.isNormal()) {
ug = ug.apply(new UStroke(stroke));
} else {
- ug = ug.apply(LinkStyle.getStroke(style, stroke));
+ ug = ug.apply(style.goThickness(stroke).getStroke3());
}
boolean drawn = false;
for (int i = 0; i < points.size() - 1; i++) {
@@ -231,6 +232,17 @@
return Collections.unmodifiableCollection(points).iterator();
}
+ public boolean doesHorizontalCross(MinMax area) {
+ for (int i = 0; i < points.size() - 1; i++) {
+ final Point2D.Double pt1 = get(i);
+ final Point2D.Double pt2 = get(i + 1);
+ if (pt1.getY() == pt2.getY() && area.doesHorizontalCross(pt1, pt2)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public int size() {
return this.points.size();
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java 2018-07-27 21:59:19.000000000 +0000
@@ -91,7 +91,7 @@
public UTranslate getFirst() {
return translations.get(0);
}
-
+
public int size() {
return translations.size();
}
@@ -187,6 +187,10 @@
return new UTranslate(result.getExtreme() * (size - 1), 0);
}
+ public boolean isDxNegative() {
+ return translations.get(0).getDx() < 0;
+ }
+
public Worm mute(Worm original) {
final Worm result = new Worm();
for (int i = 0; i < original.size(); i++) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/ZadBuilder.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,135 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile;
+
+import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.graphic.StringBounder;
+import net.sourceforge.plantuml.ugraphic.ColorMapper;
+import net.sourceforge.plantuml.ugraphic.MinMax;
+import net.sourceforge.plantuml.ugraphic.UChange;
+import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
+import net.sourceforge.plantuml.ugraphic.UChangeColor;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UParam;
+import net.sourceforge.plantuml.ugraphic.UParamNull;
+import net.sourceforge.plantuml.ugraphic.URectangle;
+import net.sourceforge.plantuml.ugraphic.UShape;
+import net.sourceforge.plantuml.ugraphic.UStroke;
+import net.sourceforge.plantuml.ugraphic.UTranslate;
+
+public class ZadBuilder implements UGraphic {
+
+ public UGraphic apply(UChange change) {
+ if (change instanceof UTranslate) {
+ return new ZadBuilder(stringBounder, translate.compose((UTranslate) change), this.context);
+ } else if (change instanceof UStroke) {
+ return new ZadBuilder(this);
+ } else if (change instanceof UChangeBackColor) {
+ return new ZadBuilder(this);
+ } else if (change instanceof UChangeColor) {
+ return new ZadBuilder(this);
+ }
+ throw new UnsupportedOperationException();
+ }
+
+ private final StringBounder stringBounder;
+ private final UTranslate translate;
+ private final Context context;
+
+ static class Context {
+ private final Zad zad = new Zad();
+ }
+
+ public ZadBuilder(StringBounder stringBounder) {
+ this(stringBounder, new UTranslate(), new Context());
+ }
+
+ private ZadBuilder(StringBounder stringBounder, UTranslate translate, Context context) {
+ this.stringBounder = stringBounder;
+ this.translate = translate;
+ this.context = context;
+ }
+
+ private ZadBuilder(ZadBuilder other) {
+ this(other.stringBounder, other.translate, other.context);
+ }
+
+ public StringBounder getStringBounder() {
+ return stringBounder;
+ }
+
+ public UParam getParam() {
+ return new UParamNull();
+ }
+
+ public void draw(UShape shape) {
+ if (shape instanceof URectangle) {
+ drawRectangle((URectangle) shape);
+ }
+ }
+
+ private void drawRectangle(URectangle shape) {
+ final MinMax area = shape.getMinMax().translate(translate);
+ // System.err.println("ZadBuilder " + shape + " " + area);
+ context.zad.add(area);
+ }
+
+ public ColorMapper getColorMapper() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void startUrl(Url url) {
+ }
+
+ public void closeAction() {
+ }
+
+ public void flushUg() {
+ }
+
+ public boolean matchesProperty(String propertyName) {
+ return false;
+ }
+
+ public double dpiFactor() {
+ return 1;
+ }
+
+ public Zad getZad() {
+ return context.zad;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,74 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3.ftile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.plantuml.graphic.HtmlColorUtils;
+import net.sourceforge.plantuml.ugraphic.MinMax;
+import net.sourceforge.plantuml.ugraphic.UChangeBackColor;
+import net.sourceforge.plantuml.ugraphic.UChangeColor;
+import net.sourceforge.plantuml.ugraphic.UGraphic;
+
+public class Zad {
+
+ private final List rectangles = new ArrayList();
+
+ public void add(MinMax rect) {
+ // System.err.println("add " + rect);
+ this.rectangles.add(rect);
+
+ }
+
+ public void drawDebug(UGraphic ug) {
+ ug = ug.apply(new UChangeBackColor(HtmlColorUtils.BLUE)).apply(new UChangeColor(HtmlColorUtils.RED_LIGHT));
+ for (MinMax minMax : rectangles) {
+ System.err.println("minmax=" + minMax);
+ minMax.drawGrey(ug);
+ }
+
+ }
+
+ public boolean doesHorizontalCross(Snake snake) {
+ for (MinMax minMax : rectangles) {
+ if (snake.doesHorizontalCross(minMax)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java 2018-07-27 21:59:19.000000000 +0000
@@ -65,9 +65,14 @@
return all.isEmpty();
}
- public boolean isOnlySingleStop() {
- return all.size() == 1 && getLast() instanceof InstructionStop
- && ((InstructionStop) getLast()).hasNotes() == false;
+ public boolean isOnlySingleStopOrSpot() {
+ if (all.size() != 1) {
+ return false;
+ }
+ if (getLast() instanceof InstructionSpot) {
+ return true;
+ }
+ return getLast() instanceof InstructionStop && ((InstructionStop) getLast()).hasNotes() == false;
}
public InstructionList(Swimlane defaultSwimlane) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java 2018-07-27 21:59:19.000000000 +0000
@@ -78,6 +78,13 @@
this.color = color;
}
+ private boolean isLastOfTheParent() {
+ if (parent instanceof InstructionList) {
+ return ((InstructionList) parent).getLast() == this;
+ }
+ return false;
+ }
+
public void setBackward(Display label) {
this.backward = label;
}
@@ -89,9 +96,9 @@
public Ftile createFtile(FtileFactory factory) {
final Ftile back = Display.isNull(backward) ? null : factory.activity(backward, swimlane, BoxStyle.PLAIN,
Colors.empty());
- final Ftile result = factory.repeat(swimlane, repeatList.getSwimlaneOut(),
- startLabel, factory.decorateOut(repeatList.createFtile(factory), endRepeatLinkRendering), test, yes, out,
- color, backRepeatLinkRendering, back);
+ final Ftile result = factory.repeat(swimlane, repeatList.getSwimlaneOut(), startLabel,
+ factory.decorateOut(repeatList.createFtile(factory), endRepeatLinkRendering), test, yes, out, color,
+ backRepeatLinkRendering, back, isLastOfTheParent());
if (killed) {
return new FtileKilled(result);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/activitydiagram3/InstructionSpot.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,80 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.activitydiagram3;
+
+import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory;
+import net.sourceforge.plantuml.activitydiagram3.ftile.FtileKilled;
+import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane;
+
+public class InstructionSpot extends MonoSwimable implements Instruction {
+
+ private boolean killed = false;
+ private final LinkRendering inlinkRendering;
+ private final String spot;
+
+ public InstructionSpot(String spot, LinkRendering inlinkRendering, Swimlane swimlane) {
+ super(swimlane);
+ this.spot = spot;
+ this.inlinkRendering = inlinkRendering;
+ if (inlinkRendering == null) {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ public Ftile createFtile(FtileFactory factory) {
+ Ftile result = factory.spot(getSwimlaneIn(), spot);
+ result = eventuallyAddNote(factory, result, result.getSwimlaneIn());
+ if (killed) {
+ return new FtileKilled(result);
+ }
+ return result;
+ }
+
+ public void add(Instruction other) {
+ throw new UnsupportedOperationException();
+ }
+
+ final public boolean kill() {
+ this.killed = true;
+ return true;
+ }
+
+ public LinkRendering getInLinkRendering() {
+ return inlinkRendering;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/AlignmentParam.java plantuml-1.2018.9/src/net/sourceforge/plantuml/AlignmentParam.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/AlignmentParam.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/AlignmentParam.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,59 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml;
+
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+
+
+public enum AlignmentParam {
+
+ arrowMessageAlignment(HorizontalAlignment.LEFT),
+ sequenceMessageAlignment(HorizontalAlignment.LEFT),
+ sequenceMessageTextAlignment(HorizontalAlignment.LEFT),
+ sequenceReferenceAlignment(HorizontalAlignment.CENTER),
+ packageTitleAlignment(HorizontalAlignment.CENTER),
+ noteTextAlignment(HorizontalAlignment.LEFT);
+
+ private final HorizontalAlignment defaultValue;
+
+ private AlignmentParam(HorizontalAlignment defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+ public final HorizontalAlignment getDefaultValue() {
+ return defaultValue;
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/AlignParam.java plantuml-1.2018.9/src/net/sourceforge/plantuml/AlignParam.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/AlignParam.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/AlignParam.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * Project Info: http://plantuml.com
- *
- * If you like this project or if you find it useful, you can support us at:
- *
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- *
- * This file is part of PlantUML.
- *
- * PlantUML is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlantUML distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- *
- *
- * Original Author: Arnaud Roques
- *
- *
- */
-package net.sourceforge.plantuml;
-
-import net.sourceforge.plantuml.graphic.HorizontalAlignment;
-
-
-public enum AlignParam {
-
- ARROW_MESSAGE_ALIGN(HorizontalAlignment.LEFT),
- SEQUENCE_MESSAGE_ALIGN(HorizontalAlignment.LEFT),
- SEQUENCE_MESSAGETEXT_ALIGN(HorizontalAlignment.LEFT),
- SEQUENCE_REFERENCE_ALIGN(HorizontalAlignment.CENTER);
-
- private final HorizontalAlignment defaultValue;
-
- private AlignParam(HorizontalAlignment defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public final HorizontalAlignment getDefaultValue() {
- return defaultValue;
- }
-}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/Annotated.java plantuml-1.2018.9/src/net/sourceforge/plantuml/Annotated.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/Annotated.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/Annotated.java 2018-07-27 21:59:19.000000000 +0000
@@ -36,6 +36,7 @@
package net.sourceforge.plantuml;
import net.sourceforge.plantuml.cucadiagram.DisplayPositionned;
+import net.sourceforge.plantuml.cucadiagram.DisplaySection;
public interface Annotated {
@@ -45,8 +46,8 @@
public DisplayPositionned getLegend();
- public DisplayPositionned getHeader();
+ public DisplaySection getHeader();
- public DisplayPositionned getFooter();
+ public DisplaySection getFooter();
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/AnnotatedWorker.java plantuml-1.2018.9/src/net/sourceforge/plantuml/AnnotatedWorker.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/AnnotatedWorker.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/AnnotatedWorker.java 2018-07-27 21:59:19.000000000 +0000
@@ -37,6 +37,7 @@
import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend;
import net.sourceforge.plantuml.cucadiagram.DisplayPositionned;
+import net.sourceforge.plantuml.cucadiagram.DisplaySection;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.TextBlock;
@@ -64,13 +65,13 @@
}
private TextBlock addLegend(TextBlock original) {
- if (DisplayPositionned.isNull(annotated.getLegend())) {
+ final DisplayPositionned legend = annotated.getLegend();
+ if (legend.isNull()) {
return original;
}
- final TextBlock text = EntityImageLegend.create(annotated.getLegend().getDisplay(), getSkinParam());
+ final TextBlock text = EntityImageLegend.create(legend.getDisplay(), getSkinParam());
- return DecorateEntityImage.add(original, text, annotated.getLegend().getHorizontalAlignment(), annotated
- .getLegend().getVerticalAlignment());
+ return DecorateEntityImage.add(original, text, legend.getHorizontalAlignment(), legend.getVerticalAlignment());
}
private ISkinParam getSkinParam() {
@@ -78,7 +79,8 @@
}
private TextBlock addCaption(TextBlock original) {
- if (DisplayPositionned.isNull(annotated.getCaption())) {
+ final DisplayPositionned caption = annotated.getCaption();
+ if (caption.isNull()) {
return original;
}
final TextBlock text = getCaption();
@@ -87,19 +89,17 @@
}
public TextBlock getCaption() {
- if (DisplayPositionned.isNull(annotated.getCaption())) {
+ final DisplayPositionned caption = annotated.getCaption();
+ if (caption.isNull()) {
return TextBlockUtils.empty(0, 0);
}
- return annotated
- .getCaption()
- .getDisplay()
- .create(new FontConfiguration(getSkinParam(), FontParam.CAPTION, null), HorizontalAlignment.CENTER,
- getSkinParam());
+ return caption.getDisplay().create(new FontConfiguration(getSkinParam(), FontParam.CAPTION, null),
+ HorizontalAlignment.CENTER, getSkinParam());
}
private TextBlock addTitle(TextBlock original) {
final DisplayPositionned title = annotated.getTitle();
- if (DisplayPositionned.isNull(title)) {
+ if (title.isNull()) {
return original;
}
ISkinParam skinParam = getSkinParam();
@@ -110,22 +110,21 @@
}
private TextBlock addHeaderAndFooter(TextBlock original) {
- if (DisplayPositionned.isNull(annotated.getFooter()) && DisplayPositionned.isNull(annotated.getHeader())) {
+ final DisplaySection footer = annotated.getFooter();
+ final DisplaySection header = annotated.getHeader();
+ if (footer.isNull() && header.isNull()) {
return original;
}
- final TextBlock textFooter = DisplayPositionned.isNull(annotated.getFooter()) ? null : annotated
- .getFooter()
- .getDisplay()
- .create(new FontConfiguration(getSkinParam(), FontParam.FOOTER, null),
- annotated.getFooter().getHorizontalAlignment(), getSkinParam());
- final TextBlock textHeader = DisplayPositionned.isNull(annotated.getHeader()) ? null : annotated
- .getHeader()
- .getDisplay()
- .create(new FontConfiguration(getSkinParam(), FontParam.HEADER, null),
- annotated.getHeader().getHorizontalAlignment(), getSkinParam());
+ TextBlock textFooter = null;
+ if (footer.isNull() == false) {
+ textFooter = footer.createRibbon(new FontConfiguration(getSkinParam(), FontParam.FOOTER, null), getSkinParam());
+ }
+ TextBlock textHeader = null;
+ if (header.isNull() == false) {
+ textHeader = header.createRibbon(new FontConfiguration(getSkinParam(), FontParam.HEADER, null), getSkinParam());
+ }
- return new DecorateEntityImage(original, textHeader, annotated.getHeader().getHorizontalAlignment(),
- textFooter, annotated.getFooter().getHorizontalAlignment());
+ return DecorateEntityImage.addTopAndBottom(original, textHeader, header.getHorizontalAlignment(), textFooter,
+ footer.getHorizontalAlignment());
}
-
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/ant/PlantUmlTask.java plantuml-1.2018.9/src/net/sourceforge/plantuml/ant/PlantUmlTask.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/ant/PlantUmlTask.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/ant/PlantUmlTask.java 2018-07-27 21:59:19.000000000 +0000
@@ -362,10 +362,10 @@
setNbThread(s);
}
- public void setSuggestEngine(String s) {
- OptionFlags.getInstance().setUseSuggestEngine(
- "true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s) || "on".equalsIgnoreCase(s));
- }
+// public void setSuggestEngine(String s) {
+// OptionFlags.getInstance().setUseSuggestEngine(
+// "true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s) || "on".equalsIgnoreCase(s));
+// }
public void setFailFast(String s) {
final boolean flag = "true".equalsIgnoreCase(s) || "yes".equalsIgnoreCase(s) || "on".equalsIgnoreCase(s);
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataAbstract.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataAbstract.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataAbstract.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataAbstract.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,73 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ *
+ *
+ */
+package net.sourceforge.plantuml.api;
+
+import java.awt.geom.Dimension2D;
+
+import net.sourceforge.plantuml.core.ImageData;
+
+public abstract class ImageDataAbstract implements ImageData {
+
+ private final int width;
+ private final int height;
+ private int status;
+
+ public ImageDataAbstract(int width, int height) {
+ this.width = width;
+ this.height = height;
+ }
+
+ public ImageDataAbstract(Dimension2D dim) {
+ this((int) dim.getWidth(), (int) dim.getHeight());
+ }
+
+ public final int getWidth() {
+ return width;
+ }
+
+ public final int getHeight() {
+ return height;
+ }
+
+ public final int getStatus() {
+ return status;
+ }
+
+ public final void setStatus(int status) {
+ this.status = status;
+ }
+
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataComplex.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataComplex.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataComplex.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataComplex.java 2018-07-27 21:59:19.000000000 +0000
@@ -38,35 +38,18 @@
import java.awt.geom.Dimension2D;
import net.sourceforge.plantuml.CMapData;
-import net.sourceforge.plantuml.core.ImageData;
-public class ImageDataComplex implements ImageData {
+public class ImageDataComplex extends ImageDataAbstract {
- private final Dimension2D info;
private final CMapData cmap;
private final String warningOrError;
-// public ImageDataComplex(Dimension2D info, CMapData cmap) {
-// this(info, cmap, null);
-// }
-
public ImageDataComplex(Dimension2D info, CMapData cmap, String warningOrError) {
- if (info==null) {
- throw new IllegalArgumentException();
- }
- this.info = info;
+ super(info);
this.cmap = cmap;
this.warningOrError = warningOrError;
}
- public int getWidth() {
- return (int) info.getWidth();
- }
-
- public int getHeight() {
- return (int) info.getHeight();
- }
-
public boolean containsCMapData() {
return cmap != null && cmap.containsData();
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataSimple.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataSimple.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/ImageDataSimple.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/ImageDataSimple.java 2018-07-27 21:59:19.000000000 +0000
@@ -39,30 +39,18 @@
import net.sourceforge.plantuml.core.ImageData;
-public class ImageDataSimple implements ImageData {
-
- private final int width;
- private final int height;
+public class ImageDataSimple extends ImageDataAbstract {
public ImageDataSimple(int width, int height) {
- this.width = width;
- this.height = height;
- }
-
- public ImageDataSimple() {
- this(0, 0);
+ super(width, height);
}
public ImageDataSimple(Dimension2D dim) {
- this((int) dim.getWidth(), (int) dim.getHeight());
- }
-
- public int getWidth() {
- return width;
+ super(dim);
}
- public int getHeight() {
- return height;
+ private ImageDataSimple() {
+ this(0, 0);
}
public boolean containsCMapData() {
@@ -77,4 +65,14 @@
return null;
}
+ public static ImageData error() {
+ final ImageDataSimple result = new ImageDataSimple();
+ result.setStatus(503);
+ return result;
+ }
+
+ public static ImageData ok() {
+ return new ImageDataSimple();
+ }
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/INumberAnalyzed.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/INumberAnalyzed.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/INumberAnalyzed.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/INumberAnalyzed.java 2018-07-27 21:59:19.000000000 +0000
@@ -40,4 +40,6 @@
public long getMean();
+ public long getSliddingMean();
+
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java 2018-07-27 21:59:19.000000000 +0000
@@ -162,9 +162,21 @@
if (nb.get() == 0) {
return 0;
}
+ // Bad
return sum.get() / nb.get();
}
+ public final long getSliddingMean() {
+ if (nb.get() == 0) {
+ return 0;
+ }
+ if (nb.get() < SLIDING_WINDOW) {
+ return sum.get() / nb.get();
+ }
+ // Bad
+ return sliddingSum.get() / nb.get();
+ }
+
final public String getName() {
return name;
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/api/NumberAnalyzed.java plantuml-1.2018.9/src/net/sourceforge/plantuml/api/NumberAnalyzed.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/api/NumberAnalyzed.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/api/NumberAnalyzed.java 2018-07-27 21:59:19.000000000 +0000
@@ -29,7 +29,6 @@
package net.sourceforge.plantuml.api;
import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.prefs.Preferences;
@@ -38,7 +37,7 @@
public class NumberAnalyzed implements INumberAnalyzed {
- private static final int SLIDING_WINDOW = 512;
+ private static final int SLIDING_WINDOW = 1024;
private long nb;
private long sum;
@@ -211,6 +210,16 @@
return sum / nb;
}
+ synchronized public final long getSliddingMean() {
+ if (nb == 0) {
+ return 0;
+ }
+ if (nb < SLIDING_WINDOW) {
+ return sum / nb;
+ }
+ return sliddingSum / nb;
+ }
+
public final long getStandardDeviation() {
final long sum1;
final long sumOfSquare1;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java 2018-07-27 21:59:19.000000000 +0000
@@ -78,6 +78,18 @@
}
}
+ private boolean isLong(char c) {
+ final int wc = Wcwidth.of(c);
+ if (wc == 1) {
+ return false;
+ }
+ if (wc == 2) {
+ return true;
+ }
+ return false;
+// throw new IllegalArgumentException("warning width=" + wc + " char=" + ((int) c));
+ }
+
private void ensurePossible(int x, int y) {
int newCharSize1 = charSize1;
int newCharSize2 = charSize2;
@@ -106,8 +118,15 @@
}
public void drawStringLR(String string, int x, int y) {
+ int pos = x;
for (int i = 0; i < string.length(); i++) {
- drawChar(string.charAt(i), x + i, y);
+ final char c = string.charAt(i);
+ drawChar(c, pos, y);
+ pos++;
+ if (isLong(c)) {
+ drawChar('\0', pos, y);
+ pos++;
+ }
}
}
@@ -120,7 +139,10 @@
public String getLine(int line) {
final StringBuilder sb = new StringBuilder(charSize1);
for (int x = 0; x < width; x++) {
- sb.append(chars[x][line]);
+ final char c = chars[x][line];
+ if (c != '\0') {
+ sb.append(c);
+ }
}
return sb.toString();
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java 2018-07-27 21:59:19.000000000 +0000
@@ -100,7 +100,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java 2018-07-27 21:59:19.000000000 +0000
@@ -96,7 +96,7 @@
final UmlCharArea charArea = ((UGraphicTxt) ug).getCharArea();
final int width = (int) dimensionToUse.getWidth();
final int height = (int) dimensionToUse.getHeight();
- final int textWidth = StringUtils.getWidth(stringsToDisplay);
+ final int textWidth = StringUtils.getWcWidth(stringsToDisplay);
final int yarrow = height - 2;
charArea.drawHLine(fileFormat == FileFormat.UTXT ? '\u2500' : '-', yarrow, 1, width);
@@ -125,7 +125,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- final int width = StringUtils.getWidth(stringsToDisplay) + 2;
+ final int width = StringUtils.getWcWidth(stringsToDisplay) + 2;
if (maxAsciiMessageLength > 0) {
return Math.min(maxAsciiMessageLength, width);
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java 2018-07-27 21:59:19.000000000 +0000
@@ -59,7 +59,7 @@
final Dimension2D dimensionToUse = area.getDimensionToUse();
final UmlCharArea charArea = ((UGraphicTxt) ug).getCharArea();
final int width = (int) dimensionToUse.getWidth();
- final int textWidth = StringUtils.getWidth(stringsToDisplay);
+ final int textWidth = StringUtils.getWcWidth(stringsToDisplay);
final int textPos = (width - textWidth) / 2;
if (stringsToDisplay.isWhite()) {
@@ -75,7 +75,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java 2018-07-27 21:59:19.000000000 +0000
@@ -63,7 +63,7 @@
final Dimension2D dimensionToUse = area.getDimensionToUse();
final UmlCharArea charArea = ((UGraphicTxt) ug).getCharArea();
final int width = (int) dimensionToUse.getWidth();
- final int textWidth = StringUtils.getWidth(stringsToDisplay);
+ final int textWidth = StringUtils.getWcWidth(stringsToDisplay);
// final int height = (int) dimensionToUse.getHeight();
final int textPos = (width - textWidth - 1) / 2;
@@ -91,7 +91,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java 2018-07-27 21:59:19.000000000 +0000
@@ -103,7 +103,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java 2018-07-27 21:59:19.000000000 +0000
@@ -86,7 +86,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 7;
+ return StringUtils.getWcWidth(stringsToDisplay) + 7;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java 2018-07-27 21:59:19.000000000 +0000
@@ -91,7 +91,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java 2018-07-27 21:59:19.000000000 +0000
@@ -102,7 +102,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 6;
+ return StringUtils.getWcWidth(stringsToDisplay) + 6;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java 2018-07-27 21:59:19.000000000 +0000
@@ -84,7 +84,7 @@
}
public double getPreferredWidth(StringBounder stringBounder) {
- return StringUtils.getWidth(stringsToDisplay) + 2;
+ return StringUtils.getWcWidth(stringsToDisplay) + 2;
}
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/Wcwidth.java plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/Wcwidth.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/asciiart/Wcwidth.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/asciiart/Wcwidth.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,253 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ *
+ *
+ * Original Author: Arnaud Roques
+ * Source code provided by Yasuhiro Matsumoto
+ *
+ */
+/**
+ * Source code provided by Yasuhiro Matsumoto.
+ * See:
+ * https://github.com/plantuml/plantuml/issues/74
+ *
+ * Many thanks for his help!
+ */
+/**
+ *
In fixed-width output devices, Latin characters all occupy a single
+ * "cell" position of equal width, whereas ideographic CJK characters
+ * occupy two such cells. Interoperability between terminal-line
+ * applications and (teletype-style) character terminals using the
+ * UTF-8 encoding requires agreement on which character should advance
+ * the cursor by how many cell positions. No established formal
+ * standards exist at present on which Unicode character shall occupy
+ * how many cell positions on character terminals. These routines are
+ * a first attempt of defining such behavior based on simple rules
+ * applied to data provided by the Unicode Consortium.
+ *
+ *
For some graphical characters, the Unicode standard explicitly
+ * defines a character-cell width via the definition of the East Asian
+ * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
+ * In all these cases, there is no ambiguity about which width a
+ * terminal shall use. For characters in the East Asian Ambiguous (A)
+ * class, the width choice depends purely on a preference of backward
+ * compatibility with either historic CJK or Western practice.
+ * Choosing single-width for these characters is easy to justify as
+ * the appropriate long-term solution, as the CJK practice of
+ * displaying these characters as double-width comes from historic
+ * implementation simplicity (8-bit encoded characters were displayed
+ * single-width and 16-bit ones double-width, even for Greek,
+ * Cyrillic, etc.) and not any typographic considerations.
+ *
+ *
Much less clear is the choice of width for the Not East Asian
+ * (Neutral) class. Existing practice does not dictate a width for any
+ * of these characters. It would nevertheless make sense
+ * typographically to allocate two character cells to characters such
+ * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
+ * represented adequately with a single-width glyph. The following
+ * routines at present merely assign a single-cell width to all
+ * neutral characters, in the interest of simplicity. This is not
+ * entirely satisfactory and should be reconsidered before
+ * establishing a formal standard in this area. At the moment, the
+ * decision which Not East Asian (Neutral) characters should be
+ * represented by double-width glyphs cannot yet be answered by
+ * applying a simple rule from the Unicode database content. Setting
+ * up a proper standard for the behavior of UTF-8 character terminals
+ * will require a careful analysis not only of each Unicode character,
+ * but also of each presentation form, something the author of these
+ * routines has avoided to do so far.
+ *
+ *
http://www.unicode.org/unicode/reports/tr11/
+ */
+package net.sourceforge.plantuml.asciiart;
+
+public class Wcwidth {
+
+ /**
+ * sorted list of non-overlapping intervals of non-spacing characters
+ * generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
+ */
+ private static final int[][] COMBINING = {
+ {0x0300, 0x036F}, {0x0483, 0x0486}, {0x0488, 0x0489},
+ {0x0591, 0x05BD}, {0x05BF, 0x05BF}, {0x05C1, 0x05C2},
+ {0x05C4, 0x05C5}, {0x05C7, 0x05C7}, {0x0600, 0x0603},
+ {0x0610, 0x0615}, {0x064B, 0x065E}, {0x0670, 0x0670},
+ {0x06D6, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED},
+ {0x070F, 0x070F}, {0x0711, 0x0711}, {0x0730, 0x074A},
+ {0x07A6, 0x07B0}, {0x07EB, 0x07F3}, {0x0901, 0x0902},
+ {0x093C, 0x093C}, {0x0941, 0x0948}, {0x094D, 0x094D},
+ {0x0951, 0x0954}, {0x0962, 0x0963}, {0x0981, 0x0981},
+ {0x09BC, 0x09BC}, {0x09C1, 0x09C4}, {0x09CD, 0x09CD},
+ {0x09E2, 0x09E3}, {0x0A01, 0x0A02}, {0x0A3C, 0x0A3C},
+ {0x0A41, 0x0A42}, {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D},
+ {0x0A70, 0x0A71}, {0x0A81, 0x0A82}, {0x0ABC, 0x0ABC},
+ {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8}, {0x0ACD, 0x0ACD},
+ {0x0AE2, 0x0AE3}, {0x0B01, 0x0B01}, {0x0B3C, 0x0B3C},
+ {0x0B3F, 0x0B3F}, {0x0B41, 0x0B43}, {0x0B4D, 0x0B4D},
+ {0x0B56, 0x0B56}, {0x0B82, 0x0B82}, {0x0BC0, 0x0BC0},
+ {0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48},
+ {0x0C4A, 0x0C4D}, {0x0C55, 0x0C56}, {0x0CBC, 0x0CBC},
+ {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6}, {0x0CCC, 0x0CCD},
+ {0x0CE2, 0x0CE3}, {0x0D41, 0x0D43}, {0x0D4D, 0x0D4D},
+ {0x0DCA, 0x0DCA}, {0x0DD2, 0x0DD4}, {0x0DD6, 0x0DD6},
+ {0x0E31, 0x0E31}, {0x0E34, 0x0E3A}, {0x0E47, 0x0E4E},
+ {0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC},
+ {0x0EC8, 0x0ECD}, {0x0F18, 0x0F19}, {0x0F35, 0x0F35},
+ {0x0F37, 0x0F37}, {0x0F39, 0x0F39}, {0x0F71, 0x0F7E},
+ {0x0F80, 0x0F84}, {0x0F86, 0x0F87}, {0x0F90, 0x0F97},
+ {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030},
+ {0x1032, 0x1032}, {0x1036, 0x1037}, {0x1039, 0x1039},
+ {0x1058, 0x1059}, {0x1160, 0x11FF}, {0x135F, 0x135F},
+ {0x1712, 0x1714}, {0x1732, 0x1734}, {0x1752, 0x1753},
+ {0x1772, 0x1773}, {0x17B4, 0x17B5}, {0x17B7, 0x17BD},
+ {0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x17DD, 0x17DD},
+ {0x180B, 0x180D}, {0x18A9, 0x18A9}, {0x1920, 0x1922},
+ {0x1927, 0x1928}, {0x1932, 0x1932}, {0x1939, 0x193B},
+ {0x1A17, 0x1A18}, {0x1B00, 0x1B03}, {0x1B34, 0x1B34},
+ {0x1B36, 0x1B3A}, {0x1B3C, 0x1B3C}, {0x1B42, 0x1B42},
+ {0x1B6B, 0x1B73}, {0x1DC0, 0x1DCA}, {0x1DFE, 0x1DFF},
+ {0x200B, 0x200F}, {0x202A, 0x202E}, {0x2060, 0x2063},
+ {0x206A, 0x206F}, {0x20D0, 0x20EF}, {0x302A, 0x302F},
+ {0x3099, 0x309A}, {0xA806, 0xA806}, {0xA80B, 0xA80B},
+ {0xA825, 0xA826}, {0xFB1E, 0xFB1E}, {0xFE00, 0xFE0F},
+ {0xFE20, 0xFE23}, {0xFEFF, 0xFEFF}, {0xFFF9, 0xFFFB},
+ {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
+ {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x1D167, 0x1D169},
+ {0x1D173, 0x1D182}, {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD},
+ {0x1D242, 0x1D244}, {0xE0001, 0xE0001}, {0xE0020, 0xE007F},
+ {0xE0100, 0xE01EF}
+ };
+
+ static boolean bisearch(int ucs) {
+ int min = 0;
+ int mid;
+ int max = COMBINING.length - 1;
+
+ if (ucs < COMBINING[0][0] || ucs > COMBINING[max][1]) {
+ return false;
+ }
+ while (max >= min) {
+ mid = (min + max) / 2;
+ if (ucs > COMBINING[mid][1]) {
+ min = mid + 1;
+ } else if (ucs < COMBINING[mid][0]) {
+ max = mid - 1;
+ } else {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * See : http://www.cl.cam.ac.uk/%7Emgk25/ucs/wcwidth.c
+ *
+ * The following two functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ * - The null character (U+0000) has a column width of 0.
+ *
+ * - Other C0/C1 control characters and DEL will lead to a return
+ * value of -1.
+ *
+ * - Non-spacing and enclosing combining characters (general
+ * category code Mn or Me in the Unicode database) have a
+ * column width of 0.
+ *
+ * - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *
+ * - Other format characters (general category code Cf in the Unicode
+ * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ * have a column width of 0.
+ *
+ * - Spacing characters in the East Asian Wide (W) or East Asian
+ * Full-width (F) category as defined in Unicode Technical
+ * Report #11 have a column width of 2.
+ *
+ * - All remaining characters (including all printable
+ * ISO 8859-1 and WGL4 characters, Unicode control characters,
+ * etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+ public static int of(int codePoint) {
+ // test for 8-bit control characters
+ if (codePoint == 0) {
+ return 0;
+ }
+ if (codePoint < 32 || (codePoint >= 0x7f && codePoint < 0xa0)) {
+ return -1;
+ }
+ // Added by Arnaud : Usual 8 bit char
+ if (codePoint < 127) {
+ return 1;
+ }
+ // binary search in table of non-spacing characters
+ if (bisearch(codePoint)) {
+ return 0;
+ }
+
+ // if we arrive here, ucs is not a combining or C0/C1 control character
+ return 1 +
+ ((codePoint >= 0x1100 &&
+ (codePoint <= 0x115f || // Hangul Jamo init. consonants
+ codePoint == 0x2329 || codePoint == 0x232a ||
+ (codePoint >= 0x2e80 && codePoint <= 0xa4cf &&
+ codePoint != 0x303f) || // CJK ... Yi
+ (codePoint >= 0xac00 && codePoint <= 0xd7a3) || // Hangul Syllables
+ (codePoint >= 0xf900 && codePoint <= 0xfaff) || // CJK Compatibility Ideographs
+ (codePoint >= 0xfe10 && codePoint <= 0xfe19) || // Vertical forms
+ (codePoint >= 0xfe30 && codePoint <= 0xfe6f) || // CJK Compatibility Forms
+ (codePoint >= 0xff00 && codePoint <= 0xff60) || // Fullwidth Forms
+ (codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
+ (codePoint >= 0x20000 && codePoint <= 0x2fffd) ||
+ (codePoint >= 0x30000 && codePoint <= 0x3fffd))) ? 1 : 0);
+ }
+
+ public static int length(CharSequence s) {
+ int result = 0;
+ for (int i = 0; i < s.length(); i++) {
+ result += of(s.charAt(i));
+ }
+ return result;
+ }
+}
\ No newline at end of file
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/BackSlash.java plantuml-1.2018.9/src/net/sourceforge/plantuml/BackSlash.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/BackSlash.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/BackSlash.java 2018-07-27 21:59:19.000000000 +0000
@@ -99,7 +99,7 @@
final StringBuilder result = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
final char c = s.charAt(i);
- if (c == '\\' && i < s.length() - 1 && isEnglishLetter(s.charAt(i + 1))) {
+ if (c == '\\' && i < s.length() - 1 && isEnglishLetterOfBackSlash(s.charAt(i + 1))) {
result.append('\\');
result.append(translateChar(s.charAt(i + 1)));
i++;
@@ -110,6 +110,11 @@
return result.toString();
}
+ private static boolean isEnglishLetterOfBackSlash(char c) {
+ return c == 'n';
+ // return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+ }
+
public static String untranslateBackSlashes(CharSequence s) {
if (s == null) {
return null;
@@ -125,10 +130,6 @@
return result.toString();
}
- private static boolean isEnglishLetter(char c) {
- return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
- }
-
private static char translateChar(char c) {
if (c > 128) {
throw new IllegalArgumentException();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/BasicEnsureVisible.java plantuml-1.2018.9/src/net/sourceforge/plantuml/BasicEnsureVisible.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/BasicEnsureVisible.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/BasicEnsureVisible.java 2018-07-27 21:59:19.000000000 +0000
@@ -57,6 +57,10 @@
}
}
+ public boolean hasData() {
+ return minX != Double.MAX_VALUE;
+ }
+
public String getCoords(double scale) {
if (minX == Double.MAX_VALUE) {
return "0,0,0,0";
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/BlockUmlBuilder.java plantuml-1.2018.9/src/net/sourceforge/plantuml/BlockUmlBuilder.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/BlockUmlBuilder.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/BlockUmlBuilder.java 2018-07-27 21:59:19.000000000 +0000
@@ -39,7 +39,6 @@
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -64,9 +63,9 @@
Preprocessor includer = null;
this.defines = defines;
try {
- reader2 = new UncommentReadLine(new ReadLineReader(reader, desc));
- includer = new Preprocessor(reader2, charset, defines, newCurrentDir, this);
- init(includer, config);
+ reader2 = new UncommentReadLine(ReadLineReader.create(reader, desc));
+ includer = new Preprocessor(config, reader2, charset, defines, newCurrentDir, this);
+ init(includer);
} finally {
if (includer != null) {
includer.close();
@@ -79,7 +78,7 @@
this(config, charset, defines, reader, null, null);
}
- private void init(Preprocessor includer, List config) throws IOException {
+ private void init(Preprocessor includer) throws IOException {
CharSequence2 s = null;
List current2 = null;
boolean paused = false;
@@ -94,6 +93,10 @@
paused = true;
reader2.setPaused(true);
}
+ if (StartUtils.isExit(s)) {
+ paused = true;
+ reader2.setPaused(true);
+ }
if (current2 != null && paused == false) {
current2.add(s);
} else if (paused) {
@@ -108,21 +111,23 @@
reader2.setPaused(false);
}
if (StartUtils.isArobaseEndDiagram(s) && current2 != null) {
- current2.addAll(1, convert(config, new LineLocationImpl(null, null).oneLineRead()));
- blocks.add(new BlockUml(current2, startLine - config.size(), defines.cloneMe()));
+ if (paused) {
+ current2.add(s);
+ }
+ blocks.add(new BlockUml(current2, startLine/* - config.size() */, defines.cloneMe()));
current2 = null;
reader2.setPaused(false);
}
}
}
- private Collection convert(List config, LineLocation location) {
- final List result = new ArrayList();
- for (String s : config) {
- result.add(new CharSequence2Impl(s, location));
- }
- return result;
- }
+ // private Collection convert(List config, LineLocation location) {
+ // final List result = new ArrayList();
+ // for (String s : config) {
+ // result.add(new CharSequence2Impl(s, location));
+ // }
+ // return result;
+ // }
public List getBlockUmls() {
return Collections.unmodifiableList(blocks);
@@ -136,7 +141,7 @@
for (BlockUml block : blocks) {
if (block.isStartDef(name)) {
this.defines.importFrom(block.getLocalDefines());
- return block.getDefinition();
+ return block.getDefinition(false);
}
}
return Collections.emptyList();
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/BlockUml.java plantuml-1.2018.9/src/net/sourceforge/plantuml/BlockUml.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/BlockUml.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/BlockUml.java 2018-07-27 21:59:19.000000000 +0000
@@ -173,9 +173,9 @@
return data.get(0).toString().equalsIgnoreCase(signature);
}
- public List getDefinition() {
- if (data.get(0).toString().startsWith("@startdef") == false) {
- throw new IllegalStateException();
+ public List getDefinition(boolean withHeader) {
+ if (withHeader) {
+ return Collections.unmodifiableList(data);
}
return Collections.unmodifiableList(data.subList(1, data.size() - 1));
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/bpm/BpmElement.java plantuml-1.2018.9/src/net/sourceforge/plantuml/bpm/BpmElement.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/bpm/BpmElement.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/bpm/BpmElement.java 2018-07-27 21:59:19.000000000 +0000
@@ -52,6 +52,7 @@
import net.sourceforge.plantuml.graphic.InnerStrategy;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.ugraphic.MinMax;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
import net.sourceforge.plantuml.ugraphic.UFont;
import net.sourceforge.plantuml.ugraphic.UGraphic;
@@ -111,6 +112,10 @@
public Dimension2D calculateDimension(StringBounder stringBounder) {
return raw.calculateDimension(stringBounder);
}
+
+ public MinMax getMinMax(StringBounder stringBounder) {
+ return raw.getMinMax(stringBounder);
+ }
};
}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java plantuml-1.2018.9/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java 2018-07-27 21:59:19.000000000 +0000
@@ -44,6 +44,7 @@
import net.sourceforge.plantuml.graphic.InnerStrategy;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.ugraphic.MinMax;
import net.sourceforge.plantuml.ugraphic.UChangeColor;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.ULine;
@@ -115,6 +116,11 @@
public Dimension2D calculateDimension(StringBounder stringBounder) {
return new Dimension2DDouble(20, 20);
}
+
+ public MinMax getMinMax(StringBounder stringBounder) {
+ throw new UnsupportedOperationException();
+ }
+
public Rectangle2D getInnerPosition(String member, StringBounder stringBounder, InnerStrategy strategy) {
return null;
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/braille/UGraphicBraille.java plantuml-1.2018.9/src/net/sourceforge/plantuml/braille/UGraphicBraille.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/braille/UGraphicBraille.java 2017-07-03 17:59:53.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/braille/UGraphicBraille.java 2018-07-27 21:59:19.000000000 +0000
@@ -39,6 +39,7 @@
import net.sourceforge.plantuml.FileFormat;
import net.sourceforge.plantuml.FileFormatOption;
+import net.sourceforge.plantuml.TikzFontDistortion;
import net.sourceforge.plantuml.Url;
import net.sourceforge.plantuml.graphic.HtmlColorUtils;
import net.sourceforge.plantuml.graphic.StringBounder;
@@ -117,7 +118,7 @@
}
public StringBounder getStringBounder() {
- return FileFormat.BRAILLE_PNG.getDefaultStringBounder();
+ return FileFormat.BRAILLE_PNG.getDefaultStringBounder(TikzFontDistortion.getDefault());
}
public void startUrl(Url url) {
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BitReader.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BitReader.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BitReader.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BitReader.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,269 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+/**
+ * Bit reading helpers.
+ */
+final class BitReader {
+
+ // Added by Arnaud... not very beautifull
+ private static final boolean CHECK_UNUSED_BYTES_AFTER_END = false;
+
+ // Possible values: {5, 6}. 5 corresponds to 32-bit build, 6 to 64-bit. This value is used for
+ // conditional compilation -> produced artifacts might be binary INCOMPATIBLE (JLS 13.2).
+ private static final int LOG_BITNESS = 6;
+ private static final int BITNESS = 1 << LOG_BITNESS;
+
+ private static final int BYTENESS = BITNESS / 8;
+ private static final int CAPACITY = 4096;
+ // After encountering the end of the input stream, this amount of zero bytes will be appended.
+ private static final int SLACK = 64;
+ private static final int BUFFER_SIZE = CAPACITY + SLACK;
+ // Don't bother to replenish the buffer while this number of bytes is available.
+ private static final int SAFEGUARD = 36;
+ private static final int WATERLINE = CAPACITY - SAFEGUARD;
+
+ // "Half" refers to "half of native integer type", i.e. on 64-bit machines it is 32-bit type,
+ // on 32-bit machines it is 16-bit.
+ private static final int HALF_BITNESS = BITNESS / 2;
+ private static final int HALF_SIZE = BYTENESS / 2;
+ private static final int HALVES_CAPACITY = CAPACITY / HALF_SIZE;
+ private static final int HALF_BUFFER_SIZE = BUFFER_SIZE / HALF_SIZE;
+ private static final int HALF_WATERLINE = WATERLINE / HALF_SIZE;
+
+ private static final int LOG_HALF_SIZE = LOG_BITNESS - 4;
+
+ /**
+ * Fills up the input buffer.
+ *
+ *
No-op if there are at least 36 bytes present after current position.
+ *
+ *
After encountering the end of the input stream, 64 additional zero bytes are copied to the
+ * buffer.
+ */
+ static void readMoreInput(State s) {
+ if (s.halfOffset > HALF_WATERLINE) {
+ doReadMoreInput(s);
+ }
+ }
+
+ static void doReadMoreInput(State s) {
+ if (s.endOfStreamReached != 0) {
+ if (halfAvailable(s) >= -2) {
+ return;
+ }
+ throw new BrotliRuntimeException("No more input");
+ }
+ int readOffset = s.halfOffset << LOG_HALF_SIZE;
+ int bytesInBuffer = CAPACITY - readOffset;
+ // Move unused bytes to the head of the buffer.
+ Utils.copyBytesWithin(s.byteBuffer, 0, readOffset, CAPACITY);
+ s.halfOffset = 0;
+ while (bytesInBuffer < CAPACITY) {
+ int spaceLeft = CAPACITY - bytesInBuffer;
+ int len = Utils.readInput(s.input, s.byteBuffer, bytesInBuffer, spaceLeft);
+ // EOF is -1 in Java, but 0 in C#.
+ if (len <= 0) {
+ s.endOfStreamReached = 1;
+ s.tailBytes = bytesInBuffer;
+ bytesInBuffer += HALF_SIZE - 1;
+ break;
+ }
+ bytesInBuffer += len;
+ }
+ bytesToNibbles(s, bytesInBuffer);
+ }
+
+ static void checkHealth(State s, int endOfStream) {
+ if (s.endOfStreamReached == 0) {
+ return;
+ }
+ int byteOffset = (s.halfOffset << LOG_HALF_SIZE) + ((s.bitOffset + 7) >> 3) - BYTENESS;
+ if (byteOffset > s.tailBytes) {
+ throw new BrotliRuntimeException("Read after end");
+ }
+ if (CHECK_UNUSED_BYTES_AFTER_END && (endOfStream != 0) && (byteOffset != s.tailBytes)) {
+ throw new BrotliRuntimeException("Unused bytes after end");
+ }
+ }
+
+ static void fillBitWindow(State s) {
+ if (s.bitOffset >= HALF_BITNESS) {
+ // Same as doFillBitWindow. JVM fails to inline it.
+ if (BITNESS == 64) {
+ s.accumulator64 = ((long) s.intBuffer[s.halfOffset++] << HALF_BITNESS)
+ | (s.accumulator64 >>> HALF_BITNESS);
+ } else {
+ s.accumulator32 = ((int) s.shortBuffer[s.halfOffset++] << HALF_BITNESS)
+ | (s.accumulator32 >>> HALF_BITNESS);
+ }
+ s.bitOffset -= HALF_BITNESS;
+ }
+ }
+
+ private static void doFillBitWindow(State s) {
+ if (BITNESS == 64) {
+ s.accumulator64 = ((long) s.intBuffer[s.halfOffset++] << HALF_BITNESS)
+ | (s.accumulator64 >>> HALF_BITNESS);
+ } else {
+ s.accumulator32 = ((int) s.shortBuffer[s.halfOffset++] << HALF_BITNESS)
+ | (s.accumulator32 >>> HALF_BITNESS);
+ }
+ s.bitOffset -= HALF_BITNESS;
+ }
+
+ static int peekBits(State s) {
+ if (BITNESS == 64) {
+ return (int) (s.accumulator64 >>> s.bitOffset);
+ } else {
+ return s.accumulator32 >>> s.bitOffset;
+ }
+ }
+
+ static int readFewBits(State s, int n) {
+ int val = peekBits(s) & ((1 << n) - 1);
+ s.bitOffset += n;
+ return val;
+ }
+
+ static int readBits(State s, int n) {
+ if (HALF_BITNESS >= 24) {
+ return readFewBits(s, n);
+ } else {
+ return (n <= 16) ? readFewBits(s, n) : readManyBits(s, n);
+ }
+ }
+
+ private static int readManyBits(State s, int n) {
+ int low = readFewBits(s, 16);
+ doFillBitWindow(s);
+ return low | (readFewBits(s, n - 16) << 16);
+ }
+
+ static void initBitReader(State s) {
+ s.byteBuffer = new byte[BUFFER_SIZE];
+ if (BITNESS == 64) {
+ s.accumulator64 = 0;
+ s.intBuffer = new int[HALF_BUFFER_SIZE];
+ } else {
+ s.accumulator32 = 0;
+ s.shortBuffer = new short[HALF_BUFFER_SIZE];
+ }
+ s.bitOffset = BITNESS;
+ s.halfOffset = HALVES_CAPACITY;
+ s.endOfStreamReached = 0;
+ prepare(s);
+ }
+
+ private static void prepare(State s) {
+ readMoreInput(s);
+ checkHealth(s, 0);
+ doFillBitWindow(s);
+ doFillBitWindow(s);
+ }
+
+ static void reload(State s) {
+ if (s.bitOffset == BITNESS) {
+ prepare(s);
+ }
+ }
+
+ static void jumpToByteBoundary(State s) {
+ int padding = (BITNESS - s.bitOffset) & 7;
+ if (padding != 0) {
+ int paddingBits = readFewBits(s, padding);
+ if (paddingBits != 0) {
+ throw new BrotliRuntimeException("Corrupted padding bits");
+ }
+ }
+ }
+
+ static int halfAvailable(State s) {
+ int limit = HALVES_CAPACITY;
+ if (s.endOfStreamReached != 0) {
+ limit = (s.tailBytes + (HALF_SIZE - 1)) >> LOG_HALF_SIZE;
+ }
+ return limit - s.halfOffset;
+ }
+
+ static void copyBytes(State s, byte[] data, int offset, int length) {
+ if ((s.bitOffset & 7) != 0) {
+ throw new BrotliRuntimeException("Unaligned copyBytes");
+ }
+
+ // Drain accumulator.
+ while ((s.bitOffset != BITNESS) && (length != 0)) {
+ data[offset++] = (byte) peekBits(s);
+ s.bitOffset += 8;
+ length--;
+ }
+ if (length == 0) {
+ return;
+ }
+
+ // Get data from shadow buffer with "sizeof(int)" granularity.
+ int copyNibbles = Math.min(halfAvailable(s), length >> LOG_HALF_SIZE);
+ if (copyNibbles > 0) {
+ int readOffset = s.halfOffset << LOG_HALF_SIZE;
+ int delta = copyNibbles << LOG_HALF_SIZE;
+ System.arraycopy(s.byteBuffer, readOffset, data, offset, delta);
+ offset += delta;
+ length -= delta;
+ s.halfOffset += copyNibbles;
+ }
+ if (length == 0) {
+ return;
+ }
+
+ // Read tail bytes.
+ if (halfAvailable(s) > 0) {
+ // length = 1..3
+ fillBitWindow(s);
+ while (length != 0) {
+ data[offset++] = (byte) peekBits(s);
+ s.bitOffset += 8;
+ length--;
+ }
+ checkHealth(s, 0);
+ return;
+ }
+
+ // Now it is possible to copy bytes directly.
+ while (length > 0) {
+ int len = Utils.readInput(s.input, data, offset, length);
+ if (len == -1) {
+ throw new BrotliRuntimeException("Unexpected end of input");
+ }
+ offset += len;
+ length -= len;
+ }
+ }
+
+ /**
+ * Translates bytes to halves (int/short).
+ */
+ static void bytesToNibbles(State s, int byteLen) {
+ byte[] byteBuffer = s.byteBuffer;
+ int halfLen = byteLen >> LOG_HALF_SIZE;
+ if (BITNESS == 64) {
+ int[] intBuffer = s.intBuffer;
+ for (int i = 0; i < halfLen; ++i) {
+ intBuffer[i] = ((byteBuffer[i * 4] & 0xFF))
+ | ((byteBuffer[(i * 4) + 1] & 0xFF) << 8)
+ | ((byteBuffer[(i * 4) + 2] & 0xFF) << 16)
+ | ((byteBuffer[(i * 4) + 3] & 0xFF) << 24);
+ }
+ } else {
+ short[] shortBuffer = s.shortBuffer;
+ for (int i = 0; i < halfLen; ++i) {
+ shortBuffer[i] = (short) ((byteBuffer[i * 2] & 0xFF)
+ | ((byteBuffer[(i * 2) + 1] & 0xFF) << 8));
+ }
+ }
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BrotliInputStream.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BrotliInputStream.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BrotliInputStream.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BrotliInputStream.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,150 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * {@link InputStream} decorator that decompresses brotli data.
+ *
+ *
Not thread-safe.
+ */
+public class BrotliInputStream extends InputStream {
+
+ public static final int DEFAULT_INTERNAL_BUFFER_SIZE = 16384;
+
+ /**
+ * Internal buffer used for efficient byte-by-byte reading.
+ */
+ private byte[] buffer;
+
+ /**
+ * Number of decoded but still unused bytes in internal buffer.
+ */
+ private int remainingBufferBytes;
+
+ /**
+ * Next unused byte offset.
+ */
+ private int bufferOffset;
+
+ /**
+ * Decoder state.
+ */
+ private final State state = new State();
+
+ /**
+ * Creates a {@link InputStream} wrapper that decompresses brotli data.
+ *
+ *
For byte-by-byte reading ({@link #read()}) internal buffer with
+ * {@link #DEFAULT_INTERNAL_BUFFER_SIZE} size is allocated and used.
+ *
+ *
Will block the thread until first kilobyte of data of source is available.
+ *
+ * @param source underlying data source
+ * @throws IOException in case of corrupted data or source stream problems
+ */
+ public BrotliInputStream(InputStream source) throws IOException {
+ this(source, DEFAULT_INTERNAL_BUFFER_SIZE);
+ }
+
+ /**
+ * Creates a {@link InputStream} wrapper that decompresses brotli data.
+ *
+ *
For byte-by-byte reading ({@link #read()}) internal buffer of specified size is
+ * allocated and used.
+ *
+ *
Will block the thread until first kilobyte of data of source is available.
+ *
+ * @param source compressed data source
+ * @param byteReadBufferSize size of internal buffer used in case of
+ * byte-by-byte reading
+ * @throws IOException in case of corrupted data or source stream problems
+ */
+ public BrotliInputStream(InputStream source, int byteReadBufferSize) throws IOException {
+ if (byteReadBufferSize <= 0) {
+ throw new IllegalArgumentException("Bad buffer size:" + byteReadBufferSize);
+ } else if (source == null) {
+ throw new IllegalArgumentException("source is null");
+ }
+ this.buffer = new byte[byteReadBufferSize];
+ this.remainingBufferBytes = 0;
+ this.bufferOffset = 0;
+ try {
+ Decode.initState(state, source);
+ } catch (BrotliRuntimeException ex) {
+ throw new IOException("Brotli decoder initialization failed", ex);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void close() throws IOException {
+ Decode.close(state);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int read() throws IOException {
+ if (bufferOffset >= remainingBufferBytes) {
+ remainingBufferBytes = read(buffer, 0, buffer.length);
+ bufferOffset = 0;
+ if (remainingBufferBytes == -1) {
+ return -1;
+ }
+ }
+ return buffer[bufferOffset++] & 0xFF;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int read(byte[] destBuffer, int destOffset, int destLen) throws IOException {
+ if (destOffset < 0) {
+ throw new IllegalArgumentException("Bad offset: " + destOffset);
+ } else if (destLen < 0) {
+ throw new IllegalArgumentException("Bad length: " + destLen);
+ } else if (destOffset + destLen > destBuffer.length) {
+ throw new IllegalArgumentException(
+ "Buffer overflow: " + (destOffset + destLen) + " > " + destBuffer.length);
+ } else if (destLen == 0) {
+ return 0;
+ }
+ int copyLen = Math.max(remainingBufferBytes - bufferOffset, 0);
+ if (copyLen != 0) {
+ copyLen = Math.min(copyLen, destLen);
+ System.arraycopy(buffer, bufferOffset, destBuffer, destOffset, copyLen);
+ bufferOffset += copyLen;
+ destOffset += copyLen;
+ destLen -= copyLen;
+ if (destLen == 0) {
+ return copyLen;
+ }
+ }
+ try {
+ state.output = destBuffer;
+ state.outputOffset = destOffset;
+ state.outputLength = destLen;
+ state.outputUsed = 0;
+ Decode.decompress(state);
+ if (state.outputUsed == 0) {
+ return -1;
+ }
+ return state.outputUsed + copyLen;
+ } catch (BrotliRuntimeException ex) {
+ throw new IOException("Brotli stream decoding failed", ex);
+ }
+
+ // <{[INJECTED CODE]}>
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BrotliRuntimeException.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BrotliRuntimeException.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/BrotliRuntimeException.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/BrotliRuntimeException.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,21 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+/**
+ * Unchecked exception used internally.
+ */
+class BrotliRuntimeException extends RuntimeException {
+
+ BrotliRuntimeException(String message) {
+ super(message);
+ }
+
+ BrotliRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/Context.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/Context.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/Context.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/Context.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,58 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+/**
+ * Common context lookup table for all context modes.
+ */
+final class Context {
+
+ static final int[] LOOKUP = new int[2048];
+
+ private static final String UTF_MAP = " !! ! \"#$##%#$&'##(#)#+++++++++"
+ + "+((&*'##,---,---,-----,-----,-----&#'###.///.///./////./////./////&#'# ";
+ private static final String UTF_RLE = "A/* ': & : $ \u0081 @";
+
+ private static void unpackLookupTable(int[] lookup, String map, String rle) {
+ // LSB6, MSB6, SIGNED
+ for (int i = 0; i < 256; ++i) {
+ lookup[i] = i & 0x3F;
+ lookup[512 + i] = i >> 2;
+ lookup[1792 + i] = 2 + (i >> 6);
+ }
+ // UTF8
+ for (int i = 0; i < 128; ++i) {
+ lookup[1024 + i] = 4 * (map.charAt(i) - 32);
+ }
+ for (int i = 0; i < 64; ++i) {
+ lookup[1152 + i] = i & 1;
+ lookup[1216 + i] = 2 + (i & 1);
+ }
+ int offset = 1280;
+ for (int k = 0; k < 19; ++k) {
+ int value = k & 3;
+ int rep = rle.charAt(k) - 32;
+ for (int i = 0; i < rep; ++i) {
+ lookup[offset++] = value;
+ }
+ }
+ // SIGNED
+ for (int i = 0; i < 16; ++i) {
+ lookup[1792 + i] = 1;
+ lookup[2032 + i] = 6;
+ }
+ lookup[1792] = 0;
+ lookup[2047] = 7;
+ for (int i = 0; i < 256; ++i) {
+ lookup[1536 + i] = lookup[1792 + i] << 3;
+ }
+ }
+
+ static {
+ unpackLookupTable(LOOKUP, UTF_MAP, UTF_RLE);
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/Decode.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/Decode.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/Decode.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/Decode.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,1002 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * API for Brotli decompression.
+ */
+final class Decode {
+
+ //----------------------------------------------------------------------------
+ // RunningState
+ //----------------------------------------------------------------------------
+ private static final int UNINITIALIZED = 0;
+ private static final int BLOCK_START = 1;
+ private static final int COMPRESSED_BLOCK_START = 2;
+ private static final int MAIN_LOOP = 3;
+ private static final int READ_METADATA = 4;
+ private static final int COPY_UNCOMPRESSED = 5;
+ private static final int INSERT_LOOP = 6;
+ private static final int COPY_LOOP = 7;
+ private static final int COPY_WRAP_BUFFER = 8;
+ private static final int TRANSFORM = 9;
+ private static final int FINISHED = 10;
+ private static final int CLOSED = 11;
+ private static final int WRITE = 12;
+
+ private static final int DEFAULT_CODE_LENGTH = 8;
+ private static final int CODE_LENGTH_REPEAT_CODE = 16;
+ private static final int NUM_LITERAL_CODES = 256;
+ private static final int NUM_INSERT_AND_COPY_CODES = 704;
+ private static final int NUM_BLOCK_LENGTH_CODES = 26;
+ private static final int LITERAL_CONTEXT_BITS = 6;
+ private static final int DISTANCE_CONTEXT_BITS = 2;
+
+ private static final int HUFFMAN_TABLE_BITS = 8;
+ private static final int HUFFMAN_TABLE_MASK = 0xFF;
+
+ /**
+ * Maximum possible Huffman table size for an alphabet size of 704, max code length 15 and root
+ * table bits 8.
+ */
+ static final int HUFFMAN_TABLE_SIZE = 1080;
+
+ private static final int CODE_LENGTH_CODES = 18;
+ private static final int[] CODE_LENGTH_CODE_ORDER = {
+ 1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ };
+
+ private static final int NUM_DISTANCE_SHORT_CODES = 16;
+ private static final int[] DISTANCE_SHORT_CODE_INDEX_OFFSET = {
+ 3, 2, 1, 0, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2
+ };
+
+ private static final int[] DISTANCE_SHORT_CODE_VALUE_OFFSET = {
+ 0, 0, 0, 0, -1, 1, -2, 2, -3, 3, -1, 1, -2, 2, -3, 3
+ };
+
+ /**
+ * Static Huffman code for the code length code lengths.
+ */
+ private static final int[] FIXED_TABLE = {
+ 0x020000, 0x020004, 0x020003, 0x030002, 0x020000, 0x020004, 0x020003, 0x040001,
+ 0x020000, 0x020004, 0x020003, 0x030002, 0x020000, 0x020004, 0x020003, 0x040005
+ };
+
+ static final int[] DICTIONARY_OFFSETS_BY_LENGTH = {
+ 0, 0, 0, 0, 0, 4096, 9216, 21504, 35840, 44032, 53248, 63488, 74752, 87040, 93696, 100864,
+ 104704, 106752, 108928, 113536, 115968, 118528, 119872, 121280, 122016
+ };
+
+ static final int[] DICTIONARY_SIZE_BITS_BY_LENGTH = {
+ 0, 0, 0, 0, 10, 10, 11, 11, 10, 10, 10, 10, 10, 9, 9, 8, 7, 7, 8, 7, 7, 6, 6, 5, 5
+ };
+
+ static final int MIN_WORD_LENGTH = 4;
+
+ static final int MAX_WORD_LENGTH = 24;
+
+ static final int MAX_TRANSFORMED_WORD_LENGTH = 5 + MAX_WORD_LENGTH + 8;
+
+ //----------------------------------------------------------------------------
+ // Prefix code LUT.
+ //----------------------------------------------------------------------------
+ static final int[] BLOCK_LENGTH_OFFSET = {
+ 1, 5, 9, 13, 17, 25, 33, 41, 49, 65, 81, 97, 113, 145, 177, 209, 241, 305, 369, 497,
+ 753, 1265, 2289, 4337, 8433, 16625
+ };
+
+ static final int[] BLOCK_LENGTH_N_BITS = {
+ 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 7, 8, 9, 10, 11, 12, 13, 24
+ };
+
+ static final int[] INSERT_LENGTH_OFFSET = {
+ 0, 1, 2, 3, 4, 5, 6, 8, 10, 14, 18, 26, 34, 50, 66, 98, 130, 194, 322, 578, 1090, 2114, 6210,
+ 22594
+ };
+
+ static final int[] INSERT_LENGTH_N_BITS = {
+ 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 12, 14, 24
+ };
+
+ static final int[] COPY_LENGTH_OFFSET = {
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 18, 22, 30, 38, 54, 70, 102, 134, 198, 326, 582, 1094,
+ 2118
+ };
+
+ static final int[] COPY_LENGTH_N_BITS = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10, 24
+ };
+
+ static final int[] INSERT_RANGE_LUT = {
+ 0, 0, 8, 8, 0, 16, 8, 16, 16
+ };
+
+ static final int[] COPY_RANGE_LUT = {
+ 0, 8, 0, 8, 16, 0, 16, 8, 16
+ };
+
+ private static int decodeWindowBits(State s) {
+ BitReader.fillBitWindow(s);
+ if (BitReader.readFewBits(s, 1) == 0) {
+ return 16;
+ }
+ int n = BitReader.readFewBits(s, 3);
+ if (n != 0) {
+ return 17 + n;
+ }
+ n = BitReader.readFewBits(s, 3);
+ if (n != 0) {
+ return 8 + n;
+ }
+ return 17;
+ }
+
+ /**
+ * Associate input with decoder state.
+ *
+ * @param s uninitialized state without associated input
+ * @param input compressed data source
+ */
+ static void initState(State s, InputStream input) {
+ if (s.runningState != UNINITIALIZED) {
+ throw new IllegalStateException("State MUST be uninitialized");
+ }
+ s.blockTrees = new int[6 * HUFFMAN_TABLE_SIZE];
+ s.input = input;
+ BitReader.initBitReader(s);
+ int windowBits = decodeWindowBits(s);
+ if (windowBits == 9) { /* Reserved case for future expansion. */
+ throw new BrotliRuntimeException("Invalid 'windowBits' code");
+ }
+ s.maxRingBufferSize = 1 << windowBits;
+ s.maxBackwardDistance = s.maxRingBufferSize - 16;
+ s.runningState = BLOCK_START;
+ }
+
+ static void close(State s) throws IOException {
+ if (s.runningState == UNINITIALIZED) {
+ throw new IllegalStateException("State MUST be initialized");
+ }
+ if (s.runningState == CLOSED) {
+ return;
+ }
+ s.runningState = CLOSED;
+ if (s.input != null) {
+ Utils.closeInput(s.input);
+ s.input = null;
+ }
+ }
+
+ /**
+ * Decodes a number in the range [0..255], by reading 1 - 11 bits.
+ */
+ private static int decodeVarLenUnsignedByte(State s) {
+ BitReader.fillBitWindow(s);
+ if (BitReader.readFewBits(s, 1) != 0) {
+ int n = BitReader.readFewBits(s, 3);
+ if (n == 0) {
+ return 1;
+ } else {
+ return BitReader.readFewBits(s, n) + (1 << n);
+ }
+ }
+ return 0;
+ }
+
+ private static void decodeMetaBlockLength(State s) {
+ BitReader.fillBitWindow(s);
+ s.inputEnd = BitReader.readFewBits(s, 1);
+ s.metaBlockLength = 0;
+ s.isUncompressed = 0;
+ s.isMetadata = 0;
+ if ((s.inputEnd != 0) && BitReader.readFewBits(s, 1) != 0) {
+ return;
+ }
+ int sizeNibbles = BitReader.readFewBits(s, 2) + 4;
+ if (sizeNibbles == 7) {
+ s.isMetadata = 1;
+ if (BitReader.readFewBits(s, 1) != 0) {
+ throw new BrotliRuntimeException("Corrupted reserved bit");
+ }
+ int sizeBytes = BitReader.readFewBits(s, 2);
+ if (sizeBytes == 0) {
+ return;
+ }
+ for (int i = 0; i < sizeBytes; i++) {
+ BitReader.fillBitWindow(s);
+ int bits = BitReader.readFewBits(s, 8);
+ if (bits == 0 && i + 1 == sizeBytes && sizeBytes > 1) {
+ throw new BrotliRuntimeException("Exuberant nibble");
+ }
+ s.metaBlockLength |= bits << (i * 8);
+ }
+ } else {
+ for (int i = 0; i < sizeNibbles; i++) {
+ BitReader.fillBitWindow(s);
+ int bits = BitReader.readFewBits(s, 4);
+ if (bits == 0 && i + 1 == sizeNibbles && sizeNibbles > 4) {
+ throw new BrotliRuntimeException("Exuberant nibble");
+ }
+ s.metaBlockLength |= bits << (i * 4);
+ }
+ }
+ s.metaBlockLength++;
+ if (s.inputEnd == 0) {
+ s.isUncompressed = BitReader.readFewBits(s, 1);
+ }
+ }
+
+ /**
+ * Decodes the next Huffman code from bit-stream.
+ */
+ private static int readSymbol(int[] table, int offset, State s) {
+ int val = BitReader.peekBits(s);
+ offset += val & HUFFMAN_TABLE_MASK;
+ int bits = table[offset] >> 16;
+ int sym = table[offset] & 0xFFFF;
+ if (bits <= HUFFMAN_TABLE_BITS) {
+ s.bitOffset += bits;
+ return sym;
+ }
+ offset += sym;
+ int mask = (1 << bits) - 1;
+ offset += (val & mask) >>> HUFFMAN_TABLE_BITS;
+ s.bitOffset += ((table[offset] >> 16) + HUFFMAN_TABLE_BITS);
+ return table[offset] & 0xFFFF;
+ }
+
+ private static int readBlockLength(int[] table, int offset, State s) {
+ BitReader.fillBitWindow(s);
+ int code = readSymbol(table, offset, s);
+ int n = BLOCK_LENGTH_N_BITS[code];
+ BitReader.fillBitWindow(s);
+ return BLOCK_LENGTH_OFFSET[code] + BitReader.readBits(s, n);
+ }
+
+ private static int translateShortCodes(int code, int[] ringBuffer, int index) {
+ if (code < NUM_DISTANCE_SHORT_CODES) {
+ index += DISTANCE_SHORT_CODE_INDEX_OFFSET[code];
+ index &= 3;
+ return ringBuffer[index] + DISTANCE_SHORT_CODE_VALUE_OFFSET[code];
+ }
+ return code - NUM_DISTANCE_SHORT_CODES + 1;
+ }
+
+ private static void moveToFront(int[] v, int index) {
+ int value = v[index];
+ for (; index > 0; index--) {
+ v[index] = v[index - 1];
+ }
+ v[0] = value;
+ }
+
+ private static void inverseMoveToFrontTransform(byte[] v, int vLen) {
+ int[] mtf = new int[256];
+ for (int i = 0; i < 256; i++) {
+ mtf[i] = i;
+ }
+ for (int i = 0; i < vLen; i++) {
+ int index = v[i] & 0xFF;
+ v[i] = (byte) mtf[index];
+ if (index != 0) {
+ moveToFront(mtf, index);
+ }
+ }
+ }
+
+ private static void readHuffmanCodeLengths(
+ int[] codeLengthCodeLengths, int numSymbols, int[] codeLengths, State s) {
+ int symbol = 0;
+ int prevCodeLen = DEFAULT_CODE_LENGTH;
+ int repeat = 0;
+ int repeatCodeLen = 0;
+ int space = 32768;
+ int[] table = new int[32];
+
+ Huffman.buildHuffmanTable(table, 0, 5, codeLengthCodeLengths, CODE_LENGTH_CODES);
+
+ while (symbol < numSymbols && space > 0) {
+ BitReader.readMoreInput(s);
+ BitReader.fillBitWindow(s);
+ int p = BitReader.peekBits(s) & 31;
+ s.bitOffset += table[p] >> 16;
+ int codeLen = table[p] & 0xFFFF;
+ if (codeLen < CODE_LENGTH_REPEAT_CODE) {
+ repeat = 0;
+ codeLengths[symbol++] = codeLen;
+ if (codeLen != 0) {
+ prevCodeLen = codeLen;
+ space -= 32768 >> codeLen;
+ }
+ } else {
+ int extraBits = codeLen - 14;
+ int newLen = 0;
+ if (codeLen == CODE_LENGTH_REPEAT_CODE) {
+ newLen = prevCodeLen;
+ }
+ if (repeatCodeLen != newLen) {
+ repeat = 0;
+ repeatCodeLen = newLen;
+ }
+ int oldRepeat = repeat;
+ if (repeat > 0) {
+ repeat -= 2;
+ repeat <<= extraBits;
+ }
+ BitReader.fillBitWindow(s);
+ repeat += BitReader.readFewBits(s, extraBits) + 3;
+ int repeatDelta = repeat - oldRepeat;
+ if (symbol + repeatDelta > numSymbols) {
+ throw new BrotliRuntimeException("symbol + repeatDelta > numSymbols"); // COV_NF_LINE
+ }
+ for (int i = 0; i < repeatDelta; i++) {
+ codeLengths[symbol++] = repeatCodeLen;
+ }
+ if (repeatCodeLen != 0) {
+ space -= repeatDelta << (15 - repeatCodeLen);
+ }
+ }
+ }
+ if (space != 0) {
+ throw new BrotliRuntimeException("Unused space"); // COV_NF_LINE
+ }
+ // TODO: Pass max_symbol to Huffman table builder instead?
+ Utils.fillIntsWithZeroes(codeLengths, symbol, numSymbols);
+ }
+
+ static int checkDupes(int[] symbols, int length) {
+ for (int i = 0; i < length - 1; ++i) {
+ for (int j = i + 1; j < length; ++j) {
+ if (symbols[i] == symbols[j]) {
+ return 0;
+ }
+ }
+ }
+ return 1;
+ }
+
+ // TODO: Use specialized versions for smaller tables.
+ static void readHuffmanCode(int alphabetSize, int[] table, int offset, State s) {
+ int ok = 1;
+ int simpleCodeOrSkip;
+ BitReader.readMoreInput(s);
+ // TODO: Avoid allocation.
+ int[] codeLengths = new int[alphabetSize];
+ BitReader.fillBitWindow(s);
+ simpleCodeOrSkip = BitReader.readFewBits(s, 2);
+ if (simpleCodeOrSkip == 1) { // Read symbols, codes & code lengths directly.
+ int maxBitsCounter = alphabetSize - 1;
+ int maxBits = 0;
+ int[] symbols = new int[4];
+ int numSymbols = BitReader.readFewBits(s, 2) + 1;
+ while (maxBitsCounter != 0) {
+ maxBitsCounter >>= 1;
+ maxBits++;
+ }
+ // TODO: uncomment when codeLengths is reused.
+ // Utils.fillWithZeroes(codeLengths, 0, alphabetSize);
+ for (int i = 0; i < numSymbols; i++) {
+ BitReader.fillBitWindow(s);
+ symbols[i] = BitReader.readFewBits(s, maxBits) % alphabetSize;
+ codeLengths[symbols[i]] = 2;
+ }
+ codeLengths[symbols[0]] = 1;
+ switch (numSymbols) {
+ case 2:
+ codeLengths[symbols[1]] = 1;
+ break;
+ case 4:
+ if (BitReader.readFewBits(s, 1) == 1) {
+ codeLengths[symbols[2]] = 3;
+ codeLengths[symbols[3]] = 3;
+ } else {
+ codeLengths[symbols[0]] = 2;
+ }
+ break;
+ default:
+ break;
+ }
+ ok = checkDupes(symbols, numSymbols);
+ } else { // Decode Huffman-coded code lengths.
+ int[] codeLengthCodeLengths = new int[CODE_LENGTH_CODES];
+ int space = 32;
+ int numCodes = 0;
+ for (int i = simpleCodeOrSkip; i < CODE_LENGTH_CODES && space > 0; i++) {
+ int codeLenIdx = CODE_LENGTH_CODE_ORDER[i];
+ BitReader.fillBitWindow(s);
+ int p = BitReader.peekBits(s) & 15;
+ // TODO: Demultiplex FIXED_TABLE.
+ s.bitOffset += FIXED_TABLE[p] >> 16;
+ int v = FIXED_TABLE[p] & 0xFFFF;
+ codeLengthCodeLengths[codeLenIdx] = v;
+ if (v != 0) {
+ space -= (32 >> v);
+ numCodes++;
+ }
+ }
+ if (space != 0 && numCodes != 1) {
+ ok = 0;
+ }
+ readHuffmanCodeLengths(codeLengthCodeLengths, alphabetSize, codeLengths, s);
+ }
+ if (ok == 0) {
+ throw new BrotliRuntimeException("Can't readHuffmanCode"); // COV_NF_LINE
+ }
+ Huffman.buildHuffmanTable(table, offset, HUFFMAN_TABLE_BITS, codeLengths, alphabetSize);
+ }
+
+ private static int decodeContextMap(int contextMapSize, byte[] contextMap, State s) {
+ BitReader.readMoreInput(s);
+ int numTrees = decodeVarLenUnsignedByte(s) + 1;
+
+ if (numTrees == 1) {
+ Utils.fillBytesWithZeroes(contextMap, 0, contextMapSize);
+ return numTrees;
+ }
+
+ BitReader.fillBitWindow(s);
+ int useRleForZeros = BitReader.readFewBits(s, 1);
+ int maxRunLengthPrefix = 0;
+ if (useRleForZeros != 0) {
+ maxRunLengthPrefix = BitReader.readFewBits(s, 4) + 1;
+ }
+ int[] table = new int[HUFFMAN_TABLE_SIZE];
+ readHuffmanCode(numTrees + maxRunLengthPrefix, table, 0, s);
+ for (int i = 0; i < contextMapSize; ) {
+ BitReader.readMoreInput(s);
+ BitReader.fillBitWindow(s);
+ int code = readSymbol(table, 0, s);
+ if (code == 0) {
+ contextMap[i] = 0;
+ i++;
+ } else if (code <= maxRunLengthPrefix) {
+ BitReader.fillBitWindow(s);
+ int reps = (1 << code) + BitReader.readFewBits(s, code);
+ while (reps != 0) {
+ if (i >= contextMapSize) {
+ throw new BrotliRuntimeException("Corrupted context map"); // COV_NF_LINE
+ }
+ contextMap[i] = 0;
+ i++;
+ reps--;
+ }
+ } else {
+ contextMap[i] = (byte) (code - maxRunLengthPrefix);
+ i++;
+ }
+ }
+ BitReader.fillBitWindow(s);
+ if (BitReader.readFewBits(s, 1) == 1) {
+ inverseMoveToFrontTransform(contextMap, contextMapSize);
+ }
+ return numTrees;
+ }
+
+ private static int decodeBlockTypeAndLength(State s, int treeType, int numBlockTypes) {
+ final int[] ringBuffers = s.rings;
+ final int offset = 4 + treeType * 2;
+ BitReader.fillBitWindow(s);
+ int blockType = readSymbol(s.blockTrees, treeType * HUFFMAN_TABLE_SIZE, s);
+ int result = readBlockLength(s.blockTrees, (treeType + 3) * HUFFMAN_TABLE_SIZE, s);
+
+ if (blockType == 1) {
+ blockType = ringBuffers[offset + 1] + 1;
+ } else if (blockType == 0) {
+ blockType = ringBuffers[offset];
+ } else {
+ blockType -= 2;
+ }
+ if (blockType >= numBlockTypes) {
+ blockType -= numBlockTypes;
+ }
+ ringBuffers[offset] = ringBuffers[offset + 1];
+ ringBuffers[offset + 1] = blockType;
+ return result;
+ }
+
+ private static void decodeLiteralBlockSwitch(State s) {
+ s.literalBlockLength = decodeBlockTypeAndLength(s, 0, s.numLiteralBlockTypes);
+ int literalBlockType = s.rings[5];
+ s.contextMapSlice = literalBlockType << LITERAL_CONTEXT_BITS;
+ s.literalTreeIndex = s.contextMap[s.contextMapSlice] & 0xFF;
+ s.literalTree = s.hGroup0[s.literalTreeIndex];
+ int contextMode = s.contextModes[literalBlockType];
+ s.contextLookupOffset1 = contextMode << 9;
+ s.contextLookupOffset2 = s.contextLookupOffset1 + 256;
+ }
+
+ private static void decodeCommandBlockSwitch(State s) {
+ s.commandBlockLength = decodeBlockTypeAndLength(s, 1, s.numCommandBlockTypes);
+ s.treeCommandOffset = s.hGroup1[s.rings[7]];
+ }
+
+ private static void decodeDistanceBlockSwitch(State s) {
+ s.distanceBlockLength = decodeBlockTypeAndLength(s, 2, s.numDistanceBlockTypes);
+ s.distContextMapSlice = s.rings[9] << DISTANCE_CONTEXT_BITS;
+ }
+
+ private static void maybeReallocateRingBuffer(State s) {
+ int newSize = s.maxRingBufferSize;
+ if (newSize > s.expectedTotalSize) {
+ /* TODO: Handle 2GB+ cases more gracefully. */
+ int minimalNewSize = s.expectedTotalSize;
+ while ((newSize >> 1) > minimalNewSize) {
+ newSize >>= 1;
+ }
+ if ((s.inputEnd == 0) && newSize < 16384 && s.maxRingBufferSize >= 16384) {
+ newSize = 16384;
+ }
+ }
+ if (newSize <= s.ringBufferSize) {
+ return;
+ }
+ int ringBufferSizeWithSlack = newSize + MAX_TRANSFORMED_WORD_LENGTH;
+ byte[] newBuffer = new byte[ringBufferSizeWithSlack];
+ if (s.ringBuffer.length != 0) {
+ System.arraycopy(s.ringBuffer, 0, newBuffer, 0, s.ringBufferSize);
+ }
+ s.ringBuffer = newBuffer;
+ s.ringBufferSize = newSize;
+ }
+
+ private static void readNextMetablockHeader(State s) {
+ if (s.inputEnd != 0) {
+ s.nextRunningState = FINISHED;
+ s.bytesToWrite = s.pos;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ return;
+ }
+ // TODO: Reset? Do we need this?
+ s.hGroup0 = new int[0];
+ s.hGroup1 = new int[0];
+ s.hGroup2 = new int[0];
+
+ BitReader.readMoreInput(s);
+ decodeMetaBlockLength(s);
+ if ((s.metaBlockLength == 0) && (s.isMetadata == 0)) {
+ return;
+ }
+ if ((s.isUncompressed != 0) || (s.isMetadata != 0)) {
+ BitReader.jumpToByteBoundary(s);
+ s.runningState = (s.isMetadata != 0) ? READ_METADATA : COPY_UNCOMPRESSED;
+ } else {
+ s.runningState = COMPRESSED_BLOCK_START;
+ }
+
+ if (s.isMetadata != 0) {
+ return;
+ }
+ s.expectedTotalSize += s.metaBlockLength;
+ if (s.expectedTotalSize > 1 << 30) {
+ s.expectedTotalSize = 1 << 30;
+ }
+ if (s.ringBufferSize < s.maxRingBufferSize) {
+ maybeReallocateRingBuffer(s);
+ }
+ }
+
+ private static int readMetablockPartition(State s, int treeType, int numBlockTypes) {
+ if (numBlockTypes <= 1) {
+ return 1 << 28;
+ }
+ readHuffmanCode(numBlockTypes + 2, s.blockTrees, treeType * HUFFMAN_TABLE_SIZE, s);
+ readHuffmanCode(NUM_BLOCK_LENGTH_CODES, s.blockTrees, (treeType + 3) * HUFFMAN_TABLE_SIZE, s);
+ return readBlockLength(s.blockTrees, (treeType + 3) * HUFFMAN_TABLE_SIZE, s);
+ }
+
+ private static void readMetablockHuffmanCodesAndContextMaps(State s) {
+ s.numLiteralBlockTypes = decodeVarLenUnsignedByte(s) + 1;
+ s.literalBlockLength = readMetablockPartition(s, 0, s.numLiteralBlockTypes);
+ s.numCommandBlockTypes = decodeVarLenUnsignedByte(s) + 1;
+ s.commandBlockLength = readMetablockPartition(s, 1, s.numCommandBlockTypes);
+ s.numDistanceBlockTypes = decodeVarLenUnsignedByte(s) + 1;
+ s.distanceBlockLength = readMetablockPartition(s, 2, s.numDistanceBlockTypes);
+
+ BitReader.readMoreInput(s);
+ BitReader.fillBitWindow(s);
+ s.distancePostfixBits = BitReader.readFewBits(s, 2);
+ s.numDirectDistanceCodes =
+ NUM_DISTANCE_SHORT_CODES + (BitReader.readFewBits(s, 4) << s.distancePostfixBits);
+ s.distancePostfixMask = (1 << s.distancePostfixBits) - 1;
+ int numDistanceCodes = s.numDirectDistanceCodes + (48 << s.distancePostfixBits);
+ // TODO: Reuse?
+ s.contextModes = new byte[s.numLiteralBlockTypes];
+ for (int i = 0; i < s.numLiteralBlockTypes;) {
+ /* Ensure that less than 256 bits read between readMoreInput. */
+ int limit = Math.min(i + 96, s.numLiteralBlockTypes);
+ for (; i < limit; ++i) {
+ BitReader.fillBitWindow(s);
+ s.contextModes[i] = (byte) (BitReader.readFewBits(s, 2));
+ }
+ BitReader.readMoreInput(s);
+ }
+
+ // TODO: Reuse?
+ s.contextMap = new byte[s.numLiteralBlockTypes << LITERAL_CONTEXT_BITS];
+ int numLiteralTrees = decodeContextMap(s.numLiteralBlockTypes << LITERAL_CONTEXT_BITS,
+ s.contextMap, s);
+ s.trivialLiteralContext = 1;
+ for (int j = 0; j < s.numLiteralBlockTypes << LITERAL_CONTEXT_BITS; j++) {
+ if (s.contextMap[j] != j >> LITERAL_CONTEXT_BITS) {
+ s.trivialLiteralContext = 0;
+ break;
+ }
+ }
+
+ // TODO: Reuse?
+ s.distContextMap = new byte[s.numDistanceBlockTypes << DISTANCE_CONTEXT_BITS];
+ int numDistTrees = decodeContextMap(s.numDistanceBlockTypes << DISTANCE_CONTEXT_BITS,
+ s.distContextMap, s);
+
+ s.hGroup0 = decodeHuffmanTreeGroup(NUM_LITERAL_CODES, numLiteralTrees, s);
+ s.hGroup1 =
+ decodeHuffmanTreeGroup(NUM_INSERT_AND_COPY_CODES, s.numCommandBlockTypes, s);
+ s.hGroup2 = decodeHuffmanTreeGroup(numDistanceCodes, numDistTrees, s);
+
+ s.contextMapSlice = 0;
+ s.distContextMapSlice = 0;
+ s.contextLookupOffset1 = (int) (s.contextModes[0]) << 9;
+ s.contextLookupOffset2 = s.contextLookupOffset1 + 256;
+ s.literalTreeIndex = 0;
+ s.literalTree = s.hGroup0[0];
+ s.treeCommandOffset = s.hGroup1[0];
+
+ s.rings[4] = 1;
+ s.rings[5] = 0;
+ s.rings[6] = 1;
+ s.rings[7] = 0;
+ s.rings[8] = 1;
+ s.rings[9] = 0;
+ }
+
+ private static void copyUncompressedData(State s) {
+ final byte[] ringBuffer = s.ringBuffer;
+
+ // Could happen if block ends at ring buffer end.
+ if (s.metaBlockLength <= 0) {
+ BitReader.reload(s);
+ s.runningState = BLOCK_START;
+ return;
+ }
+
+ int chunkLength = Math.min(s.ringBufferSize - s.pos, s.metaBlockLength);
+ BitReader.copyBytes(s, ringBuffer, s.pos, chunkLength);
+ s.metaBlockLength -= chunkLength;
+ s.pos += chunkLength;
+ if (s.pos == s.ringBufferSize) {
+ s.nextRunningState = COPY_UNCOMPRESSED;
+ s.bytesToWrite = s.ringBufferSize;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ return;
+ }
+
+ BitReader.reload(s);
+ s.runningState = BLOCK_START;
+ }
+
+ private static int writeRingBuffer(State s) {
+ int toWrite = Math.min(s.outputLength - s.outputUsed,
+ s.bytesToWrite - s.bytesWritten);
+ if (toWrite != 0) {
+ System.arraycopy(s.ringBuffer, s.bytesWritten, s.output,
+ s.outputOffset + s.outputUsed, toWrite);
+ s.outputUsed += toWrite;
+ s.bytesWritten += toWrite;
+ }
+
+ if (s.outputUsed < s.outputLength) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
+ private static int[] decodeHuffmanTreeGroup(int alphabetSize, int n, State s) {
+ int[] group = new int[n + (n * HUFFMAN_TABLE_SIZE)];
+ int next = n;
+ for (int i = 0; i < n; i++) {
+ group[i] = next;
+ Decode.readHuffmanCode(alphabetSize, group, next, s);
+ next += HUFFMAN_TABLE_SIZE;
+ }
+ return group;
+ }
+
+ /**
+ * Actual decompress implementation.
+ */
+ static void decompress(State s) {
+ if (s.runningState == UNINITIALIZED) {
+ throw new IllegalStateException("Can't decompress until initialized");
+ }
+ if (s.runningState == CLOSED) {
+ throw new IllegalStateException("Can't decompress after close");
+ }
+ int ringBufferMask = s.ringBufferSize - 1;
+ byte[] ringBuffer = s.ringBuffer;
+
+ while (s.runningState != FINISHED) {
+ // TODO: extract cases to methods for the better readability.
+ switch (s.runningState) {
+ case BLOCK_START:
+ if (s.metaBlockLength < 0) {
+ throw new BrotliRuntimeException("Invalid metablock length");
+ }
+ readNextMetablockHeader(s);
+ /* Ring-buffer would be reallocated here. */
+ ringBufferMask = s.ringBufferSize - 1;
+ ringBuffer = s.ringBuffer;
+ continue;
+
+ case COMPRESSED_BLOCK_START:
+ readMetablockHuffmanCodesAndContextMaps(s);
+ s.runningState = MAIN_LOOP;
+ // Fall through
+
+ case MAIN_LOOP:
+ if (s.metaBlockLength <= 0) {
+ s.runningState = BLOCK_START;
+ continue;
+ }
+ BitReader.readMoreInput(s);
+ if (s.commandBlockLength == 0) {
+ decodeCommandBlockSwitch(s);
+ }
+ s.commandBlockLength--;
+ BitReader.fillBitWindow(s);
+ int cmdCode = readSymbol(s.hGroup1, s.treeCommandOffset, s);
+ int rangeIdx = cmdCode >>> 6;
+ s.distanceCode = 0;
+ if (rangeIdx >= 2) {
+ rangeIdx -= 2;
+ s.distanceCode = -1;
+ }
+ int insertCode = INSERT_RANGE_LUT[rangeIdx] + ((cmdCode >>> 3) & 7);
+ BitReader.fillBitWindow(s);
+ int insertBits = INSERT_LENGTH_N_BITS[insertCode];
+ int insertExtra = BitReader.readBits(s, insertBits);
+ s.insertLength = INSERT_LENGTH_OFFSET[insertCode] + insertExtra;
+ int copyCode = COPY_RANGE_LUT[rangeIdx] + (cmdCode & 7);
+ BitReader.fillBitWindow(s);
+ int copyBits = COPY_LENGTH_N_BITS[copyCode];
+ int copyExtra = BitReader.readBits(s, copyBits);
+ s.copyLength = COPY_LENGTH_OFFSET[copyCode] + copyExtra;
+
+ s.j = 0;
+ s.runningState = INSERT_LOOP;
+
+ // Fall through
+ case INSERT_LOOP:
+ if (s.trivialLiteralContext != 0) {
+ while (s.j < s.insertLength) {
+ BitReader.readMoreInput(s);
+ if (s.literalBlockLength == 0) {
+ decodeLiteralBlockSwitch(s);
+ }
+ s.literalBlockLength--;
+ BitReader.fillBitWindow(s);
+ ringBuffer[s.pos] =
+ (byte) readSymbol(s.hGroup0, s.literalTree, s);
+ s.j++;
+ if (s.pos++ == ringBufferMask) {
+ s.nextRunningState = INSERT_LOOP;
+ s.bytesToWrite = s.ringBufferSize;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ break;
+ }
+ }
+ } else {
+ int prevByte1 = ringBuffer[(s.pos - 1) & ringBufferMask] & 0xFF;
+ int prevByte2 = ringBuffer[(s.pos - 2) & ringBufferMask] & 0xFF;
+ while (s.j < s.insertLength) {
+ BitReader.readMoreInput(s);
+ if (s.literalBlockLength == 0) {
+ decodeLiteralBlockSwitch(s);
+ }
+ int literalTreeIndex = s.contextMap[s.contextMapSlice
+ + (Context.LOOKUP[s.contextLookupOffset1 + prevByte1]
+ | Context.LOOKUP[s.contextLookupOffset2 + prevByte2])] & 0xFF;
+ s.literalBlockLength--;
+ prevByte2 = prevByte1;
+ BitReader.fillBitWindow(s);
+ prevByte1 = readSymbol(
+ s.hGroup0, s.hGroup0[literalTreeIndex], s);
+ ringBuffer[s.pos] = (byte) prevByte1;
+ s.j++;
+ if (s.pos++ == ringBufferMask) {
+ s.nextRunningState = INSERT_LOOP;
+ s.bytesToWrite = s.ringBufferSize;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ break;
+ }
+ }
+ }
+ if (s.runningState != INSERT_LOOP) {
+ continue;
+ }
+ s.metaBlockLength -= s.insertLength;
+ if (s.metaBlockLength <= 0) {
+ s.runningState = MAIN_LOOP;
+ continue;
+ }
+ if (s.distanceCode < 0) {
+ BitReader.readMoreInput(s);
+ if (s.distanceBlockLength == 0) {
+ decodeDistanceBlockSwitch(s);
+ }
+ s.distanceBlockLength--;
+ BitReader.fillBitWindow(s);
+ s.distanceCode = readSymbol(s.hGroup2, s.hGroup2[
+ s.distContextMap[s.distContextMapSlice
+ + (s.copyLength > 4 ? 3 : s.copyLength - 2)] & 0xFF], s);
+ if (s.distanceCode >= s.numDirectDistanceCodes) {
+ s.distanceCode -= s.numDirectDistanceCodes;
+ int postfix = s.distanceCode & s.distancePostfixMask;
+ s.distanceCode >>>= s.distancePostfixBits;
+ int n = (s.distanceCode >>> 1) + 1;
+ int offset = ((2 + (s.distanceCode & 1)) << n) - 4;
+ BitReader.fillBitWindow(s);
+ int distanceExtra = BitReader.readBits(s, n);
+ s.distanceCode = s.numDirectDistanceCodes + postfix
+ + ((offset + distanceExtra) << s.distancePostfixBits);
+ }
+ }
+
+ // Convert the distance code to the actual distance by possibly looking up past distances
+ // from the ringBuffer.
+ s.distance = translateShortCodes(s.distanceCode, s.rings, s.distRbIdx);
+ if (s.distance < 0) {
+ throw new BrotliRuntimeException("Negative distance"); // COV_NF_LINE
+ }
+
+ if (s.maxDistance != s.maxBackwardDistance
+ && s.pos < s.maxBackwardDistance) {
+ s.maxDistance = s.pos;
+ } else {
+ s.maxDistance = s.maxBackwardDistance;
+ }
+
+ s.copyDst = s.pos;
+ if (s.distance > s.maxDistance) {
+ s.runningState = TRANSFORM;
+ continue;
+ }
+
+ if (s.distanceCode > 0) {
+ s.rings[s.distRbIdx & 3] = s.distance;
+ s.distRbIdx++;
+ }
+
+ if (s.copyLength > s.metaBlockLength) {
+ throw new BrotliRuntimeException("Invalid backward reference"); // COV_NF_LINE
+ }
+ s.j = 0;
+ s.runningState = COPY_LOOP;
+ // fall through
+ case COPY_LOOP:
+ int src = (s.pos - s.distance) & ringBufferMask;
+ int dst = s.pos;
+ int copyLength = s.copyLength - s.j;
+ int srcEnd = src + copyLength;
+ int dstEnd = dst + copyLength;
+ if ((srcEnd < ringBufferMask) && (dstEnd < ringBufferMask)) {
+ if (copyLength < 12 || (srcEnd > dst && dstEnd > src)) {
+ for (int k = 0; k < copyLength; ++k) {
+ ringBuffer[dst++] = ringBuffer[src++];
+ }
+ } else {
+ Utils.copyBytesWithin(ringBuffer, dst, src, srcEnd);
+ }
+ s.j += copyLength;
+ s.metaBlockLength -= copyLength;
+ s.pos += copyLength;
+ } else {
+ for (; s.j < s.copyLength;) {
+ ringBuffer[s.pos] =
+ ringBuffer[(s.pos - s.distance) & ringBufferMask];
+ s.metaBlockLength--;
+ s.j++;
+ if (s.pos++ == ringBufferMask) {
+ s.nextRunningState = COPY_LOOP;
+ s.bytesToWrite = s.ringBufferSize;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ break;
+ }
+ }
+ }
+ if (s.runningState == COPY_LOOP) {
+ s.runningState = MAIN_LOOP;
+ }
+ continue;
+
+ case TRANSFORM:
+ if (s.copyLength >= MIN_WORD_LENGTH
+ && s.copyLength <= MAX_WORD_LENGTH) {
+ int offset = DICTIONARY_OFFSETS_BY_LENGTH[s.copyLength];
+ int wordId = s.distance - s.maxDistance - 1;
+ int shift = DICTIONARY_SIZE_BITS_BY_LENGTH[s.copyLength];
+ int mask = (1 << shift) - 1;
+ int wordIdx = wordId & mask;
+ int transformIdx = wordId >>> shift;
+ offset += wordIdx * s.copyLength;
+ if (transformIdx < Transform.NUM_TRANSFORMS) {
+ int len = Transform.transformDictionaryWord(ringBuffer, s.copyDst,
+ Dictionary.getData(), offset, s.copyLength, transformIdx);
+ s.copyDst += len;
+ s.pos += len;
+ s.metaBlockLength -= len;
+ if (s.copyDst >= s.ringBufferSize) {
+ s.nextRunningState = COPY_WRAP_BUFFER;
+ s.bytesToWrite = s.ringBufferSize;
+ s.bytesWritten = 0;
+ s.runningState = WRITE;
+ continue;
+ }
+ } else {
+ throw new BrotliRuntimeException("Invalid backward reference"); // COV_NF_LINE
+ }
+ } else {
+ throw new BrotliRuntimeException("Invalid backward reference"); // COV_NF_LINE
+ }
+ s.runningState = MAIN_LOOP;
+ continue;
+
+ case COPY_WRAP_BUFFER:
+ Utils.copyBytesWithin(ringBuffer, 0, s.ringBufferSize, s.copyDst);
+ s.runningState = MAIN_LOOP;
+ continue;
+
+ case READ_METADATA:
+ while (s.metaBlockLength > 0) {
+ BitReader.readMoreInput(s);
+ // Optimize
+ BitReader.fillBitWindow(s);
+ BitReader.readFewBits(s, 8);
+ s.metaBlockLength--;
+ }
+ s.runningState = BLOCK_START;
+ continue;
+
+
+ case COPY_UNCOMPRESSED:
+ copyUncompressedData(s);
+ continue;
+
+ case WRITE:
+ if (writeRingBuffer(s) == 0) {
+ // Output buffer is full.
+ return;
+ }
+ if (s.pos >= s.maxBackwardDistance) {
+ s.maxDistance = s.maxBackwardDistance;
+ }
+ s.pos &= ringBufferMask;
+ s.runningState = s.nextRunningState;
+ continue;
+
+ default:
+ throw new BrotliRuntimeException("Unexpected state " + s.runningState);
+ }
+ }
+ if (s.runningState == FINISHED) {
+ if (s.metaBlockLength < 0) {
+ throw new BrotliRuntimeException("Invalid metablock length");
+ }
+ BitReader.jumpToByteBoundary(s);
+ BitReader.checkHealth(s, 1);
+ }
+ }
+}
diff -Nru plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/DictionaryData.java plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/DictionaryData.java
--- plantuml-1.2017.15/src/net/sourceforge/plantuml/brotli/DictionaryData.java 1970-01-01 00:00:00.000000000 +0000
+++ plantuml-1.2018.9/src/net/sourceforge/plantuml/brotli/DictionaryData.java 2018-07-27 21:59:19.000000000 +0000
@@ -0,0 +1,55 @@
+/* Copyright 2015 Google Inc. All Rights Reserved.
+
+ Distributed under MIT license.
+ See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
+*/
+
+package net.sourceforge.plantuml.brotli;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Built-in dictionary data.
+ *
+ * When this class is loaded, it sets its data: {@link Dictionary#setData(ByteBuffer)}.
+ */
+final class DictionaryData {
+ private static final String DATA0 = "timedownlifeleftbackcodedatashowonlysitecityopenjustlikefreeworktextyearoverbodyloveformbookplaylivelinehelphomesidemorewordlongthemviewfindpagedaysfullheadtermeachareafromtruemarkableuponhighdatelandnewsevennextcasebothpostusedmadehandherewhatnameLinkblogsizebaseheldmakemainuser') +holdendswithNewsreadweresigntakehavegameseencallpathwellplusmenufilmpartjointhislistgoodneedwayswestjobsmindalsologorichuseslastteamarmyfoodkingwilleastwardbestfirePageknowaway.pngmovethanloadgiveselfnotemuchfeedmanyrockicononcelookhidediedHomerulehostajaxinfoclublawslesshalfsomesuchzone100%onescareTimeracebluefourweekfacehopegavehardlostwhenparkkeptpassshiproomHTMLplanTypedonesavekeepflaglinksoldfivetookratetownjumpthusdarkcardfilefearstaykillthatfallautoever.comtalkshopvotedeepmoderestturnbornbandfellroseurl(skinrolecomeactsagesmeetgold.jpgitemvaryfeltthensenddropViewcopy1.0\"stopelseliestourpack.gifpastcss?graymean>rideshotlatesaidroadvar feeljohnrickportfast'UA-deadpoorbilltypeU.S.woodmust2px;Inforankwidewantwalllead[0];paulwavesure$('#waitmassarmsgoesgainlangpaid!-- lockunitrootwalkfirmwifexml\"songtest20pxkindrowstoolfontmailsafestarmapscorerainflowbabyspansays4px;6px;artsfootrealwikiheatsteptriporg/lakeweaktoldFormcastfansbankveryrunsjulytask1px;goalgrewslowedgeid=\"sets5px;.js?40pxif (soonseatnonetubezerosentreedfactintogiftharm18pxcamehillboldzoomvoideasyringfillpeakinitcost3px;jacktagsbitsrolleditknewnearironfreddiskwentsoilputs/js/holyT22:ISBNT20:adamsees
Archbishop class=\"nobeing usedapproachesprivilegesnoscript>\nresults inmay be theEaster eggmechanismsreasonablePopulationCollectionselected\">noscript>\r/index.phparrival of-jssdk'));managed toincompletecasualtiescompletionChristiansSeptember arithmeticproceduresmight haveProductionit appearsPhilosophyfriendshipleading togiving thetoward theguaranteeddocumentedcolor:#000video gamecommissionreflectingchange theassociatedsans-serifonkeypress; padding:He was theunderlyingtypically , and the srcElementsuccessivesince the should be networkingaccountinguse of thelower thanshows that\n\t\tcomplaintscontinuousquantitiesastronomerhe did notdue to itsapplied toan averageefforts tothe futureattempt toTherefore,capabilityRepublicanwas formedElectronickilometerschallengespublishingthe formerindigenousdirectionssubsidiaryconspiracydetails ofand in theaffordablesubstancesreason forconventionitemtype=\"absolutelysupposedlyremained aattractivetravellingseparatelyfocuses onelementaryapplicablefound thatstylesheetmanuscriptstands for no-repeat(sometimesCommercialin Americaundertakenquarter ofan examplepersonallyindex.php?\npercentagebest-knowncreating a\" dir=\"ltrLieutenant\n
is said tostructuralreferendummost oftena separate->\nsoundtracksearchFormtend to beinput id=\"opening ofrestrictedadopted byaddressingtheologianmethods ofvariant ofChristian very largeautomotiveby far therange frompursuit offollow thebrought toin Englandagree thataccused ofcomes frompreventingdiv style=his or hertremendousfreedom ofconcerning0 1em 1em;Basketball/style.cssan earliereven after/\" title=\".com/indextaking thepittsburghcontent\">\rimplementedcan be seenthere was ademonstratecontainer\">connectionsthe Britishwas written!important;px; margin-followed byability to complicatedduring the immigrationalso called
\n
acquisitioncalled the persecutiondesignation{font-size:appeared ininvestigateexperiencedmost likelywidely useddiscussionspresence of (document.extensivelyIt has beenit does notcontrary toinhabitantsimprovementscholarshipconsumptioninstructionfor exampleone or morepx; paddingthe currenta series ofare usuallyrole in thepreviously derivativesevidence ofexperiencescolorschemestated thatcertificate
\n selected=\"high schoolresponse tocomfortableadoption ofthree yearsthe countryin Februaryso that thepeople who provided by\nhaving been\r\n\r\n< "The compilationhe had beenproduced byphilosopherconstructedintended toamong othercompared toto say thatEngineeringa differentreferred todifferencesbelief thatphotographsidentifyingHistory of Republic ofnecessarilyprobabilitytechnicallyleaving thespectacularfraction ofelectricityhead of therestaurantspartnershipemphasis onmost recentshare with saying thatfilled withdesigned toit is often\">as follows:merged withthrough thecommercial pointed outopportunityview of therequirementdivision ofprogramminghe receivedsetInterval\">maintainingChristopherMuch of thewritings of\" height=\"2size of theversion of mixture of between theExamples ofeducationalcompetitive onsubmit=\"director ofdistinctive/DTD XHTML relating totendency toprovince ofwhich woulddespite thescientific legislature.innerHTML allegationsAgriculturewas used inapproach tointelligentyears later,sans-serifdeterminingPerformanceappearances, which is foundationsabbreviatedhigher thans from the individual composed ofsupposed toclaims thatattributionfont-size:1elements ofHistorical his brotherat the timeanniversarygoverned byrelated to ultimately innovationsit is stillcan only bedefinitionstoGMTStringA number ofimg class=\"Eventually,was changedoccurred inneighboringdistinguishwhen he wasintroducingterrestrialMany of theargues thatan Americanconquest ofwidespread were killedscreen and In order toexpected todescendantsare locatedlegislativegenerations backgroundmost peopleyears afterthere is nothe highestfrequently they do notargued thatshowed thatpredominanttheologicalby the timeconsideringshort-livedcan be usedvery littleone of the had alreadyinterpretedcommunicatefeatures ofgovernment,entered the\" height=\"3Independentpopulationslarge-scale. Although used in thedestructionpossibilitystarting intwo or moreexpressionssubordinatelarger thanhistory and\r\nContinentaleliminatingwill not bepractice ofin front ofsite of theensure thatto create amississippipotentiallyoutstandingbetter thanwhat is nowsituated inmeta name=\"TraditionalsuggestionsTranslationthe form ofatmosphericideologicalenterprisescalculatingeast of theremnants ofpluginspage/index.php?remained intransformedHe was alsowas alreadystatisticalin favor ofMinistry ofmovement offormulationis required\nquestion ofwas electedto become abecause of some peopleinspired bysuccessful a time whenmore commonamongst thean officialwidth:100%;technology,was adoptedto keep thesettlementslive birthsindex.html\"Connecticutassigned to×account foralign=rightthe companyalways beenreturned toinvolvementBecause thethis period\" name=\"q\" confined toa result ofvalue=\"\" />is actuallyEnvironment\r\n\r\nConversely,>\n
combination of marginwidth=\"createElement(w.attachEvent(src=\"https://aIn particular, align=\"left\" Czech RepublicUnited Kingdomcorrespondenceconcluded that.html\" title=\"(function () {comes from theapplication of\n\nfounder of theattempting to carbon dioxide\n\n