Endre språkkode for nordsamisk fra sme til se

Basert på anbefaling fra Børre Gaup om bruk av språkkode for
nordsamisk.

diff --git a/Makefile b/Makefile
index e8123be155deb7101175b86a0a18137626ef9e4f..8a7176e79bb6ed98c0c07245e9dd3ba314fc77a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 SOURCE = pdf.xsl
 SOURCE_NB = $(SOURCE) book.xml glossary-nb.xml
-SOURCE_SME = $(SOURCE) book-sme.xml glossary-sme.xml
+SOURCE_SE = $(SOURCE) book-se.xml glossary-se.xml
+SOURCE_EN = $(SOURCE) book-en.xml glossary-en.xml
 
 GENERATED = \
   mekaniker-ordbok-nb.pdf mekaniker-ordbok-nb.epub mekaniker-ordbok-nb.html \
-  mekaniker-ordbok-sme.pdf mekaniker-ordbok-sme.epub mekaniker-ordbok-sme.html
+  mekaniker-ordbok-se.pdf mekaniker-ordbok-se.epub mekaniker-ordbok-se.html
 
 all: $(GENERATED)
 
@@ -26,8 +27,8 @@ check: lint epubcheck
 glossary-nb.xml: make-glossary meksme-utf8.xml
        LC_COLLATE=nb_NO.UTF-8 ./make-glossary --output $@ nb
 
-glossary-sme.xml: make-glossary meksme-utf8.xml
-       LC_COLLATE=nb_NO.UTF-8 ./make-glossary --output $@ sme
+glossary-se.xml: make-glossary meksme-utf8.xml
+       LC_COLLATE=nb_NO.UTF-8 ./make-glossary --output $@ se
 
 DBLATEX_OPTS = \
        -b xetex \
@@ -46,16 +47,16 @@ mekaniker-ordbok-nb.html: $(SOURCE_NB)
        xmlto -m pdf.xsl html-nochunks book.xml
        mv book.html $@
 
-book-sme.xml: book.xml
-# dblatex do not understand lang="sme", use "nn" with workarounds in pdf.xsl
-       sed -e 's/-nb/-sme/' -e 's/"nb"/"nn"/' < $^ >$@
+book-se.xml: book.xml
+# dblatex do not understand lang="se", use "nn" with workarounds in pdf.xsl
+       sed -e 's/-nb/-se/' -e 's/"nb"/"nn"/' < $^ >$@
 
-mekaniker-ordbok-sme.pdf: $(SOURCE_SME)
-       dblatex $(DBLATEX_OPTS) -o $@ book-sme.xml
+mekaniker-ordbok-se.pdf: $(SOURCE_SE)
+       dblatex $(DBLATEX_OPTS) -o $@ book-se.xml
 
-mekaniker-ordbok-sme.epub: $(SOURCE_SME)
-       dbtoepub -s epub.xsl book-sme.xml -o $@
+mekaniker-ordbok-se.epub: $(SOURCE_SE)
+       dbtoepub -s epub.xsl book-se.xml -o $@
 
-mekaniker-ordbok-sme.html: $(SOURCE_SME)
-       xmlto -m pdf.xsl html-nochunks book-sme.xml
-       mv book-sme.html $@
+mekaniker-ordbok-se.html: $(SOURCE_SE)
+       xmlto -m pdf.xsl html-nochunks book-se.xml
+       mv book-se.html $@

diff --git a/book.xml b/book.xml
index ff4113b8346b4ae3cfcf7ae7217f59de01ba58cb..df72bc354b3b2472cf5a8d371c3ba0f63dde9e81 100644 (file)
--- a/book.xml
+++ b/book.xml
@@ -110,6 +110,17 @@
     forklaring.  I PDF og papirutgave kan alle språkenes ordvalg slås
     opp i registeret for å finne aktuelt oppslagsord.
   </para>
+
+  <para>
+    Ordene på ulike språk er markert med språkkoder i tråd med ISO-639-1:
+    <itemizedlist>
+      <listitem><para>(en) Engelsk</para></listitem>
+      <listitem><para>(nb) Norsk bokmål</para></listitem>
+      <listitem><para>(se) Nordsamisk</para></listitem>
+      <listitem><para>(se) Svensk</para></listitem>
+      <listitem><para>(fi) Finsk</para></listitem>
+    </itemizedlist>
+  </para>
  </abstract>
 
  <!-- biblioid class="isbn">978-82-93828-02-0</biblioid -->

