diff --git a/.travis.yml b/.travis.yml index 31a768c..1afb9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,36 @@ language: python python: - '2.7' -install: -- sudo add-apt-repository -y ppa:texlive-backports/ppa -- sudo apt-get update -- sudo apt-get install texlive make +addons: + apt: + packages: + - texlive-latex-recommended + - texlive-latex-extra + - texlive-fonts-recommended + - texlive-font-utils + - texlive-generic-recommended + - psutils + - ps2eps + - dvidvi + - purifyeps + - t1utils + - dot2tex + - texlive-luatex + - lmodern + - tipa + - prosper + - latex-beamer + - latex-xcolor + - pgf script: +- apt list --installed +- epstopdf +- dvips - (cd sheets; LATEX_OPTS="-interaction=nonstopmode -shell-escape" make pdfrelease) deploy: - provider: s3 - access_key_id: AKIAJNGHJWMQEU6QAIPQ - secret_access_key: - secure: tviNwD7V1A4WRzCwnRGXTHUf6kdbEG+7X7AxnTnSEf+ar1iXl/1aplLKFccc9vwzlGy0sUVqv0wg0kmQkIMhUhdZovOD4gUnOARUZzkTHj9L0apIb2gxLyEyYHCRFiIKLT6Vto8iPbU3ALCoQAhk2oQwM+dznQb6lg+U5HpRK8U= - bucket: livewires-worksheets - local-dir: release - upload-dir: "$TRAVIS_BUILD_NUMBER" - acl: !ruby/string:HighLine::String public_read - skip_cleanup: true + provider: releases + api_key: + secure: cONhoGDyJTI1AB3N52EXNKoP6VivURket/NZEIzEpLgg2iiXzvevTZehOIJmdB67fdW0cHqkgpsD2kxxJ/BkoJN7atOPdmnIOeKD2GX8ntT33Fcvs3Co2drVPLtpriWQhnY7qNVBsYpm4kuyRZ+gAjFkQus6JC3+YF+O3U29lGTR/CFBmZMgIR+LLUVZMOYlugAOe/6aIYAKhw7jG2B4Do1s/gPM/l9fexqYr5B+4iiTRDZgDo9PcwhyzTEU7XsHhEHf3JQWxWE5U1XybBvvb826EIEj3ak/TaTvF5xe2uIuTGU9Hx5GAvJEOjuB3s/WAhVTGLm50y58ipmLiTg54Ya6tkdLZzsArX+wAexjW58kAlGDiFIvQcmvcdbLBfgtnlAR7MsZEksaJ5TWVZohGMAK0+umIlmJ7sqnQu2g5x11BxAM2TEW5TyTTtlQL1u4Tbc11UGCkVdzqPTBrEJis0b7WTrWawpDlqi22GXeHPl2jI372TMXT5crdIZAgC1zJdF7B+cpxE2bJLrm4JUnAqKtZWs/nmwKMDZ0Z5kG9AtL9aFQhgCr3C7SG+f6HBTiylYRZtucrXWzjU7r8vU9Bc64efvcQr/KFFo9xjLxDRpEyG0t/0q3LUKQdrDpNdVmMXJqYL/cWLHqEoev+LngeIuRhpvX9eeqXdaR0p+E688= + file: release/livewires-pdfs.tar.gz on: - repo: livewires/python + repo: tjvr/livewires diff --git a/sheets/games/minesweeper.ltx b/sheets/games/minesweeper.ltx index bc261f2..a25bc5e 100755 --- a/sheets/games/minesweeper.ltx +++ b/sheets/games/minesweeper.ltx @@ -231,6 +231,9 @@ Now we get on to our boxes on the screen. \begin{program} class GridBox(boards.GameCell): def __init__(self, screen, i, j): + self.init_gridbox(screen, i, j) + + def init_gridbox(self, screen, i, j): self.init_gamecell(screen, i, j) self.flagged = 0 self.shown = 0 @@ -264,9 +267,9 @@ so that it can be seen. The following code will do the trick: \begin{program} class Mine(boards.Container, GridBox): - def __init(self, board, i, j): - self.init_gridbox(board, i, j) + def __init__(self, board, i, j): self.init_container(['image', 'flag']) + self.init_gridbox(board, i, j) def reveal_mine(self): self.set_colour(colour.red) diff --git a/sheets/games/tetris.ltx b/sheets/games/tetris.ltx index 5842abb..c666f76 100755 --- a/sheets/games/tetris.ltx +++ b/sheets/games/tetris.ltx @@ -619,8 +619,8 @@ tx, ty = self.cell_to_coords(WIDTH/2, -1) self.status_message = games.Text(self, tx, ty+BOX_SIZE/2, "TETRIS", TITLE_SIZE, colour.white) tx, ty = self.cell_to_coords(WIDTH/2, HEIGHT) -self.score_message = game.Text(self, tx, ty+BOX_SIZE/2, - "Score: 0", SCORE_SIZE, colour.white) +self.score_message = games.Text(self, tx, ty+BOX_SIZE/2, + "Score: 0", SCORE_SIZE, colour.white) self.score = 0 \end{program}