PR: Add font properties handling

.github/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
  task: ['pycodestyle']
  steps:
  - uses: actions/checkout@v1
- - name: Set up Python 3.7
+ - name: Set up Python 3.8
  uses: actions/setup-python@v1
  with:
- python-version: 3.7
+ python-version: 3.8
  - name: Install dependencies
  run: |
  pip install --upgrade pip setuptools beefore
@@ -25,31 +25,35 @@ jobs:
  beefore --username github-actions --repository ${{ github.repository }} --pull-request ${{ github.event.number }} --commit ${{ github.event.pull_request.head.sha }} ${{ matrix.task }} .
 
  smoke:
- name: Smoke test
+ name: Smoke test (Linux) (3.5)
  needs: beefore
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v1
- - name: Set up Python 3.7
+ - name: Set up Python 3.5
  uses: actions/setup-python@v1
  with:
- python-version: 3.7
+ python-version: 3.5
  - name: Install dependencies
  run: |
- pip install --upgrade pip setuptools pytest-tldr
+ sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config
+ pip install --upgrade pip setuptools pytest pytest-tldr
  pip install -e .
+ - name: Install fonts
+ run: |
+ xvfb-run -a -s '-screen 0 2048x1536x24' python tests/utils.py
  - name: Test
  run: |
- python setup.py test
+ xvfb-run -a -s '-screen 0 2048x1536x24' pytest tests/
 
  python-versions:
- name: Python compatibility test
+ name: Python compatibility test (Linux)
  needs: smoke
  runs-on: ubuntu-latest
  strategy:
  max-parallel: 4
  matrix:
- python-version: [3.5, 3.6]
+ python-version: [3.6, 3.7, 3.8]
  steps:
  - uses: actions/checkout@v1
  - name: Set up Python ${{ matrix.python-version }}
@@ -58,8 +62,54 @@ jobs:
  python-version: ${{ matrix.python-version }}
  - name: Install dependencies
  run: |
- pip install --upgrade pip setuptools
+ sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config
+ pip install --upgrade pip setuptools pytest pytest-tldr
+ pip install -e .
+ - name: Install fonts
+ run: |
+ xvfb-run -a -s '-screen 0 2048x1536x24' python tests/utils.py
+ - name: Test
+ run: |
+ xvfb-run -a -s '-screen 0 2048x1536x24' pytest tests/
+
+ windows:
+ name: Windows tests
+ needs: python-versions
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set up Python 3.5
+ uses: actions/setup-python@v1
+ with:
+ python-version: 3.5
+ - name: Install dependencies
+ run: |
+ pip install --upgrade pip setuptools pytest pytest-tldr
  pip install -e .
+ - name: Install fonts
+ run: |
+ python tests/utils.py
+ - name: Test
+ run: |
+ pytest tests/
+
+ macOS:
+ name: macOS tests
+ needs: python-versions
+ runs-on: macos-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set up Python 3.5
+ uses: actions/setup-python@v1
+ with:
+ python-version: 3.5
+ - name: Install dependencies
+ run: |
+ pip install --upgrade pip setuptools pytest pytest-tldr
+ pip install -e .
+ - name: Install fonts
+ run: |
+ python tests/utils.py
  - name: Test
  run: |
- python setup.py test
+ pytest tests/

colosseum/constants.py

@@ -1,5 +1,6 @@
-from .validators import (is_color, is_integer, is_length, is_number,
- is_percentage, ValidationError)
+from .exceptions import ValidationError
+from .validators import is_color, is_font_family, is_integer, is_length, is_number, is_percentage
+from .wrappers import FontFamily
 
 
 class Choices:
@@ -36,13 +37,13 @@ def validate(self, value):
  def __str__(self):
  choices = set([str(c).lower().replace('_', '-') for c in self.constants])
  for validator in self.validators:
- choices.add(validator.description)
+ choices.update(validator.description.split(', '))
 
  if self.explicit_defaulting_constants:
  for item in self.explicit_defaulting_constants:
  choices.add(item)
 
- return ", ".join(sorted(choices))
+ return ", ".join(sorted(set(choices)))
 
 
 ######################################################################
@@ -235,6 +236,8 @@ def __str__(self):
 # 10.8 Leading and half-leading
 ######################################################################
 # line_height
