Removed archaic units from pagesizes.

Author: domdfcoding

domdf_python_tools/pagesizes/classes.py

@@ -36,7 +36,7 @@
 
 # this package
 from ._types import AnyNumber
-from .units import Unit, _rounders, cicero, cm, didot, inch, mm, new_cicero, new_didot, pica, pt, scaled_point, um
+from .units import Unit, _rounders, cm, inch, mm, pica, pt, um
 from .utils import convert_from
 
 __all__ = [
@@ -46,11 +46,6 @@
 		"Size_cm",
 		"Size_um",
 		"Size_pica",
-		"Size_didot",
-		"Size_cicero",
-		"Size_new_didot",
-		"Size_new_cicero",
-		"Size_scaled_point",
 		"PageSize",
 		]
 
@@ -225,76 +220,6 @@ class Size_pica(BaseSize):
 	_unit = pica
 
 
-class Size_didot(BaseSize):
-	"""
-	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
-	representing a pagesize in didots / French Points.
-
-	:param width: The page width
-	:type width: int, float, Decimal or Unit
-	:param height: The page height
-	:type height: int, float, Decimal or Unit
-	"""
-
-	_unit = didot
-
-
-class Size_cicero(BaseSize):
-	"""
-	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
-	representing a pagesize in ciceros.
-
-	:param width: The page width
-	:type width: int, float, Decimal or Unit
-	:param height: The page height
-	:type height: int, float, Decimal or Unit
-	"""
-
-	_unit = cicero
-
-
-class Size_new_didot(BaseSize):
-	"""
-	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
-	representing a pagesize in new didots.
-
-	:param width: The page width
-	:type width: int, float, Decimal or Unit
-	:param height: The page height
-	:type height: int, float, Decimal or Unit
-	"""
-
-	_unit = new_didot
-
-
-class Size_new_cicero(BaseSize):
-	"""
-	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
-	representing a pagesize in ciceros.
-
-	:param width: The page width
-	:type width: int, float, Decimal or Unit
-	:param height: The page height
-	:type height: int, float, Decimal or Unit
-	"""
-
-	_unit = new_cicero
-
-
-class Size_scaled_point(BaseSize):
-	"""
-	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
-	representing a pagesize in scaled points.
-
-	:param width: The page width
-	:type width: int, float, Decimal or Unit
-	:param height: The page height
-	:type height: int, float, Decimal or Unit
-	"""
-
-	_unit = scaled_point
-
-
 class PageSize(BaseSize):
 	"""
 	Subclass of :class:`~domdf_python_tools.pagesizes.classes.BaseSize`
@@ -322,6 +247,14 @@ def __new__(cls, width: AnyNumber, height: AnyNumber, unit: AnyNumber = pt):
 		width, height = convert_from((width, height), unit)  # type: ignore
 		return super().__new__(cls, width, height)
 
+	@property
+	def pt(self) -> "PageSize":
+		"""
+		Returns the pagesize in pt.
+		"""
+
+		return self
+
 	@property
 	def inch(self) -> Size_inch:
 		"""
@@ -354,6 +287,8 @@ def um(self) -> Size_um:
 
 		return Size_um.from_pt(self)
 
+	µm = um
+
 	@property
 	def pc(self) -> Size_pica:
 		"""
@@ -363,53 +298,3 @@ def pc(self) -> Size_pica:
 		return Size_pica.from_pt(self)
 
 	pica = pc
-
-	@property
-	def dd(self) -> Size_didot:
-		"""
-		Returns the pagesize in didots.
-		"""
-
-		return Size_didot.from_pt(self)
-
-	didot = dd
-
-	@property
-	def cc(self) -> Size_cicero:
-		"""
-		Returns the pagesize in ciceros.
-		"""
-
-		return Size_cicero.from_pt(self)
-
-	cicero = cc
-
-	@property
-	def nd(self) -> Size_new_didot:
-		"""
-		Returns the pagesize in new didots.
-		"""
-
-		return Size_new_didot.from_pt(self)
-
-	new_didot = nd
-
-	@property
-	def nc(self) -> Size_new_cicero:
-		"""
-		Returns the pagesize in new ciceros.
-		"""
-
-		return Size_new_cicero.from_pt(self)
-
-	new_cicero = nc
-
-	@property
-	def sp(self) -> Size_scaled_point:
-		"""
-		Returns the pagesize in scaled point.
-		"""
-
-		return Size_scaled_point.from_pt(self)
-
-	scaled_point = sp

domdf_python_tools/pagesizes/units.py

@@ -31,6 +31,7 @@
 #
 
 # stdlib
+import math
 from decimal import ROUND_HALF_UP, Decimal
 from typing import Union
 
@@ -42,16 +43,6 @@
 		"um",
 		"pc",
 		"pica",
-		"dd",
-		"didot",
-		"cc",
-		"cicero",
-		"nd",
-		"new_didot",
-		"nc",
-		"new_cicero",
-		"sp",
-		"scaled_point",
 		"Unit",
 		]
 
@@ -157,50 +148,74 @@ class Unit(float):
 	>>> (3*mm) % 2.5
 	<Unit '0.500 mm': 1.417pt>
 
-	Diving by a unit, or modulo division of two units, is not officially supported.
+	Dividing by a unit, or modulo division of two units, is not officially supported.
 	"""
 
 	name: str = "pt"
 	_in_pt: float = 1
 
 	def __repr__(self):
