fixed newton pages

- moved the sub-doc under the main doc
- re-added images
- fixed internal anchors (both in document and in du2html)

16 files changed, 178 insertions, 196 deletions

diff --git a/additions/HW/newton-7110/inet-setup.png b/additions/HW/newton-7110/inet-setup.png
new file mode 100644
index 0000000..decd379
--- /dev/null
+++ b/additions/HW/newton-7110/inet-setup.png
diff --git a/additions/HW/newton-7110/minicom-at.png b/additions/HW/newton-7110/minicom-at.png
new file mode 100644
index 0000000..aadde2c
--- /dev/null
+++ b/additions/HW/newton-7110/minicom-at.png
diff --git a/additions/HW/newton-7110/modem-setup1.png b/additions/HW/newton-7110/modem-setup1.png
new file mode 100644
index 0000000..1332a63
--- /dev/null
+++ b/additions/HW/newton-7110/modem-setup1.png
diff --git a/additions/HW/newton-7110/modem-setup2.png b/additions/HW/newton-7110/modem-setup2.png
new file mode 100644
index 0000000..6b82234
--- /dev/null
+++ b/additions/HW/newton-7110/modem-setup2.png
diff --git a/additions/HW/newton-7110/modem-setup3.png b/additions/HW/newton-7110/modem-setup3.png
new file mode 100644
index 0000000..a7fa510
--- /dev/null
+++ b/additions/HW/newton-7110/modem-setup3.png
diff --git a/additions/HW/newton-7110/modem-setup4.png b/additions/HW/newton-7110/modem-setup4.png
new file mode 100644
index 0000000..53c3f99
--- /dev/null
+++ b/additions/HW/newton-7110/modem-setup4.png
diff --git a/additions/HW/newton-7110/pt100-at.png b/additions/HW/newton-7110/pt100-at.png
new file mode 100644
index 0000000..722d787
--- /dev/null
+++ b/additions/HW/newton-7110/pt100-at.png
diff --git a/additions/HW/newton-7110/rs232-dsub9.gif b/additions/HW/newton-7110/rs232-dsub9.gif
new file mode 100644
index 0000000..6643dc6
--- /dev/null
+++ b/additions/HW/newton-7110/rs232-dsub9.gif
diff --git a/additions/HW/newton-7110/rs422-mdin8.gif b/additions/HW/newton-7110/rs422-mdin8.gif
new file mode 100644
index 0000000..19e2412
--- /dev/null
+++ b/additions/HW/newton-7110/rs422-mdin8.gif
diff --git a/src/HW/newt-setup/du2html.xsl b/src/HW/newt-setup/du2html.xsl
deleted file mode 120000
index e2487e0..0000000
--- a/src/HW/newt-setup/du2html.xsl
+++ /dev/null
@@ -1 +0,0 @@
-../../../templates/du2html.xsl
\ No newline at end of file
diff --git a/src/HW/newton-7110/document.en.rest.txt b/src/HW/newton-7110/document.en.rest.txt
index d01780e..d4ab516 100644
--- a/src/HW/newton-7110/document.en.rest.txt
+++ b/src/HW/newton-7110/document.en.rest.txt
@@ -17,6 +17,9 @@ cables, but only under Windows with a software modem).
 Having the cable, we can test it putting it between the phone and a computer
 with a RS-232 serial port. With a terminal emulation program:
 
+.. image:: minicom-at.png
+   :alt: screen-shot of minicom connected to the 7110
+
 In the picture you can see how to the ati (identification) commnad, the phone
 answers with its name, and to the ati2 command, it asnwers with the version
 number of its software.
@@ -29,26 +32,29 @@ with the special serial adapter (dongle) it's possible to extract a RS-422 (Mac
 serial) from the Newton; moreover, RS-422 is compatible with RS-232: just
 connect the right wires. I did it this way: (pinouts are connector side):
 
-+------+------+
-|RS-232|RS-422|
-+------+------+
-|1     |2     |
-+------+------+
-|2     |5     |
-+------+------+
-|3     |3     |
-+------+------+
-|4     |1     |
-+------+------+
-|5     |8 & 4 |
-+------+------+
-|6     |2     |
-+------+------+
-|7     |1     |
-+------+------+
-|8     |2     |
-+------+------+
 