diff --git a/make-glossary b/make-glossary
index 51c94bf291b092896226ead78fe549168ba3c88f..cc23f67154907db5c5370101cc4ca99fb038d570 100755 (executable)
--- a/make-glossary
+++ b/make-glossary
@@ -16,7 +16,7 @@ root = tree.getroot()
 #print(tostring(tree))
 
 cols = (
-    'topic', 'sme', 'desc-sme', 'desc-nb', 'nb', 'sv', 'fi', 'en', 'is',
+    'topic', 'se', 'desc-se', 'desc-nb', 'nb', 'sv', 'fi', 'en', 'is',
 )
 
 topicmap = {
@@ -59,7 +59,7 @@ def langsort(lang, e):
     if lang in e:
         return locale.strxfrm(e[lang])
     else:
-        return locale.strxfrm(e['sme'])
+        return locale.strxfrm(e['se'])
 
 def make_glossary_docbook(lang, desccodes, langcodes, output='glossary.xml'):
     import lxml.builder
@@ -113,7 +113,7 @@ def make_glossary_docbook(lang, desccodes, langcodes, output='glossary.xml'):
             for desccode in desccodes:
                 codestr = 'desc-%s' % desccode
                 if codestr in e:
-                    entry.append(E.glossdef(E.para("%s: %s" % (desccode,
+                    entry.append(E.glossdef(E.para("(%s): %s" % (desccode,
                                                                e[codestr]))))
             glossary.append(entry)
 
@@ -157,19 +157,19 @@ if 'nb' == args.langcode:
     print("Norsk/bokmål")
     print()
     make_glossary_docbook(lang='nb', desccodes=('nb',),
-                          langcodes=('en', 'sme', 'sv', 'da', 'fi', 'is',),
+                          langcodes=('en', 'se', 'sv', 'da', 'fi', 'is',),
                           output=args.output)
-elif 'sme' == args.langcode:
+elif 'se' == args.langcode:
     print("Nordsamisk")
     print()
-    make_glossary_docbook(lang='sme', desccodes=('sme', 'nb'),
+    make_glossary_docbook(lang='se', desccodes=('se', 'nb'),
                           langcodes=('nb', 'en', 'sv', 'da', 'fi', 'is',),
                           output=args.output)
 elif 'en' == args.langcode:
     print("Engelsk")
     print()
     make_glossary_docbook(lang='en', desccodes=('en', 'nb'),
-                          langcodes=('en', 'nb', 'sme', 'sv', 'da', 'fi', 'is',),
+                          langcodes=('en', 'nb', 'se', 'sv', 'da', 'fi', 'is',),
                           output=args.output)
 else:
     print("error: Unknown language code %s" % args.langcode)

diff --git a/pdf.xsl b/pdf.xsl
index d1a5d5edf2e3ba81c7b5e863234382da1220973b..cf2b0b331fd6e88c4679d4d974d384ead71db66a 100644 (file)
--- a/pdf.xsl
+++ b/pdf.xsl
@@ -122,15 +122,15 @@
       <l:dingbat key="nestedendquote" text="’"/>
 
   <!--
-Workaround for missing 'sme' support in dblatex/docbook, use 'nn' as
+Workaround for missing 'se' support in dblatex/docbook, use 'nn' as
 replacement and rewrite the strings we use.  Note PDF use some of
 these, while HTML and ePub uses others.
 
 A more future proof approach that would help others would be to submit
-a sme.xsl file to
+a se.xsl file to
 https://github.com/docbook/xslt10-stylesheets/tree/master/gentext/locale .
   -->
-      <l:gentext key="Editedby" text="Redigert av (sme)"/>
+      <l:gentext key="Editedby" text="Redigert av (se)"/>
       <l:gentext key="Abstract" text="Čoahkkáigeassu"/>
       <l:gentext key="TableofContents" text="Sisdoallu"/>
       <l:gentext key="Copyright" text="Dahkkivuoigatvuohta"/>