diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 312170a9a33..9d013311cd3 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -57,7 +57,7 @@ $(BOOKNAME)/index.html: $(BOOK_SRCS) $(DB2HTML) $(BOOKNAME).sgml $(BOOKNAME).pdf: $(BOOK_SRCS) - db2pdf $(BOOKNAME).sgml > /dev/null + db2pdf -d ./print.dsl $(BOOKNAME).sgml > /dev/null $(BOOKNAME).ps: $(BOOK_SRCS) db2ps $(BOOKNAME).sgml > /dev/null diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index f3b4345c05c..21950a7fd97 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -171,15 +171,12 @@ to leave off the trailing slash! - -"Type" = "floppy|hd|cdrom|network" <--- the |'s mean "Type = '<one of the options>'" - - - + "Type" = "floppy|hd|cdrom|network" Sets up the type of drive Wine will see it as. Type must equal one of the four floppy, hd, cdrom, or network. They are self-explanatory. + (The |'s mean "Type = '<one of the options>'".) "Label" = "blah" Defines the diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml index 0ba774201cd..213f03140d7 100644 --- a/documentation/fonts.sgml +++ b/documentation/fonts.sgml @@ -435,8 +435,10 @@ default-resolutions = 75,75,100,100 my Windows fonts on my Win95 C: drive live; could be e.g. /mnt/dosC/windows/system for Win31. + + In /c/windows/fonts/fonts.scale I - have + have: 14 diff --git a/documentation/getting.sgml b/documentation/getting.sgml index 0bf899b4ad0..25d82c10c6b 100644 --- a/documentation/getting.sgml +++ b/documentation/getting.sgml @@ -78,9 +78,7 @@ this may be a little risky, depending on how far the unstable distribution has diverged from the stable one. You can find a list of Wine binary packages for the various Debian releases - using the - - package search engine at + using the package search engine at www.debian.org. diff --git a/documentation/installing.sgml b/documentation/installing.sgml index 5fd4895b36b..51005dedfc4 100644 --- a/documentation/installing.sgml +++ b/documentation/installing.sgml @@ -55,8 +55,8 @@ themselves, the Wine team will make the automated Wine installation script, tools/wineinstall, do everything we find necessary to do; running the - conventional configure && make depend && make && make - install cycle is thus not recommended, unless + conventional configure && make depend && make && make + install cycle is thus not recommended, unless you know what you're doing. At the moment, tools/wineinstall is able to create a configuration file, install the registry, and create the @@ -84,53 +84,17 @@ correctly. - - - - - C:\ - - Root directory of primary disk drive - - - - Windows\ - - Windows directory, containing .INI files, accessories, etc - - - - System\ - - Win3.x/95/98/ME directory for common DLLs -WinNT/2000 directory for common 16-bit DLLs - - - - System32\ - - WinNT/2000 directory for common 32-bit DLLs - - - - Start Menu\ - - Program launcher directory structure - - - - Programs\ - Program launcher links (.LNK files) to applications - - - - Program Files\ - - Application binaries (.EXE and .DLL files) - - - - + +C:\ Root directory of primary disk drive + Windows\ Windows directory, containing .INI files, + accessories, etc. + System\ Win3.x/95/98/ME directory for common DLLs + WinNT/2000 directory for common 16-bit DLLs + System32\ WinNT/2000 directory for common 32-bit DLLs + Start Menu\ Program launcher directory structure + Programs\ Program launcher links (.LNK files) to applications + Program Files\ Application binaries (.EXE and .DLL files) + Wine emulates drives by placing their virtual drive roots to @@ -246,9 +210,11 @@ WinNT/2000 directory for common 16-bit DLLs Use tools/wineinstall to compile Wine and install the default registry. Or if you prefer to do it yourself, compile programs/regapi, - and run: programs/regapi/regapi setValue < - winedefault.reg + and run: + + programs/regapi/regapi setValue < winedefault.reg + @@ -569,13 +535,9 @@ drwxrwxr-x 41 sle sle 16384 Dec 30 1998 windows - - Warning/Warning/Warning!!!!!! - - -THIS MAY TRASH YOUR SYSTEM IF USED INCORRECTLY -THIS MAY TRASH YOUR SYSTEM IF USED CORRECTLY - + Warning/Warning/Warning!!!!!! + This may trash your system if used incorrectly. It may + even trash your system when used correctly! @@ -629,7 +591,7 @@ THIS MAY TRASH YOUR SYSTEM IF USED CORRECTLY - Your SCSI card must be supported under linux. This will + Your SCSI card must be supported under Linux. This will not work with an unknown SCSI card. Even for cheap'n crappy "scanner only" controllers some special Linux drivers exist on the net. @@ -710,7 +672,7 @@ THIS MAY TRASH YOUR SYSTEM IF USED CORRECTLY -ipplus.exe <---> (TWAIN INTERFACE) <---> (TWAIN DATA SOURCE . ASPI) -> WINASPI +ipplus.exe <-> (TWAIN INTERFACE) <-> (TWAIN DATA SOURCE.ASPI) -> WINASPI @@ -718,7 +680,7 @@ ipplus.exe <---> (TWAIN INTERFACE) <---> (TWAIN DATA SOURCE . ASPI) -> WIN NOTES/BUGS - The biggest is that it only works under linux at the moment. + The biggest is that it only works under Linux at the moment. The ASPI code has only been tested with: diff --git a/documentation/introduction.sgml b/documentation/introduction.sgml index cf1babb1d52..aa701a3a876 100644 --- a/documentation/introduction.sgml +++ b/documentation/introduction.sgml @@ -90,8 +90,7 @@ The Wine Users Guide will focus on running precompiled Windows applications using the Wine emulator. - - The Winelib Users Guide will cover Winelib + The Winelib Users Guide will cover Winelib applications. diff --git a/documentation/make_winehq b/documentation/make_winehq index 240295ba3bb..a1428f22768 100755 --- a/documentation/make_winehq +++ b/documentation/make_winehq @@ -45,26 +45,26 @@ tar czf wine-set-html.tgz wine-doc cp wine-set-html.tgz $WWWDIR ## Create PostScript tarball -echo "db2ps wine-user.sgml" -db2ps wine-user.sgml > /dev/null 2>&1 -echo "db2ps wine-devel.sgml" -db2ps wine-devel.sgml > /dev/null 2>&1 -echo "db2ps winelib-user.sgml" -db2ps winelib-user.sgml > /dev/null 2>&1 -echo "db2ps wine-pkg.sgml" -db2ps wine-pkg.sgml > /dev/null 2>&1 +echo "db2ps -d ./print.dsl wine-user.sgml" +db2ps -d ./print.dsl wine-user.sgml > /dev/null 2>&1 +echo "db2ps -d ./print.dsl wine-devel.sgml" +db2ps -d ./print.dsl wine-devel.sgml > /dev/null 2>&1 +echo "db2ps -d ./print.dsl winelib-user.sgml" +db2ps -d ./print.dsl winelib-user.sgml > /dev/null 2>&1 +echo "db2ps -d ./print.dsl wine-pkg.sgml" +db2ps -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1 tar czf winedoc-ps.tgz wine-user.ps wine-devel.ps winelib-user.ps wine-pkg.ps cp winedoc-ps.tgz $WWWDIR ## Create PDF tarball -echo "db2pdf wine-user.sgml" -db2pdf wine-user.sgml > /dev/null 2>&1 -echo "db2pdf wine-devel.sgml" -db2pdf wine-devel.sgml > /dev/null 2>&1 -echo "db2pdf winelib-user.sgml" -db2pdf winelib-user.sgml > /dev/null 2>&1 -echo "db2pdf wine-pkg.sgml" -db2pdf wine-pkg.sgml > /dev/null 2>&1 +echo "db2pdf -d ./print.dsl wine-user.sgml" +db2pdf -d ./print.dsl wine-user.sgml > /dev/null 2>&1 +echo "db2pdf -d ./print.dsl wine-devel.sgml" +db2pdf -d ./print.dsl wine-devel.sgml > /dev/null 2>&1 +echo "db2pdf -d ./print.dsl winelib-user.sgml" +db2pdf -d ./print.dsl winelib-user.sgml > /dev/null 2>&1 +echo "db2pdf -d ./print.dsl wine-pkg.sgml" +db2pdf -d ./print.dsl wine-pkg.sgml > /dev/null 2>&1 tar czf winedoc-pdf.tgz wine-user.pdf wine-devel.pdf winelib-user.pdf wine-pkg.pdf cp winedoc-pdf.tgz $WWWDIR diff --git a/documentation/print.dsl b/documentation/print.dsl new file mode 100644 index 00000000000..7f53b2f2420 --- /dev/null +++ b/documentation/print.dsl @@ -0,0 +1,111 @@ + +]> + + + + + + +;; I was hoping that this would take out the many blank pages in the +;; PDF file, but it doesn't, it just slides the page numbers over. +(define %two-side% #f) + +(define %generate-book-titlepage% #t) + +;;Titlepage Not Separate +(define (chunk-skip-first-element-list) + (list (normalize "sect1") + (normalize "section"))) + +;;Titlepage Separate? +;(define (chunk-skip-first-element-list) +; '()) + +(define (list-element-list) + ;; fixes bug in Table of Contents generation + '()) + +(define (toc-depth nd) + 2) + +;; This seems to have no affect +(define %generate-book-titlepage-on-separate-page% #f) + +(define %body-start-indent% + ;; Default indent of body text + 2pi) + +(define %para-indent-firstpara% + ;; First line start-indent for the first paragraph + 0pt) + +(define %para-indent% + ;; First line start-indent for paragraphs (other than the first) + 0pt) + +(define %block-start-indent% + ;; Extra start-indent for block-elements + 2pt) + +;;Define distance between paragraphs +(define %para-sep% + (/ %bf-size% 2.0)) + +;;Define distance between block elements (figures, tables, etc.). +(define %block-sep% + (* %para-sep% 1.0)) +;; (* %para-sep% 2.0)) + +(define %hyphenation% + ;; Allow automatic hyphenation? + #t) + +(define %left-margin% 5pi) +(define %right-margin% 5pi) +(define %top-margin% 5pi) +(define %bottom-margin% 5pi) + +(define %footer-margin% 2pi) +(define %header-margin% 2pi) + +(define %line-spacing-factor% 1.3) + ;; Factor used to calculate leading + ;; The leading is calculated by multiplying the current font size by the + ;; '%line-spacing-factor%'. For example, if the font size is 10pt and + ;; the '%line-spacing-factor%' is 1.1, then the text will be + ;; printed "10-on-11". + +(define %head-before-factor% + ;; Factor used to calculate space above a title + ;; The space before a title is calculated by multiplying the font size + ;; used in the title by the '%head-before-factor%'. +;; 0.75) + 0.5) + +(define %head-after-factor% + ;; Factor used to calculate space below a title + ;; The space after a title is calculated by multiplying the font size used + ;; in the title by the '%head-after-factor%'. + 0.5) + +(define %input-whitespace-treatment% 'collapse) + +(define ($generate-book-lot-list$) + ;; Which Lists of Titles should be produced for Books? + (list )) + +(define tex-backend + ;; Are we using the TeX backend? + ;; This parameter exists so that '-V tex-backend' can be used on the + ;; command line to explicitly select the TeX backend. + #t) + + + + + + + + + diff --git a/documentation/running.sgml b/documentation/running.sgml index a07d991a9a0..4dd950e1b42 100644 --- a/documentation/running.sgml +++ b/documentation/running.sgml @@ -33,7 +33,8 @@ Options: --help,-h Show this help message --managed Allow the window manager to manage created windows --version,-v Display the Wine version - --winver Version to imitate (win95,nt40,win31,nt2k,win98,nt351,win30,win20) + --winver Version to imitate + (win95,nt40,win31,nt2k,win98,nt351,win30,win20) @@ -170,29 +171,83 @@ Options: in Wine. More channels might be added to (or subtracted from) later versions. - -all accel advapi animate aspi atom avifile bitblt -bitmap caret cdrom class clipboard clipping combo comboex -comm commctrl commdlg console crtdll cursor datetime dc -ddeml ddraw debug debugstr delayhlp dialog dinput dll -dosfs dosmem dplay driver dsound edit elfdll enhmetafile -event exec file fixup font gdi global graphics -header heap hook hotkey icmp icon imagehlp imagelist -imm int int10 int16 int17 int19 int21 int31 -io ipaddress joystick key keyboard ldt listbox listview -local mci mcianim mciavi mcicda mcimidi mciwave mdi -menu message metafile midi mmaux mmio mmsys mmtime -module monthcal mpr msacm msg msvideo nativefont nonclient -ntdll odbc ole opengl pager palette pidl print -process profile progress prop propsheet psapi psdrv ras -rebar reg region relay resource richedit scroll segment -seh selector sendmsg server setupapi setupx shell snoop -sound static statusbar storage stress string syscolor system -tab tape tapi task text thread thunk timer -toolbar toolhelp tooltips trackbar treeview ttydrv tweak typelib -updown ver virtual vxd wave win win16drv win32 -wing wininet winsock winspool wnet x11 x11drv - + + Debug Channels + + + +allacceladvapianimateaspi + +atomavifile bitblt bitmap caret + +cdromclass clipboard clippingcombo + +comboex commcommctrlcommdlg console + +crtdllcursordatetimedc ddeml + +ddraw debug debugstrdelayhlpdialog + +dinputdll dosfsdosmemdplay + +driverdsoundeditelfdllenhmetafile + +eventexecfilefixupfont + +gdi globalgraphics headerheap + +hookhotkeyicmpiconimagehlp + +imagelist immintint10int16 + +int17int19int21int31 io + +ipaddressjoystickkeykeyboardldt + +listbox listview localmcimcianim + +mciavimcicda mcimidi mciwave mdi + +menu message metafilemidi mmaux + +mmio mmsys mmtime modulemonthcal + +mpr msacm msg msvideo nativefont + +nonclient ntdll odbc ole opengl + +pager palette pidl print process + +profile progressprop propsheetpsapi + +psdrv ras rebar reg region + +relay resourcericheditscrollsegment + +sehselectorsendmsg serversetupapi + +setupxshell snoop soundstatic + +statusbarstorage stress stringsyscolor + +system tabtapetapitask + +textthreadthunktimer toolbar + +toolhelptooltipstrackbartreeviewttydrv + +tweaktypelib updownvervirtual + +vxdwavewinwin16drvwin32 + +wingwininet winsock winspoolwnet + +x11 x11drv + + + +
+ For more details about debug channels, check out the diff --git a/documentation/winehq.dsl b/documentation/winehq.dsl index 78d6324e27e..553f25bf120 100644 --- a/documentation/winehq.dsl +++ b/documentation/winehq.dsl @@ -30,13 +30,13 @@ (make formatting-instruction data: "-->"))) ;; Customize the body tag attributes -(define %body-attr% - (list - (list "BGCOLOR" "#555555") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#840084") - (list "ALINK" "#0000FF"))) +;;(define %body-attr% +;; (list + ;; (list "BGCOLOR" "#555555") +;; (list "TEXT" "#000000") +;; (list "LINK" "#0000FF") +;; (list "VLINK" "#840084") +;; (list "ALINK" "#0000FF")))