++---------------------------+---------------------------+
+|.. image:: rs232-dsub9.gif |.. image:: rs422-mdin8.gif |
+|   :alt: RS-232, D-Sub     |   :alt: RS-422, mini DIN 8|
++---------------------------+---------------------------+
+|          RS-232           |          RS-422           |
++===========================+===========================+
+|            1              |             2             |
++---------------------------+---------------------------+
+|            2              |             5             |
++---------------------------+---------------------------+
+|            3              |             3             |
++---------------------------+---------------------------+
+|            4              |             1             |
++---------------------------+---------------------------+
+|            5              |             8 & 4         |
++---------------------------+---------------------------+
+|            6              |             2             |
++---------------------------+---------------------------+
+|            7              |             1             |
++---------------------------+---------------------------+
+|            8              |             2             |
++---------------------------+---------------------------+
 
 On the Web you can find several texts about different serial interfaces: the
 search is left as useful exercise to the reader.
@@ -56,6 +62,9 @@ search is left as useful exercise to the reader.
 To test the adapter, link everything up (phone - DLR-3 - adapter just built -
 dongle - Newton) and use a terminal emulator on the Newton:
 
+.. image:: pt100-at.png
+   :alt: PT-100 on the Newton, connected to the 7110
+
 The program used is `PT100`_
 
 What about the Internet?
@@ -68,29 +77,51 @@ version 2`_, and `Modem Modifier version 2.02`_.
 Here you can see the settings I use (the links are to a text version of the
 same).
 
-There are some details to clear:
+.. image:: inet-setup.png
+   :alt: Internet setup (link to text version)
+   :target: newt-setup/#inet
 
-*   2800 is the phone number of `Omnitel`_ (Vodaphone group) Internet access.
-    It seems to be the cheapest in Italy.
+.. image:: modem-setup1.png
+   :alt: Modem setup, part 1
+   :target: newt-setup/#modem1
 
-*   There's no need for username or password, since the authentication is done
-    by the SIM card.
+.. image:: modem-setup2.png
+   :alt: Modem setup, part 2
+   :target: newt-setup/#modem2
 
-*   The DNS number **is NOT official**: it would get sent during PPP
-    handshaking, but the Newton doesn't understand it. The information come
-    from an Italian web page (`Come accedere a Omnitelnet 2800 da Linux`_).
-    **DO NOT** use this number if you are not using Omnitel's service.
+.. image:: modem-setup3.png
+   :alt: Modem setup, part 3
+   :target: newt-setup/#modem3
 
-*   Configuration strings have been taken form the .INF file for the 7110
-    installation under Windows.
+.. image:: modem-setup4.png
+   :alt: Modem setup, part 4
+   :target: newt-setup/#modem4
+
+There are some details to clear:
 
-*   Someone might have noticed that the +CBST=0,0,1 command has been changed in
-    +CBST=75,0,1. This allows the phone to connect at 14400bps instead of
-    9600bps. The information comes from an Italian web page (`Portel`_). In
-    some areas, the phone will not correclty establish the data connection if
-    set for 14400bps. I have made two modem profiles, one for each speed. I
-    still need to find a way to discover which one to use without trial and
-    error (and paying for two calls).
+* 2800 is the phone number of `Omnitel`_ (Vodafone group) Internet
+  access. It seems to be the cheapest in Italy.
+
+* There's no need for username or password, since the authentication
+  is done by the SIM card.
+
+* The DNS number **is NOT official**: it would get sent during PPP
+  handshaking, but the Newton doesn't understand it. The information
+  come from an Italian web page (`Come accedere a Omnitelnet 2800 da
+  Linux`_).  **DO NOT** use this number if you are not using Omnitel's
+  service.
+
+* Configuration strings have been taken form the .INF file for the
+  7110 installation under Windows.
+
+* Someone might have noticed that the ``+CBST=0,0,1`` command has been
+  changed in ``+CBST=75,0,1``. This allows the phone to connect at
+  14400bps instead of 9600bps. The information comes from an Italian
+  web page (`Portel`_). In some areas, the phone will not correclty
+  establish the data connection if set for 14400bps. I have made two
+  modem profiles, one for each speed. I still need to find a way to
+  discover which one to use without trial and error (and paying for
+  two calls).
 
 Enjoy!
 
diff --git a/src/HW/newton-7110/document.it.rest.txt b/src/HW/newton-7110/document.it.rest.txt
index 05542e4..6e7eeac 100644
--- a/src/HW/newton-7110/document.it.rest.txt
+++ b/src/HW/newton-7110/document.it.rest.txt
@@ -20,6 +20,9 @@ software modem).
 Ottenuto il cavo, si può provarlo collegandolo tra il telefono e un computer
 con porta RS-232, usando un programma di emulazione terminale:
 
+.. image:: minicom-at.png
+   :alt: immagine di minicom collegato al 7110
+
 Nell'immagine si può vedere come al comando ati (identificazione) il telefono
 risponda col proprio nome, e ad ati2 risponda con il numero di versione del
 proprio software
@@ -33,26 +36,28 @@ possibile estrarre una RS-422 (seriale Mac) dal Newton; inoltre, la RS-422 è
 compatibile con la RS-232: basta collegare i fili giusti. Io ho fatto così (le
 piedinature sono lato connettore):
 
-+------+------+
-|RS-232|RS-422|
-+------+------+
-|1     |2     |
-+------+------+
-|2     |5     |
-+------+------+
-|3     |3     |
-+------+------+
-|4     |1     |
-+------+------+
-|5     |8 & 4 |
-+------+------+
-|6     |2     |
-+------+------+
-|7     |1     |
-+------+------+
-|8     |2     |
-+------+------+
-
++---------------------------+---------------------------+
+|.. image:: rs232-dsub9.gif |.. image:: rs422-mdin8.gif |
+|   :alt: RS-232, D-Sub     |   :alt: RS-422, mini DIN 8|
++---------------------------+---------------------------+
+|          RS-232           |          RS-422           |
++===========================+===========================+
+|            1              |             2             |
++---------------------------+---------------------------+
+|            2              |             5             |
++---------------------------+---------------------------+
+|            3              |             3             |
++---------------------------+---------------------------+
+|            4              |             1             |
++---------------------------+---------------------------+
+|            5              |             8 & 4         |
++---------------------------+---------------------------+
+|            6              |             2             |
++---------------------------+---------------------------+
+|            7              |             1             |
++---------------------------+---------------------------+
+|            8              |             2             |
++---------------------------+---------------------------+
 
 In rete è possibile trovare svariate spiegazioni sulle varie interfacce
 seriali: la ricerca è lasciata come utile esercizio al lettore.
@@ -61,6 +66,9 @@ Per provare l'adattatore, collegate il tutto (telefono - DLR-3 - adattatore
 appena costruito - dongle - Newton) e usate un emulatore di terminale sul
 Newton:
 
+.. image:: pt100-at.png
+   :alt: PT-100 sul Newton, collegato al 7110
+
 Il programma usato è `PT100`_
 
 E Internet?
@@ -73,29 +81,51 @@ Enabler versione 2`_, vi servirà `Modem Modifier versione 2.02`_.
 Qui sotto potete vedere le impostazioni che uso io (i link puntano a una
 versione testo delle stesse).
 