+LINE_HEIGHT_CHOICES = Choices(NORMAL, validators=[is_number, is_length, is_percentage],
+ explicit_defaulting_constants=[INHERIT])
 # vertical_align
 
 ######################################################################
@@ -317,26 +320,133 @@ def __str__(self):
 ######################################################################
 # font_family
 
+SERIF = 'serif'
+SANS_SERIF = 'sans-serif'
+CURSIVE = 'cursive'
+FANTASY = 'fantasy'
+MONOSPACE = 'monospace'
+
+GENERIC_FAMILY_FONTS = [SERIF, SANS_SERIF, CURSIVE, FANTASY, MONOSPACE]
+
+FONT_FAMILY_CHOICES = Choices(
+ validators=[is_font_family],
+ explicit_defaulting_constants=[INHERIT, INITIAL],
+)
+
 ######################################################################
 # 15.4 Font Styling
 ######################################################################
 # font_style
+NORMAL = 'normal'
+ITALIC = 'italic'
+OBLIQUE = 'oblique'
+
+FONT_STYLE_CHOICES = Choices(
+ NORMAL,
+ ITALIC,
+ OBLIQUE,
+ explicit_defaulting_constants=[INHERIT],
+)
 
 ######################################################################
 # 15.5 Small-caps
 ######################################################################
 # font_variant
+SMALL_CAPS = 'small-caps'
+FONT_VARIANT_CHOICES = Choices(
+ NORMAL,
+ SMALL_CAPS,
+ explicit_defaulting_constants=[INHERIT],
+)
 
 ######################################################################
 # 15.6 Font boldness
 ######################################################################
 # font_weight
+BOLD = 'bold'
+BOLDER = 'bolder'
+LIGHTER = 'lighter'
+WEIGHT_100 = '100'
+WEIGHT_200 = '200'
+WEIGHT_300 = '300'
+WEIGHT_400 = '400'
+WEIGHT_500 = '500'
+WEIGHT_600 = '600'
+WEIGHT_700 = '700'
+WEIGHT_800 = '800'
+WEIGHT_900 = '900'
+
+FONT_WEIGHT_CHOICES = Choices(
+ NORMAL,
+ BOLD,
+ BOLDER,
+ LIGHTER,
+ WEIGHT_100,
+ WEIGHT_200,
+ WEIGHT_300,
+ WEIGHT_400,
+ WEIGHT_500,
+ WEIGHT_600,
+ WEIGHT_700,
+ WEIGHT_800,
+ WEIGHT_900,
+ explicit_defaulting_constants=[INHERIT],
+)
 
 ######################################################################
 # 15.7 Font size
 ######################################################################
 # font_size
 
+# <absolute-size>
+XX_SMALL = 'xx-small'
+X_SMALL = 'x-small'
+SMALL = 'small'
+MEDIUM = 'medium'
+LARGE = 'large'
+X_LARGE = 'x-large'
+XX_LARGE = 'xx-large'
+
+# <relative-size>
+LARGER = 'larger'
+SMALLER = 'smaller'
+
+FONT_SIZE_CHOICES = Choices(
+ XX_SMALL,
+ X_SMALL,
+ SMALL,
+ MEDIUM,
+ LARGE,
+ X_LARGE,
+ XX_LARGE,
+ LARGER,
+ SMALLER,
+ validators=[is_length, is_percentage],
+ explicit_defaulting_constants=[INHERIT],
+)
+
+######################################################################
+# 15.8 Font shorthand
+######################################################################
+
+ICON = 'icon'
+CAPTION = 'caption'
+MENU = 'menu'
+MESSAGE_BOX = 'message-box'
+SMALL_CAPTION = 'small-caption'
+STATUS_BAR = 'status-bar'
+
+SYSTEM_FONT_KEYWORDS = [ICON, CAPTION, MENU, MESSAGE_BOX, SMALL_CAPTION, STATUS_BAR]
+
+INITIAL_FONT_VALUES = {
+ 'font_style': NORMAL,
+ 'font_variant': NORMAL,
+ 'font_weight': NORMAL,
+ 'font_size': MEDIUM,
+ 'line_height': NORMAL,
+ 'font_family': FontFamily([INITIAL]), # TODO: Depends on user agent. What to use?
+}
+
 ######################################################################
 # 16. Text ###########################################################
 ######################################################################