From 0f33552e45c4538d43de56cbf1bbb6beeb531d83 Mon Sep 17 00:00:00 2001 From: Mark Pilgrim Date: Wed, 8 Apr 2009 20:56:11 -0400 Subject: [PATCH] mobile fiddling --- about.html | 2 +- advanced-iterators.html | 2 +- case-study-porting-chardet-to-python-3.html | 2 +- dip3.css | 2 - index.html | 2 +- iterators-and-generators.html | 2 +- mobile.css | 69 ++++++++++++++------- native-datatypes.html | 2 +- porting-code-to-python-3-with-2to3.html | 2 +- publish | 1 + regular-expressions.html | 2 +- strings.html | 2 +- table-of-contents.html | 2 +- unit-testing.html | 2 +- your-first-python-program.html | 2 +- 15 files changed, 59 insertions(+), 37 deletions(-) diff --git a/about.html b/about.html index 90249a1..44e40f1 100644 --- a/about.html +++ b/about.html @@ -23,6 +23,6 @@ h1:before{content:""}
  • The entire book was lovingly hand-authored in HTML 5 to avoid markup cruft.

    Send corrections and feedback to mark@diveintomark.org. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/advanced-iterators.html b/advanced-iterators.html index fc9d520..ac9aa69 100644 --- a/advanced-iterators.html +++ b/advanced-iterators.html @@ -301,6 +301,6 @@ Wesley

    FIXME -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/case-study-porting-chardet-to-python-3.html b/case-study-porting-chardet-to-python-3.html index 8fcfd24..f30a909 100644 --- a/case-study-porting-chardet-to-python-3.html +++ b/case-study-porting-chardet-to-python-3.html @@ -1178,6 +1178,6 @@ tests\EUC-JP\arclamp.jp.xml EUC-JP with confide

  • You need to understand your program. Thoroughly. Preferably because you wrote it, but at the very least, you need to be comfortable with all its quirks and musty corners. The bugs are everywhere.
  • Test cases are essential. Don't port anything without them. Don't even try. The only reason I have any confidence at all that chardet works in Python 3 is because I had a test suite that exercised every line of code in the entire library. I never would have found half of these problems with manual spot-checking. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/dip3.css b/dip3.css index 755d5b7..95c3a23 100644 --- a/dip3.css +++ b/dip3.css @@ -47,8 +47,6 @@ Acknowledgements & Inspirations "Compose to a Vertical Rhythm" ........................... http://24ways.org/2006/compose-to-a-vertical-rhythm "Use the Best Available Ampersand" ....................... http://simplebits.com/notebook/2008/08/14/ampersands.html "Unicode Support in HTML, Fonts, and Web Browsers" ....... http://alanwood.net/unicode/ -"Return of the Mobile Style Sheet" ....................... http://www.alistapart.com/articles/returnofthemobilestylesheet -"Optimizing Web Content Using Conditional CSS" ........... http://developer.apple.com/safari/library/documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/chapter_3_section_2.html */ /* typography */ diff --git a/index.html b/index.html index 98ed884..cc5435a 100644 --- a/index.html +++ b/index.html @@ -55,6 +55,6 @@ h1:before{content:""}

    This site is optimized for Lynx just because fuck you.
    I’m told it also looks good in graphical browsers. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/iterators-and-generators.html b/iterators-and-generators.html index 94f0605..6b29d08 100644 --- a/iterators-and-generators.html +++ b/iterators-and-generators.html @@ -570,6 +570,6 @@ rules = LazyRules()

  • PEP 255: Simple Generators -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/mobile.css b/mobile.css index 37385c9..285bf22 100644 --- a/mobile.css +++ b/mobile.css @@ -1,39 +1,62 @@ -/* mobile stylesheet for iPhone, Android, and other small-screen devices */ +/* + +"Dive Into Python 3" mobile stylesheet for iPhone, Android, and other +small-screen devices + +Copyright (c) 2009, Mark Pilgrim, All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +Acknowledgements & Inspirations + +"Return of the Mobile Style Sheet" ....................... http://www.alistapart.com/articles/returnofthemobilestylesheet +"Optimizing Web Content Using Conditional CSS" ........... http://developer.apple.com/safari/library/documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/chapter_3_section_2.html +*/ /* typography */ -body,.c,span,pre span,.baa{font-size:12px;word-spacing:0} -pre,kbd,samp,code,var{font-size:12px;font-family:'Droid Sans Mono',monospace} -.c,pre{line-height:1.75} -.baa{font-family:serif} +body,.c,span,pre span,.c,.note,p,ul,ol{font:normal 12px/18px sans-serif;word-spacing:0} +pre,kbd,samp,code,var{font:normal 12px/18px monospace} +.baa{font:normal 14px/18px serif} abbr{font-variant:normal;text-transform:none;letter-spacing:0} -.c,.note,p,ul,ol{font-size:12px;margin:1.75em 0} +.c,.note,p,ul,ol,h2,h3{margin:1.75em 0} /* basics */ html{color:#000} -body{margin:0} +body{margin:4px 1px 0 1px} /* links */ a{text-decoration:underline;border-bottom:0} -a:hover{border-bottom:0} pre a{text-decoration:none} -/* code blocks */ -pre{padding:0;border:0} - /* headers and pullquotes */ -h1,h2,h3{padding:0;border:0;letter-spacing:0;font-variant:normal} -h1{margin:0;width:auto} -h2,h3{margin:1.75em 0} -h1,h1 code{font-size:18px} -h2,h2 code{font-size:16px} -h3,h3 code{font-size:14px} +h1,h2,h3,pre{padding:0;border:0;letter-spacing:0} +h1{margin:0} +h1,h1 code{font:normal 18px/18px serif} +h2,h2 code{font:normal 16px/18px serif} +h3,h3 code{font:normal 14px/18px serif} h1:before{content:""} -h1{counter-reset:h2} -h2:before{counter-increment:h2;content:counter(h1) "." counter(h2) ". "} -h3:before{counter-increment:h3;content:counter(h1) "." counter(h2) "." counter(h3) ". "} /* overrides */ -.nm,.w,aside,form,form + p,.note span,ol li li,.q span{display:none} -ol{padding-left:24px} -ul{list-style:none;margin:0;padding:0} +.nm,.w,aside,form,form+p,.note span,.q span{display:none} +ol,ul{margin:0;padding:0 0 0 24px} dd{margin:0 0 0 1.75em} diff --git a/native-datatypes.html b/native-datatypes.html index 5c501b5..26d4aaf 100644 --- a/native-datatypes.html +++ b/native-datatypes.html @@ -453,6 +453,6 @@ KeyError: 'db.diveintopython3.org'

  • PEP 237: Unifying Long Integers and Integers
  • PEP 238: Changing the Division Operator -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/porting-code-to-python-3-with-2to3.html b/porting-code-to-python-3-with-2to3.html index 832fb82..561fbd0 100644 --- a/porting-code-to-python-3-with-2to3.html +++ b/porting-code-to-python-3-with-2to3.html @@ -1153,6 +1153,6 @@ do_stuff(a_list) do_stuff(a_list)

    FIXME: once the rest of the book is written, this appendix should contain copious links back to any chapter or section that touches on these features. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/publish b/publish index 84b8e7c..5c62d4a 100644 --- a/publish +++ b/publish @@ -22,6 +22,7 @@ java -jar yuicompressor-2.4.2.jar build/dip3.js > build/$revision.js java -jar yuicompressor-2.4.2.jar build/dip3.css > build/$revision.css java -jar yuicompressor-2.4.2.jar build/mobile.css > build/m-$revision.css sed -i -e "s|;}|}|g" build/$revision.css +sed -i -e "s|;}|}|g" build/m-$revision.css # put CSS inline css=`cat build/$revision.css` diff --git a/regular-expressions.html b/regular-expressions.html index ff17c96..66df17b 100644 --- a/regular-expressions.html +++ b/regular-expressions.html @@ -417,6 +417,6 @@ body{counter-reset:h1 4}

  • (x) in general is a remembered group. You can get the value of what matched by using the groups() method of the object returned by re.search.

    Regular expressions are extremely powerful, but they are not the correct solution for every problem. You should learn enough about them to know when they are appropriate, when they will solve your problems, and when they will cause more problems than they solve. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/strings.html b/strings.html index acf214a..12c3ffd 100644 --- a/strings.html +++ b/strings.html @@ -388,6 +388,6 @@ is an object. You might have thought I meant that string variables are

  • PEP 3101: Advanced String Formatting -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/table-of-contents.html b/table-of-contents.html index 1333c17..9bdf039 100644 --- a/table-of-contents.html +++ b/table-of-contents.html @@ -367,4 +367,4 @@ ul li ol{margin:0;padding:0 0 0 2.5em}

  • Dictionary comprehensions
  • Views (several dictionary methods return them, they're dynamic, update when the dictionary changes, etc.) -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/unit-testing.html b/unit-testing.html index fd08d0a..c4946a2 100644 --- a/unit-testing.html +++ b/unit-testing.html @@ -355,6 +355,6 @@ For instance, the testFromRomanCase method (“from_roman

  • from_roman should only accept uppercase Roman numerals (i.e. it should fail when given lowercase input). --> -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim diff --git a/your-first-python-program.html b/your-first-python-program.html index 51dfeb2..ded3fff 100644 --- a/your-first-python-program.html +++ b/your-first-python-program.html @@ -223,6 +223,6 @@ if __name__ == "__main__":

  • PEP 8: Style Guide for Python Code discusses good indentation style.
  • Python Reference Manual explains what it means to say that everything in Python is an object, because some people are pedantic and like to discuss that sort of thing at great length. -

    © 2001–9 ark Pilgrim +

    © 2001–9 Mark Pilgrim