-Ci sono alcuni punti da chiarire:
+.. image:: inet-setup.png
+   :alt: Internet setup (link alla versione testo)
+   :target: newt-setup/#inet
+
+.. image:: modem-setup1.png
+   :alt: Modem setup, parte 1
+   :target: newt-setup/#modem1
 
-*   Il numero 2800 è quello del servizio Internet di `Omnitel`_. L'ho scelto
-    perché mi sembra quello più economico (`accetto volentieri`_ smentite e
-    suggerimenti)
+.. image:: modem-setup2.png
+   :alt: Modem setup, parte 2
+   :target: newt-setup/#modem2
 
-*   Il nome utente e la password non sono necessari, in quanto l'autenticazione
-    avviene tramite la carta SIM
+.. image:: modem-setup3.png
+   :alt: Modem setup, parte 3
+   :target: newt-setup/#modem3
 
-*   Il numero del DNS **non è ufficiale**: verrebbe fornito dinamicamente
-    durante l'handshaking del PPP, ma il Newton non è in grado di capirlo.
-    L'informazione viene da `Come accedere a Omnitelnet 2800 da Linux`_
+.. image:: modem-setup4.png
+   :alt: Modem setup, parte 4
+   :target: newt-setup/#modem4
 
-*   Le stringhe di configurazione sono state ricavate dai file .INF per
-    l'installazione del 7110 sotto Windows.
+Ci sono alcuni punti da chiarire:
 
