Index: abi/user/wp/strings/no-NYN.strings =================================================================== RCS file: /cvsroot/abi/user/wp/strings/no-NYN.strings,v retrieving revision 1.6 diff -u -r1.6 no-NYN.strings --- abi/user/wp/strings/no-NYN.strings 2000/08/07 18:38:55 1.6 +++ abi/user/wp/strings/no-NYN.strings 2000/08/15 09:40:12 @@ -252,7 +252,7 @@ FIELD_Type_Numbers="Tal" FIELD_Datetime_CurrentTime="Gjeldande klokkeslett" FIELD_Numbers_PageNumber="Sidetal" -FIELD_Numbers_PagesCount="Talet på side" +FIELD_Numbers_PagesCount="Talet på sider" FIELD_Numbers_ListLabel="Listeetikett" DLG_Goto_Title="Gå til ..." DLG_Goto_Label_Help="Vel kva type plassering du vil gå til i venstre felt og fyll eventuelt ut talfeltet til høgre viss du vil bruka Gå til-knappen. Du kan bruka + og - for å flytta i forhold til den gjeldande plasseringa. Eksempel: +2 flyttar to element (f.eks. linjer) framover." Index: wv/text.c =================================================================== RCS file: /cvsroot/wv/text.c,v retrieving revision 1.44 diff -u -r1.44 text.c --- wv/text.c 2000/08/15 02:09:24 1.44 +++ wv/text.c 2000/08/15 09:40:23 @@ -566,24 +566,6 @@ case 30: case 31: case 45: - case 0x2013: - /* - soft-hyphen? Or en-dash? I find that making - this a soft-hyphen works very well, but makes - the occasional "hard" word-connection hyphen - (like the "-" in roller-coaster) disappear. - (Are these actually en-dashes? Dunno.) - How does MS Word distinguish between the 0x2013's - that signify soft hyphens and those that signify - word-connection hyphens? wvware should be able - to as well. -- MV 8.7.2000 - - U+2013 is the en-dash character and not a soft - hyphen. Soft hyphen is U+00AD. Changing to - "--". -- 2000-08-11 huftis@bigfoot.com - */ - printf("--"); - return(1); case 12: case 13: case 14: @@ -605,22 +587,10 @@ printf(">"); return(1); - case 0x2019: - printf("'"); /* Right single quote, Win */ - return(1); - case 0x2026: - printf("\\ldots"); /* ellipsis */ - return(1); - case 0x2215: - printf("/"); - return(1); case 0xF8E7: /* without this, things should work in theory, but not for me */ printf("_"); return(1); - case 0x2018: - printf("`"); /* left single quote, Win */ - return(1); /* Added some new Unicode characters. It's probably difficult to write these characters in AbiWord, though ... :( @@ -969,38 +939,296 @@ printf("\\v{z}"); /* z with caron */ return(1); - /* Windows specials (MV 4.7.2000). More could be added. - See http://www.hut.fi/u/jkorpela/www/windows-chars.html - */ + case 0x01C7: + printf("LJ"); /* the LJ letter */ + return(1); + case 0x01C8: + printf("Lj"); /* the Lj letter */ + return(1); + case 0x01C9: + printf("lj"); /* the lj letter */ + return(1); + case 0x01CA: + printf("NJ"); /* the NJ letter */ + return(1); + case 0x01CB: + printf("Nj"); /* the Nj letter */ + return(1); + case 0x01CC: + printf("nj"); /* the nj letter */ + return(1); + case 0x01CD: + printf("\\v{A}"); /* A with caron */ + return(1); + case 0x01CE: + printf("\\v{a}"); /* a with caron */ + return(1); + case 0x01CF: + printf("\\v{I}"); /* I with caron */ + return(1); + case 0x01D0: + printf("\\v{\\i}"); /* i with caron (dotless) */ + return(1); + case 0x01D1: + printf("\\v{O}"); /* O with caron */ + return(1); + case 0x01D2: + printf("\\v{o}"); /* o with caron */ + return(1); + case 0x01D3: + printf("\\v{U}"); /* U with caron */ + return(1); + case 0x01D4: + printf("\\v{u}"); /* u with caron */ + return(1); + + case 0x01E6: + printf("\\v{G}"); /* G with caron */ + return(1); + case 0x01E7: + printf("\\v{g}"); /* g with caron */ + return(1); + case 0x01E8: + printf("\\v{K}"); /* K with caron */ + return(1); + case 0x01E9: + printf("\\v{k}"); /* k with caron */ + return(1); + + case 0x01F0: + printf("\\v{\j}"); /* j with caron (dotless) */ + return(1); + case 0x01F1: + printf("DZ"); /* the DZ letter */ + return(1); + case 0x01F2: + printf("Dz"); /* the Dz letter */ + return(1); + case 0x01F3: + printf("dz"); /* the dz letter */ + return(1); + case 0x01F4: + printf("\\'G"); /* G with acute */ + return(1); + case 0x01F5: + printf("\\'g"); /* g with acute */ + return(1); + + case 0x01FA: + printf("\\'{\\AA}"); /* Å with acute */ + return(1); + case 0x01FB: + printf("\\'{\\aa}"); /* å with acute */ + return(1); + case 0x01FC: + printf("\\'{\\AE}"); /* Æ with acute */ + return(1); + case 0x01FD: + printf("\\'{\\ae}"); /* æ with acute */ + return(1); + case 0x01FE: + printf("\\'{\\O}"); /* Ø with acute */ + return(1); + case 0x01FF: + printf("\\'{\\o}"); /* ø with acute */ + return(1); + + case 0x2010: + printf("-"); /* hyphen */ + return(1); + case 0x2011: + printf("-"); /* non-breaking hyphen (is there a way to get this in LaTeX?) */ + return(1); + case 0x2012: + printf("--"); /* figure dash (similar to en-dash) */ + return(1); + case 0x2013: + /* + soft-hyphen? Or en-dash? I find that making + this a soft-hyphen works very well, but makes + the occasional "hard" word-connection hyphen + (like the "-" in roller-coaster) disappear. + (Are these actually en-dashes? Dunno.) + How does MS Word distinguish between the 0x2013's + that signify soft hyphens and those that signify + word-connection hyphens? wvware should be able + to as well. -- MV 8.7.2000 + + U+2013 is the en-dash character and not a soft + hyphen. Soft hyphen is U+00AD. Changing to + "--". -- 2000-08-11 huftis@bigfoot.com + */ + printf("--"); + return(1); case 0x2014: printf("---"); /* em-dash */ return(1); - case 0x201c: + case 0x2018: + printf("`"); /* left single quote, Win */ + return(1); + case 0x2019: + printf("'"); /* Right single quote, Win */ + return(1); + case 0x201A: + printf("\\quotesinglbase{}"); /* single low 99 quotation mark */ + return(1); + case 0x201C: printf("``"); /* inverted double quotation mark */ return(1); - case 0x201d: + case 0x201D: printf("''"); /* double q.m. */ return(1); - case 0x201e: - printf("\\hbox{,,}"); /* below double q.m. */ + case 0x201E: + printf("\\quotedblbase{}"); /* double low 99 quotation mark */ return(1); case 0x2020: - printf("$\\dagger$"); + printf("\\dag{}"); /* dagger */ return(1); case 0x2021: - printf("$\\ddagger$"); + printf("\\ddag{}"); /* double dagger */ return(1); case 0x2022: - printf("$\\bullet$"); + printf("$\\bullet$"); /* bullet */ + return(1); + case 0x2023: + printf("$\\bullet$"); /* NOTE: Not a real triangular bullet */ + return(1); + + case 0x2024: + printf("."); /* One dot leader (for use in TOCs) */ + return(1); + case 0x2025: + printf(".."); /* Two dot leader (for use in TOCs) */ + return(1); + case 0x2026: + printf("\\ldots"); /* ellipsis */ + return(1); + + case 0x2039: + printf("\\guilsinglleft{}"); /* single left angle quotation mark */ + return(1); + case 0x203A: + printf("\\guilsinglright{}"); /* single right angle quotation mark */ + return(1); + + case 0x203C: + printf("!!"); /* double exclamation mark */ + return(1); + + case 0x2215: + printf("$/$"); /* Division slash */ return(1); + case 0x2030: printf("o/oo"); return(1); + case 0x20ac: - printf("\\euro"); /* No known implementation ;-) */ + printf("\\euro"); + /* No known implementation ;-) + + Shouldn't we use the package 'eurofont'? + -- 2000-08-15 huftis@bigfoot.com + */ return(1); + case 0x2160: + printf("I"); /* Roman numeral I */ + return(1); + case 0x2161: + printf("II"); /* Roman numeral II */ + return(1); + case 0x2162: + printf("III"); /* Roman numeral III */ + return(1); + case 0x2163: + printf("IV"); /* Roman numeral IV */ + return(1); + case 0x2164: + printf("V"); /* Roman numeral V */ + return(1); + case 0x2165: + printf("VI"); /* Roman numeral VI */ + return(1); + case 0x2166: + printf("VII"); /* Roman numeral VII */ + return(1); + case 0x2167: + printf("VIII"); /* Roman numeral VIII */ + return(1); + case 0x2168: + printf("IX"); /* Roman numeral IX */ + return(1); + case 0x2169: + printf("X"); /* Roman numeral X */ + return(1); + case 0x216A: + printf("XI"); /* Roman numeral XI */ + return(1); + case 0x216B: + printf("XII"); /* Roman numeral XII */ + return(1); + case 0x216C: + printf("L"); /* Roman numeral L */ + return(1); + case 0x216D: + printf("C"); /* Roman numeral C */ + return(1); + case 0x216E: + printf("D"); /* Roman numeral D */ + return(1); + case 0x216F: + printf("M"); /* Roman numeral M */ + return(1); + case 0x2170: + printf("i"); /* Roman numeral i */ + return(1); + case 0x2171: + printf("ii"); /* Roman numeral ii */ + return(1); + case 0x2172: + printf("iii"); /* Roman numeral iii */ + return(1); + case 0x2173: + printf("iv"); /* Roman numeral iv */ + return(1); + case 0x2174: + printf("v"); /* Roman numeral v */ + return(1); + case 0x2175: + printf("vi"); /* Roman numeral vi */ + return(1); + case 0x2176: + printf("vii"); /* Roman numeral vii */ + return(1); + case 0x2177: + printf("viii"); /* Roman numeral viii */ + return(1); + case 0x2178: + printf("ix"); /* Roman numeral ix */ + return(1); + case 0x2179: + printf("x"); /* Roman numeral x */ + return(1); + case 0x217A: + printf("xi"); /* Roman numeral xi */ + return(1); + case 0x217B: + printf("xiii"); /* Roman numeral xii */ + return(1); + case 0x217C: + printf("l"); /* Roman numeral l */ + return(1); + case 0x217D: + printf("c"); /* Roman numeral c */ + return(1); + case 0x217E: + printf("d"); /* Roman numeral d */ + return(1); + case 0x217F: + printf("m"); /* Roman numeral m */ + return(1); } /* Debugging aid: */