diff --git a/build.xml b/build.xml index 15b073b..7ff5dca 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,7 @@ ############################################################################ # This is the Ant build file for writer2latex # Original: Sep 2004 (mgn) - # version 1.6 (2014-11-04) + # version 1.6 (2014-11-10) ############################################################################ --> @@ -248,7 +248,7 @@ + includes="${jarfile}.jar,writer2latex.oxt,writer2xhtml.oxt,w2lconfig.oxt,xhtml-config-sample.oxt"/> diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt index 9c8626f..0210074 100644 --- a/source/distro/changelog.txt +++ b/source/distro/changelog.txt @@ -2,6 +2,13 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6 ---------- version 1.5.2 ---------- +[w2l] Added new option font to load font packages. It accepts a large number of standard font packages such as + cmbright or fourier. Only packages with math support are included. Unknown packages defaults to Computer Modern. + In the user interface, this option can be found in the export dialog. To make room for this, the BibTeX + settings no longer has a heading in the dialog. + +[w2l] Bugfix: Include w2lconfig.oxt in the distribution (was missing in 1.5.1) + ---------- version 1.5.1 ---------- [w2l] Implementation detail: Updated to version 20140107 of the JSON library org.json.* from JSON.org. diff --git a/source/distro/doc/user-manual.odt b/source/distro/doc/user-manual.odt index 2db9c20..9dd8a9e 100644 Binary files a/source/distro/doc/user-manual.odt and b/source/distro/doc/user-manual.odt differ diff --git a/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java index 0d94da2..b465ba4 100644 --- a/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java +++ b/source/java/org/openoffice/da/comp/writer2latex/LaTeXOptionsDialog.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-19) + * Version 1.6 (2014-11-12) * */ @@ -52,6 +52,24 @@ public class LaTeXOptionsDialog extends OptionsDialogBase { private static final String[] FLOATOPTIONS_VALUES = { "", "tp", "bp", "htp", "hbp" }; + // UI names and configuration option values for fonts + private static final String[] FONT_VALUES = + { "default", "cmbright", "ccfonts", "ccfonts-euler", + "iwona", "kurier", "anttor", "kmath-kerkis", + "millennial", "fouriernc", + "pxfonts", "mathpazo", "mathpple", + "txfonts", "mathtime", "mathptmx", + "mbtimes", "arev", + "charter-mathdesign", "garamond-mathdesign", "utopia-mathdesign", "fourier" }; + private static final String[] FONT_NAMES = + { "Default (Computer Modern)", "CM Bright", "Concrete", "Concrete + Euler Math", + "Iwona", "Kurier", "Antykwa Torunska", "Kerkis", + "New Century Schoolbook + Millennial Math", "New Century Schoolbook + Fourier Math", + "Palatino + PXfonts Math", "Palatino + Pazo Math", "Palatino + Euler Math", + "Times + TXfonts Math", "Times + Belleek Math", "Times + Symbol", + "Omega Serif + Omega Math", "Arev Sans + Arev Math", + "Bitstream Charter + Math Design", "URW Garamond + Math Design", "Utopia + Math Design", "Utopia + Fourier Math" }; + /** The component will be registered under this name. */ public static String __serviceName = "org.openoffice.da.writer2latex.LaTeXOptionsDialog"; @@ -87,6 +105,8 @@ public class LaTeXOptionsDialog extends OptionsDialogBase { loadListBoxOption(xProps,"Backend"); loadListBoxOption(xProps,"Inputencoding"); loadCheckBoxOption(xProps,"Multilingual"); + setListBoxStringItemList("Font", FONT_NAMES); + loadListBoxOption(xProps,"Font"); loadCheckBoxOption(xProps,"GreekMath"); loadCheckBoxOption(xProps,"AdditionalSymbols"); @@ -145,6 +165,7 @@ public class LaTeXOptionsDialog extends OptionsDialogBase { } saveListBoxOption(xProps, filterData, "Inputencoding", "inputencoding", INPUTENCODING_VALUES); saveCheckBoxOption(xProps, filterData, "Multilingual", "multilingual"); + saveListBoxOption(xProps, filterData, "Font", "font", FONT_VALUES); saveCheckBoxOption(xProps, filterData, "GreekMath", "greek_math"); // AdditionalSymbols sets 5 different w2l options... saveCheckBoxOption(xProps, filterData, "AdditionalSymbols", "use_pifont"); @@ -280,6 +301,7 @@ public class LaTeXOptionsDialog extends OptionsDialogBase { setControlEnabled("InputencodingLabel",!isLocked("inputencoding")); setControlEnabled("Inputencoding",!isLocked("inputencoding")); setControlEnabled("Multilingual",!isLocked("multilingual")); + setControlEnabled("Font",!isLocked("font")); setControlEnabled("GreekMath",!isLocked("greek_math")); setControlEnabled("AdditionalSymbols",!isLocked("additional_symbols")); diff --git a/source/java/writer2latex/latex/LaTeXConfig.java b/source/java/writer2latex/latex/LaTeXConfig.java index 48615b1..a0d8d32 100644 --- a/source/java/writer2latex/latex/LaTeXConfig.java +++ b/source/java/writer2latex/latex/LaTeXConfig.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-11-06) * */ @@ -49,7 +49,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { ///////////////////////////////////////////////////////////////////////// // I. Define items needed by ConfigBase - protected int getOptionCount() { return 71; } + protected int getOptionCount() { return 72; } protected String getDefaultConfigPath() { return "/writer2latex/latex/config/"; } ///////////////////////////////////////////////////////////////////////// @@ -150,38 +150,39 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { private static final int INCLUDE_ORIGINAL_CITATIONS = 36; private static final int USE_NATBIB = 37; private static final int NATBIB_OPTIONS = 38; - private static final int FORMATTING = 39; - private static final int PAGE_FORMATTING = 40; - private static final int OTHER_STYLES = 41; - private static final int IMAGE_CONTENT = 42; - private static final int TABLE_CONTENT = 43; - private static final int TABLE_FIRST_HEAD_STYLE = 44; - private static final int TABLE_HEAD_STYLE = 45; - private static final int TABLE_FOOT_STYLE = 46; - private static final int TABLE_LAST_FOOT_STYLE = 47; - private static final int IGNORE_HARD_PAGE_BREAKS = 48; - private static final int IGNORE_HARD_LINE_BREAKS = 49; - private static final int IGNORE_EMPTY_PARAGRAPHS =50; - private static final int IGNORE_DOUBLE_SPACES = 51; - private static final int DISPLAY_HIDDEN_TEXT = 52; - private static final int ALIGN_FRAMES = 53; - private static final int FLOAT_FIGURES = 54; - private static final int FLOAT_TABLES = 55; - private static final int FLOAT_OPTIONS = 56; - private static final int FIGURE_SEQUENCE_NAME = 57; - private static final int TABLE_SEQUENCE_NAME = 58; - private static final int IMAGE_OPTIONS = 59; - private static final int REMOVE_GRAPHICS_EXTENSION = 60; - private static final int ORIGINAL_IMAGE_SIZE = 61; - private static final int SIMPLE_TABLE_LIMIT = 62; - private static final int NOTES = 63; - private static final int METADATA = 64; - private static final int TABSTOP = 65; - private static final int WRAP_LINES_AFTER = 66; - private static final int SPLIT_LINKED_SECTIONS = 67; - private static final int SPLIT_TOPLEVEL_SECTIONS = 68; - private static final int SAVE_IMAGES_IN_SUBDIR = 69; - private static final int DEBUG = 70; + private static final int FONT = 39; + private static final int FORMATTING = 40; + private static final int PAGE_FORMATTING = 41; + private static final int OTHER_STYLES = 42; + private static final int IMAGE_CONTENT = 43; + private static final int TABLE_CONTENT = 44; + private static final int TABLE_FIRST_HEAD_STYLE = 45; + private static final int TABLE_HEAD_STYLE = 46; + private static final int TABLE_FOOT_STYLE = 47; + private static final int TABLE_LAST_FOOT_STYLE = 48; + private static final int IGNORE_HARD_PAGE_BREAKS = 49; + private static final int IGNORE_HARD_LINE_BREAKS = 50; + private static final int IGNORE_EMPTY_PARAGRAPHS =51; + private static final int IGNORE_DOUBLE_SPACES = 52; + private static final int DISPLAY_HIDDEN_TEXT = 53; + private static final int ALIGN_FRAMES = 54; + private static final int FLOAT_FIGURES = 55; + private static final int FLOAT_TABLES = 56; + private static final int FLOAT_OPTIONS = 57; + private static final int FIGURE_SEQUENCE_NAME = 58; + private static final int TABLE_SEQUENCE_NAME = 59; + private static final int IMAGE_OPTIONS = 60; + private static final int REMOVE_GRAPHICS_EXTENSION = 61; + private static final int ORIGINAL_IMAGE_SIZE = 62; + private static final int SIMPLE_TABLE_LIMIT = 63; + private static final int NOTES = 64; + private static final int METADATA = 65; + private static final int TABSTOP = 66; + private static final int WRAP_LINES_AFTER = 67; + private static final int SPLIT_LINKED_SECTIONS = 68; + private static final int SPLIT_TOPLEVEL_SECTIONS = 69; + private static final int SAVE_IMAGES_IN_SUBDIR = 70; + private static final int DEBUG = 71; ///////////////////////////////////////////////////////////////////////// // IV. Our options data @@ -259,6 +260,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { options[INCLUDE_ORIGINAL_CITATIONS] = new BooleanOption("include_original_citations","false"); options[USE_NATBIB] = new BooleanOption("use_natbib","false"); options[NATBIB_OPTIONS] = new Option("natbib_options",""); + options[FONT] = new Option("font","default"); options[FORMATTING] = new IntegerOption("formatting","convert_basic") { public void setString(String sValue) { super.setString(sValue); @@ -689,6 +691,7 @@ public class LaTeXConfig extends writer2latex.base.ConfigBase { public String getNatbibOptions() { return options[NATBIB_OPTIONS].getString(); } // Formatting options + public String getFont() { return options[FONT].getString(); } public int formatting() { return ((IntegerOption) options[FORMATTING]).getValue(); } public int pageFormatting() { return ((IntegerOption) options[PAGE_FORMATTING]).getValue(); } public int otherStyles() { return ((IntegerOption) options[OTHER_STYLES]).getValue(); } diff --git a/source/java/writer2latex/latex/i18n/ClassicI18n.java b/source/java/writer2latex/latex/i18n/ClassicI18n.java index 2223256..589bc11 100644 --- a/source/java/writer2latex/latex/i18n/ClassicI18n.java +++ b/source/java/writer2latex/latex/i18n/ClassicI18n.java @@ -20,7 +20,7 @@ * * All Rights Reserved. * - * Version 1.4 (2014-09-16) + * Version 1.6 (2014-11-12) * */ @@ -303,6 +303,9 @@ public class ClassicI18n extends I18n { fontencs.addValue("T1"); pack.append("\\usepackage[").append(fontencs.toString()) .append("]{fontenc}").nl(); + + // use font package(s) + useFontPackages(pack); // usepackage babel @@ -394,6 +397,76 @@ public class ClassicI18n extends I18n { } + private void useFontPackages(LaTeXDocumentPortion ldp) { + String sFont = config.getFont(); + // Sources: + // A Survey of Free Math Fonts for TeX and LaTeX, Stephen G. Hartke 2006 + if ("cmbright".equals(sFont)) { // Computer Modern Bright designed by Walter A. Schmidt + ldp.append("\\usepackage{cmbright}").nl(); + } + else if ("ccfonts".equals(sFont)) { // Concrete designed by Donald E. Knuth + ldp.append("\\usepackage{ccfonts}").nl(); + } + else if ("ccfonts-euler".equals(sFont)) { // Concrete with Euler math fonts + ldp.append("\\usepackage{ccfonts,eulervm}").nl(); + } + else if ("iwona".equals(sFont)) { // Iwona + ldp.append("\\usepackage[math]{iwona}").nl(); + } + else if ("kurier".equals(sFont)) { // Kurier + ldp.append("\\usepackage[math]{kurier}").nl(); + } + else if ("anttor".equals(sFont)) { // Antykwa Torunska + ldp.append("\\usepackage[math]{anttor}").nl(); + } + else if ("kmath-kerkis".equals(sFont)) { // Kerkis + ldp.append("\\usepackage{kmath,kerkis}"); + } + else if ("millennial".equals(sFont)) { // New Century Schoolbook + Millennial + ldp.append("\\usepackage{millennial}"); + } + else if ("fouriernc".equals(sFont)) { // New Century Schoolbook + Fourier + ldp.append("\\usepackage{fouriernc}"); + } + else if ("pxfonts".equals(sFont)) { // Palatino + pxfonts math + ldp.append("\\usepackage{pxfonts}"); + } + else if ("mathpazo".equals(sFont)) { // Palatino + Pazo math + ldp.append("\\usepackage{mathpazo}"); + } + else if ("mathpple".equals(sFont)) { // Palatino + Euler + ldp.append("\\usepackage{mathpple}"); + } + else if ("txfonts".equals(sFont)) { // Times + txfonts math + ldp.append("\\usepackage[varg]{txfonts}"); + } + else if ("mathtime".equals(sFont)) { // Times + Beleek math + ldp.append("\\usepackage{mathtime}"); + } + else if ("mathptmx".equals(sFont)) { // Times + Symbol + ldp.append("\\usepackage{mathptmx}"); + } + else if ("mbtimes".equals(sFont)) { // Omega serif + Omega math + ldp.append("\\usepackage{mbtimes}"); + } + else if ("arev".equals(sFont)) { // Arev Sans + Arev math + ldp.append("\\usepackage{arev}"); + } + else if ("charter-mathdesign".equals(sFont)) { // Bitstream Charter + Math Design + ldp.append("\\usepackage[charter]{mathdesign}"); + } + else if ("garamond-mathdesign".equals(sFont)) { // URW Garamond + Math Design + ldp.append("\\usepackage[garamond]{mathdesign}"); + } + else if ("utopia-mathdesign".equals(sFont)) { // Utopia + Math Design + ldp.append("\\usepackage[utopia]{mathdesign}"); + } + else if ("fourier".equals(sFont)) { // Utopia + Fourier + ldp.append("\\usepackage{fourier}"); + } + } + + /** Apply a language language * @param style the OOo style to read attributes from * @param bDecl true if declaration form is required diff --git a/source/oxt/writer2latex/Options.xcs b/source/oxt/writer2latex/Options.xcs index 206a767..358038f 100644 --- a/source/oxt/writer2latex/Options.xcs +++ b/source/oxt/writer2latex/Options.xcs @@ -25,6 +25,7 @@ + diff --git a/source/oxt/writer2latex/Options.xcu b/source/oxt/writer2latex/Options.xcu index 844e325..4bdc6c6 100644 --- a/source/oxt/writer2latex/Options.xcu +++ b/source/oxt/writer2latex/Options.xcu @@ -20,6 +20,9 @@ true + + 0 + true diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_ca.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_ca.properties index 50741b2..f6302ad 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_ca.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_ca.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Lletres gregues com a s\u00edmbols 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=S\u00edmbols suplementaris -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografia 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Fes la bibliografia amb BibTeX 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Cancel\u00b7la 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_cs_CZ.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_cs_CZ.properties index 2784897..eac35bd 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_cs_CZ.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_cs_CZ.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=\u0158eck\u00e1 p\u00edsmena reprezentovat jako symboly 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Podpora pro dal\u0161\u00ed symboly -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografie 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Pro bibliografii pou\u017e\u00edt BibTeX 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Zru\u0161it 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_da_DK.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_da_DK.properties index 136cade..38948d1 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_da_DK.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_da_DK.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Brug gr\u00e6ske bogstaver som symboler 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Underst\u00f8t yderligere symboler -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Litteraturliste 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Brug BibTeX til litteraturlisten 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Afbryd 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Eksporter skjult tekst +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Skrifttype +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_de_DE.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_de_DE.properties index de29fea..bc196e4 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_de_DE.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_de_DE.properties @@ -20,8 +20,6 @@ 36.LaTeXOptions.GreekMath.Label=Benutze griechische Buchstaben als Symbole 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Unterst\u00fctze weitere Symbole -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Literaturverzeichnis 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Benutze BibTeX f\u00fcr das Literaturverzeichnis 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,4 +109,6 @@ 136.FloatOptions.StringItemList=Hier oder Ende der Seite 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text - +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_en_US.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_en_US.properties index 2b96d07..4d93cb8 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_en_US.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_en_US.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Use greek letters as symbols 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Support additional symbols -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliography 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Use BibTeX for bibliography 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Cancel 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties index fe1b7f1..fd8c0f9 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Usar letras griegas como s\u00edmbolos 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Habilitar soporte a s\u00edmbolos adicionales -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliograf\u00eda 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Usar BibTeX para bibliograf\u00eda 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,4 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Cancelar 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text - +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fa_IR.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fa_IR.properties index 03b0177..dc63c20 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fa_IR.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fa_IR.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0648\u0627\u0698\u06a9 \u0647\u0627\u06cc \u06cc\u0648\u0646\u0627\u0646\u06cc \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0646\u0645\u0627\u062f 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=\u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 \u0646\u0645\u0627\u062f\u0647\u0627\u06cc \u0627\u0636\u0627\u0641\u06cc -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliography 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Use BibTeX for bibliography 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=\u0627\u0646\u0635\u0631\u0627\u0641 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties index 3ca483a..697b024 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fi_FI.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=K\u00e4yt\u00e4 Kreikkalaisia kirjaimia symbooleina 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Tue muita symbooleja -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibiliografia 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=K\u00e4yt\u00e4 BibTeX:i\u00e4 bibliografiaan 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Peruuta 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fr_FR.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fr_FR.properties index b36431a..4164054 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_fr_FR.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_fr_FR.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Utiliser les lettres grecques comme symboles 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Prise en charge de symboles additionels -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliographie 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Utiliser BibTeX pour la bibliographie 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Annuler 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_it_IT.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_it_IT.properties index c26a040..91b191c 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_it_IT.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_it_IT.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Usa le lettere greche come simboli 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Supporto simboli aggiuntivi -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografia 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Usa BibTeX per la bibliografia 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Annulla 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_nl_NL.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_nl_NL.properties index f7c6832..ae15966 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_nl_NL.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_nl_NL.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Gebruik Griekse letters als symbolen 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Ondersteuning van extra symbolen -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografie 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Gebruik BibTeX voor de bibliografie 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Annuleren 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_nn_NO.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_nn_NO.properties index f44c1da..b482506 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_nn_NO.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_nn_NO.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Nytt greske teikn som symbol 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=St\u00f8tt fleire symbol -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografi 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Nytt BibTeX for bibliografi 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Avbryt 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_pl_PL.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_pl_PL.properties index 5729379..51a6c92 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_pl_PL.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_pl_PL.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=U\u017cyj greckich liter jako symboli 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=U\u017cywaj dodatkowych symboli -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografia 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=U\u017cywaj BibTeXa dla bibliografii 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Anuluj 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_pt_BR.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_pt_BR.properties index 53eb253..1a52f73 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_pt_BR.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_pt_BR.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Usar caracteres gregos como s\u00edmbolos 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Suportar s\u00edmbolos adicionais -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografia 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Usar BibTeX para bibliografia 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=Cancelar 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_ru_RU.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_ru_RU.properties index 7b69334..c08c015 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_ru_RU.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_ru_RU.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b \u043a\u0430\u043a \u0441\u0438\u043c\u0432\u043e\u043b\u044b 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=\u0411\u0438\u0431\u043b\u0438\u043e\u0433\u0440\u0430\u0444\u0438\u044f 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c BibTeX \u0434\u043b\u044f \u0431\u0438\u0431\u043b\u0438\u043e\u0433\u0440\u0430\u0444\u0438\u0438 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_tr_TR.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_tr_TR.properties index 0b970db..bd5884d 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_tr_TR.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_tr_TR.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=Yunan harflerini sembol gibi kullan 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=Ek sembolleri destekle -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=Bibliografya 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=Bibliografya i\u00e7in BibTeX kullan 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=\u0130ptal 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_uk_UA.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_uk_UA.properties index d2a39ec..42d6287 100644 --- a/source/oxt/writer2latex/W2LDialogs/DialogStrings_uk_UA.properties +++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_uk_UA.properties @@ -38,8 +38,6 @@ 36.LaTeXOptions.GreekMath.Label=\u0412\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u043b\u0456\u0442\u0435\u0440\u0438 \u044f\u043a \u0441\u0438\u043c\u0432\u043e\u043b\u0438 37.LaTeXOptions.AdditionalSymbols.HelpText= 38.LaTeXOptions.AdditionalSymbols.Label=\u041f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0432\u0430\u0442\u0438 \u0434\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 -39.LaTeXOptions.BibliographyLabel.HelpText= -40.LaTeXOptions.BibliographyLabel.Label=\u0411\u0456\u0431\u0456\u043b\u043e\u0433\u0440\u0430\u0444\u0456\u044f 41.LaTeXOptions.UseBibtex.HelpText= 42.LaTeXOptions.UseBibtex.Label=\u0412\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0432\u0430\u0442\u0438 BibTeX \u0434\u043b\u044f \u0431\u0456\u0431\u043b\u0456\u043e\u0433\u0440\u0430\u0444\u0456\u0457 43.LaTeXOptions.BibtexStyleLabel.HelpText= @@ -111,3 +109,6 @@ 109.LaTeXOptions.CancelButton.Label=\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438 147.LaTeXOptions.DisplayHiddenText.HelpText= 148.LaTeXOptions.DisplayHiddenText.Label=Export hidden text +151.LaTeXOptions.FontLabel.HelpText= +152.LaTeXOptions.FontLabel.Label=Font +154.LaTeXOptions.Font.HelpText= diff --git a/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl b/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl index 6a45fa3..4674075 100644 --- a/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl +++ b/source/oxt/writer2latex/W2LDialogs/LaTeXOptions.xdl @@ -41,9 +41,8 @@ - - - + + @@ -106,7 +105,9 @@ - + + + \ No newline at end of file diff --git a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp index b68139f..48bce4b 100644 --- a/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp +++ b/source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/export.xhp @@ -114,6 +114,12 @@ so if you have a document that is written in one language only you may want to uncheck this option. This will produce a cleaner LaTeX file because you may avoid a large number of language selections. + + Font + Select a font scheme to use in the LaTeX document + Use this option to select a font scheme to use in the LaTeX document. + (TODO) + Use greek letters as symbols Check this treat greek characters as symbols rather than as text