");
diff --git a/src/java/net/sf/jabref/imports/HTMLConverter.java b/src/java/net/sf/jabref/imports/HTMLConverter.java
index 56d8b4367c9..c38913b133f 100644
--- a/src/java/net/sf/jabref/imports/HTMLConverter.java
+++ b/src/java/net/sf/jabref/imports/HTMLConverter.java
@@ -76,6 +76,7 @@ public class HTMLConverter implements LayoutFormatter {
{"180", "acute", "\\{\\\\'\\{\\}\\}"}, // acute accent = spacing acute,
// U+00B4 ISOdia
{"181", "micro", "\\$\\\\mu\\$"}, // micro sign, U+00B5 ISOnum
+ {"", "mu", "\\$\\\\mu\\$"}, // micro sign, U+00B5 ISOnum
{"182", "para", "\\{\\\\P\\}"}, // pilcrow sign = paragraph sign,
// U+00B6 ISOnum
{"183", "middot", "\\$\\\\cdot\\$"}, // middle dot = Georgian comma
@@ -418,13 +419,14 @@ public class HTMLConverter implements LayoutFormatter {
// U+22A5 ISOtech
{"8901", "sdot", "\\$\\\\cdot\\$"}, // dot operator, U+22C5 ISOamsb
/* dot operator is NOT the same character as U+00B7 middle dot */
- /* Miscellaneous Technical */
{"8968", "lceil", "\\$\\\\lceil\\$"}, // left ceiling = apl upstile,
// U+2308 ISOamsc
{"8969", "rceil", "\\$\\\\rceil\\$"}, // right ceiling, U+2309 ISOamsc
{"8970", "lfloor", "\\$\\\\lfloor\\$"}, // left floor = apl downstile,
// U+230A ISOamsc
{"8971", "rfloor", "\\$\\\\rfloor\\$"}, // right floor, U+230B ISOamsc
+
+ /* Miscellaneous Technical */
{"9001", "lang", "\\$\\\\langle\\$"}, // left-pointing angle bracket = bra,
// U+2329 ISOtech
/* lang is NOT the same character as U+003C 'less than'
@@ -557,6 +559,8 @@ public class HTMLConverter implements LayoutFormatter {
{"", "imath", "\\{\\\\i\\}"}, // Small i without the dot
{"321", "Lstrok", "\\{\\\\L\\}"}, // upper case l with stroke
{"322", "lstrok", "\\{\\\\l\\}"}, // lower case l with stroke
+ {"348", "Scirc", "\\{\\\\\\^\\{S\\}\\}"}, // upper case S with circumflex
+ {"349", "scirc", "\\{\\\\\\^\\{s\\}\\}"}, // lower case s with circumflex
{"370", "Uogon", "\\{\\\\k\\{U\\}\\}"}, // capital U with ogonek
{"371", "uogon", "\\{\\\\k\\{u\\}\\}"}, // small u with ogonek
{"381", "Zcaron", "\\{\\\\v\\{Z\\}\\}"}, // capital Z with caron
@@ -590,12 +594,15 @@ public class HTMLConverter implements LayoutFormatter {
{"8198", "", "\\\\hspace\\{0.167em\\}"}, // Six-Per-Em Space
{"8208", "hyphen", "-"}, // Hyphen
{"8229", "nldr", "\\.\\."}, // Double dots - en leader
+ {"8450", "complexes", "\\$\\\\mathbb\\{C\\}\\$"}, // double struck capital C -- requires e.g. amsfonts
{"8451", "", "\\$\\\\deg\\$\\{C\\}"}, // Degree Celsius
{"8459", "Hscr", "\\$\\\\mathcal\\{H\\}\\$"}, // script capital H -- possibly use \mathscr
{"8460", "Hfr", "\\$\\\\mathbb\\{H\\}\\$"}, // black letter capital H -- requires e.g. amsfonts
{"8466", "Lscr", "\\$\\\\mathcal\\{L\\}\\$"}, // script capital L -- possibly use \mathscr
{"8467", "ell", "\\{\\\\ell\\}"}, // script small l
{"8469", "naturals", "\\$\\\\mathbb\\{N\\}\\$"}, // double struck capital N -- requires e.g. amsfonts
+ {"8474", "Qopf", "\\$\\\\mathbb\\{Q\\}\\$"}, // double struck capital Q -- requires e.g. amsfonts
+ {"8477", "reals", "\\$\\\\mathbb\\{R\\}\\$"}, // double struck capital R -- requires e.g. amsfonts
{"8486", "", "\\$\\{\\\\Omega\\}\\$"}, // Omega
{"8491", "angst", "\\{\\\\AA\\}"}, // Angstrom
{"8496", "Escr", "\\$\\\\mathcal\\{E\\}\\$"}, // script capital E
@@ -631,6 +638,11 @@ public class HTMLConverter implements LayoutFormatter {
{"8883", "vrtri", "\\$\\\\triangleright\\$"}, // Right triangle
{"8896", "xwedge", "\\$\\\\bigwedge\\$"}, // Big wedge
{"8897", "xvee", "\\$\\\\bigvee\\$"}, // Big vee
+ {"8942", "vdots", "\\$\\\\vdots\\$"}, // vertical ellipsis U+22EE
+ {"8943", "cdots", "\\$\\\\cdots\\$"}, // midline horizontal ellipsis U+22EF
+ /*{"8944", "", "\\$\\\\ddots\\$"}, // up right diagonal ellipsis U+22F0 */
+ {"8945", "ddots", "\\$\\\\ddots\\$"}, // down right diagonal ellipsis U+22F1
+
{"9426", "circledc", "\\{\\\\copyright\\}"}, // circled small letter C
{"9633", "square", "\\$\\\\square\\$"}, // White square
{"9651", "xutri", "\\$\\\\bigtriangleup\\$"}, // White up-pointing big triangle
diff --git a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
index cd5328d6fa2..beb6beae602 100644
--- a/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
+++ b/src/java/net/sf/jabref/imports/IEEEXploreFetcher.java
@@ -103,6 +103,7 @@ public class IEEEXploreFetcher implements EntryFetcher {
Pattern ieeeArticleNumberPattern = Pattern.compile("
");
+ Pattern authorPattern = Pattern.compile("");
// Common words in IEEE Xplore that should always be
public IEEEXploreFetcher() {
@@ -111,7 +112,8 @@ public IEEEXploreFetcher() {
fieldPatterns.put("title", "\\s*(.+)\\s* ");
//fieldPatterns.put("author", "\\s*(.+)");
- fieldPatterns.put("author", "(?s)\\s*(.+)");
+ //fieldPatterns.put("author", "(?s)\\s*(.+)");
+ // fieldPatterns.put("author", "
");
fieldPatterns.put("volume", "Volume:\\s*([A-Za-z-]*\\d+)");
fieldPatterns.put("number", "Issue:\\s*(\\d+)");
//fieldPatterns.put("part", "Part (\\d+), (.+)");
@@ -390,7 +392,7 @@ private BibtexEntry cleanup(BibtexEntry entry) {
}
// clean up author
- String author = (String)entry.getField("author");
+ /* String author = (String)entry.getField("author");
if (author != null) {
if (author.indexOf("a href=") >= 0) { // Author parsing failed because it was empty
entry.setField("author",""); // Maybe not needed anymore due to another change
@@ -406,7 +408,7 @@ private BibtexEntry cleanup(BibtexEntry entry) {
author = author.replaceAll("[ ,;]+$", "");
entry.setField("author", author);
}
- }
+ }*/
// clean up month
String month = (String)entry.getField("month");
if ((month != null) && (month.length() > 0)) {
@@ -702,6 +704,20 @@ private BibtexEntry parseNextEntry(String allText, int startIndex) {
}
}
}
+
+ Matcher authorMatcher = authorPattern.matcher(text);
+ // System.out.println(text);
+ StringBuffer authorNames = new StringBuffer("");
+ int authorCount=0;
+ while(authorMatcher.find()) {
+ if(authorCount >= 1) {
+ authorNames.append(" and ");
+ }
+ authorNames.append(htmlConverter.format(authorMatcher.group(1)));
+ //System.out.println(authorCount + ": " + authorMatcher.group(1));
+ authorCount++;
+ }
+ entry.setField("author",authorNames.toString());
if (entry.getField("author") == null || entry.getField("author").startsWith("a href") ||
entry.getField("author").startsWith("Topic(s)")) { // Fix for some documents without authors
entry.setField("author","");
diff --git a/src/java/net/sf/jabref/sql/SQLUtil.java b/src/java/net/sf/jabref/sql/SQLUtil.java
index 7bb146fd81b..0aaead01e2a 100644
--- a/src/java/net/sf/jabref/sql/SQLUtil.java
+++ b/src/java/net/sf/jabref/sql/SQLUtil.java
@@ -27,7 +27,6 @@
import java.util.ListIterator;
import net.sf.jabref.BibtexFields;
-import net.sf.jabref.Globals;
/**
*
@@ -62,6 +61,7 @@ public static void refreshFields() {
allFields.clear();
}
uniqueInsert(allFields, BibtexFields.getAllFieldNames());
+ uniqueInsert(allFields, BibtexFields.getAllPrivateFieldNames());
}
/**
@@ -108,12 +108,12 @@ private static ArrayList uniqueInsert(ArrayList list,
if (array != null) {
for (int i = 0; i < array.length; i++) {
if (!list.contains(array[i]))
+ if (!array[i].equals("#"))
list.add(array[i]);
}
}
return list;
}
-
/**
* Generates DML specifying table columns and their datatypes. The output of
* this routine should be used within a CREATE TABLE statement.
diff --git a/src/resource/JabRef_pt_BR.properties b/src/resource/JabRef_pt_BR.properties
index 14035c39fc8..a5a996a1054 100644
--- a/src/resource/JabRef_pt_BR.properties
+++ b/src/resource/JabRef_pt_BR.properties
@@ -1,5 +1,5 @@
#!
-#! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
+#! created/edited by Popeye version 0.55 (https://github.com/koppor/popeye)
#! encoding:ISO-8859-1
%0_contains_the_Regular_Expression_%1 =%0_cont\u00e9m_a_Express\u00e3o_Regular_%1
%0_contains_the_term_%1 =%0_cont\u00e9m_o_termo_%1
@@ -16,6 +16,7 @@
=
=
=
+A_string_with_this_label_already_exists=Uma_string_com_este_r\u00f3tulo_j\u00e1_existe.
Abbreviate_journal_names_of_the_selected_entries_(ISO_abbreviation)=Abreviar_nomes_de_peri\u00f3dicos_das_refer\u00eancias_selecionadas_(abrevia\u00e7\u00e3o_ISO)
Abbreviate_journal_names_of_the_selected_entries_(MEDLINE_abbreviation)=Abreviar_nomes_de_peri\u00f3dicos_das_refer\u00eancias_selecionadas_(abrevia\u00e7\u00e3o_MEDLINE)
Abbreviate_names=Abreviar_nomes
@@ -601,7 +602,6 @@ Open=Abrir
Open_BibTeX_database=Abrir_base_de_dados_BibTeX
Open_database=Abrir_base_de_dados
Open_editor_when_a_new_entry_is_created=Abrir_o_editor_quando_uma_nova_refer\u00eancia_\u00e9_criada
-Open_folder=Abrir_pasta
Open_file=Abrir_arquivo
Open_last_edited_databases_at_startup=Abrir_as_\u00faltimas_base_de_dados_editadas_ao_iniciar
Open_PDF_or_PS=_Abrir_PDF_ou_PS
@@ -1065,6 +1065,8 @@ Cannot_use_port_%0_for_remote_operation;_another_application_may_be_using_it._Tr
Plugin_installer=Instalador_do_plugin
Unable_to_create_plugin_directory=N\u00e3o_foi_poss\u00edvel_criar_o_diret\u00f3rio_de_plugins
Unable_to_copy_file=N\u00e3o_foi_poss\u00edvel_copiar_os_arquivos
+#Plugin_installed_successfully._You_must_restart_JabRef_to_load_the_new_plugin.=Plugin_instalado_com_sucesso._Voc\u00ea_deve_reiniciar_o_JabRef_para_carregar_o_novo_plugin.
+Plugin_installed_successfully._You_must_restart_JabRef_to_load_the_new_plugin.=Plugin_instalado_com_sucesso._O_Jabref_precisa_ser_reiniciado_para_carregar_o_novo_plugin.
Unable_to_create_user_plugin_directory=N\u00e3o_foi_poss\u00edvel_criar_diret\u00f3rio_de_plugins_do_usu\u00e1rio
Plugin_installation_failed.=Falha_na_instala\u00e7\u00e3o_do_plugin.
The_same_version_of_this_plugin_is_already_installed.=A_mesma_vers\u00e3o_deste_plugin_j\u00e1_est\u00e1_instalada.
@@ -1294,8 +1296,8 @@ Autocomplete_names=Autocompletar_nomes
Default_style=Estilo_padr\u00e3o
Choose_style_file_directly=Escolha_o_arquivo_de_estilo_diretamente
Choose_from_a_directory=Escolha_a_partir_de_um_diret\u00f3rio
-Allow_file_links_relative_to_each_bib_file's_location=Permitir_links_de_arquivos_relativos_ao_local_do_arquivo_.bib
No_directory_defined_for_%0-files=Nenhum_diret\u00f3rio_definido_para_arquivos_%0
+Allow_file_links_relative_to_each_bib_file's_location=Permitir_links_de_arquivos_relativos_ao_local_do_arquivo_.bib
Style_selection=Sele\u00e7\u00e3o_de_estilo
The_panel_below_shows_the_definition_of_the_default_style.=O_painel_abaixo_exibe_a_defini\u00e7\u00e3o_do_estilo_padr\u00e3o.
If_you_want_to_use_it_as_a_template_for_a_new_style,_you_can_copy_the_contents_into_a_new_.jstyle_file=Se_voc\u00ea_deseja_utilizar_isto_como_template_para_um_novo_estilo,_voc\u00ea_pode_copiar_seu_conte\u00fado_para_um_novo_arquivo_.jstyle
@@ -1314,250 +1316,248 @@ You_must_select_either_a_valid_style_file,_or_use_a_default_style.=Voc\u00ea_dev
Show=Exibir
This_is_a_simple_copy_and_paste_dialog._First_load_or_paste_some_text_into_the_text_input_area.=
-Push_selection_to_TeXstudio=
-Path_to_TeXstudio=
-Program_'%0'_not_found=
-Pushed_citations_to_TeXstudio=
-Unable_to_connect_to_freecite_online_service.=
-Parse_with_FreeCite=
-Insert_selected_citations_into_TeXstudio=
-The_current_BibTeX_key_will_be_overwritten._Continue?=
-Overwrite_key=
-Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator=
-How_would_you_like_to_link_to_'%0'?=
-Bibtex_key_patterns=
-Changed_special_field_settings=
-Clear_priority=
-Clear_rank=
-Compact_rank=
-Convert_1st,_2nd,_..._to_real_superscripts=
-Dropped_comment_from_database=
-Enable_PDF_preview=
-Enable_special_fields=
-Five_stars=
-Four_stars=
-Help_on_special_fields=
-Keywords_of_selected_entries=
-Manage_content_selectors=
-Manage_keywords=
-Marked_entries'_quality_as_good=
-Marked_entries_as_relevant=
-No_priority_information=
-No_rank_information=
-One_star=
-Priority=
-Priority_high=
-Priority_low=
-Priority_medium=
-Quality=
-Rank=
-Relevance=
-Set_priority_to_high=
-Set_priority_to_low=
-Set_priority_to_medium=
-Set_rank_to_five_stars=
-Set_rank_to_four_stars=
-Set_rank_to_one_star=
-Set_rank_to_three_stars=
-Set_rank_to_two_stars=
-Show_one_letter_heading_for_icon_columns=
-Show_priority=
-Show_quality=
-Show_rank=
-Show_relevance=
-Synchronize_with_keywords=
-Synchronized_special_fields_based_on_keywords=
-Three_stars=
-Toggle_relevance=
-Toogle_quality_assured=
-Two_stars=
-Update_keywords=
-Write_values_of_special_fields_as_separate_fields_to_BibTeX=
-You_have_changed_settings_for_special_fields.=
-no_preview_available=
+Reset_preferences_(key1,key2,..._or_'all')=Redefinir_prefer\u00eancias_(key1,key2,..._ou_todas)
+Find_unlinked_files=Encontrar_arquivos_n\u00e3o_referenciados
+Unselect_all=Desmarcar_todas
+Expand_all=Expandir_todos
+Collapse_all=Reduzir_todos
+Select_Directory=Escolha_diret\u00f3rio
+Choose_Directory=Escolha_Diret\u00f3rio
+Use_the_selected_directory_to_start_with_the_search.=Usar_o_diret\u00f3rio_selecionado_para_come\u00e7ar_a_busca
+Browse...=Pesquisar...
+Opens_the_file_browser.=Abrir_o_gerenciador_de_arquivos
+Scan_directory=Varrer_diret\u00f3rio
+Searches_the_selected_directory_for_unlinked_files.=Buscar_arquivos_n\u00e3o_referenciados_no_diret\u00f3rio_selecionado
+Starts_the_import_of_bibtex_entries.=Iniciar_a_importa\u00e7\u00e3o_de_entradas_BibTeX
+Leave_this_dialog.=Deixar_esse_di\u00e1logo.
+Create_directory_based_keywords=Criar_diret\u00f3rios_baseados_em_palavras-chave
+Creates_keywords_in_created_entrys_with_directory_pathnames=Criar_palavras-chave_nas_refer\u00eancias_criadas_com_caminhos_de_diret\u00f3rios
+Select_a_directory_where_the_search_shall_start.=Selecione_um_diret\u00f3rio_em_que_a_busca_deve_come\u00e7ar
+Select_file_type\:=Selecione_o_arquivo
+These_files_are_not_linked_in_the_active_database.=Esses_arquivos_n\u00e3o_s\u00e3o_referenciados_na_base_de_dados_ativa
+Entry_type_to_be_created\:=Tipo_de_refer\u00eancia_a_ser_criada
+Searching_file_system...=Buscando_sistema_de_arquivo...
+Importing_into_Database...=Importando_na_base_de_dados
+Select_directory=Selecionar_diret\u00f3rio
+Select_files=Selecionar_arquivos
+Bibtex_entry_creation=Cria\u00e7\u00e3o_de_refer\u00eancia_BibTeX
+=
+Push_selection_to_TeXstudio=Enviar_sele\u00e7\u00e3o_ao_TeXstudio
+Path_to_TeXstudio=Caminho_do_TeXstudio
+Program_'%0'_not_found=Programa_%0_n\u00e3o_encontrado
+Pushed_citations_to_TeXstudio=Cita\u00e7\u00f5es_enviadas_ao_TeXstudio
+Unable_to_connect_to_freecite_online_service.=N\u00e3o_foi_poss\u00edvel_conectar_ao_servi\u00e7o_FreeCite
+Parse_with_FreeCite=Interpretar_com_FreeCite
+Insert_selected_citations_into_TeXstudio=Inserir_cita\u00e7\u00f5es_selecionadas_no_TeXstudio
+The_current_BibTeX_key_will_be_overwritten._Continue?=A_chave_BibTeX_atual_ser\u00e1_sobrescrita._Continuar_mesmo_assim?
+Overwrite_key=Sobrescrever_chave
+Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator=Chave_existente_N\u00c3O_foi_sobrescrita._Para_mudar_essa_configura\u00e7\u00e3o_abra_Op\u00e7\u00f5es_->_Prefer\u00eancias_->_Gerador_de_chaves_BibTeX
+How_would_you_like_to_link_to_'%0'?=Como_deseja_ligar_ao_'%0'?
+Bibtex_key_patterns=Padr\u00f5es_de_chaves_BibTeX
+Changed_special_field_settings=Prefer\u00eancias_de_campos_especiais_alteradas
+Clear_priority=Limpar_prioridades
+Clear_rank=Limpar_classifica\u00e7\u00e3o
+Compact_rank=Compactar_classifica\u00e7\u00e3o
+Convert_1st,_2nd,_..._to_real_superscripts=Converter_primeiro_segundo_..._para_sobrescritos
+Dropped_comment_from_database=Coment\u00e1rio_retirado_da_base_de_dados
+Enable_PDF_preview=Habilitar_preview_de_PDF
+Enable_special_fields=Habilitar_campos_especiais
+Five_stars=Cinco_estrelas
+Four_stars=Quatro_estrelas
+Help_on_special_fields=Ajuda_com_campos_especiais
+Keywords_of_selected_entries=Palavras-chave_das_entradas_selecionadas
+Manage_content_selectors=Gerenciar_seletores_de_conte\u00fado
+Manage_keywords=Gerenciar_palavras-chave
+Marked_entries'_quality_as_good=Qualidade_das_entradas_marcada_como_boa
+Marked_entries_as_relevant=Entradas_marcadas_como_relevantes
+No_priority_information=Sem_informa\u00e7\u00f5es_de_prioridade
+No_rank_information=Sem_informa\u00e7\u00f5es_de_classifica\u00e7\u00e3o
+One_star=Uma_estrela
+Priority=Prioridade
+Priority_high=Alta_prioridade
+Priority_low=Baixa_prioridade
+Priority_medium=M\u00e9dia_prioridade
+Quality=Qualidade
+Rank=Classifica\u00e7\u00e3o
+Relevance=Relev\u00e2ncia
+Set_priority_to_high=Definir_prioridade_como_alta
+Set_priority_to_low=Definir_prioridade_como_baixa
+Set_priority_to_medium=Definir_prioridade_como_m\u00e9dia
+Set_rank_to_five_stars=Classificar_como_cinco_estrelas
+Set_rank_to_four_stars=Classificar_como_quatro_estrelas
+Set_rank_to_one_star=Classificar_como_uma_estrela
+Set_rank_to_three_stars=Classificar_como_tr\u00eas_estrelas
+Set_rank_to_two_stars=Classificar_como_duas_estrelas
+Show_one_letter_heading_for_icon_columns=Mostrar_t\u00edtulo_de_uma_letra_para_colunas_de_\u00edcones
+Show_priority=Mostrar_prioridade
+Show_quality=Mostrar_qualidade
+Show_rank=Mostrar_classifica\u00e7\u00e3o(estrelas)
+Show_relevance=Mostrar_relev\u00e2ncia
+Synchronize_with_keywords=Sincronizar_com_palavras-chave
+Synchronized_special_fields_based_on_keywords=Campos_especiais_sincronizados_com_base_nas_palavras-chave
+Three_stars=Tr\u00eas_estrelas
+Toggle_relevance=Alternar_relev\u00e2ncia
+Toogle_quality_assured=Alteranar_qualidade_garantida
+Two_stars=Duas_estrelas
+Update_keywords=Atualizar_palavras-chave
+Write_values_of_special_fields_as_separate_fields_to_BibTeX=Escrever_valores_dos_campos_especiais_como_campos_separados_do_BibTeX
+You_have_changed_settings_for_special_fields.=Voc\u00ea_alterou_as_configura\u00e7\u00f5es_de_campos_especiais
+no_preview_available=Preview_n\u00e3o_dispon\u00edvel
-%0_entries_found._To_reduce_server_load,_only_%1_will_be_downloaded.=
-A_string_with_that_label_already_exists=
-Connection_to_OpenOffice_has_been_lost._Please_make_sure_OpenOffice_is_running,_and_try_to_reconnect.=
-Correct_the_entry,_and_reopen_editor_to_display/edit_source.=
-Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,