+		value = _rounders(float(self), "0.000")
+		as_pt = _rounders(self.as_pt(), "0.000")
+		return f"<Unit '{value} {self.name}': {as_pt}pt>"
+
+	def __str__(self):
 		value = _rounders(float(self), "0.000")
 		as_pt = _rounders(self.as_pt(), "0.000")
 		return f"<Unit '{value}\u205F{self.name}': {as_pt}pt>"
 
 	def __mul__(self, other: Union[float, "Unit"]) -> "Unit":
 		if isinstance(other, Unit):
-			return NotImplemented
+			raise NotImplementedError("Multiplying a unit by another unit is not allowed.")
 
 		return self.__class__(super().__mul__(other))
 
 	__rmul__ = __mul__
 
 	def __truediv__(self, other: Union[float, "Unit"]) -> "Unit":
 		if isinstance(other, Unit):
-			return NotImplemented
+			raise NotImplementedError("Dividing a unit by another unit is not allowed.")
 
 		return self.__class__(super().__truediv__(other))
 
-	__div__ = __truediv__
+	def __floordiv__(self, other: Union[float, "Unit"]) -> "Unit":
+		if isinstance(other, Unit):
+			raise NotImplementedError("Dividing a unit by another unit is not allowed.")
+
+		return self.__class__(super().__floordiv__(other))
+
+	def __eq__(self, other: Union[float, "Unit"]) -> bool:
+		if isinstance(other, Unit):
+			if self._in_pt != 1:
+				self_value = self.as_pt()
+			else:
+				self_value = self
+
+			if other._in_pt != 1:
+				other_value = other.as_pt()
+			else:
+				other_value = other
+
+			return math.isclose(float(self_value), float(other_value), abs_tol=1e-8)
+		else:
+			return super().__eq__(other)
 
 	def __mod__(self, other: Union[float, "Unit"]) -> "Unit":
 		if isinstance(other, Unit):
-			return NotImplemented
+			raise NotImplementedError("Modulo division of a unit by another unit is not allowed.")
 
 		return self.__class__(super().__mod__(other))
 
 	def __pow__(self, power, modulo=None):
-		return NotImplemented
+		raise NotImplementedError("Powers are not supported for units.")
 
 	def __rtruediv__(self, other):
-		return NotImplemented
+		raise NotImplementedError("Dividing by a unit is not allowed.")
 
 	__rdiv__ = __rtruediv__
 
 	def __add__(self, other: Union[float, "Unit"]) -> "Unit":
 		if isinstance(other, Unit):
-			print(float(self.as_pt()) + float(other.as_pt()))
 			return self.__class__.from_pt(float(self.as_pt()) + float(other.as_pt()))
 		else:
 			return self.__class__(super().__add__(other))
@@ -214,13 +229,13 @@ def __sub__(self, other: Union[float, "Unit"]) -> "Unit":
 			return self.__class__(super().__sub__(other))
 
 	def __rsub__(self, other: Union[float, "Unit"]) -> "Unit":
-		if isinstance(other, Unit):
+		if isinstance(other, Unit):  # pragma: no cover (sub should be called instead)
 			return self.__class__.from_pt(float(other.as_pt()) - float(self.as_pt()))
 		else:
 			return self.__class__(super().__rsub__(other))
 
 	def as_pt(self) -> "Unit":
-		return Unit(float(self) * self._in_pt)
+		return Unit(float(_rounders(float(self) * self._in_pt, "0.000000")))
 
 	@classmethod
 	def from_pt(cls, value: float) -> "Unit":
@@ -236,7 +251,7 @@ class Unitpt(Unit):
 
 
 class UnitInch(Unit):
-	name = "in"
+	name = "inch"
 	_in_pt = 72.0
 
 
@@ -252,48 +267,18 @@ class Unitmm(Unit):
 
 class Unitum(Unit):
 	name = "µm"
-	_in_pt = 0.283464566929
+	_in_pt = 0.00283464566929
 
 
 class Unitpc(Unit):
 	name = "pc"
 	_in_pt = 12.0
 
 
-class Unitdd(Unit):
-	name = "dd"
-	_in_pt = 1.07
-
-
-class Unitcc(Unit):
-	name = "cc"
-	_in_pt = 12.84
-
-
-class Unitnd(Unit):
-	name = "nd"
-	_in_pt = 1.067
-
-
-class Unitnc(Unit):
-	name = "nc"
-	_in_pt = 12.804
-
-
-class Unitsp(Unit):
-	name = "sp"
-	_in_pt = 1 / 65536
-
-
 # Units
 pt = Unitpt(1)
 inch = UnitInch(1)
 cm = Unitcm(1)
 mm = Unitmm(1)
 um = Unitum(1)
 pc = pica = Unitpc(1)
-dd = didot = Unitdd(1)
-cc = cicero = Unitcc(1)
-nd = new_didot = Unitnd(1)
-nc = new_cicero = Unitnc(1)
-sp = scaled_point = Unitsp(1)