Changed video standard nomenclature to be completely pedantic.

diff --git a/README b/README
index 45c0189c3cfac96f930a85fa7dd36f7807de0231..e209fff39fb72ca49e0330a233c33f8a2caf236f 100644 (file)
--- a/README
+++ b/README
@@ -66,9 +66,28 @@ This will result in a title with the following chapters:
 
 Video standards
 
 
 Video standards
 

-By default, webdvd generates PAL/SECAM video.  If you wish to produce
-NTSC DVDs you can override this by adding the option "--video-std ntsc"
-to the following commands.
+The encoding of analogue TV and video signals varies in many different
+ways between countries.  Happily there are only two parameters that
+matter for standard-definition digital video, and two different pairs
+of values.  You can choose between these with the --video-std option:
+
+Analogue parameters   | Region of world              | --video-std | Frame
+                      |                              | argument    | size
+----------------------+------------------------------+-------------+--------
+59.94 fields/second,  | Americas except Argentina,   | 525         | 720x576
+interlaced;           | Paraguay, Uruguay;           | or 525/60   |
+525 lines/frame       | Japan; Laos; Myanmar;        | or NTSC     |
+(commonly called      | Philippines; South Korea;    | or ntsc     |
+ NTSC)                | Taiwan; some Pacific islands |             |
+----------------------+------------------------------+-------------+--------
+50 fields/second,     | Rest of world                | 625         | 720x480
+interlaced;           |                              | or 625/50   |
+625 lines/frame       |                              | or PAL      |
+(commonly called PAL) |                              | or pal      |
+
+The default is to use "PAL" parameters.
+
+Currently 

 
 Preview
 
 
 Preview
 


@@ -109,13 +128,13 @@ Limitations
 
 Each page must fit within the frame - DVD players do not support
 scrolling menus and WebDVD currently is not able to split them into
 
 Each page must fit within the frame - DVD players do not support
 scrolling menus and WebDVD currently is not able to split them into

-multiple menus.  The standard frame size for PAL and SECAM is 720x576
-pixels; for NTSC it is 720x480 pixels.  The exact visible area varies
-between TVs so the background should cover all or very nearly all the
-frame whereas the important content such as text must not be placed
-near the edge.  For this reason WebDVD applies a stylesheet to all
-pages that adds 60 pixels of padding on all sides of the body; this
-doesn't apply to the background.
+multiple menus.  The frame size is dictated by the video standard; see
+above.  The exact visible area varies between TVs so the background
+should cover all or very nearly all the frame whereas the important
+content such as text must not be placed near the edge.  For this
+reason WebDVD applies a stylesheet to all pages that adds 60 pixels of
+padding on all sides of the body; this doesn't apply to the
+background.

 
 Prior to Mozilla version 1.8, which I have not yet tested, Mozilla may
 signal that a page is completely loaded before any background images
 
 Prior to Mozilla version 1.8, which I have not yet tested, Mozilla may
 signal that a page is completely loaded before any background images

diff --git a/webdvd.cpp b/webdvd.cpp
index fa94ccb90abcd410b4ceed506dd2e6ec2bdf7878..9063bce42befa3a31fb20abce50d029d67162484 100644 (file)
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -868,9 +868,9 @@ namespace
        // ranging from 10 to 25 inches wide, for a resolution of
        // 24-60 dpi.  I therefore declare the average horizontal
        // resolution to be 40 dpi.  The vertical resolution will be
        // ranging from 10 to 25 inches wide, for a resolution of
        // 24-60 dpi.  I therefore declare the average horizontal
        // resolution to be 40 dpi.  The vertical resolution will be

-       // slightly higher (PAL/SECAM) or lower (NTSC), but
-       // unfortunately Mozilla doesn't support non-square pixels
-       // (and neither do fontconfig or Xft anyway).
+       // slightly different but unfortunately Mozilla doesn't
+       // support non-square pixels (and neither do fontconfig or Xft
+       // anyway).

        check(pref_service->GetDefaultBranch("browser.display",
                                             getter_AddRefs(pref_branch)));
        check(pref_branch->SetIntPref("screen_resolution", 40));
        check(pref_service->GetDefaultBranch("browser.display",
                                             getter_AddRefs(pref_branch)));
        check(pref_branch->SetIntPref("screen_resolution", 40));