-*   Qualcuno avrà notato che il comando +CBST=0,0,1 è stato rimpiazzato da
-    +CBST=75,0,1. Questo permette di collegarsi a una velocità di 14400bps
-    anziché 9600bps. L'informazione viene da `Portel`_. È possibile che in
-    alcune zone (mi è capitato a Lucca) il telefono non prenda la linea dati se
-    configurato per 14400bps. Io ho creato due profili modem, uno a 14440bps e
-    uno a 9600bps, e scelgo quello che funziona. Devo ancora scoprire un modo
-    per decidere quale usare senza andare per tentativi (e spendere 400 lire).
+* Il numero 2800 è quello del servizio Internet di `Omnitel`_. L'ho
+  scelto perché mi sembra quello più economico (`accetto volentieri`_
+  smentite e suggerimenti)
+
+* Il nome utente e la password non sono necessari, in quanto
+  l'autenticazione avviene tramite la carta SIM
+
+* Il numero del DNS **non è ufficiale**: verrebbe fornito
+  dinamicamente durante l'handshaking del PPP, ma il Newton non è in
+  grado di capirlo.  L'informazione viene da `Come accedere a
+  Omnitelnet 2800 da Linux`_
+
+* Le stringhe di configurazione sono state ricavate dai file .INF per
+  l'installazione del 7110 sotto Windows.
+
+* Qualcuno avrà notato che il comando ``+CBST=0,0,1`` è stato
+  rimpiazzato da ``+CBST=75,0,1``. Questo permette di collegarsi a una
+  velocità di 14400bps anziché 9600bps. L'informazione viene da
+  `Portel`_. È possibile che in alcune zone (mi è capitato a Lucca) il
+  telefono non prenda la linea dati se configurato per 14400bps. Io ho
+  creato due profili modem, uno a 14440bps e uno a 9600bps, e scelgo
+  quello che funziona. Devo ancora scoprire un modo per decidere quale
+  usare senza andare per tentativi (e spendere 400 lire).
 
 Buon divertimento!
 
diff --git a/src/HW/newt-setup/document.en.rest.txt b/src/HW/newton-7110/newt-setup/document.en.rest.txt
index cf7cba1..152b3fa 100644
--- a/src/HW/newt-setup/document.en.rest.txt
+++ b/src/HW/newton-7110/newt-setup/document.en.rest.txt
@@ -3,138 +3,93 @@ Newton and Nokia 7110 Setup
 :CreationDate: 2003-01-28 10:09:25
 :tags: hardware
 
+.. _inet:
+
 Internet Settings
 -----------------
 
 For Internet Setup of NIE 2.0
 
 Protocol:
-
     PPP
-
 Configuration:
-
     Server
-
 User ID:
-
     <none>
-
 Access Number:
-
     2800
-
 When closing, disconnect:
-
     after 1 minute
-
 Primary DNS/Name Server Address:
-
     10.127.1.141
-
 Domain Name:
-
     omnitel.it
-
 Modem Settings:
-
     7110
-
 Country:
-
     Italy
 
+.. _modem1:
+
 Modem Settings
 --------------
 
 For Modem Modifier v2.02
 
 Modem Name:
-
     7110
-
 Version:
-
     1
-
 Organization:
-
     Nokia
-
 ID the Modem:
-
     False
-
 Use Hardware CD:
-
     True
-
 Use Config. String:
-
     True
-
 Use Dial Options:
-
     True
-
 Hang Up At Disconnect:
-
     True
-
 Supports Cellular:
-
     **False**
 
-Supports EC:
+.. _modem2:
 
+Supports EC:
     True
-
 Supports LCS:
-
     False
-
 Direct Connect Only:
-
     False
-
 Connect Speeds:
-
     2400 4800 7200 9600 12000 14400
-
 Config. Speed:
-
     19200
-
 Command Timeout:
-
     2000
-
 Max Chars Per Line:
-
     40
 
-Inter-Command Delay:
+.. _modem3:
 
+Inter-Command Delay:
     50
-
 Modem ID String:
-
+    ..
 Config. String No EC:
-
-    AT&FV1E0&D2&S0&C1S0=0
-
+    ``AT&FV1E0&D2&S0&C1S0=0``
 Config. String EC Only:
+    ``AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1``
 
-    AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1
+.. _modem4:
 
 Config. String EC And Fallback:
-
-    AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1
-
+    ``AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1``
 Config. String Cellular:
-
+    ..
 Config. String Direct Connect:
-
+    ..
 Smart Cr's:
-
     checked
diff --git a/src/HW/newt-setup/document.it.rest.txt b/src/HW/newton-7110/newt-setup/document.it.rest.txt
index dc24f7c..eace6fe 100644
--- a/src/HW/newt-setup/document.it.rest.txt
+++ b/src/HW/newton-7110/newt-setup/document.it.rest.txt
@@ -3,138 +3,93 @@ Impostazioni Newton e Nokia 7110
 :CreationDate: 2003-01-28 10:09:25
 :tags: hardware
 
+.. _inet:
+
 Impostazioni Internet
 ---------------------
 
 Per Internet Setup di NIE 2.0
 
 Protocol:
-
     PPP
-
 Configuration:
-
     Server
-
 User ID:
-
     <none>
-
 Access Number:
-
     2800
-
 When closing, disconnect:
-
     after 1 minute
-
 Primary DNS/Name Server Address:
-
     10.127.1.141
-
 Domain Name:
-
     omnitel.it
-
 Modem Settings:
-
     7110
-
 Country:
-
     Italy
 
+.. _modem1:
+
 Impostazioni modem
 ------------------
 
 Per Modem Modifier v2.02
 
 Modem Name:
-
     7110
-
 Version:
-
     1
-
 Organization:
-
     Nokia
-
 ID the Modem:
-
     False
-
 Use Hardware CD:
-
     True
-
 Use Config. String:
-
     True
-
 Use Dial Options:
-
     True
-
 Hang Up At Disconnect:
-
     True
-
 Supports Cellular:
-
     **False**
 
-Supports EC:
+.. _modem2:
 
+Supports EC:
     True
-
 Supports LCS:
-
     False
-
 Direct Connect Only:
-
     False
-
 Connect Speeds:
-
     2400 4800 7200 9600 12000 14400
-
 Config. Speed:
-
     19200
-
 Command Timeout:
-
     2000
-
 Max Chars Per Line:
-
     40
 
-Inter-Command Delay:
+.. _modem3:
 
+Inter-Command Delay:
     50
-
 Modem ID String:
-
+    ..
 Config. String No EC:
-
-    AT&FV1E0&D2&S0&C1S0=0
-
+    ``AT&FV1E0&D2&S0&C1S0=0``
 Config. String EC Only:
+    ``AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1``
 
-    AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1
+.. _modem4:
 
 Config. String EC And Fallback:
-
-    AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1
-
+    ``AT&FV1E0&D2&S0&C1S0=0+CBST=75,0,1``
 Config. String Cellular:
-
+    ..
 Config. String Direct Connect:
-
+    ..
 Smart Cr's:
-
     checked
diff --git a/src/HW/newton-7110/newt-setup/du2html.xsl b/src/HW/newton-7110/newt-setup/du2html.xsl
new file mode 120000
index 0000000..7364257
--- /dev/null
+++ b/src/HW/newton-7110/newt-setup/du2html.xsl
@@ -0,0 +1 @@
+../../../../templates/du2html.xsl
\ No newline at end of file
diff --git a/templates/du2html.xsl b/templates/du2html.xsl
index 29d1cbb..3725333 100644
--- a/templates/du2html.xsl
+++ b/templates/du2html.xsl
@@ -2,6 +2,7 @@
 <x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform"
               xmlns="http://www.w3.org/1999/xhtml"
               xmlns:e="http://exslt.org/common"
+              xmlns:s="http://exslt.org/strings"
               xmlns:wc="http://webcoso.thenautilus.net/"
               exclude-result-prefixes="wc e"
               version="1.0"
@@ -70,6 +71,16 @@
   </x:element>
  </x:template>
 
+ <x:template match="target[@refid and not(@refuri)]">
+  <a name="{@refid}"/>
+ </x:template>
+
+ <x:template match="target[@names and not(@refuri)]">
+  <x:for-each select="s:split(@names,' ')/token">
+   <a name="{.}"/>
+  </x:for-each>
+ </x:template>
+
  <!-- qui ce ne freghiamo del @source, tanto viene usata solo per i
       documenti stand-alone -->